wikiparser-node 1.0.0-beta.0 → 1.0.0-beta.2

package/dist/src/transclude.js

@@ -1,16 +1,18 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TranscludeToken = void 0;
 const string_1 = require("../util/string");
 const lint_1 = require("../util/lint");
-const Parser = require("../index");
-const Token = require(".");
-const ParameterToken = require("./parameter");
-const AtomToken = require("./atom");
-const SyntaxToken = require("./syntax");
+const index_1 = require("../index");
+const _1 = require(".");
+const parameter_1 = require("./parameter");
+const atom_1 = require("./atom");
+const syntax_1 = require("./syntax");
 /**
  * 模板或魔术字
  * @classdesc `{childNodes: [AtomToken|SyntaxToken, ...AtomToken, ...ParameterToken]}`
  */
-class TranscludeToken extends Token {
+class TranscludeToken extends _1.Token {
     /** @browser */
     type = 'template';
     /** @browser */
@@ -21,7 +23,7 @@ class TranscludeToken extends Token {
     #valid = true;
     /** @browser */
     #raw = false;
-    #args = {};
+    #args = new Map();
     #keys = new Set();
     /** 是否存在重复参数 */
     get duplication() {
@@ -33,7 +35,7 @@ class TranscludeToken extends Token {
      * @param parts 参数各部分
      * @throws `SyntaxError` 非法的模板名称
      */
-    constructor(title, parts, config = Parser.getConfig(), accum = []) {
+    constructor(title, parts, config = index_1.default.getConfig(), accum = []) {
         super(undefined, config, true, accum, {
             AtomToken: 0, SyntaxToken: 0, ParameterToken: '1:',
         });
@@ -41,19 +43,19 @@ class TranscludeToken extends Token {
         const { parserFunction: [insensitive, sensitive] } = config, argSubst = /^(?:\s|\0\d+c\x7F)*\0\d+s\x7F/u.exec(title)?.[0];
         if (argSubst) {
             this.setAttribute('modifier', argSubst);
-            title = title.slice(argSubst.length); // eslint-disable-line no-param-reassign
+            title = title.slice(argSubst.length);
         }
         else if (title.includes(':')) {
             const [modifier, ...arg] = title.split(':'), [mt] = /^(?:\s|\0\d+c\x7F)*/u.exec(arg[0] ?? '');
             if (this.setModifier(`${modifier}:${mt}`)) {
-                title = arg.join(':').slice(mt.length); // eslint-disable-line no-param-reassign
+                title = arg.join(':').slice(mt.length);
             }
         }
         if (title.includes(':') || parts.length === 0 && !this.#raw) {
             const [magicWord, ...arg] = title.split(':'), cleaned = (0, string_1.removeComment)(magicWord), name = cleaned[arg.length > 0 ? 'trimStart' : 'trim'](), isSensitive = sensitive.includes(name), canonicalCame = insensitive[name.toLowerCase()];
             if (isSensitive || canonicalCame) {
                 this.setAttribute('name', canonicalCame ?? name.toLowerCase()).type = 'magic-word';
-                const pattern = new RegExp(`^\\s*${name}\\s*$`, isSensitive ? 'u' : 'iu'), token = new SyntaxToken(magicWord, pattern, 'magic-word-name', config, accum, {
+                const pattern = new RegExp(`^\\s*${name}\\s*$`, isSensitive ? 'u' : 'iu'), token = new syntax_1.SyntaxToken(magicWord, pattern, 'magic-word-name', config, accum, {
                     'Stage-1': ':', '!ExtToken': '',
                 });
                 super.insertAt(token);
@@ -67,7 +69,7 @@ class TranscludeToken extends Token {
                         if (!part) {
                             break;
                         }
-                        const invoke = new AtomToken(part.join('='), `invoke-${i ? 'function' : 'module'}`, config, accum, {
+                        const invoke = new atom_1.AtomToken(part.join('='), `invoke-${i ? 'function' : 'module'}`, config, accum, {
                             'Stage-1': ':', '!ExtToken': '',
                         });
                         super.insertAt(invoke);
@@ -82,7 +84,7 @@ class TranscludeToken extends Token {
                 accum.pop();
                 throw new SyntaxError(`非法的模板名称：${(0, string_1.noWrap)(name)}`);
             }
-            const token = new AtomToken(title, 'template-name', config, accum, {
+            const token = new atom_1.AtomToken(title, 'template-name', config, accum, {
                 'Stage-2': ':', '!HeadingToken': '',
             });
             super.insertAt(token);
@@ -99,7 +101,8 @@ class TranscludeToken extends Token {
                 part.unshift(i);
                 i++;
             }
-            this.insertAt(new ParameterToken(...part, config, accum));
+            // @ts-expect-error abstract class
+            this.insertAt(new parameter_1.ParameterToken(...part, config, accum));
         }
         this.protectChildren(0);
     }
@@ -109,16 +112,13 @@ class TranscludeToken extends Token {
      * @param modifier 引用修饰符
      */
     setModifier(modifier = '') {
-        if (typeof modifier !== 'string') {
-            this.typeError('setModifier', 'String');
-        }
         const { parserFunction: [, , raw, subst] } = this.getAttribute('config'), lcModifier = (0, string_1.removeComment)(modifier).trim();
         if (modifier && !lcModifier.endsWith(':')) {
             return false;
         }
         const magicWord = lcModifier.slice(0, -1).toLowerCase(), isRaw = raw.includes(magicWord), isSubst = subst.includes(magicWord);
         if (this.#raw && isRaw || !this.#raw && (isSubst || modifier === '')
-            || (Parser.running || this.length > 1) && (isRaw || isSubst || modifier === '')) {
+            || (index_1.default.running || this.length > 1) && (isRaw || isSubst || modifier === '')) {
             this.setAttribute('modifier', modifier);
             this.#raw = isRaw;
             return Boolean(modifier);
@@ -160,7 +160,7 @@ class TranscludeToken extends Token {
                     this.#fragment = fragment;
                     this.#valid = valid;
                 }
-                else if (oldKey !== newKey && prevTarget.type === 'parameter') {
+                else if (oldKey !== newKey && prevTarget instanceof parameter_1.ParameterToken) {
                     const oldArgs = this.getArgs(oldKey, false, false);
                     oldArgs.delete(prevTarget);
                     this.getArgs(newKey, false, false).add(prevTarget);
@@ -181,9 +181,9 @@ class TranscludeToken extends Token {
         if (selector && this.matches(selector)) {
             return '';
         }
-        const { childNodes, firstChild, modifier } = this;
+        const { childNodes, length, firstChild, modifier } = this;
         return `{{${modifier}${this.type === 'magic-word'
-            ? `${firstChild.toString(selector)}${childNodes.length > 1 ? ':' : ''}${childNodes.slice(1).map(child => child.toString(selector)).join('|')}`
+            ? `${firstChild.toString(selector)}${length === 1 ? '' : ':'}${childNodes.slice(1).map(child => child.toString(selector)).join('|')}`
             : super.toString(selector, '|')}}}`;
     }
     /**
@@ -191,11 +191,11 @@ class TranscludeToken extends Token {
      * @browser
      */
     text() {
-        const { childNodes, firstChild, modifier, type, name } = this;
+        const { childNodes, length, firstChild, modifier, type, name } = this;
         return type === 'magic-word' && name === 'vardefine'
             ? ''
             : `{{${modifier}${this.type === 'magic-word'
-                ? `${firstChild.text()}${childNodes.length > 1 ? ':' : ''}${(0, string_1.text)(childNodes.slice(1), '|')}`
+                ? `${firstChild.text()}${length === 1 ? '' : ':'}${(0, string_1.text)(childNodes.slice(1), '|')}`
                 : super.text('|')}}}`;
     }
     /** @private */
@@ -203,17 +203,17 @@ class TranscludeToken extends Token {
         return this.modifier.length + 2;
     }
     /** @private */
-    getGaps() {
-        return 1;
+    getGaps(i) {
+        return i < this.length - 1 ? 1 : 0;
     }
     /**
      * @override
      * @browser
      */
     print() {
-        const { childNodes, firstChild, modifier } = this;
+        const { childNodes, length, firstChild, modifier } = this;
         return `<span class="wpb-${this.type}">{{${modifier}${this.type === 'magic-word'
-            ? `${firstChild.print()}${childNodes.length > 1 ? ':' : ''}${(0, string_1.print)(childNodes.slice(1), { sep: '|' })}`
+            ? `${firstChild.print()}${length === 1 ? '' : ':'}${(0, string_1.print)(childNodes.slice(1), { sep: '|' })}`
             : (0, string_1.print)(childNodes, { sep: '|' })}}}</span>`;
     }
     /**
@@ -254,8 +254,7 @@ class TranscludeToken extends Token {
         else if (!this.hasArg(maxAnon, true)) {
             this.#keys.delete(maxAnon);
         }
-        const j = added ? args.indexOf(addedToken) : addedToken - 1;
-        for (let i = j; i < args.length; i++) {
+        for (let i = added ? args.indexOf(addedToken) : addedToken - 1; i < args.length; i++) {
             const token = args[i], { name } = token, newName = String(i + 1);
             if (name !== newName) {
                 this.getArgs(newName, false, false).add(token.setAttribute('name', newName));
@@ -304,18 +303,16 @@ class TranscludeToken extends Token {
      * @param copy 是否返回一个备份
      */
     getArgs(key, exact = false, copy = true) {
-        if (typeof key !== 'string' && typeof key !== 'number') {
-            this.typeError('getArgs', 'String', 'Number');
-        }
         const keyStr = String(key).replace(/^[ \t\n\0\v]+|(?<=[^ \t\n\0\v])[ \t\n\0\v]+$/gu, '');
         let args;
-        if (Object.hasOwn(this.#args, keyStr)) {
-            args = this.#args[keyStr];
+        if (this.#args.has(keyStr)) {
+            args = this.#args.get(keyStr);
         }
         else {
             args = new Set(this.getAllArgs().filter(({ name }) => keyStr === name));
-            this.#args[keyStr] = args;
+            this.#args.set(keyStr, args);
         }
+        // @ts-expect-error isNaN
         if (exact && !isNaN(keyStr)) {
             args = new Set([...args].filter(({ anon }) => typeof key === 'number' === anon));
         }
@@ -331,8 +328,7 @@ class TranscludeToken extends Token {
      */
     getDuplicatedArgs() {
         if (this.isTemplate()) {
-            return Object.entries(this.#args).filter(([, { size }]) => size > 1)
-                .map(([key, args]) => [key, [...args]]);
+            return [...this.#args].filter(([, { size }]) => size > 1).map(([key, args]) => [key, [...args]]);
         }
         throw new Error(`${this.constructor.name}.getDuplicatedArgs 方法仅供模板使用！`);
     }
@@ -385,7 +381,8 @@ class TranscludeToken extends Token {
     /** @override */
     cloneNode() {
         const [first, ...cloned] = this.cloneChildNodes(), config = this.getAttribute('config');
-        return Parser.run(() => {
+        return index_1.default.run(() => {
+            // @ts-expect-error abstract class
             const token = new TranscludeToken(this.type === 'template' ? '' : first.text(), [], config);
             if (this.#raw) {
                 token.setModifier(this.modifier);
@@ -414,7 +411,7 @@ class TranscludeToken extends Token {
     /** @private */
     getAttribute(key) {
         if (key === 'args') {
-            return { ...this.#args };
+            return new Map(this.#args);
         }
         else if (key === 'keys') {
             return this.#keys;
@@ -461,7 +458,7 @@ class TranscludeToken extends Token {
      * @param exact 是否匹配匿名性
      */
     removeArg(key, exact = false) {
-        Parser.run(() => {
+        index_1.default.run(() => {
             for (const token of this.getArgs(key, exact, false)) {
                 this.removeChild(token);
             }
@@ -499,8 +496,12 @@ class TranscludeToken extends Token {
      * @throws `SyntaxError` 非法的匿名参数
      */
     newAnonArg(val) {
-        const templateLike = this.isTemplate(), wikitext = `{{${templateLike ? ':T|' : 'lc:'}${val}}}`, root = Parser.parse(wikitext, this.getAttribute('include'), 2, this.getAttribute('config')), { length, firstChild: transclude } = root, { type, name, length: transcludeLength, lastChild } = transclude, targetType = templateLike ? 'template' : 'magic-word', targetName = templateLike ? 'T' : 'lc';
-        if (length === 1 && type === targetType && name === targetName && transcludeLength === 2 && lastChild.anon) {
+        const templateLike = this.isTemplate(), wikitext = `{{${templateLike ? ':T|' : 'lc:'}${val}}}`, root = index_1.default.parse(wikitext, this.getAttribute('include'), 2, this.getAttribute('config')), { length, firstChild: transclude } = root, targetType = templateLike ? 'template' : 'magic-word';
+        if (length !== 1 || transclude.type !== targetType || transclude.length !== 2) {
+            throw new SyntaxError(`非法的匿名参数：${(0, string_1.noWrap)(val)}`);
+        }
+        const { name, lastChild } = transclude, targetName = templateLike ? 'T' : 'lc';
+        if (name === targetName && lastChild.anon) {
             return this.insertAt(lastChild);
         }
         throw new SyntaxError(`非法的匿名参数：${(0, string_1.noWrap)(val)}`);
@@ -513,10 +514,7 @@ class TranscludeToken extends Token {
      * @throws `SyntaxError` 非法的命名参数
      */
     setValue(key, value) {
-        if (typeof key !== 'string') {
-            this.typeError('setValue', 'String');
-        }
-        else if (!this.isTemplate()) {
+        if (!this.isTemplate()) {
             throw new Error(`${this.constructor.name}.setValue 方法仅供模板使用！`);
         }
         const token = this.getArg(key);
@@ -524,11 +522,15 @@ class TranscludeToken extends Token {
             token.setValue(value);
             return;
         }
-        const wikitext = `{{:T|${key}=${value}}}`, root = Parser.parse(wikitext, this.getAttribute('include'), 2, this.getAttribute('config')), { length, firstChild: template } = root, { type, name, length: templateLength, lastChild: parameter } = template;
-        if (length !== 1 || type !== 'template' || name !== 'T' || templateLength !== 2 || parameter.name !== key) {
+        const wikitext = `{{:T|${key}=${value}}}`, root = index_1.default.parse(wikitext, this.getAttribute('include'), 2, this.getAttribute('config')), { length, firstChild: template } = root;
+        if (length !== 1 || template.type !== 'template' || template.length !== 2) {
             throw new SyntaxError(`非法的命名参数：${key}=${(0, string_1.noWrap)(value)}`);
         }
-        this.insertAt(parameter);
+        const { name, lastChild: parameter } = template;
+        if (name === 'T' && parameter.name === key) {
+            this.insertAt(parameter);
+        }
+        throw new SyntaxError(`非法的命名参数：${key}=${(0, string_1.noWrap)(value)}`);
     }
     /**
      * 将匿名参数改写为命名参数
@@ -552,14 +554,11 @@ class TranscludeToken extends Token {
         if (this.type === 'magic-word') {
             throw new Error(`${this.constructor.name}.replaceTemplate 方法仅用于更换模板！`);
         }
-        else if (typeof title !== 'string') {
-            this.typeError('replaceTemplate', 'String');
-        }
-        const root = Parser.parse(`{{${title}}}`, this.getAttribute('include'), 2, this.getAttribute('config')), { length, firstChild: template } = root;
-        if (length !== 1 || template.type !== 'template' || template.length !== 1) {
-            throw new SyntaxError(`非法的模板名称：${title}`);
+        const root = index_1.default.parse(`{{${title}}}`, this.getAttribute('include'), 2, this.getAttribute('config')), { length, firstChild: template } = root;
+        if (length === 1 && template.type === 'template' && template.length === 1) {
+            this.firstChild.replaceChildren(...template.firstChild.childNodes);
         }
-        this.firstChild.replaceChildren(...template.firstChild.childNodes);
+        throw new SyntaxError(`非法的模板名称：${title}`);
     }
     /**
      * 替换模块名
@@ -571,10 +570,7 @@ class TranscludeToken extends Token {
         if (this.type !== 'magic-word' || this.name !== 'invoke') {
             throw new Error(`${this.constructor.name}.replaceModule 方法仅用于更换模块！`);
         }
-        else if (typeof title !== 'string') {
-            this.typeError('replaceModule', 'String');
-        }
-        const root = Parser.parse(`{{#invoke:${title}}}`, this.getAttribute('include'), 2, this.getAttribute('config')), { length, firstChild: invoke } = root, { type, name, lastChild } = invoke;
+        const root = index_1.default.parse(`{{#invoke:${title}}}`, this.getAttribute('include'), 2, this.getAttribute('config')), { length, firstChild: invoke } = root, { type, name, lastChild } = invoke;
         if (length !== 1 || type !== 'magic-word' || name !== 'invoke' || invoke.length !== 2) {
             throw new SyntaxError(`非法的模块名称：${title}`);
         }
@@ -597,13 +593,10 @@ class TranscludeToken extends Token {
         if (this.type !== 'magic-word' || this.name !== 'invoke') {
             throw new Error(`${this.constructor.name}.replaceModule 方法仅用于更换模块！`);
         }
-        else if (typeof func !== 'string') {
-            this.typeError('replaceFunction', 'String');
-        }
         else if (this.length < 2) {
             throw new Error('尚未指定模块名称！');
         }
-        const root = Parser.parse(`{{#invoke:M|${func}}}`, this.getAttribute('include'), 2, this.getAttribute('config')), { length, firstChild: invoke } = root, { type, name, lastChild } = invoke;
+        const root = index_1.default.parse(`{{#invoke:M|${func}}}`, this.getAttribute('include'), 2, this.getAttribute('config')), { length, firstChild: invoke } = root, { type, name, lastChild } = invoke;
         if (length !== 1 || type !== 'magic-word' || name !== 'invoke' || invoke.length !== 3) {
             throw new SyntaxError(`非法的模块函数名：${func}`);
         }
@@ -641,19 +634,19 @@ class TranscludeToken extends Token {
             if (args.length <= 1) {
                 continue;
             }
-            const values = {};
+            const values = new Map();
             for (const arg of args) {
                 const val = arg.getValue().trim();
-                if (Object.hasOwn(values, val)) {
-                    values[val].push(arg);
+                if (values.has(val)) {
+                    values.get(val).push(arg);
                 }
                 else {
-                    values[val] = [arg];
+                    values.set(val, [arg]);
                 }
             }
+            // @ts-expect-error isNaN
             let noMoreAnon = anonCount === 0 || isNaN(key);
-            const emptyArgs = values[''] ?? [], duplicatedArgs = Object.entries(values).filter(([val, { length }]) => val && length > 1)
-                .flatMap(([, curArgs]) => {
+            const emptyArgs = values.get('') ?? [], duplicatedArgs = [...values].filter(([val, { length }]) => val && length > 1).flatMap(([, curArgs]) => {
                 const anonIndex = noMoreAnon ? -1 : curArgs.findIndex(({ anon }) => anon);
                 if (anonIndex !== -1) {
                     noMoreAnon = true;
@@ -695,7 +688,7 @@ class TranscludeToken extends Token {
                 }
             }
             if (remaining > 1) {
-                Parser.error(`${this.type === 'template'
+                index_1.default.error(`${this.type === 'template'
                     ? this.name
                     : this.normalizeTitle(this.childNodes[1]?.text() ?? '', 828).title} 还留有 ${remaining} 个重复的 ${key} 参数：${[...this.getArgs(key)].map(arg => {
                     const { top, left } = arg.getBoundingClientRect();
@@ -716,24 +709,24 @@ class TranscludeToken extends Token {
         if (!/\n[^\S\n]*(?::+\s*)?\{\|[^\n]*\n\s*(?:\S[^\n]*\n\s*)*\|\}/u.test(this.text()) || !count) {
             return this;
         }
-        const stripped = String(this).slice(2, -2), include = this.getAttribute('include'), config = this.getAttribute('config'), parsed = Parser.parse(stripped, include, 4, config);
+        const stripped = String(this).slice(2, -2), include = this.getAttribute('include'), config = this.getAttribute('config'), parsed = index_1.default.parse(stripped, include, 4, config);
         for (const table of parsed.childNodes) {
             if (table.type === 'table') {
                 table.escape();
             }
         }
-        const { firstChild, childNodes } = Parser.parse(`{{${String(parsed)}}}`, include, 2, config);
-        if (childNodes.length !== 1 || !(firstChild instanceof TranscludeToken)) {
+        const { firstChild, length } = index_1.default.parse(`{{${String(parsed)}}}`, include, 2, config);
+        if (length !== 1 || !(firstChild instanceof TranscludeToken)) {
             throw new Error('转义表格失败！');
         }
         const newCount = firstChild.hasDuplicatedArgs();
         if (newCount === count) {
             return this;
         }
-        Parser.info(`共修复了 ${count - newCount} 个重复参数。`);
+        index_1.default.info(`共修复了 ${count - newCount} 个重复参数。`);
         this.safeReplaceWith(firstChild);
         return firstChild;
     }
 }
-Parser.classes['TranscludeToken'] = __filename;
-module.exports = TranscludeToken;
+exports.TranscludeToken = TranscludeToken;
+index_1.default.classes['TranscludeToken'] = __filename;

package/dist/util/debug.js

@@ -1,16 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.undo = exports.typeError = void 0;
-/**
- * 定制TypeError消息
- * @param {Function} Constructor 类
- * @param args 可接受的参数类型
- * @throws `TypeError`
- */
-const typeError = ({ name }, method, ...args) => {
-    throw new TypeError(`${name}.${method} 方法仅接受 ${args.join('、')} 作为输入参数！`);
-};
-exports.typeError = typeError;
+exports.undo = void 0;
 /**
  * 撤销最近一次Mutation
  * @param e 事件
@@ -46,7 +36,7 @@ const undo = (e, data) => {
             }
             break;
         default:
-            throw new RangeError(`无法撤销未知类型的事件：${type}`);
+            throw new RangeError(`无法撤销未知类型的事件：${String(type)}`);
     }
 };
 exports.undo = undo;

package/dist/util/diff.js

@@ -1,6 +1,8 @@
 "use strict";
-const child_process_1 = require("child_process");
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.diff = void 0;
 const fs = require("fs/promises");
+const child_process_1 = require("child_process");
 process.on('unhandledRejection', e => {
     console.error(e);
 });
@@ -66,4 +68,4 @@ const diff = async (oldStr, newStr, uid = -1) => {
     await Promise.all([fs.unlink(oldFile), fs.unlink(newFile)]);
     console.log(stdout?.split('\n')?.slice(4)?.join('\n'));
 };
-module.exports = diff;
+exports.diff = diff;

package/dist/util/lint.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateForSelf = exports.generateForChild = void 0;
-const Parser = require("../index");
+const index_1 = require("../index");
 /**
  * 生成对于子节点的LintError对象
  * @param child 子节点
@@ -10,8 +10,8 @@ const Parser = require("../index");
  * @param severity 严重程度
  */
 const generateForChild = (child, boundingRect, msg, severity = 'error') => {
-    const index = child.getRelativeIndex(), { offsetHeight, offsetWidth, parentNode } = child, { top: offsetTop, left: offsetLeft } = parentNode.posFromIndex(index), { start } = boundingRect, { top, left } = 'top' in boundingRect ? boundingRect : child.getRootNode().posFromIndex(start), str = String(child), excerpt = str.slice(0, 50), startIndex = start + index, endIndex = startIndex + str.length, startLine = top + offsetTop, endLine = startLine + offsetHeight - 1, startCol = offsetTop ? offsetLeft : left + offsetLeft, endCol = offsetHeight > 1 ? offsetWidth : startCol + offsetWidth;
-    return { message: Parser.msg(msg), severity, startIndex, endIndex, startLine, endLine, startCol, endCol, excerpt };
+    const index = child.getRelativeIndex(), { offsetHeight, offsetWidth, parentNode } = child, { top: offsetTop, left: offsetLeft } = parentNode.posFromIndex(index), { start } = boundingRect, { top, left } = 'top' in boundingRect ? boundingRect : child.getRootNode().posFromIndex(start), str = String(child), excerpt = str.slice(0, 50), startIndex = start + index, endIndex = startIndex + str.length, startLine = top + offsetTop, endLine = startLine + offsetHeight - 1, startCol = offsetTop ? offsetLeft : left + offsetLeft, endCol = offsetHeight === 1 ? startCol + offsetWidth : offsetWidth;
+    return { message: index_1.default.msg(msg), severity, startIndex, endIndex, startLine, endLine, startCol, endCol, excerpt };
 };
 exports.generateForChild = generateForChild;
 /**
@@ -24,14 +24,14 @@ exports.generateForChild = generateForChild;
 const generateForSelf = (token, boundingRect, msg, severity = 'error') => {
     const { start } = boundingRect, { offsetHeight, offsetWidth } = token, str = String(token), { top, left } = 'top' in boundingRect ? boundingRect : token.getRootNode().posFromIndex(start);
     return {
-        message: Parser.msg(msg),
+        message: index_1.default.msg(msg),
         severity,
         startIndex: start,
         endIndex: start + str.length,
         startLine: top,
         endLine: top + offsetHeight - 1,
         startCol: left,
-        endCol: offsetHeight > 1 ? offsetWidth : left + offsetWidth,
+        endCol: offsetHeight === 1 ? left + offsetWidth : offsetWidth,
         excerpt: str.slice(0, 50),
     };
 };

package/dist/util/string.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.normalizeSpace = exports.noWrap = exports.toCase = exports.decodeHtml = exports.text = exports.explode = exports.escapeRegExp = exports.print = exports.removeComment = exports.extUrlChar = exports.extUrlCharFirst = void 0;
+exports.normalizeSpace = exports.noWrap = exports.toCase = exports.decodeHtml = exports.text = exports.escapeRegExp = exports.print = exports.removeComment = exports.extUrlChar = exports.extUrlCharFirst = void 0;
 exports.extUrlCharFirst = '(?:\\[[\\da-f:.]+\\]|[^[\\]<>"\\0-\\x1F\\x7F\\p{Zs}\\uFFFD])';
 exports.extUrlChar = '(?:[^[\\]<>"\\0-\\x1F\\x7F\\p{Zs}\\uFFFD]|\\0\\d+c\\x7F)*';
 /**
@@ -19,7 +19,7 @@ exports.removeComment = removeComment;
 const print = (childNodes, opt = {}) => {
     const { pre = '', post = '', sep = '' } = opt, entities = { '&': 'amp', '<': 'lt', '>': 'gt' };
     return `${pre}${childNodes.map(child => child.type === 'text'
-        ? String(child).replace(/[&<>]/gu, p => `&${entities[p]};`)
+        ? child.data.replace(/[&<>]/gu, p => `&${entities[p]};`)
         : child.print()).join(sep)}${post}`;
 };
 exports.print = print;
@@ -30,35 +30,6 @@ exports.print = print;
  */
 const escapeRegExp = (str) => str.replace(/[\\{}()|.?*+^$[\]]/gu, '\\$&');
 exports.escapeRegExp = escapeRegExp;
-/**
- * a more sophisticated string-explode function
- * @browser
- * @param start start syntax of a nested AST node
- * @param end end syntax of a nested AST node
- * @param separator syntax for explosion
- * @param str string to be exploded
- */
-const explode = (start, end, separator, str) => {
-    if (str === undefined) {
-        return [];
-    }
-    const regex = new RegExp(`${[start, end, separator].map(exports.escapeRegExp).join('|')}`, 'gu'), exploded = [];
-    let mt = regex.exec(str), depth = 0, lastIndex = 0;
-    while (mt) {
-        const { 0: match, index } = mt;
-        if (match !== separator) {
-            depth += match === start ? 1 : -1;
-        }
-        else if (depth === 0) {
-            exploded.push(str.slice(lastIndex, index));
-            ({ lastIndex } = regex);
-        }
-        mt = regex.exec(str);
-    }
-    exploded.push(str.slice(lastIndex));
-    return exploded;
-};
-exports.explode = explode;
 /**
  * extract effective wikitext
  * @browser

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wikiparser-node",
-	"version": "1.0.0-beta.0",
+	"version": "1.0.0-beta.2",
 	"description": "A Node.js parser for MediaWiki markup with AST",
 	"keywords": [
 		"mediawiki",
@@ -26,8 +26,8 @@
 		"url": "git+https://github.com/bhsd-harry/wikiparser-node.git"
 	},
 	"scripts": {
-		"prepublishOnly": "rm -rf dist/; tsc; grep -rl --include='*.js' -e '@ts' -e '@typescript' dist/ | xargs gsed -i -E '/@ts|@typescript/d'; rm dist/[mpu]*/*.d.ts; grep -rl --include='*.d.ts' '@private' dist/ | xargs gsed -i '/@private/,+1d'",
-		"build": "rm -rf dist/; tsc; grep -rl --include='*.js' -e '@ts' -e '@typescript' dist/ | xargs gsed -i -E '/@ts|@typescript/d'; eslint --fix dist/",
+		"prepublishOnly": "rm -rf dist/; tsc; rm dist/internal.js; rm dist/[mpu]*/*.d.ts; grep -rl --include='*.d.ts' '@private' dist/ | xargs gsed -i '/@private/,+1d'",
+		"build": "rm -rf dist/; tsc; grep -rl --include='*.js' '@ts' dist/ | xargs gsed -i '/@ts/d'; eslint --fix dist/",
 		"doc": "node ./bin/doc.js",
 		"toc": "node ./bin/toc.js",
 		"lint:ts": "eslint --cache --ignore-pattern '/dist/' .",
@@ -37,21 +37,21 @@
 		"test:single": "node --prof test/single.js && node --prof-process isolate-0x*-v8.log > test/processed.txt && rm isolate-0x*-v8.log"
 	},
 	"devDependencies": {
-		"@types/node": "^17.0.23",
-		"eslint": "^8.30.0",
-		"eslint-plugin-n": "^15.6.0",
-		"eslint-plugin-regexp": "^1.11.0",
-		"eslint-plugin-unicorn": "^45.0.2",
-		"eslint-plugin-jsdoc": "^1.0.0",
+		"@types/node": "^20.9.0",
+		"eslint": "^8.53.0",
+		"eslint-plugin-n": "^16.3.1",
+		"eslint-plugin-regexp": "^2.1.1",
+		"eslint-plugin-unicorn": "^49.0.0",
+		"eslint-plugin-jsdoc": "^46.8.2",
 		"eslint-plugin-json-es": "^1.5.7",
 		"eslint-plugin-eslint-comments": "^3.2.0",
-		"typescript": "^4.6.3",
-		"@typescript-eslint/eslint-plugin": "^5.47.1",
-		"@typescript-eslint/parser": "^5.47.1",
+		"typescript": "^5.0.3",
+		"@typescript-eslint/eslint-plugin": "^5.62.0",
+		"@typescript-eslint/parser": "^5.62.0",
 		"ajv-cli": "^5.0.0",
 		"request": "^2.88.2"
 	},
 	"engines": {
-		"node": "^18.4.0"
+		"node": "^20.9.0"
 	}
 }

package/dist/util/base.js

@@ -1,26 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.del = exports.isPlainObject = void 0;
-/**
- * 是否是普通对象
- * @param obj 对象
- */
-const isPlainObject = (obj) => {
-    if (!obj) {
-        return false;
-    }
-    const prototype = Object.getPrototypeOf(obj);
-    return prototype === null || prototype.constructor === Object;
-};
-exports.isPlainObject = isPlainObject;
-/**
- * 从数组中删除指定元素
- * @param arr 数组
- * @param ele 元素
- */
-const del = (arr, ele) => {
-    const set = new Set(arr);
-    set.delete(ele);
-    return [...set];
-};
-exports.del = del;