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

package/dist/src/table/trBase.js

@@ -1,11 +1,13 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TrBaseToken = void 0;
 const lint_1 = require("../../util/lint");
-const Parser = require("../../index");
-const Token = require("..");
-const TableBaseToken = require("./base");
-const TdToken = require("./td");
+const index_1 = require("../../index");
+const __1 = require("..");
+const base_1 = require("./base");
+const td_1 = require("./td");
 /** 表格行或表格 */
-class TrBaseToken extends TableBaseToken {
+class TrBaseToken extends base_1.TableBaseToken {
     /**
      * @override
      * @browser
@@ -51,7 +53,7 @@ class TrBaseToken extends TableBaseToken {
     /** 修复简单的表格语法错误 */
     #correct() {
         const { childNodes: [, , child] } = this;
-        if (child?.constructor === Token) {
+        if (child?.constructor === __1.Token) {
             const { firstChild } = child;
             if (firstChild?.type !== 'text') {
                 child.prepend('\n');
@@ -72,7 +74,7 @@ class TrBaseToken extends TableBaseToken {
      */
     removeAt(i) {
         const child = this.childNodes.at(i);
-        if (child instanceof TdToken && child.isIndependent()) {
+        if (child instanceof td_1.TdToken && child.isIndependent()) {
             const { nextSibling } = child;
             if (nextSibling?.type === 'td') {
                 nextSibling.independence();
@@ -86,24 +88,29 @@ class TrBaseToken extends TableBaseToken {
      * @param i 插入位置
      */
     insertAt(token, i = this.length) {
-        if (!Parser.running && !(token instanceof TrBaseToken)) {
-            this.typeError('insertAt', 'TrToken');
+        if (!index_1.default.running && token.type !== 'td') {
+            if (this.type === 'tr') {
+                this.typeError('insertAt', 'TdToken');
+            }
+            else if (token.type !== 'tr') {
+                this.typeError('insertAt', 'TrToken', 'TdToken');
+            }
         }
         const child = this.childNodes.at(i);
-        if (token instanceof TdToken && token.isIndependent() && child instanceof TdToken) {
+        if (token instanceof td_1.TdToken && token.isIndependent() && child instanceof td_1.TdToken) {
             child.independence();
         }
         return super.insertAt(token, i);
     }
     /** 获取行数 */
     getRowCount() {
-        return Number(this.childNodes.some(child => child instanceof TdToken && child.isIndependent() && !child.firstChild.text().endsWith('+')));
+        return Number(this.childNodes.some(child => child instanceof td_1.TdToken && child.isIndependent() && !child.firstChild.text().endsWith('+')));
     }
     /** 获取列数 */
     getColCount() {
         let count = 0, last = 0;
         for (const child of this.childNodes) {
-            if (child instanceof TdToken) {
+            if (child instanceof td_1.TdToken) {
                 last = child.isIndependent() ? Number(child.subtype !== 'caption') : last;
                 count += last;
             }
@@ -112,9 +119,6 @@ class TrBaseToken extends TableBaseToken {
     }
     /** @ignore */
     getNthCol(n, insert = false) {
-        if (!Number.isInteger(n)) {
-            this.typeError('getNthCol', 'Number');
-        }
         const nCols = this.getColCount();
         let m = n < 0 ? n + nCols : n;
         if (m < 0 || m > nCols || m === nCols && !insert) {
@@ -122,7 +126,7 @@ class TrBaseToken extends TableBaseToken {
         }
         let last = 0;
         for (const child of this.childNodes.slice(2)) {
-            if (child instanceof TdToken) {
+            if (child instanceof td_1.TdToken) {
                 if (child.isIndependent()) {
                     last = Number(child.subtype !== 'caption');
                 }
@@ -145,9 +149,9 @@ class TrBaseToken extends TableBaseToken {
      * @param attr 单元格属性
      */
     insertTableCell(inner, { column }, subtype = 'td', attr = {}) {
-        const token = TdToken.create(inner, subtype, attr, this.getAttribute('include'), this.getAttribute('config'));
+        const token = td_1.TdToken.create(inner, subtype, attr, this.getAttribute('include'), this.getAttribute('config'));
         return this.insertBefore(token, this.getNthCol(column, true));
     }
 }
-Parser.classes['TrBaseToken'] = __filename;
-module.exports = TrBaseToken;
+exports.TrBaseToken = TrBaseToken;
+index_1.default.classes['TrBaseToken'] = __filename;

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

@@ -1,10 +1,10 @@
-import * as Parser from '../../index';
-import Token = require('..');
-import TagPairToken = require('.');
-import AttributesToken = require('../attributes');
+import { Token } from '..';
+import { TagPairToken } from '.';
+import { AttributesToken } from '../attributes';
+import type { LintError, Config } from '../../index';
 declare const ExtToken_base: (abstract new (...args: any[]) => {
-    childNodes: import("../../lib/node").AstNodeTypes[];
-    readonly "__#12@#attributesChild": AttributesToken;
+    childNodes: import("../../index").AstNodes[];
+    readonly "__#4@#attributesChild": AttributesToken;
     readonly attributes: Record<string, string | true>;
     className: string;
     readonly classList: Set<string>;
@@ -26,7 +26,7 @@ declare const ExtToken_base: (abstract new (...args: any[]) => {
  * 扩展标签
  * @classdesc `{childNodes: [AttributesToken, Token]}`
  */
-declare abstract class ExtToken extends ExtToken_base {
+export declare abstract class ExtToken extends ExtToken_base {
     readonly type = "ext";
     childNodes: [AttributesToken, Token];
     abstract get children(): [AttributesToken, Token];
@@ -42,13 +42,13 @@ declare abstract class ExtToken extends ExtToken_base {
      * @param inner 内部wikitext
      * @param closed 是否封闭
      */
-    constructor(name: string, attr?: string, inner?: string, closed?: string | undefined, config?: Parser.Config, accum?: Token[]);
+    constructor(name: string, attr?: string, inner?: string, closed?: string, config?: Config, accum?: Token[]);
     /**
      * @override
      * @browser
      */
-    lint(start?: number): Parser.LintError[];
+    lint(start?: number): LintError[];
     /** @override */
     cloneNode(): this;
 }
-export = ExtToken;
+export {};

package/dist/src/tagPair/ext.js

@@ -1,18 +1,30 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ExtToken = void 0;
 const lint_1 = require("../../util/lint");
-const base_1 = require("../../util/base");
-const attributesParent = require("../../mixin/attributesParent");
-const Parser = require("../../index");
-const Token = require("..");
-const TagPairToken = require(".");
-const AttributesToken = require("../attributes");
+const attributesParent_1 = require("../../mixin/attributesParent");
+const index_1 = require("../../index");
+const __1 = require("..");
+const _1 = require(".");
+const attributes_1 = require("../attributes");
+/**
+ * 从数组中删除指定元素
+ * @param arr 数组
+ * @param ele 元素
+ */
+const del = (arr, ele) => {
+    const set = new Set(arr);
+    set.delete(ele);
+    return [...set];
+};
 /**
  * 扩展标签
  * @classdesc `{childNodes: [AttributesToken, Token]}`
  */
-class ExtToken extends attributesParent(TagPairToken) {
+class ExtToken extends (0, attributesParent_1.attributesParent)(_1.TagPairToken) {
     type = 'ext';
     /** @override */
+    // eslint-disable-next-line class-methods-use-this
     get closed() {
         return true;
     }
@@ -23,13 +35,14 @@ class ExtToken extends attributesParent(TagPairToken) {
      * @param inner 内部wikitext
      * @param closed 是否封闭
      */
-    constructor(name, attr = '', inner = '', closed = undefined, config = Parser.getConfig(), accum = []) {
+    constructor(name, attr = '', inner = '', closed, config = index_1.default.getConfig(), accum = []) {
         const lcName = name.toLowerCase(), 
-        attrToken = new AttributesToken(!attr || attr.trimStart() !== attr ? attr : ` ${attr}`, 'ext-attrs', lcName, config, accum), newConfig = { ...config, ext: (0, base_1.del)(config.ext, lcName), excludes: [...config.excludes ?? []] };
+        // @ts-expect-error abstract class
+        attrToken = new attributes_1.AttributesToken(!attr || attr.trimStart() !== attr ? attr : ` ${attr}`, 'ext-attrs', lcName, config, accum), newConfig = { ...config, ext: del(config.ext, lcName), excludes: [...config.excludes ?? []] };
         let innerToken;
         switch (lcName) {
             case 'tab':
-                newConfig.ext = (0, base_1.del)(newConfig.ext, 'tabs');
+                newConfig.ext = del(newConfig.ext, 'tabs');
             // fall through
             case 'indicator':
             case 'poem':
@@ -42,59 +55,68 @@ class ExtToken extends attributesParent(TagPairToken) {
                 if (lcName === 'poem') {
                     newConfig.excludes.push('heading');
                 }
-                innerToken = new Token(inner, newConfig, true, accum);
+                innerToken = new __1.Token(inner, newConfig, true, accum);
                 break;
             case 'pre': {
-                const PreToken = require('../pre');
+                const { PreToken } = require('../pre');
+                // @ts-expect-error abstract class
                 innerToken = new PreToken(inner, newConfig, accum);
                 break;
             }
             case 'dynamicpagelist': {
-                const ParamTagToken = require('../paramTag');
+                const { ParamTagToken } = require('../paramTag');
+                // @ts-expect-error abstract class
                 innerToken = new ParamTagToken(inner, newConfig, accum);
                 break;
             }
             case 'inputbox': {
                 newConfig.excludes.push('heading');
-                const InputboxToken = require('../paramTag/inputbox');
+                const { InputboxToken } = require('../paramTag/inputbox');
+                // @ts-expect-error abstract class
                 innerToken = new InputboxToken(inner, newConfig, accum);
                 break;
             }
             case 'references': {
-                const NestedToken = require('../nested');
+                const { NestedToken } = require('../nested');
+                // @ts-expect-error abstract class
                 innerToken = new NestedToken(inner, /<!--.*?(?:-->|$)|<(ref)(\s[^>]*)?>(.*?)<\/(ref\s*)>/gisu, ['ref'], newConfig, accum);
                 break;
             }
             case 'choose': {
-                const NestedToken = require('../nested');
+                const { NestedToken } = require('../nested');
+                // @ts-expect-error abstract class
                 innerToken = new NestedToken(inner, /<(option|choicetemplate)(\s[^>]*)?>(.*?)<\/(\1)>/gsu, ['option', 'choicetemplate'], newConfig, accum);
                 break;
             }
             case 'combobox': {
-                const NestedToken = require('../nested');
+                const { NestedToken } = require('../nested');
+                // @ts-expect-error abstract class
                 innerToken = new NestedToken(inner, /<(combooption)(\s[^>]*)?>(.*?)<\/(combooption\s*)>/gisu, ['combooption'], newConfig, accum);
                 break;
             }
             case 'gallery': {
-                const GalleryToken = require('../gallery');
+                const { GalleryToken } = require('../gallery');
+                // @ts-expect-error abstract class
                 innerToken = new GalleryToken(inner, newConfig, accum);
                 break;
             }
             case 'imagemap': {
-                const ImagemapToken = require('../imagemap');
+                const { ImagemapToken } = require('../imagemap');
+                // @ts-expect-error abstract class
                 innerToken = new ImagemapToken(inner, newConfig, accum);
                 break;
             }
             // 更多定制扩展的代码示例：
             // ```
             // case 'extensionName': {
-            //	const ExtensionToken: typeof import('../extension') = require('../extension');
+            //	const {ExtensionToken}: typeof import('../extension') = require('../extension');
             //	innerToken = new ExtensionToken(inner, newConfig, accum);
             //	break;
             // }
             // ```
             default: {
-                const NowikiToken = require('../nowiki');
+                const { NowikiToken } = require('../nowiki');
+                // @ts-expect-error abstract class
                 innerToken = new NowikiToken(inner, newConfig);
             }
         }
@@ -116,12 +138,13 @@ class ExtToken extends attributesParent(TagPairToken) {
     /** @override */
     cloneNode() {
         const inner = this.lastChild.cloneNode(), tags = this.getAttribute('tags'), config = this.getAttribute('config'), attr = String(this.firstChild);
-        return Parser.run(() => {
+        return index_1.default.run(() => {
+            // @ts-expect-error abstract class
             const token = new ExtToken(tags[0], attr, '', this.selfClosing ? undefined : tags[1], config);
             token.lastChild.safeReplaceWith(inner);
             return token;
         });
     }
 }
-Parser.classes['ExtToken'] = __filename;
-module.exports = ExtToken;
+exports.ExtToken = ExtToken;
+index_1.default.classes['ExtToken'] = __filename;

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

@@ -1,9 +1,8 @@
-import * as Parser from '../../index';
-import TagPairToken = require('.');
-import Token = require('..');
-import AstText = require('../../lib/text');
+import { TagPairToken } from '.';
+import type { AstText, Token } from '../../internal';
 declare const IncludeToken_base: ((abstract new (...args: any[]) => {
     text(): string;
+    /** @browser */
     length: number;
     toString(selector?: string | undefined, separator?: string | undefined): string;
     insertAt(token: unknown, i?: number | undefined): unknown;
@@ -14,7 +13,7 @@ declare const IncludeToken_base: ((abstract new (...args: any[]) => {
  * `<includeonly>`或`<noinclude>`或`<onlyinclude>`
  * @classdesc `{childNodes: [AstText, AstText]}`
  */
-declare abstract class IncludeToken extends IncludeToken_base {
+export declare abstract class IncludeToken extends IncludeToken_base {
     /** @browser */
     readonly type = "include";
     childNodes: [AstText, AstText];
@@ -30,7 +29,7 @@ declare abstract class IncludeToken extends IncludeToken_base {
      * @param inner 内部wikitext
      * @param closed 是否封闭
      */
-    constructor(name: string, attr?: string, inner?: string | undefined, closed?: string | undefined, config?: Parser.Config, accum?: Token[]);
+    constructor(name: string, attr?: string, inner?: string, closed?: string, config?: import("../../index").Config, accum?: Token[]);
     /** @override */
     cloneNode(): this;
     /**
@@ -41,4 +40,4 @@ declare abstract class IncludeToken extends IncludeToken_base {
     /** 清除标签属性 */
     removeAttr(): void;
 }
-export = IncludeToken;
+export {};

package/dist/src/tagPair/include.js

@@ -1,12 +1,14 @@
 "use strict";
-const hidden = require("../../mixin/hidden");
-const Parser = require("../../index");
-const TagPairToken = require(".");
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.IncludeToken = void 0;
+const hidden_1 = require("../../mixin/hidden");
+const index_1 = require("../../index");
+const _1 = require(".");
 /**
  * `<includeonly>`或`<noinclude>`或`<onlyinclude>`
  * @classdesc `{childNodes: [AstText, AstText]}`
  */
-class IncludeToken extends hidden(TagPairToken) {
+class IncludeToken extends (0, hidden_1.hidden)(_1.TagPairToken) {
     /** @browser */
     type = 'include';
     /**
@@ -16,13 +18,14 @@ class IncludeToken extends hidden(TagPairToken) {
      * @param inner 内部wikitext
      * @param closed 是否封闭
      */
-    constructor(name, attr = '', inner = undefined, closed = undefined, config = Parser.getConfig(), accum = []) {
+    constructor(name, attr = '', inner, closed, config = index_1.default.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];
-        return Parser.run(() => new IncludeToken(tags[0], this.firstChild.data, inner, closing, config));
+        // @ts-expect-error abstract class
+        return index_1.default.run(() => new IncludeToken(tags[0], this.firstChild.data, inner, closing, config));
     }
     /**
      * @override
@@ -36,5 +39,5 @@ class IncludeToken extends hidden(TagPairToken) {
         super.setText('');
     }
 }
-Parser.classes['IncludeToken'] = __filename;
-module.exports = IncludeToken;
+exports.IncludeToken = IncludeToken;
+index_1.default.classes['IncludeToken'] = __filename;

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

@@ -1,23 +1,24 @@
-import * as Parser from '../../index';
-import Token = require('..');
-import type { AstNodeTypes, TokenAttributeGetter } from '../../lib/node';
+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("../../lib/text");
-    insertAt<T extends AstNodeTypes>(token: T, i?: number | undefined): T;
+    insertAt(token: string, i?: number | undefined): import("../../index").AstText;
+    insertAt<T extends AstNodes>(token: T, i?: number | undefined): T;
     length: number;
     toString(selector?: string | undefined, separator?: string | undefined): string;
+    /** @browser */
     text(separator?: string | undefined): string;
 }) & {
-    readonly fixed: true; /** @browser */
+    readonly fixed: true;
 }) & typeof Token;
 /** 成对标签 */
-declare abstract class TagPairToken extends TagPairToken_base {
+export declare abstract class TagPairToken extends TagPairToken_base {
     #private;
     type: 'ext' | 'include';
     name: string;
-    abstract get firstChild(): AstNodeTypes;
-    abstract get lastChild(): AstNodeTypes;
+    childNodes: [AstNodes, AstNodes];
+    abstract get firstChild(): AstNodes;
+    abstract get lastChild(): AstNodes;
     /**
      * 是否闭合
      * @browser
@@ -36,7 +37,7 @@ declare abstract class TagPairToken extends TagPairToken_base {
      * @param inner 内部wikitext
      * @param closed 是否封闭；约定`undefined`表示自封闭，`''`表示未闭合
      */
-    constructor(name: string, attr: string | Token, inner: string | Token, closed: string | undefined, config?: Parser.Config, accum?: Token[]);
+    constructor(name: string, attr: string | Token, inner: string | Token, closed?: string, config?: import("../../index").Config, accum?: Token[]);
     /**
      * @override
      * @browser
@@ -53,4 +54,4 @@ declare abstract class TagPairToken extends TagPairToken_base {
      */
     print(): string;
 }
-export = TagPairToken;
+export {};

package/dist/src/tagPair/index.js

@@ -1,9 +1,11 @@
 "use strict";
-const Parser = require("../../index");
-const fixed = require("../../mixin/fixed");
-const Token = require("..");
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TagPairToken = void 0;
+const fixed_1 = require("../../mixin/fixed");
+const index_1 = require("../../index");
+const __1 = require("..");
 /** 成对标签 */
-class TagPairToken extends fixed(Token) {
+class TagPairToken extends (0, fixed_1.fixed)(__1.Token) {
     /** @browser */
     #selfClosing;
     /** @browser */
@@ -26,7 +28,7 @@ class TagPairToken extends fixed(Token) {
     }
     set selfClosing(value) {
         if (value !== this.#selfClosing && this.lastChild.text()) {
-            Parser.warn(`<${this.name}>标签内部的${value ? '文本将被隐藏' : '原有文本将再次可见'}！`);
+            index_1.default.warn(`<${this.name}>标签内部的${value ? '文本将被隐藏' : '原有文本将再次可见'}！`);
         }
         this.#selfClosing = value;
     }
@@ -41,7 +43,7 @@ class TagPairToken extends fixed(Token) {
      * @param inner 内部wikitext
      * @param closed 是否封闭；约定`undefined`表示自封闭，`''`表示未闭合
      */
-    constructor(name, attr, inner, closed, config = Parser.getConfig(), accum = []) {
+    constructor(name, attr, inner, closed, config = index_1.default.getConfig(), accum = []) {
         super(undefined, config, true);
         this.setAttribute('name', name.toLowerCase());
         this.#tags = [name, closed || name];
@@ -67,7 +69,7 @@ class TagPairToken extends fixed(Token) {
             return '';
         }
         else if (!this.closed && nextSibling) {
-            Parser.error(`自动闭合 <${name}>`, lastChild);
+            index_1.default.error(`自动闭合 <${name}>`, lastChild);
             this.#closed = true;
         }
         return this.#selfClosing
@@ -89,8 +91,8 @@ class TagPairToken extends fixed(Token) {
         return this.#tags[0].length + 1;
     }
     /** @private */
-    getGaps() {
-        return 1;
+    getGaps(i) {
+        return i === 0 ? 1 : 1;
     }
     /**
      * @override
@@ -107,5 +109,5 @@ class TagPairToken extends fixed(Token) {
         return key === 'tags' ? [...this.#tags] : super.getAttribute(key);
     }
 }
-Parser.classes['TagPairToken'] = __filename;
-module.exports = TagPairToken;
+exports.TagPairToken = TagPairToken;
+index_1.default.classes['TagPairToken'] = __filename;

package/dist/src/transclude.d.ts

@@ -1,14 +1,13 @@
-import * as Parser from '../index';
-import Token = require('.');
-import ParameterToken = require('./parameter');
-import AtomToken = require('./atom');
-import SyntaxToken = require('./syntax');
-import type { TokenAttributeGetter } from '../lib/node';
+import { Token } from '.';
+import { ParameterToken } from './parameter';
+import { AtomToken } from './atom';
+import { SyntaxToken } from './syntax';
+import type { LintError } from '../index';
 /**
  * 模板或魔术字
  * @classdesc `{childNodes: [AtomToken|SyntaxToken, ...AtomToken, ...ParameterToken]}`
  */
-declare abstract class TranscludeToken extends Token {
+export declare abstract class TranscludeToken extends Token {
     #private;
     /** @browser */
     type: 'template' | 'magic-word';
@@ -28,7 +27,7 @@ declare abstract class TranscludeToken extends Token {
      * @param parts 参数各部分
      * @throws `SyntaxError` 非法的模板名称
      */
-    constructor(title: string, parts: ([string] | [string | number, string])[], config?: Parser.Config, accum?: Token[]);
+    constructor(title: string, parts: ([string] | [string | number, string])[], config?: import("../index").Config, accum?: Token[]);
     /**
      * 设置引用修饰符
      * @browser
@@ -59,7 +58,7 @@ declare abstract class TranscludeToken extends Token {
      * @override
      * @browser
      */
-    lint(start?: number): Parser.LintError[];
+    lint(start?: number): LintError[];
     /**
      * @override
      * @browser
@@ -199,4 +198,3 @@ declare abstract class TranscludeToken extends Token {
      */
     escapeTables(): TranscludeToken;
 }
-export = TranscludeToken;