wikiparser-node 0.0.2 → 0.2.0

package/src/index.js

@@ -37,9 +37,11 @@
  * l: LinkToken
  * q: QuoteToken
  * w: ExtLinkToken
+ * d: ListToken
+ * v: ConverterToken
  */
 
-const {typeError, externalUse} = require('../util/debug'),
+const {externalUse} = require('../util/debug'),
 	Ranges = require('../lib/ranges'),
 	AstElement = require('../lib/element'),
 	assert = require('assert/strict'),
@@ -201,9 +203,13 @@ class Token extends AstElement {
 	 * @complexity `n`
 	 */
 	removeAt(i) {
+		if (typeof i !== 'number') {
+			this.typeError('removeAt', 'Number');
+		}
+		const iPos = i < 0 ? i + this.childNodes.length : i;
 		if (!Parser.running) {
 			const protectedIndices = this.#protectedChildren.applyTo(this.childNodes);
-			if (protectedIndices.includes(i)) {
+			if (protectedIndices.includes(iPos)) {
 				throw new Error(`${this.constructor.name} 的第 ${i} 个子节点不可移除！`);
 			} else if (this.#acceptable) {
 				const acceptableIndices = Object.fromEntries(
@@ -255,7 +261,7 @@ class Token extends AstElement {
 		if (!parentNode) {
 			throw new Error('不存在父节点！');
 		} else if (token.constructor !== this.constructor) {
-			typeError(this, 'safeReplaceWith', this.constructor.name);
+			this.typeError('safeReplaceWith', this.constructor.name);
 		}
 		try {
 			assert.deepEqual(token.getAttribute('acceptable'), this.#acceptable);
@@ -320,7 +326,7 @@ class Token extends AstElement {
 	 */
 	section(n) {
 		if (typeof n !== 'number') {
-			typeError(this, 'section', 'Number');
+			this.typeError('section', 'Number');
 		}
 		return this.sections()[n];
 	}
@@ -332,7 +338,7 @@ class Token extends AstElement {
 	 */
 	findEnclosingHtml(tag) {
 		if (tag !== undefined && typeof tag !== 'string') {
-			typeError(this, 'findEnclosingHtml', 'String');
+			this.typeError('findEnclosingHtml', 'String');
 		}
 		tag = tag?.toLowerCase();
 		if (tag !== undefined && !this.#config.html.slice(0, 2).flat().includes(tag)) {
@@ -436,11 +442,7 @@ class Token extends AstElement {
 				this.#parseLinks();
 				break;
 			case 6: {
-				const lines = this.firstChild.split('\n');
-				for (let i = 0; i < lines.length; i++) {
-					lines[i] = this.#parseQuotes(lines[i]);
-				}
-				this.setText(lines.join('\n'));
+				this.#parseQuotes();
 				break;
 			}
 			case 7:
@@ -450,8 +452,10 @@ class Token extends AstElement {
 				this.#parseMagicLinks();
 				break;
 			case 9:
+				this.#parseList();
 				break;
 			case 10:
+				this.#parseConverter();
 				// no default
 		}
 		if (this.type === 'root') {
@@ -519,7 +523,7 @@ class Token extends AstElement {
 	/** 解析、重构、生成部分Token的`name`属性 */
 	parse(n = MAX_STAGE, include = false) {
 		if (typeof n !== 'number') {
-			typeError(this, 'parse', 'Number');
+			this.typeError('parse', 'Number');
 		} else if (n < MAX_STAGE && !Parser.debugging && externalUse('parse')) {
 			Parser.warn('指定解析层级的方法仅供熟练用户使用！');
 		}
@@ -530,25 +534,21 @@ class Token extends AstElement {
 		return n ? this.build().afterBuild() : this;
 	}
 
-	/** @this {Token & {firstChild: string}} */
 	#parseCommentAndExt(includeOnly = false) {
 		const parseCommentAndExt = require('../parser/commentAndExt');
 		this.setText(parseCommentAndExt(this.firstChild, this.#config, this.#accum, includeOnly));
 	}
 
-	/** @this {Token & {firstChild: string}} */
 	#parseBrackets() {
 		const parseBrackets = require('../parser/brackets');
 		this.setText(parseBrackets(this.firstChild, this.#config, this.#accum));
 	}
 
-	/** @this {Token & {firstChild: string}} */
 	#parseHtml() {
 		const parseHtml = require('../parser/html');
 		this.setText(parseHtml(this.firstChild, this.#config, this.#accum));
 	}
 
-	/** @this {Token & {firstChild: string}} */
 	#parseTable() {
 		const parseTable = require('../parser/table'),
 			TableToken = require('./table');
@@ -567,35 +567,50 @@ class Token extends AstElement {
 		}
 	}
 
-	/** @this {Token & {firstChild: string}} */
 	#parseHrAndDoubleUndescore() {
 		const parseHrAndDoubleUnderscore = require('../parser/hrAndDoubleUnderscore');
 		this.setText(parseHrAndDoubleUnderscore(this.firstChild, this.#config, this.#accum));
 	}
 
-	/** @this {Token & {firstChild: string}} */
 	#parseLinks() {
 		const parseLinks = require('../parser/links');
 		this.setText(parseLinks(this.firstChild, this.#config, this.#accum));
 	}
 
-	/** @param {string} text */
-	#parseQuotes(text) {
-		const parseQuotes = require('../parser/quotes');
-		return parseQuotes(text, this.#config, this.#accum);
+	/** @this {Token & {firstChild: string}} */
+	#parseQuotes() {
+		const parseQuotes = require('../parser/quotes'),
+			lines = this.firstChild.split('\n');
+		for (let i = 0; i < lines.length; i++) {
+			lines[i] = parseQuotes(lines[i], this.#config, this.#accum);
+		}
+		this.setText(lines.join('\n'));
 	}
 
-	/** @this {Token & {firstChild: string}} */
 	#parseExternalLinks() {
 		const parseExternalLinks = require('../parser/externalLinks');
 		this.setText(parseExternalLinks(this.firstChild, this.#config, this.#accum));
 	}
 
-	/** @this {Token & {firstChild: string}} */
 	#parseMagicLinks() {
 		const parseMagicLinks = require('../parser/magicLinks');
 		this.setText(parseMagicLinks(this.firstChild, this.#config, this.#accum));
 	}
+
+	/** @this {Token & {firstChild: string}} */
+	#parseList() {
+		const parseList = require('../parser/list'),
+			lines = this.firstChild.split('\n');
+		for (let i = this.type === 'root' ? 0 : 1; i < lines.length; i++) {
+			lines[i] = parseList(lines[i], this.#config, this.#accum);
+		}
+		this.setText(lines.join('\n'));
+	}
+
+	#parseConverter() {
+		const parseConverter = require('../parser/converter');
+		this.setText(parseConverter(this.firstChild, this.#config, this.#accum));
+	}
 }
 
 Parser.classes.Token = __filename;

package/src/link/file.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const {explode} = require('../../util/string'),
-	{typeError, externalUse} = require('../../util/debug'),
+const {explode, noWrap} = require('../../util/string'),
+	{externalUse} = require('../../util/debug'),
 	/** @type {Parser} */ Parser = require('../..'),
 	LinkToken = require('.'),
 	ImageParameterToken = require('../imageParameter');
@@ -84,7 +84,7 @@ class FileToken extends LinkToken {
 	 * @param {ImageParameterToken} token
 	 * @complexity `n`
 	 */
-	insertAt(token, i = this.childElementCount) {
+	insertAt(token, i = this.childNodes.length) {
 		if (!Parser.running) {
 			this.getArgs(token.name, false, false).add(token);
 			this.#keys.add(token.name);
@@ -102,7 +102,7 @@ class FileToken extends LinkToken {
 		const args = this.getAllArgs()
 			.filter(({name}) => ['manualthumb', 'frameless', 'framed', 'thumbnail'].includes(name));
 		if (args.length > 1) {
-			Parser.error(`警告：图片 ${this.name} 带有 ${args.length} 个框架参数，只有第 1 个 ${args[0].name} 会生效！`);
+			Parser.error(`图片 ${this.name} 带有 ${args.length} 个框架参数，只有第 1 个 ${args[0].name} 会生效！`);
 		}
 		return args;
 	}
@@ -113,7 +113,7 @@ class FileToken extends LinkToken {
 	 */
 	getArgs(key, copy = true) {
 		if (typeof key !== 'string') {
-			typeError(this, 'getArgs', 'String');
+			this.typeError('getArgs', 'String');
 		} else if (!copy && !Parser.debugging && externalUse('getArgs')) {
 			this.debugOnly('getArgs');
 		}
@@ -190,7 +190,7 @@ class FileToken extends LinkToken {
 	 */
 	setValue(key, value) {
 		if (typeof key !== 'string') {
-			typeError(this, 'setValue', 'String');
+			this.typeError('setValue', 'String');
 		} else if (value === false) {
 			this.removeArg(key);
 			return;
@@ -211,7 +211,7 @@ class FileToken extends LinkToken {
 		}
 		if (value === true) {
 			if (syntax.includes('$1')) {
-				typeError(this, 'setValue', 'Boolean');
+				this.typeError('setValue', 'Boolean');
 			}
 			const newArg = Parser.run(() => new ImageParameterToken(syntax, config));
 			this.appendChild(newArg);
@@ -221,9 +221,9 @@ class FileToken extends LinkToken {
 			root = Parser.parse(wikitext, this.getAttribute('include'), 6, config),
 			{childNodes: {length}, firstElementChild} = root;
 		if (length !== 1 || !firstElementChild?.matches('file#File:F')
-			|| firstElementChild.childElementCount !== 2 || firstElementChild.lastElementChild.name !== key
+			|| firstElementChild.childNodes.length !== 2 || firstElementChild.lastElementChild.name !== key
 		) {
-			throw new SyntaxError(`非法的 ${key} 参数：${value.replaceAll('\n', '\\n')}`);
+			throw new SyntaxError(`非法的 ${key} 参数：${noWrap(value)}`);
 		}
 		this.appendChild(firstElementChild.lastChild);
 	}

package/src/link/index.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const Title = require('../../lib/title'), // eslint-disable-line no-unused-vars
-	{text} = require('../../util/string'),
+	{text, noWrap} = require('../../util/string'),
 	{undo} = require('../../util/debug'),
 	/** @type {Parser} */ Parser = require('../..'),
 	Token = require('..');
@@ -29,9 +29,9 @@ class LinkToken extends Token {
 			'Stage-2': ':', '!ExtToken': '', '!HeadingToken': '',
 		}));
 		if (linkText !== undefined) {
-			const inner = new Token(linkText, config, true, accum);
+			const inner = new Token(linkText, config, true, accum, {'Stage-5': ':', ConverterToken: ':'});
 			inner.type = 'link-text';
-			this.appendChild(inner.setAttribute('stage', 7));
+			this.appendChild(inner.setAttribute('stage', Parser.MAX_STAGE - 1));
 		}
 		this.selfLink = !title.title;
 		this.fragment = title.fragment;
@@ -107,7 +107,7 @@ class LinkToken extends Token {
 
 	/** @returns {[number, string][]} */
 	plain() {
-		return this.childElementCount === 1 ? [] : this.lastElementChild.plain();
+		return this.childNodes.length === 1 ? [] : this.lastElementChild.plain();
 	}
 
 	/** @param {string} link */
@@ -118,7 +118,7 @@ class LinkToken extends Token {
 		}
 		const root = Parser.parse(`[[${link}]]`, this.getAttribute('include'), 6, this.getAttribute('config')),
 			{childNodes: {length}, firstElementChild} = root;
-		if (length !== 1 || firstElementChild?.type !== this.type || firstElementChild.childElementCount !== 1) {
+		if (length !== 1 || firstElementChild?.type !== this.type || firstElementChild.childNodes.length !== 1) {
 			const msgs = {link: '内链', file: '文件链接', category: '分类'};
 			throw new SyntaxError(`非法的${msgs[this.type]}目标：${link}`);
 		}
@@ -135,7 +135,7 @@ class LinkToken extends Token {
 			config = this.getAttribute('config'),
 			root = Parser.parse(`[[${page ? `:${this.name}` : ''}#${fragment}]]`, include, 6, config),
 			{childNodes: {length}, firstElementChild} = root;
-		if (length !== 1 || firstElementChild?.type !== 'link' || firstElementChild.childElementCount !== 1) {
+		if (length !== 1 || firstElementChild?.type !== 'link' || firstElementChild.childNodes.length !== 1) {
 			throw new SyntaxError(`非法的 fragment：${fragment}`);
 		}
 		if (page) {
@@ -169,17 +169,15 @@ class LinkToken extends Token {
 					this.type === 'category' ? 'Category:' : ''
 				}L|${linkText}]]`, this.getAttribute('include'), 6, config),
 				{childNodes: {length}, firstElementChild} = root;
-			if (length !== 1 || firstElementChild?.type !== this.type || firstElementChild.childElementCount !== 2) {
-				throw new SyntaxError(`非法的${this.type === 'link' ? '内链文字' : '分类关键字'}：${
-					linkText.replaceAll('\n', '\\n')
-				}`);
+			if (length !== 1 || firstElementChild?.type !== this.type || firstElementChild.childNodes.length !== 2) {
+				throw new SyntaxError(`非法的${this.type === 'link' ? '内链文字' : '分类关键字'}：${noWrap(linkText)}`);
 			}
 			({lastElementChild} = firstElementChild);
 		} else {
 			lastElementChild = Parser.run(() => new Token('', config));
 			lastElementChild.setAttribute('stage', 7).type = 'link-text';
 		}
-		if (this.childElementCount === 1) {
+		if (this.childNodes.length === 1) {
 			this.appendChild(lastElementChild);
 		} else {
 			this.lastElementChild.safeReplaceWith(lastElementChild);

package/src/magicLink.js

@@ -1,7 +1,6 @@
 'use strict';
 
-const {typeError} = require('../util/debug'),
-	/** @type {Parser} */ Parser = require('..'),
+const /** @type {Parser} */ Parser = require('..'),
 	Token = require('.');
 
 /**
@@ -17,7 +16,7 @@ class MagicLinkToken extends Token {
 	}
 	set protocol(value) {
 		if (typeof value !== 'string') {
-			typeError(this, 'protocol', 'String');
+			this.typeError('protocol', 'String');
 		}
 		if (!new RegExp(`${this.#protocolRegex.source}$`, 'i').test(value)) {
 			throw new RangeError(`非法的外链协议：${value}`);

package/src/nowiki/comment.js

@@ -30,7 +30,7 @@ class CommentToken extends hidden(NowikiToken) {
 	toString() {
 		const {firstChild, closed, nextSibling} = this;
 		if (!closed && nextSibling) {
-			Parser.error('自动闭合HTML注释', firstChild.replaceAll('\n', '\\n'));
+			Parser.error('自动闭合HTML注释', this);
 			this.closed = true;
 		}
 		return `<!--${firstChild}${this.closed ? '-->' : ''}`;

package/src/nowiki/dd.js

@@ -0,0 +1,49 @@
+'use strict';
+
+const /** @type {Parser} */ Parser = require('../..'),
+	NowikiToken = require('.');
+
+/**
+ * :
+ * @classdesc `{childNodes: [string]}`
+ */
+class DdToken extends NowikiToken {
+	type = 'dd';
+	dt;
+	ul;
+	ol;
+	indent;
+
+	/** @param {string} str */
+	#update(str) {
+		this.setAttribute('ul', str.includes('*')).setAttribute('ol', str.includes('#'))
+			.setAttribute('dt', str.includes(';')).setAttribute('indent', str.split(':').length - 1);
+	}
+
+	/**
+	 * @param {string} str
+	 * @param {accum} accum
+	 */
+	constructor(str, config = Parser.getConfig(), accum = []) {
+		super(str, config, accum);
+		this.seal(['dt', 'ul', 'ol', 'indent']).#update(str);
+	}
+
+	/** @returns {[number, string][]} */
+	plain() {
+		return [];
+	}
+
+	/** @param {string} str */
+	setText(str) {
+		const src = this.type === 'dd' ? ':' : ';:*#';
+		if (new RegExp(`[^${src}]`).test(str)) {
+			throw new RangeError(`${this.constructor.name} 仅能包含${src.split('').map(c => `"${c}"`).join('、')}！`);
+		}
+		this.#update(str);
+		return super.setText(str);
+	}
+}
+
+Parser.classes.DdToken = __filename;
+module.exports = DdToken;

package/src/nowiki/hr.js

@@ -1,13 +1,14 @@
 'use strict';
 
-const /** @type {Parser} */ Parser = require('../..'),
+const sol = require('../../mixin/sol'),
+	/** @type {Parser} */ Parser = require('../..'),
 	NowikiToken = require('.');
 
 /**
  * `<hr>`
  * @classdesc `{childNodes: [string]}`
  */
-class HrToken extends NowikiToken {
+class HrToken extends sol(NowikiToken) {
 	type = 'hr';
 
 	/**

package/src/nowiki/list.js

@@ -0,0 +1,16 @@
+'use strict';
+
+const sol = require('../../mixin/sol'),
+	/** @type {Parser} */ Parser = require('../..'),
+	DdToken = require('./dd');
+
+/**
+ * ;:*#
+ * @classdesc `{childNodes: [string]}`
+ */
+class ListToken extends sol(DdToken) {
+	type = 'list';
+}
+
+Parser.classes.ListToken = __filename;
+module.exports = ListToken;

package/src/parameter.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const {typeError} = require('../util/debug'),
+const {noWrap} = require('../util/string'),
 	fixedToken = require('../mixin/fixedToken'),
 	/** @type {Parser} */ Parser = require('..'),
 	Token = require('.');
@@ -113,10 +113,10 @@ class ParameterToken extends fixedToken(Token) {
 			{childNodes: {length}, firstElementChild} = root,
 			/** @type {ParameterToken} */ lastElementChild = firstElementChild?.lastElementChild;
 		if (length !== 1 || !firstElementChild?.matches(templateLike ? 'template#T' : 'magic-word#lc')
-			|| firstElementChild.childElementCount !== 2
+			|| firstElementChild.childNodes.length !== 2
 			|| lastElementChild.anon !== this.anon || lastElementChild.name !== '1'
 		) {
-			throw new SyntaxError(`非法的模板参数：${value.replaceAll('\n', '\\n')}`);
+			throw new SyntaxError(`非法的模板参数：${noWrap(value)}`);
 		}
 		const newValue = lastElementChild.lastChild;
 		root.destroy();
@@ -128,7 +128,7 @@ class ParameterToken extends fixedToken(Token) {
 	/** @param {string} key */
 	rename(key, force = false) {
 		if (typeof key !== 'string') {
-			typeError(this, 'rename', 'String');
+			this.typeError('rename', 'String');
 		}
 		const {parentNode} = this;
 		// 必须检测是否是TranscludeToken
@@ -139,7 +139,7 @@ class ParameterToken extends fixedToken(Token) {
 		}
 		const root = Parser.parse(`{{:T|${key}=}}`, this.getAttribute('include'), 2, this.getAttribute('config')),
 			{childNodes: {length}, firstElementChild} = root;
-		if (length !== 1 || !firstElementChild?.matches('template#T') || firstElementChild.childElementCount !== 2) {
+		if (length !== 1 || !firstElementChild?.matches('template#T') || firstElementChild.childNodes.length !== 2) {
 			throw new SyntaxError(`非法的模板参数名：${key}`);
 		}
 		const {lastElementChild} = firstElementChild,

package/src/syntax.js

@@ -38,8 +38,10 @@ class SyntaxToken extends Token {
 	afterBuild() {
 		const that = this,
 			/** @type {AstListener} */ syntaxListener = (e, data) => {
-				if (!Parser.running && !that.#pattern.test(that.text())) {
+				const pattern = that.#pattern;
+				if (!Parser.running && !pattern.test(that.text())) {
 					undo(e, data);
+					throw new Error(`不可修改 ${that.constructor.name} 的语法：/${pattern.source}/${pattern.flags}`);
 				}
 			};
 		this.addEventListener(['remove', 'insert', 'replace', 'text'], syntaxListener);

package/src/table/index.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const {typeError} = require('../../util/debug'),
-	assert = require('assert/strict'),
+const assert = require('assert/strict'),
+	{noWrap} = require('../../util/string'),
 	/** @type {Parser} */ Parser = require('../..'),
 	Token = require('..'), // eslint-disable-line no-unused-vars
 	TrToken = require('./tr'),
@@ -70,40 +70,45 @@ class TableToken extends TrToken {
 	}
 
 	/**
-	 * @template {string|Token} T
+	 * @template {TrToken|SyntaxToken} T
 	 * @param {T} token
 	 * @returns {T}
 	 * @complexity `n`
 	 */
 	insertAt(token, i = this.childNodes.length) {
-		const previous = this.childNodes.at(i - 1),
+		const previous = this.children.at(i - 1),
 			{closingPattern} = TableToken;
-		if (token instanceof TrToken && token.type === 'td' && previous instanceof TrToken && previous.type === 'tr') {
+		if (token.type === 'td' && previous.type === 'tr') {
 			Parser.warn('改为将单元格插入当前行。');
 			return previous.appendChild(token);
 		} else if (!Parser.running && i === this.childNodes.length && token instanceof SyntaxToken
 			&& (token.getAttribute('pattern') !== closingPattern || !closingPattern.test(token.text()))
 		) {
-			throw new SyntaxError(`表格的闭合部分不符合语法！${token.toString().replaceAll('\n', '\\n')}`);
+			throw new SyntaxError(`表格的闭合部分不符合语法！${noWrap(token.toString())}`);
 		}
 		return super.insertAt(token, i);
 	}
 
 	/** @complexity `n` */
-	close(syntax = '\n|}') {
+	close(syntax = '\n|}', halfParsed = false) {
+		halfParsed &&= Parser.running;
 		const config = this.getAttribute('config'),
-			inner = Parser.parse(syntax, this.getAttribute('include'), 2, config),
-			{lastElementChild} = this;
-		if (!TableToken.closingPattern.test(inner.text())) {
-			throw new SyntaxError(`表格的闭合部分不符合语法！${syntax.replaceAll('\n', '\\n')}`);
+			accum = this.getAttribute('accum'),
+			inner = !halfParsed && Parser.parse(syntax, this.getAttribute('include'), 2, config),
+			{lastElementChild} = this,
+			{closingPattern} = TableToken;
+		if (!halfParsed && !closingPattern.test(inner.text())) {
+			throw new SyntaxError(`表格的闭合部分不符合语法！${noWrap(syntax)}`);
 		} else if (lastElementChild instanceof SyntaxToken) {
 			lastElementChild.replaceChildren(...inner.childNodes);
 		} else {
 			this.appendChild(Parser.run(() => {
-				const token = new SyntaxToken(undefined, TableToken.closingPattern, 'table-syntax', config, [], {
+				const token = new SyntaxToken(syntax, closingPattern, 'table-syntax', config, accum, {
 					'Stage-1': ':', '!ExtToken': '', TranscludeToken: ':',
 				});
-				token.replaceChildren(...inner.childNodes);
+				if (inner) {
+					token.replaceChildren(...inner.childNodes);
+				}
 				return token;
 			}));
 		}
@@ -132,7 +137,7 @@ class TableToken extends TrToken {
 	 */
 	getNthRow(n, force = false, insert = false) {
 		if (typeof n !== 'number') {
-			typeError(this, 'getNthRow', 'Number');
+			this.typeError('getNthRow', 'Number');
 		}
 		const nRows = this.getRowCount(),
 			isRow = super.getRowCount();
@@ -240,7 +245,7 @@ class TableToken extends TrToken {
 	 */
 	toRenderedCoords({row, column}) {
 		if (typeof row !== 'number' || typeof column !== 'number') {
-			typeError(this, 'toRenderedCoords', 'Number');
+			this.typeError('toRenderedCoords', 'Number');
 		}
 		const rowLayout = this.getLayout({row, column})[row],
 			x = rowLayout?.findIndex(coords => cmpCoords(coords, {row, column}) === 0);
@@ -253,7 +258,7 @@ class TableToken extends TrToken {
 	 */
 	toRawCoords({x, y}) {
 		if (typeof x !== 'number' || typeof y !== 'number') {
-			typeError(this, 'toRawCoords', 'Number');
+			this.typeError('toRawCoords', 'Number');
 		}
 		const rowLayout = this.getLayout({x, y})[y],
 			coords = rowLayout?.[x];
@@ -272,7 +277,7 @@ class TableToken extends TrToken {
 	 */
 	getFullRow(y) {
 		if (typeof y !== 'number') {
-			typeError(this, 'getFullRow', 'Number');
+			this.typeError('getFullRow', 'Number');
 		}
 		const rows = this.getAllRows();
 		return new Map(
@@ -286,7 +291,7 @@ class TableToken extends TrToken {
 	 */
 	getFullCol(x) {
 		if (typeof x !== 'number') {
-			typeError(this, 'getFullCol', 'Number');
+			this.typeError('getFullCol', 'Number');
 		}
 		const layout = this.getLayout(),
 			colLayout = layout.map(row => row[x]).filter(coords => coords),
@@ -412,14 +417,14 @@ class TableToken extends TrToken {
 	/** @complexity `n` */
 	#prependTableRow() {
 		const row = Parser.run(() => new TrToken('\n|-', undefined, this.getAttribute('config'))),
-			{childNodes} = this,
-			[,, plain] = childNodes,
-			start = typeof plain === 'string' || plain.isPlain() ? 3 : 2,
-			/** @type {TdToken[]} */ children = childNodes.slice(start),
-			index = children.findIndex(({type}) => type !== 'td');
+			{children} = this,
+			[,, plain] = children,
+			start = plain?.isPlain() ? 3 : 2,
+			/** @type {TdToken[]} */ tdChildren = children.slice(start),
+			index = tdChildren.findIndex(({type}) => type !== 'td');
 		this.insertAt(row, index === -1 ? -1 : index + start);
 		Parser.run(() => {
-			for (const cell of children.slice(0, index === -1 ? undefined : index)) {
+			for (const cell of tdChildren.slice(0, index === -1 ? undefined : index)) {
 				if (cell.subtype !== 'caption') {
 					row.appendChild(cell);
 				}
@@ -438,7 +443,7 @@ class TableToken extends TrToken {
 	 */
 	insertTableRow(y, attr = {}, inner = undefined, subtype = 'td', innerAttr = {}) {
 		if (typeof attr !== 'object') {
-			typeError(this, 'insertTableRow', 'Object');
+			this.typeError('insertTableRow', 'Object');
 		}
 		let reference = this.getNthRow(y, false, true);
 		/** @type {TrToken & AttributeToken}} */
@@ -482,7 +487,7 @@ class TableToken extends TrToken {
 	 */
 	insertTableCol(x, inner, subtype = 'td', attr = {}) {
 		if (typeof x !== 'number') {
-			typeError(this, 'insertTableCol', 'Number');
+			this.typeError('insertTableCol', 'Number');
 		}
 		const layout = this.getLayout(),
 			rowLength = layout.map(({length}) => length),
@@ -565,7 +570,7 @@ class TableToken extends TrToken {
 	 */
 	mergeCells(xlim, ylim) {
 		if ([...xlim, ...ylim].some(arg => typeof arg !== 'number')) {
-			typeError(this, 'mergeCells', 'Number');
+			this.typeError('mergeCells', 'Number');
 		}
 		const layout = this.getLayout(),
 			maxCol = Math.max(...layout.map(({length}) => length));
@@ -711,7 +716,7 @@ class TableToken extends TrToken {
 	 */
 	moveTableRowBefore(y, before) {
 		if (typeof y !== 'number' || typeof before !== 'number') {
-			typeError(this, 'moveTableRowBefore', 'Number');
+			this.typeError('moveTableRowBefore', 'Number');
 		}
 		const layout = this.getLayout(),
 			/**
@@ -748,7 +753,7 @@ class TableToken extends TrToken {
 	 */
 	moveTableRowAfter(y, after) {
 		if (typeof y !== 'number' || typeof after !== 'number') {
-			typeError(this, 'moveTableRowAfter', 'Number');
+			this.typeError('moveTableRowAfter', 'Number');
 		}
 		const layout = this.getLayout(),
 			afterToken = this.getNthRow(after),
@@ -797,7 +802,7 @@ class TableToken extends TrToken {
 	 */
 	#moveCol(x, reference, after = false) {
 		if (typeof x !== 'number' || typeof reference !== 'number') {
-			typeError(this, `moveTableCol${after ? 'After' : 'Before'}`, 'Number');
+			this.typeError(`moveTableCol${after ? 'After' : 'Before'}`, 'Number');
 		}
 		const layout = this.getLayout(),
 			/** @type {(rowLayout: TableCoords[], i: number, oneCol?: boolean) => boolean} */