wikilint 2.9.1 → 2.9.2

package/dist/index.js

@@ -43,20 +43,19 @@ const Parser = {
             return new Title(title, defaultNs, config, decode, selfLink);
         }
         const { Token } = require('./src/index');
-        const token = debug_1.Shadow.run(() => {
+        return debug_1.Shadow.run(() => {
             const root = new Token(title, config);
             root.type = 'root';
-            return root.parseOnce(0, include).parseOnce();
-        }), titleObj = new Title(token.toString(), defaultNs, config, decode, selfLink);
-        debug_1.Shadow.run(() => {
+            root.parseOnce(0, include).parseOnce();
+            const titleObj = new Title(root.toString(), defaultNs, config, decode, selfLink);
             for (const key of ['main', 'fragment']) {
                 const str = titleObj[key];
                 if (str?.includes('\0')) {
-                    titleObj[key] = token.buildFromStr(str, constants_1.BuildMethod.Text);
+                    titleObj[key] = root.buildFromStr(str, constants_1.BuildMethod.Text);
                 }
             }
+            return titleObj;
         });
-        return titleObj;
     },
     /** @implements */
     parse(wikitext, include, maxStage = constants_1.MAX_STAGE, config = Parser.getConfig()) {

package/dist/lib/node.js

@@ -52,10 +52,7 @@ class AstNode {
     }
     /** @private */
     getAttribute(key) {
-        if (key === 'padding') {
-            return 0;
-        }
-        return this[key];
+        return (key === 'padding' ? 0 : this[key]);
     }
     /** @private */
     setAttribute(key, value) {

package/dist/parser/braces.js

@@ -19,14 +19,14 @@ const closes = {
  * @throws TranscludeToken.constructor()
  */
 const parseBraces = (wikitext, config, accum) => {
-    const source = String.raw `${config.excludes?.includes('heading') ? '' : String.raw `^(\0\d+c\x7F)*={1,6}|`}\[\[|\{{2,}|-\{(?!\{)`, { parserFunction: [, , , subst] } = config, stack = [];
+    const source = String.raw `${config.excludes?.includes('heading') ? '' : String.raw `^(\0\d+c\x7F)*={1,6}|`}\[\[|-\{(?!\{)`, openBraces = String.raw `|\{{2,}`, { parserFunction: [, , , subst] } = config, stack = [];
     wikitext = wikitext.replace(re, (m, p1) => {
         // @ts-expect-error abstract class
         new transclude_1.TranscludeToken(m.slice(2, -2), [], config, accum);
         return `\0${accum.length - 2}${marks.get(p1)}\x7F`;
     });
     const lastBraces = wikitext.lastIndexOf('}}') - wikitext.length;
-    let regex = new RegExp(source, 'gmu'), mt = regex.exec(wikitext), moreBraces = lastBraces + wikitext.length !== -1, lastIndex;
+    let moreBraces = lastBraces + wikitext.length !== -1, regex = new RegExp(source + (moreBraces ? openBraces : ''), 'gmu'), mt = regex.exec(wikitext), lastIndex;
     while (mt
         || lastIndex !== undefined && lastIndex <= wikitext.length && stack[stack.length - 1]?.[0]?.startsWith('=')) {
         if (mt?.[1]) {
@@ -125,13 +125,17 @@ const parseBraces = (wikitext, config, accum) => {
             }
             stack.push(...'0' in top ? [top] : [], mt);
         }
-        moreBraces &&= lastBraces + wikitext.length >= lastIndex;
         let curTop = stack[stack.length - 1];
-        if (!moreBraces && curTop?.[0]?.startsWith('{')) {
-            stack.pop();
-            curTop = stack[stack.length - 1];
+        if (moreBraces && lastBraces + wikitext.length < lastIndex) {
+            moreBraces = false;
+            while (curTop?.[0]?.startsWith('{')) {
+                stack.pop();
+                curTop = stack[stack.length - 1];
+            }
         }
-        regex = new RegExp(source + (curTop ? `|${closes[curTop[0][0]]}${curTop.findEqual ? '|=' : ''}` : ''), 'gmu');
+        regex = new RegExp(source
+            + (moreBraces ? openBraces : '')
+            + (curTop ? `|${closes[curTop[0][0]]}${curTop.findEqual ? '|=' : ''}` : ''), 'gmu');
         regex.lastIndex = lastIndex;
         mt = regex.exec(wikitext);
     }

package/dist/src/attribute.js

@@ -235,6 +235,7 @@ class AttributeToken extends index_2.Token {
             this.#tag = this.parentNode.name;
         }
         this.setAttribute('name', this.firstChild.text().trim().toLowerCase());
+        super.afterBuild();
     }
     /** @private */
     toString() {

package/dist/src/attributes.js

@@ -64,10 +64,11 @@ class AttributesToken extends index_2.Token {
     }
     /** @private */
     afterBuild() {
-        if (this.type === 'table-attrs') {
-            const { parentNode } = this;
-            this.setAttribute('name', parentNode?.type === 'td' && parentNode.subtype === 'caption' ? 'caption' : parentNode?.type);
+        const { parentNode } = this;
+        if (parentNode?.type === 'td' && parentNode.subtype === 'caption') {
+            this.setAttribute('name', 'caption');
         }
+        super.afterBuild();
     }
     /**
      * 所有指定属性名的AttributeToken

package/dist/src/converterFlags.js

@@ -22,6 +22,7 @@ class ConverterFlagsToken extends index_2.Token {
     /** @private */
     afterBuild() {
         this.#flags = this.childNodes.map(child => child.text().trim());
+        super.afterBuild();
     }
     /** @private */
     toString() {

package/dist/src/imageParameter.js

@@ -81,6 +81,7 @@ class ImageParameterToken extends index_2.Token {
         if (this.parentNode?.type === 'gallery-image' && !exports.galleryParams.has(this.name)) {
             this.setAttribute('name', 'invalid');
         }
+        super.afterBuild();
     }
     /** @private */
     toString() {

package/dist/src/index.js

@@ -43,6 +43,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Token = void 0;
 const string_1 = require("../util/string");
 const constants_1 = require("../util/constants");
+const debug_1 = require("../util/debug");
 const lint_1 = require("../util/lint");
 const index_1 = require("../index");
 const element_1 = require("../lib/element");
@@ -147,8 +148,8 @@ class Token extends element_1.AstElement {
         }
         return nodes;
     }
-    /** 将占位符替换为子Token */
-    #build() {
+    /** @private */
+    build() {
         this.#stage = constants_1.MAX_STAGE;
         const { length, firstChild } = this, str = String(firstChild);
         if (length === 1 && firstChild.type === 'text' && str.includes('\0')) {
@@ -156,7 +157,7 @@ class Token extends element_1.AstElement {
             this.normalize();
             if (this.type === 'root') {
                 for (const token of this.#accum) {
-                    token.#build();
+                    token.build();
                 }
             }
         }
@@ -177,7 +178,7 @@ class Token extends element_1.AstElement {
             this.parseOnce(this.#stage, include);
         }
         if (n) {
-            this.#build();
+            this.build();
             this.afterBuild();
         }
         return this;
@@ -293,6 +294,8 @@ class Token extends element_1.AstElement {
                 return (this.#include ?? Boolean(this.getRootNode().#include));
             case 'accum':
                 return this.#accum;
+            case 'built':
+                return this.#built;
             default:
                 return super.getAttribute(key);
         }
@@ -393,11 +396,11 @@ class Token extends element_1.AstElement {
     }
     /** @private */
     toString(separator) {
-        const root = this.getRootNode();
+        const { rev } = debug_1.Shadow, root = this.getRootNode();
         if (root.type === 'root'
             && root.#built) {
-            this.#string ??= super.toString(separator);
-            return this.#string;
+            this.#string ??= [rev, super.toString(separator)];
+            return this.#string[1];
         }
         return super.toString(separator);
     }

package/dist/src/link/base.js

@@ -38,6 +38,7 @@ class LinkBaseToken extends index_2.Token {
             this.#delimiter = this.buildFromStr(this.#delimiter, constants_1.BuildMethod.String);
         }
         this.setAttribute('name', this.#title.title);
+        super.afterBuild();
     }
     /** @private */
     setAttribute(key, value) {

package/dist/src/link/galleryImage.js

@@ -54,6 +54,7 @@ class GalleryImageToken extends file_1.FileToken {
     /** @private */
     afterBuild() {
         this.#setName(this.getTitle());
+        super.afterBuild();
     }
 }
 exports.GalleryImageToken = GalleryImageToken;

package/dist/src/parameter.js

@@ -42,6 +42,7 @@ class ParameterToken extends index_2.Token {
                 parentNode.getArgs(name, false, false).add(this);
             }
         }
+        super.afterBuild();
     }
     /** @private */
     toString() {

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';
+    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.js

@@ -33,7 +33,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 +73,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.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");
@@ -37,7 +38,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 +49,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 +77,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() {

package/dist/src/table/tr.js

@@ -13,7 +13,7 @@ class TrToken extends trBase_1.TrBaseToken {
      * @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/transclude.js

@@ -128,6 +128,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.2",
 	"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",