wikiparser-node 0.0.2 → 0.2.0

package/src/table/td.js

@@ -110,7 +110,7 @@ class TdToken extends fixedToken(TrToken) {
 	 */
 	static create(inner, subtype = 'td', attr = {}, include = false, config = Parser.getConfig()) {
 		if (typeof inner !== 'string' && (!(inner instanceof Token) || !inner.isPlain()) || typeof attr !== 'object') {
-			throw new TypeError('TdToken.create 方法仅接受 String、Token、Object 作为输入参数！');
+			typeError(this, 'create', 'String', 'Token', 'Object');
 		} else if (!['td', 'th', 'caption'].includes(subtype)) {
 			throw new RangeError('单元格的子类型只能为 "td"、"th" 或 "caption"！');
 		} else if (typeof inner === 'string') {
@@ -196,6 +196,7 @@ class TdToken extends fixedToken(TrToken) {
 	}
 
 	getGaps(i = 0) {
+		i = i < 0 ? i + this.childNodes.length : i;
 		if (i !== 1) {
 			return 0;
 		}
@@ -231,7 +232,7 @@ class TdToken extends fixedToken(TrToken) {
 	 */
 	setAttr(key, value) {
 		if (typeof key !== 'string') {
-			typeError(this, 'setAttr', 'String');
+			this.typeError('setAttr', 'String');
 		}
 		key = key.toLowerCase().trim();
 		if (typeof value === 'number' && ['rowspan', 'colspan'].includes(key)) {

package/src/table/tr.js

@@ -1,7 +1,6 @@
 'use strict';
 
 const attributeParent = require('../../mixin/attributeParent'),
-	{typeError} = require('../../util/debug'),
 	/** @type {Parser} */ Parser = require('../..'),
 	Token = require('..'),
 	SyntaxToken = require('../syntax'),
@@ -38,7 +37,7 @@ class TrToken extends attributeParent(Token, 1) {
 			const token = new Constructor(undefined, undefined, this.getAttribute('config'));
 			token.firstElementChild.safeReplaceWith(syntax);
 			token.children[1].safeReplaceWith(attr);
-			if (token.childElementCount > 2) { // TdToken
+			if (token.type === 'td') { // TdToken
 				token.children[2].safeReplaceWith(inner);
 			} else if (inner !== undefined) {
 				token.appendChild(inner);
@@ -49,15 +48,13 @@ class TrToken extends attributeParent(Token, 1) {
 	}
 
 	#correct() {
-		const [,, child] = this.childNodes;
-		if (typeof child === 'string' && !child.startsWith('\n')) {
-			this.setText(`\n${child}`, 2);
-		} else if (typeof child !== 'string' && child?.isPlain()) {
+		const [,, child] = this.children;
+		if (child?.isPlain()) {
 			const {firstChild} = child;
 			if (typeof firstChild !== 'string') {
 				child.prepend('\n');
 			} else if (!firstChild.startsWith('\n')) {
-				child.setText(`\n${firstChild}`, 0);
+				child.setText(`\n${firstChild}`);
 			}
 		}
 	}
@@ -75,9 +72,6 @@ class TrToken extends attributeParent(Token, 1) {
 
 	/** @param {SyntaxToken} syntax */
 	static escape(syntax) {
-		if (!(syntax instanceof SyntaxToken)) {
-			typeError('SyntaxToken');
-		}
 		const wikitext = syntax.childNodes.map(child => typeof child === 'string'
 				? child.replaceAll('{|', '{{(!}}').replaceAll('|}', '{{!)}}').replaceAll('||', '{{!!}}')
 					.replaceAll('|', '{{!}}')
@@ -131,7 +125,7 @@ class TrToken extends attributeParent(Token, 1) {
 	 */
 	insertAt(token, i = this.childNodes.length) {
 		if (!Parser.running && !(token instanceof TrToken)) {
-			typeError(this, 'insertAt', 'TrToken');
+			this.typeError('insertAt', 'TrToken');
 		}
 		const TdToken = require('./td'),
 			child = this.childNodes.at(i);
@@ -201,7 +195,7 @@ class TrToken extends attributeParent(Token, 1) {
 	 */
 	getNthCol(n, insert = false) {
 		if (typeof n !== 'number') {
-			typeError(this, 'getNthCol', 'Number');
+			this.typeError('getNthCol', 'Number');
 		}
 		const nCols = this.getColCount();
 		n = n < 0 ? n + nCols : n;

package/src/tagPair/index.js

@@ -52,7 +52,7 @@ class TagPairToken extends fixedToken(Token) {
 		const {closed, firstChild, lastChild, nextSibling, name, selfClosing} = this,
 			[opening, closing] = this.#tags;
 		if (!closed && nextSibling) {
-			Parser.error(`自动闭合 <${name}>`, String(lastChild).replaceAll('\n', '\\n'));
+			Parser.error(`自动闭合 <${name}>`, lastChild);
 			this.closed = true;
 		}
 		return selfClosing

package/src/transclude.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const {removeComment, escapeRegExp, text} = require('../util/string'),
-	{typeError, externalUse} = require('../util/debug'),
+const {removeComment, escapeRegExp, text, noWrap} = require('../util/string'),
+	{externalUse} = require('../util/debug'),
 	/** @type {Parser} */ Parser = require('..'),
 	Token = require('.'),
 	ParameterToken = require('./parameter');
@@ -19,7 +19,7 @@ class TranscludeToken extends Token {
 	/** @complexity `n` */
 	setModifier(modifier = '') {
 		if (typeof modifier !== 'string') {
-			typeError(this, 'setModifier', 'String');
+			this.typeError('setModifier', 'String');
 		}
 		const [,, raw, subst] = this.getAttribute('config').parserFunction,
 			lcModifier = modifier.trim().toLowerCase(),
@@ -27,7 +27,7 @@ class TranscludeToken extends Token {
 			isSubst = subst.includes(lcModifier),
 			wasRaw = raw.includes(this.modifier.trim().toLowerCase());
 		if (wasRaw && isRaw || !wasRaw && (isSubst || modifier === '')
-			|| (Parser.running || this.childElementCount > 1) && (isRaw || isSubst || modifier === '')
+			|| (Parser.running || this.childNodes.length > 1) && (isRaw || isSubst || modifier === '')
 		) {
 			this.setAttribute('modifier', modifier);
 			return Boolean(modifier);
@@ -180,10 +180,10 @@ class TranscludeToken extends Token {
 	}
 
 	toString() {
-		const {children, childElementCount, firstChild} = this;
+		const {children, childNodes: {length}, firstChild} = this;
 		return `{{${this.modifier}${this.modifier && ':'}${
 			this.type === 'magic-word'
-				? `${String(firstChild)}${childElementCount > 1 ? ':' : ''}${children.slice(1).map(String).join('|')}`
+				? `${String(firstChild)}${length > 1 ? ':' : ''}${children.slice(1).map(String).join('|')}`
 				: super.toString('|')
 		}}}`;
 	}
@@ -201,10 +201,10 @@ class TranscludeToken extends Token {
 	 * @complexity `n`
 	 */
 	text() {
-		const {children, childElementCount, firstElementChild} = this;
+		const {children, childNodes: {length}, firstElementChild} = this;
 		return `{{${this.modifier}${this.modifier && ':'}${
 			this.type === 'magic-word'
-				? `${firstElementChild.text()}${childElementCount > 1 ? ':' : ''}${text(children.slice(1), '|')}`
+				? `${firstElementChild.text()}${length > 1 ? ':' : ''}${text(children.slice(1), '|')}`
 				: super.text('|')
 		}}}`;
 	}
@@ -261,7 +261,7 @@ class TranscludeToken extends Token {
 	 * @param {ParameterToken} token
 	 * @complexity `n`
 	 */
-	insertAt(token, i = this.childElementCount) {
+	insertAt(token, i = this.childNodes.length) {
 		super.insertAt(token, i);
 		if (token.anon) {
 			this.#handleAnonArgChange(token);
@@ -291,7 +291,7 @@ class TranscludeToken extends Token {
 	 */
 	getArgs(key, exact = false, copy = true) {
 		if (!['string', 'number'].includes(typeof key)) {
-			typeError(this, 'getArgs', 'String', 'Number');
+			this.typeError('getArgs', 'String', 'Number');
 		} else if (!copy && !Parser.debugging && externalUse('getArgs')) {
 			this.debugOnly('getArgs');
 		}
@@ -381,9 +381,9 @@ class TranscludeToken extends Token {
 			root = Parser.parse(wikitext, this.getAttribute('include'), 2, this.getAttribute('config')),
 			{childNodes: {length}, firstElementChild} = root;
 		if (length !== 1 || !firstElementChild?.matches(templateLike ? 'template#T' : 'magic-word#lc')
-			|| firstElementChild.childElementCount !== 2 || !firstElementChild.lastElementChild.anon
+			|| firstElementChild.childNodes.length !== 2 || !firstElementChild.lastElementChild.anon
 		) {
-			throw new SyntaxError(`非法的匿名参数：${val.replaceAll('\n', '\\n')}`);
+			throw new SyntaxError(`非法的匿名参数：${noWrap(val)}`);
 		}
 		return this.appendChild(firstElementChild.lastChild);
 	}
@@ -395,7 +395,7 @@ class TranscludeToken extends Token {
 	 */
 	setValue(key, value) {
 		if (typeof key !== 'string') {
-			typeError(this, 'setValue', 'String');
+			this.typeError('setValue', 'String');
 		} else if (!this.matches('template, magic-word#invoke')) {
 			throw new Error(`${this.constructor.name}.setValue 方法仅供模板使用！`);
 		}
@@ -409,9 +409,9 @@ class TranscludeToken extends Token {
 			root = Parser.parse(wikitext, this.getAttribute('include'), 2, this.getAttribute('config')),
 			{childNodes: {length}, firstElementChild} = root;
 		if (length !== 1 || !firstElementChild?.matches('template#T')
-			|| 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);
 	}
@@ -432,11 +432,11 @@ class TranscludeToken extends Token {
 		if (this.type === 'magic-word') {
 			throw new Error(`${this.constructor.name}.replaceTemplate 方法仅用于更换模板！`);
 		} else if (typeof title !== 'string') {
-			typeError(this, 'replaceTemplate', 'String');
+			this.typeError('replaceTemplate', 'String');
 		}
 		const root = Parser.parse(`{{${title}}}`, this.getAttribute('include'), 2, this.getAttribute('config')),
 			{childNodes: {length}, firstElementChild} = root;
-		if (length !== 1 || firstElementChild?.type !== 'template' || firstElementChild.childElementCount !== 1) {
+		if (length !== 1 || firstElementChild?.type !== 'template' || firstElementChild.childNodes.length !== 1) {
 			throw new SyntaxError(`非法的模板名称：${title}`);
 		}
 		this.firstElementChild.replaceChildren(...firstElementChild.firstElementChild.childNodes);
@@ -447,15 +447,15 @@ class TranscludeToken extends Token {
 		if (this.type !== 'magic-word' || this.name !== 'invoke') {
 			throw new Error(`${this.constructor.name}.replaceModule 方法仅用于更换模块！`);
 		} else if (typeof title !== 'string') {
-			typeError(this, 'replaceModule', 'String');
+			this.typeError('replaceModule', 'String');
 		}
 		const root = Parser.parse(`{{#invoke:${title}}}`, this.getAttribute('include'), 2, this.getAttribute('config')),
 			{childNodes: {length}, firstElementChild} = root;
 		if (length !== 1 || !firstElementChild?.matches('magic-word#invoke')
-			|| firstElementChild.childElementCount !== 2
+			|| firstElementChild.childNodes.length !== 2
 		) {
 			throw new SyntaxError(`非法的模块名称：${title}`);
-		} else if (this.childElementCount > 1) {
+		} else if (this.childNodes.length > 1) {
 			this.children[1].replaceChildren(...firstElementChild.lastElementChild.childNodes);
 		} else {
 			const {lastChild} = firstElementChild;
@@ -470,17 +470,17 @@ class TranscludeToken extends Token {
 		if (this.type !== 'magic-word' || this.name !== 'invoke') {
 			throw new Error(`${this.constructor.name}.replaceModule 方法仅用于更换模块！`);
 		} else if (typeof func !== 'string') {
-			typeError(this, 'replaceFunction', 'String');
-		} else if (this.childElementCount < 2) {
+			this.typeError('replaceFunction', 'String');
+		} else if (this.childNodes.length < 2) {
 			throw new Error('尚未指定模块名称！');
 		}
 		const root = Parser.parse(`{{#invoke:M|${func}}}`, this.getAttribute('include'), 2, this.getAttribute('config')),
 			{childNodes: {length}, firstElementChild} = root;
 		if (length !== 1 || !firstElementChild?.matches('magic-word#invoke')
-			|| firstElementChild.childElementCount !== 3
+			|| firstElementChild.childNodes.length !== 3
 		) {
 			throw new SyntaxError(`非法的模块函数名：${func}`);
-		} else if (this.childElementCount > 2) {
+		} else if (this.childNodes.length > 2) {
 			this.children[2].replaceChildren(...firstElementChild.lastElementChild.childNodes);
 		} else {
 			const {lastChild} = firstElementChild;
@@ -582,7 +582,10 @@ class TranscludeToken extends Token {
 				Parser.error(`${this.type === 'template'
 					? this.name
 					: this.normalizeTitle(this.children[1]?.text() ?? '', 828).title
-				} 还留有 ${remaining} 个重复的 ${key} 参数！`);
+				} 还留有 ${remaining} 个重复的 ${key} 参数：${[...this.getArgs(key)].map(arg => {
+					const {top, left} = arg.getBoundingClientRect();
+					return `第 ${top} 行第 ${left} 列`;
+				}).join('、')}`);
 				duplicatedKeys.push(key);
 				continue;
 			}

package/tool/index.js

@@ -1,17 +1,18 @@
 'use strict';
 
 const {typeError, externalUse} = require('../util/debug'),
-	{text} = require('../util/string'),
+	{text, noWrap} = require('../util/string'),
 	Token = require('../src'),
 	assert = require('assert/strict');
 
 const /** @type {WeakMap<Token, Record<string, any>>} */ dataStore = new WeakMap();
 
 /**
+ * @param {string} method
  * @param {string|Token|Token[]} selector
  * @returns {(token: Token) => boolean}
  */
-const matchesGenerator = selector => {
+const matchesGenerator = (method, selector) => {
 	if (typeof selector === 'string') {
 		return token => token instanceof Token && token.matches(selector);
 	} else if (Array.isArray(selector)) {
@@ -19,7 +20,7 @@ const matchesGenerator = selector => {
 	} else if (selector instanceof Token) {
 		return token => token === selector;
 	}
-	typeError('String', 'Token', 'Array');
+	typeError(TokenCollection, method, 'String', 'Token', 'Array');
 };
 
 /** @extends {Array<Token>} */
@@ -39,7 +40,7 @@ class TokenCollection extends Array {
 			} else if (typeof token === 'string') {
 				this.push(token);
 			} else if (!(token instanceof Token)) {
-				typeError('String', 'Token');
+				this.typeError('constructor', 'String', 'Token');
 			} else if (!this.includes(token)) {
 				this.#roots.add(token.getRootNode());
 				this.push(token);
@@ -49,6 +50,14 @@ class TokenCollection extends Array {
 		this.#sort();
 	}
 
+	/**
+	 * @param {string} method
+	 * @param  {...string} types
+	 */
+	typeError(method, ...types) {
+		return typeError(this.constructor, method, ...types);
+	}
+
 	#sort() {
 		if (this.some(token => typeof token === 'string')) {
 			return;
@@ -171,7 +180,7 @@ class TokenCollection extends Array {
 		if (typeof selector === 'function') {
 			return this.some((ele, i) => selector.call(ele, i, ele));
 		}
-		const matches = matchesGenerator(selector);
+		const matches = matchesGenerator('is', selector);
 		return this.some(matches);
 	}
 
@@ -182,7 +191,7 @@ class TokenCollection extends Array {
 		if (typeof selector === 'function') {
 			$arr = $(arr.filter((ele, i) => selector.call(ele, i, ele)));
 		} else {
-			const matches = matchesGenerator(selector);
+			const matches = matchesGenerator('filter', selector);
 			$arr = $(arr.filter(matches));
 		}
 		$arr.prevObject = this;
@@ -198,7 +207,7 @@ class TokenCollection extends Array {
 		} else if (typeof selector === 'string') {
 			$arr = $(arr.filter(ele => ele instanceof Token && !ele.matches(selector)));
 		} else {
-			const matches = matchesGenerator(selector);
+			const matches = matchesGenerator('not', selector);
 			$arr = $(arr.filter(ele => !matches(ele)));
 		}
 		$arr.prevObject = this;
@@ -215,7 +224,7 @@ class TokenCollection extends Array {
 		} else if (selector instanceof Token) {
 			map = arr => arr.some(token => token.contains(selector)) ? [selector] : [];
 		} else {
-			typeError('String', 'Token', 'Array');
+			this.typeError('find', 'String', 'Token', 'Array');
 		}
 		return this._create(map);
 	}
@@ -228,13 +237,13 @@ class TokenCollection extends Array {
 		} else if (selector instanceof Token) {
 			return arr.some(ele => ele.contains(selector));
 		}
-		typeError('String', 'Token');
+		this.typeError('has', 'String', 'Token');
 	}
 
 	/** @param {string} selector */
 	closest(selector) {
 		if (typeof selector !== 'string') {
-			typeError('String');
+			this.typeError('closest', 'String');
 		}
 		return this._create(arr => arr.map(ele => ele.closest(selector)));
 	}
@@ -314,7 +323,7 @@ class TokenCollection extends Array {
 	 * @param {string|Token|Token[]} selector
 	 */
 	_until(method, selector, filter = '') {
-		const matches = matchesGenerator(selector);
+		const matches = matchesGenerator(`${method.replace(/All$/, '')}Until`, selector);
 		return this._create(arr => arr.flatMap(ele => {
 			const tokens = $(ele)[method]().toArray(),
 				tokenArray = method === 'nextAll' ? tokens : tokens.reverse(),
@@ -349,7 +358,7 @@ class TokenCollection extends Array {
 	/** @param {[string|Record<string, any>]} key */
 	data(key, value) {
 		if (value !== undefined && typeof key !== 'string') {
-			typeError('String');
+			this.typeError('data', 'String');
 		} else if (value === undefined && typeof key !== 'object') {
 			const data = $.dataStore.get(this._find());
 			return key === undefined ? data : data?.[key];
@@ -371,7 +380,7 @@ class TokenCollection extends Array {
 	/** @param {string|string[]} name */
 	removeData(name) {
 		if (name !== undefined && typeof name !== 'string' && !Array.isArray(name)) {
-			typeError('String', 'Array');
+			this.typeError('removeData', 'String', 'Array');
 		}
 		name = typeof name === 'string' ? name.split(/\s/) : name;
 		for (const token of this._filter()) {
@@ -396,7 +405,7 @@ class TokenCollection extends Array {
 	 */
 	_addEventListener(events, selector, handler, once = false) {
 		if (!['string', 'object'].includes(typeof events)) {
-			typeError('String', 'Object');
+			this.typeError(once ? 'once' : 'on', 'String', 'Object');
 		} else if (typeof selector === 'function') {
 			handler = selector;
 			selector = undefined;
@@ -437,7 +446,7 @@ class TokenCollection extends Array {
 	 */
 	off(events, selector, handler) {
 		if (!['string', 'object', 'undefined'].includes(typeof events)) {
-			typeError('String', 'Object');
+			this.typeError('off', 'String', 'Object');
 		}
 		handler = typeof selector === 'function' ? selector : handler;
 		let eventPair;
@@ -452,7 +461,7 @@ class TokenCollection extends Array {
 			} else {
 				for (const [event, listener] of eventPair) {
 					if (typeof event !== 'string' || !['function', 'undefined'].includes(typeof listener)) {
-						typeError('String', 'Function');
+						this.typeError('off', 'String', 'Function');
 					} else if (listener) {
 						token.removeEventListener(event, listener);
 					} else {
@@ -503,7 +512,7 @@ class TokenCollection extends Array {
 					} else if (Array.isArray(result)) {
 						token[method](...result);
 					} else {
-						typeError('String', 'Token');
+						this.typeError(method, 'String', 'Token');
 					}
 				}
 			}
@@ -604,7 +613,7 @@ class TokenCollection extends Array {
 				}
 			}
 		} else {
-			typeError('Token', 'Array');
+			this.typeError(method, 'Token', 'Array');
 		}
 		return this;
 	}
@@ -648,7 +657,7 @@ class TokenCollection extends Array {
 		} else if (Array.isArray(value)) {
 			toValue = i => value[i];
 		} else {
-			typeError('String', 'Array', 'Function');
+			this.typeError('val', 'String', 'Array', 'Function');
 		}
 		for (const [i, token] of this.entries()) {
 			if (token instanceof Token && typeof token.setValue === 'function' && token.setValue.length === 1) {
@@ -730,7 +739,7 @@ class TokenCollection extends Array {
 	 */
 	wrapAll(wrapper) {
 		if (typeof wrapper !== 'function' && !Array.isArray(wrapper)) {
-			typeError('Array', 'Function');
+			this.typeError('wrapAll', 'Array', 'Function');
 		}
 		const firstToken = this._find(),
 			error = new Error('wrapAll 的主体应为同一个父节点下的连续子节点！');
@@ -757,7 +766,7 @@ class TokenCollection extends Array {
 			config = firstToken.getRootNode().getAttribute('config'),
 			token = new Token(`${pre}${this.toString()}${post}`, config).parse();
 		if (token.childNodes.length !== 1) {
-			throw new RangeError(`非法的 wrapper:\n${pre}\n${post}`);
+			throw new RangeError(`非法的 wrapper:\n${noWrap(pre)}\n${noWrap(post)}`);
 		}
 		for (let j = i + this.length - 1; j >= i; j--) {
 			parentNode.removeAt(j);
@@ -772,7 +781,7 @@ class TokenCollection extends Array {
 	 */
 	_wrap(method, wrapper) {
 		if (typeof wrapper !== 'function' && !Array.isArray(wrapper)) {
-			typeError('Array', 'Function');
+			this.typeError(method, 'Array', 'Function');
 		}
 		return this[method](
 			/**
@@ -788,7 +797,7 @@ class TokenCollection extends Array {
 					config = this.getRootNode().getAttribute('config'),
 					token = new Token(`${pre}${string}${post}`, config).parse();
 				if (token.childNodes.length !== 1) {
-					throw new RangeError(`非法的 wrapper:\n${pre}\n${post}`);
+					throw new RangeError(`非法的 wrapper:\n${noWrap(pre)}\n${noWrap(post)}`);
 				}
 				return token.firstChild;
 			},
@@ -852,36 +861,37 @@ const $ = tokens => {
 		},
 	});
 };
-$.hasData = /** @param {Token} element */ element => {
+/* eslint-disable func-names */
+$.hasData = /** @param {Token} element */ function hasData(element) {
 	if (!(element instanceof Token)) {
-		typeError('Token');
+		typeError(this, 'hasData', 'Token');
 	}
-	return $.dataStore.has(element);
+	return this.dataStore.has(element);
 };
-$.data = /** @type {(element: Token, key?: string, value?: any) => any} */ (element, key, value) => {
+$.data = /** @type {function(Token, string, any): any} */ function data(element, key, value) {
 	if (!(element instanceof Token)) {
-		typeError('Token');
+		typeError(this, 'data', 'Token');
 	} else if (key === undefined) {
-		return $.dataStore.get(element);
+		return this.dataStore.get(element);
 	} else if (typeof key !== 'string') {
-		typeError('String');
+		typeError(this, 'data', 'String');
 	} else if (value === undefined) {
-		return $.dataStore.get(element)?.[key];
-	} else if (!$.dataStore.has(element)) {
-		$.dataStore.set(element, {});
+		return this.dataStore.get(element)?.[key];
+	} else if (!this.dataStore.has(element)) {
+		this.dataStore.set(element, {});
 	}
-	$.dataStore.get(element)[key] = value;
+	this.dataStore.get(element)[key] = value;
 	return value;
 };
-$.removeData = /** @type {(element: Token, name?: string) => void} */ (element, name) => {
+$.removeData = /** @type {function(Token, string): void} */ function removeData(element, name) {
 	if (!(element instanceof Token)) {
-		typeError('Token');
+		typeError(this, 'removeData', 'Token');
 	} else if (name === undefined) {
-		$.dataStore.delete(element);
+		this.dataStore.delete(element);
 	} else if (typeof name !== 'string') {
-		typeError('String');
-	} else if ($.dataStore.has(element)) {
-		const data = $.dataStore.get(element);
+		typeError(this, 'removeData', 'String');
+	} else if (this.dataStore.has(element)) {
+		const data = this.dataStore.get(element);
 		delete data[name];
 	}
 };

package/typings/index.d.ts

@@ -41,8 +41,11 @@ declare global {
 
 		readonly MAX_STAGE: number;
 		parse(wikitext: string|Token, include?: boolean, maxStage?: number, config?: ParserConfig): Token;
+		reparse(date: string): Token;
 
 		getTool(): typeof $;
+
+		typeAliases: Record<string, string[]>;
 	}
 }
 

package/typings/node.d.ts

@@ -6,8 +6,8 @@ declare global {
 	type TokenAttribute<T> =
 		T extends 'childNodes' ? (string|Token)[] :
 		T extends 'parentNode' ? Token|undefined :
-		T extends 'optional'|'tags' ? string[] :
-		T extends 'stage' ? number :
+		T extends 'optional'|'tags'|'flags' ? string[] :
+		T extends 'stage'|'indent' ? number :
 		T extends 'config' ? ParserConfig :
 		T extends 'accum' ? accum :
 		T extends 'acceptable' ? Record<string, Ranges> :
@@ -15,7 +15,7 @@ declare global {
 		T extends 'keys' ? Set<string> :
 		T extends 'args' ? Record<string, Set<ParameterToken>> :
 		T extends 'attr' ? Map<string, string|true> :
-		T extends 'include'|'selfLink' ? boolean :
+		T extends 'include'|'selfLink'|'ul'|'ol'|'dt'|'unidirectional'|'bidirectional' ? boolean :
 		T extends 'pattern' ? RegExp :
 		string;
 }

package/typings/token.d.ts

@@ -12,6 +12,7 @@ declare global {
 		protocol: string;
 		interwiki: string[];
 		img: Record<string, string>;
+		variants: string[];
 	}
 
 	type accum = Token[];

package/util/debug.js

@@ -1,12 +1,12 @@
 'use strict';
 
 /**
- * @param {ObjectConstructor} constructor
+ * @param {function}
  * @param {string} method
  * @param {...string} args
  */
-const typeError = ({constructor}, method, ...args) => {
-	throw new TypeError(`${constructor.name}.${method} 方法仅接受 ${args.join('、')} 作为输入参数！`);
+const typeError = ({name}, method, ...args) => {
+	throw new TypeError(`${name}.${method} 方法仅接受 ${args.join('、')} 作为输入参数！`);
 };
 
 /**

package/util/string.js

@@ -54,7 +54,22 @@ const explode = (start, end, separator, str) => {
 	return exploded;
 };
 
+/** @param {string} str */
+const noWrap = str => str.replaceAll('\n', '\\n');
+
+/**
+ * @param {string|Token} token
+ * @returns {string}
+ */
+const normalizeSpace = (token = '', separator = '') => {
+	const Token = require('../src'); // eslint-disable-line no-unused-vars
+	return typeof token === 'string'
+		? token.replaceAll('\n', ' ')
+		: token.childNodes.map(child => typeof child === 'string' ? normalizeSpace(child) : child.toString())
+			.join(separator);
+};
+
 const extUrlChar = '(?:[\\d.]+|\\[[\\da-f:.]+\\]|[^[\\]<>"\\x00-\\x20\\x7f\\p{Zs}\\ufffd])'
 	+ '[^[\\]<>"\\x00-\\x20\\x7f\\p{Zs}\\ufffd]*';
 
-module.exports = {toCase, removeComment, ucfirst, escapeRegExp, text, explode, extUrlChar};
+module.exports = {toCase, removeComment, ucfirst, escapeRegExp, text, explode, noWrap, normalizeSpace, extUrlChar};

package/src/listToken.js

@@ -1,47 +0,0 @@
-'use strict';
-const Token = require('.'),
-	AtomToken = require('./atom'),
-	{fixToken} = require('./util');
-
-class ListToken extends fixToken(Token) {
-	type = 'list';
-
-	/**
-	 * @param {string} syntax
-	 * @param {?string|number|Token|(string|Token)[]} content
-	 * @param {Object<string, any>} config
-	 * @param {Token} parent
-	 * @param {Token[]} accum
-	 */
-	constructor(syntax, content, config = require(Token.config), parent = null, accum = [], isTable = false) {
-		if (/[^:;#*]/.test(syntax)) {
-			throw new RangeError('List语法只接受":"、";"、"#"或"*"！');
-		}
-		super(new AtomToken(syntax, 'list-syntax'), config, true, parent, accum, ['AtomToken', 'Token']);
-		const inner = new Token(content, config, true, this, accum);
-		inner.type = 'list-inner';
-		inner.set('stage', isTable ? 4 : 10);
-		this.lists = new Set(syntax.split(''));
-		this.seal();
-	}
-
-	isDt() {
-		return this.$children[0].contains(';');
-	}
-
-	idDd() {
-		return this.$children[0].contains(':');
-	}
-
-	isOl() {
-		return this.$children[0].contains('#');
-	}
-
-	isUl() {
-		return this.$children[0].contains('*');
-	}
-}
-
-Token.classes.ListToken = ListToken;
-
-module.exports = ListToken;