wikiparser-node 0.0.0 → 0.0.3

package/src/attribute.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const {typeError, externalUse} = require('../util/debug'),
+const {externalUse} = require('../util/debug'),
 	{toCase, removeComment} = require('../util/string'),
 	/** @type {Parser} */ Parser = require('..'),
 	Token = require('.');
@@ -147,7 +147,7 @@ class AttributeToken extends Token {
 	/** @param {string} key */
 	hasAttr(key) {
 		if (typeof key !== 'string') {
-			typeError(this, 'hasAttr', 'String');
+			this.typeError('hasAttr', 'String');
 		}
 		return this.#attr.has(key.toLowerCase().trim());
 	}
@@ -161,7 +161,7 @@ class AttributeToken extends Token {
 		if (key === undefined) {
 			return Object.fromEntries(this.#attr);
 		} else if (typeof key !== 'string') {
-			typeError(this, 'getAttr', 'String');
+			this.typeError('getAttr', 'String');
 		}
 		return this.#attr.get(key.toLowerCase().trim());
 	}
@@ -182,7 +182,7 @@ class AttributeToken extends Token {
 	setAttr(key, value, init = false) {
 		init &&= !externalUse('setAttr');
 		if (typeof key !== 'string' || !['string', 'boolean'].includes(typeof value)) {
-			typeError(this, 'setValue', 'String', 'Boolean');
+			this.typeError('setValue', 'String', 'Boolean');
 		} else if (!init && this.type === 'ext-attr' && typeof value === 'string' && value.includes('>')) {
 			throw new RangeError('扩展标签属性不能包含 ">"！');
 		}
@@ -214,7 +214,7 @@ class AttributeToken extends Token {
 	 */
 	removeAttr(key) {
 		if (typeof key !== 'string') {
-			typeError(this, 'removeAttr', 'String');
+			this.typeError('removeAttr', 'String');
 		}
 		key = key.toLowerCase().trim();
 		if (this.#attr.delete(key)) {
@@ -229,7 +229,7 @@ class AttributeToken extends Token {
 	 */
 	toggleAttr(key, force) {
 		if (typeof key !== 'string') {
-			typeError(this, 'toggleAttr', 'String');
+			this.typeError('toggleAttr', 'String');
 		} else if (force !== undefined) {
 			force = Boolean(force);
 		}

package/src/extLink.js

@@ -1,6 +1,7 @@
 'use strict';
 
-const /** @type {Parser} */ Parser = require('..'),
+const {noWrap} = require('../util/string'),
+	/** @type {Parser} */ Parser = require('..'),
 	Token = require('.'),
 	MagicLinkToken = require('./magicLink');
 
@@ -12,16 +13,13 @@ class ExtLinkToken extends Token {
 	type = 'ext-link';
 	#space;
 
-	/** @this {ExtLinkToken & {firstElementChild: MagicLinkToken}} */
+	/** @this {{firstChild: MagicLinkToken}} */
 	get protocol() {
-		return this.firstElementChild.protocol;
+		return this.firstChild.protocol;
 	}
-	/**
-	 * @this {ExtLinkToken & {firstElementChild: MagicLinkToken}}
-	 * @param {string} value
-	 */
+	/** @this {{firstChild: MagicLinkToken}} */
 	set protocol(value) {
-		this.firstElementChild.protocol = value;
+		this.firstChild.protocol = value;
 	}
 
 	/**
@@ -52,7 +50,7 @@ class ExtLinkToken extends Token {
 	}
 
 	toString() {
-		return `[${super.toString(this.#space)}]`;
+		return `[${this.firstElementChild.toString()}${this.#space}${this.children[1]?.toString() ?? ''}]`;
 	}
 
 	getPadding() {
@@ -100,7 +98,7 @@ class ExtLinkToken extends Token {
 		const root = Parser.parse(`[//url ${text}]`, this.getAttribute('include'), 8, this.getAttribute('config')),
 			{childNodes: {length}, firstElementChild} = root;
 		if (length !== 1 || firstElementChild?.type !== 'ext-link' || firstElementChild.childElementCount !== 2) {
-			throw new SyntaxError(`非法的外链文字：${text.replaceAll('\n', '\\n')}`);
+			throw new SyntaxError(`非法的外链文字：${noWrap(text)}`);
 		}
 		const {lastChild} = firstElementChild;
 		if (this.childElementCount === 1) {

package/src/heading.js

@@ -1,7 +1,6 @@
 'use strict';
 
-const {typeError} = require('../util/debug'),
-	fixedToken = require('../mixin/fixedToken'),
+const fixedToken = require('../mixin/fixedToken'),
 	/** @type {Parser} */ Parser = require('..'),
 	Token = require('.');
 
@@ -76,7 +75,7 @@ class HeadingToken extends fixedToken(Token) {
 	/** @param {number} n */
 	setLevel(n) {
 		if (typeof n !== 'number') {
-			typeError(this, 'setLevel', 'Number');
+			this.typeError('setLevel', 'Number');
 		}
 		n = Math.min(Math.max(n, 1), 6);
 		this.setAttribute('name', String(n)).firstElementChild.setAttribute('name', this.name);

package/src/html.js

@@ -1,6 +1,7 @@
 'use strict';
 
-const fixedToken = require('../mixin/fixedToken'),
+const {noWrap} = require('../util/string'),
+	fixedToken = require('../mixin/fixedToken'),
 	attributeParent = require('../mixin/attributeParent'),
 	/** @type {Parser} */ Parser = require('..'),
 	Token = require('.');
@@ -79,7 +80,7 @@ class HtmlToken extends attributeParent(fixedToken(Token)) {
 	findMatchingTag() {
 		const {html} = this.getAttribute('config'),
 			{name, parentElement, closing, selfClosing} = this,
-			string = this.toString().replaceAll('\n', '\\n');
+			string = noWrap(this.toString());
 		if (closing && selfClosing) {
 			throw new SyntaxError(`同时闭合和自封闭的标签：${string}`);
 		} else if (html[2].includes(name) || selfClosing && html[1].includes(name)) { // 自封闭标签
@@ -134,7 +135,7 @@ class HtmlToken extends attributeParent(fixedToken(Token)) {
 			this.selfClosing = false;
 			this.closing = true;
 		} else {
-			Parser.warn('无法修复无效自封闭标签', this.toString().replaceAll('\n', '\\n'));
+			Parser.warn('无法修复无效自封闭标签', noWrap(this.toString()));
 			throw new Error(`无法修复无效自封闭标签：前文共有 ${imbalance} 个未匹配的闭合标签`);
 		}
 	}

package/src/imageParameter.js

@@ -1,7 +1,6 @@
 'use strict';
 
-const {typeError} = require('../util/debug'),
-	{extUrlChar} = require('../util/string'),
+const {text, noWrap, extUrlChar} = require('../util/string'),
 	Title = require('../lib/title'),
 	/** @type {Parser} */ Parser = require('..'),
 	Token = require('.');
@@ -14,24 +13,27 @@ class ImageParameterToken extends Token {
 	type = 'image-parameter';
 	#syntax = '';
 
+	static #noLink = Symbol('no-link');
+
 	/**
-	 * @param {string} key
+	 * @template {string} T
+	 * @param {T} key
 	 * @param {string} value
+	 * @returns {T extends 'link' ? string|Symbol : boolean}
 	 */
 	static #validate(key, value, config = Parser.getConfig()) {
-		value = value.trim();
+		value = value.replace(/\x00\d+t\x7f/g, '').trim();
 		if (key === 'width') {
-			const mt = value.match(/^(\d*)(?:x(\d*))?$/);
-			return Number(mt?.[1]) > 0 || Number(mt?.[2]) > 0;
+			return /^\d*(?:x\d*)?$/.test(value);
 		} else if (['alt', 'class', 'manualthumb', 'frameless', 'framed', 'thumbnail'].includes(key)) {
 			return true;
 		} else if (key === 'link') {
 			if (!value) {
-				return true;
+				return this.#noLink;
 			}
-			const regex = new RegExp(`(?:${config.protocol}|//)${extUrlChar}`, 'ui');
+			const regex = new RegExp(`(?:${config.protocol}|//)${extUrlChar}(?=\x00\\d+t\x7f|$)`, 'ui');
 			if (regex.test(value)) {
-				return true;
+				return value;
 			}
 			if (/^\[\[.+]]$/.test(value)) {
 				value = value.slice(2, -2);
@@ -41,11 +43,62 @@ class ImageParameterToken extends Token {
 					value = decodeURIComponent(value);
 				} catch {}
 			}
-			return new Title(value, 0, config).valid;
+			const {title, fragment, valid} = new Title(value, 0, config);
+			return valid && `${title}${fragment && '#'}${fragment}`;
 		}
 		return !isNaN(value);
 	}
 
+	get link() {
+		if (this.name === 'link') {
+			return ImageParameterToken.#validate('link', this.getValue(), this.getAttribute('config'));
+		}
+		return undefined;
+	}
+	set link(value) {
+		if (this.name === 'link') {
+			value = value === ImageParameterToken.#noLink ? '' : value;
+			this.setValue(value);
+		}
+	}
+	get size() {
+		if (this.name === 'width') {
+			const /** @type {string} */ size = this.getValue().trim();
+			if (!size.includes('{{')) {
+				const [width, height = ''] = size.split('x');
+				return {width, height};
+			}
+			const token = Parser.parse(size, false, 2, this.getAttribute('config')),
+				{childNodes} = token,
+				i = childNodes.findIndex(child => typeof child === 'string' && child.includes('x'));
+			if (i === -1) {
+				return {width: size, height: ''};
+			}
+			token.splitText(i, childNodes[i].indexOf('x'));
+			token.splitText(i + 1, 1);
+			return {width: text(token.childNodes.slice(0, i + 1)), height: text(token.childNodes.slice(i + 2))};
+		}
+		return undefined;
+	}
+	get width() {
+		return this.size?.width;
+	}
+	set width(width) {
+		if (this.name === 'width') {
+			const {height} = this;
+			this.setValue(`${String(width || '')}${height && 'x'}${height}`);
+		}
+	}
+	get height() {
+		return this.size?.height;
+	}
+	set height(height) {
+		height = String(height || '');
+		if (this.name === 'width') {
+			this.setValue(`${this.width}${height && 'x'}${height}`);
+		}
+	}
+
 	/**
 	 * @param {string} str
 	 * @param {accum} accum
@@ -68,7 +121,7 @@ class ImageParameterToken extends Token {
 					super(mt[2], config, true, accum, {'Stage-2': ':', '!HeadingToken': ':'});
 					this.#syntax = `${mt[1]}${param[0]}${mt[3]}`;
 				}
-				this.setAttribute('name', param[1]).setAttribute('stage', 7);
+				this.setAttribute('name', param[1]).setAttribute('stage', Parser.MAX_STAGE);
 				return;
 			}
 		}
@@ -146,13 +199,13 @@ class ImageParameterToken extends Token {
 	setValue(value) {
 		if (this.#isVoid()) {
 			if (typeof value !== 'boolean') {
-				typeError(this, 'setValue', 'Boolean');
+				this.typeError('setValue', 'Boolean');
 			} else if (value === false) {
 				this.remove();
 			}
 			return;
 		} else if (typeof value !== 'string') {
-			typeError(this, 'setValue', 'String');
+			this.typeError('setValue', 'String');
 		}
 		const root = Parser.parse(`[[File:F|${
 				this.#syntax ? this.#syntax.replace('$1', value) : value
@@ -162,7 +215,7 @@ class ImageParameterToken extends Token {
 		if (length !== 1 || !firstElementChild?.matches('file#File:F')
 			|| firstElementChild.childElementCount !== 2 || param.name !== this.name
 		) {
-			throw new SyntaxError(`非法的 ${this.name} 参数：${value.replaceAll('\n', '\\n')}`);
+			throw new SyntaxError(`非法的 ${this.name} 参数：${noWrap(value)}`);
 		}
 		this.replaceChildren(...param.childNodes);
 	}

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');
@@ -20,6 +20,38 @@ class FileToken extends LinkToken {
 	setLinkText = undefined;
 	pipeTrick = undefined;
 
+	get link() {
+		return this.getArg('link')?.link;
+	}
+	set link(value) {
+		this.setValue('link', value);
+	}
+	get size() {
+		return this.getArg('width')?.size;
+	}
+	get width() {
+		return this.size?.width;
+	}
+	set width(width) {
+		const arg = this.getArg('width');
+		if (arg) {
+			arg.width = width;
+		} else {
+			this.setValue('width', width);
+		}
+	}
+	get height() {
+		return this.size?.height;
+	}
+	set height(height) {
+		const arg = this.getArg('width');
+		if (arg) {
+			arg.height = height;
+		} else {
+			this.setValue('width', `x${height}`);
+		}
+	}
+
 	/**
 	 * @param {string} link
 	 * @param {string|undefined} text
@@ -70,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;
 	}
@@ -81,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');
 		}
@@ -158,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;
@@ -179,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);
@@ -191,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('.');
 
 /**
@@ -15,10 +14,9 @@ class MagicLinkToken extends Token {
 	get protocol() {
 		return this.text().match(this.#protocolRegex)?.[0];
 	}
-	/** @param {string} value */
 	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}`);
@@ -38,6 +36,14 @@ class MagicLinkToken extends Token {
 		this.#protocolRegex = new RegExp(`^(?:${config.protocol}${doubleSlash ? '|//' : ''})`, 'i');
 	}
 
+	afterBuild() {
+		const ParameterToken = require('./parameter'), // eslint-disable-line no-unused-vars
+			/** @type {ParameterToken} */ parameter = this.closest('parameter');
+		if (parameter?.getValue() === this.text()) {
+			this.replaceWith(this.toString());
+		}
+	}
+
 	getUrl() {
 		const url = this.text();
 		try {

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