wikiparser-node 0.8.1 → 0.9.0

package/src/link/category.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const Title = require('../../lib/title'),
+const {decodeHtml} = require('../../util/string'),
 	Parser = require('../..'),
 	LinkToken = require('.');
 
@@ -13,11 +13,7 @@ class CategoryToken extends LinkToken {
 
 	/** 分类排序关键字 */
 	get sortkey() {
-		return this.childNodes[1]?.text()?.replace(
-			/&#(\d+|x[\da-f]+);|\n/gu,
-			/** @param {string} p */
-			(_, p) => p ? String.fromCodePoint(p[0] === 'x' ? parseInt(p.slice(1), 16) : Number(p)) : '',
-		);
+		return decodeHtml(this.childNodes[1]?.text());
 	}
 
 	set sortkey(text) {
@@ -27,12 +23,11 @@ class CategoryToken extends LinkToken {
 	/**
 	 * @param {string} link 分类名
 	 * @param {string|undefined} text 排序关键字
-	 * @param {Title} title 分类页面标题对象
 	 * @param {accum} accum
 	 * @param {string} delimiter `|`
 	 */
-	constructor(link, text, title, config = Parser.getConfig(), accum = [], delimiter = '|') {
-		super(link, text, title, config, accum, delimiter);
+	constructor(link, text, config = Parser.getConfig(), accum = [], delimiter = '|') {
+		super(link, text, config, accum, delimiter);
 		this.seal(['selfLink', 'interwiki', 'setLangLink', 'setFragment', 'asSelfLink', 'pipeTrick'], true);
 	}
 

package/src/link/file.js

@@ -3,7 +3,6 @@
 const {explode, noWrap} = require('../../util/string'),
 	{generateForChild} = require('../../util/lint'),
 	Parser = require('../..'),
-	Title = require('../../lib/title'),
 	LinkToken = require('.'),
 	ImageParameterToken = require('../imageParameter');
 
@@ -63,13 +62,12 @@ class FileToken extends LinkToken {
 	/**
 	 * @param {string} link 文件名
 	 * @param {string|undefined} text 图片参数
-	 * @param {Title} title 文件标题对象
 	 * @param {accum} accum
 	 * @param {string} delimiter `|`
 	 * @complexity `n`
 	 */
-	constructor(link, text, title, config = Parser.getConfig(), accum = [], delimiter = '|') {
-		super(link, undefined, title, config, accum, delimiter);
+	constructor(link, text, config = Parser.getConfig(), accum = [], delimiter = '|') {
+		super(link, undefined, config, accum, delimiter);
 		this.setAttribute('acceptable', {AtomToken: 0, ImageParameterToken: '1:'});
 		this.append(...explode('-{', '}-', '|', text).map(part => new ImageParameterToken(part, config, accum)));
 		this.seal(
@@ -82,10 +80,13 @@ class FileToken extends LinkToken {
 	 * @override
 	 * @param {number} start 起始位置
 	 */
-	lint(start = 0) {
+	lint(start = this.getAbsoluteIndex()) {
 		const errors = super.lint(start),
-			args = this.getAllArgs(),
-			keys = [...new Set(args.map(({name}) => name))],
+			args = this.getAllArgs().filter(({childNodes}) => {
+				const visibleNodes = childNodes.filter(node => node.text().trim());
+				return visibleNodes.length !== 1 || visibleNodes[0].type !== 'arg';
+			}),
+			keys = [...new Set(args.map(({name}) => name))].filter(key => key !== 'invalid'),
 			frameKeys = keys.filter(key => frame.has(key)),
 			horizAlignKeys = keys.filter(key => horizAlign.has(key)),
 			vertAlignKeys = keys.filter(key => vertAlign.has(key));
@@ -104,24 +105,28 @@ class FileToken extends LinkToken {
 				];
 			}
 			if (relevantArgs.length > 1) {
-				errors.push(...relevantArgs.map(arg => generateForChild(arg, rect, `重复的图片${key}参数`)));
+				errors.push(...relevantArgs.map(
+					arg => generateForChild(arg, rect, Parser.msg('duplicated image $1 parameter', key)),
+				));
 			}
 		}
 		if (frameKeys.size > 1) {
 			errors.push(
-				...args.filter(({name}) => frame.has(name)).map(arg => generateForChild(arg, rect, '冲突的图片框架参数')),
+				...args.filter(({name}) => frame.has(name)).map(
+					arg => generateForChild(arg, rect, 'conflicting image $1 parameter', 'frame'),
+				),
 			);
 		}
 		if (horizAlignKeys.size > 1) {
 			errors.push(
 				...args.filter(({name}) => horizAlign.has(name))
-					.map(arg => generateForChild(arg, rect, '冲突的图片水平对齐参数')),
+					.map(arg => generateForChild(arg, rect, 'conflicting image $1 parameter', 'horizontal-alignment')),
 			);
 		}
 		if (vertAlignKeys.size > 1) {
 			errors.push(
 				...args.filter(({name}) => vertAlign.has(name))
-					.map(arg => generateForChild(arg, rect, '冲突的图片垂直对齐参数')),
+					.map(arg => generateForChild(arg, rect, 'conflicting image $1 parameter', 'vertical-alignment')),
 			);
 		}
 		return errors;

package/src/link/galleryImage.js

@@ -3,7 +3,6 @@
 const {generateForSelf} = require('../../util/lint'),
 	{undo} = require('../../util/debug'),
 	singleLine = require('../../mixin/singleLine'),
-	Title = require('../../lib/title'),
 	Parser = require('../..'),
 	Token = require('..'),
 	FileToken = require('./file');
@@ -22,16 +21,17 @@ class GalleryImageToken extends singleLine(FileToken) {
 	}
 
 	set link(value) {
-		super.link = value;
+		if (this.type !== 'imagemap-image') {
+			super.link = value;
+		}
 	}
 
 	/**
 	 * @param {string} link 图片文件名
 	 * @param {string|undefined} text 图片参数
-	 * @param {Title} title 图片文件标题对象
 	 * @param {accum} accum
 	 */
-	constructor(link, text, title, config = Parser.getConfig(), accum = []) {
+	constructor(link, text, config = Parser.getConfig(), accum = []) {
 		let token;
 		if (text !== undefined) {
 			token = new Token(text, config, true, accum);
@@ -41,7 +41,7 @@ class GalleryImageToken extends singleLine(FileToken) {
 			}
 			accum.splice(accum.indexOf(token), 1);
 		}
-		super(link, token?.toString(), title, config, accum);
+		super(link, token?.toString(), config, accum);
 		this.setAttribute('bracket', false);
 		if (!Object.values(config.img).includes('width')) {
 			this.seal(['size', 'width', 'height'], true);
@@ -87,10 +87,10 @@ class GalleryImageToken extends singleLine(FileToken) {
 	 * @override
 	 * @param {number} start 起始位置
 	 */
-	lint(start = 0) {
+	lint(start = this.getAbsoluteIndex()) {
 		const errors = super.lint(start);
 		if (this.#invalid) {
-			errors.push(generateForSelf(this, {start}, '无效的图库图片'));
+			errors.push(generateForSelf(this, {start}, 'invalid gallery image'));
 		}
 		return errors;
 	}

package/src/link/index.js

@@ -4,7 +4,6 @@ const {generateForChild} = require('../../util/lint'),
 	{noWrap} = require('../../util/string'),
 	{undo} = require('../../util/debug'),
 	Parser = require('../..'),
-	Title = require('../../lib/title'),
 	AstText = require('../../lib/text'),
 	Token = require('..'),
 	AtomToken = require('../atom');
@@ -17,12 +16,12 @@ class LinkToken extends Token {
 	type = 'link';
 	#bracket = true;
 	#delimiter;
-	#fragment = '';
+	#fragment;
 	#encoded = false;
 
 	/** 完整链接，和FileToken保持一致 */
 	get link() {
-		return String(this.#getTitle());
+		return this.#getTitle();
 	}
 
 	set link(link) {
@@ -31,7 +30,8 @@ class LinkToken extends Token {
 
 	/** 是否链接到自身 */
 	get selfLink() {
-		return !this.#getTitle().title;
+		const {title, fragment} = this.#getTitle();
+		return !title && Boolean(fragment);
 	}
 
 	set selfLink(selfLink) {
@@ -46,7 +46,7 @@ class LinkToken extends Token {
 	}
 
 	set fragment(fragment) {
-		this.setFragment(fragment);
+		this.#setFragment(fragment);
 	}
 
 	/** interwiki */
@@ -59,7 +59,7 @@ class LinkToken extends Token {
 			this.typeError('set interwiki', 'String');
 		}
 		const {prefix, main, fragment} = this.#getTitle(),
-			link = `${interwiki}:${prefix}${main}${fragment && '#'}${fragment}`;
+			link = `${interwiki}:${prefix}${main}${fragment === undefined ? '' : `#${fragment}`}`;
 		if (interwiki && !this.isInterwiki(link)) {
 			throw new RangeError(`${interwiki} 不是合法的跨维基前缀!`);
 		}
@@ -79,11 +79,10 @@ class LinkToken extends Token {
 	/**
 	 * @param {string} link 链接标题
 	 * @param {string|undefined} linkText 链接显示文字
-	 * @param {Title} title 链接标题对象
 	 * @param {accum} accum
 	 * @param {string} delimiter `|`
 	 */
-	constructor(link, linkText, title, config = Parser.getConfig(), accum = [], delimiter = '|') {
+	constructor(link, linkText, config = Parser.getConfig(), accum = [], delimiter = '|') {
 		super(undefined, config, true, accum, {
 			AtomToken: 0, Token: 1,
 		});
@@ -191,22 +190,22 @@ class LinkToken extends Token {
 	 * @override
 	 * @param {number} start 起始位置
 	 */
-	lint(start = 0) {
+	lint(start = this.getAbsoluteIndex()) {
 		const errors = super.lint(start),
 			{childNodes: [target, linkText], type: linkType} = this;
 		let rect;
-		if (this.#encoded && !this.interwiki) {
+		if (this.#encoded) {
 			rect = {start, ...this.getRootNode().posFromIndex(start)};
-			errors.push(generateForChild(target, rect, '内链中不必要的URL编码'));
+			errors.push(generateForChild(target, rect, 'unnecessary URL encoding in an internal link'));
 		}
 		if (linkType === 'link' && linkText?.childNodes?.some(
 			/** @param {AstText} */ ({type, data}) => type === 'text' && data.includes('|'),
 		)) {
 			rect ||= {start, ...this.getRootNode().posFromIndex(start)};
-			errors.push(generateForChild(linkText, rect, '链接文本中多余的"|"', 'warning'));
-		} else if (linkType !== 'link' && this.#fragment) {
+			errors.push(generateForChild(linkText, rect, 'additional "|" in the link text', 'warning'));
+		} else if (linkType !== 'link' && this.#fragment !== undefined) {
 			rect ||= {start, ...this.getRootNode().posFromIndex(start)};
-			errors.push(generateForChild(target, rect, '多余的fragment'));
+			errors.push(generateForChild(target, rect, 'useless fragment'));
 		}
 		return errors;
 	}
@@ -286,10 +285,12 @@ class LinkToken extends Token {
 	 * @throws `SyntaxError` 非法的fragment
 	 */
 	#setFragment(fragment, page = true) {
-		fragment = String(fragment).replace(/[<>[\]#|=]/gu, p => encodeURIComponent(p));
+		fragment &&= String(fragment).replace(/[<>[\]#|=]/gu, p => encodeURIComponent(p));
 		const include = this.getAttribute('include'),
 			config = this.getAttribute('config'),
-			root = Parser.parse(`[[${page ? `:${this.name}` : ''}#${fragment}]]`, include, 6, config),
+			root = Parser.parse(`[[${page ? `:${this.name}` : ''}${
+				fragment === undefined ? '' : `#${fragment}`
+			}]]`, include, 6, config),
 			{length, firstChild: wikiLink} = root,
 			{type, length: linkLength, firstChild} = wikiLink;
 		if (length !== 1 || type !== 'link' || linkLength !== 1) {
@@ -315,8 +316,8 @@ class LinkToken extends Token {
 	 * @throws `RangeError` 空fragment
 	 */
 	asSelfLink(fragment = this.fragment) {
-		fragment = String(fragment);
-		if (!fragment.trim()) {
+		fragment &&= String(fragment);
+		if (!fragment?.trim()) {
 			throw new RangeError(`${this.constructor.name}.asSelfLink 方法必须指定非空的 fragment！`);
 		}
 		this.#setFragment(fragment, false);

package/src/magicLink.js

@@ -43,7 +43,7 @@ class MagicLinkToken extends Token {
 	 * @override
 	 * @param {number} start 起始位置
 	 */
-	lint(start = 0) {
+	lint(start = this.getAbsoluteIndex()) {
 		const errors = super.lint(start),
 			source = `[，；。：！？（）]+${this.type === 'ext-link-url' ? '|\\|+' : ''}`;
 		let /** @type {{top: number, left: number}} */ rect;
@@ -63,7 +63,7 @@ class MagicLinkToken extends Token {
 					startCol = (top > 1 ? 0 : refError.startCol) + left;
 				return {
 					...refError,
-					message: `URL中的${char === '|' ? '"|"' : '全角标点'}`,
+					message: Parser.msg('$1 in URL', char === '|' ? '"|"' : Parser.msg('full-width punctuation')),
 					startIndex,
 					endIndex: startIndex + length,
 					startLine,

package/src/nested/index.js

@@ -34,10 +34,7 @@ class NestedToken extends Token {
 				}
 				return str;
 			},
-		)?.replace(/(?<=^|\0\d+[ce]\x7F).*?(?=$|\0\d+[ce]\x7F)/gsu, substr => {
-			if (substr === '') {
-				return '';
-			}
+		)?.replace(/(?<=^|\0\d+[ce]\x7F)[^\0]+(?=$|\0\d+[ce]\x7F)/gu, substr => {
 			new NoincludeToken(substr, config, accum);
 			return `\0${accum.length}c\x7F`;
 		});
@@ -51,7 +48,7 @@ class NestedToken extends Token {
 	 * @override
 	 * @param {number} start 起始位置
 	 */
-	lint(start = 0) {
+	lint(start = this.getAbsoluteIndex()) {
 		let rect;
 		return [
 			...super.lint(start),
@@ -63,7 +60,7 @@ class NestedToken extends Token {
 				return str && !/^<!--.*-->$/u.test(str);
 			}).map(child => {
 				rect ||= {start, ...this.getRootNode().posFromIndex(start)};
-				return generateForChild(child, rect, `<${this.name}>内的无效内容`);
+				return generateForChild(child, rect, Parser.msg('invalid content in <$1>', this.name));
 			}),
 		];
 	}

package/src/nowiki/comment.js

@@ -43,8 +43,8 @@ class CommentToken extends hidden(NowikiToken) {
 	 * @override
 	 * @param {number} start 起始位置
 	 */
-	lint(start = 0) {
-		return this.closed ? [] : [generateForSelf(this, {start}, '未闭合的HTML注释')];
+	lint(start = this.getAbsoluteIndex()) {
+		return this.closed ? [] : [generateForSelf(this, {start}, 'unclosed HTML comment')];
 	}
 
 	/**

package/src/nowiki/index.js

@@ -25,10 +25,10 @@ class NowikiToken extends fixedToken(Token) {
 	 * @override
 	 * @param {number} start 起始位置
 	 */
-	lint(start = 0) {
+	lint(start = this.getAbsoluteIndex()) {
 		const {type, name} = this;
 		return type === 'ext-inner' && (name === 'templatestyles' || name === 'section') && String(this)
-			? [generateForSelf(this, {start}, `<${name}>标签内不应有任何内容`)]
+			? [generateForSelf(this, {start}, Parser.msg('nothing should be in <$1>', name))]
 			: super.lint(start);
 	}
 

package/src/nowiki/quote.js

@@ -26,12 +26,12 @@ class QuoteToken extends NowikiToken {
 	 * @this {AstText}
 	 * @param {number} start 起始位置
 	 */
-	lint(start = 0) {
+	lint(start = this.getAbsoluteIndex()) {
 		const {previousSibling, nextSibling} = this,
-			message = `孤立的"'"`,
+			message = Parser.msg('lonely "$1"', `'`),
 			/** @type {LintError[]} */ errors = [];
 		let refError, wikitext;
-		if (previousSibling?.type === 'text' && previousSibling.data.at(-1) === `'`) {
+		if (previousSibling?.type === 'text' && previousSibling.data.endsWith(`'`)) {
 			refError = generateForSelf(this, {start}, message);
 			wikitext = String(this.getRootNode());
 			const {startIndex: endIndex, startLine: endLine, startCol: endCol} = refError,

package/src/paramTag/index.js

@@ -58,16 +58,16 @@ class ParamTagToken extends Token {
 	 * @override
 	 * @param {number} start 起始位置
 	 */
-	lint(start = 0) {
+	lint(start = this.getAbsoluteIndex()) {
 		let /** @type {{top: number, left: number}} */ rect;
 		return this.childNodes.filter(child => {
 			const {childNodes} = child,
 				i = childNodes.findIndex(({type}) => type !== 'text'),
 				str = (i >= 0 ? childNodes.slice(0, i).map(String).join('') : String(child)).trim();
-			return str && !(i >= 0 ? /^[a-z]+\s*(?:=|$)/iu : /^[a-z]+\s*=/iu).test(str);
+			return str && !(i >= 0 ? /^[a-z]+(?:\[\])?\s*(?:=|$)/iu : /^[a-z]+(?:\[\])?\s*=/iu).test(str);
 		}).map(child => {
 			rect ||= {start, ...this.getRootNode().posFromIndex(start)};
-			return generateForChild(child, rect, `${this.name}的无效参数`);
+			return generateForChild(child, rect, Parser.msg('invalid parameter of $1', this.name));
 		});
 	}
 

package/src/parameter.js

@@ -117,13 +117,13 @@ class ParameterToken extends fixedToken(Token) {
 	 * @override
 	 * @param {number} start 起始位置
 	 */
-	lint(start = 0) {
+	lint(start = this.getAbsoluteIndex()) {
 		const errors = super.lint(start),
 			{firstChild, lastChild} = this,
 			link = new RegExp(`https?://${extUrlCharFirst}${extUrlChar}$`, 'iu')
 				.exec(firstChild.toString('comment, noinclude, include'))?.[0];
 		if (link && new URL(link).search) {
-			const e = generateForChild(firstChild, {start}, '匿名参数中未转义的查询参数');
+			const e = generateForChild(firstChild, {start}, 'unescaped query string in an anonymous parameter');
 			errors.push({
 				...e,
 				startIndex: e.endIndex,

package/src/table/index.js

@@ -72,13 +72,12 @@ const format = (cells, attr = {}, multi = false) => {
  */
 const fill = (y, rowToken, layout, maxCol, token) => {
 	const rowLayout = layout[y],
-		{childNodes} = rowToken,
-		lastIndex = childNodes.findLastIndex(child => child instanceof TdToken && child.subtype !== 'caption') + 1
-			|| undefined;
+		lastIndex = rowToken.childNodes.findLastIndex(child => child instanceof TdToken && child.subtype !== 'caption'),
+		pos = lastIndex + 1 || undefined;
 	Parser.run(() => {
 		for (let i = 0; i < maxCol; i++) {
 			if (!rowLayout[i]) {
-				rowToken.insertAt(token.cloneNode(), lastIndex);
+				rowToken.insertAt(token.cloneNode(), pos);
 			}
 		}
 	});
@@ -171,12 +170,12 @@ class TableToken extends TrToken {
 	 * @override
 	 * @param {number} start 起始位置
 	 */
-	lint(start = 0) {
+	lint(start = this.getAbsoluteIndex()) {
 		const errors = super.lint(start);
 		if (!this.closed) {
 			const {firstChild, lastChild: tr} = this,
 				{lastChild: td} = tr,
-				error = generateForChild(firstChild, {start}, '未闭合的表格');
+				error = generateForChild(firstChild, {start}, 'unclosed table');
 			errors.push({...error, excerpt: String(td?.type === 'td' ? td : tr).slice(0, 50)});
 		}
 		return errors;

package/src/table/td.js

@@ -9,7 +9,7 @@ const {generateForChild} = require('../../util/lint'),
 	TrToken = require('./tr');
 
 const aliases = {td: '\n|', th: '\n!', caption: '\n|+'},
-	openingPattern = /^(?:\n[\S\n]*(?:[|!]|\|\+|\{\{\s*!\s*\}\}\+?)|(?:\||\{\{\s*!\s*\}\}){2}|!!|\{\{\s*!!\s*\}\})$/u;
+	openingPattern = /^(?:\n[^\S\n]*(?:[|!]|\|\+|\{\{\s*!\s*\}\}\+?)|(?:\||\{\{\s*!\s*\}\}){2}|!!|\{\{\s*!!\s*\}\})$/u;
 
 /**
  * `<td>`、`<th>`和`<caption>`
@@ -166,13 +166,12 @@ class TdToken extends fixedToken(TrToken) {
 	 * @override
 	 * @param {number} start 起始位置
 	 */
-	lint(start = 0) {
-		const errors = super.lint(start),
-			{lastChild} = this;
+	lint(start = this.getAbsoluteIndex()) {
+		const errors = super.lint(start);
 		start += this.getRelativeIndex(-1);
-		for (const child of lastChild.childNodes) {
+		for (const child of this.lastChild.childNodes) {
 			if (child.type === 'text' && child.data.includes('|')) {
-				errors.push(generateForChild(child, {start}, '表格单元格中多余的"|"', 'warning'));
+				errors.push(generateForChild(child, {start}, 'additional "|" in a table cell', 'warning'));
 			}
 		}
 		return errors;

package/src/table/tr.js

@@ -55,7 +55,7 @@ class TrToken extends attributeParent(Token, 1) {
 	 * @override
 	 * @param {number} start 起始位置
 	 */
-	lint(start = 0) {
+	lint(start = this.getAbsoluteIndex()) {
 		const TranscludeToken = require('../transclude'),
 			ArgToken = require('../arg');
 		const errors = super.lint(start),
@@ -75,7 +75,7 @@ class TrToken extends attributeParent(Token, 1) {
 				}
 			} catch {}
 		}
-		const error = generateForChild(inter, {start}, '将被移出表格的内容');
+		const error = generateForChild(inter, {start}, 'content to be moved out from the table');
 		errors.push({
 			...error,
 			startIndex: error.startIndex + 1,
@@ -207,7 +207,7 @@ class TrToken extends attributeParent(Token, 1) {
 	getRowCount() {
 		const TdToken = require('./td');
 		return Number(this.childNodes.some(
-			child => child instanceof TdToken && child.isIndependent() && child.firstChild.text().at(-1) !== '+',
+			child => child instanceof TdToken && child.isIndependent() && !child.firstChild.text().endsWith('+'),
 		));
 	}
 

package/src/tagPair/ext.js

@@ -2,7 +2,6 @@
 
 const {generateForSelf} = require('../../util/lint'),
 	attributeParent = require('../../mixin/attributeParent'),
-	path = require('path'),
 	Parser = require('../..'),
 	Token = require('..'),
 	TagPairToken = require('.'),
@@ -65,12 +64,19 @@ class ExtToken extends attributeParent(TagPairToken) {
 				innerToken = new CharinsertToken(inner, newConfig, accum);
 				break;
 			}
-			case 'references':
-			case 'choose':
+			case 'references': {
+				const ReferencesToken = require('../nested/references');
+				innerToken = new ReferencesToken(inner, newConfig, accum);
+				break;
+			}
+			case 'choose': {
+				const ChooseToken = require('../nested/choose');
+				innerToken = new ChooseToken(inner, newConfig, accum);
+				break;
+			}
 			case 'combobox': {
-				const NestedToken = require('../nested'),
-					/** @type {typeof NestedToken} */ NestedExtToken = require(path.join('..', 'nested', lcName));
-				innerToken = new NestedExtToken(inner, newConfig, accum);
+				const ComboboxToken = require('../nested/combobox');
+				innerToken = new ComboboxToken(inner, newConfig, accum);
 				break;
 			}
 			case 'imagemap': {
@@ -113,13 +119,13 @@ class ExtToken extends attributeParent(TagPairToken) {
 	 * @override
 	 * @param {number} start 起始位置
 	 */
-	lint(start = 0) {
+	lint(start = this.getAbsoluteIndex()) {
 		const errors = super.lint(start);
 		if (this.name !== 'nowiki' && this.closest('html-attrs, table-attrs')) {
 			const root = this.getRootNode(),
 				excerpt = String(root).slice(Math.max(0, start - 25), start + 25),
 				rect = {start, ...root.posFromIndex(start)};
-			errors.push({...generateForSelf(this, rect, 'HTML标签属性中的扩展标签'), excerpt});
+			errors.push({...generateForSelf(this, rect, 'extension tag in HTML tag attributes'), excerpt});
 		}
 		return errors;
 	}