wikiparser-node 0.0.2 → 0.0.3

package/src/index.js

@@ -39,7 +39,7 @@
  * w: ExtLinkToken
  */
 
-const {typeError, externalUse} = require('../util/debug'),
+const {externalUse} = require('../util/debug'),
 	Ranges = require('../lib/ranges'),
 	AstElement = require('../lib/element'),
 	assert = require('assert/strict'),
@@ -255,7 +255,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 +320,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 +332,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)) {
@@ -519,7 +519,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('指定解析层级的方法仅供熟练用户使用！');
 		}

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');
@@ -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);
@@ -223,7 +223,7 @@ class FileToken extends LinkToken {
 		if (length !== 1 || !firstElementChild?.matches('file#File:F')
 			|| firstElementChild.childElementCount !== 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('..');
@@ -170,9 +170,7 @@ class LinkToken extends Token {
 				}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')
-				}`);
+				throw new SyntaxError(`非法的${this.type === 'link' ? '内链文字' : '分类关键字'}：${noWrap(linkText)}`);
 			}
 			({lastElementChild} = firstElementChild);
 		} else {

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/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('.');
@@ -116,7 +116,7 @@ class ParameterToken extends fixedToken(Token) {
 			|| firstElementChild.childElementCount !== 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

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'),
@@ -84,26 +84,31 @@ class TableToken extends TrToken {
 		} 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),
@@ -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} */

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') {
@@ -231,7 +231,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'),
@@ -75,9 +74,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 +127,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 +197,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(),
@@ -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');
 		}
@@ -383,7 +383,7 @@ class TranscludeToken extends Token {
 		if (length !== 1 || !firstElementChild?.matches(templateLike ? 'template#T' : 'magic-word#lc')
 			|| firstElementChild.childElementCount !== 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 方法仅供模板使用！`);
 		}
@@ -411,7 +411,7 @@ class TranscludeToken extends Token {
 		if (length !== 1 || !firstElementChild?.matches('template#T')
 			|| firstElementChild.childElementCount !== 2 || firstElementChild.lastElementChild.name !== key
 		) {
-			throw new SyntaxError(`非法的命名参数：${key}=${value.replaceAll('\n', '\\n')}`);
+			throw new SyntaxError(`非法的命名参数：${key}=${noWrap(value)}`);
 		}
 		this.appendChild(firstElementChild.lastChild);
 	}
@@ -432,7 +432,7 @@ 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;
@@ -447,7 +447,7 @@ 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;
@@ -470,7 +470,7 @@ 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');
+			this.typeError('replaceFunction', 'String');
 		} else if (this.childElementCount < 2) {
 			throw new Error('尚未指定模块名称！');
 		}
@@ -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;
 			}