wikilint 2.9.1 → 2.9.3

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

@@ -8,7 +8,6 @@ import type { AttributesToken, ExtToken } from '../../internal';
  * @classdesc `{childNodes: ...AtomToken}`
  */
 export declare abstract class ParamTagToken extends Token {
-    readonly type = "ext-inner";
     readonly name: string;
     readonly childNodes: readonly AtomToken[];
     abstract get firstChild(): AtomToken | undefined;
@@ -16,6 +15,7 @@ export declare abstract class ParamTagToken extends Token {
     abstract get nextSibling(): undefined;
     abstract get previousSibling(): AttributesToken;
     abstract get parentNode(): ExtToken | undefined;
+    get type(): 'ext-inner';
     /** @class */
     constructor(wikitext?: string, config?: Parser.Config, accum?: Token[], acceptable?: Acceptable);
 }

package/dist/src/paramTag/index.js

@@ -11,7 +11,9 @@ const atom_1 = require("../atom");
  * @classdesc `{childNodes: ...AtomToken}`
  */
 class ParamTagToken extends index_2.Token {
-    type = 'ext-inner';
+    get type() {
+        return 'ext-inner';
+    }
     /** @class */
     constructor(wikitext, config = index_1.default.getConfig(), accum = [], acceptable = {}) {
         super(undefined, config, accum, {});

package/dist/src/parameter.d.ts

@@ -7,7 +7,6 @@ import type { AtomToken, SyntaxToken, TranscludeToken } from '../internal';
  * @classdesc `{childNodes: [Token, Token]}`
  */
 export declare abstract class ParameterToken extends Token {
-    readonly type = "parameter";
     readonly name: string;
     readonly childNodes: readonly [Token, Token];
     abstract get firstChild(): Token;
@@ -15,6 +14,7 @@ export declare abstract class ParameterToken extends Token {
     abstract get parentNode(): TranscludeToken | undefined;
     abstract get nextSibling(): this | undefined;
     abstract get previousSibling(): AtomToken | SyntaxToken | this;
+    get type(): 'parameter';
     /** 是否是匿名参数 */
     get anon(): boolean;
     /**
@@ -22,6 +22,5 @@ export declare abstract class ParameterToken extends Token {
      * @param value 参数值
      */
     constructor(key?: string | number, value?: string, config?: Parser.Config, accum?: Token[]);
-    /** @override */
     text(): string;
 }

package/dist/src/parameter.js

@@ -16,7 +16,9 @@ const linkRegex = new RegExp(`https?://${string_1.extUrlCharFirst}${string_1.ext
  * @classdesc `{childNodes: [Token, Token]}`
  */
 class ParameterToken extends index_2.Token {
-    type = 'parameter';
+    get type() {
+        return 'parameter';
+    }
     /** 是否是匿名参数 */
     get anon() {
         return this.firstChild.length === 0;
@@ -42,12 +44,12 @@ class ParameterToken extends index_2.Token {
                 parentNode.getArgs(name, false, false).add(this);
             }
         }
+        super.afterBuild();
     }
     /** @private */
     toString() {
         return this.anon ? this.lastChild.toString() : super.toString('=');
     }
-    /** @override */
     text() {
         return this.anon ? this.lastChild.text() : super.text('=');
     }

package/dist/src/pre.d.ts

@@ -8,7 +8,6 @@ import type { AstText, AttributesToken, ExtToken, ConverterToken } from '../inte
  * @classdesc `{childNodes: [...AstText|NoincludeToken|ConverterToken]}`
  */
 export declare abstract class PreToken extends Token {
-    readonly type = "ext-inner";
     readonly name: 'pre';
     readonly childNodes: readonly (AstText | NoincludeToken | ConverterToken)[];
     abstract get firstChild(): AstText | NoincludeToken | ConverterToken | undefined;
@@ -16,6 +15,7 @@ export declare abstract class PreToken extends Token {
     abstract get nextSibling(): undefined;
     abstract get previousSibling(): AttributesToken;
     abstract get parentNode(): ExtToken | undefined;
+    get type(): 'ext-inner';
     /** @class */
     constructor(wikitext?: string, config?: Parser.Config, accum?: Token[]);
 }

package/dist/src/pre.js

@@ -10,7 +10,9 @@ const noinclude_1 = require("./nowiki/noinclude");
  * @classdesc `{childNodes: [...AstText|NoincludeToken|ConverterToken]}`
  */
 class PreToken extends index_2.Token {
-    type = 'ext-inner';
+    get type() {
+        return 'ext-inner';
+    }
     /** @class */
     constructor(wikitext, config = index_1.default.getConfig(), accum = []) {
         if (wikitext) {

package/dist/src/redirect.d.ts

@@ -9,11 +9,11 @@ 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;
     abstract get previousSibling(): undefined;
+    get type(): 'redirect';
     /**
      * @param pre leading whitespace
      * @param syntax 重定向魔术字

package/dist/src/redirect.js

@@ -59,9 +59,11 @@ let RedirectToken = (() => {
             if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
             __runInitializers(_classThis, _classExtraInitializers);
         }
-        type = 'redirect';
         #pre;
         #post;
+        get type() {
+            return 'redirect';
+        }
         /**
          * @param pre leading whitespace
          * @param syntax 重定向魔术字

package/dist/src/syntax.d.ts

@@ -1,10 +1,11 @@
 import { Token } from './index';
 import type { Config } from '../base';
-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';
 /** 满足特定语法格式的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);
+    constructor(wikitext: string | undefined, pattern: RegExp, type: SyntaxTypes, config?: Config, accum?: Token[], acceptable?: Acceptable);
 }
 export {};

package/dist/src/syntax.js

@@ -4,10 +4,14 @@ exports.SyntaxToken = void 0;
 const index_1 = require("./index");
 /** 满足特定语法格式的plain Token */
 class SyntaxToken extends index_1.Token {
+    #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;
     }
     /** @private */
     lint() {

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

@@ -3,18 +3,20 @@ import { Token } from '../index';
 import { SyntaxToken } from '../syntax';
 import { AttributesToken } from '../attributes';
 import type { AttributesParentBase } from '../../mixin/attributesParent';
+declare type TableTypes = 'table' | 'tr' | 'td';
 export interface TableBaseToken extends AttributesParentBase {
 }
 export declare abstract class TableBaseToken extends Token {
-    type: 'table' | 'tr' | 'td';
+    abstract get type(): TableTypes;
     readonly childNodes: readonly [SyntaxToken, AttributesToken, ...Token[]];
     abstract get firstChild(): SyntaxToken;
     abstract get lastChild(): Token;
     /**
      * @param pattern 表格语法正则
      * @param syntax 表格语法
+     * @param type 节点类型
      * @param attr 表格属性
      */
-    constructor(pattern: RegExp, syntax?: string, attr?: string, config?: Parser.Config, accum?: Token[], acceptable?: Acceptable);
+    constructor(pattern: RegExp, syntax: string, type: TableTypes, attr?: string, config?: Parser.Config, accum?: Token[], acceptable?: Acceptable);
 }
 export {};

package/dist/src/table/base.js

@@ -14,13 +14,14 @@ class TableBaseToken extends (0, attributesParent_1.attributesParent)(1)(index_2
     /**
      * @param pattern 表格语法正则
      * @param syntax 表格语法
+     * @param type 节点类型
      * @param attr 表格属性
      */
-    constructor(pattern, syntax, attr, config = index_1.default.getConfig(), accum = [], acceptable = {}) {
+    constructor(pattern, syntax, type, attr, config = index_1.default.getConfig(), accum = [], acceptable = {}) {
         super(undefined, config, accum, acceptable);
         this.append(new syntax_1.SyntaxToken(syntax, pattern, 'table-syntax', config, accum, {}), 
         // @ts-expect-error abstract class
-        new attributes_1.AttributesToken(attr, 'table-attrs', this.type, config, accum));
+        new attributes_1.AttributesToken(attr, 'table-attrs', type, config, accum));
     }
 }
 exports.TableBaseToken = TableBaseToken;

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

@@ -16,9 +16,9 @@ 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;
+    get type(): 'table';
     /** 表格是否闭合 */
     get closed(): boolean;
     /**

package/dist/src/table/index.js

@@ -23,7 +23,9 @@ exports.Layout = Layout;
  * @classdesc `{childNodes: [SyntaxToken, AttributesToken, ?Token, ...TdToken, ...TrToken, ?SyntaxToken]}`
  */
 class TableToken extends trBase_1.TrBaseToken {
-    type = 'table';
+    get type() {
+        return 'table';
+    }
     /** 表格是否闭合 */
     get closed() {
         return this.lastChild.type === 'table-syntax';
@@ -33,7 +35,7 @@ class TableToken extends trBase_1.TrBaseToken {
      * @param attr 表格属性
      */
     constructor(syntax, attr, config, accum) {
-        super(/^(?:\{\||\{\{\{\s*!\s*\}\}|\{\{\s*\(!\s*\}\})$/u, syntax, attr, config, accum, {});
+        super(/^(?:\{\||\{\{\{\s*!\s*\}\}|\{\{\s*\(!\s*\}\})$/u, syntax, 'table', attr, config, accum, {});
     }
     /** @private */
     lint(start = this.getAbsoluteIndex(), re) {
@@ -73,10 +75,10 @@ class TableToken extends trBase_1.TrBaseToken {
     /** @private */
     close(syntax = '\n|}', halfParsed) {
         const config = this.getAttribute('config'), accum = this.getAttribute('accum'), inner = halfParsed ? [syntax] : index_1.default.parse(syntax, this.getAttribute('include'), 2, config).childNodes;
-        const token = debug_1.Shadow.run(() => super.insertAt(new syntax_1.SyntaxToken(undefined, closingPattern, 'table-syntax', config, accum, {})));
-        if (!halfParsed) {
-            token.afterBuild();
-        }
+        debug_1.Shadow.run(() => {
+            const token = new syntax_1.SyntaxToken(undefined, closingPattern, 'table-syntax', config, accum, {});
+            super.insertAt(token);
+        });
         this.lastChild.replaceChildren(...inner);
     }
     /**

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

@@ -15,11 +15,11 @@ declare type TdAttrGetter<T extends string> = T extends keyof TdSpanAttrs ? numb
  */
 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;
     abstract get previousSibling(): Token | undefined;
+    get type(): 'td';
     /** rowspan */
     get rowspan(): number;
     /** colspan */
@@ -33,10 +33,6 @@ 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>;
 }
 export {};

package/dist/src/table/td.js

@@ -4,6 +4,7 @@ exports.TdToken = void 0;
 const lint_1 = require("../../util/lint");
 const rect_1 = require("../../lib/rect");
 const constants_1 = require("../../util/constants");
+const debug_1 = require("../../util/debug");
 const index_1 = require("../../index");
 const index_2 = require("../index");
 const base_1 = require("./base");
@@ -12,9 +13,11 @@ const base_1 = require("./base");
  * @classdesc `{childNodes: [SyntaxToken, AttributesToken, Token]}`
  */
 class TdToken extends base_1.TableBaseToken {
-    type = 'td';
     #innerSyntax = '';
     #syntax;
+    get type() {
+        return 'td';
+    }
     /** rowspan */
     get rowspan() {
         return this.getAttr('rowspan');
@@ -37,7 +40,7 @@ class TdToken extends base_1.TableBaseToken {
             innerSyntax = null;
             attr = '';
         }
-        super(/^(?:\n[^\S\n]*(?:[|!]|\|\+|\{\{\s*!\s*\}\}\+?)|(?:\||\{\{\s*!\s*\}\}){2}|!!|\{\{\s*!!\s*\}\})$/u, syntax, attr, config, accum);
+        super(/^(?:\n[^\S\n]*(?:[|!]|\|\+|\{\{\s*!\s*\}\}\+?)|(?:\||\{\{\s*!\s*\}\}){2}|!!|\{\{\s*!!\s*\}\})$/u, syntax, 'td', attr, config, accum);
         if (innerSyntax) {
             [this.#innerSyntax] = innerSyntax;
         }
@@ -48,8 +51,9 @@ class TdToken extends base_1.TableBaseToken {
     }
     /** 表格语法信息 */
     #getSyntax() {
-        this.#syntax ??= this.#computeSyntax();
-        return this.#syntax;
+        const { rev } = debug_1.Shadow;
+        this.#syntax ??= [rev, this.#computeSyntax()];
+        return this.#syntax[1];
     }
     /** 表格语法信息 */
     #computeSyntax() {
@@ -75,6 +79,7 @@ class TdToken extends base_1.TableBaseToken {
         if (this.#innerSyntax.includes('\0')) {
             this.#innerSyntax = this.buildFromStr(this.#innerSyntax, constants_1.BuildMethod.String);
         }
+        super.afterBuild();
     }
     /** @private */
     toString() {
@@ -127,10 +132,6 @@ class TdToken extends base_1.TableBaseToken {
     isIndependent() {
         return this.firstChild.text().startsWith('\n');
     }
-    /**
-     * @override
-     * @param key 属性键
-     */
     getAttr(key) {
         const value = super.getAttr(key);
         return (key === 'rowspan' || key === 'colspan' ? parseInt(value) || 1 : value);

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

@@ -6,12 +6,12 @@ import type { Token, TdToken, TableToken, SyntaxToken, AttributesToken } from '.
  * @classdesc `{childNodes: [SyntaxToken, AttributesToken, ?Token, ...TdToken]}`
  */
 export declare abstract class TrToken extends TrBaseToken {
-    readonly type = "tr";
     readonly childNodes: readonly [SyntaxToken, AttributesToken, ...TdToken[]];
     abstract get lastChild(): AttributesToken | TdToken;
     abstract get parentNode(): TableToken | undefined;
     abstract get nextSibling(): this | SyntaxToken | undefined;
     abstract get previousSibling(): Token;
+    get type(): 'tr';
     /**
      * @param syntax 表格语法
      * @param attr 表格属性

package/dist/src/table/tr.js

@@ -7,13 +7,15 @@ const trBase_1 = require("./trBase");
  * @classdesc `{childNodes: [SyntaxToken, AttributesToken, ?Token, ...TdToken]}`
  */
 class TrToken extends trBase_1.TrBaseToken {
-    type = 'tr';
+    get type() {
+        return 'tr';
+    }
     /**
      * @param syntax 表格语法
      * @param attr 表格属性
      */
     constructor(syntax, attr, config, accum) {
-        super(/^\n[^\S\n]*(?:\|-+|\{\{\s*!\s*\}\}-+|\{\{\s*!-\s*\}\}-*)$/u, syntax, attr, config, accum, {});
+        super(/^\n[^\S\n]*(?:\|-+|\{\{\s*!\s*\}\}-+|\{\{\s*!-\s*\}\}-*)$/u, syntax, 'tr', attr, config, accum, {});
     }
 }
 exports.TrToken = TrToken;

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

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

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

@@ -8,11 +8,11 @@ import type { LintError } from '../../base';
  * @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;
+    get type(): 'ext';
     /**
      * @param name 标签名
      * @param attr 标签属性

package/dist/src/tagPair/ext.js

@@ -22,7 +22,9 @@ const del = (arr, ele) => {
  * @classdesc `{childNodes: [AttributesToken, Token]}`
  */
 class ExtToken extends index_3.TagPairToken {
-    type = 'ext';
+    get type() {
+        return 'ext';
+    }
     /**
      * @param name 标签名
      * @param attr 标签属性
@@ -111,11 +113,13 @@ class ExtToken extends index_3.TagPairToken {
             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);
     }

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

@@ -6,10 +6,10 @@ 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;
+    get type(): 'include';
     /**
      * @param name 标签名
      * @param attr 标签属性

package/dist/src/tagPair/include.js

@@ -58,7 +58,9 @@ let IncludeToken = (() => {
             if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
             __runInitializers(_classThis, _classExtraInitializers);
         }
-        type = 'include';
+        get type() {
+            return 'include';
+        }
         /**
          * @param name 标签名
          * @param attr 标签属性

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,11 +10,11 @@ import type { LintError } from '../base';
  */
 export declare abstract class TranscludeToken extends Token {
     #private;
-    type: 'template' | 'magic-word';
     readonly modifier: string;
     readonly childNodes: readonly [AtomToken | SyntaxToken, ...ParameterToken[]] | readonly [SyntaxToken, AtomToken, AtomToken, ...ParameterToken[]];
     abstract get firstChild(): AtomToken | SyntaxToken;
     abstract get lastChild(): AtomToken | SyntaxToken | ParameterToken;
+    get type(): 'template' | 'magic-word';
     /**
      * @param title 模板标题或魔术字
      * @param parts 参数各部分

package/dist/src/transclude.js

@@ -24,10 +24,13 @@ const insensitiveVars = new Set([
  * @classdesc `{childNodes: [AtomToken|SyntaxToken, ...AtomToken, ...ParameterToken]}`
  */
 class TranscludeToken extends index_2.Token {
-    type = 'template';
     modifier = '';
+    #type = 'template';
     #raw = false;
     #args = new Map();
+    get type() {
+        return this.#type;
+    }
     /**
      * @param title 模板标题或魔术字
      * @param parts 参数各部分
@@ -51,7 +54,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';
                 const pattern = new RegExp(String.raw `^\s*${name}\s*$`, isSensitive ? 'u' : 'iu'), token = new syntax_1.SyntaxToken(magicWord, pattern, 'magic-word-name', config, accum, {});
                 super.insertAt(token);
                 if (arg.length > 0) {
@@ -128,6 +131,7 @@ class TranscludeToken extends index_2.Token {
         if (this.modifier.includes('\0')) {
             this.setAttribute('modifier', this.buildFromStr(this.modifier, constants_1.BuildMethod.String));
         }
+        super.afterBuild();
     }
     /** @private */
     toString() {

package/dist/util/debug.js

@@ -8,7 +8,11 @@ exports.Shadow = {
         const { running } = this;
         this.running = true;
         try {
+            const { Token: AnyToken } = require('../src/index');
             const result = callback();
+            if (result instanceof AnyToken && !result.getAttribute('built')) {
+                result.afterBuild();
+            }
             this.running = running;
             return result;
         }
@@ -17,6 +21,7 @@ exports.Shadow = {
             throw e;
         }
     },
+    rev: 0,
 };
 /**
  * 是否是某一特定类型的节点

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wikilint",
-	"version": "2.9.1",
+	"version": "2.9.3",
 	"description": "A Node.js linter for MediaWiki markup",
 	"keywords": [
 		"mediawiki",
@@ -24,7 +24,7 @@
 		"!/dist/bin/declaration.js"
 	],
 	"bin": {
-		"wikilint": "./bin/cli.js"
+		"wikilint": "bin/cli.js"
 	},
 	"main": "./dist/index.js",
 	"types": "./dist/index.d.ts",