wikiparser-node 0.2.3 → 0.3.1

package/src/gallery.js

@@ -1,30 +1,78 @@
 'use strict';
 
-const /** @type {Parser} */ Parser = require('..'),
+const {text} = require('../util/string'),
+	/** @type {Parser} */ Parser = require('..'),
 	Token = require('.'),
-	FileToken = require('./link/file');
+	GalleryImageToken = require('./link/galleryImage');
 
 /**
- * 扩展标签
- * @classdesc `{childNodes: [...FileToken]}`
+ * gallery标签
+ * @classdesc `{childNodes: (string|FileToken)[]]}`
  */
 class GalleryToken extends Token {
 	type = 'ext-inner';
 	name = 'gallery';
 
-	/** @param {accum} accum */
-	constructor(wikitext = '', config = Parser.getConfig(), accum = []) {
-		super(undefined, config, true, accum, {FileToken: ':'});
-		for (const line of wikitext.split('\n')) {
-			const [link, ...text] = line.split('|'),
-				title = Parser.normalizeTitle(link, 6, false, config);
-			this.appendChild(new FileToken(link, text.length ? text.join('|') : undefined, title, config, accum));
+	/**
+	 * @param {string} inner
+	 * @param {accum} accum
+	 */
+	constructor(inner, config = Parser.getConfig(), accum = []) {
+		super(undefined, config, true, accum, {String: ':', GalleryImageToken: ':'});
+		for (const line of inner?.split('\n') ?? []) {
+			const matches = /^([^|]+)(?:\|(.*))?/.exec(line);
+			if (!matches) {
+				this.appendChild(line);
+				continue;
+			}
+			const [, file, alt] = matches;
+			let title;
+			try {
+				title = this.normalizeTitle(decodeURIComponent(file), 6, true);
+			} catch {
+				title = this.normalizeTitle(file, 6, true);
+			}
+			if (!title.valid) {
+				this.appendChild(line);
+			} else {
+				this.appendChild(new GalleryImageToken(file, alt, title, config, accum));
+			}
 		}
 	}
 
+	cloneNode() {
+		const cloned = this.cloneChildren(),
+			token = Parser.run(() => new GalleryToken(undefined, this.getAttribute('config')));
+		token.append(...cloned);
+		return token;
+	}
+
 	toString() {
 		return super.toString('\n');
 	}
+
+	getGaps() {
+		return 1;
+	}
+
+	text() {
+		return text(this.children, '\n');
+	}
+
+	/** @param {string} file */
+	insertImage(file, i = this.childNodes.length) {
+		let title;
+		try {
+			title = this.normalizeTitle(decodeURIComponent(file), 6, true);
+		} catch {
+			title = this.normalizeTitle(file, 6, true);
+		}
+		if (!title.valid) {
+			throw new SyntaxError(`非法的文件名：${file}`);
+		}
+		const token = Parser.run(() => new GalleryImageToken(file, undefined, title, this.getAttribute('config')));
+		return this.insertAt(token, i);
+	}
 }
 
 Parser.classes.GalleryToken = __filename;

package/src/heading.js

@@ -7,7 +7,7 @@ const fixedToken = require('../mixin/fixedToken'),
 
 /**
  * 章节标题
- * @classdesc `{childNodes: [Token, HiddenToken]}`
+ * @classdesc `{childNodes: [Token, SyntaxToken]}`
  */
 class HeadingToken extends fixedToken(sol(Token)) {
 	type = 'heading';

package/src/imageParameter.js

@@ -22,7 +22,7 @@ class ImageParameterToken extends Token {
 	 * @returns {T extends 'link' ? string|Symbol : boolean}
 	 */
 	static #validate(key, value, config = Parser.getConfig()) {
-		value = value.replace(/\x00\d+t\x7f/g, '').trim();
+		value = value.replace(/\0\d+t\x7f/g, '').trim();
 		if (key === 'width') {
 			return /^\d*(?:x\d*)?$/.test(value);
 		} else if (['alt', 'class', 'manualthumb', 'frameless', 'framed', 'thumbnail'].includes(key)) {
@@ -31,11 +31,11 @@ class ImageParameterToken extends Token {
 			if (!value) {
 				return this.#noLink;
 			}
-			const regex = new RegExp(`(?:${config.protocol}|//)${extUrlChar}(?=\x00\\d+t\x7f|$)`, 'ui');
+			const regex = RegExp(`(?:${config.protocol}|//)${extUrlChar}(?=\0\\d+t\x7f|$)`, 'iu');
 			if (regex.test(value)) {
 				return value;
 			}
-			if (/^\[\[.+]]$/.test(value)) {
+			if (/^\[\[.+\]\]$/.test(value)) {
 				value = value.slice(2, -2);
 			}
 			if (value.includes('%')) {
@@ -106,11 +106,11 @@ class ImageParameterToken extends Token {
 	constructor(str, config = Parser.getConfig(), accum = []) {
 		const regexes = Object.entries(config.img).map(
 				/** @returns {[string, string, RegExp]} */
-				([syntax, param]) => [syntax, param, new RegExp(`^(\\s*)${syntax.replace('$1', '(.*)')}(\\s*)$`)],
+				([syntax, param]) => [syntax, param, RegExp(`^(\\s*)${syntax.replace('$1', '(.*)')}(\\s*)$`)],
 			),
 			param = regexes.find(([,, regex]) => regex.test(str));
 		if (param) {
-			const mt = str.match(param[2]);
+			const mt = param[2].exec(str);
 			if (mt.length === 4 && !ImageParameterToken.#validate(param[1], mt[2], config)) {
 				// pass
 			} else {

package/src/index.js

@@ -3,7 +3,7 @@
 /*
  * PHP解析器的步骤：
  * -1. 替换签名和`{{subst:}}`，参见Parser::preSaveTransform；这在revision中不可能保留，可以跳过
- * 0. 移除特定字符`\x00`和`\x7f`，参见Parser::parse
+ * 0. 移除特定字符`\0`和`\x7f`，参见Parser::parse
  * 1. 注释/扩展标签（'<'相关），参见Preprocessor_Hash::buildDomTreeArrayFromText和Sanitizer::decodeTagAttributes
  * 2. 模板/模板变量/标题，注意rightmost法则，以及`-{`和`[[`可以破坏`{{`或`{{{`语法，
  *    参见Preprocessor_Hash::buildDomTreeArrayFromText
@@ -19,7 +19,7 @@
  */
 
 /*
- * \x00\d+.\x7f标记Token：
+ * \0\d+.\x7f标记Token：
  * e: ExtToken
  * c: CommentToken、NoIncludeToken和IncludeToken
  * !: `{{!}}`专用
@@ -52,7 +52,7 @@ class Token extends AstElement {
 	type = 'root';
 	/** 解析阶段，参见顶部注释。只对plain Token有意义。 */ #stage = 0;
 	#config;
-	/** 这个数组起两个作用：1. 数组中的Token会在build时替换`/\x00\d+.\x7f/`标记；2. 数组中的Token会依次执行parseOnce和build方法。 */
+	/** 这个数组起两个作用：1. 数组中的Token会在build时替换`/\0\d+.\x7f/`标记；2. 数组中的Token会依次执行parseOnce和build方法。 */
 	#accum;
 	/** @type {Record<string, Ranges>} */ #acceptable;
 	#protectedChildren = new Ranges();
@@ -66,7 +66,7 @@ class Token extends AstElement {
 	constructor(wikitext, config = Parser.getConfig(), halfParsed = false, accum = [], acceptable = null) {
 		super();
 		if (typeof wikitext === 'string') {
-			this.appendChild(halfParsed ? wikitext : wikitext.replace(/[\x00\x7f]/g, ''));
+			this.appendChild(halfParsed ? wikitext : wikitext.replace(/[\0\x7f]/g, ''));
 		}
 		this.#config = config;
 		this.#accum = accum;
@@ -474,7 +474,7 @@ class Token extends AstElement {
 		if (!Parser.debugging && externalUse('buildFromStr')) {
 			this.debugOnly('buildFromStr');
 		}
-		return str.split(/[\x00\x7f]/).map((s, i) => {
+		return str.split(/[\0\x7f]/).map((s, i) => {
 			if (i % 2 === 0) {
 				return s;
 			} else if (!isNaN(s.at(-1))) {
@@ -494,7 +494,7 @@ class Token extends AstElement {
 		}
 		this.#stage = MAX_STAGE;
 		const {childNodes: {length}, firstChild} = this;
-		if (length !== 1 || typeof firstChild !== 'string' || !firstChild.includes('\x00')) {
+		if (length !== 1 || typeof firstChild !== 'string' || !firstChild.includes('\0')) {
 			return this;
 		}
 		this.replaceChildren(...this.buildFromStr(firstChild));
@@ -556,7 +556,7 @@ class Token extends AstElement {
 			if (table instanceof TableToken && table.type !== 'td') {
 				table.normalize();
 				const [, child] = table.childNodes;
-				if (typeof child === 'string' && child.includes('\x00')) {
+				if (typeof child === 'string' && child.includes('\0')) {
 					table.removeAt(1);
 					const inner = new Token(child, this.#config, true, this.#accum);
 					table.insertAt(inner, 1);

package/src/link/category.js

@@ -2,7 +2,7 @@
 
 const /** @type {Parser} */ Parser = require('../..'),
 	LinkToken = require('.'),
-	Token = require('..'); // eslint-disable-line no-unused-vars
+	Token = require('..');
 
 /**
  * 分类

package/src/link/file.js

@@ -64,7 +64,7 @@ class FileToken extends LinkToken {
 		super(link, undefined, title, config, accum);
 		this.setAttribute('acceptable', {AtomToken: 0, ImageParameterToken: '1:'});
 		this.append(...explode('-{', '}-', '|', text).map(part => new ImageParameterToken(part, config, accum)));
-		this.seal(['setFragment', 'asSelfLink', 'setLinkText', 'pipeTrick']);
+		this.seal(['setLangLink', 'setFragment', 'asSelfLink', 'setLinkText', 'pipeTrick']);
 	}
 
 	/**

package/src/link/galleryImage.js

@@ -0,0 +1,47 @@
+'use strict';
+
+const /** @type {Parser} */ Parser = require('../..'),
+	Token = require('..'),
+	FileToken = require('./file');
+
+/**
+ * 图片
+ * @classdesc `{childNodes: [AtomToken, ...ImageParameterToken]}`
+ */
+class GalleryImageToken extends FileToken {
+	type = 'gallery-image';
+
+	size = undefined;
+	width = undefined;
+	height = undefined;
+
+	/**
+	 * @param {string} link
+	 * @param {string|undefined} text
+	 * @param {Title} title
+	 * @param {accum} accum
+	 */
+	constructor(link, text, title, config = Parser.getConfig(), accum = []) {
+		let token;
+		if (text !== undefined) {
+			token = new Token(text, config, true, accum);
+			token.type = 'temp';
+			token.setAttribute('stage', 1);
+			for (let n = 1; n < Parser.MAX_STAGE; n++) {
+				token.parseOnce();
+			}
+			accum.splice(accum.indexOf(token), 1);
+		}
+		const newConfig = structuredClone(config);
+		newConfig.img = Object.fromEntries(Object.entries(config.img).filter(([, param]) => param !== 'width'));
+		super(link, token?.toString(), title, newConfig, accum);
+		this.seal(['size', 'width', 'height']);
+	}
+
+	getPadding() {
+		return 0;
+	}
+}
+
+Parser.classes.GalleryImageToken = __filename;
+module.exports = GalleryImageToken;

package/src/link/index.js

@@ -47,16 +47,16 @@ class LinkToken extends Token {
 					title: this.name, interwiki: this.interwiki, fragment: this.fragment,
 				}, this.getAttribute('config'));
 			token.firstElementChild.safeReplaceWith(link);
-			token.appendChild(...linkText);
+			token.append(...linkText);
 			return token.afterBuild();
 		});
 	}
 
 	afterBuild() {
-		if (this.name.includes('\x00')) {
+		if (this.name.includes('\0')) {
 			this.setAttribute('name', text(this.buildFromStr(this.name)));
 		}
-		if (this.fragment.includes('\x00')) {
+		if (this.fragment.includes('\0')) {
 			this.setAttribute('fragment', text(this.buildFromStr(this.fragment)));
 		}
 		const that = this;
@@ -91,7 +91,7 @@ class LinkToken extends Token {
 
 	toString() {
 		const str = super.toString('|');
-		return this.parentElement?.matches('ext-inner#gallery') ? str : `[[${str}]]`;
+		return this.type === 'gallery-image' ? str : `[[${str}]]`;
 	}
 
 	getPadding() {
@@ -103,19 +103,20 @@ class LinkToken extends Token {
 	}
 
 	text() {
-		return `[[${super.text('|')}]]`;
+		const str = super.text('|');
+		return this.type === 'gallery-image' ? str : `[[${str}]]`;
 	}
 
 	/** @param {string} link */
 	setTarget(link) {
 		link = String(link);
-		if (!/^\s*[:#]/.test(link)) {
+		if (link.type === 'link' && !/^\s*[:#]/.test(link)) {
 			link = `:${link}`;
 		}
 		const root = Parser.parse(`[[${link}]]`, this.getAttribute('include'), 6, this.getAttribute('config')),
 			{childNodes: {length}, firstElementChild} = root;
 		if (length !== 1 || firstElementChild?.type !== this.type || firstElementChild.childNodes.length !== 1) {
-			const msgs = {link: '内链', file: '文件链接', category: '分类'};
+			const msgs = {link: '内链', file: '文件链接', category: '分类', 'gallery-image': '文件链接'};
 			throw new SyntaxError(`非法的${msgs[this.type]}目标：${link}`);
 		}
 		const {firstChild} = firstElementChild;
@@ -153,7 +154,7 @@ class LinkToken extends Token {
 
 	/** @param {string} fragment */
 	#setFragment(fragment, page = true) {
-		fragment = String(fragment).replace(/[<>[]#|=!]/g, p => encodeURIComponent(p));
+		fragment = String(fragment).replace(/[<>[]#|=!\]/g, p => encodeURIComponent(p));
 		const include = this.getAttribute('include'),
 			config = this.getAttribute('config'),
 			root = Parser.parse(`[[${page ? `:${this.name}` : ''}#${fragment}]]`, include, 6, config),
@@ -212,19 +213,19 @@ class LinkToken extends Token {
 		if (/[#%]/.test(linkText)) {
 			throw new Error('Pipe trick 不能用于带有"#"或"%"的场合！');
 		}
-		const m1 = linkText.match(/^:?(?:[ \w\x80-\xff-]+:)?(.+?) ?\(.+\)$/);
+		const m1 = /^:?(?:[ \w\x80-\xff-]+:)?([^(]+)\(.+\)$/.exec(linkText);
 		if (m1) {
-			this.setLinkText(m1[1]);
+			this.setLinkText(m1[1].trim());
 			return;
 		}
-		const m2 = linkText.match(/^:?(?:[ \w\x80-\xff-]+:)?(.+?) ?（.+）$/);
+		const m2 = /^:?(?:[ \w\x80-\xff-]+:)?([^（]+)（.+）$/.exec(linkText);
 		if (m2) {
-			this.setLinkText(m2[1]);
+			this.setLinkText(m2[1].trim());
 			return;
 		}
-		const m3 = linkText.match(/^:?(?:[ \w\x80-\xff-]+:)?(.+?)(?: ?\(.+\))?(?:, |，|، ).+/);
+		const m3 = /^:?(?:[ \w\x80-\xff-]+:)?(.+?)(?:(?<!\()\(.+\))?(?:, |，|، )./.exec(linkText);
 		if (m3) {
-			this.setLinkText(m3[1]);
+			this.setLinkText(m3[1].trim());
 			return;
 		}
 		this.setLinkText(linkText);

package/src/magicLink.js

@@ -12,13 +12,13 @@ class MagicLinkToken extends Token {
 	#protocolRegex;
 
 	get protocol() {
-		return this.text().match(this.#protocolRegex)?.[0];
+		return this.#protocolRegex.exec(this.text())?.[0];
 	}
 	set protocol(value) {
 		if (typeof value !== 'string') {
 			this.typeError('protocol', 'String');
 		}
-		if (!new RegExp(`${this.#protocolRegex.source}$`, 'i').test(value)) {
+		if (!RegExp(`${this.#protocolRegex.source}$`, 'i').test(value)) {
 			throw new RangeError(`非法的外链协议：${value}`);
 		}
 		this.replaceChildren(this.text().replace(this.#protocolRegex, value));
@@ -33,11 +33,11 @@ class MagicLinkToken extends Token {
 		if (doubleSlash) {
 			this.type = 'ext-link-url';
 		}
-		this.#protocolRegex = new RegExp(`^(?:${config.protocol}${doubleSlash ? '|//' : ''})`, 'i');
+		this.#protocolRegex = RegExp(`^(?:${config.protocol}${doubleSlash ? '|//' : ''})`, 'i');
 	}
 
 	afterBuild() {
-		const ParameterToken = require('./parameter'), // eslint-disable-line no-unused-vars
+		const ParameterToken = require('./parameter'),
 			/** @type {ParameterToken} */ parameter = this.closest('parameter');
 		if (parameter?.getValue() === this.text()) {
 			this.replaceWith(this.toString());
@@ -45,6 +45,16 @@ class MagicLinkToken extends Token {
 		return this;
 	}
 
+	cloneNode() {
+		const cloned = this.cloneChildren(),
+			token = Parser.run(() => new MagicLinkToken(
+				undefined, this.type === 'ext-link-url', this.getAttribute('config'),
+			));
+		token.append(...cloned);
+		token.afterBuild();
+		return token;
+	}
+
 	getUrl() {
 		let url = this.text();
 		if (url.startsWith('//')) {

package/src/nowiki/dd.js

@@ -32,7 +32,7 @@ class DdToken extends NowikiToken {
 	/** @param {string} str */
 	setText(str) {
 		const src = this.type === 'dd' ? ':' : ';:*#';
-		if (new RegExp(`[^${src}]`).test(str)) {
+		if (RegExp(`[^${src}]`).test(str)) {
 			throw new RangeError(`${this.constructor.name} 仅能包含${src.split('').map(c => `"${c}"`).join('、')}！`);
 		}
 		this.#update(str);

package/src/syntax.js

@@ -19,6 +19,9 @@ class SyntaxToken extends Token {
 	 * @param {acceptable} acceptable
 	 */
 	constructor(wikitext, pattern, type = 'plain', config = Parser.getConfig(), accum = [], acceptable = null) {
+		if (pattern.global) {
+			throw new RangeError(`SyntaxToken 的语法正则不能含有 g 修饰符：${pattern}`);
+		}
 		super(wikitext, config, true, accum, acceptable);
 		this.type = type;
 		this.#pattern = pattern;

package/src/table/index.js

@@ -3,19 +3,19 @@
 const assert = require('assert/strict'),
 	{noWrap} = require('../../util/string'),
 	/** @type {Parser} */ Parser = require('../..'),
-	Token = require('..'), // eslint-disable-line no-unused-vars
+	Token = require('..'),
 	TrToken = require('./tr'),
 	TdToken = require('./td'),
 	SyntaxToken = require('../syntax'),
-	AttributeToken = require('../attribute'); // eslint-disable-line no-unused-vars
+	AttributeToken = require('../attribute');
 
 /**
  * @param {TableCoords} coords1
  * @param {TableCoords} coords2
  */
 const cmpCoords = (coords1, coords2) => {
-	const diff = coords1?.row - coords2?.row;
-	return diff === 0 ? coords1?.column - coords2?.column : diff;
+	const diff = coords1.row - coords2.row;
+	return diff === 0 ? coords1.column - coords2.column : diff;
 };
 const isRowEnd = /** @param {Token} */ ({type}) => ['tr', 'table-syntax'].includes(type);
 
@@ -55,8 +55,8 @@ class Layout extends Array {
 class TableToken extends TrToken {
 	type = 'table';
 
-	static openingPattern = /^(?:{\||{{{\s*!\s*}}|{{\s*\(!\s*}})$/;
-	static closingPattern = /^\n[^\S\n]*(?:\|}|{{\s*!\s*}}}|{{\s*!\)\s*}})$/;
+	static openingPattern = /^(?:\{\||\{\{\{\s*!\s*\}\}|\{\{\s*\(!\s*\}\})$/;
+	static closingPattern = /^\n[^\S\n]*(?:\|\}|\{\{\s*!\s*\}\}\}|\{\{\s*!\)\s*\}\})$/;
 
 	/**
 	 * @param {string} syntax
@@ -192,7 +192,7 @@ class TableToken extends TrToken {
 			{length} = rows,
 			/** @type {Layout} */ layout = new Layout(length).fill().map(() => []);
 		for (const [i, rowToken] of rows.entries()) {
-			if (i > stop.row ?? stop.y) {
+			if (i > (stop.row ?? stop.y)) {
 				break;
 			}
 			const rowLayout = layout[i];

package/src/table/td.js

@@ -45,7 +45,7 @@ class TdToken extends fixedToken(TrToken) {
 	 */
 	getSyntax() {
 		const syntax = this.firstElementChild.text(),
-			escape = syntax.includes('{{');
+			esc = syntax.includes('{{');
 		let subtype = 'td';
 		if (syntax.endsWith('!')) {
 			subtype = 'th';
@@ -53,14 +53,14 @@ class TdToken extends fixedToken(TrToken) {
 			subtype = 'caption';
 		}
 		if (this.isIndependent()) {
-			return {subtype, escape, correction: false};
+			return {subtype, escape: esc, correction: false};
 		}
 		const {previousElementSibling} = this;
 		if (previousElementSibling?.type !== 'td') {
-			return {subtype, escape, correction: true};
+			return {subtype, escape: esc, correction: true};
 		}
 		const result = previousElementSibling.getSyntax();
-		result.escape ||= escape;
+		result.escape ||= esc;
 		result.correction = previousElementSibling.lastElementChild.offsetHeight > 1;
 		if (subtype === 'th' && result.subtype !== 'th') {
 			result.subtype = 'th';
@@ -69,7 +69,8 @@ class TdToken extends fixedToken(TrToken) {
 		return result;
 	}
 
-	static openingPattern = /^(?:\n[\S\n]*(?:[|!]|\|\+|{{\s*!\s*}}\+?)|(?:\||{{\s*!\s*}}){2}|!!|{{\s*!!\s*}})$/;
+	static openingPattern
+		= /^(?:\n[\S\n]*(?:[|!]|\|\+|\{\{\s*!\s*\}\}\+?)|(?:\||\{\{\s*!\s*\}\}){2}|!!|\{\{\s*!!\s*\}\})$/;
 
 	getRowCount = undefined;
 	getNthCol = undefined;
@@ -81,9 +82,9 @@ class TdToken extends fixedToken(TrToken) {
 	 * @param {accum} accum
 	 */
 	constructor(syntax, inner, config = Parser.getConfig(), accum = []) {
-		let innerSyntax = inner?.match(/\||\x00\d+!\x7f/),
+		let innerSyntax = /\||\0\d+!\x7f/.exec(inner),
 			attr = innerSyntax ? inner.slice(0, innerSyntax.index) : '';
-		if (/\[\[|-{/.test(attr)) {
+		if (/\[\[|-\{/.test(attr)) {
 			innerSyntax = null;
 			attr = '';
 		}
@@ -91,6 +92,7 @@ class TdToken extends fixedToken(TrToken) {
 		if (innerSyntax) {
 			[this.#innerSyntax] = innerSyntax;
 		}
+		// eslint-disable-next-line no-unsafe-optional-chaining
 		const innerToken = new Token(inner?.slice(innerSyntax?.index + this.#innerSyntax.length), config, true, accum);
 		innerToken.type = 'td-inner';
 		this.setAttribute('acceptable', {SyntaxToken: 0, AttributeToken: 1, Token: 2})
@@ -98,7 +100,7 @@ class TdToken extends fixedToken(TrToken) {
 	}
 
 	cloneNode() {
-		const token = super.cloneNode();
+		const /** @type {TdToken} */ token = super.cloneNode();
 		token.setAttribute('innerSyntax', this.#innerSyntax);
 		return token;
 	}
@@ -141,6 +143,7 @@ class TdToken extends fixedToken(TrToken) {
 	 * @template {string} T
 	 * @param {T} key
 	 * @param {TokenAttribute<T>} value
+	 * @return {this}
 	 */
 	setAttribute(key, value) {
 		if (key !== 'innerSyntax') {
@@ -153,7 +156,7 @@ class TdToken extends fixedToken(TrToken) {
 	}
 
 	afterBuild() {
-		if (this.#innerSyntax.includes('\x00')) {
+		if (this.#innerSyntax.includes('\0')) {
 			this.#innerSyntax = this.buildFromStr(this.#innerSyntax).map(String).join('');
 		}
 		return this;
@@ -162,8 +165,8 @@ class TdToken extends fixedToken(TrToken) {
 	static #aliases = {td: '\n|', th: '\n!', caption: '\n|+'};
 
 	/** @param {string} syntax */
-	setSyntax(syntax, escape = false) {
-		super.setSyntax(TdToken.#aliases[syntax] ?? syntax, escape);
+	setSyntax(syntax, esc = false) {
+		super.setSyntax(TdToken.#aliases[syntax] ?? syntax, esc);
 	}
 
 	/** @complexity `n` */
@@ -171,17 +174,17 @@ class TdToken extends fixedToken(TrToken) {
 		if (this.children[1].toString()) {
 			this.#innerSyntax ||= '|';
 		}
-		const {subtype, escape, correction} = this.getSyntax();
+		const {subtype, escape: esc, correction} = this.getSyntax();
 		if (correction) {
-			this.setSyntax(subtype, escape);
+			this.setSyntax(subtype, esc);
 		}
 	}
 
 	/** @complexity `n` */
 	independence() {
 		if (!this.isIndependent()) {
-			const {subtype, escape} = this.getSyntax();
-			this.setSyntax(subtype, escape);
+			const {subtype, escape: esc} = this.getSyntax();
+			this.setSyntax(subtype, esc);
 		}
 	}
 

package/src/table/tr.js

@@ -13,7 +13,7 @@ const attributeParent = require('../../mixin/attributeParent'),
 class TrToken extends attributeParent(Token, 1) {
 	type = 'tr';
 
-	static openingPattern = /^\n[^\S\n]*(?:\|-+|{{\s*!\s*}}-+|{{\s*!-\s*}}-*)$/;
+	static openingPattern = /^\n[^\S\n]*(?:\|-+|\{\{\s*!\s*\}\}-+|\{\{\s*!-\s*\}\}-*)$/;
 
 	/**
 	 * @param {string} syntax
@@ -93,10 +93,10 @@ class TrToken extends attributeParent(Token, 1) {
 	}
 
 	/** @param {string} syntax */
-	setSyntax(syntax, escape = false) {
+	setSyntax(syntax, esc = false) {
 		const {firstElementChild} = this;
 		firstElementChild.replaceChildren(syntax);
-		if (escape) {
+		if (esc) {
 			TrToken.escape(firstElementChild);
 		}
 	}
@@ -202,7 +202,7 @@ class TrToken extends attributeParent(Token, 1) {
 		if (n < 0 || n > nCols || n === nCols && !insert) {
 			throw new RangeError(`不存在第 ${n} 个单元格！`);
 		}
-		const TdToken = require('./td'); // eslint-disable-line no-unused-vars
+		const TdToken = require('./td');
 		let last = 0;
 		for (const child of this.children.slice(2)) {
 			if (child instanceof TdToken) {

package/src/tagPair/ext.js

@@ -23,7 +23,7 @@ class ExtToken extends attributeParent(TagPairToken) {
 			attrToken = new AttributeToken(attr, 'ext-attr', lcName, config, accum),
 			newConfig = structuredClone(config),
 			ext = new Set(newConfig.ext);
-		let /** @type {acceptable} */ acceptable, innerToken;
+		let /** @type {acceptable} */ acceptable, /** @type {Token} */ innerToken;
 		switch (lcName) {
 			case 'choose':
 				ext.add('option');
@@ -42,15 +42,23 @@ class ExtToken extends attributeParent(TagPairToken) {
 				innerToken = new Token(inner, newConfig, false, accum);
 				break;
 			}
+			case 'gallery': {
+				ext.delete(lcName);
+				newConfig.ext = [...ext];
+				const GalleryToken = require('../gallery');
+				acceptable = {AttributeToken: 0, GalleryToken: 1};
+				innerToken = new GalleryToken(inner, newConfig, accum);
+				break;
+			}
 			/*
 			 * 更多定制扩展的代码示例：
 			 * ```
 			 * case 'extensionName': {
-			 * 	ext.delete(this.name);
+			 * 	ext.delete(lcName);
 			 * 	newConfig.ext = [...ext];
 			 * 	const ExtensionToken = require('../extension');
 			 * 	acceptable = {AttributeToken: 0, ExtensionToken: 1};
-			 * 	innerToken = new ExtensionToken(extInner, newConfig, false, accum);
+			 * 	innerToken = new ExtensionToken(inner, newConfig, accum);
 			 * 	break;
 			 * }
 			 * ```