wikiparser-node 0.5.0 → 0.6.1

package/src/table/index.js

@@ -3,12 +3,12 @@
 const assert = require('assert/strict'),
 	{noWrap} = require('../../util/string'),
 	{generateForChild} = require('../../util/lint'),
+	{isPlainObject} = require('../../util/base'),
 	Parser = require('../..'),
 	Token = require('..'),
 	TrToken = require('./tr'),
 	TdToken = require('./td'),
-	SyntaxToken = require('../syntax'),
-	AttributeToken = require('../attribute');
+	SyntaxToken = require('../syntax');
 
 const openingPattern = /^(?:\{\||\{\{\{\s*!\s*\}\}|\{\{\s*\(!\s*\}\})$/u,
 	closingPattern = /^\n[^\S\n]*(?:\|\}|\{\{\s*!\s*\}\}\}|\{\{\s*!\)\s*\}\})$/u;
@@ -145,18 +145,6 @@ class TableToken extends TrToken {
 		});
 	}
 
-	/**
-	 * @override
-	 * @param {number} start 起始位置
-	 */
-	lint(start = 0) {
-		const errors = super.lint(start);
-		if (!this.closed) {
-			errors.push(generateForChild(this.firstChild, this.getRootNode().posFromIndex(start), '未闭合的表格'));
-		}
-		return errors;
-	}
-
 	/**
 	 * @override
 	 * @template {TrToken|SyntaxToken} T
@@ -170,8 +158,8 @@ class TableToken extends TrToken {
 		const previous = this.childNodes.at(i - 1);
 		if (token.type === 'td' && previous.type === 'tr') {
 			Parser.warn('改为将单元格插入当前行。');
-			return previous.appendChild(token);
-		} else if (!Parser.running && i === this.childNodes.length && token instanceof SyntaxToken
+			return previous.insertAt(token);
+		} else if (i > 0 && i === this.childNodes.length && token instanceof SyntaxToken
 			&& (token.getAttribute('pattern') !== closingPattern || !closingPattern.test(token.text()))
 		) {
 			throw new SyntaxError(`表格的闭合部分不符合语法！${noWrap(String(token))}`);
@@ -179,6 +167,18 @@ class TableToken extends TrToken {
 		return super.insertAt(token, i);
 	}
 
+	/**
+	 * @override
+	 * @param {number} start 起始位置
+	 */
+	lint(start = 0) {
+		const errors = super.lint(start);
+		if (!this.closed) {
+			errors.push(generateForChild(this.firstChild, this.getRootNode().posFromIndex(start), '未闭合的表格'));
+		}
+		return errors;
+	}
+
 	/**
 	 * 闭合表格语法
 	 * @complexity `n`
@@ -196,7 +196,7 @@ class TableToken extends TrToken {
 		} else if (lastChild instanceof SyntaxToken) {
 			lastChild.replaceChildren(...inner.childNodes);
 		} else {
-			this.appendChild(Parser.run(() => {
+			super.insertAt(Parser.run(() => {
 				const token = new SyntaxToken(syntax, closingPattern, 'table-syntax', config, accum, {
 					'Stage-1': ':', '!ExtToken': '', TranscludeToken: ':',
 				});
@@ -241,7 +241,7 @@ class TableToken extends TrToken {
 	 * @throws `RangeError` 不存在该行
 	 */
 	getNthRow(n, force, insert) {
-		if (typeof n !== 'number') {
+		if (!Number.isInteger(n)) {
 			this.typeError('getNthRow', 'Number');
 		}
 		const nRows = this.getRowCount(),
@@ -357,7 +357,7 @@ class TableToken extends TrToken {
 	 * @complexity `n`
 	 */
 	toRenderedCoords({row, column}) {
-		if (typeof row !== 'number' || typeof column !== 'number') {
+		if (!Number.isInteger(row) || !Number.isInteger(column)) {
 			this.typeError('toRenderedCoords', 'Number');
 		}
 		const rowLayout = this.getLayout({row, column})[row],
@@ -371,7 +371,7 @@ class TableToken extends TrToken {
 	 * @complexity `n`
 	 */
 	toRawCoords({x, y}) {
-		if (typeof x !== 'number' || typeof y !== 'number') {
+		if (!Number.isInteger(x) || !Number.isInteger(y)) {
 			this.typeError('toRawCoords', 'Number');
 		}
 		const rowLayout = this.getLayout({x, y})[y],
@@ -392,7 +392,7 @@ class TableToken extends TrToken {
 	 * @complexity `n²`
 	 */
 	getFullRow(y) {
-		if (typeof y !== 'number') {
+		if (!Number.isInteger(y)) {
 			this.typeError('getFullRow', 'Number');
 		}
 		const rows = this.getAllRows();
@@ -407,7 +407,7 @@ class TableToken extends TrToken {
 	 * @complexity `n`
 	 */
 	getFullCol(x) {
-		if (typeof x !== 'number') {
+		if (!Number.isInteger(x)) {
 			this.typeError('getFullCol', 'Number');
 		}
 		const layout = this.getLayout(),
@@ -505,14 +505,14 @@ class TableToken extends TrToken {
 		const row = Parser.run(() => new TrToken('\n|-', undefined, this.getAttribute('config'))),
 			{childNodes} = this,
 			[,, plain] = childNodes,
-			start = plain?.isPlain() ? 3 : 2,
+			start = plain?.constructor === Token ? 3 : 2,
 			/** @type {TdToken[]} */ tdChildren = childNodes.slice(start),
 			index = tdChildren.findIndex(({type}) => type !== 'td');
 		this.insertAt(row, index === -1 ? -1 : index + start);
 		Parser.run(() => {
 			for (const cell of tdChildren.slice(0, index === -1 ? undefined : index)) {
 				if (cell.subtype !== 'caption') {
-					row.appendChild(cell);
+					row.insertAt(cell);
 				}
 			}
 		});
@@ -529,10 +529,11 @@ class TableToken extends TrToken {
 	 * @complexity `n`
 	 */
 	insertTableRow(y, attr = {}, inner = undefined, subtype = 'td', innerAttr = {}) {
-		if (typeof attr !== 'object') {
+		if (!isPlainObject(attr)) {
 			this.typeError('insertTableRow', 'Object');
 		}
 		let reference = this.getNthRow(y, false, true);
+		const AttributeToken = require('../attribute');
 		/** @type {TrToken & AttributeToken}} */
 		const token = Parser.run(() => new TrToken('\n|-', undefined, this.getAttribute('config')));
 		for (const [k, v] of Object.entries(attr)) {
@@ -552,7 +553,7 @@ class TableToken extends TrToken {
 				for (let i = 0; i < maxCol; i++) {
 					const coords = rowLayout[i];
 					if (!coords) {
-						token.appendChild(td.cloneNode());
+						token.insertAt(td.cloneNode());
 					} else if (!set.has(coords)) {
 						set.add(coords);
 						if (coords.row < y) {
@@ -575,7 +576,7 @@ class TableToken extends TrToken {
 	 * @throws `RangeError` 列号过大
 	 */
 	insertTableCol(x, inner, subtype = 'td', attr = {}) {
-		if (typeof x !== 'number') {
+		if (!Number.isInteger(x)) {
 			this.typeError('insertTableCol', 'Number');
 		}
 		const layout = this.getLayout(),
@@ -664,7 +665,7 @@ class TableToken extends TrToken {
 	 * @throws `RangeError` 待合并区域与外侧区域有重叠
 	 */
 	mergeCells(xlim, ylim) {
-		if ([...xlim, ...ylim].some(arg => typeof arg !== 'number')) {
+		if (![...xlim, ...ylim].every(Number.isInteger)) {
 			this.typeError('mergeCells', 'Number');
 		}
 		const layout = this.getLayout(),
@@ -677,7 +678,7 @@ class TableToken extends TrToken {
 		if ([...layout[ymin - 1] ?? [], ...layout[ymax] ?? []].some(coords => set.has(coords))
 			|| layout.some(rowLayout => set.has(rowLayout[xmin - 1]) || set.has(rowLayout[xmax]))
 		) {
-			throw new RangeError(`待合并区域与外侧区域有重叠！`);
+			throw new RangeError('待合并区域与外侧区域有重叠！');
 		}
 		const corner = layout[ymin][xmin],
 			rows = this.getAllRows(),
@@ -817,7 +818,7 @@ class TableToken extends TrToken {
 	 * @throws `RangeError` 无法移动
 	 */
 	moveTableRowBefore(y, before) {
-		if (typeof y !== 'number' || typeof before !== 'number') {
+		if (!Number.isInteger(y) || !Number.isInteger(before)) {
 			this.typeError('moveTableRowBefore', 'Number');
 		}
 		const layout = this.getLayout();
@@ -857,7 +858,7 @@ class TableToken extends TrToken {
 	 * @throws `RangeError` 无法移动
 	 */
 	moveTableRowAfter(y, after) {
-		if (typeof y !== 'number' || typeof after !== 'number') {
+		if (!Number.isInteger(y) || !Number.isInteger(after)) {
 			this.typeError('moveTableRowAfter', 'Number');
 		}
 		const layout = this.getLayout(),
@@ -910,7 +911,7 @@ class TableToken extends TrToken {
 	 * @throws `RangeError` 无法移动
 	 */
 	#moveCol(x, reference, after = false) {
-		if (typeof x !== 'number' || typeof reference !== 'number') {
+		if (!Number.isInteger(x) || !Number.isInteger(reference)) {
 			this.typeError(`moveTableCol${after ? 'After' : 'Before'}`, 'Number');
 		}
 		const layout = this.getLayout();

package/src/table/td.js

@@ -1,7 +1,8 @@
 'use strict';
 
 const fixedToken = require('../../mixin/fixedToken'),
-	{externalUse, typeError} = require('../../util/debug'),
+	{typeError} = require('../../util/debug'),
+	{isPlainObject} = require('../../util/base'),
 	Parser = require('../..'),
 	Token = require('..'),
 	TrToken = require('./tr');
@@ -82,7 +83,7 @@ class TdToken extends fixedToken(TrToken) {
 		const result = previousSibling.getSyntax();
 		result.escape ||= esc;
 		result.correction = previousSibling.lastChild
-			.toString('comment, ext, include, noinclude, arg, template, magic-word, html')
+			.toString('comment, ext, include, noinclude, arg, template, magic-word')
 			.includes('\n');
 		if (subtype === 'th' && result.subtype !== 'th') {
 			result.subtype = 'th';
@@ -91,10 +92,6 @@ class TdToken extends fixedToken(TrToken) {
 		return result;
 	}
 
-	getRowCount = undefined;
-	getNthCol = undefined;
-	insertTableCell = undefined;
-
 	/**
 	 * @param {string} syntax 单元格语法
 	 * @param {string} inner 内部wikitext
@@ -114,9 +111,50 @@ class TdToken extends fixedToken(TrToken) {
 		// 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.insertAt(innerToken.setAttribute('stage', 4));
 		this.setAttribute('acceptable', {SyntaxToken: 0, AttributeToken: 1, Token: 2})
-			.seal(['getRowCount', 'getNthCol', 'insertTableCell'], true)
-			.appendChild(innerToken.setAttribute('stage', 4));
+			.seal(['getRowCount', 'getNthCol', 'insertTableCell'], true);
+	}
+
+	/** @override */
+	afterBuild() {
+		if (this.#innerSyntax.includes('\0')) {
+			this.#innerSyntax = this.getAttribute('buildFromStr')(this.#innerSyntax).map(String).join('');
+		}
+		return this;
+	}
+
+	/**
+	 * @override
+	 * @param {string} selector
+	 * @returns {string}
+	 * @complexity `n`
+	 */
+	toString(selector) {
+		this.#correct();
+		const {childNodes: [syntax, attr, inner]} = this;
+		return selector && this.matches(selector)
+			? ''
+			: `${syntax.toString(selector)}${attr.toString(selector)}${this.#innerSyntax}${inner.toString(selector)}`;
+	}
+
+	/**
+	 * @override
+	 * @param {number} i 子节点位置
+	 */
+	getGaps(i = 0) {
+		i = i < 0 ? i + this.childNodes.length : i;
+		if (i === 1) {
+			this.#correct();
+			return this.#innerSyntax.length;
+		}
+		return 0;
+	}
+
+	/** @override */
+	print() {
+		const {childNodes: [syntax, attr, inner]} = this;
+		return `<span class="wpb-td">${syntax.print()}${attr.print()}${this.#innerSyntax}${inner.print()}</span>`;
 	}
 
 	/** @override */
@@ -135,7 +173,7 @@ class TdToken extends fixedToken(TrToken) {
 	 * @throws `RangeError` 非法的单元格类型
 	 */
 	static create(inner, subtype = 'td', attr = {}, include = false, config = Parser.getConfig()) {
-		if (typeof inner !== 'string' && (!(inner instanceof Token) || !inner.isPlain()) || typeof attr !== 'object') {
+		if (typeof inner !== 'string' && inner?.constructor !== Token || !isPlainObject(attr)) {
 			typeError(this, 'create', 'String', 'Token', 'Object');
 		} else if (subtype !== 'td' && subtype !== 'th' && subtype !== 'caption') {
 			throw new RangeError('单元格的子类型只能为 "td"、"th" 或 "caption"！');
@@ -167,24 +205,13 @@ class TdToken extends fixedToken(TrToken) {
 	 * @param {T} key 属性键
 	 * @param {TokenAttribute<T>} value 属性值
 	 * @returns {this}
-	 * @throws `RangeError` 仅用于代码调试
 	 */
 	setAttribute(key, value) {
-		if (key !== 'innerSyntax') {
-			return super.setAttribute(key, value);
-		} else if (!Parser.debugging && externalUse('setAttribute')) {
-			throw new RangeError(`使用 ${this.constructor.name}.setAttribute 方法设置私有属性 #${key} 仅用于代码调试！`);
+		if (key === 'innerSyntax') {
+			this.#innerSyntax = String(value);
+			return this;
 		}
-		this.#innerSyntax = String(value);
-		return this;
-	}
-
-	/** @override */
-	afterBuild() {
-		if (this.#innerSyntax.includes('\0')) {
-			this.#innerSyntax = this.getAttribute('buildFromStr')(this.#innerSyntax).map(String).join('');
-		}
-		return this;
+		return super.setAttribute(key, value);
 	}
 
 	/**
@@ -221,39 +248,6 @@ class TdToken extends fixedToken(TrToken) {
 		}
 	}
 
-	/**
-	 * @override
-	 * @param {string} selector
-	 * @returns {string}
-	 * @complexity `n`
-	 */
-	toString(selector) {
-		this.#correct();
-		const {childNodes: [syntax, attr, inner]} = this;
-		return selector && this.matches(selector)
-			? ''
-			: `${syntax.toString(selector)}${attr.toString(selector)}${this.#innerSyntax}${inner.toString(selector)}`;
-	}
-
-	/**
-	 * @override
-	 * @param {number} i 子节点位置
-	 */
-	getGaps(i = 0) {
-		i = i < 0 ? i + this.childNodes.length : i;
-		if (i === 1) {
-			this.#correct();
-			return this.#innerSyntax.length;
-		}
-		return 0;
-	}
-
-	/** @override */
-	print() {
-		const {childNodes: [syntax, attr, inner]} = this;
-		return `<span class="wpb-td">${syntax.print()}${attr.print()}${this.#innerSyntax}${inner.print()}</span>`;
-	}
-
 	/**
 	 * @override
 	 * @returns {string}

package/src/table/tr.js

@@ -5,8 +5,7 @@ const {generateForChild} = require('../../util/lint'),
 	Parser = require('../..'),
 	AstText = require('../../lib/text'),
 	Token = require('..'),
-	SyntaxToken = require('../syntax'),
-	AttributeToken = require('../attribute');
+	SyntaxToken = require('../syntax');
 
 const openingPattern = /^\n[^\S\n]*(?:\|-+|\{\{\s*!\s*\}\}-+|\{\{\s*!-\s*\}\}-*)$/u;
 
@@ -40,6 +39,7 @@ class TrToken extends attributeParent(Token, 1) {
 	 */
 	constructor(syntax, attr = '', config = Parser.getConfig(), accum = [], pattern = openingPattern) {
 		super(undefined, config, true, accum, {Token: 2, SyntaxToken: 0, AttributeToken: 1, TdToken: '2:'});
+		const AttributeToken = require('../attribute');
 		this.append(
 			new SyntaxToken(syntax, pattern, 'table-syntax', config, accum, {
 				'Stage-1': ':', '!ExtToken': '', TranscludeToken: ':',
@@ -57,7 +57,7 @@ class TrToken extends attributeParent(Token, 1) {
 		const errors = super.lint(start),
 			inter = this.childNodes.find(({type}) => type === 'table-inter'),
 			str = String(inter).trim();
-		if (inter && str && !/^<!--.*-->$/u.test(str)) {
+		if (inter && str && !/^<!--.*-->$/su.test(str)) {
 			const error = generateForChild(inter, this.getRootNode().posFromIndex(start), '将被移出表格的内容');
 			error.startLine++;
 			error.startCol = 0;
@@ -79,7 +79,7 @@ class TrToken extends attributeParent(Token, 1) {
 			if (token.type === 'td') { // TdToken
 				token.childNodes[2].safeReplaceWith(inner);
 			} else if (inner !== undefined) {
-				token.appendChild(inner);
+				token.insertAt(inner);
 			}
 			token.append(...cloned);
 			return token;
@@ -89,7 +89,7 @@ class TrToken extends attributeParent(Token, 1) {
 	/** 修复简单的表格语法错误 */
 	#correct() {
 		const {childNodes: [,, child]} = this;
-		if (child?.isPlain()) {
+		if (child?.constructor === Token) {
 			const /** @type {{firstChild: AstText}} */ {firstChild} = child;
 			if (firstChild.type !== 'text') {
 				child.prepend('\n');
@@ -253,7 +253,7 @@ class TrToken extends attributeParent(Token, 1) {
 	 * @throws `RangeError` 不存在对应单元格
 	 */
 	getNthCol(n, insert) {
-		if (typeof n !== 'number') {
+		if (!Number.isInteger(n)) {
 			this.typeError('getNthCol', 'Number');
 		}
 		const nCols = this.getColCount();

package/src/tagPair/ext.js

@@ -1,6 +1,7 @@
 'use strict';
 
-const attributeParent = require('../../mixin/attributeParent'),
+const path = require('path'),
+	attributeParent = require('../../mixin/attributeParent'),
 	Parser = require('../..'),
 	TagPairToken = require('.');
 
@@ -10,11 +11,7 @@ const attributeParent = require('../../mixin/attributeParent'),
  */
 class ExtToken extends attributeParent(TagPairToken) {
 	type = 'ext';
-
-	/** @override */
-	get closed() {
-		return super.closed;
-	}
+	closed = true;
 
 	/**
 	 * @param {string} name 标签名
@@ -25,51 +22,74 @@ class ExtToken extends attributeParent(TagPairToken) {
 	 */
 	constructor(name, attr = '', inner = '', closed = undefined, config = Parser.getConfig(), accum = []) {
 		attr = !attr || attr.trimStart() !== attr ? attr : ` ${attr}`;
-		const AttributeToken = require('../attribute');
+		const Token = require('..'),
+			AttributeToken = require('../attribute');
 		const lcName = name.toLowerCase(),
 			attrToken = new AttributeToken(attr, 'ext-attr', lcName, config, accum),
 			newConfig = structuredClone(config),
 			ext = new Set(newConfig.ext);
-		let /** @type {acceptable} */ acceptable, /** @type {Token} */ innerToken;
+		let /** @type {Token} */ innerToken;
+		ext.delete(lcName);
+		newConfig.ext = [...ext];
 		switch (lcName) {
-			case 'choose':
-			case 'option':
-			case 'ref':
-			case 'poem':
-			case 'indicator':
 			case 'tab':
+				ext.delete('tabs');
+				newConfig.ext = [...ext];
+				// fall through
+			case 'indicator':
+			case 'poem':
+			case 'ref':
+			case 'option':
+			case 'combooption':
 			case 'tabs':
-			case 'pre':
-			case 'combobox':
-			case 'combooption': {
-				ext.delete(lcName);
-				newConfig.ext = [
-					...ext,
-					...lcName === 'choose' ? ['option'] : [],
-					...lcName === 'combobox' ? ['combooption'] : [],
-				];
-				const Token = require('..');
-				acceptable = {AttributeToken: 0, Token: 1};
+			case 'poll':
+			case 'seo':
 				innerToken = new Token(inner, newConfig, true, 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 'pre': {
+				const PreToken = require('../hasNowiki/pre');
+				innerToken = new PreToken(inner, newConfig, accum);
+				break;
+			}
+			case 'charinsert': {
+				const CharinsertToken = require('../charinsert');
+				innerToken = new CharinsertToken(inner, newConfig, accum);
+				break;
+			}
+			case 'references':
+			case 'choose':
+			case 'combobox': {
+				const NestedToken = require('../nested'),
+					/** @type {typeof NestedToken} */ NestedExtToken = require(path.join('..', 'nested', lcName));
+				innerToken = new NestedExtToken(inner, newConfig, accum);
+				break;
+			}
+			case 'imagemap': {
+				const ImagemapToken = require('../imagemap');
+				innerToken = new ImagemapToken(inner, config, accum);
+				break;
+			}
+			case 'dynamicpagelist': {
+				const ParamTagToken = require('../paramTag');
+				innerToken = new ParamTagToken(inner, newConfig, accum);
+				break;
+			}
+			case 'inputbox': {
+				const InputboxToken = require('../paramTag/inputbox');
+				innerToken = new InputboxToken(inner, newConfig, accum);
+				break;
+			}
 
 			/*
 			 * 更多定制扩展的代码示例：
 			 * ```
 			 * case 'extensionName': {
-			 * 	ext.delete(lcName);
-			 * 	newConfig.ext = [...ext];
 			 * 	const ExtensionToken = require('../extension');
-			 * 	acceptable = {AttributeToken: 0, ExtensionToken: 1};
 			 * 	innerToken = new ExtensionToken(inner, newConfig, accum);
 			 * 	break;
 			 * }
@@ -77,15 +97,11 @@ class ExtToken extends attributeParent(TagPairToken) {
 			 */
 			default: {
 				const NowikiToken = require('../nowiki');
-				acceptable = {AttributeToken: 0, NowikiToken: 1};
 				innerToken = new NowikiToken(inner, config);
 			}
 		}
 		innerToken.setAttribute('name', lcName).type = 'ext-inner';
-		if (lcName === 'pre') {
-			innerToken.setAttribute('stage', Parser.MAX_STAGE - 1);
-		}
-		super(name, attrToken, innerToken, closed, config, accum, acceptable);
+		super(name, attrToken, innerToken, closed, config, accum);
 	}
 
 	/** @override */
@@ -93,10 +109,12 @@ class ExtToken extends attributeParent(TagPairToken) {
 		const inner = this.lastChild.cloneNode(),
 			tags = this.getAttribute('tags'),
 			config = this.getAttribute('config'),
-			attr = String(this.firstChild),
-			token = Parser.run(() => new ExtToken(tags[0], attr, '', this.selfClosing ? undefined : tags[1], config));
-		token.lastChild.safeReplaceWith(inner);
-		return token;
+			attr = String(this.firstChild);
+		return Parser.run(() => {
+			const token = new ExtToken(tags[0], attr, '', this.selfClosing ? undefined : tags[1], config);
+			token.lastChild.safeReplaceWith(inner);
+			return token;
+		});
 	}
 }
 

package/src/tagPair/include.js

@@ -20,7 +20,7 @@ class IncludeToken extends hidden(TagPairToken) {
 	 * @param {accum} accum
 	 */
 	constructor(name, attr = '', inner = undefined, closed = undefined, config = Parser.getConfig(), accum = []) {
-		super(name, attr, inner ?? '', inner === undefined ? closed : closed ?? '', config, accum, {AstText: [0, 1]});
+		super(name, attr, inner ?? '', inner === undefined ? closed : closed ?? '', config, accum);
 	}
 
 	/**

package/src/tagPair/index.js

@@ -13,6 +13,15 @@ class TagPairToken extends fixedToken(Token) {
 	#closed;
 	#tags;
 
+	/** getter */
+	get closed() {
+		return this.#closed;
+	}
+
+	set closed(value) {
+		this.#closed ||= Boolean(value);
+	}
+
 	/** getter */
 	get selfClosing() {
 		return this.#selfClosing;
@@ -26,15 +35,6 @@ class TagPairToken extends fixedToken(Token) {
 		this.#selfClosing = value;
 	}
 
-	/** getter */
-	get closed() {
-		return this.#closed;
-	}
-
-	set closed(value) {
-		this.#closed ||= Boolean(value);
-	}
-
 	/** 内部wikitext */
 	get innerText() {
 		return this.#selfClosing ? undefined : this.lastChild.text();
@@ -49,7 +49,8 @@ class TagPairToken extends fixedToken(Token) {
 	 */
 	constructor(name, attr, inner, closed, config = Parser.getConfig(), accum = []) {
 		super(undefined, config, true);
-		this.setAttribute('name', name.toLowerCase()).#tags = [name, closed || name];
+		this.setAttribute('name', name.toLowerCase());
+		this.#tags = [name, closed || name];
 		this.#selfClosing = closed === undefined;
 		this.#closed = closed !== '';
 		this.append(attr, inner);
@@ -63,16 +64,6 @@ class TagPairToken extends fixedToken(Token) {
 		accum.splice(index, 0, this);
 	}
 
-	/**
-	 * @override
-	 * @template {string} T
-	 * @param {T} key 属性键
-	 * @returns {TokenAttribute<T>}
-	 */
-	getAttribute(key) {
-		return key === 'tags' ? [...this.#tags] : super.getAttribute(key);
-	}
-
 	/**
 	 * @override
 	 * @param {string} selector
@@ -109,6 +100,16 @@ class TagPairToken extends fixedToken(Token) {
 			: {pre: `&lt;${opening}`, sep: '&gt;', post: this.#closed ? `&lt;/${closing}&gt;` : ''});
 	}
 
+	/**
+	 * @override
+	 * @template {string} T
+	 * @param {T} key 属性键
+	 * @returns {TokenAttribute<T>}
+	 */
+	getAttribute(key) {
+		return key === 'tags' ? [...this.#tags] : super.getAttribute(key);
+	}
+
 	/**
 	 * @override
 	 * @returns {string}