wikiparser-node 0.3.0 → 0.3.1

package/src/table/index.js

@@ -55,8 +55,8 @@ class Layout extends Array {
 class TableToken extends TrToken {
 	type = 'table';
 
-	static openingPattern = /^(?:{\||{{{\s*!\s*}}|{{\s*\(!\s*}})$/;
-	static closingPattern = /^\n[^\S\n]*(?:\|}|{{\s*!\s*}}}|{{\s*!\)\s*}})$/;
+	static openingPattern = /^(?:\{\||\{\{\{\s*!\s*\}\}|\{\{\s*\(!\s*\}\})$/;
+	static closingPattern = /^\n[^\S\n]*(?:\|\}|\{\{\s*!\s*\}\}\}|\{\{\s*!\)\s*\}\})$/;
 
 	/**
 	 * @param {string} syntax

package/src/table/td.js

@@ -69,7 +69,8 @@ class TdToken extends fixedToken(TrToken) {
 		return result;
 	}
 
-	static openingPattern = /^(?:\n[\S\n]*(?:[|!]|\|\+|{{\s*!\s*}}\+?)|(?:\||{{\s*!\s*}}){2}|!!|{{\s*!!\s*}})$/;
+	static openingPattern
+		= /^(?:\n[\S\n]*(?:[|!]|\|\+|\{\{\s*!\s*\}\}\+?)|(?:\||\{\{\s*!\s*\}\}){2}|!!|\{\{\s*!!\s*\}\})$/;
 
 	getRowCount = undefined;
 	getNthCol = undefined;
@@ -81,9 +82,9 @@ class TdToken extends fixedToken(TrToken) {
 	 * @param {accum} accum
 	 */
 	constructor(syntax, inner, config = Parser.getConfig(), accum = []) {
-		let innerSyntax = inner?.match(/\||\x00\d+!\x7f/),
+		let innerSyntax = /\||\0\d+!\x7f/.exec(inner),
 			attr = innerSyntax ? inner.slice(0, innerSyntax.index) : '';
-		if (/\[\[|-{/.test(attr)) {
+		if (/\[\[|-\{/.test(attr)) {
 			innerSyntax = null;
 			attr = '';
 		}
@@ -155,7 +156,7 @@ class TdToken extends fixedToken(TrToken) {
 	}
 
 	afterBuild() {
-		if (this.#innerSyntax.includes('\x00')) {
+		if (this.#innerSyntax.includes('\0')) {
 			this.#innerSyntax = this.buildFromStr(this.#innerSyntax).map(String).join('');
 		}
 		return this;

package/src/table/tr.js

@@ -13,7 +13,7 @@ const attributeParent = require('../../mixin/attributeParent'),
 class TrToken extends attributeParent(Token, 1) {
 	type = 'tr';
 
-	static openingPattern = /^\n[^\S\n]*(?:\|-+|{{\s*!\s*}}-+|{{\s*!-\s*}}-*)$/;
+	static openingPattern = /^\n[^\S\n]*(?:\|-+|\{\{\s*!\s*\}\}-+|\{\{\s*!-\s*\}\}-*)$/;
 
 	/**
 	 * @param {string} syntax

package/src/transclude.js

@@ -59,7 +59,7 @@ class TranscludeToken extends Token {
 				isSensitive = sensitive.includes(name);
 			if (isSensitive || insensitive.includes(name.toLowerCase())) {
 				this.setAttribute('name', name.toLowerCase().replace(/^#/, '')).type = 'magic-word';
-				const pattern = new RegExp(`^\\s*${name}\\s*$`, isSensitive ? '' : 'i'),
+				const pattern = RegExp(`^\\s*${name}\\s*$`, isSensitive ? '' : 'i'),
 					token = new SyntaxToken(magicWord, pattern, 'magic-word-name', config, accum, {
 						'Stage-1': ':', '!ExtToken': '',
 					});
@@ -85,7 +85,7 @@ class TranscludeToken extends Token {
 		}
 		if (this.type === 'template') {
 			const [name] = removeComment(title).split('#');
-			if (/\x00\d+[eh!+-]\x7f|[<>[\]{}]/.test(name)) {
+			if (/\0\d+[eh!+-]\x7f|[<>[\]{}]/.test(name)) {
 				accum.pop();
 				throw new SyntaxError(`非法的模板名称：${name}`);
 			}
@@ -123,7 +123,7 @@ class TranscludeToken extends Token {
 	}
 
 	afterBuild() {
-		if (this.name.includes('\x00')) {
+		if (this.name.includes('\0')) {
 			this.setAttribute('name', text(this.buildFromStr(this.name)));
 		}
 		if (this.matches('template, magic-word#invoke')) {
@@ -470,7 +470,9 @@ class TranscludeToken extends Token {
 		} else if (this.childNodes.length < 2) {
 			throw new Error('尚未指定模块名称！');
 		}
-		const root = Parser.parse(`{{#invoke:M|${func}}}`, this.getAttribute('include'), 2, this.getAttribute('config')),
+		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.childNodes.length !== 3
@@ -553,8 +555,8 @@ class TranscludeToken extends Token {
 				continue;
 			} else if (aggressive && (anonCount ? /\D\d+$/ : /(?:^|\D)\d+$/).test(key)) {
 				let /** @type {number} */ last;
-				const str = key.slice(0, -key.match(/\d+$/)[0].length),
-					regex = new RegExp(`^${escapeRegExp(str)}\\d+$`),
+				const str = key.slice(0, -/(?<!\d)\d+$/.exec(key)[0].length),
+					regex = RegExp(`^${escapeRegExp(str)}\\d+$`),
 					series = this.getAllArgs().filter(({name}) => regex.test(name)),
 					ordered = series.every(({name}, i) => {
 						const j = Number(name.slice(str.length)),
@@ -595,7 +597,7 @@ class TranscludeToken extends Token {
 	 */
 	escapeTables() {
 		const count = this.hasDuplicatedArgs();
-		if (!/\n\s*:*\s*{\|.*\n\s*\|}/s.test(this.text()) || !count) {
+		if (!/\n[^\S\n]*(?::+\s*)?\{\|[^\n]*\n\s*(?:\S[^\n]*\n\s*)*\|\}/.test(this.text()) || !count) {
 			return this;
 		}
 		const stripped = this.toString().slice(2, -2),

package/util/debug.js

@@ -17,7 +17,7 @@ const externalUse = (name, proxy = false) => {
 	if (!proxy && require('..').running) {
 		return false;
 	}
-	const regex = new RegExp(`^${
+	const regex = RegExp(`^${
 		proxy ? 'Proxy' : 'new \\w*Token$|^(?:AstNode|AstElement|\\w*Token)'
 	}\\.(?!${name}$)`);
 	try {

package/util/string.js

@@ -3,7 +3,7 @@
 /**
  * optionally convert to lower cases
  * @param {string} val
- * @param {boolean} i
+ * @param {string|undefined} i
  */
 const toCase = (val, i) => i ? val.toLowerCase() : val;
 
@@ -11,7 +11,7 @@ const toCase = (val, i) => i ? val.toLowerCase() : val;
  * remove half-parsed comment-like tokens
  * @param {string} str
  */
-const removeComment = str => str.replace(/\x00\d+c\x7f/g, '');
+const removeComment = str => str.replace(/\0\d+c\x7f/g, '');
 
 /** @param {string} str */
 const ucfirst = str => str && `${str[0].toUpperCase()}${str.slice(1)}`;
@@ -35,7 +35,7 @@ const explode = (start, end, separator, str) => {
 	if (str === undefined) {
 		return [];
 	}
-	const regex = new RegExp(`${[start, end, separator].map(escapeRegExp).join('|')}`, 'g'),
+	const regex = RegExp(`${[start, end, separator].map(escapeRegExp).join('|')}`, 'g'),
 		/** @type {string[]} */ exploded = [];
 	let mt = regex.exec(str),
 		depth = 0,
@@ -69,7 +69,7 @@ const normalizeSpace = (token = '', separator = '') => {
 			.join(separator);
 };
 
-const extUrlChar = '(?:[\\d.]+|\\[[\\da-f:.]+\\]|[^[\\]<>"\\x00-\\x20\\x7f\\p{Zs}\\ufffd])'
-	+ '(?:[^[\\]<>"\\x00-\\x20\\x7f\\p{Zs}\\ufffd]|\\x00\\d+c\\x7f)*';
+const extUrlChar = '(?:\\[[\\da-f:.]+\\]|[^[\\]<>"\\0-\\x1f\\x7f\\p{Zs}\\ufffd])'
+	+ '(?:[^[\\]<>"\\0-\\x1f\\x7f\\p{Zs}\\ufffd]|\\0\\d+c\\x7f)*';
 
 module.exports = {toCase, removeComment, ucfirst, escapeRegExp, text, explode, noWrap, normalizeSpace, extUrlChar};