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

package/dist/src/tagPair/include.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IncludeToken = void 0;
 const hidden_1 = require("../../mixin/hidden");
-const index_1 = require("../../index");
+const Parser = require("../../index");
 const _1 = require(".");
 /**
  * `<includeonly>`或`<noinclude>`或`<onlyinclude>`
@@ -18,14 +18,13 @@ class IncludeToken extends (0, hidden_1.hidden)(_1.TagPairToken) {
      * @param inner 内部wikitext
      * @param closed 是否封闭
      */
-    constructor(name, attr = '', inner, closed, config = index_1.default.getConfig(), accum = []) {
+    constructor(name, attr = '', inner, closed, config = Parser.getConfig(), accum = []) {
         super(name, attr, inner ?? '', inner === undefined ? closed : closed ?? '', config, accum);
     }
     /** @override */
     cloneNode() {
         const tags = this.getAttribute('tags'), config = this.getAttribute('config'), inner = this.selfClosing ? undefined : this.lastChild.data, closing = this.selfClosing || !this.closed ? undefined : tags[1];
-        // @ts-expect-error abstract class
-        return index_1.default.run(() => new IncludeToken(tags[0], this.firstChild.data, inner, closing, config));
+        return Parser.run(() => new IncludeToken(tags[0], this.firstChild.data, inner, closing, config));
     }
     /**
      * @override
@@ -40,4 +39,4 @@ class IncludeToken extends (0, hidden_1.hidden)(_1.TagPairToken) {
     }
 }
 exports.IncludeToken = IncludeToken;
-index_1.default.classes['IncludeToken'] = __filename;
+Parser.classes['IncludeToken'] = __filename;

package/dist/src/tagPair/index.d.ts

@@ -1,16 +1,16 @@
+import * as Parser from '../../index';
 import { Token } from '..';
 import type { AstNodes } from '../../lib/node';
 declare const TagPairToken_base: ((abstract new (...args: any[]) => {
     removeAt(): never;
-    insertAt(token: string, i?: number | undefined): import("../../index").AstText;
-    insertAt<T extends AstNodes>(token: T, i?: number | undefined): T;
+    insertAt(token: string, i?: number | undefined): Parser.AstText;
+    insertAt<T extends Parser.AstNodes>(token: T, i?: number | undefined): T;
     length: number;
-    toString(selector?: string | undefined, separator?: string | undefined): string;
-    /** @browser */
+    toString(omit?: Set<string> | undefined, separator?: string | undefined): string;
     text(separator?: string | undefined): string;
 }) & {
     readonly fixed: true;
-}) & typeof Token;
+}) & typeof Parser.Token;
 /** 成对标签 */
 export declare abstract class TagPairToken extends TagPairToken_base {
     #private;
@@ -37,12 +37,12 @@ export declare abstract class TagPairToken extends TagPairToken_base {
      * @param inner 内部wikitext
      * @param closed 是否封闭；约定`undefined`表示自封闭，`''`表示未闭合
      */
-    constructor(name: string, attr: string | Token, inner: string | Token, closed?: string, config?: import("../../index").Config, accum?: Token[]);
+    constructor(name: string, attr: string | Token, inner: string | Token, closed?: string, config?: Parser.Config, accum?: Token[]);
     /**
      * @override
      * @browser
      */
-    toString(selector?: string): string;
+    toString(omit?: Set<string>): string;
     /**
      * @override
      * @browser

package/dist/src/tagPair/index.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TagPairToken = void 0;
 const fixed_1 = require("../../mixin/fixed");
-const index_1 = require("../../index");
+const Parser = require("../../index");
 const __1 = require("..");
 /** 成对标签 */
 class TagPairToken extends (0, fixed_1.fixed)(__1.Token) {
@@ -28,7 +28,7 @@ class TagPairToken extends (0, fixed_1.fixed)(__1.Token) {
     }
     set selfClosing(value) {
         if (value !== this.#selfClosing && this.lastChild.text()) {
-            index_1.default.warn(`<${this.name}>标签内部的${value ? '文本将被隐藏' : '原有文本将再次可见'}！`);
+            Parser.warn(`<${this.name}>标签内部的${value ? '文本将被隐藏' : '原有文本将再次可见'}！`);
         }
         this.#selfClosing = value;
     }
@@ -43,38 +43,32 @@ class TagPairToken extends (0, fixed_1.fixed)(__1.Token) {
      * @param inner 内部wikitext
      * @param closed 是否封闭；约定`undefined`表示自封闭，`''`表示未闭合
      */
-    constructor(name, attr, inner, closed, config = index_1.default.getConfig(), accum = []) {
+    constructor(name, attr, inner, closed, config = Parser.getConfig(), accum = []) {
         super(undefined, config, true);
         this.setAttribute('name', name.toLowerCase());
         this.#tags = [name, closed || name];
         this.#selfClosing = closed === undefined;
         this.#closed = closed !== '';
         this.append(attr, inner);
-        let index = typeof attr === 'string' ? -1 : accum.indexOf(attr);
-        if (index === -1 && typeof inner !== 'string') {
-            index = accum.indexOf(inner);
-        }
-        if (index === -1) {
-            index = Infinity;
-        }
-        accum.splice(index, 0, this);
+        const index = typeof attr === 'string' ? -1 : accum.indexOf(attr);
+        accum.splice(index === -1 ? Infinity : index, 0, this);
     }
     /**
      * @override
      * @browser
      */
-    toString(selector) {
-        const { firstChild, lastChild, nextSibling, name } = this, [opening, closing] = this.#tags;
-        if (selector && this.matches(selector)) {
+    toString(omit) {
+        const { firstChild, lastChild, nextSibling, name, closed } = this, [opening, closing] = this.#tags;
+        if (omit && this.matchesTypes(omit)) {
             return '';
         }
-        else if (!this.closed && nextSibling) {
-            index_1.default.error(`自动闭合 <${name}>`, lastChild);
+        else if (!closed && nextSibling) {
+            Parser.error(`自动闭合 <${name}>`, lastChild);
             this.#closed = true;
         }
         return this.#selfClosing
-            ? `<${opening}${firstChild.toString(selector)}/>`
-            : `<${opening}${firstChild.toString(selector)}>${lastChild.toString(selector)}${this.closed ? `</${closing}>` : ''}`;
+            ? `<${opening}${firstChild.toString(omit)}/>`
+            : `<${opening}${firstChild.toString(omit)}>${lastChild.toString(omit)}${this.closed ? `</${closing}>` : ''}`;
     }
     /**
      * @override
@@ -110,4 +104,4 @@ class TagPairToken extends (0, fixed_1.fixed)(__1.Token) {
     }
 }
 exports.TagPairToken = TagPairToken;
-index_1.default.classes['TagPairToken'] = __filename;
+Parser.classes['TagPairToken'] = __filename;

package/dist/src/transclude.d.ts

@@ -1,3 +1,4 @@
+import * as Parser from '../index';
 import { Token } from '.';
 import { ParameterToken } from './parameter';
 import { AtomToken } from './atom';
@@ -7,7 +8,7 @@ import type { LintError } from '../index';
  * 模板或魔术字
  * @classdesc `{childNodes: [AtomToken|SyntaxToken, ...AtomToken, ...ParameterToken]}`
  */
-export declare abstract class TranscludeToken extends Token {
+export declare class TranscludeToken extends Token {
     #private;
     /** @browser */
     type: 'template' | 'magic-word';
@@ -27,13 +28,13 @@ export declare abstract class TranscludeToken extends Token {
      * @param parts 参数各部分
      * @throws `SyntaxError` 非法的模板名称
      */
-    constructor(title: string, parts: ([string] | [string | number, string])[], config?: import("../index").Config, accum?: Token[]);
+    constructor(title: string, parts: ([string] | [string | number, string])[], config?: Parser.Config, accum?: Token[]);
     /**
      * 设置引用修饰符
      * @browser
      * @param modifier 引用修饰符
      */
-    setModifier(modifier?: string): boolean;
+    setModifier(modifier: string): boolean;
     /**
      * 是否是模板
      * @browser
@@ -43,17 +44,12 @@ export declare abstract class TranscludeToken extends Token {
      * @override
      * @browser
      */
-    toString(selector?: string): string;
+    toString(omit?: Set<string>): string;
     /**
      * @override
      * @browser
      */
     text(): string;
-    /**
-     * @override
-     * @browser
-     */
-    print(): string;
     /**
      * @override
      * @browser
@@ -96,6 +92,11 @@ export declare abstract class TranscludeToken extends Token {
      * @throws `Error` 不是可接受的魔术字
      */
     getPossibleValues(): Token[];
+    /**
+     * @override
+     * @browser
+     */
+    print(): string;
     /** @override */
     cloneNode(): this;
     /** 替换引用 */

package/dist/src/transclude.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TranscludeToken = void 0;
 const string_1 = require("../util/string");
 const lint_1 = require("../util/lint");
-const index_1 = require("../index");
+const Parser = require("../index");
 const _1 = require(".");
 const parameter_1 = require("./parameter");
 const atom_1 = require("./atom");
@@ -35,7 +35,7 @@ class TranscludeToken extends _1.Token {
      * @param parts 参数各部分
      * @throws `SyntaxError` 非法的模板名称
      */
-    constructor(title, parts, config = index_1.default.getConfig(), accum = []) {
+    constructor(title, parts, config = Parser.getConfig(), accum = []) {
         super(undefined, config, true, accum, {
             AtomToken: 0, SyntaxToken: 0, ParameterToken: '1:',
         });
@@ -69,9 +69,7 @@ class TranscludeToken extends _1.Token {
                         if (!part) {
                             break;
                         }
-                        const invoke = new atom_1.AtomToken(part.join('='), `invoke-${i ? 'function' : 'module'}`, config, accum, {
-                            'Stage-1': ':', '!ExtToken': '',
-                        });
+                        const invoke = new atom_1.AtomToken(part.join('='), `invoke-${i ? 'function' : 'module'}`, config, accum, { 'Stage-1': ':', '!ExtToken': '' });
                         super.insertAt(invoke);
                     }
                     this.protectChildren('1:3');
@@ -101,7 +99,6 @@ class TranscludeToken extends _1.Token {
                 part.unshift(i);
                 i++;
             }
-            // @ts-expect-error abstract class
             this.insertAt(new parameter_1.ParameterToken(...part, config, accum));
         }
         this.protectChildren(0);
@@ -111,14 +108,14 @@ class TranscludeToken extends _1.Token {
      * @browser
      * @param modifier 引用修饰符
      */
-    setModifier(modifier = '') {
+    setModifier(modifier) {
         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 === '')
-            || (index_1.default.running || this.length > 1) && (isRaw || isSubst || modifier === '')) {
+            || (Parser.running || this.length > 1) && (isRaw || isSubst || modifier === '')) {
             this.setAttribute('modifier', modifier);
             this.#raw = isRaw;
             return Boolean(modifier);
@@ -177,14 +174,13 @@ class TranscludeToken extends _1.Token {
      * @override
      * @browser
      */
-    toString(selector) {
-        if (selector && this.matches(selector)) {
+    toString(omit) {
+        if (omit && this.matchesTypes(omit)) {
             return '';
         }
-        const { childNodes, length, firstChild, modifier } = this;
-        return `{{${modifier}${this.type === 'magic-word'
-            ? `${firstChild.toString(selector)}${length === 1 ? '' : ':'}${childNodes.slice(1).map(child => child.toString(selector)).join('|')}`
-            : super.toString(selector, '|')}}}`;
+        return `{{${this.modifier}${this.type === 'magic-word'
+            ? `${this.firstChild.toString(omit)}${this.length === 1 ? '' : ':'}${this.childNodes.slice(1).map(child => child.toString(omit)).join('|')}`
+            : super.toString(omit, '|')}}}`;
     }
     /**
      * @override
@@ -194,7 +190,7 @@ class TranscludeToken extends _1.Token {
         const { childNodes, length, firstChild, modifier, type, name } = this;
         return type === 'magic-word' && name === 'vardefine'
             ? ''
-            : `{{${modifier}${this.type === 'magic-word'
+            : `{{${modifier}${type === 'magic-word'
                 ? `${firstChild.text()}${length === 1 ? '' : ':'}${(0, string_1.text)(childNodes.slice(1), '|')}`
                 : super.text('|')}}}`;
     }
@@ -206,16 +202,6 @@ class TranscludeToken extends _1.Token {
     getGaps(i) {
         return i < this.length - 1 ? 1 : 0;
     }
-    /**
-     * @override
-     * @browser
-     */
-    print() {
-        const { childNodes, length, firstChild, modifier } = this;
-        return `<span class="wpb-${this.type}">{{${modifier}${this.type === 'magic-word'
-            ? `${firstChild.print()}${length === 1 ? '' : ':'}${(0, string_1.print)(childNodes.slice(1), { sep: '|' })}`
-            : (0, string_1.print)(childNodes, { sep: '|' })}}}</span>`;
-    }
     /**
      * @override
      * @browser
@@ -378,11 +364,20 @@ class TranscludeToken extends _1.Token {
         }
         return queue;
     }
+    /**
+     * @override
+     * @browser
+     */
+    print() {
+        const { childNodes, length, firstChild, modifier, type } = this;
+        return `<span class="wpb-${type}">{{${modifier}${type === 'magic-word'
+            ? `${firstChild.print()}${length === 1 ? '' : ':'}${(0, string_1.print)(childNodes.slice(1), { sep: '|' })}`
+            : (0, string_1.print)(childNodes, { sep: '|' })}}}</span>`;
+    }
     /** @override */
     cloneNode() {
         const [first, ...cloned] = this.cloneChildNodes(), config = this.getAttribute('config');
-        return index_1.default.run(() => {
-            // @ts-expect-error abstract class
+        return Parser.run(() => {
             const token = new TranscludeToken(this.type === 'template' ? '' : first.text(), [], config);
             if (this.#raw) {
                 token.setModifier(this.modifier);
@@ -458,7 +453,7 @@ class TranscludeToken extends _1.Token {
      * @param exact 是否匹配匿名性
      */
     removeArg(key, exact = false) {
-        index_1.default.run(() => {
+        Parser.run(() => {
             for (const token of this.getArgs(key, exact, false)) {
                 this.removeChild(token);
             }
@@ -496,7 +491,7 @@ class TranscludeToken extends _1.Token {
      * @throws `SyntaxError` 非法的匿名参数
      */
     newAnonArg(val) {
-        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';
+        const templateLike = this.isTemplate(), wikitext = `{{${templateLike ? ':T|' : 'lc:'}${val}}}`, root = Parser.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)}`);
         }
@@ -522,15 +517,15 @@ class TranscludeToken extends _1.Token {
             token.setValue(value);
             return;
         }
-        const wikitext = `{{:T|${key}=${value}}}`, root = index_1.default.parse(wikitext, this.getAttribute('include'), 2, this.getAttribute('config')), { length, firstChild: template } = root;
+        const wikitext = `{{:T|${key}=${value}}}`, root = Parser.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)}`);
         }
         const { name, lastChild: parameter } = template;
-        if (name === 'T' && parameter.name === key) {
-            this.insertAt(parameter);
+        if (name !== 'T' || parameter.name !== key) {
+            throw new SyntaxError(`非法的命名参数：${key}=${(0, string_1.noWrap)(value)}`);
         }
-        throw new SyntaxError(`非法的命名参数：${key}=${(0, string_1.noWrap)(value)}`);
+        this.insertAt(parameter);
     }
     /**
      * 将匿名参数改写为命名参数
@@ -554,11 +549,11 @@ class TranscludeToken extends _1.Token {
         if (this.type === 'magic-word') {
             throw new Error(`${this.constructor.name}.replaceTemplate 方法仅用于更换模板！`);
         }
-        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);
+        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}`);
         }
-        throw new SyntaxError(`非法的模板名称：${title}`);
+        this.firstChild.replaceChildren(...template.firstChild.childNodes);
     }
     /**
      * 替换模块名
@@ -570,7 +565,7 @@ class TranscludeToken extends _1.Token {
         if (this.type !== 'magic-word' || this.name !== 'invoke') {
             throw new Error(`${this.constructor.name}.replaceModule 方法仅用于更换模块！`);
         }
-        const root = index_1.default.parse(`{{#invoke:${title}}}`, this.getAttribute('include'), 2, this.getAttribute('config')), { length, firstChild: invoke } = root, { type, name, lastChild } = invoke;
+        const root = Parser.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}`);
         }
@@ -596,7 +591,7 @@ class TranscludeToken extends _1.Token {
         else if (this.length < 2) {
             throw new Error('尚未指定模块名称！');
         }
-        const root = index_1.default.parse(`{{#invoke:M|${func}}}`, this.getAttribute('include'), 2, this.getAttribute('config')), { length, firstChild: invoke } = root, { type, name, lastChild } = invoke;
+        const root = Parser.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}`);
         }
@@ -688,7 +683,7 @@ class TranscludeToken extends _1.Token {
                 }
             }
             if (remaining > 1) {
-                index_1.default.error(`${this.type === 'template'
+                Parser.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();
@@ -705,17 +700,17 @@ class TranscludeToken extends _1.Token {
      * @throws `Error` 转义失败
      */
     escapeTables() {
-        const count = this.hasDuplicatedArgs();
-        if (!/\n[^\S\n]*(?::+\s*)?\{\|[^\n]*\n\s*(?:\S[^\n]*\n\s*)*\|\}/u.test(this.text()) || !count) {
+        const count = this.hasDuplicatedArgs(), str = this.text(), i = str.search(/\n[^\S\n]*(?::+[^\S\n]*)?\{\|/u), j = str.slice(i).search(/\n[^\S\n]*\|\}/u);
+        if (i === -1 || j === -1 || !count) {
             return this;
         }
-        const stripped = String(this).slice(2, -2), include = this.getAttribute('include'), config = this.getAttribute('config'), parsed = index_1.default.parse(stripped, include, 4, config);
+        const stripped = String(this).slice(2, -2), include = this.getAttribute('include'), config = this.getAttribute('config'), parsed = Parser.parse(stripped, include, 4, config);
         for (const table of parsed.childNodes) {
             if (table.type === 'table') {
                 table.escape();
             }
         }
-        const { firstChild, length } = index_1.default.parse(`{{${String(parsed)}}}`, include, 2, config);
+        const { firstChild, length } = Parser.parse(`{{${String(parsed)}}}`, include, 2, config);
         if (length !== 1 || !(firstChild instanceof TranscludeToken)) {
             throw new Error('转义表格失败！');
         }
@@ -723,10 +718,10 @@ class TranscludeToken extends _1.Token {
         if (newCount === count) {
             return this;
         }
-        index_1.default.info(`共修复了 ${count - newCount} 个重复参数。`);
+        Parser.info(`共修复了 ${count - newCount} 个重复参数。`);
         this.safeReplaceWith(firstChild);
         return firstChild;
     }
 }
 exports.TranscludeToken = TranscludeToken;
-index_1.default.classes['TranscludeToken'] = __filename;
+Parser.classes['TranscludeToken'] = __filename;

package/dist/util/lint.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateForSelf = exports.generateForChild = void 0;
-const index_1 = require("../index");
+const Parser = require("../index");
 /**
  * 生成对于子节点的LintError对象
  * @param child 子节点
@@ -10,8 +10,18 @@ const index_1 = 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 ? startCol + offsetWidth : offsetWidth;
-    return { message: index_1.default.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), startIndex = start + index, startLine = top + offsetTop, startCol = offsetTop ? offsetLeft : left + offsetLeft;
+    return {
+        message: Parser.msg(msg),
+        severity,
+        startIndex,
+        endIndex: startIndex + str.length,
+        startLine,
+        endLine: startLine + offsetHeight - 1,
+        startCol,
+        endCol: offsetHeight === 1 ? startCol + offsetWidth : offsetWidth,
+        excerpt: str.slice(0, 50),
+    };
 };
 exports.generateForChild = generateForChild;
 /**
@@ -24,7 +34,7 @@ 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: index_1.default.msg(msg),
+        message: Parser.msg(msg),
         severity,
         startIndex: start,
         endIndex: start + str.length,

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.escapeRegExp = exports.print = exports.removeComment = exports.extUrlChar = exports.extUrlCharFirst = void 0;
+exports.normalizeSpace = exports.toCase = exports.print = exports.noWrap = exports.decodeHtml = exports.text = exports.escapeRegExp = 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)*';
 /**
@@ -10,19 +10,6 @@ exports.extUrlChar = '(?:[^[\\]<>"\\0-\\x1F\\x7F\\p{Zs}\\uFFFD]|\\0\\d+c\\x7F)*'
  */
 const removeComment = (str) => str.replace(/\0\d+c\x7F/gu, '');
 exports.removeComment = removeComment;
-/**
- * 以HTML格式打印
- * @browser
- * @param childNodes 子节点
- * @param opt 选项
- */
-const print = (childNodes, opt = {}) => {
-    const { pre = '', post = '', sep = '' } = opt, entities = { '&': 'amp', '<': 'lt', '>': 'gt' };
-    return `${pre}${childNodes.map(child => child.type === 'text'
-        ? child.data.replace(/[&<>]/gu, p => `&${entities[p]};`)
-        : child.print()).join(sep)}${post}`;
-};
-exports.print = print;
 /**
  * escape special chars for RegExp constructor
  * @browser
@@ -45,6 +32,26 @@ exports.text = text;
  */
 const decodeHtml = (str) => str.replace(/&#(\d+|x[\da-f]+);/giu, (_, code) => String.fromCodePoint(Number(`${code[0].toLowerCase() === 'x' ? '0' : ''}${code}`)));
 exports.decodeHtml = decodeHtml;
+/**
+ * escape newlines
+ * @browser
+ * @param str 原字符串
+ */
+const noWrap = (str) => str.replaceAll('\n', '\\n');
+exports.noWrap = noWrap;
+/**
+ * 以HTML格式打印
+ * @browser
+ * @param childNodes 子节点
+ * @param opt 选项
+ */
+const print = (childNodes, opt = {}) => {
+    const { pre = '', post = '', sep = '' } = opt, entities = { '&': 'amp', '<': 'lt', '>': 'gt' };
+    return `${pre}${childNodes.map(child => child.type === 'text'
+        ? child.data.replace(/[&<>]/gu, p => `&${entities[p]};`)
+        : child.print()).join(sep)}${post}`;
+};
+exports.print = print;
 /**
  * optionally convert to lower cases
  * @param val 属性值
@@ -52,12 +59,6 @@ exports.decodeHtml = decodeHtml;
  */
 const toCase = (val, i) => i ? val.toLowerCase() : val;
 exports.toCase = toCase;
-/**
- * escape newlines
- * @param str 原字符串
- */
-const noWrap = (str) => str.replaceAll('\n', '\\n');
-exports.noWrap = noWrap;
 /**
  * convert newline in text nodes to single whitespace
  * @param token 父节点

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wikiparser-node",
-	"version": "1.0.0-beta.2",
+	"version": "1.0.0-beta.4",
 	"description": "A Node.js parser for MediaWiki markup with AST",
 	"keywords": [
 		"mediawiki",
@@ -28,6 +28,7 @@
 	"scripts": {
 		"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/",
+		"diff": "git diff --ignore-all-space --color-moved",
 		"doc": "node ./bin/doc.js",
 		"toc": "node ./bin/toc.js",
 		"lint:ts": "eslint --cache --ignore-pattern '/dist/' .",
@@ -37,19 +38,20 @@
 		"test:single": "node --prof test/single.js && node --prof-process isolate-0x*-v8.log > test/processed.txt && rm isolate-0x*-v8.log"
 	},
 	"devDependencies": {
+		"@cypress/request": "^3.0.1",
 		"@types/node": "^20.9.0",
+		"@typescript-eslint/eslint-plugin": "^5.62.0",
+		"@typescript-eslint/parser": "^5.62.0",
+		"ajv-cli": "^5.0.0",
 		"eslint": "^8.53.0",
+		"eslint-plugin-eslint-comments": "^3.2.0",
+		"eslint-plugin-jsdoc": "^46.8.2",
+		"eslint-plugin-json-es": "^1.5.7",
 		"eslint-plugin-n": "^16.3.1",
+		"eslint-plugin-promise": "^6.1.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": "^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"
+		"typescript": "^5.0.3"
 	},
 	"engines": {
 		"node": "^20.9.0"