From e4ad025d99b47fd20347adc247ff1af2510506a9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 17 Jun 2025 14:41:41 +0000 Subject: [PATCH 1/3] chore(deps): update dependency @biomejs/biome to v2 --- package-lock.json | 73 +++++++++++++++++++++++------------------------ package.json | 2 +- 2 files changed, 37 insertions(+), 38 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8ab9564e..f677cfdc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "10.0.0", "license": "MIT", "devDependencies": { - "@biomejs/biome": "1.9.4", + "@biomejs/biome": "2.0.0", "@types/node": "22.15.32", "tsdown": "0.12.8", "typescript": "5.8.3" @@ -83,11 +83,10 @@ } }, "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", + "resolved": "https://registry.npmjs.org/@biomejs/biome/-/biome-2.0.0.tgz", + "integrity": "sha512-BlUoXEOI/UQTDEj/pVfnkMo8SrZw3oOWBDrXYFT43V7HTkIUDkBRY53IC5Jx1QkZbaB+0ai1wJIfYwp9+qaJTQ==", "dev": true, - "hasInstallScript": true, "license": "MIT OR Apache-2.0", "bin": { "biome": "bin/biome" @@ -100,20 +99,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", + "@biomejs/cli-darwin-x64": "2.0.0", + "@biomejs/cli-linux-arm64": "2.0.0", + "@biomejs/cli-linux-arm64-musl": "2.0.0", + "@biomejs/cli-linux-x64": "2.0.0", + "@biomejs/cli-linux-x64-musl": "2.0.0", + "@biomejs/cli-win32-arm64": "2.0.0", + "@biomejs/cli-win32-x64": "2.0.0" } }, "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", + "resolved": "https://registry.npmjs.org/@biomejs/cli-darwin-arm64/-/cli-darwin-arm64-2.0.0.tgz", + "integrity": "sha512-QvqWYtFFhhxdf8jMAdJzXW+Frc7X8XsnHQLY+TBM1fnT1TfeV/v9vsFI5L2J7GH6qN1+QEEJ19jHibCY2Ypplw==", "cpu": [ "arm64" ], @@ -128,9 +127,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", + "resolved": "https://registry.npmjs.org/@biomejs/cli-darwin-x64/-/cli-darwin-x64-2.0.0.tgz", + "integrity": "sha512-5JFhls1EfmuIH4QGFPlNpxJQFC6ic3X1ltcoLN+eSRRIPr6H/lUS1ttuD0Fj7rPgPhZqopK/jfH8UVj/1hIsQw==", "cpu": [ "x64" ], @@ -145,9 +144,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", + "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-arm64/-/cli-linux-arm64-2.0.0.tgz", + "integrity": "sha512-BAH4QVi06TzAbVchXdJPsL0Z/P87jOfes15rI+p3EX9/EGTfIjaQ9lBVlHunxcmoptaA5y1Hdb9UYojIhmnjIw==", "cpu": [ "arm64" ], @@ -162,9 +161,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", + "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-arm64-musl/-/cli-linux-arm64-musl-2.0.0.tgz", + "integrity": "sha512-Bxsz8ki8+b3PytMnS5SgrGV+mbAWwIxI3ydChb/d1rURlJTMdxTTq5LTebUnlsUWAX6OvJuFeiVq9Gjn1YbCyA==", "cpu": [ "arm64" ], @@ -179,9 +178,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", + "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-x64/-/cli-linux-x64-2.0.0.tgz", + "integrity": "sha512-09PcOGYTtkopWRm6mZ/B6Mr6UHdkniUgIG/jLBv+2J8Z61ezRE+xQmpi3yNgUrFIAU4lPA9atg7mhvE/5Bo7Wg==", "cpu": [ "x64" ], @@ -196,9 +195,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", + "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-x64-musl/-/cli-linux-x64-musl-2.0.0.tgz", + "integrity": "sha512-tiQ0ABxMJb9I6GlfNp0ulrTiQSFacJRJO8245FFwE3ty3bfsfxlU/miblzDIi+qNrgGsLq5wIZcVYGp4c+HXZA==", "cpu": [ "x64" ], @@ -213,9 +212,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", + "resolved": "https://registry.npmjs.org/@biomejs/cli-win32-arm64/-/cli-win32-arm64-2.0.0.tgz", + "integrity": "sha512-vrTtuGu91xNTEQ5ZcMJBZuDlqr32DWU1r14UfePIGndF//s2WUAmer4FmgoPgruo76rprk37e8S2A2c0psXdxw==", "cpu": [ "arm64" ], @@ -230,9 +229,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", + "resolved": "https://registry.npmjs.org/@biomejs/cli-win32-x64/-/cli-win32-x64-2.0.0.tgz", + "integrity": "sha512-2USVQ0hklNsph/KIR72ZdeptyXNnQ3JdzPn3NbjI4Sna34CnxeiYAaZcZzXPDl5PYNFBivV4xmvT3Z3rTmyDBg==", "cpu": [ "x64" ], diff --git a/package.json b/package.json index 1e06b349..16ccf346 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ }, "homepage": "https://github.com/progfay/scrapbox-parser#readme", "devDependencies": { - "@biomejs/biome": "1.9.4", + "@biomejs/biome": "2.0.0", "@types/node": "22.15.32", "tsdown": "0.12.8", "typescript": "5.8.3" From 17bc69009124c281c25bfd4f4bfa25b33f776cc1 Mon Sep 17 00:00:00 2001 From: progfay <19568747+progfay@users.noreply.github.com> Date: Thu, 19 Jun 2025 16:05:35 +0900 Subject: [PATCH 2/3] `npx @biomejs/biome migrate --write` --- biome.json | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/biome.json b/biome.json index bc5fca02..c373af88 100644 --- a/biome.json +++ b/biome.json @@ -1,14 +1,26 @@ { "$schema": "./node_modules/@biomejs/biome/configuration_schema.json", - "organizeImports": { "enabled": true }, + "assist": { "actions": { "source": { "organizeImports": "on" } } }, "files": { - "ignore": ["./dist", "./coverage"] + "includes": ["**", "!dist", "!coverage"] }, "linter": { "enabled": true, "rules": { "correctness": { "useImportExtensions": "error" + }, + "style": { + "noParameterAssign": "error", + "useAsConstAssertion": "error", + "useDefaultParameterLast": "error", + "useEnumInitializers": "error", + "useSelfClosingElements": "error", + "useSingleVarDeclarator": "error", + "noUnusedTemplateLiteral": "error", + "useNumberNamespace": "error", + "noInferrableTypes": "error", + "noUselessElse": "error" } } }, From e9a1e4ef3a3c67ab000402734783bf63712b4360 Mon Sep 17 00:00:00 2001 From: progfay <19568747+progfay@users.noreply.github.com> Date: Thu, 19 Jun 2025 16:05:51 +0900 Subject: [PATCH 3/3] `npm run format` --- package.json | 9 ++++++-- src/block/Line.ts | 3 +-- src/block/Table.ts | 3 +-- src/block/index.ts | 9 ++++---- src/block/node/BlankNode.ts | 5 ++--- src/block/node/CodeNode.ts | 5 ++--- src/block/node/CommandLineNode.ts | 5 ++--- src/block/node/DecorationNode.ts | 7 +++--- src/block/node/ExternalLinkNode.ts | 5 ++--- src/block/node/FormulaNode.ts | 5 ++--- src/block/node/GoogleMapNode.ts | 5 ++--- src/block/node/HashTagNode.ts | 5 ++--- src/block/node/HelpfeelNode.ts | 5 ++--- src/block/node/IconNode.ts | 2 +- src/block/node/ImageNode.ts | 5 ++--- src/block/node/InternalLinkNode.ts | 3 +-- src/block/node/NumberListNode.ts | 7 +++--- src/block/node/PlainNode.ts | 3 +-- src/block/node/QuoteNode.ts | 7 +++--- src/block/node/StrongIconNode.ts | 4 ++-- src/block/node/StrongImageNode.ts | 5 ++--- src/block/node/StrongNode.ts | 7 +++--- src/block/node/creator.ts | 3 +-- src/index.ts | 36 +++++++++++++++--------------- src/parse.ts | 5 ++--- 25 files changed, 71 insertions(+), 87 deletions(-) diff --git a/package.json b/package.json index 16ccf346..f4052f95 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,9 @@ "version": "10.0.0", "type": "module", "description": "parse Scrapbox notation to JavaScript Object", - "files": ["dist"], + "files": [ + "dist" + ], "types": "./dist/index.d.ts", "exports": { ".": "./dist/index.js", @@ -31,7 +33,10 @@ "type": "git", "url": "git+https://github.com/progfay/scrapbox-parser.git" }, - "keywords": ["scrapbox", "parser"], + "keywords": [ + "scrapbox", + "parser" + ], "author": "progfay", "license": "MIT", "bugs": { 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