pass result of RegExp.prototype.exec to NodeCreator

progfay · progfay · commit cbec1f3d9056 · 2025-11-23T19:12:02.000+09:00
diff --git a/src/block/node/BlankNode.ts b/src/block/node/BlankNode.ts
@@ -6,9 +6,9 @@ import type { BlankNode, PlainNode } from "./type.ts";
 
 const blankRegExp = /\[\s+\]/;
 
-const createBlankNode: NodeCreator<BlankNode | PlainNode> = (raw, opts) =>
+const createBlankNode: NodeCreator<BlankNode | PlainNode> = ([raw], opts) =>
 	opts.context === "table"
-		? createPlainNode(raw, opts)
+		? createPlainNode(raw)
 		: [
 				{
 					type: "blank",
diff --git a/src/block/node/CodeNode.ts b/src/block/node/CodeNode.ts
@@ -6,9 +6,9 @@ import type { CodeNode, PlainNode } from "./type.ts";
 
 const codeRegExp = /`.*?`/;
 
-const createCodeNode: NodeCreator<CodeNode | PlainNode> = (raw, opts) =>
+const createCodeNode: NodeCreator<CodeNode | PlainNode> = ([raw], opts) =>
 	opts.context === "table"
-		? createPlainNode(raw, opts)
+		? createPlainNode(raw)
 		: [
 				{
 					type: "code",
diff --git a/src/block/node/CommandLineNode.ts b/src/block/node/CommandLineNode.ts
@@ -7,11 +7,11 @@ import type { CommandLineNode, PlainNode } from "./type.ts";
 const commandLineRegExp = /^[$%] .+$/;
 
 const createCommandLineNode: NodeCreator<CommandLineNode | PlainNode> = (
-	raw: string,
+	[raw],
 	opts,
 ) => {
 	if (opts.context === "table") {
-		return createPlainNode(raw, opts);
+		return createPlainNode(raw);
 	}
 
 	const symbol = raw[0] ?? "";
diff --git a/src/block/node/DecorationNode.ts b/src/block/node/DecorationNode.ts
@@ -48,11 +48,11 @@ type AsteriskDecorationChar =
 export type Decoration = Exclude<DecorationChar, "*"> | AsteriskDecorationChar;
 
 const createDecorationNode: NodeCreator<DecorationNode | PlainNode> = (
-	raw,
+	[raw],
 	opts,
 ) => {
 	if (opts.context === "table") {
-		return createPlainNode(raw, opts);
+		return createPlainNode(raw);
 	}
 
 	const separatorIndex = raw.indexOf(" ");
diff --git a/src/block/node/ExternalLinkNode.ts b/src/block/node/ExternalLinkNode.ts
@@ -10,11 +10,11 @@ const bracketedUrlRegExp = /\[https?:\/\/[^\s\]]+\]/;
 const httpRegExp = /https?:\/\/[^\s]+/;
 
 const createExternalLinkNode: NodeCreator<LinkNode | PlainNode> = (
-	raw,
+	[raw],
 	opts,
 ) => {
 	if (opts.context === "table") {
-		return createPlainNode(raw, opts);
+		return createPlainNode(raw);
 	}
 
 	const inner =
diff --git a/src/block/node/FormulaNode.ts b/src/block/node/FormulaNode.ts
@@ -7,9 +7,12 @@ import type { FormulaNode, PlainNode } from "./type.ts";
 const formulaWithTailHalfSpaceRegExp = /\[\$ .+? \]/;
 const formulaRegExp = /\[\$ [^\]]+\]/;
 
-const createFormulaNode: NodeCreator<FormulaNode | PlainNode> = (raw, opts) =>
+const createFormulaNode: NodeCreator<FormulaNode | PlainNode> = (
+	[raw],
+	opts,
+) =>
 	opts.context === "table"
-		? createPlainNode(raw, opts)
+		? createPlainNode(raw)
 		: [
 				{
 					type: "formula",
diff --git a/src/block/node/GoogleMapNode.ts b/src/block/node/GoogleMapNode.ts
@@ -24,18 +24,13 @@ const parseCoordinate: (format: string) => Coordinate = (format) => {
 };
 
 const createGoogleMapNode: NodeCreator<GoogleMapNode | PlainNode> = (
-	raw,
+	match,
 	opts,
 ) => {
+	const raw = match[0];
 	if (opts.context === "table") {
-		return createPlainNode(raw, opts);
+		return createPlainNode(raw);
 	}
-
-	const match =
-		raw.match(placeFirstGoogleMapRegExp) ??
-		raw.match(coordFirstGoogleMapRegExp);
-	if (match === null) return [];
-
 	const isCoordFirst = raw.startsWith("[N") || raw.startsWith("[S");
 	const [, coord = "", place = ""] = isCoordFirst
 		? match
diff --git a/src/block/node/HashTagNode.ts b/src/block/node/HashTagNode.ts
@@ -6,9 +6,12 @@ import type { HashTagNode, PlainNode } from "./type.ts";
 
 const hashTagRegExp = /(?:^|\s)#\S+/;
 
-const createHashTagNode: NodeCreator<HashTagNode | PlainNode> = (raw, opts) => {
+const createHashTagNode: NodeCreator<HashTagNode | PlainNode> = (
+	[raw],
+	opts,
+) => {
 	if (opts.context === "table") {
-		return createPlainNode(raw, opts);
+		return createPlainNode(raw);
 	}
 
 	if (raw.startsWith("#")) {
@@ -25,7 +28,7 @@ const createHashTagNode: NodeCreator<HashTagNode | PlainNode> = (raw, opts) => {
 	const tag = raw.substring(1);
 
 	return [
-		...createPlainNode(space, opts),
+		...createPlainNode(space),
 		{
 			type: "hashTag",
 			raw: tag,
diff --git a/src/block/node/HelpfeelNode.ts b/src/block/node/HelpfeelNode.ts
@@ -7,11 +7,11 @@ import type { HelpfeelNode, PlainNode } from "./type.ts";
 const helpfeelRegExp = /^\? .+$/;
 
 const createHelpfeelNode: NodeCreator<HelpfeelNode | PlainNode> = (
-	raw,
+	[raw],
 	opts,
 ) =>
 	opts.context === "table"
-		? createPlainNode(raw, opts)
+		? createPlainNode(raw)
 		: [
 				{
 					type: "helpfeel",
diff --git a/src/block/node/IconNode.ts b/src/block/node/IconNode.ts
@@ -5,7 +5,7 @@ import type { IconNode } from "./type.ts";
 
 const iconRegExp = /\[[^[\]]*\.icon(?:\*[1-9]\d*)?\]/;
 
-const createIconNode: NodeCreator<IconNode> = (raw) => {
+const createIconNode: NodeCreator<IconNode> = ([raw]) => {
 	const target = raw.substring(1, raw.length - 1);
 	const index = target.lastIndexOf(".icon");
 	const path = target.substring(0, index);
diff --git a/src/block/node/ImageNode.ts b/src/block/node/ImageNode.ts
@@ -20,9 +20,9 @@ const isImageUrl = (text: string): boolean =>
 const isGyazoImageUrl = (text: string): boolean =>
 	/^https?:\/\/([0-9a-z-]\.)?gyazo\.com\/[0-9a-f]{32}(\/raw)?$/.test(text);
 
-const createImageNode: NodeCreator<ImageNode | PlainNode> = (raw, opts) => {
+const createImageNode: NodeCreator<ImageNode | PlainNode> = ([raw], opts) => {
 	if (opts.context === "table") {
-		return createPlainNode(raw, opts);
+		return createPlainNode(raw);
 	}
 
 	const index = raw.search(/\s/);
diff --git a/src/block/node/InternalLinkNode.ts b/src/block/node/InternalLinkNode.ts
@@ -5,7 +5,7 @@ import type { LinkNode } from "./type.ts";
 
 const internalLinkRegExp = /\[\/?[^[\]]+\]/;
 
-const createInternalLinkNode: NodeCreator<LinkNode> = (raw) => {
+const createInternalLinkNode: NodeCreator<LinkNode> = ([raw]) => {
 	const href = raw.substring(1, raw.length - 1);
 	return [
 		{
diff --git a/src/block/node/NumberListNode.ts b/src/block/node/NumberListNode.ts
@@ -7,11 +7,11 @@ import type { NumberListNode, PlainNode } from "./type.ts";
 const numberListRegExp = /^[0-9]+\. .*$/;
 
 const createNumberListNode: NodeCreator<NumberListNode | PlainNode> = (
-	raw,
+	[raw],
 	opts,
 ) => {
 	if (opts.context === "table") {
-		return createPlainNode(raw, opts);
+		return createPlainNode(raw);
 	}
 
 	const separatorIndex = raw.indexOf(" ");
diff --git a/src/block/node/PlainNode.ts b/src/block/node/PlainNode.ts
@@ -1,8 +1,7 @@
-import type { NodeCreator } from "./creator.ts";
 import type { TerminateNodeParser } from "./index.ts";
 import type { PlainNode } from "./type.ts";
 
-export const createPlainNode: NodeCreator<PlainNode> = (raw) => [
+export const createPlainNode = (raw: string): [PlainNode] => [
 	{
 		type: "plain",
 		raw,
diff --git a/src/block/node/QuoteNode.ts b/src/block/node/QuoteNode.ts
@@ -6,9 +6,9 @@ import type { PlainNode, QuoteNode } from "./type.ts";
 
 const quoteRegExp = /^>.*$/;
 
-const createQuoteNode: NodeCreator<QuoteNode | PlainNode> = (raw, opts) =>
+const createQuoteNode: NodeCreator<QuoteNode | PlainNode> = ([raw], opts) =>
 	opts.context === "table"
-		? createPlainNode(raw, opts)
+		? createPlainNode(raw)
 		: [
 				{
 					type: "quote",
diff --git a/src/block/node/StrongIconNode.ts b/src/block/node/StrongIconNode.ts
@@ -6,10 +6,10 @@ import type { PlainNode, StrongIconNode } from "./type.ts";
 const strongIconRegExp = /\[\[[^[\]]*\.icon(?:\*\d+)?\]\]/;
 
 const createStrongIconNode: NodeCreator<StrongIconNode | PlainNode> = (
-	raw,
+	[raw],
 	opts,
 ) => {
-	if (opts.context === "table") return createPlainNode(raw, opts);
+	if (opts.context === "table") return createPlainNode(raw);
 
 	const target = raw.substring(2, raw.length - 2);
 	const index = target.lastIndexOf(".icon");
diff --git a/src/block/node/StrongImageNode.ts b/src/block/node/StrongImageNode.ts
@@ -10,11 +10,11 @@ const strongGyazoImageRegExp =
 	/\[\[https?:\/\/(?:[0-9a-z-]+\.)?gyazo\.com\/[0-9a-f]{32}\]\]/;
 
 const createStrongImageNode: NodeCreator<StrongImageNode | PlainNode> = (
-	raw,
+	[raw],
 	opts,
 ) => {
 	if (opts.context === "table") {
-		return createPlainNode(raw, opts);
+		return createPlainNode(raw);
 	}
 
 	const src = raw.substring(2, raw.length - 2);
diff --git a/src/block/node/StrongNode.ts b/src/block/node/StrongNode.ts
@@ -7,9 +7,9 @@ import type { PlainNode, StrongNode } from "./type.ts";
 
 const strongRegExp = /\[\[(?:[^[]|\[[^[]).*?\]*\]\]/;
 
-const createStrongNode: NodeCreator<StrongNode | PlainNode> = (raw, opts) =>
+const createStrongNode: NodeCreator<StrongNode | PlainNode> = ([raw], opts) =>
 	opts.context === "table"
-		? createPlainNode(raw, opts)
+		? createPlainNode(raw)
 		: [
 				{
 					type: "strong",
diff --git a/src/block/node/creator.ts b/src/block/node/creator.ts
@@ -3,7 +3,7 @@ import { convertToNodes } from "./index.ts";
 import type { Node } from "./type.ts";
 
 export type NodeCreator<T extends Node> = (
-	target: string,
+	match: RegExpExecArray,
 	opts: NodeParserOption,
 ) => T[];
 
@@ -33,7 +33,7 @@ export const createNodeParser: NodeParserCreator<Node> = (
 			const left = text.substring(0, match.index);
 			const right = text.substring(match.index + match[0].length);
 
-			const node = nodeCreator(match[0], opts);
+			const node = nodeCreator(match, opts);
 			return [
 				...convertToNodes(left, opts),
 				...node,
