wikiparser-node 0.1.0 → 0.2.2

package/src/link/index.js

@@ -29,9 +29,9 @@ class LinkToken extends Token {
 			'Stage-2': ':', '!ExtToken': '', '!HeadingToken': '',
 		}));
 		if (linkText !== undefined) {
-			const inner = new Token(linkText, config, true, accum);
+			const inner = new Token(linkText, config, true, accum, {'Stage-5': ':', ConverterToken: ':'});
 			inner.type = 'link-text';
-			this.appendChild(inner.setAttribute('stage', 7));
+			this.appendChild(inner.setAttribute('stage', Parser.MAX_STAGE - 1));
 		}
 		this.selfLink = !title.title;
 		this.fragment = title.fragment;
@@ -107,7 +107,7 @@ class LinkToken extends Token {
 
 	/** @returns {[number, string][]} */
 	plain() {
-		return this.childElementCount === 1 ? [] : this.lastElementChild.plain();
+		return this.childNodes.length === 1 ? [] : this.lastElementChild.plain();
 	}
 
 	/** @param {string} link */
@@ -118,7 +118,7 @@ class LinkToken extends Token {
 		}
 		const root = Parser.parse(`[[${link}]]`, this.getAttribute('include'), 6, this.getAttribute('config')),
 			{childNodes: {length}, firstElementChild} = root;
-		if (length !== 1 || firstElementChild?.type !== this.type || firstElementChild.childElementCount !== 1) {
+		if (length !== 1 || firstElementChild?.type !== this.type || firstElementChild.childNodes.length !== 1) {
 			const msgs = {link: '内链', file: '文件链接', category: '分类'};
 			throw new SyntaxError(`非法的${msgs[this.type]}目标：${link}`);
 		}
@@ -135,7 +135,7 @@ class LinkToken extends Token {
 			config = this.getAttribute('config'),
 			root = Parser.parse(`[[${page ? `:${this.name}` : ''}#${fragment}]]`, include, 6, config),
 			{childNodes: {length}, firstElementChild} = root;
-		if (length !== 1 || firstElementChild?.type !== 'link' || firstElementChild.childElementCount !== 1) {
+		if (length !== 1 || firstElementChild?.type !== 'link' || firstElementChild.childNodes.length !== 1) {
 			throw new SyntaxError(`非法的 fragment：${fragment}`);
 		}
 		if (page) {
@@ -169,7 +169,7 @@ class LinkToken extends Token {
 					this.type === 'category' ? 'Category:' : ''
 				}L|${linkText}]]`, this.getAttribute('include'), 6, config),
 				{childNodes: {length}, firstElementChild} = root;
-			if (length !== 1 || firstElementChild?.type !== this.type || firstElementChild.childElementCount !== 2) {
+			if (length !== 1 || firstElementChild?.type !== this.type || firstElementChild.childNodes.length !== 2) {
 				throw new SyntaxError(`非法的${this.type === 'link' ? '内链文字' : '分类关键字'}：${noWrap(linkText)}`);
 			}
 			({lastElementChild} = firstElementChild);
@@ -177,7 +177,7 @@ class LinkToken extends Token {
 			lastElementChild = Parser.run(() => new Token('', config));
 			lastElementChild.setAttribute('stage', 7).type = 'link-text';
 		}
-		if (this.childElementCount === 1) {
+		if (this.childNodes.length === 1) {
 			this.appendChild(lastElementChild);
 		} else {
 			this.lastElementChild.safeReplaceWith(lastElementChild);

package/src/magicLink.js

@@ -42,10 +42,14 @@ class MagicLinkToken extends Token {
 		if (parameter?.getValue() === this.text()) {
 			this.replaceWith(this.toString());
 		}
+		return this;
 	}
 
 	getUrl() {
-		const url = this.text();
+		let url = this.text();
+		if (url.startsWith('//')) {
+			url = `https:${url}`;
+		}
 		try {
 			return new URL(url);
 		} catch (e) {

package/src/nowiki/dd.js

@@ -9,10 +9,10 @@ const /** @type {Parser} */ Parser = require('../..'),
  */
 class DdToken extends NowikiToken {
 	type = 'dd';
-	dt;
-	ul;
-	ol;
-	indent;
+	dt = false;
+	ul = false;
+	ol = false;
+	indent = 0;
 
 	/** @param {string} str */
 	#update(str) {

package/src/parameter.js

@@ -113,7 +113,7 @@ class ParameterToken extends fixedToken(Token) {
 			{childNodes: {length}, firstElementChild} = root,
 			/** @type {ParameterToken} */ lastElementChild = firstElementChild?.lastElementChild;
 		if (length !== 1 || !firstElementChild?.matches(templateLike ? 'template#T' : 'magic-word#lc')
-			|| firstElementChild.childElementCount !== 2
+			|| firstElementChild.childNodes.length !== 2
 			|| lastElementChild.anon !== this.anon || lastElementChild.name !== '1'
 		) {
 			throw new SyntaxError(`非法的模板参数：${noWrap(value)}`);
@@ -139,7 +139,7 @@ class ParameterToken extends fixedToken(Token) {
 		}
 		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.childElementCount !== 2) {
+		if (length !== 1 || !firstElementChild?.matches('template#T') || firstElementChild.childNodes.length !== 2) {
 			throw new SyntaxError(`非法的模板参数名：${key}`);
 		}
 		const {lastElementChild} = firstElementChild,

package/src/syntax.js

@@ -38,8 +38,10 @@ class SyntaxToken extends Token {
 	afterBuild() {
 		const that = this,
 			/** @type {AstListener} */ syntaxListener = (e, data) => {
-				if (!Parser.running && !that.#pattern.test(that.text())) {
+				const pattern = that.#pattern;
+				if (!Parser.running && !pattern.test(that.text())) {
 					undo(e, data);
+					throw new Error(`不可修改 ${that.constructor.name} 的语法：/${pattern.source}/${pattern.flags}`);
 				}
 			};
 		this.addEventListener(['remove', 'insert', 'replace', 'text'], syntaxListener);

package/src/table/td.js

@@ -152,7 +152,7 @@ class TdToken extends fixedToken(TrToken) {
 		return this;
 	}
 
-	build() {
+	afterBuild() {
 		if (this.#innerSyntax.includes('\x00')) {
 			this.#innerSyntax = this.buildFromStr(this.#innerSyntax).map(String).join('');
 		}
@@ -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;
 		}

package/src/table/tr.js

@@ -37,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);

package/src/tagPair/index.js

@@ -57,7 +57,7 @@ class TagPairToken extends fixedToken(Token) {
 		}
 		return selfClosing
 			? `<${opening}${String(firstChild)}/>`
-			: `<${opening}${String(firstChild)}>${String(lastChild)}${closed ? `</${closing}>` : ''}`;
+			: `<${opening}${String(firstChild)}>${String(lastChild)}${this.closed ? `</${closing}>` : ''}`;
 	}
 
 	getPadding() {

package/src/transclude.js

@@ -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);
@@ -381,7 +381,7 @@ 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(`非法的匿名参数：${noWrap(val)}`);
 		}
@@ -409,7 +409,7 @@ 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}=${noWrap(value)}`);
 		}
@@ -436,7 +436,7 @@ class TranscludeToken extends Token {
 		}
 		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);
@@ -452,10 +452,10 @@ class TranscludeToken extends Token {
 		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;
@@ -471,16 +471,16 @@ class TranscludeToken extends Token {
 			throw new Error(`${this.constructor.name}.replaceModule 方法仅用于更换模块！`);
 		} else if (typeof func !== 'string') {
 			this.typeError('replaceFunction', 'String');
-		} else if (this.childElementCount < 2) {
+		} 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;

package/typings/index.d.ts

@@ -44,6 +44,8 @@ declare global {
 		reparse(date: string): Token;
 
 		getTool(): typeof $;
+
+		typeAliases: Record<string, string[]>;
 	}
 }
 

package/typings/node.d.ts

@@ -6,7 +6,7 @@ declare global {
 	type TokenAttribute<T> =
 		T extends 'childNodes' ? (string|Token)[] :
 		T extends 'parentNode' ? Token|undefined :
-		T extends 'optional'|'tags' ? string[] :
+		T extends 'optional'|'tags'|'flags' ? string[] :
 		T extends 'stage'|'indent' ? number :
 		T extends 'config' ? ParserConfig :
 		T extends 'accum' ? accum :
@@ -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'|'ul'|'ol'|'dt' ? 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/string.js

@@ -57,7 +57,19 @@ const explode = (start, end, separator, str) => {
 /** @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]*';
+	+ '(?:[^[\\]<>"\\x00-\\x20\\x7f\\p{Zs}\\ufffd]|\\x00\\d+c\\x7f)*';
 
-module.exports = {toCase, removeComment, ucfirst, escapeRegExp, text, explode, noWrap, extUrlChar};
+module.exports = {toCase, removeComment, ucfirst, escapeRegExp, text, explode, noWrap, normalizeSpace, extUrlChar};