wikilint 2.6.0 → 2.6.2

package/dist/base.d.ts

@@ -47,9 +47,6 @@ interface AstElement extends AstNode {
 export interface Parser {
     config: string | Config;
     i18n: string | Record<string, string> | undefined;
-    rules: readonly LintError.Rule[];
-    /** 获取解析设置 */
-    getConfig(): Config;
     /**
      * 解析wikitext
      * @param include 是否嵌入

package/dist/index.d.ts

@@ -2,6 +2,7 @@ import type { Config, LintError, Parser as ParserBase } from './base';
 import type { Title } from './lib/title';
 import type { Token } from './internal';
 declare interface Parser extends ParserBase {
+    rules: readonly LintError.Rule[];
     /**
      * 规范化页面标题
      * @param title 标题（含或不含命名空间前缀）

package/dist/index.js

@@ -37,13 +37,21 @@ const Parser = {
         return msg && (this.i18n?.[msg] ?? msg).replace('$1', this.msg(arg));
     },
     /** @implements */
-    normalizeTitle(title, defaultNs = 0, include = false, config = Parser.getConfig(), halfParsed = false, decode = false, selfLink = false) {
+    normalizeTitle(title, defaultNs = 0, include, config = Parser.getConfig(), halfParsed, decode = false, selfLink = false) {
         const { Title } = require('./lib/title');
         if (halfParsed) {
             return new Title(title, defaultNs, config, decode, selfLink);
         }
         const { Token } = require('./src/index');
         const token = debug_1.Shadow.run(() => new Token(title, config).parseOnce(0, include).parseOnce()), titleObj = new Title(String(token), defaultNs, config, decode, selfLink);
+        debug_1.Shadow.run(() => {
+            for (const key of ['main', 'fragment']) {
+                const str = titleObj[key];
+                if (str?.includes('\0')) {
+                    titleObj[key] = token.buildFromStr(str, constants_1.BuildMethod.Text);
+                }
+            }
+        });
         return titleObj;
     },
     /** @implements */
@@ -60,9 +68,7 @@ const Parser = {
                     const file = path.join(__dirname, '..', 'errors', new Date().toISOString()), stage = token.getAttribute('stage');
                     fs.writeFileSync(file, stage === constants_1.MAX_STAGE ? wikitext : String(token));
                     fs.writeFileSync(`${file}.err`, e.stack);
-                    fs.writeFileSync(`${file}.json`, JSON.stringify({
-                        stage, include: token.getAttribute('include'), config: this.config,
-                    }, null, '\t'));
+                    fs.writeFileSync(`${file}.json`, JSON.stringify({ stage, include, config }, null, '\t'));
                 }
                 throw e;
             }

package/dist/lib/element.d.ts

@@ -31,6 +31,11 @@ export declare abstract class AstElement extends AstNode {
      * @param selector 选择器
      */
     closest<T = Token>(selector: string): T | undefined;
+    /**
+     * 符合选择器的所有后代节点
+     * @param selector 选择器
+     */
+    querySelectorAll<T = Token>(selector: string): T[];
     /**
      * 在末尾批量插入子节点
      * @param elements 插入节点

package/dist/lib/element.js

@@ -70,6 +70,31 @@ class AstElement extends node_1.AstNode {
         }
         return undefined;
     }
+    /**
+     * 符合条件的所有后代节点
+     * @param condition 条件
+     */
+    #getElementsBy(condition) {
+        const descendants = [];
+        for (const child of this.childNodes) {
+            if (child.type === 'text') {
+                continue;
+            }
+            else if (condition(child)) {
+                descendants.push(child);
+            }
+            descendants.push(...child.#getElementsBy(condition));
+        }
+        return descendants;
+    }
+    /**
+     * 符合选择器的所有后代节点
+     * @param selector 选择器
+     */
+    querySelectorAll(selector) {
+        const condition = this.#getCondition(selector);
+        return this.#getElementsBy(condition);
+    }
     /**
      * 在末尾批量插入子节点
      * @param elements 插入节点

package/dist/lib/title.d.ts

@@ -1,20 +1,27 @@
-import Parser from '../index';
+import type { Config } from '../base';
 /** MediaWiki页面标题对象 */
 export declare class Title {
     #private;
-    readonly valid: boolean;
     ns: number;
     fragment: string | undefined;
+    interwiki: string;
+    readonly valid: boolean;
     /** 不含命名空间的标题主体部分 */
     get main(): string;
     set main(title: string);
+    /** 命名空间前缀 */
+    get prefix(): string;
+    /** 完整标题 */
+    get title(): string;
     /** 扩展名 */
     get extension(): string | undefined;
     /**
+     * @see MediaWikiTitleCodec::splitTitleString
+     *
      * @param title 标题（含或不含命名空间前缀）
      * @param defaultNs 命名空间
      * @param decode 是否需要解码
      * @param selfLink 是否允许selfLink
      */
-    constructor(title: string, defaultNs?: number, config?: Parser.Config, decode?: boolean, selfLink?: boolean);
+    constructor(title: string, defaultNs: number, config: Config, decode: boolean, selfLink: boolean);
 }

package/dist/lib/title.js

@@ -2,15 +2,21 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Title = void 0;
 const string_1 = require("../util/string");
-const index_1 = require("../index");
+/**
+ * PHP的`rawurldecode`函数的JavaScript实现
+ * @param str 要解码的字符串
+ */
+const rawurldecode = (str) => decodeURIComponent(str.replace(/%(?![\da-f]{2})/giu, '%25'));
 /** MediaWiki页面标题对象 */
 class Title {
-    valid;
+    #main;
+    #namespaces;
     ns;
     fragment;
+    interwiki = '';
+    valid;
     /** @private */
     encoded = false;
-    #main;
     /** 不含命名空间的标题主体部分 */
     get main() {
         return this.#main;
@@ -19,57 +25,85 @@ class Title {
         title = title.replace(/_/gu, ' ').trim();
         this.#main = title && `${title[0].toUpperCase()}${title.slice(1)}`;
     }
+    /** 命名空间前缀 */
+    get prefix() {
+        const namespace = this.#namespaces[this.ns];
+        return `${namespace}${namespace && ':'}`;
+    }
+    /** 完整标题 */
+    get title() {
+        const prefix = `${this.interwiki}${this.interwiki && ':'}${this.prefix}`;
+        // eslint-disable-next-line prefer-const
+        let title = `${prefix}${this.main}`.replace(/ /gu, '_');
+        return title;
+    }
     /** 扩展名 */
     get extension() {
         const { main } = this, i = main.lastIndexOf('.');
         return i === -1 ? undefined : main.slice(i + 1).toLowerCase();
     }
     /**
+     * @see MediaWikiTitleCodec::splitTitleString
+     *
      * @param title 标题（含或不含命名空间前缀）
      * @param defaultNs 命名空间
      * @param decode 是否需要解码
      * @param selfLink 是否允许selfLink
      */
-    constructor(title, defaultNs = 0, config = index_1.default.getConfig(), decode = false, selfLink = false) {
+    constructor(title, defaultNs, config, decode, selfLink) {
+        const subpage = title.trim().startsWith('../');
         title = (0, string_1.decodeHtml)(title);
         if (decode && title.includes('%')) {
             try {
                 const encoded = /%(?!21|3[ce]|5[bd]|7[b-d])[\da-f]{2}/iu.test(title);
-                title = decodeURIComponent(title);
+                title = rawurldecode(title);
                 this.encoded = encoded;
             }
             catch { }
         }
         title = title.replace(/_/gu, ' ').trim();
-        let ns = defaultNs;
-        if (title.startsWith(':')) {
-            ns = 0;
-            title = title.slice(1).trim();
+        if (subpage) {
+            this.ns = 0;
         }
-        const m = title.split(':');
-        if (m.length > 1) {
-            const id = config.nsid[m[0].trim().toLowerCase()];
-            if (id) {
-                ns = id;
-                title = m.slice(1).join(':').trim();
+        else {
+            let ns = defaultNs;
+            if (title.startsWith(':')) {
+                ns = 0;
+                title = title.slice(1).trim();
+            }
+            const m = title.split(':');
+            if (m.length > 1) {
+                const id = config.nsid[m[0].trim().toLowerCase()];
+                if (id) {
+                    ns = id;
+                    title = m.slice(1).join(':').trim();
+                }
             }
+            this.ns = ns;
         }
-        this.ns = ns;
         const i = title.indexOf('#');
         if (i !== -1) {
             let fragment = title.slice(i + 1).trimEnd();
             if (fragment.includes('%')) {
                 try {
-                    fragment = decodeURIComponent(fragment);
+                    fragment = rawurldecode(fragment);
                 }
                 catch { }
             }
             this.fragment = fragment;
             title = title.slice(0, i).trim();
         }
-        this.valid = Boolean(title || this.interwiki || selfLink && this.fragment !== undefined)
-            && !/^:|\0\d+[eh!+-]\x7F|[<>[\]{}|]|%[\da-f]{2}/iu.test(title);
+        this.valid = Boolean(title || this.interwiki || selfLink && this.ns === 0 && this.fragment !== undefined)
+            && !/^:|\0\d+[eh!+-]\x7F|[<>[\]{}|\n]|%[\da-f]{2}|(?:^|\/)\.{1,2}(?:$|\/)/iu.test(subpage ? /^(?:\.\.\/)+(.*)/u.exec(title)[1] : title);
         this.main = title;
+        Object.defineProperties(this, {
+            encoded: { enumerable: false, writable: false },
+        });
+        this.#namespaces = config.namespaces;
+    }
+    /** @private */
+    toString() {
+        return `${this.title}${this.fragment === undefined ? '' : `#${this.fragment}`}`;
     }
 }
 exports.Title = Title;

package/dist/parser/braces.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseBraces = void 0;
 const string_1 = require("../util/string");
-const index_1 = require("../index");
 const heading_1 = require("../src/heading");
 const transclude_1 = require("../src/transclude");
 const arg_1 = require("../src/arg");
@@ -13,7 +12,7 @@ const arg_1 = require("../src/arg");
  * @param accum
  * @throws TranscludeToken.constructor()
  */
-const parseBraces = (wikitext, config = index_1.default.getConfig(), accum = []) => {
+const parseBraces = (wikitext, config, accum) => {
     const source = `${config.excludes?.includes('heading') ? '' : '^(\0\\d+c\x7F)*={1,6}|'}\\[\\[|\\{{2,}|-\\{(?!\\{)`, { parserFunction: [, , , subst] } = config, stack = [], closes = { '=': '\n', '{': '\\}{2,}|\\|', '-': '\\}-', '[': '\\]\\]' }, marks = new Map([['!', '!'], ['!!', '+'], ['(!', '{'], ['!)', '}'], ['!-', '-'], ['=', '~']]);
     let regex = new RegExp(source, 'gmu'), mt = regex.exec(wikitext), moreBraces = wikitext.includes('}}'), lastIndex;
     while (mt

package/dist/parser/commentAndExt.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseCommentAndExt = void 0;
-const index_1 = require("../index");
 const onlyinclude_1 = require("../src/onlyinclude");
 const noinclude_1 = require("../src/nowiki/noinclude");
 const include_1 = require("../src/tagPair/include");
@@ -14,7 +13,7 @@ const comment_1 = require("../src/nowiki/comment");
  * @param accum
  * @param includeOnly 是否嵌入
  */
-const parseCommentAndExt = (wikitext, config = index_1.default.getConfig(), accum = [], includeOnly = false) => {
+const parseCommentAndExt = (wikitext, config, accum, includeOnly) => {
     const onlyincludeLeft = '<onlyinclude>', onlyincludeRight = '</onlyinclude>', { length } = onlyincludeLeft;
     /** 更新`<onlyinclude>`和`</onlyinclude>`的位置 */
     const update = () => {

package/dist/parser/converter.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseConverter = void 0;
-const index_1 = require("../index");
 const converter_1 = require("../src/converter");
 /**
  * 解析语言变体转换
@@ -9,7 +8,7 @@ const converter_1 = require("../src/converter");
  * @param config
  * @param accum
  */
-const parseConverter = (text, config = index_1.default.getConfig(), accum = []) => {
+const parseConverter = (text, config, accum) => {
     const regex1 = /-\{/gu, regex2 = /-\{|\}-/gu, stack = [];
     let regex = regex1, mt = regex.exec(text);
     while (mt) {

package/dist/parser/externalLinks.js

@@ -2,26 +2,39 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseExternalLinks = void 0;
 const string_1 = require("../util/string");
-const index_1 = require("../index");
 const extLink_1 = require("../src/extLink");
+const magicLink_1 = require("../src/magicLink");
 /**
  * 解析外部链接
  * @param wikitext
  * @param config
  * @param accum
+ * @param inFile 是否在图链中
  */
-const parseExternalLinks = (wikitext, config = index_1.default.getConfig(), accum = []) => {
+const parseExternalLinks = (wikitext, config, accum, inFile) => {
     // eslint-disable-next-line @typescript-eslint/no-unused-expressions
     /\[((?:\[[\da-f:.]+\]|[^[\]\t\n\p{Zs}])[^[\]\t\n\p{Zs}]*(?=[[\]\t\p{Zs}]|\0\d))(\p{Zs}*(?=\P{Zs}))([^\]\n]*)\]/giu;
-    const regex = new RegExp(`\\[((?:(?:${config.protocol}|//)${string_1.extUrlCharFirst}|\0\\d+m\x7F)${string_1.extUrlChar}(?=[[\\]<>"\\t\\p{Zs}]|\0\\d))`
-        + '(\\p{Zs}*(?=\\P{Zs}))([^\\]\x01-\x08\x0A-\x1F\uFFFD]*)\\]', 'giu');
+    const regex = new RegExp('\\[' // 左括号
+        + `(${'\0\\d+f\x7F' // 预先解析的MagicLinkToken
+            + '|'
+            + `(?:(?:${config.protocol}|//)${string_1.extUrlCharFirst}|\0\\d+m\x7F)${string_1.extUrlChar}(?=[[\\]<>"\\t\\p{Zs}]|\0\\d)`})` // 链接网址
+        + '(\\p{Zs}*(?=\\P{Zs}))' // 空格
+        + '([^\\]\x01-\x08\x0A-\x1F\uFFFD]*)' // 链接文字
+        + '\\]', // 右括号
+    'giu');
     return wikitext.replace(regex, (_, url, space, text) => {
-        const { length } = accum, mt = /&[lg]t;/u.exec(url);
+        const { length } = accum;
+        const mt = /&[lg]t;/u.exec(url);
         if (mt) {
             url = url.slice(0, mt.index);
             space = '';
             text = `${url.slice(mt.index)}${space}${text}`;
         }
+        if (inFile) {
+            // @ts-expect-error abstract class
+            new magicLink_1.MagicLinkToken(url, true, config, accum);
+            return `[\0${length}f\x7F${space}${text}]`;
+        }
         // @ts-expect-error abstract class
         new extLink_1.ExtLinkToken(url, space, text, config, accum);
         return `\0${length}w\x7F`;

package/dist/parser/hrAndDoubleUnderscore.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseHrAndDoubleUnderscore = void 0;
-const index_1 = require("../index");
 const hr_1 = require("../src/nowiki/hr");
 const doubleUnderscore_1 = require("../src/nowiki/doubleUnderscore");
 const heading_1 = require("../src/heading");
@@ -11,7 +10,7 @@ const heading_1 = require("../src/heading");
  * @param config
  * @param accum
  */
-const parseHrAndDoubleUnderscore = ({ firstChild: { data }, type, name }, config = index_1.default.getConfig(), accum = []) => {
+const parseHrAndDoubleUnderscore = ({ firstChild: { data }, type, name }, config, accum) => {
     const { doubleUnderscore } = config, insensitive = new Set(doubleUnderscore[0]), sensitive = new Set(doubleUnderscore[1]);
     if (type !== 'root' && (type !== 'ext-inner' || name !== 'poem')) {
         data = `\0${data}`;

package/dist/parser/html.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseHtml = void 0;
-const index_1 = require("../index");
 const attributes_1 = require("../src/attributes");
 const html_1 = require("../src/html");
 /**
@@ -10,7 +9,7 @@ const html_1 = require("../src/html");
  * @param config
  * @param accum
  */
-const parseHtml = (wikitext, config = index_1.default.getConfig(), accum = []) => {
+const parseHtml = (wikitext, config, accum) => {
     const regex = /^(\/?)([a-z][^\s/>]*)((?:\s|\/(?!>))[^>]*?)?(\/?>)([^<]*)$/iu, elements = new Set(config.html.flat()), bits = wikitext.split('<');
     let text = bits.shift();
     for (const x of bits) {
@@ -19,18 +18,18 @@ const parseHtml = (wikitext, config = index_1.default.getConfig(), accum = []) =
             text += `<${x}`;
             continue;
         }
-        const [, slash, , params = '', brace, rest] = mt, 
+        const [, slash, , params = '', brace, rest] = mt, { length } = accum, 
         // @ts-expect-error abstract class
-        attr = new attributes_1.AttributesToken(params, 'html-attrs', name, config, accum), itemprop = attr.getAttr('itemprop');
-        if (name === 'meta' && (itemprop === undefined || attr.getAttr('content') === undefined)
-            || name === 'link' && (itemprop === undefined || attr.getAttr('href') === undefined)) {
+        attrs = new attributes_1.AttributesToken(params, 'html-attrs', name, config, accum), itemprop = attrs.getAttr('itemprop');
+        if (name === 'meta' && (itemprop === undefined || attrs.getAttr('content') === undefined)
+            || name === 'link' && (itemprop === undefined || attrs.getAttr('href') === undefined)) {
             text += `<${x}`;
-            accum.pop();
+            accum.length = length;
             continue;
         }
         text += `\0${accum.length}x\x7F${rest}`;
         // @ts-expect-error abstract class
-        new html_1.HtmlToken(t, attr, slash === '/', brace === '/>', config, accum);
+        new html_1.HtmlToken(t, attrs, slash === '/', brace === '/>', config, accum);
     }
     return text;
 };

package/dist/parser/links.js

@@ -2,6 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseLinks = void 0;
 const index_1 = require("../index");
+const quotes_1 = require("./quotes");
+const externalLinks_1 = require("./externalLinks");
 const index_2 = require("../src/link/index");
 const file_1 = require("../src/link/file");
 const category_1 = require("../src/link/category");
@@ -11,8 +13,7 @@ const category_1 = require("../src/link/category");
  * @param config
  * @param accum
  */
-const parseLinks = (wikitext, config = index_1.default.getConfig(), accum = []) => {
-    const { parseQuotes } = require('./quotes');
+const parseLinks = (wikitext, config, accum) => {
     const regex = /^((?:(?!\0\d+!\x7F)[^\n[\]{}|])+)(?:(\||\0\d+!\x7F)(.*?[^\]]))?\]\](.*)$/su, regexImg = /^((?:(?!\0\d+!\x7F)[^\n[\]{}|])+)(\||\0\d+!\x7F)(.*)$/su, regexExt = new RegExp(`^\\s*(?:${config.protocol}|//)`, 'iu'), bits = wikitext.split('[[');
     let s = bits.shift();
     for (let i = 0; i < bits.length; i++) {
@@ -74,17 +75,18 @@ const parseLinks = (wikitext, config = index_1.default.getConfig(), accum = [])
                 continue;
             }
         }
-        text &&= parseQuotes(text, config, accum);
-        s += `\0${accum.length}l\x7F${after}`;
+        text &&= (0, quotes_1.parseQuotes)(text, config, accum);
         let SomeLinkToken = index_2.LinkToken;
         if (!force) {
             if (!interwiki && ns === 6) {
+                text &&= (0, externalLinks_1.parseExternalLinks)(text, config, accum, true);
                 SomeLinkToken = file_1.FileToken;
             }
             else if (!interwiki && ns === 14) {
                 SomeLinkToken = category_1.CategoryToken;
             }
         }
+        s += `\0${accum.length}l\x7F${after}`;
         // @ts-expect-error abstract class
         new SomeLinkToken(link, text, config, accum, delimiter);
     }

package/dist/parser/list.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseList = void 0;
-const index_1 = require("../index");
 const list_1 = require("../src/nowiki/list");
 const dd_1 = require("../src/nowiki/dd");
 /**
@@ -10,7 +9,7 @@ const dd_1 = require("../src/nowiki/dd");
  * @param config
  * @param accum
  */
-const parseList = (wikitext, config = index_1.default.getConfig(), accum = []) => {
+const parseList = (wikitext, config, accum) => {
     const mt = /^((?:\0\d+c\x7F)*)([;:*#]+)/u.exec(wikitext);
     if (!mt) {
         return wikitext;

package/dist/parser/magicLinks.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseMagicLinks = void 0;
 const string_1 = require("../util/string");
-const index_1 = require("../index");
 const magicLink_1 = require("../src/magicLink");
 /**
  * 解析自由外链
@@ -10,18 +9,18 @@ const magicLink_1 = require("../src/magicLink");
  * @param config
  * @param accum
  */
-const parseMagicLinks = (wikitext, config = index_1.default.getConfig(), accum = []) => {
+const parseMagicLinks = (wikitext, config, accum) => {
     // eslint-disable-next-line @typescript-eslint/no-unused-expressions
     /(^|[^\p{L}\d_])((?:\[[\da-f:.]+\]|[^[\]<>"\t\n\p{Zs}])(?:[^[\]<>"\0\t\n\p{Zs}]|\0\d+c\x7F)*)/giu;
     const regex = new RegExp(`(^|[^\\p{L}\\d_])(?:${config.protocol})(${string_1.extUrlCharFirst}${string_1.extUrlChar})`, 'giu');
     return wikitext.replace(regex, (m, lead, p1) => {
-        let trail = '', url = lead ? m.slice(1) : m;
+        let trail = '', url = lead ? m.slice(lead.length) : m;
         const m2 = /&(?:lt|gt|nbsp|#x0*(?:3[ce]|a0)|#0*(?:6[02]|160));/iu.exec(url);
         if (m2) {
             trail = url.slice(m2.index);
             url = url.slice(0, m2.index);
         }
-        const sep = new RegExp(`[,;.:!?${url.includes('(') ? '' : ')'}]+$`, 'u'), sepChars = sep.exec(url);
+        const sep = new RegExp(`[,;\\\\.:!?${url.includes('(') ? '' : ')'}]+$`, 'u'), sepChars = sep.exec(url);
         if (sepChars) {
             let correction = 0;
             if (sepChars[0].startsWith(';') && /&(?:[a-z]+|#x[\da-f]+|#\d+)$/iu.test(url.slice(0, sepChars.index))) {

package/dist/parser/quotes.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseQuotes = void 0;
-const index_1 = require("../index");
 const quote_1 = require("../src/nowiki/quote");
 /**
  * 解析单引号
@@ -9,7 +8,7 @@ const quote_1 = require("../src/nowiki/quote");
  * @param config
  * @param accum
  */
-const parseQuotes = (wikitext, config = index_1.default.getConfig(), accum = []) => {
+const parseQuotes = (wikitext, config, accum) => {
     const arr = wikitext.split(/('{2,})/u), { length } = arr;
     if (length === 1) {
         return wikitext;

package/dist/parser/table.js

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseTable = void 0;
-const index_1 = require("../index");
-const index_2 = require("../src/index");
-const index_3 = require("../src/table/index");
+const index_1 = require("../src/index");
+const index_2 = require("../src/table/index");
 const tr_1 = require("../src/table/tr");
 const td_1 = require("../src/table/td");
 const dd_1 = require("../src/nowiki/dd");
@@ -11,14 +10,14 @@ const dd_1 = require("../src/nowiki/dd");
  * 判断是否为表格行或表格
  * @param token 表格节点
  */
-const isTr = (token) => token.lastChild.constructor !== index_2.Token;
+const isTr = (token) => token.lastChild.constructor !== index_1.Token;
 /**
  * 解析表格，注意`tr`和`td`包含开头的换行
  * @param {Token & {firstChild: AstText}} root 根节点
  * @param config
  * @param accum
  */
-const parseTable = ({ firstChild: { data }, type, name }, config = index_1.default.getConfig(), accum = []) => {
+const parseTable = ({ firstChild: { data }, type, name }, config, accum) => {
     const stack = [], lines = data.split('\n');
     let out = type === 'root' || type === 'parameter-value' || type === 'ext-inner' && name === 'poem'
         ? ''
@@ -35,7 +34,7 @@ const parseTable = ({ firstChild: { data }, type, name }, config = index_1.defau
         }
         const { lastChild } = topToken;
         if (isTr(topToken)) {
-            const token = new index_2.Token(str, config, accum);
+            const token = new index_1.Token(str, config, accum);
             token.type = 'table-inter';
             token.setAttribute('stage', 3);
             topToken.insertAt(token);
@@ -61,7 +60,7 @@ const parseTable = ({ firstChild: { data }, type, name }, config = index_1.defau
             }
             push(`\n${spaces}${indent && `\0${accum.length - 1}d\x7F`}${moreSpaces}\0${accum.length}b\x7F`, top);
             // @ts-expect-error abstract class
-            stack.push(...top ? [top] : [], new index_3.TableToken(tableSyntax, attr, config, accum));
+            stack.push(...top ? [top] : [], new index_2.TableToken(tableSyntax, attr, config, accum));
             continue;
         }
         else if (!top) {

package/dist/src/extLink.js

@@ -20,8 +20,11 @@ class ExtLinkToken extends index_2.Token {
      */
     constructor(url, space = '', text = '', config = index_1.default.getConfig(), accum = []) {
         super(undefined, config, accum, {});
-        // @ts-expect-error abstract class
-        this.insertAt(new magicLink_1.MagicLinkToken(url, true, config, accum));
+        const link = url && /\0\d+f\x7F/u.test(url)
+            ? accum[Number(url.slice(1, -2))]
+            // @ts-expect-error abstract class
+            : new magicLink_1.MagicLinkToken(url, true, config, accum);
+        this.insertAt(link);
         this.#space = space;
         if (text) {
             const inner = new index_2.Token(text, config, accum, {});

package/dist/src/imageParameter.js

@@ -6,12 +6,12 @@ const lint_1 = require("../util/lint");
 const index_1 = require("../index");
 const index_2 = require("./index");
 exports.galleryParams = new Set(['alt', 'link', 'lang', 'page', 'caption']);
-function validate(key, val, config, halfParsed = false, ext) {
+function validate(key, val, config, halfParsed, ext) {
     val = val.trim();
     let value = val.replace(/\0\d+t\x7F/gu, '').trim();
     switch (key) {
         case 'width':
-            return !value || /^(?:\d+x?|\d*x\d+)$/u.test(value);
+            return !value || /^(?:\d+x?|\d*x\d+)(?:\s*px)?$/u.test(value);
         case 'link': {
             if (!value) {
                 return val;
@@ -35,9 +35,9 @@ function validate(key, val, config, halfParsed = false, ext) {
         case 'manualthumb':
             return true;
         case 'page':
-            return (ext === 'djvu' || ext === 'djv') && Number(value) > 0;
+            return (ext === 'djvu' || ext === 'djv' || ext === 'pdf') && Number(value) > 0;
         default:
-            return !Number.isNaN(Number(value));
+            return Boolean(value) && !isNaN(value);
     }
 }
 /** 图片参数 */

package/dist/src/imagemap.js

@@ -49,7 +49,7 @@ class ImagemapToken extends index_2.Token {
                 continue;
             }
             else if (line.includes('[')) {
-                const i = line.indexOf('['), substr = line.slice(i), mtIn = /^\[{2}([^|]+)(?:\|([^\]]+))?\]{2}[\w\s]*$/u
+                const i = line.indexOf('['), substr = line.slice(i), mtIn = /^\[\[([^|]+)(?:\|([^\]]+))?\]\][\w\s]*$/u
                     .exec(substr);
                 if (mtIn) {
                     if (this.normalizeTitle(mtIn[1], 0, true, false, true).valid) {

package/dist/src/index.js

@@ -26,6 +26,7 @@
 // c: CommentToken、NoIncludeToken和IncludeToken
 // d: ListToken
 // e: ExtToken
+// f: MagicLinkToken inside ImageParameterToken
 // h: HeadingToken
 // l: LinkToken
 // m: `{{fullurl:}}`、`{{canonicalurl:}}`或`{{filepath:}}`
@@ -128,7 +129,7 @@ class Token extends element_1.AstElement {
             if (i % 2 === 0) {
                 return new text_1.AstText(s);
             }
-            else if (Number.isNaN(Number(s.slice(-1)))) {
+            else if (isNaN(s.slice(-1))) {
                 return this.#accum[Number(s.slice(0, -1))];
             }
             throw new Error(`解析错误！未正确标记的 Token：${s}`);
@@ -164,7 +165,7 @@ class Token extends element_1.AstElement {
         }
     }
     /** @private */
-    parse(n = constants_1.MAX_STAGE, include = false) {
+    parse(n = constants_1.MAX_STAGE, include) {
         n = Math.min(n, constants_1.MAX_STAGE);
         while (this.#stage < n) {
             this.parseOnce(this.#stage, include);
@@ -315,38 +316,38 @@ class Token extends element_1.AstElement {
      * @param decode 是否需要解码
      * @param selfLink 是否允许selfLink
      */
-    normalizeTitle(title, defaultNs = 0, halfParsed = false, decode = false, selfLink = false) {
+    normalizeTitle(title, defaultNs = 0, halfParsed, decode, selfLink) {
         return index_1.default.normalizeTitle(title, defaultNs, this.#include, this.#config, halfParsed, decode, selfLink);
     }
     /** @override */
     lint(start = this.getAbsoluteIndex(), re) {
         const errors = super.lint(start, re);
-        const record = {};
-        for (const cat of this.childNodes.filter((node) => node.type === 'category')) {
-            const thisCat = record[cat.name];
-            if (thisCat) {
-                thisCat.add(cat);
-            }
-            else {
-                record[cat.name] = new Set([cat]);
+        if (this.type === 'root') {
+            const record = {};
+            for (const cat of this.querySelectorAll('category')) {
+                const thisCat = record[cat.name];
+                if (thisCat) {
+                    thisCat.add(cat);
+                }
+                else {
+                    record[cat.name] = new Set([cat]);
+                }
             }
-        }
-        for (const value of Object.values(record)) {
-            if (value.size > 1) {
-                errors.push(...[...value].map(cat => {
-                    const e = (0, lint_1.generateForSelf)(cat, { start: cat.getAbsoluteIndex() }, 'no-duplicate', 'duplicated category');
-                    e.suggestions = [
-                        {
-                            desc: 'remove',
-                            range: [e.startIndex, e.endIndex],
-                            text: '',
-                        },
-                    ];
-                    return e;
-                }));
+            for (const value of Object.values(record)) {
+                if (value.size > 1) {
+                    errors.push(...[...value].map(cat => {
+                        const e = (0, lint_1.generateForSelf)(cat, { start: cat.getAbsoluteIndex() }, 'no-duplicate', 'duplicated category');
+                        e.suggestions = [
+                            {
+                                desc: 'remove',
+                                range: [e.startIndex, e.endIndex],
+                                text: '',
+                            },
+                        ];
+                        return e;
+                    }));
+                }
             }
-        }
-        if (this.type === 'root') {
             const regex = /<!--\s*lint-(disable(?:(?:-next)?-line)?|enable)(\s[\sa-z,-]*)?-->/gu, wikitext = String(this), ignores = [];
             let mt = regex.exec(wikitext), last = 0, curLine = 0;
             while (mt) {

package/dist/src/link/base.js

@@ -36,12 +36,12 @@ class LinkBaseToken extends index_2.Token {
         if (this.#delimiter.includes('\0')) {
             this.#delimiter = this.buildFromStr(this.#delimiter, constants_1.BuildMethod.String);
         }
-        this.setAttribute('name', this.#title.main);
+        this.setAttribute('name', this.#title.title);
     }
     /** @private */
     setAttribute(key, value) {
         if (key === 'bracket') {
-            this.#bracket = Boolean(value);
+            this.#bracket = value;
         }
         else if (key === 'title') {
             this.#title = value;
@@ -115,7 +115,7 @@ class LinkBaseToken extends index_2.Token {
         return errors;
     }
     /** @private */
-    getTitle(halfParsed = false) {
+    getTitle(halfParsed) {
         return this.normalizeTitle(this.firstChild.text(), 0, halfParsed, true, true);
     }
 }

package/dist/src/link/galleryImage.js

@@ -16,12 +16,13 @@ class GalleryImageToken extends file_1.FileToken {
     constructor(type, link, text, config = index_1.default.getConfig(), accum = []) {
         let token;
         if (text !== undefined) {
+            const { length } = accum;
             token = new index_2.Token(text, config, accum);
             token.type = 'plain';
             for (let n = 1; n < constants_1.MAX_STAGE; n++) {
                 token.parseOnce();
             }
-            accum.splice(accum.indexOf(token), 1);
+            accum.splice(length, 1);
         }
         super(link, token?.toString(), config, accum);
         this.setAttribute('bracket', false);

package/dist/src/magicLink.js

@@ -13,7 +13,7 @@ class MagicLinkToken extends index_2.Token {
      * @param url 网址
      * @param doubleSlash 是否接受"//"作为协议
      */
-    constructor(url, doubleSlash = false, config = index_1.default.getConfig(), accum = []) {
+    constructor(url, doubleSlash, config = index_1.default.getConfig(), accum = []) {
         super(url, config, accum, {});
         this.type = doubleSlash ? 'ext-link-url' : 'free-ext-link';
     }

package/dist/src/paramTag/inputbox.js

@@ -8,10 +8,10 @@ const index_2 = require("./index");
 class InputboxToken extends index_2.ParamTagToken {
     /** @class */
     constructor(wikitext, config = index_1.default.getConfig(), accum = []) {
-        const placeholder = Symbol('InputboxToken');
+        const placeholder = Symbol('InputboxToken'), { length } = accum;
         accum.push(placeholder);
         wikitext &&= (0, braces_1.parseBraces)(wikitext, config, accum);
-        accum.splice(accum.indexOf(placeholder), 1);
+        accum.splice(length, 1);
         super(wikitext, config, accum, {});
     }
 }

package/dist/src/table/index.js

@@ -60,13 +60,17 @@ class TableToken extends trBase_1.TrBaseToken {
                 }
             }
             if (j < length) {
-                errors.push((0, lint_1.generateForChild)(this.getNthRow(j), { start }, 'table-layout', 'inconsistent table layout', 'warning'));
+                const e = (0, lint_1.generateForChild)(this.getNthRow(j), { start }, 'table-layout', 'inconsistent table layout', 'warning');
+                e.startIndex++;
+                e.startLine++;
+                e.startCol = 0;
+                errors.push(e);
             }
         }
         return errors;
     }
     /** @private */
-    close(syntax = '\n|}', halfParsed = false) {
+    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) {
@@ -125,12 +129,16 @@ class TableToken extends trBase_1.TrBaseToken {
      * 获取指定坐标的单元格
      * @param coords 表格坐标
      */
-    getNthCell(coords) {
-        const rawCoords = coords;
+    getNthCell(
+    // eslint-disable-next-line @stylistic/comma-dangle
+    coords) {
         // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+        const rawCoords = coords.row === undefined
+            ? undefined
+            : coords;
         return rawCoords && this.getNthRow(rawCoords.row, false, false)?.getNthCol(rawCoords.column);
     }
-    getNthRow(n, force = false, insert = false) {
+    getNthRow(n, force, insert) {
         const isRow = super.getRowCount();
         if (n === 0
             // eslint-disable-next-line @stylistic/no-extra-parens

package/dist/src/table/td.js

@@ -127,7 +127,7 @@ class TdToken extends base_1.TableBaseToken {
      */
     getAttr(key) {
         const value = super.getAttr(key);
-        return (key === 'rowspan' || key === 'colspan' ? Number(value) || 1 : value);
+        return (key === 'rowspan' || key === 'colspan' ? parseInt(value) || 1 : value);
     }
 }
 exports.TdToken = TdToken;

package/dist/src/table/trBase.js

@@ -39,7 +39,7 @@ class TrBaseToken extends base_1.TableBaseToken {
     getRowCount() {
         return Number(this.childNodes.some(child => child instanceof td_1.TdToken && child.isIndependent() && !child.firstChild.text().endsWith('+')));
     }
-    getNthCol(n, insert = false) {
+    getNthCol(n, insert) {
         let last = 0;
         for (const child of this.childNodes.slice(2)) {
             if (child instanceof td_1.TdToken) {

package/dist/src/transclude.js

@@ -69,8 +69,8 @@ class TranscludeToken extends index_2.Token {
             }
         }
         if (this.type === 'template') {
-            const name = (0, string_1.removeComment)((0, string_1.decodeHtml)(title)).split('#')[0].trim();
-            if (!name || /^:[\s_]*:|\0\d+[eh!+-]\x7F|[<>[\]{}\n]|%[\da-f]{2}/iu.test(name)) {
+            const name = (0, string_1.removeComment)(title).trim();
+            if (!this.normalizeTitle(name, 10, true).valid) {
                 accum.pop();
                 throw new SyntaxError('非法的模板名称');
             }
@@ -234,7 +234,7 @@ class TranscludeToken extends index_2.Token {
      * @param exact 是否匹配匿名性
      * @param copy 是否返回一个备份
      */
-    getArgs(key, exact = false, copy = true) {
+    getArgs(key, exact, copy = true) {
         const keyStr = String(key).replace(/^[ \t\n\0\v]+|([^ \t\n\0\v])[ \t\n\0\v]+$/gu, '$1');
         let args;
         if (this.#args.has(keyStr)) {

package/dist/util/debug.js

@@ -5,8 +5,17 @@ exports.Shadow = {
     running: false,
     /** @private */
     run(callback) {
-        const result = callback();
-        return result;
+        const { running } = this;
+        this.running = true;
+        try {
+            const result = callback();
+            this.running = running;
+            return result;
+        }
+        catch (e) {
+            this.running = running;
+            throw e;
+        }
     },
 };
 /**

package/dist/util/diff.js

@@ -53,7 +53,7 @@ exports.cmd = cmd;
  * @param newStr 新文本
  * @param uid 唯一标识
  */
-const diff = async (oldStr, newStr, uid = -1) => {
+const diff = async (oldStr, newStr, uid) => {
     if (oldStr === newStr) {
         return;
     }
@@ -67,8 +67,8 @@ const diff = async (oldStr, newStr, uid = -1) => {
         oldFile,
         newFile,
     ]);
-    await Promise.all([fs.unlink(oldFile), fs.unlink(newFile)]);
     console.log(stdout?.split('\n').slice(4).join('\n'));
+    await Promise.all([fs.unlink(oldFile), fs.unlink(newFile)]);
 };
 exports.diff = diff;
 /** @implements */

package/dist/util/string.js

@@ -23,7 +23,10 @@ exports.escapeRegExp = factory(/[\\{}()|.?*+^$[\]]/gu, '\\$&');
  */
 const text = (childNodes, separator = '') => childNodes.map(child => typeof child === 'string' ? child : child.text()).join(separator);
 exports.text = text;
+const names = { lt: '<', gt: '>', lbrack: '[', rbrack: ']', lbrace: '{', rbrace: '}' };
 /** decode HTML entities */
-exports.decodeHtml = factory(/&#(\d+|x[\da-f]+);/giu, (_, code) => String.fromCodePoint(Number(`${code.toLowerCase().startsWith('x') ? '0' : ''}${code}`)));
+exports.decodeHtml = factory(/&(?:#(\d+|x[\da-fA-F]+)|([lLgG][tT]|[lr]brac[ke]));/gu, (_, code, name) => code
+    ? String.fromCodePoint(Number(`${/^x/iu.test(code) ? '0' : ''}${code}`))
+    : names[name.toLowerCase()]);
 /** escape newlines */
 exports.noWrap = factory(/\n/gu, '\\n');

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wikilint",
-	"version": "2.6.0",
+	"version": "2.6.2",
 	"description": "A Node.js linter for MediaWiki markup",
 	"keywords": [
 		"mediawiki",
@@ -40,6 +40,7 @@
 		"lint:ts": "tsc --noEmit && eslint --cache .",
 		"lint:json": "ajv -s config/.schema.json -d 'config/*.json' --strict=true --strict-required=false",
 		"lint": "npm run lint:ts && npm run lint:json",
+		"test": "node dist/test/test.js",
 		"test:end": "pkill -x http-server",
 		"test:real": "node dist/test/real.js"
 	},