wikilint 2.0.0 → 2.1.2

package/README.md

@@ -3,6 +3,7 @@
 [![CI](https://github.com/bhsd-harry/wikiparser-node/actions/workflows/node.js.yml/badge.svg)](https://github.com/bhsd-harry/wikiparser-node/actions/workflows/node.js.yml)
 
 # wikilint
+
 This is a minimal version of [wikiparser-node](https://www.npmjs.com/package/wikiparser-node) customized for [eslint-plugin-wikitext](https://www.npmjs.com/package/eslint-plugin-wikitext).
 
 You can also directly lint Wikitext articles in the command line using this package:

package/dist/base.d.ts

@@ -0,0 +1,39 @@
+export interface Config {
+    ext: string[];
+    html: [string[], string[], string[]];
+    namespaces: Record<string, string>;
+    nsid: Record<string, number>;
+    parserFunction: [Record<string, string>, string[], string[], string[]];
+    doubleUnderscore: [string[], string[]];
+    protocol: string;
+    img: Record<string, string>;
+    variants: string[];
+    excludes?: string[];
+}
+export interface LintError {
+    message: string;
+    severity: 'error' | 'warning';
+    startIndex: number;
+    endIndex: number;
+    startLine: number;
+    startCol: number;
+    endLine: number;
+    endCol: number;
+}
+/** 类似Node */
+export interface AstNode {
+    type: string;
+    childNodes: AstNode[];
+    /** Linter */
+    lint(): LintError[];
+}
+export interface Parser {
+    config: string | Config;
+    i18n: string | Record<string, string> | undefined;
+    /**
+     * 解析wikitext
+     * @param include 是否嵌入
+     * @param maxStage 最大解析层级
+     */
+    parse(wikitext: string, include?: boolean, maxStage?: number, config?: Config): AstNode;
+}

package/dist/index.d.ts

@@ -1,30 +1,7 @@
 import type { Title } from './lib/title';
 import type { Token } from './internal';
-export interface Config {
-    ext: string[];
-    html: [string[], string[], string[]];
-    namespaces: Record<string, string>;
-    nsid: Record<string, number>;
-    parserFunction: [Record<string, string>, string[], string[], string[]];
-    doubleUnderscore: [string[], string[]];
-    protocol: string;
-    img: Record<string, string>;
-    variants: string[];
-    excludes?: string[];
-}
-export interface LintError {
-    message: string;
-    severity: 'error' | 'warning';
-    startIndex: number;
-    endIndex: number;
-    startLine: number;
-    startCol: number;
-    endLine: number;
-    endCol: number;
-}
-declare interface Parser {
-    config: string | Config;
-    i18n: string | Record<string, string> | undefined;
+import type { Config, LintError, Parser as ParserBase } from './base';
+declare interface Parser extends ParserBase {
     /**
      * 规范化页面标题
      * @param title 标题（含或不含命名空间前缀）
@@ -36,7 +13,7 @@ declare interface Parser {
      */
     normalizeTitle(title: string, defaultNs?: number, include?: boolean, config?: Config, halfParsed?: boolean, decode?: boolean, selfLink?: boolean): Title;
     /**
-     * 解析wikitext
+     * @override
      * @param include 是否嵌入
      * @param maxStage 最大解析层级
      */
@@ -44,4 +21,5 @@ declare interface Parser {
 }
 declare const Parser: Parser;
 export = Parser;
+export type { Config, LintError };
 export type * from './internal';

package/dist/index.js

@@ -10,6 +10,11 @@ const constants_1 = require("./util/constants");
  * @param dir 子路径
  */
 const rootRequire = (file, dir) => require(file.startsWith('/') ? file : `../${file.includes('/') ? '' : dir}${file}`);
+/**
+ * 清理解析专用的不可见字符
+ * @param text 源文本
+ */
+const tidy = (text) => text.replace(/[\0\x7F]/gu, '');
 // eslint-disable-next-line @typescript-eslint/no-redeclare
 const Parser = {
     config: 'default',
@@ -46,11 +51,10 @@ const Parser = {
     /** @implements */
     parse(wikitext, include, maxStage = constants_1.MAX_STAGE, config = Parser.getConfig()) {
         const { Token } = require('./src/index');
-        let token;
-        debug_1.Shadow.run(() => {
-            token = new Token(wikitext.replace(/[\0\x7F]/gu, ''), config);
+        const root = debug_1.Shadow.run(() => {
+            const token = new Token(tidy(wikitext), config);
             try {
-                token.parse(maxStage, include);
+                return token.parse(maxStage, include);
             }
             catch (e) {
                 if (e instanceof Error) {
@@ -64,7 +68,7 @@ const Parser = {
                 throw e;
             }
         });
-        return token;
+        return root;
     },
 };
 const def = {}, enumerable = new Set([

package/dist/lib/element.d.ts

@@ -1,5 +1,5 @@
 import { AstNode } from './node';
-import type { LintError } from '../index';
+import type { LintError } from '../base';
 import type { AstNodes, Token } from '../internal';
 /** 类似HTMLElement */
 export declare abstract class AstElement extends AstNode {
@@ -49,7 +49,7 @@ export declare abstract class AstElement extends AstNode {
      */
     setText(str: string, i?: number): string;
     /**
-     * Linter
+     * @override
      * @param start
      */
     lint(start?: number): LintError[];

package/dist/lib/element.js

@@ -121,7 +121,7 @@ class AstElement extends node_1.AstNode {
         return this.childNodes.map(child => child.toString()).join(separator);
     }
     /**
-     * Linter
+     * @override
      * @param start
      */
     lint(start = this.getAbsoluteIndex()) {

package/dist/lib/node.d.ts

@@ -1,6 +1,7 @@
+import type { LintError, AstNode as AstNodeBase } from '../base';
 import type { AstText, Token } from '../internal';
 export type AstNodes = AstText | Token;
-export type TokenTypes = 'root' | 'plain' | 'onlyinclude' | 'noinclude' | 'include' | 'comment' | 'ext' | 'ext-attrs' | 'ext-attr-dirty' | 'ext-attr' | 'attr-key' | 'attr-value' | 'ext-inner' | 'arg' | 'arg-name' | 'arg-default' | 'hidden' | 'magic-word' | 'magic-word-name' | 'invoke-function' | 'invoke-module' | 'template' | 'template-name' | 'parameter' | 'parameter-key' | 'parameter-value' | 'heading' | 'heading-title' | 'heading-trail' | 'html' | 'html-attrs' | 'html-attr-dirty' | 'html-attr' | 'table' | 'tr' | 'td' | 'table-syntax' | 'table-attrs' | 'table-attr-dirty' | 'table-attr' | 'table-inter' | 'td-inner' | 'hr' | 'double-underscore' | 'link' | 'link-target' | 'link-text' | 'category' | 'file' | 'gallery-image' | 'imagemap-image' | 'image-parameter' | 'quote' | 'ext-link' | 'ext-link-text' | 'ext-link-url' | 'free-ext-link' | 'list' | 'dd' | 'converter' | 'converter-flags' | 'converter-flag' | 'converter-rule' | 'converter-rule-noconvert' | 'converter-rule-variant' | 'converter-rule-to' | 'converter-rule-from' | 'param-line' | 'imagemap-link';
+export type TokenTypes = 'root' | 'plain' | 'onlyinclude' | 'noinclude' | 'include' | 'comment' | 'ext' | 'ext-attrs' | 'ext-attr-dirty' | 'ext-attr' | 'attr-key' | 'attr-value' | 'ext-inner' | 'arg' | 'arg-name' | 'arg-default' | 'hidden' | 'magic-word' | 'magic-word-name' | 'invoke-function' | 'invoke-module' | 'template' | 'template-name' | 'parameter' | 'parameter-key' | 'parameter-value' | 'heading' | 'heading-title' | 'heading-trail' | 'html' | 'html-attrs' | 'html-attr-dirty' | 'html-attr' | 'table' | 'tr' | 'td' | 'table-syntax' | 'table-attrs' | 'table-attr-dirty' | 'table-attr' | 'table-inter' | 'td-inner' | 'hr' | 'double-underscore' | 'link' | 'link-target' | 'link-text' | 'category' | 'file' | 'gallery-image' | 'imagemap-image' | 'image-parameter' | 'quote' | 'ext-link' | 'ext-link-text' | 'ext-link-url' | 'free-ext-link' | 'list' | 'dd' | 'converter' | 'converter-flags' | 'converter-flag' | 'converter-rule' | 'converter-rule-variant' | 'converter-rule-to' | 'converter-rule-from' | 'param-line' | 'imagemap-link';
 export interface Dimension {
     height: number;
     width: number;
@@ -14,11 +15,12 @@ export interface CaretPosition {
     offset: number;
 }
 /** 类似Node */
-export declare abstract class AstNode {
+export declare abstract class AstNode implements AstNodeBase {
     #private;
     type: TokenTypes | 'text';
     data?: string | undefined;
     readonly childNodes: AstNodes[];
+    abstract lint(): LintError[];
     /** 首位子节点 */
     get firstChild(): AstNodes | undefined;
     /** 末位子节点 */

package/dist/lib/node.js

@@ -19,12 +19,12 @@ class AstNode {
     }
     /** 后一个兄弟节点 */
     get nextSibling() {
-        const childNodes = this.#parentNode?.childNodes;
+        const childNodes = this.parentNode?.childNodes;
         return childNodes && childNodes[childNodes.indexOf(this) + 1];
     }
     /** 前一个兄弟节点 */
     get previousSibling() {
-        const childNodes = this.#parentNode?.childNodes;
+        const childNodes = this.parentNode?.childNodes;
         return childNodes && childNodes[childNodes.indexOf(this) - 1];
     }
     /** 行数 */

package/dist/lib/text.d.ts

@@ -1,5 +1,5 @@
 import { AstNode } from './node';
-import type { LintError } from '../index';
+import type { LintError } from '../base';
 /** 文本节点 */
 export declare class AstText extends AstNode {
     #private;
@@ -11,7 +11,7 @@ export declare class AstText extends AstNode {
     /** 可见部分 */
     text(): string;
     /**
-     * Linter
+     * @override
      * @param start
      */
     lint(start?: number): LintError[];

package/dist/lib/text.js

@@ -48,7 +48,7 @@ class AstText extends node_1.AstNode {
         return this.data;
     }
     /**
-     * Linter
+     * @override
      * @param start
      */
     lint(start = this.getAbsoluteIndex()) {
@@ -60,8 +60,9 @@ class AstText extends node_1.AstNode {
             return errors
                 .map(({ 0: error, 1: prefix, 2: tag, index }) => {
                 if (prefix) {
-                    index += prefix.length;
-                    error = error.slice(prefix.length);
+                    const { length } = prefix;
+                    index += length;
+                    error = error.slice(length);
                 }
                 const startIndex = start + index, lines = data.slice(0, index).split('\n'), startLine = lines.length + top - 1, line = lines.at(-1), startCol = lines.length === 1 ? left + line.length : line.length, { 0: char, length } = error, endIndex = startIndex + length, rootStr = String(root), nextChar = rootStr[endIndex], previousChar = rootStr[startIndex - 1], severity = length > 1 && (char !== '<' || /[\s/>]/u.test(nextChar ?? ''))
                     || char === '{' && (nextChar === char || previousChar === '-')

package/dist/lib/title.d.ts

@@ -4,7 +4,6 @@ export declare class Title {
     valid: boolean;
     ns: number;
     fragment: string | undefined;
-    encoded: boolean;
     /**
      * @param title 标题（含或不含命名空间前缀）
      * @param defaultNs 命名空间

package/dist/lib/title.js

@@ -8,6 +8,7 @@ class Title {
     valid;
     ns;
     fragment;
+    /** @private */
     encoded = false;
     /**
      * @param title 标题（含或不含命名空间前缀）
@@ -16,8 +17,7 @@ class Title {
      * @param selfLink 是否允许selfLink
      */
     constructor(title, defaultNs = 0, config = Parser.getConfig(), decode = false, selfLink = false) {
-        const { namespaces, nsid } = config;
-        let namespace = namespaces[defaultNs] ?? '';
+        const { nsid, } = config;
         title = (0, string_1.decodeHtml)(title);
         if (decode && title.includes('%')) {
             try {
@@ -28,29 +28,29 @@ class Title {
             catch { }
         }
         title = title.replaceAll('_', ' ').trim();
+        let ns = defaultNs;
         if (title.startsWith(':')) {
-            namespace = '';
+            ns = 0;
             title = title.slice(1).trim();
         }
         const m = title.split(':');
         if (m.length > 1) {
-            const ns = nsid[m[0].trim().toLowerCase()], id = ns === undefined ? undefined : namespaces[ns];
+            const id = nsid[m[0].trim().toLowerCase()];
             if (id !== undefined) {
-                namespace = id;
+                ns = id;
                 title = m.slice(1).join(':').trim();
             }
         }
-        this.ns = nsid[namespace.toLowerCase()];
+        this.ns = ns;
         const i = title.indexOf('#');
-        let fragment;
         if (i !== -1) {
-            fragment = title.slice(i + 1).trimEnd();
+            // eslint-disable-next-line prefer-const
+            let fragment = title.slice(i + 1).trimEnd();
+            this.fragment = fragment;
             title = title.slice(0, i).trim();
         }
         this.valid = Boolean(title
-            || selfLink && fragment !== undefined)
-            && !/\0\d+[eh!+-]\x7F|[<>[\]{}|]|%[\da-f]{2}/iu.test(title);
-        this.fragment = fragment;
+            || selfLink && this.fragment !== undefined) && !/\0\d+[eh!+-]\x7F|[<>[\]{}|]|%[\da-f]{2}/iu.test(title);
     }
 }
 exports.Title = Title;

package/dist/parser/commentAndExt.js

@@ -34,7 +34,11 @@ const parseCommentAndExt = (wikitext, config = Parser.getConfig(), accum = [], i
                 i = wikitext.indexOf(onlyincludeLeft);
                 j = wikitext.indexOf(onlyincludeRight, i + length);
             }
-            return `${str}${wikitext}`;
+            if (wikitext) {
+                new noinclude_1.NoincludeToken(wikitext, config, accum);
+                str += `\0${accum.length - 1}c\x7F`;
+            }
+            return str;
         }
     }
     const ext = config.ext.join('|'), includeRegex = includeOnly ? 'includeonly' : '(?:no|only)include', noincludeRegex = includeOnly ? 'noinclude' : 'includeonly', regex = new RegExp('<!--.*?(?:-->|$)|' // comment

package/dist/src/arg.d.ts

@@ -2,7 +2,7 @@ import * as Parser from '../index';
 import { Token } from './index';
 import { AtomToken } from './atom';
 import { HiddenToken } from './hidden';
-import type { LintError } from '../index';
+import type { LintError } from '../base';
 /**
  * `{{{}}}`包裹的参数
  * @classdesc `{childNodes: [AtomToken, ?Token, ...HiddenToken]}`

package/dist/src/atom.d.ts

@@ -1,6 +1,6 @@
 import * as Parser from '../index';
 import { Token } from './index';
-declare type AtomTypes = 'arg-name' | 'attr-key' | 'attr-value' | 'ext-attr-dirty' | 'html-attr-dirty' | 'table-attr-dirty' | 'converter-flag' | 'converter-rule-variant' | 'converter-rule-to' | 'converter-rule-from' | 'converter-rule-noconvert' | 'invoke-function' | 'invoke-module' | 'template-name' | 'link-target' | 'param-line';
+declare type AtomTypes = 'arg-name' | 'attr-key' | 'attr-value' | 'ext-attr-dirty' | 'html-attr-dirty' | 'table-attr-dirty' | 'converter-flag' | 'converter-rule-variant' | 'converter-rule-to' | 'converter-rule-from' | 'invoke-function' | 'invoke-module' | 'template-name' | 'link-target' | 'param-line';
 /** 不会被继续解析的plain Token */
 export declare class AtomToken extends Token {
     type: AtomTypes;

package/dist/src/attribute.d.ts

@@ -1,7 +1,7 @@
 import * as Parser from '../index';
 import { Token } from './index';
 import { AtomToken } from './atom';
-import type { LintError } from '../index';
+import type { LintError } from '../base';
 import type { AttributesToken } from '../internal';
 export type AttributeTypes = 'ext-attr' | 'html-attr' | 'table-attr';
 /**

package/dist/src/attributes.d.ts

@@ -2,7 +2,7 @@ import * as Parser from '../index';
 import { Token } from './index';
 import { AtomToken } from './atom';
 import { AttributeToken } from './attribute';
-import type { LintError } from '../index';
+import type { LintError } from '../base';
 import type { ExtToken, HtmlToken, TdToken, TrToken, TableToken } from '../internal';
 declare type AttributesTypes = 'ext-attrs' | 'html-attrs' | 'table-attrs';
 /**

package/dist/src/converterFlags.d.ts

@@ -1,7 +1,7 @@
 import * as Parser from '../index';
 import { Token } from './index';
 import { AtomToken } from './atom';
-import type { LintError } from '../index';
+import type { LintError } from '../base';
 import type { ConverterToken, ConverterRuleToken } from '../internal';
 /**
  * 转换flags

package/dist/src/converterRule.js

@@ -16,21 +16,16 @@ class ConverterRuleToken extends index_1.Token {
      */
     constructor(rule, hasColon = true, config = Parser.getConfig(), accum = []) {
         super(undefined, config, accum);
-        if (hasColon) {
-            const i = rule.indexOf(':'), j = rule.slice(0, i).indexOf('=>'), v = j === -1 ? rule.slice(0, i) : rule.slice(j + 2, i);
-            if (config.variants.includes(v.trim())) {
-                super.insertAt(new atom_1.AtomToken(v, 'converter-rule-variant', config, accum));
-                super.insertAt(new atom_1.AtomToken(rule.slice(i + 1), 'converter-rule-to', config, accum));
-                if (j !== -1) {
-                    super.insertAt(new atom_1.AtomToken(rule.slice(0, j), 'converter-rule-from', config, accum), 0);
-                }
-            }
-            else {
-                super.insertAt(new atom_1.AtomToken(rule, 'converter-rule-noconvert', config, accum));
+        const i = rule.indexOf(':'), j = rule.slice(0, i).indexOf('=>'), v = j === -1 ? rule.slice(0, i) : rule.slice(j + 2, i);
+        if (hasColon && config.variants.includes(v.trim())) {
+            super.insertAt(new atom_1.AtomToken(v, 'converter-rule-variant', config, accum));
+            super.insertAt(new atom_1.AtomToken(rule.slice(i + 1), 'converter-rule-to', config, accum));
+            if (j !== -1) {
+                super.insertAt(new atom_1.AtomToken(rule.slice(0, j), 'converter-rule-from', config, accum), 0);
             }
         }
         else {
-            super.insertAt(new atom_1.AtomToken(rule, 'converter-rule-noconvert', config, accum));
+            super.insertAt(new atom_1.AtomToken(rule, 'converter-rule-to', config, accum));
         }
     }
     /** @private */

package/dist/src/gallery.d.ts

@@ -2,7 +2,7 @@ import * as Parser from '../index';
 import { Token } from './index';
 import { GalleryImageToken } from './link/galleryImage';
 import { HiddenToken } from './hidden';
-import type { LintError } from '../index';
+import type { LintError } from '../base';
 import type { AstText, AttributesToken, ExtToken } from '../internal';
 /**
  * gallery标签

package/dist/src/heading.d.ts

@@ -1,7 +1,7 @@
 import * as Parser from '../index';
 import { Token } from './index';
 import { SyntaxToken } from './syntax';
-import type { LintError } from '../index';
+import type { LintError } from '../base';
 /**
  * 章节标题
  * @classdesc `{childNodes: [Token, SyntaxToken]}`
@@ -9,7 +9,6 @@ import type { LintError } from '../index';
 export declare class HeadingToken extends Token {
     #private;
     readonly type = "heading";
-    name: string;
     childNodes: [Token, SyntaxToken];
     abstract get firstChild(): Token;
     abstract get lastChild(): SyntaxToken;

package/dist/src/heading.js

@@ -11,13 +11,14 @@ const syntax_1 = require("./syntax");
  */
 class HeadingToken extends index_1.Token {
     type = 'heading';
+    #level;
     /** 标题格式的等号 */
     get #equals() {
         return '='.repeat(this.level);
     }
     /** 标题层级 */
     get level() {
-        return Number(this.name);
+        return this.#level;
     }
     /**
      * @param level 标题层级
@@ -25,7 +26,7 @@ class HeadingToken extends index_1.Token {
      */
     constructor(level, input, config = Parser.getConfig(), accum = []) {
         super(undefined, config, accum);
-        this.setAttribute('name', String(level));
+        this.#level = level;
         const token = new index_1.Token(input[0], config, accum);
         token.type = 'heading-title';
         token.setAttribute('stage', 2);
@@ -56,7 +57,7 @@ class HeadingToken extends index_1.Token {
     lint(start = this.getAbsoluteIndex()) {
         const errors = super.lint(start), innerStr = String(this.firstChild);
         let refError;
-        if (this.name === '1') {
+        if (this.level === 1) {
             refError = (0, lint_1.generateForSelf)(this, { start }, '<h1>');
             errors.push(refError);
         }

package/dist/src/html.d.ts

@@ -1,6 +1,6 @@
 import * as Parser from '../index';
 import { Token } from './index';
-import type { LintError } from '../index';
+import type { LintError } from '../base';
 import type { AttributesToken } from '../internal';
 /**
  * HTML标签

package/dist/src/html.js

@@ -35,23 +35,24 @@ class HtmlToken extends index_1.Token {
     }
     /** @private */
     toString(omit) {
-        return `<${this.#closing ? '/' : ''}${this.#tag}${super.toString()}${this.#selfClosing ? '/' : ''}>`;
+        return `<${this.closing ? '/' : ''}${this.#tag}${super.toString()}${this.#selfClosing ? '/' : ''}>`;
     }
     /** @override */
     text() {
-        return `<${this.#closing ? '/' : ''}${this.#tag}${this.#closing ? '' : super.text()}${this.#selfClosing ? '/' : ''}>`;
+        const { closing } = this;
+        return `<${closing ? '/' : ''}${this.#tag}${closing ? '' : super.text()}${this.#selfClosing ? '/' : ''}>`;
     }
     /** @private */
     getAttribute(key) {
         return key === 'padding'
-            ? this.#tag.length + (this.#closing ? 2 : 1)
+            ? this.#tag.length + (this.closing ? 2 : 1)
             : super.getAttribute(key);
     }
     /** @override */
     lint(start = this.getAbsoluteIndex()) {
         const errors = super.lint(start);
         let refError;
-        if (this.name === 'h1' && !this.#closing) {
+        if (this.name === 'h1' && !this.closing) {
             refError = (0, lint_1.generateForSelf)(this, { start }, '<h1>');
             errors.push(refError);
         }
@@ -91,8 +92,8 @@ class HtmlToken extends index_1.Token {
      * @throws `SyntaxError` 未闭合的标签
      */
     findMatchingTag() {
-        const { html } = this.getAttribute('config'), { name: tagName, parentNode } = this, string = (0, string_1.noWrap)(String(this));
-        if (this.#closing && (this.#selfClosing || html[2].includes(tagName))) {
+        const { html } = this.getAttribute('config'), { name: tagName, parentNode, closing } = this, string = (0, string_1.noWrap)(String(this));
+        if (closing && (this.#selfClosing || html[2].includes(tagName))) {
             throw new SyntaxError(`tag that is both closing and self-closing: ${string}`);
         }
         else if (html[2].includes(tagName) || this.#selfClosing && html[1].includes(tagName)) { // 自封闭标签
@@ -104,10 +105,10 @@ class HtmlToken extends index_1.Token {
         else if (!parentNode) {
             return undefined;
         }
-        const { childNodes } = parentNode, i = childNodes.indexOf(this), siblings = this.#closing
+        const { childNodes } = parentNode, i = childNodes.indexOf(this), siblings = closing
             ? childNodes.slice(0, i).reverse().filter(({ type, name }) => type === 'html' && name === tagName)
             : childNodes.slice(i + 1).filter(({ type, name }) => type === 'html' && name === tagName);
-        let imbalance = this.#closing ? -1 : 1;
+        let imbalance = closing ? -1 : 1;
         for (const token of siblings) {
             if (token.#closing) {
                 imbalance--;
@@ -119,7 +120,7 @@ class HtmlToken extends index_1.Token {
                 return token;
             }
         }
-        throw new SyntaxError(`${this.#closing ? 'unmatched closing' : 'unclosed'} tag: ${string}`);
+        throw new SyntaxError(`${closing ? 'unmatched closing' : 'unclosed'} tag: ${string}`);
     }
 }
 exports.HtmlToken = HtmlToken;

package/dist/src/imageParameter.d.ts

@@ -1,6 +1,6 @@
 import * as Parser from '../index';
 import { Token } from './index';
-import type { LintError } from '../index';
+import type { LintError } from '../base';
 import type { Title } from '../lib/title';
 import type { AtomToken, FileToken } from '../internal';
 export declare const galleryParams: Set<string>;

package/dist/src/imagemap.d.ts

@@ -3,7 +3,7 @@ import { Token } from './index';
 import { NoincludeToken } from './nowiki/noinclude';
 import { GalleryImageToken } from './link/galleryImage';
 import { ImagemapLinkToken } from './imagemapLink';
-import type { LintError } from '../index';
+import type { LintError } from '../base';
 import type { AstText, AttributesToken, ExtToken } from '../internal';
 /**
  * `<imagemap>`

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

@@ -1,7 +1,8 @@
 import * as Parser from '../../index';
 import { Token } from '../index';
 import { AtomToken } from '../atom';
-import type { LintError } from '../../index';
+import type { LintError } from '../../base';
+import type { Title } from '../../lib/title';
 /**
  * 内链
  * @classdesc `{childNodes: [AtomToken, ...Token]}`

package/dist/src/link/base.js

@@ -13,6 +13,7 @@ const atom_1 = require("../atom");
 class LinkBaseToken extends index_1.Token {
     #bracket = true;
     #delimiter;
+    #title;
     /**
      * @param link 链接标题
      * @param linkText 链接显示文字
@@ -31,6 +32,7 @@ class LinkBaseToken extends index_1.Token {
     }
     /** @private */
     afterBuild() {
+        this.#title = this.getTitle();
         if (this.#delimiter.includes('\0')) {
             this.#delimiter = this.buildFromStr(this.#delimiter, 'string');
         }
@@ -40,6 +42,9 @@ class LinkBaseToken extends index_1.Token {
         if (key === 'bracket') {
             this.#bracket = Boolean(value);
         }
+        else if (key === 'title') {
+            this.#title = value;
+        }
         else {
             super.setAttribute(key, value);
         }
@@ -58,6 +63,9 @@ class LinkBaseToken extends index_1.Token {
     }
     /** @private */
     getAttribute(key) {
+        if (key === 'title') {
+            return this.#title;
+        }
         return key === 'padding' ? 2 : super.getAttribute(key);
     }
     /** @private */
@@ -66,7 +74,7 @@ class LinkBaseToken extends index_1.Token {
     }
     /** @override */
     lint(start = this.getAbsoluteIndex()) {
-        const errors = super.lint(start), { childNodes: [target, linkText], type: linkType } = this, { encoded, fragment } = this.#getTitle();
+        const errors = super.lint(start), { childNodes: [target, linkText], type: linkType } = this, { encoded, fragment } = this.#title;
         let rect;
         if (linkType === 'link' && target.childNodes.some(({ type }) => type === 'template')) {
             rect = { start, ...this.getRootNode().posFromIndex(start) };
@@ -86,8 +94,8 @@ class LinkBaseToken extends index_1.Token {
         }
         return errors;
     }
-    /** 生成Title对象 */
-    #getTitle() {
+    /** @private */
+    getTitle() {
         return this.normalizeTitle(this.firstChild.text(), 0, false, true, true);
     }
 }

package/dist/src/link/file.d.ts

@@ -1,7 +1,7 @@
 import * as Parser from '../../index';
 import { LinkBaseToken } from './base';
 import { ImageParameterToken } from '../imageParameter';
-import type { LintError } from '../../index';
+import type { LintError } from '../../base';
 import type { Token, AtomToken } from '../../internal';
 /**
  * 图片

package/dist/src/link/galleryImage.d.ts

@@ -1,7 +1,8 @@
 import * as Parser from '../../index';
 import { Token } from '../index';
 import { FileToken } from './file';
-import type { LintError } from '../../index';
+import type { Title } from '../../lib/title';
+import type { LintError } from '../../base';
 /** 图库图片 */
 export declare class GalleryImageToken extends FileToken {
     #private;
@@ -12,6 +13,8 @@ export declare class GalleryImageToken extends FileToken {
      * @param text 图片参数
      */
     constructor(type: 'gallery' | 'imagemap', link: string, text?: string, config?: Parser.Config, accum?: Token[]);
+    /** private */
+    getTitle(): Title;
     /** @override */
     lint(start?: number): LintError[];
 }

package/dist/src/link/galleryImage.js

@@ -28,8 +28,8 @@ class GalleryImageToken extends file_1.FileToken {
         this.setAttribute('bracket', false);
         this.type = `${type}-image`;
     }
-    /** 生成Title对象 */
-    #getTitle() {
+    /** private */
+    getTitle() {
         const imagemap = this.type === 'imagemap-image';
         return this.normalizeTitle(String(this.firstChild), imagemap ? 0 : 6, true, !imagemap);
     }
@@ -39,11 +39,22 @@ class GalleryImageToken extends file_1.FileToken {
     }
     /** @override */
     lint(start = this.getAbsoluteIndex()) {
-        const errors = super.lint(start), { ns, } = this.#getTitle();
+        const errors = super.lint(start), { ns, } = this.getAttribute('title');
         if (ns !== 6) {
             errors.push((0, lint_1.generateForSelf)(this, { start }, 'invalid gallery image'));
         }
         return errors;
     }
+    /**
+     * 设置`#title`
+     * @param title Title对象
+     */
+    #setName(title) {
+        this.setAttribute('title', title);
+    }
+    /** @private */
+    afterBuild() {
+        this.#setName(this.getTitle());
+    }
 }
 exports.GalleryImageToken = GalleryImageToken;

package/dist/src/magicLink.d.ts

@@ -1,6 +1,6 @@
 import * as Parser from '../index';
 import { Token } from './index';
-import type { LintError } from '../index';
+import type { LintError } from '../base';
 import type { AstText, CommentToken, IncludeToken, NoincludeToken } from '../internal';
 /**
  * 自由外链

package/dist/src/nested.d.ts

@@ -3,7 +3,7 @@ import { Token } from './index';
 import { ExtToken } from './tagPair/ext';
 import { NoincludeToken } from './nowiki/noinclude';
 import { CommentToken } from './nowiki/comment';
-import type { LintError } from '../index';
+import type { LintError } from '../base';
 import type { AttributesToken } from './attributes';
 /**
  * 嵌套式的扩展标签

package/dist/src/nowiki/comment.d.ts

@@ -1,6 +1,6 @@
 import * as Parser from '../../index';
 import { NowikiBaseToken } from './base';
-import type { LintError } from '../../index';
+import type { LintError } from '../../base';
 import type { Token } from '../index';
 declare const CommentToken_base: ((abstract new (...args: any[]) => {
     text(): string;

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

@@ -1,5 +1,5 @@
 import { NowikiBaseToken } from './base';
-import type { LintError } from '../../index';
+import type { LintError } from '../../base';
 import type { AttributesToken, ExtToken } from '../../internal';
 /** 扩展标签内的纯文字Token */
 export declare class NowikiToken extends NowikiBaseToken {

package/dist/src/nowiki/quote.d.ts

@@ -1,5 +1,5 @@
 import { NowikiBaseToken } from './base';
-import type { LintError } from '../../index';
+import type { LintError } from '../../base';
 /** `''`和`'''` */
 export declare class QuoteToken extends NowikiBaseToken {
     readonly type = "quote";

package/dist/src/nowiki/quote.js

@@ -14,7 +14,7 @@ class QuoteToken extends base_1.NowikiBaseToken {
         let refError;
         if (previousSibling?.type === 'text' && previousSibling.data.endsWith(`'`)) {
             refError = (0, lint_1.generateForSelf)(this, { start }, message);
-            const { startIndex: endIndex, startLine: endLine, startCol: endCol } = refError, [{ length }] = previousSibling.data.match(/(?<!')'+$/u), startIndex = start - length;
+            const { startIndex: endIndex, startLine: endLine, startCol: endCol } = refError, [{ length }] = /(?<!')'+$/u.exec(previousSibling.data), startIndex = start - length;
             errors.push({
                 ...refError,
                 startIndex,
@@ -26,7 +26,7 @@ class QuoteToken extends base_1.NowikiBaseToken {
         }
         if (nextSibling?.type === 'text' && nextSibling.data.startsWith(`'`)) {
             refError ??= (0, lint_1.generateForSelf)(this, { start }, message);
-            const { endIndex: startIndex, endLine: startLine, endCol: startCol } = refError, [{ length }] = nextSibling.data.match(/^'+/u), endIndex = startIndex + length;
+            const { endIndex: startIndex, endLine: startLine, endCol: startCol } = refError, [{ length }] = /^'+/u.exec(nextSibling.data), endIndex = startIndex + length;
             errors.push({
                 ...refError,
                 startIndex,

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

@@ -1,7 +1,7 @@
 import * as Parser from '../../index';
 import { Token } from '../index';
 import { AtomToken } from '../atom';
-import type { LintError } from '../../index';
+import type { LintError } from '../../base';
 import type { AttributesToken, ExtToken } from '../../internal';
 /**
  * `<dynamicpagelist>`

package/dist/src/parameter.d.ts

@@ -1,6 +1,6 @@
 import * as Parser from '../index';
 import { Token } from './index';
-import type { LintError } from '../index';
+import type { LintError } from '../base';
 import type { AtomToken, SyntaxToken, TranscludeToken } from '../internal';
 /**
  * 模板或魔术字参数

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

@@ -1,7 +1,7 @@
 import * as Parser from '../../index';
 import { TrBaseToken } from './trBase';
 import { SyntaxToken } from '../syntax';
-import type { LintError } from '../../index';
+import type { LintError } from '../../base';
 import type { AttributesToken, TdToken, TrToken, Token } from '../../internal';
 /**
  * 表格

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

@@ -1,7 +1,7 @@
 import * as Parser from '../../index';
 import { Token } from '../index';
 import { TableBaseToken } from './base';
-import type { LintError } from '../../index';
+import type { LintError } from '../../base';
 import type { SyntaxToken, AttributesToken, TrToken, TableToken } from '../../internal';
 export type TdSubtypes = 'td' | 'th' | 'caption';
 export type TdAttrs = Record<string, string | true> & {

package/dist/src/table/td.js

@@ -22,9 +22,9 @@ class TdToken extends base_1.TableBaseToken {
      * @param inner 内部wikitext
      */
     constructor(syntax, inner, config = Parser.getConfig(), accum = []) {
-        let innerSyntax = inner?.match(/\||\0\d+!\x7F/u), attr = innerSyntax ? inner.slice(0, innerSyntax.index) : '';
+        let innerSyntax = /\||\0\d+!\x7F/u.exec(inner ?? ''), attr = innerSyntax ? inner.slice(0, innerSyntax.index) : '';
         if (/\[\[|-\{/u.test(attr)) {
-            innerSyntax = undefined;
+            innerSyntax = null;
             attr = '';
         }
         super(/^(?:\n[^\S\n]*(?:[|!]|\|\+|\{\{\s*!\s*\}\}\+?)|(?:\||\{\{\s*!\s*\}\}){2}|!!|\{\{\s*!!\s*\}\})$/u, syntax, attr, config, accum);

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

@@ -1,5 +1,5 @@
 import { TableBaseToken } from './base';
-import type { LintError } from '../../index';
+import type { LintError } from '../../base';
 export interface TableCoords {
     row: number;
     column: number;

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

@@ -2,7 +2,7 @@ import * as Parser from '../../index';
 import { Token } from '../index';
 import { TagPairToken } from './index';
 import { AttributesToken } from '../attributes';
-import type { LintError } from '../../index';
+import type { LintError } from '../../base';
 /**
  * 扩展标签
  * @classdesc `{childNodes: [AttributesToken, Token]}`

package/dist/src/transclude.d.ts

@@ -3,7 +3,7 @@ import { Token } from './index';
 import { ParameterToken } from './parameter';
 import { AtomToken } from './atom';
 import { SyntaxToken } from './syntax';
-import type { LintError } from '../index';
+import type { LintError } from '../base';
 /**
  * 模板或魔术字
  * @classdesc `{childNodes: [AtomToken|SyntaxToken, ...AtomToken, ...ParameterToken]}`

package/dist/util/debug.js

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Shadow = void 0;
-// eslint-disable-next-line @typescript-eslint/no-redeclare
 exports.Shadow = {
-    /** @implements */
+    /** @private */
     run(callback) {
         const result = callback();
         return result;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wikilint",
-	"version": "2.0.0",
+	"version": "2.1.2",
 	"description": "A Node.js linter for MediaWiki markup",
 	"keywords": [
 		"mediawiki",
@@ -30,7 +30,7 @@
 		"url": "git+https://github.com/bhsd-harry/wikiparser-node.git"
 	},
 	"scripts": {
-		"prepublishOnly": "npm run build; rm dist/internal.js; rm -r dist/test; rm dist/[bmpu]*/*.d.ts; grep -rl --include='*.d.ts' '@private' dist/ | xargs gsed -i '/@private/,+1d'",
+		"prepublishOnly": "npm run build; rm dist/internal.js dist/base.js dist/[bmpu]*/*.d.ts; rm -r dist/test; grep -rl --include='*.d.ts' '@private' dist/ | xargs gsed -i '/@private/,+1d'",
 		"build": "rm -rf dist/; tsc; grep -rl --include='*.d.ts' '@private' dist/ | xargs gsed -i '/@private/,+1d'",
 		"diff": "git diff --ignore-all-space --color-moved",
 		"lint:ts": "tsc --noEmit && eslint --cache .",