diff --git a/biome.json b/biome.json index 47eb1298..68fcdb6e 100644 --- a/biome.json +++ b/biome.json @@ -1,12 +1,42 @@ { "$schema": "./node_modules/@biomejs/biome/configuration_schema.json", - "organizeImports": { "enabled": true }, + "assist": { + "actions": { + "source": { + "organizeImports": "on" + } + } + }, "files": { - "ignore": ["./out", "./coverage"] + "includes": ["**", "!out", "!coverage"] }, "linter": { "enabled": true, "rules": { + "style": { + "useLiteralEnumMembers": "error", + "noCommaOperator": "error", + "useNodejsImportProtocol": "error", + "useAsConstAssertion": "error", + "useNumericLiterals": "error", + "useEnumInitializers": "error", + "useSelfClosingElements": "error", + "useConst": "error", + "useSingleVarDeclarator": "error", + "noUnusedTemplateLiteral": "error", + "useNumberNamespace": "error", + "noInferrableTypes": "error", + "useExponentiationOperator": "error", + "useTemplate": "error", + "noParameterAssign": "error", + "noNonNullAssertion": "error", + "useDefaultParameterLast": "error", + "noArguments": "error", + "useImportType": "error", + "useExportType": "error", + "noUselessElse": "error", + "useShorthandFunctionType": "error" + }, "correctness": { "useImportExtensions": "error" } diff --git a/package-lock.json b/package-lock.json index 7224c8dd..9d11231e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,18 +9,17 @@ "version": "9.2.0", "license": "MIT", "devDependencies": { - "@biomejs/biome": "1.9.4", + "@biomejs/biome": "2.0.0-beta.1", "npm-run-all2": "7.0.2", "typescript": "5.8.2", "vite": "6.2.3" } }, "node_modules/@biomejs/biome": { - "version": "1.9.4", - "resolved": "https://registry.npmjs.org/@biomejs/biome/-/biome-1.9.4.tgz", - "integrity": "sha512-1rkd7G70+o9KkTn5KLmDYXihGoTaIGO9PIIN2ZB7UJxFrWw04CZHPYiMRjYsaDvVV7hP1dYNRLxSANLaBFGpog==", + "version": "2.0.0-beta.1", + "resolved": "https://registry.npmjs.org/@biomejs/biome/-/biome-2.0.0-beta.1.tgz", + "integrity": "sha512-MqRoy9CbTkrS45zW+S4u8p4kQUIFx0mGUWi789W1R3b1kXYIudEqsTKgXKtTGsI0kWOlvnjuKqwTrabjaGchhQ==", "dev": true, - "hasInstallScript": true, "license": "MIT OR Apache-2.0", "bin": { "biome": "bin/biome" @@ -33,20 +32,20 @@ "url": "https://opencollective.com/biome" }, "optionalDependencies": { - "@biomejs/cli-darwin-arm64": "1.9.4", - "@biomejs/cli-darwin-x64": "1.9.4", - "@biomejs/cli-linux-arm64": "1.9.4", - "@biomejs/cli-linux-arm64-musl": "1.9.4", - "@biomejs/cli-linux-x64": "1.9.4", - "@biomejs/cli-linux-x64-musl": "1.9.4", - "@biomejs/cli-win32-arm64": "1.9.4", - "@biomejs/cli-win32-x64": "1.9.4" + "@biomejs/cli-darwin-arm64": "2.0.0-beta.1", + "@biomejs/cli-darwin-x64": "2.0.0-beta.1", + "@biomejs/cli-linux-arm64": "2.0.0-beta.1", + "@biomejs/cli-linux-arm64-musl": "2.0.0-beta.1", + "@biomejs/cli-linux-x64": "2.0.0-beta.1", + "@biomejs/cli-linux-x64-musl": "2.0.0-beta.1", + "@biomejs/cli-win32-arm64": "2.0.0-beta.1", + "@biomejs/cli-win32-x64": "2.0.0-beta.1" } }, "node_modules/@biomejs/cli-darwin-arm64": { - "version": "1.9.4", - "resolved": "https://registry.npmjs.org/@biomejs/cli-darwin-arm64/-/cli-darwin-arm64-1.9.4.tgz", - "integrity": "sha512-bFBsPWrNvkdKrNCYeAp+xo2HecOGPAy9WyNyB/jKnnedgzl4W4Hb9ZMzYNbf8dMCGmUdSavlYHiR01QaYR58cw==", + "version": "2.0.0-beta.1", + "resolved": "https://registry.npmjs.org/@biomejs/cli-darwin-arm64/-/cli-darwin-arm64-2.0.0-beta.1.tgz", + "integrity": "sha512-RaGmpNLl5NFooXaoCwvgvcuU6Am/rMZ3R48pQeCVxjrCcz1BIlKLTai5UosiedazW7JbXAvgXdSNizYG7ITlAQ==", "cpu": [ "arm64" ], @@ -61,9 +60,9 @@ } }, "node_modules/@biomejs/cli-darwin-x64": { - "version": "1.9.4", - "resolved": "https://registry.npmjs.org/@biomejs/cli-darwin-x64/-/cli-darwin-x64-1.9.4.tgz", - "integrity": "sha512-ngYBh/+bEedqkSevPVhLP4QfVPCpb+4BBe2p7Xs32dBgs7rh9nY2AIYUL6BgLw1JVXV8GlpKmb/hNiuIxfPfZg==", + "version": "2.0.0-beta.1", + "resolved": "https://registry.npmjs.org/@biomejs/cli-darwin-x64/-/cli-darwin-x64-2.0.0-beta.1.tgz", + "integrity": "sha512-sTzSshkne7HKZFNfiIhmAji7gjtCBXvkTujZELCZWIZC7oj1Tjw/gvAzbdFj2UyHd5/i90pND4ybFOLQZm9gpg==", "cpu": [ "x64" ], @@ -78,9 +77,9 @@ } }, "node_modules/@biomejs/cli-linux-arm64": { - "version": "1.9.4", - "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-arm64/-/cli-linux-arm64-1.9.4.tgz", - "integrity": "sha512-fJIW0+LYujdjUgJJuwesP4EjIBl/N/TcOX3IvIHJQNsAqvV2CHIogsmA94BPG6jZATS4Hi+xv4SkBBQSt1N4/g==", + "version": "2.0.0-beta.1", + "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-arm64/-/cli-linux-arm64-2.0.0-beta.1.tgz", + "integrity": "sha512-bxce2O4nooBmp20Ey0+IFIZyy/b0RVnciIQk9euCfAi9evq7SvFtMBYo3YUZej0KIvrau5H7tJk5OqmRJk2l+g==", "cpu": [ "arm64" ], @@ -95,9 +94,9 @@ } }, "node_modules/@biomejs/cli-linux-arm64-musl": { - "version": "1.9.4", - "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-arm64-musl/-/cli-linux-arm64-musl-1.9.4.tgz", - "integrity": "sha512-v665Ct9WCRjGa8+kTr0CzApU0+XXtRgwmzIf1SeKSGAv+2scAlW6JR5PMFo6FzqqZ64Po79cKODKf3/AAmECqA==", + "version": "2.0.0-beta.1", + "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-arm64-musl/-/cli-linux-arm64-musl-2.0.0-beta.1.tgz", + "integrity": "sha512-0MPUKzz9uBBxAYSJ+OlFi4+yGwiRcZeFqq39H0MxXCQ9MMpKJFH2Ek72fw8sXwG7Prn7EsW/3u1b7najyn1XGQ==", "cpu": [ "arm64" ], @@ -112,9 +111,9 @@ } }, "node_modules/@biomejs/cli-linux-x64": { - "version": "1.9.4", - "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-x64/-/cli-linux-x64-1.9.4.tgz", - "integrity": "sha512-lRCJv/Vi3Vlwmbd6K+oQ0KhLHMAysN8lXoCI7XeHlxaajk06u7G+UsFSO01NAs5iYuWKmVZjmiOzJ0OJmGsMwg==", + "version": "2.0.0-beta.1", + "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-x64/-/cli-linux-x64-2.0.0-beta.1.tgz", + "integrity": "sha512-6P/AtJv4hOH8mu8ez0c4UInUpiet9NEoF25+O7OPyb4w6ZHJMp2qzvayJS7TKrTQzE5KUvSiNsACGRz34DzUkg==", "cpu": [ "x64" ], @@ -129,9 +128,9 @@ } }, "node_modules/@biomejs/cli-linux-x64-musl": { - "version": "1.9.4", - "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-x64-musl/-/cli-linux-x64-musl-1.9.4.tgz", - "integrity": "sha512-gEhi/jSBhZ2m6wjV530Yy8+fNqG8PAinM3oV7CyO+6c3CEh16Eizm21uHVsyVBEB6RIM8JHIl6AGYCv6Q6Q9Tg==", + "version": "2.0.0-beta.1", + "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-x64-musl/-/cli-linux-x64-musl-2.0.0-beta.1.tgz", + "integrity": "sha512-dFvisnP1hFpVILNw0PZfs8piBwe8+aykO04Tb/4AJDVVzKkGgJfwSefwo4jqzO/Wk/Zruvhcp1nKbjgRXM+vDg==", "cpu": [ "x64" ], @@ -146,9 +145,9 @@ } }, "node_modules/@biomejs/cli-win32-arm64": { - "version": "1.9.4", - "resolved": "https://registry.npmjs.org/@biomejs/cli-win32-arm64/-/cli-win32-arm64-1.9.4.tgz", - "integrity": "sha512-tlbhLk+WXZmgwoIKwHIHEBZUwxml7bRJgk0X2sPyNR3S93cdRq6XulAZRQJ17FYGGzWne0fgrXBKpl7l4M87Hg==", + "version": "2.0.0-beta.1", + "resolved": "https://registry.npmjs.org/@biomejs/cli-win32-arm64/-/cli-win32-arm64-2.0.0-beta.1.tgz", + "integrity": "sha512-0C9YSqWHf2cJGnjKDbLi49xv6H9IfqbDsFav7X557PqwY64O6IKWqcmZzi/PkDFHjQM9opU6uhKapeGKGDxziQ==", "cpu": [ "arm64" ], @@ -163,9 +162,9 @@ } }, "node_modules/@biomejs/cli-win32-x64": { - "version": "1.9.4", - "resolved": "https://registry.npmjs.org/@biomejs/cli-win32-x64/-/cli-win32-x64-1.9.4.tgz", - "integrity": "sha512-8Y5wMhVIPaWe6jw2H+KlEm4wP/f7EW3810ZLmDlrEEy5KvBsb9ECEfu/kMWD484ijfQ8+nIi0giMgu9g1UAuuA==", + "version": "2.0.0-beta.1", + "resolved": "https://registry.npmjs.org/@biomejs/cli-win32-x64/-/cli-win32-x64-2.0.0-beta.1.tgz", + "integrity": "sha512-o8W6+DX0YRjt1kS8Y3ismq6EkjwiVDv7X0TEpfnFywoVG8HoJ7G7/m9r8LM1yE46WI3maPH2A0MoVpQ1ZNG++A==", "cpu": [ "x64" ], diff --git a/package.json b/package.json index f6282ebb..402438cb 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,9 @@ "version": "9.2.0", "type": "module", "description": "parse Scrapbox notation to JavaScript Object", - "files": ["out"], + "files": [ + "out" + ], "main": "./out/index.cjs", "module": "./out/index.mjs", "types": "./out/index.d.ts", @@ -37,7 +39,10 @@ "type": "git", "url": "git+https://github.com/progfay/scrapbox-parser.git" }, - "keywords": ["scrapbox", "parser"], + "keywords": [ + "scrapbox", + "parser" + ], "author": "progfay", "license": "MIT", "bugs": { @@ -45,7 +50,7 @@ }, "homepage": "https://github.com/progfay/scrapbox-parser#readme", "devDependencies": { - "@biomejs/biome": "1.9.4", + "@biomejs/biome": "2.0.0-beta.1", "npm-run-all2": "7.0.2", "typescript": "5.8.2", "vite": "6.2.3" diff --git a/src/block/Line.ts b/src/block/Line.ts index d8a6e6d8..17759d22 100644 --- a/src/block/Line.ts +++ b/src/block/Line.ts @@ -1,7 +1,6 @@ import { convertToNodes } from "./node/index.ts"; - -import type { Row } from "./Row.ts"; import type { Node } from "./node/type.ts"; +import type { Row } from "./Row.ts"; export interface LinePack { type: "line"; diff --git a/src/block/Table.ts b/src/block/Table.ts index eaaea3af..0cb36e6b 100644 --- a/src/block/Table.ts +++ b/src/block/Table.ts @@ -1,7 +1,6 @@ import { convertToNodes } from "./node/index.ts"; - -import type { Row } from "./Row.ts"; import type { Node } from "./node/type.ts"; +import type { Row } from "./Row.ts"; export interface TablePack { type: "table"; diff --git a/src/block/index.ts b/src/block/index.ts index e2a3ddaf..59b1fe70 100644 --- a/src/block/index.ts +++ b/src/block/index.ts @@ -1,13 +1,12 @@ -import { convertToCodeBlock } from "./CodeBlock.ts"; -import { convertToLine } from "./Line.ts"; -import { convertToTable } from "./Table.ts"; -import { convertToTitle } from "./Title.ts"; - import type { CodeBlock } from "./CodeBlock.ts"; +import { convertToCodeBlock } from "./CodeBlock.ts"; import type { Line } from "./Line.ts"; +import { convertToLine } from "./Line.ts"; import type { Pack } from "./Pack.ts"; import type { Table } from "./Table.ts"; +import { convertToTable } from "./Table.ts"; import type { Title } from "./Title.ts"; +import { convertToTitle } from "./Title.ts"; /** * Scrapbox block type diff --git a/src/block/node/BlankNode.ts b/src/block/node/BlankNode.ts index 9bdd9a40..7e9e71ca 100644 --- a/src/block/node/BlankNode.ts +++ b/src/block/node/BlankNode.ts @@ -1,8 +1,7 @@ -import { createPlainNode } from "./PlainNode.ts"; -import { createNodeParser } from "./creator.ts"; - import type { NodeCreator } from "./creator.ts"; +import { createNodeParser } from "./creator.ts"; import type { NodeParser } from "./index.ts"; +import { createPlainNode } from "./PlainNode.ts"; import type { BlankNode, PlainNode } from "./type.ts"; const blankRegExp = /\[\s+\]/; diff --git a/src/block/node/CodeNode.ts b/src/block/node/CodeNode.ts index 3ef43009..6e610b39 100644 --- a/src/block/node/CodeNode.ts +++ b/src/block/node/CodeNode.ts @@ -1,8 +1,7 @@ -import { createPlainNode } from "./PlainNode.ts"; -import { createNodeParser } from "./creator.ts"; - import type { NodeCreator } from "./creator.ts"; +import { createNodeParser } from "./creator.ts"; import type { NodeParser } from "./index.ts"; +import { createPlainNode } from "./PlainNode.ts"; import type { CodeNode, PlainNode } from "./type.ts"; const codeRegExp = /`.*?`/; diff --git a/src/block/node/CommandLineNode.ts b/src/block/node/CommandLineNode.ts index 845bdd32..da85375c 100644 --- a/src/block/node/CommandLineNode.ts +++ b/src/block/node/CommandLineNode.ts @@ -1,8 +1,7 @@ -import { createPlainNode } from "./PlainNode.ts"; -import { createNodeParser } from "./creator.ts"; - import type { NodeCreator } from "./creator.ts"; +import { createNodeParser } from "./creator.ts"; import type { NodeParser } from "./index.ts"; +import { createPlainNode } from "./PlainNode.ts"; import type { CommandLineNode, PlainNode } from "./type.ts"; const commandLineRegExp = /^[$%] .+$/; diff --git a/src/block/node/DecorationNode.ts b/src/block/node/DecorationNode.ts index 3aff26a1..6b15725b 100644 --- a/src/block/node/DecorationNode.ts +++ b/src/block/node/DecorationNode.ts @@ -1,9 +1,8 @@ -import { createPlainNode } from "./PlainNode.ts"; -import { createNodeParser } from "./creator.ts"; -import { convertToNodes } from "./index.ts"; - import type { NodeCreator } from "./creator.ts"; +import { createNodeParser } from "./creator.ts"; import type { NodeParser } from "./index.ts"; +import { convertToNodes } from "./index.ts"; +import { createPlainNode } from "./PlainNode.ts"; import type { DecorationNode, PlainNode } from "./type.ts"; const decorationRegExp = /\[[!"#%&'()*+,\-./{|}<>_~]+ (?:\[[^[\]]+\]|[^\]])+\]/; diff --git a/src/block/node/ExternalLinkNode.ts b/src/block/node/ExternalLinkNode.ts index cb63a7af..460edfac 100644 --- a/src/block/node/ExternalLinkNode.ts +++ b/src/block/node/ExternalLinkNode.ts @@ -1,8 +1,7 @@ -import { createPlainNode } from "./PlainNode.ts"; -import { createNodeParser } from "./creator.ts"; - import type { NodeCreator } from "./creator.ts"; +import { createNodeParser } from "./creator.ts"; import type { NodeParser } from "./index.ts"; +import { createPlainNode } from "./PlainNode.ts"; import type { LinkNode, PlainNode } from "./type.ts"; const hrefFirstUrlRegExp = /\[https?:\/\/[^\s\]]+\s+[^\]]*[^\s]\]/; diff --git a/src/block/node/FormulaNode.ts b/src/block/node/FormulaNode.ts index 5577bc72..4608ba27 100644 --- a/src/block/node/FormulaNode.ts +++ b/src/block/node/FormulaNode.ts @@ -1,8 +1,7 @@ -import { createPlainNode } from "./PlainNode.ts"; -import { createNodeParser } from "./creator.ts"; - import type { NodeCreator } from "./creator.ts"; +import { createNodeParser } from "./creator.ts"; import type { NodeParser } from "./index.ts"; +import { createPlainNode } from "./PlainNode.ts"; import type { FormulaNode, PlainNode } from "./type.ts"; const formulaWithTailHalfSpaceRegExp = /\[\$ .+? \]/; diff --git a/src/block/node/GoogleMapNode.ts b/src/block/node/GoogleMapNode.ts index 1fac776e..c21b86a2 100644 --- a/src/block/node/GoogleMapNode.ts +++ b/src/block/node/GoogleMapNode.ts @@ -1,8 +1,7 @@ -import { createPlainNode } from "./PlainNode.ts"; -import { createNodeParser } from "./creator.ts"; - import type { NodeCreator } from "./creator.ts"; +import { createNodeParser } from "./creator.ts"; import type { NodeParser } from "./index.ts"; +import { createPlainNode } from "./PlainNode.ts"; import type { GoogleMapNode, PlainNode } from "./type.ts"; const placeFirstGoogleMapRegExp = diff --git a/src/block/node/HashTagNode.ts b/src/block/node/HashTagNode.ts index 2016bd89..3db4b9a2 100644 --- a/src/block/node/HashTagNode.ts +++ b/src/block/node/HashTagNode.ts @@ -1,8 +1,7 @@ -import { createPlainNode } from "./PlainNode.ts"; -import { createNodeParser } from "./creator.ts"; - import type { NodeCreator } from "./creator.ts"; +import { createNodeParser } from "./creator.ts"; import type { NodeParser } from "./index.ts"; +import { createPlainNode } from "./PlainNode.ts"; import type { HashTagNode, PlainNode } from "./type.ts"; const hashTagRegExp = /(?:^|\s)#\S+/; diff --git a/src/block/node/HelpfeelNode.ts b/src/block/node/HelpfeelNode.ts index 6a2ac418..f4a3282f 100644 --- a/src/block/node/HelpfeelNode.ts +++ b/src/block/node/HelpfeelNode.ts @@ -1,8 +1,7 @@ -import { createPlainNode } from "./PlainNode.ts"; -import { createNodeParser } from "./creator.ts"; - import type { NodeCreator } from "./creator.ts"; +import { createNodeParser } from "./creator.ts"; import type { NodeParser } from "./index.ts"; +import { createPlainNode } from "./PlainNode.ts"; import type { HelpfeelNode, PlainNode } from "./type.ts"; const helpfeelRegExp = /^\? .+$/; diff --git a/src/block/node/IconNode.ts b/src/block/node/IconNode.ts index cf8fe3fb..0a0c140f 100644 --- a/src/block/node/IconNode.ts +++ b/src/block/node/IconNode.ts @@ -1,5 +1,5 @@ -import { createNodeParser } from "./creator.ts"; import type { NodeCreator } from "./creator.ts"; +import { createNodeParser } from "./creator.ts"; import type { NodeParser } from "./index.ts"; import type { IconNode } from "./type.ts"; diff --git a/src/block/node/ImageNode.ts b/src/block/node/ImageNode.ts index 0a101958..7a625561 100644 --- a/src/block/node/ImageNode.ts +++ b/src/block/node/ImageNode.ts @@ -1,8 +1,7 @@ -import { createPlainNode } from "./PlainNode.ts"; -import { createNodeParser } from "./creator.ts"; - import type { NodeCreator } from "./creator.ts"; +import { createNodeParser } from "./creator.ts"; import type { NodeParser } from "./index.ts"; +import { createPlainNode } from "./PlainNode.ts"; import type { ImageNode, PlainNode } from "./type.ts"; const srcFirstStrongImageRegExp = diff --git a/src/block/node/InternalLinkNode.ts b/src/block/node/InternalLinkNode.ts index 096e8d85..6fc24e35 100644 --- a/src/block/node/InternalLinkNode.ts +++ b/src/block/node/InternalLinkNode.ts @@ -1,6 +1,5 @@ -import { createNodeParser } from "./creator.ts"; - import type { NodeCreator } from "./creator.ts"; +import { createNodeParser } from "./creator.ts"; import type { NodeParser } from "./index.ts"; import type { LinkNode } from "./type.ts"; diff --git a/src/block/node/NumberListNode.ts b/src/block/node/NumberListNode.ts index f59c5e75..b859ac43 100644 --- a/src/block/node/NumberListNode.ts +++ b/src/block/node/NumberListNode.ts @@ -1,8 +1,7 @@ -import { createPlainNode } from "./PlainNode.ts"; -import { createNodeParser } from "./creator.ts"; -import { type NodeParser, convertToNodes } from "./index.ts"; - import type { NodeCreator } from "./creator.ts"; +import { createNodeParser } from "./creator.ts"; +import { convertToNodes, type NodeParser } from "./index.ts"; +import { createPlainNode } from "./PlainNode.ts"; import type { NumberListNode, PlainNode } from "./type.ts"; const numberListRegExp = /^[0-9]+\. .*$/; diff --git a/src/block/node/PlainNode.ts b/src/block/node/PlainNode.ts index 05a79942..53f1d536 100644 --- a/src/block/node/PlainNode.ts +++ b/src/block/node/PlainNode.ts @@ -1,6 +1,5 @@ -import { createNodeParser } from "./creator.ts"; - import type { NodeCreator } from "./creator.ts"; +import { createNodeParser } from "./creator.ts"; import type { NodeParser } from "./index.ts"; import type { PlainNode } from "./type.ts"; diff --git a/src/block/node/QuoteNode.ts b/src/block/node/QuoteNode.ts index e05356ef..8fa2de8c 100644 --- a/src/block/node/QuoteNode.ts +++ b/src/block/node/QuoteNode.ts @@ -1,8 +1,7 @@ -import { createPlainNode } from "./PlainNode.ts"; -import { createNodeParser } from "./creator.ts"; -import { type NodeParser, convertToNodes } from "./index.ts"; - import type { NodeCreator } from "./creator.ts"; +import { createNodeParser } from "./creator.ts"; +import { convertToNodes, type NodeParser } from "./index.ts"; +import { createPlainNode } from "./PlainNode.ts"; import type { PlainNode, QuoteNode } from "./type.ts"; const quoteRegExp = /^>.*$/; diff --git a/src/block/node/StrongIconNode.ts b/src/block/node/StrongIconNode.ts index a9ff67c9..f4efdd5a 100644 --- a/src/block/node/StrongIconNode.ts +++ b/src/block/node/StrongIconNode.ts @@ -1,6 +1,6 @@ -import { createPlainNode } from "./PlainNode.ts"; -import { type NodeCreator, createNodeParser } from "./creator.ts"; +import { createNodeParser, type NodeCreator } from "./creator.ts"; import type { NodeParser } from "./index.ts"; +import { createPlainNode } from "./PlainNode.ts"; import type { PlainNode, StrongIconNode } from "./type.ts"; const strongIconRegExp = /\[\[[^[\]]*\.icon(?:\*\d+)?\]\]/; diff --git a/src/block/node/StrongImageNode.ts b/src/block/node/StrongImageNode.ts index a41b8589..34600314 100644 --- a/src/block/node/StrongImageNode.ts +++ b/src/block/node/StrongImageNode.ts @@ -1,8 +1,7 @@ -import { createPlainNode } from "./PlainNode.ts"; -import { createNodeParser } from "./creator.ts"; - import type { NodeCreator } from "./creator.ts"; +import { createNodeParser } from "./creator.ts"; import type { NodeParser } from "./index.ts"; +import { createPlainNode } from "./PlainNode.ts"; import type { PlainNode, StrongImageNode } from "./type.ts"; const strongImageRegExp = diff --git a/src/block/node/StrongNode.ts b/src/block/node/StrongNode.ts index dca80f24..11ae69f2 100644 --- a/src/block/node/StrongNode.ts +++ b/src/block/node/StrongNode.ts @@ -1,9 +1,8 @@ -import { createPlainNode } from "./PlainNode.ts"; -import { createNodeParser } from "./creator.ts"; -import { convertToNodes } from "./index.ts"; - import type { NodeCreator } from "./creator.ts"; +import { createNodeParser } from "./creator.ts"; import type { NodeParser } from "./index.ts"; +import { convertToNodes } from "./index.ts"; +import { createPlainNode } from "./PlainNode.ts"; import type { PlainNode, StrongNode } from "./type.ts"; const strongRegExp = /\[\[(?:[^[]|\[[^[]).*?\]*\]\]/; diff --git a/src/block/node/creator.ts b/src/block/node/creator.ts index 24fa759c..e18c5b4e 100644 --- a/src/block/node/creator.ts +++ b/src/block/node/creator.ts @@ -1,6 +1,5 @@ -import { convertToNodes } from "./index.ts"; - import type { NodeParser, NodeParserOption } from "./index.ts"; +import { convertToNodes } from "./index.ts"; import type { Node } from "./type.ts"; export type NodeCreator = ( diff --git a/src/index.ts b/src/index.ts index f8a1b96b..173f85cf 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,27 +1,27 @@ -export { parse, getTitle } from "./parse.ts"; -export type { ParserOption, Page } from "./parse.ts"; -export type { Block } from "./block/index.ts"; -export type { Title } from "./block/Title.ts"; export type { CodeBlock } from "./block/CodeBlock.ts"; -export type { Table } from "./block/Table.ts"; +export type { Block } from "./block/index.ts"; export type { Line } from "./block/Line.ts"; +export type { Decoration } from "./block/node/DecorationNode.ts"; export type { - Node, - QuoteNode, - HelpfeelNode, - StrongImageNode, - StrongIconNode, - StrongNode, - FormulaNode, - DecorationNode, + BlankNode, CodeNode, CommandLineNode, - BlankNode, - ImageNode, - LinkNode, + DecorationNode, + FormulaNode, GoogleMapNode, - IconNode, HashTagNode, + HelpfeelNode, + IconNode, + ImageNode, + LinkNode, + Node, PlainNode, + QuoteNode, + StrongIconNode, + StrongImageNode, + StrongNode, } from "./block/node/type.ts"; -export type { Decoration } from "./block/node/DecorationNode.ts"; +export type { Table } from "./block/Table.ts"; +export type { Title } from "./block/Title.ts"; +export type { Page, ParserOption } from "./parse.ts"; +export { getTitle, parse } from "./parse.ts"; diff --git a/src/parse.ts b/src/parse.ts index 8a1c231f..f57c8f18 100644 --- a/src/parse.ts +++ b/src/parse.ts @@ -1,8 +1,7 @@ +import type { Block } from "./block/index.ts"; +import { convertToBlock } from "./block/index.ts"; import { packRows } from "./block/Pack.ts"; import { parseToRows } from "./block/Row.ts"; -import { convertToBlock } from "./block/index.ts"; - -import type { Block } from "./block/index.ts"; /** * parser option type diff --git a/vite.config.ts b/vite.config.ts index d5428709..12020a4a 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -1,5 +1,5 @@ import { resolve } from "node:path"; -import { type LibraryFormats, defineConfig } from "vite"; +import { defineConfig, type LibraryFormats } from "vite"; const formats = ["es", "cjs", "umd"] satisfies LibraryFormats[];