wikiparser-node 0.4.0 → 0.6.1

package/src/parameter.js

@@ -14,7 +14,7 @@ class ParameterToken extends fixedToken(Token) {
 
 	/** 是否是匿名参数 */
 	get anon() {
-		return this.firstElementChild.childNodes.length === 0;
+		return this.firstChild.childNodes.length === 0;
 	}
 
 	/** getValue()的getter */
@@ -26,6 +26,19 @@ class ParameterToken extends fixedToken(Token) {
 		this.setValue(value);
 	}
 
+	/**
+	 * 是否是重复参数
+	 * @this {ParameterToken & {parentNode: TranscludeToken}}
+	 */
+	get duplicated() {
+		const TranscludeToken = require('./transclude');
+		try {
+			return Boolean(this.parentNode?.getDuplicatedArgs()?.some(([key]) => key === this.name));
+		} catch {
+			return false;
+		}
+	}
+
 	/**
 	 * @param {string|number} key 参数名
 	 * @param {string} value 参数值
@@ -42,34 +55,23 @@ class ParameterToken extends fixedToken(Token) {
 		this.append(keyToken, token.setAttribute('stage', 2));
 	}
 
-	/** @override */
-	cloneNode() {
-		const [key, value] = this.cloneChildNodes(),
-			config = this.getAttribute('config');
-		return Parser.run(() => {
-			const token = new ParameterToken(this.anon ? Number(this.name) : undefined, undefined, config);
-			token.firstElementChild.safeReplaceWith(key);
-			token.lastElementChild.safeReplaceWith(value);
-			return token.afterBuild();
-		});
-	}
-
 	/** @override */
 	afterBuild() {
 		if (!this.anon) {
-			const name = this.firstElementChild.text().trim(),
+			const TranscludeToken = require('./transclude');
+			const name = this.firstChild.text().trim(),
 				{parentNode} = this;
 			this.setAttribute('name', name);
-			if (parentNode && parentNode instanceof require('./transclude')) {
+			if (parentNode && parentNode instanceof TranscludeToken) {
 				parentNode.getAttribute('keys').add(name);
 				parentNode.getArgs(name, false, false).add(this);
 			}
 		}
 		const /** @type {AstListener} */ parameterListener = ({prevTarget}, data) => {
 			if (!this.anon) { // 匿名参数不管怎么变动还是匿名
-				const {firstElementChild, name} = this;
-				if (prevTarget === firstElementChild) {
-					const newKey = firstElementChild.text().trim();
+				const {firstChild, name} = this;
+				if (prevTarget === firstChild) {
+					const newKey = firstChild.text().trim();
 					data.oldKey = name;
 					data.newKey = newKey;
 					this.setAttribute('name', newKey);
@@ -87,7 +89,7 @@ class ParameterToken extends fixedToken(Token) {
 	 */
 	toString(selector) {
 		return this.anon && !(selector && this.matches(selector))
-			? this.lastElementChild.toString(selector)
+			? this.lastChild.toString(selector)
 			: super.toString(selector, '=');
 	}
 
@@ -96,12 +98,29 @@ class ParameterToken extends fixedToken(Token) {
 		return this.anon ? 0 : 1;
 	}
 
+	/** @override */
+	print() {
+		return super.print({sep: this.anon ? '' : '='});
+	}
+
+	/** @override */
+	cloneNode() {
+		const [key, value] = this.cloneChildNodes(),
+			config = this.getAttribute('config');
+		return Parser.run(() => {
+			const token = new ParameterToken(this.anon ? Number(this.name) : undefined, undefined, config);
+			token.firstChild.safeReplaceWith(key);
+			token.lastChild.safeReplaceWith(value);
+			return token.afterBuild();
+		});
+	}
+
 	/**
 	 * @override
 	 * @returns {string}
 	 */
 	text() {
-		return this.anon ? this.lastElementChild.text() : super.text('=');
+		return this.anon ? this.lastChild.text() : super.text('=');
 	}
 
 	/**
@@ -114,37 +133,46 @@ class ParameterToken extends fixedToken(Token) {
 		return this.replaceWith(token);
 	}
 
-	/** 获取参数值 */
+	/**
+	 * 获取参数值
+	 * @this {ParameterToken & {parentNode: TranscludeToken}}
+	 */
 	getValue() {
-		const value = this.lastElementChild.text();
-		return this.anon && this.parentNode?.matches('template, magic-word#invoke') ? value : value.trim();
+		const TranscludeToken = require('./transclude');
+		const value = this.lastChild.text();
+		return this.anon && this.parentNode?.isTemplate() ? value : value.trim();
 	}
 
 	/**
 	 * 设置参数值
+	 * @this {ParameterToken & {parentNode: TranscludeToken}}
 	 * @param {string} value 参数值
 	 * @throws `SyntaxError` 非法的模板参数
 	 */
 	setValue(value) {
 		value = String(value);
-		const templateLike = this.parentNode?.matches('template, magic-word#invoke'),
+		const TranscludeToken = require('./transclude');
+		const templateLike = this.parentNode?.isTemplate(),
 			wikitext = `{{${templateLike ? ':T|' : 'lc:'}${this.anon ? '' : '1='}${value}}}`,
 			root = Parser.parse(wikitext, this.getAttribute('include'), 2, this.getAttribute('config')),
-			{childNodes: {length}, firstElementChild} = root,
-			/** @type {ParameterToken} */ lastElementChild = firstElementChild?.lastElementChild;
-		if (length !== 1 || !firstElementChild?.matches(templateLike ? 'template#T' : 'magic-word#lc')
-			|| firstElementChild.childNodes.length !== 2
-			|| lastElementChild.anon !== this.anon || lastElementChild.name !== '1'
+			{length, firstChild: transclude} = root,
+			/** @type {Token & {lastChild: ParameterToken}} */
+			{lastChild: parameter, type, name, length: transcludeLength} = transclude,
+			targetType = templateLike ? 'template' : 'magic-word',
+			targetName = templateLike ? 'T' : 'lc';
+		if (length !== 1 || type !== targetType || name !== targetName || transcludeLength !== 2
+			|| parameter.anon !== this.anon || parameter.name !== '1'
 		) {
 			throw new SyntaxError(`非法的模板参数：${noWrap(value)}`);
 		}
-		const {lastChild} = lastElementChild;
-		lastElementChild.destroy(true);
-		this.lastElementChild.safeReplaceWith(lastChild);
+		const {lastChild} = parameter;
+		parameter.destroy(true);
+		this.lastChild.safeReplaceWith(lastChild);
 	}
 
 	/**
 	 * 修改参数名
+	 * @this {ParameterToken & {parentNode: TranscludeToken}}
 	 * @param {string} key 新参数名
 	 * @param {boolean} force 是否无视冲突命名
 	 * @throws `Error` 仅用于模板参数
@@ -155,31 +183,30 @@ class ParameterToken extends fixedToken(Token) {
 		if (typeof key !== 'string') {
 			this.typeError('rename', 'String');
 		}
+		const TranscludeToken = require('./transclude');
 		const {parentNode} = this;
 		// 必须检测是否是TranscludeToken
-		if (!parentNode || !parentNode.matches('template, magic-word#invoke')
-			|| !(parentNode instanceof require('./transclude'))
-		) {
+		if (!parentNode?.isTemplate() || !(parentNode instanceof TranscludeToken)) {
 			throw new Error(`${this.constructor.name}.rename 方法仅用于模板参数！`);
 		}
 		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.childNodes.length !== 2) {
+			{length, firstChild: template} = root,
+			{type, name, lastChild: parameter, length: templateLength} = template;
+		if (length !== 1 || type !== 'template' || name !== 'T' || templateLength !== 2) {
 			throw new SyntaxError(`非法的模板参数名：${key}`);
 		}
-		const {lastElementChild} = firstElementChild,
-			{name, firstChild} = lastElementChild;
-		if (this.name === name) {
-			Parser.warn('未改变实际参数名', name);
-		} else if (parentNode.hasArg(name)) {
+		const {name: parameterName, firstChild} = parameter;
+		if (this.name === parameterName) {
+			Parser.warn('未改变实际参数名', parameterName);
+		} else if (parentNode.hasArg(parameterName)) {
 			if (force) {
-				Parser.warn('参数更名造成重复参数', name);
+				Parser.warn('参数更名造成重复参数', parameterName);
 			} else {
-				throw new RangeError(`参数更名造成重复参数：${name}`);
+				throw new RangeError(`参数更名造成重复参数：${parameterName}`);
 			}
 		}
-		lastElementChild.destroy(true);
-		this.firstElementChild.safeReplaceWith(firstChild);
+		parameter.destroy(true);
+		this.firstChild.safeReplaceWith(firstChild);
 	}
 }
 

package/src/syntax.js

@@ -7,7 +7,7 @@ const {undo} = require('../util/debug'),
 
 /**
  * 满足特定语法格式的plain Token
- * @classdesc `{childNodes: (AstText|Token)[]}`
+ * @classdesc `{childNodes: ...AstText|Token}`
  */
 class SyntaxToken extends Token {
 	#pattern;
@@ -65,6 +65,14 @@ class SyntaxToken extends Token {
 		return key === 'pattern' ? this.#pattern : super.getAttribute(key);
 	}
 
+	/**
+	 * @override
+	 * @param {PropertyKey} key 属性键
+	 */
+	hasAttribute(key) {
+		return key === 'pattern' || super.hasAttribute(key);
+	}
+
 	/**
 	 * @override
 	 * @param {...Token} elements 待替换的子节点

package/src/table/index.js

@@ -2,12 +2,13 @@
 
 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;
@@ -123,7 +124,7 @@ class TableToken extends TrToken {
 
 	/** 表格是否闭合 */
 	get closed() {
-		return this.lastElementChild.type === 'table-syntax';
+		return this.lastChild.type === 'table-syntax';
 	}
 
 	set closed(closed) {
@@ -154,11 +155,11 @@ class TableToken extends TrToken {
 	 * @throws `SyntaxError` 表格的闭合部分非法
 	 */
 	insertAt(token, i = this.childNodes.length) {
-		const previous = this.children.at(i - 1);
+		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))}`);
@@ -166,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`
@@ -177,13 +190,13 @@ class TableToken extends TrToken {
 		const config = this.getAttribute('config'),
 			accum = this.getAttribute('accum'),
 			inner = !halfParsed && Parser.parse(syntax, this.getAttribute('include'), 2, config),
-			{lastElementChild} = this;
+			{lastChild} = this;
 		if (!halfParsed && !closingPattern.test(inner.text())) {
 			throw new SyntaxError(`表格的闭合部分不符合语法！${noWrap(syntax)}`);
-		} else if (lastElementChild instanceof SyntaxToken) {
-			lastElementChild.replaceChildren(...inner.childNodes);
+		} 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: ':',
 				});
@@ -202,7 +215,7 @@ class TableToken extends TrToken {
 	 */
 	getRowCount() {
 		return super.getRowCount()
-			+ this.children.filter(child => child.type === 'tr' && child.getRowCount()).length;
+			+ this.childNodes.filter(child => child.type === 'tr' && child.getRowCount()).length;
 	}
 
 	/** @override */
@@ -228,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(),
@@ -241,7 +254,7 @@ class TableToken extends TrToken {
 		} else if (isRow) {
 			n--;
 		}
-		for (const child of this.children.slice(2)) {
+		for (const child of this.childNodes.slice(2)) {
 			if (child.type === 'tr' && child.getRowCount()) {
 				n--;
 				if (n < 0) {
@@ -262,7 +275,7 @@ class TableToken extends TrToken {
 	getAllRows() {
 		return [
 			...super.getRowCount() ? [this] : [],
-			...this.children.filter(child => child.type === 'tr' && child.getRowCount()),
+			...this.childNodes.filter(child => child.type === 'tr' && child.getRowCount()),
 		];
 	}
 
@@ -295,7 +308,7 @@ class TableToken extends TrToken {
 			let j = 0,
 				k = 0,
 				last;
-			for (const cell of rows[i].children.slice(2)) {
+			for (const cell of rows[i].childNodes.slice(2)) {
 				if (cell instanceof TdToken) {
 					if (cell.isIndependent()) {
 						last = cell.subtype !== 'caption';
@@ -344,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],
@@ -358,19 +371,19 @@ 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],
 			coords = rowLayout?.[x];
 		if (coords) {
 			return {...coords, start: coords.row === y && rowLayout[x - 1] !== coords};
-		} else if (!rowLayout && y === 0) {
-			return {row: 0, column: 0, start: true};
+		} else if (rowLayout || y > 0) {
+			return x === rowLayout?.length
+				? {row: y, column: (rowLayout.findLast(({row}) => row === y)?.column ?? -1) + 1, start: true}
+				: undefined;
 		}
-		return x === rowLayout?.length
-			? {row: y, column: (rowLayout.findLast(({row}) => row === y)?.column ?? -1) + 1, start: true}
-			: undefined;
+		return {row: 0, column: 0, start: true};
 	}
 
 	/**
@@ -379,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();
@@ -394,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(),
@@ -474,7 +487,7 @@ class TableToken extends TrToken {
 		if (coords.column === undefined) {
 			const {x, y} = coords;
 			coords = this.toRawCoords(coords);
-			if (!coords?.start) { // eslint-disable-line unicorn/consistent-destructuring
+			if (!coords?.start) {
 				throw new RangeError(`指定的坐标不是单元格起始点：(${x}, ${y})`);
 			}
 		}
@@ -490,16 +503,16 @@ class TableToken extends TrToken {
 	 */
 	#prependTableRow() {
 		const row = Parser.run(() => new TrToken('\n|-', undefined, this.getAttribute('config'))),
-			{children} = this,
-			[,, plain] = children,
-			start = plain?.isPlain() ? 3 : 2,
-			/** @type {TdToken[]} */ tdChildren = children.slice(start),
+			{childNodes} = this,
+			[,, plain] = childNodes,
+			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);
 				}
 			}
 		});
@@ -516,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)) {
@@ -539,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) {
@@ -562,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(),
@@ -631,11 +645,11 @@ class TableToken extends TrToken {
 	 */
 	removeTableCol(x) {
 		for (const [token, start] of this.getFullCol(x)) {
-			const {colspan, lastElementChild} = token;
+			const {colspan, lastChild} = token;
 			if (colspan > 1) {
 				token.colspan = colspan - 1;
 				if (start) {
-					lastElementChild.replaceChildren();
+					lastChild.replaceChildren();
 				}
 			} else {
 				token.remove();
@@ -651,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(),
@@ -664,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(),
@@ -703,7 +717,7 @@ class TableToken extends TrToken {
 		if (x !== undefined) {
 			coords = this.toRawCoords(coords);
 		}
-		if (coords.start === false || x === undefined) { // eslint-disable-line unicorn/consistent-destructuring
+		if (coords.start === false || x === undefined) {
 			({x, y} = this.toRenderedCoords(coords));
 		}
 		const splitting = {rowspan: 1, colspan: 1};
@@ -804,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();
@@ -844,13 +858,13 @@ 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(),
 			afterToken = this.getNthRow(after),
 			/** @type {TdToken[]} */
-			cells = afterToken.children.filter(child => child instanceof TdToken && child.subtype !== 'caption');
+			cells = afterToken.childNodes.filter(child => child instanceof TdToken && child.subtype !== 'caption');
 
 		/**
 		 * @type {(i: number, oneRow?: boolean) => number[]}
@@ -897,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();
@@ -926,7 +940,7 @@ class TableToken extends TrToken {
 					if (start) {
 						const original = token;
 						token = token.cloneNode();
-						original.lastElementChild.replaceChildren();
+						original.lastChild.replaceChildren();
 						token.colspan = 1;
 					}
 				}
@@ -934,7 +948,7 @@ class TableToken extends TrToken {
 					const col = rowLayout.slice(reference + Number(after)).find(({row}) => row === i)?.column;
 					rowToken.insertBefore(
 						token, col === undefined && rowToken.type === 'table'
-							? rowToken.children.slice(2).find(isRowEnd)
+							? rowToken.childNodes.slice(2).find(isRowEnd)
 							: col !== undefined && rowToken.getNthCol(col),
 					);
 				}