wikiparser-node 1.9.2 → 1.9.3

package/dist/src/redirect.d.ts

@@ -9,7 +9,6 @@ import type { LintError } from '../base';
  */
 export declare abstract class RedirectToken extends Token {
     #private;
-    readonly type = "redirect";
     readonly childNodes: readonly [SyntaxToken, RedirectTargetToken];
     abstract get firstChild(): SyntaxToken;
     abstract get lastChild(): RedirectTargetToken;
@@ -18,6 +17,7 @@ export declare abstract class RedirectToken extends Token {
     abstract get firstElementChild(): SyntaxToken;
     abstract get lastElementChild(): RedirectTargetToken;
     abstract get previousElementSibling(): undefined;
+    get type(): 'redirect';
     /**
      * @param pre leading whitespace
      * @param syntax 重定向魔术字
@@ -26,6 +26,5 @@ export declare abstract class RedirectToken extends Token {
      * @param post trailing whitespace
      */
     constructor(pre: string, syntax: string | undefined, link: string, text: string | undefined, post: string, config?: Parser.Config, accum?: Token[]);
-    /** @override */
     cloneNode(): this;
 }

package/dist/src/redirect.js

@@ -62,10 +62,12 @@ let RedirectToken = (() => {
             if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
             __runInitializers(_classThis, _classExtraInitializers);
         }
-        type = 'redirect';
         #pre;
         #post;
         /* NOT FOR BROWSER END */
+        get type() {
+            return 'redirect';
+        }
         /**
          * @param pre leading whitespace
          * @param syntax 重定向魔术字
@@ -103,7 +105,6 @@ let RedirectToken = (() => {
             return super.print({ pre: this.#pre, post: this.#post });
         }
         /* NOT FOR BROWSER */
-        /** @override */
         cloneNode() {
             const cloned = this.cloneChildNodes(), config = this.getAttribute('config');
             return debug_1.Shadow.run(() => {

package/dist/src/syntax.d.ts

@@ -1,17 +1,17 @@
 import { Token } from './index';
 import type { Config } from '../base';
 import type { SyntaxBase } from '../mixin/syntax';
-declare type SyntaxTypes = 'plain' | 'heading-trail' | 'magic-word-name' | 'table-syntax' | 'redirect-syntax';
+declare type SyntaxTypes = 'heading-trail' | 'magic-word-name' | 'table-syntax' | 'redirect-syntax';
 /** NOT FOR BROWSER */
 export interface SyntaxToken extends SyntaxBase {
 }
 /** NOT FOR BROWSER END */
 /** 满足特定语法格式的plain Token */
 export declare class SyntaxToken extends Token {
-    type: SyntaxTypes;
+    #private;
+    get type(): SyntaxTypes;
     /** @param pattern 语法正则 */
-    constructor(wikitext: string | undefined, pattern: RegExp, type?: SyntaxTypes, config?: Config, accum?: Token[], acceptable?: Acceptable);
-    /** @override */
+    constructor(wikitext: string | undefined, pattern: RegExp, type: SyntaxTypes, config?: Config, accum?: Token[], acceptable?: Acceptable);
     cloneNode(): this;
 }
 export {};

package/dist/src/syntax.js

@@ -56,10 +56,14 @@ let SyntaxToken = (() => {
             if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
             __runInitializers(_classThis, _classExtraInitializers);
         }
+        #type;
+        get type() {
+            return this.#type;
+        }
         /** @param pattern 语法正则 */
-        constructor(wikitext, pattern, type = 'plain', config, accum, acceptable) {
+        constructor(wikitext, pattern, type, config, accum, acceptable) {
             super(wikitext, config, accum, acceptable);
-            this.type = type;
+            this.#type = type;
             /* NOT FOR BROWSER */
             this.setAttribute('pattern', pattern);
         }
@@ -68,7 +72,6 @@ let SyntaxToken = (() => {
             return [];
         }
         /* NOT FOR BROWSER */
-        /** @override */
         cloneNode() {
             const cloned = this.cloneChildNodes(), config = this.getAttribute('config'), acceptable = this.getAcceptable();
             return debug_1.Shadow.run(() => {

package/dist/src/table/base.d.ts

@@ -7,7 +7,7 @@ declare type TableTypes = 'table' | 'tr' | 'td';
 export interface TableBaseToken extends AttributesParentBase {
 }
 export declare abstract class TableBaseToken extends Token {
-    type: TableTypes;
+    abstract get type(): TableTypes;
     readonly childNodes: readonly [SyntaxToken, AttributesToken, ...Token[]];
     abstract get firstChild(): SyntaxToken;
     abstract get lastChild(): Token;
@@ -21,7 +21,6 @@ export declare abstract class TableBaseToken extends Token {
      * @param attr 表格属性
      */
     constructor(pattern: RegExp, syntax: string, type: TableTypes, attr?: string, config?: Parser.Config, accum?: Token[], acceptable?: Acceptable);
-    /** @override */
     cloneNode(): this;
     /** 转义表格语法 */
     escape(): void;

package/dist/src/table/base.js

@@ -42,7 +42,6 @@ class TableBaseToken extends (0, attributesParent_1.attributesParent)(1)(index_2
         this.protectChildren(0, 1);
     }
     /* NOT FOR BROWSER */
-    /** @override */
     cloneNode() {
         const [syntax, attr, ...cloned] = this.cloneChildNodes();
         return debug_1.Shadow.run(() => {

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

@@ -28,11 +28,11 @@ export declare class Layout extends Array<TableCoords[]> {
  * @classdesc `{childNodes: [SyntaxToken, AttributesToken, ?Token, ...TdToken, ...TrToken, ?SyntaxToken]}`
  */
 export declare abstract class TableToken extends TrBaseToken {
-    readonly type = "table";
     readonly childNodes: readonly [SyntaxToken, AttributesToken, ...(TdToken | TrToken)[], SyntaxToken] | readonly [SyntaxToken, AttributesToken, ...(TdToken | TrToken)[]];
     abstract get lastChild(): AttributesToken | TdToken | TrToken | SyntaxToken;
     abstract get children(): [SyntaxToken, AttributesToken, ...(TdToken | TrToken)[], SyntaxToken] | [SyntaxToken, AttributesToken, ...(TdToken | TrToken)[]];
     abstract get lastElementChild(): AttributesToken | TdToken | TrToken | SyntaxToken;
+    get type(): 'table';
     /** 表格是否闭合 */
     get closed(): boolean;
     set closed(closed: boolean);
@@ -86,7 +86,6 @@ export declare abstract class TableToken extends TrBaseToken {
      * @throws `SyntaxError` 表格的闭合部分非法
      */
     insertAt<T extends Token>(token: T, i?: number): T;
-    /** @override */
     getRowCount(): number;
     /** 获取下一行 */
     getNextRow(): TrToken | undefined;
@@ -141,14 +140,6 @@ export declare abstract class TableToken extends TrBaseToken {
      * @param attr 表格属性
      */
     fillTable(inner: string | Token, subtype?: TdSubtypes, attr?: TdAttrs): void;
-    /**
-     * @override
-     * @param inner 单元格内部wikitext
-     * @param coords 单元格坐标
-     * @param subtype 单元格类型
-     * @param attr 单元格属性
-     * @throws `RangeError` 指定的坐标不是单元格起始点
-     */
     insertTableCell(inner: string | Token, coords: TableCoords | TableRenderedCoords, subtype?: TdSubtypes, attr?: TdAttrs): TdToken;
     /**
      * 插入表格行

package/dist/src/table/index.js

@@ -47,8 +47,10 @@ exports.Layout = Layout;
  * @classdesc `{childNodes: [SyntaxToken, AttributesToken, ?Token, ...TdToken, ...TrToken, ?SyntaxToken]}`
  */
 class TableToken extends trBase_1.TrBaseToken {
-    type = 'table';
     /* NOT FOR BROWSER END */
+    get type() {
+        return 'table';
+    }
     /** 表格是否闭合 */
     get closed() {
         return this.lastChild.type === 'table-syntax';
@@ -256,7 +258,6 @@ class TableToken extends trBase_1.TrBaseToken {
         }
         return super.insertAt(token, i);
     }
-    /** @override */
     getRowCount() {
         return super.getRowCount() + this.childNodes.filter(child => child.type === 'tr' && child.getRowCount()).length;
     }
@@ -342,14 +343,6 @@ class TableToken extends trBase_1.TrBaseToken {
         require('../../addon/table');
         this.fillTable(inner, subtype, attr);
     }
-    /**
-     * @override
-     * @param inner 单元格内部wikitext
-     * @param coords 单元格坐标
-     * @param subtype 单元格类型
-     * @param attr 单元格属性
-     * @throws `RangeError` 指定的坐标不是单元格起始点
-     */
     insertTableCell(inner, coords, subtype, attr) {
         require('../../addon/table');
         return this.insertTableCell(inner, coords, subtype, attr);

package/dist/src/table/td.d.ts

@@ -17,7 +17,6 @@ export type TdAttrs = Record<string, string | true> & TdSpanAttrs;
  */
 export declare abstract class TdToken extends TableBaseToken {
     #private;
-    readonly type = "td";
     readonly childNodes: readonly [SyntaxToken, AttributesToken, Token];
     abstract get parentNode(): TrToken | TableToken | undefined;
     abstract get nextSibling(): this | TrToken | SyntaxToken | undefined;
@@ -25,6 +24,7 @@ export declare abstract class TdToken extends TableBaseToken {
     abstract get children(): [SyntaxToken, AttributesToken, Token];
     abstract get parentElement(): TrToken | TableToken | undefined;
     abstract get nextElementSibling(): this | TrToken | SyntaxToken | undefined;
+    get type(): 'td';
     /** rowspan */
     get rowspan(): number;
     /** colspan */
@@ -44,18 +44,12 @@ export declare abstract class TdToken extends TableBaseToken {
     constructor(syntax: string, inner?: string, config?: Parser.Config, accum?: Token[]);
     /** 是否位于行首 */
     isIndependent(): boolean;
-    /**
-     * @override
-     * @param key 属性键
-     */
     getAttr<T extends string>(key: T): TdAttrGetter<T>;
     /** @override */
     json(): AST;
-    /** @override */
     cloneNode(): this;
     /** 改为独占一行 */
     independence(): void;
-    /** @override */
     getAttrs(): TdAttrs;
     /**
      * @override

package/dist/src/table/td.js

@@ -64,10 +64,12 @@ let TdToken = (() => {
             if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
             __runInitializers(_classThis, _classExtraInitializers);
         }
-        type = 'td';
         #innerSyntax = '';
         #syntax;
         /* NOT FOR BROWSER END */
+        get type() {
+            return 'td';
+        }
         /** rowspan */
         get rowspan() {
             return this.getAttr('rowspan');
@@ -242,10 +244,6 @@ let TdToken = (() => {
         isIndependent() {
             return this.firstChild.text().startsWith('\n');
         }
-        /**
-         * @override
-         * @param key 属性键
-         */
         getAttr(key) {
             const value = super.getAttr(key);
             key = key.toLowerCase().trim();
@@ -263,7 +261,6 @@ let TdToken = (() => {
             return json;
         }
         /* NOT FOR BROWSER */
-        /** @override */
         cloneNode() {
             const token = super.cloneNode();
             token.setAttribute('innerSyntax', this.#innerSyntax);
@@ -300,7 +297,6 @@ let TdToken = (() => {
                 this.setSyntax(subtype, escape);
             }
         }
-        /** @override */
         getAttrs() {
             const attr = super.getAttrs();
             if ('rowspan' in attr) {

package/dist/src/table/tr.d.ts

@@ -7,7 +7,6 @@ import type { Token, TdToken, TableToken, SyntaxToken, AttributesToken } from '.
  */
 export declare abstract class TrToken extends TrBaseToken {
     #private;
-    readonly type = "tr";
     readonly childNodes: readonly [SyntaxToken, AttributesToken, ...TdToken[]];
     abstract get lastChild(): AttributesToken | TdToken;
     abstract get parentNode(): TableToken | undefined;
@@ -18,6 +17,7 @@ export declare abstract class TrToken extends TrBaseToken {
     abstract get parentElement(): TableToken | undefined;
     abstract get nextElementSibling(): this | SyntaxToken | undefined;
     abstract get previousElementSibling(): Token;
+    get type(): 'tr';
     /**
      * @param syntax 表格语法
      * @param attr 表格属性

package/dist/src/table/tr.js

@@ -9,8 +9,10 @@ const trBase_1 = require("./trBase");
  * @classdesc `{childNodes: [SyntaxToken, AttributesToken, ?Token, ...TdToken]}`
  */
 class TrToken extends trBase_1.TrBaseToken {
-    type = 'tr';
     /* NOT FOR BROWSER END */
+    get type() {
+        return 'tr';
+    }
     /**
      * @param syntax 表格语法
      * @param attr 表格属性

package/dist/src/table/trBase.d.ts

@@ -14,7 +14,7 @@ export interface TableCoords {
 /** 表格行或表格 */
 export declare abstract class TrBaseToken extends TableBaseToken {
     #private;
-    type: 'table' | 'tr';
+    abstract get type(): 'table' | 'tr';
     /** 获取行数 */
     getRowCount(): number;
     /**

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

@@ -11,13 +11,13 @@ export interface ExtToken extends AttributesParentBase {
  * @classdesc `{childNodes: [AttributesToken, Token]}`
  */
 export declare abstract class ExtToken extends TagPairToken {
-    readonly type = "ext";
     closed: true;
     readonly childNodes: readonly [AttributesToken, Token];
     abstract get firstChild(): AttributesToken;
     abstract get lastChild(): Token;
     abstract get children(): [AttributesToken, Token];
     abstract get firstElementChild(): AttributesToken;
+    get type(): 'ext';
     /**
      * @param name 标签名
      * @param attr 标签属性
@@ -25,6 +25,5 @@ export declare abstract class ExtToken extends TagPairToken {
      * @param closed 是否封闭
      */
     constructor(name: string, attr?: string, inner?: string, closed?: string, config?: Parser.Config, accum?: Token[]);
-    /** @override */
     cloneNode(): this;
 }

package/dist/src/tagPair/ext.js

@@ -74,8 +74,10 @@ let ExtToken = (() => {
             if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
             __runInitializers(_classThis, _classExtraInitializers);
         }
-        type = 'ext';
         /* NOT FOR BROWSER END */
+        get type() {
+            return 'ext';
+        }
         /**
          * @param name 标签名
          * @param attr 标签属性
@@ -164,11 +166,13 @@ let ExtToken = (() => {
                 default: {
                     const { NowikiToken } = require('../nowiki/index');
                     // @ts-expect-error abstract class
-                    innerToken = new NowikiToken(inner, newConfig);
+                    innerToken = new NowikiToken(inner, newConfig, accum);
                 }
             }
             innerToken.setAttribute('name', lcName);
-            innerToken.type = 'ext-inner';
+            if (innerToken.type === 'plain') {
+                innerToken.type = 'ext-inner';
+            }
             super(name, attrToken, innerToken, closed, config, accum);
             this.seal('closed', true);
         }
@@ -184,7 +188,6 @@ let ExtToken = (() => {
             return errors;
         }
         /* NOT FOR BROWSER */
-        /** @override */
         cloneNode() {
             const inner = this.lastChild.cloneNode(), tags = this.getAttribute('tags'), config = this.getAttribute('config'), attr = this.firstChild.toString();
             return debug_1.Shadow.run(() => {

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

@@ -6,14 +6,13 @@ import type { AstText, Token } from '../../internal';
  * @classdesc `{childNodes: [AstText, AstText]}`
  */
 export declare abstract class IncludeToken extends TagPairToken {
-    readonly type = "include";
     readonly childNodes: readonly [AstText, AstText];
     abstract get firstChild(): AstText;
     abstract get lastChild(): AstText;
     abstract get children(): [];
     abstract get firstElementChild(): undefined;
     abstract get lastElementChild(): undefined;
-    /** @override */
+    get type(): 'include';
     get innerText(): string | undefined;
     set innerText(text: string | undefined);
     /**
@@ -23,7 +22,6 @@ export declare abstract class IncludeToken extends TagPairToken {
      * @param closed 是否封闭
      */
     constructor(name: string, attr?: string, inner?: string, closed?: string, config?: Config, accum?: Token[]);
-    /** @override */
     cloneNode(): this;
     /**
      * @override

package/dist/src/tagPair/include.js

@@ -60,8 +60,11 @@ let IncludeToken = (() => {
             if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
             __runInitializers(_classThis, _classExtraInitializers);
         }
-        type = 'include';
-        /** @override */
+        /* NOT FOR BROWSER END */
+        get type() {
+            return 'include';
+        }
+        /* NOT FOR BROWSER */
         get innerText() {
             return this.selfClosing ? undefined : this.lastChild.data;
         }
@@ -100,7 +103,6 @@ let IncludeToken = (() => {
             return [e];
         }
         /* NOT FOR BROWSER */
-        /** @override */
         cloneNode() {
             const tags = this.getAttribute('tags'), config = this.getAttribute('config'), { innerText } = this, closing = this.selfClosing || !this.closed ? undefined : tags[1];
             // @ts-expect-error abstract class

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

@@ -4,10 +4,10 @@ import type { AstNodes } from '../../lib/node';
 /** 成对标签 */
 export declare abstract class TagPairToken extends Token {
     #private;
-    type: 'ext' | 'include';
     readonly name: string;
     closed: boolean;
     selfClosing: boolean;
+    abstract get type(): 'ext' | 'include';
     readonly childNodes: readonly [AstNodes, AstNodes];
     abstract get firstChild(): AstNodes;
     abstract get lastChild(): AstNodes;

package/dist/src/transclude.d.ts

@@ -10,7 +10,6 @@ import type { LintError } from '../base';
  */
 export declare abstract class TranscludeToken extends Token {
     #private;
-    type: 'template' | 'magic-word';
     readonly modifier: string;
     readonly name: string;
     readonly childNodes: readonly [AtomToken | SyntaxToken, ...ParameterToken[]] | readonly [SyntaxToken, AtomToken, AtomToken, ...ParameterToken[]];
@@ -19,6 +18,7 @@ export declare abstract class TranscludeToken extends Token {
     abstract get children(): [AtomToken | SyntaxToken, ...ParameterToken[]] | [SyntaxToken, AtomToken, AtomToken, ...ParameterToken[]];
     abstract get firstElementChild(): AtomToken | SyntaxToken;
     abstract get lastElementChild(): AtomToken | SyntaxToken | ParameterToken;
+    get type(): 'template' | 'magic-word';
     /** 是否存在重复参数 */
     get duplication(): boolean;
     set duplication(duplication: boolean);
@@ -62,7 +62,6 @@ export declare abstract class TranscludeToken extends Token {
      * @throws `Error` 不是可接受的魔术字
      */
     getPossibleValues(): Token[];
-    /** @override */
     cloneNode(): this;
     /** 替换引用 */
     subst(): void;

package/dist/src/transclude.js

@@ -24,12 +24,16 @@ const insensitiveVars = new Set([
  * @classdesc `{childNodes: [AtomToken|SyntaxToken, ...AtomToken, ...ParameterToken]}`
  */
 class TranscludeToken extends index_2.Token {
-    type = 'template';
     modifier = '';
-    #keys = new Set();
-    /* NOT FOR BROWSER END */
+    #type = 'template';
     #raw = false;
     #args = new Map();
+    #keys = new Set();
+    /* NOT FOR BROWSER END */
+    get type() {
+        return this.#type;
+    }
+    /* NOT FOR BROWSER */
     /** 是否存在重复参数 */
     get duplication() {
         return this.isTemplate() && Boolean(this.hasDuplicatedArgs());
@@ -65,7 +69,7 @@ class TranscludeToken extends index_2.Token {
             const [magicWord, ...arg] = title.split(':'), cleaned = (0, string_1.removeComment)(magicWord), name = cleaned[arg.length > 0 ? 'trimStart' : 'trim'](), lcName = name.toLowerCase(), canonicalName = insensitive[lcName], isSensitive = sensitive.includes(name), isVar = isSensitive || insensitiveVars.has(canonicalName);
             if (isVar || isFunction && canonicalName) {
                 this.setAttribute('name', canonicalName ?? lcName);
-                this.type = 'magic-word';
+                this.#type = 'magic-word';
                 // eslint-disable-next-line @typescript-eslint/no-unused-expressions
                 /^\s*uc\s*$/iu;
                 const pattern = new RegExp(String.raw `^\s*${name}\s*$`, isSensitive ? 'u' : 'iu'), token = new syntax_1.SyntaxToken(magicWord, pattern, 'magic-word-name', config, accum, {
@@ -394,7 +398,6 @@ class TranscludeToken extends index_2.Token {
             : (0, string_1.print)(childNodes, { sep: '|' })}}}</span>`;
     }
     /* NOT FOR BROWSER */
-    /** @override */
     cloneNode() {
         const [first, ...cloned] = this.cloneChildNodes(), config = this.getAttribute('config');
         return debug_1.Shadow.run(() => {

package/dist/util/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.aliases = exports.constants = exports.parsers = exports.mixins = exports.classes = exports.BuildMethod = exports.MAX_STAGE = void 0;
+exports.aliases = exports.parsers = exports.mixins = exports.classes = exports.BuildMethod = exports.MAX_STAGE = void 0;
 exports.MAX_STAGE = 11;
 var BuildMethod;
 (function (BuildMethod) {
@@ -8,7 +8,7 @@ var BuildMethod;
     BuildMethod[BuildMethod["Text"] = 1] = "Text";
 })(BuildMethod || (exports.BuildMethod = BuildMethod = {}));
 /* NOT FOR BROWSER */
-exports.classes = {}, exports.mixins = {}, exports.parsers = {}, exports.constants = {};
+exports.classes = {}, exports.mixins = {}, exports.parsers = {};
 exports.aliases = [
     ['AstText'],
     ['CommentToken', 'ExtToken', 'IncludeToken', 'NoincludeToken'],

package/dist/util/debug.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.undo = exports.mixin = exports.emptyArray = exports.setChildNodes = exports.isToken = exports.Shadow = void 0;
-const constants_1 = require("./constants");
 exports.Shadow = {
     running: false,
     /** @private */
@@ -94,4 +93,3 @@ const undo = (e, data) => {
     }
 };
 exports.undo = undo;
-constants_1.constants['Shadow'] = __filename;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wikiparser-node",
-	"version": "1.9.2",
+	"version": "1.9.3",
 	"description": "A Node.js parser for MediaWiki markup with AST",
 	"keywords": [
 		"mediawiki",