wikilint 2.9.3 → 2.10.0

package/config/.schema.json

@@ -162,6 +162,11 @@
 				"minItems": 2,
 				"maxItems": 2
 			}
+		},
+		"articlePath": {
+			"description": "base URL of internal links",
+			"type": "string",
+			"pattern": "\\$1"
 		}
 	},
 	"required": [

package/config/enwiki.json

@@ -409,5 +409,6 @@
 	"redirection": [
 		"#redirect"
 	],
-	"variants": []
+	"variants": [],
+	"articlePath": "/wiki/$1"
 }

package/config/llwiki.json

@@ -597,5 +597,6 @@
 		"zh-sg",
 		"zh-my",
 		"zh-mo"
-	]
+	],
+	"articlePath": "/zh/$1"
 }

package/config/moegirl.json

@@ -687,5 +687,6 @@
 		"zh-cn",
 		"zh-tw",
 		"zh-hk"
-	]
+	],
+	"articlePath": "/$1"
 }

package/config/zhwiki.json

@@ -805,5 +805,6 @@
 		"zh-sg",
 		"zh-my",
 		"zh-mo"
-	]
+	],
+	"articlePath": "/wiki/$1"
 }

package/dist/base.d.ts

@@ -38,8 +38,9 @@ export interface LintError {
 }
 /** 类似Node */
 export interface AstNode {
-    type: string;
     readonly childNodes: readonly AstNode[];
+    /** 节点类型 */
+    type: string;
     /** Linter */
     lint(): LintError[];
 }

package/dist/index.js

@@ -11,8 +11,7 @@ const string_1 = require("./util/string");
  * @param file 文件名
  * @param dir 子路径
  */
-const rootRequire = (file, dir) => require(file.startsWith('/') ? file : `../${file.includes('/') ? '' : dir}${file}`);
-// eslint-disable-next-line @typescript-eslint/no-redeclare
+const rootRequire = (file, dir) => require(path.isAbsolute(file) ? file : path.join('..', file.includes('/') ? '' : dir, file));
 const Parser = {
     config: 'default',
     i18n: undefined,
@@ -20,7 +19,7 @@ const Parser = {
     /** @implements */
     getConfig() {
         if (typeof this.config === 'string') {
-            this.config = rootRequire(this.config, 'config/');
+            this.config = rootRequire(this.config, 'config');
             return this.getConfig();
         }
         return {
@@ -31,7 +30,7 @@ const Parser = {
     /** @implements */
     msg(msg, arg = '') {
         if (typeof this.i18n === 'string') {
-            this.i18n = rootRequire(this.i18n, 'i18n/');
+            this.i18n = rootRequire(this.i18n, 'i18n');
             return this.msg(msg, arg);
         }
         return msg && (this.i18n?.[msg] ?? msg).replace('$1', this.msg(arg));

package/dist/lib/element.js

@@ -158,8 +158,8 @@ class AstElement extends node_1.AstNode {
         return data;
     }
     /** @private */
-    toString(separator = '') {
-        return this.childNodes.map(String).join(separator);
+    toString(skip, separator = '') {
+        return this.childNodes.map(child => child.toString(skip)).join(separator);
     }
     /** @private */
     lint(start = this.getAbsoluteIndex(), re) {

package/dist/lib/node.d.ts

@@ -18,9 +18,9 @@ export declare abstract class AstNode implements AstNodeBase {
     #private;
     data?: string | undefined;
     readonly childNodes: readonly AstNodes[];
-    /** 节点类型 */
     abstract get type(): TokenTypes | 'text';
     abstract set type(value: TokenTypes | 'text');
+    /** 可见部分 */
     text(): string;
     lint(): LintError[];
     /** 首位子节点 */
@@ -51,4 +51,9 @@ export declare abstract class AstNode implements AstNodeBase {
     getRelativeIndex(j?: number): number;
     /** 获取当前节点的绝对位置 */
     getAbsoluteIndex(): number;
+    /**
+     * 是否是某种类型的节点
+     * @param type 节点类型
+     */
+    is<T extends Token>(type: string): this is T;
 }

package/dist/lib/node.js

@@ -114,5 +114,12 @@ class AstNode {
             configurable: true,
         });
     }
+    /**
+     * 是否是某种类型的节点
+     * @param type 节点类型
+     */
+    is(type) {
+        return this.type === type;
+    }
 }
 exports.AstNode = AstNode;

package/dist/lib/text.d.ts

@@ -8,8 +8,6 @@ export declare class AstText extends AstNode {
     get type(): 'text';
     /** @param text 包含文本 */
     constructor(text: string);
-    /** 可见部分 */
-    text(): string;
     /**
      * 替换字符串
      * @param text 替换的字符串

package/dist/lib/text.js

@@ -63,12 +63,15 @@ class AstText extends node_1.AstNode {
     toString() {
         return this.data;
     }
-    /** 可见部分 */
+    /** @private */
     text() {
         return this.data;
     }
     /** @private */
     lint(start = this.getAbsoluteIndex(), errorRegex) {
+        if (errorRegex === false) {
+            return [];
+        }
         const { data, parentNode, nextSibling, previousSibling } = this;
         if (!parentNode) {
             throw new Error('An isolated text node cannot be linted!');
@@ -108,9 +111,7 @@ class AstText extends node_1.AstNode {
                 || char === '['
                     && type === 'ext-link-text'
                     && (/&(?:rbrack|#93|#x5[Dd];);/u.test(data.slice(index + 1))
-                        || nextType === 'ext'
-                            && nextName === 'nowiki'
-                            && nextSibling.innerText?.includes(']'))) {
+                        || nextSibling?.is('ext') && nextName === 'nowiki' && nextSibling.innerText?.includes(']'))) {
                 continue;
             }
             else if (char === ']' && (index || length > 1)) {

package/dist/mixin/hidden.d.ts

@@ -1,6 +1,7 @@
 /**
  * 解析后不可见的类
  * @param linter 是否覆写 lint 方法
+ * @param html 是否覆写 toHtml 方法
  * @param constructor 基类
  * @param _ context
  */

package/dist/mixin/hidden.js

@@ -5,17 +5,17 @@ const debug_1 = require("../util/debug");
 /**
  * 解析后不可见的类
  * @param linter 是否覆写 lint 方法
+ * @param html 是否覆写 toHtml 方法
  * @param constructor 基类
  * @param _ context
  */
-const hiddenToken = (linter) => (constructor, _) => {
+const hiddenToken = (linter = true, html = true) => (constructor, _) => {
     /** 解析后不可见的类 */
     class AnyHiddenToken extends constructor {
         /** 没有可见部分 */
         text() {
             return '';
         }
-        /** @private */
         lint(start) {
             // @ts-expect-error private argument
             return linter ? [] : super.lint(start);

package/dist/parser/list.js

@@ -10,18 +10,20 @@ const dd_1 = require("../src/nowiki/dd");
  * @param accum
  */
 const parseList = (wikitext, config, accum) => {
-    const mt = /^((?:\0\d+c\x7F)*)([;:*#]+)/u.exec(wikitext);
+    const mt = /^((?:\0\d+c\x7F)*)([;:*#]+\s*)/u.exec(wikitext);
     if (!mt) {
         return wikitext;
     }
-    const [total, comment, prefix] = mt;
-    let text = `${comment}\0${accum.length}d\x7F${wikitext.slice(total.length)}`, dt = prefix.split(';').length - 1;
-    // @ts-expect-error abstract class
-    new list_1.ListToken(prefix, config, accum);
+    const [total, comment, prefix] = mt, parts = prefix.split(/(?=;)/u);
+    let text = comment + parts.map((_, i) => `\0${accum.length + i}d\x7F`).join('') + wikitext.slice(total.length), dt = parts.length - (parts[0].startsWith(';') ? 0 : 1);
+    for (const part of parts) {
+        // @ts-expect-error abstract class
+        new list_1.ListToken(part, config, accum);
+    }
     if (!dt) {
         return text;
     }
-    const { html: [normalTags] } = config, fullRegex = /:+|-\{|\0\d+[xq]\x7F/gu;
+    const { html: [normalTags] } = config, fullRegex = /:+\s*|-\{|\0\d+[xq]\x7F/gu;
     let regex = fullRegex, ex = regex.exec(text), lt = 0, lb = false, li = false, lc = 0;
     /**
      * 创建`DdToken`

package/dist/parser/table.js

@@ -67,8 +67,8 @@ const parseTable = ({ firstChild: { data }, type, name }, config, accum) => {
             out += `\n${outLine}`;
             continue;
         }
-        // eslint-disable-next-line @stylistic/operator-linebreak
-        const matches = /^(?:(\|\}|\0\d+!\x7F\}|\0\d+\}\x7F)|(\|-+|\0\d+!\x7F-+|\0\d+-\x7F-*)(?!-)|(!|(?:\||\0\d+!\x7F)\+?))(.*)$/u
+        const matches = // eslint-disable-line @stylistic/operator-linebreak
+         /^(?:(\|\}|\0\d+!\x7F\}|\0\d+\}\x7F)|(\|-+|\0\d+!\x7F-+|\0\d+-\x7F-*)(?!-)|(!|(?:\||\0\d+!\x7F)\+?))(.*)$/u
             .exec(line);
         if (!matches) {
             push(`\n${outLine}`, top);

package/dist/src/arg.js

@@ -41,8 +41,8 @@ class ArgToken extends index_2.Token {
         }
     }
     /** @private */
-    toString() {
-        return `{{{${super.toString('|')}}}}`;
+    toString(skip) {
+        return `{{{${super.toString(skip, '|')}}}}`;
     }
     /** @private */
     text() {

package/dist/src/attribute.js

@@ -60,7 +60,6 @@ const commonHtmlAttrs = new Set([
     img: new Set(['alt', 'src', 'width', 'height', 'srcset']),
     font: new Set(['size', 'color', 'face']),
     hr: widthAttrs,
-    rt: new Set(['rbspan']),
     data: new Set(['value']),
     time: new Set(['datetime']),
     meta: new Set(['itemprop', 'content']),
@@ -194,23 +193,15 @@ class AttributeToken extends index_2.Token {
      * @param quotes 引号
      */
     constructor(type, tag, key, equal = '', value, quotes = [], config = index_1.default.getConfig(), accum = []) {
-        const keyToken = new atom_1.AtomToken(key, 'attr-key', config, accum, {});
+        const keyToken = new atom_1.AtomToken(key, 'attr-key', config, accum);
         let valueToken;
         if (key === 'title' || tag === 'img' && key === 'alt') {
             valueToken = new index_2.Token(value, config, accum, {});
             valueToken.type = 'attr-value';
             valueToken.setAttribute('stage', constants_1.MAX_STAGE - 1);
         }
-        else if (tag === 'gallery' && key === 'caption') {
-            const newConfig = {
-                ...config,
-                excludes: [...config.excludes, 'quote', 'extLink', 'magicLink', 'list'],
-            };
-            valueToken = new index_2.Token(value, newConfig, accum, {});
-            valueToken.type = 'attr-value';
-            valueToken.setAttribute('stage', 5);
-        }
-        else if (tag === 'choose' && (key === 'before' || key === 'after')) {
+        else if (tag === 'gallery' && key === 'caption'
+            || tag === 'choose' && (key === 'before' || key === 'after')) {
             const newConfig = {
                 ...config,
                 excludes: [...config.excludes, 'heading', 'html', 'table', 'hr', 'list'],
@@ -238,13 +229,13 @@ class AttributeToken extends index_2.Token {
         if (this.parentNode) {
             this.#tag = this.parentNode.name;
         }
-        this.setAttribute('name', this.firstChild.text().trim().toLowerCase());
+        this.setAttribute('name', this.firstChild.toString(true).trim().toLowerCase());
         super.afterBuild();
     }
     /** @private */
-    toString() {
+    toString(skip) {
         const [quoteStart = '', quoteEnd = ''] = this.#quotes;
-        return this.#equal ? super.toString(this.#equal + quoteStart) + quoteEnd : this.firstChild.toString();
+        return this.#equal ? super.toString(skip, this.#equal + quoteStart) + quoteEnd : this.firstChild.toString(skip);
     }
     /** @private */
     text() {
@@ -292,7 +283,7 @@ class AttributeToken extends index_2.Token {
         else if (name === 'style' && typeof value === 'string' && insecureStyle.test(value)) {
             errors.push((0, lint_1.generateForChild)(lastChild, rect, 'insecure-style', 'insecure style'));
         }
-        else if (name === 'tabindex' && typeof value === 'string' && value.trim() !== '0') {
+        else if (name === 'tabindex' && typeof value === 'string' && value !== '0') {
             const e = (0, lint_1.generateForChild)(lastChild, rect, 'illegal-attr', 'nonzero tabindex');
             e.suggestions = [
                 {
@@ -312,14 +303,7 @@ class AttributeToken extends index_2.Token {
     }
     /** 获取属性值 */
     getValue() {
-        if (this.#equal) {
-            const value = this.lastChild.text();
-            if (this.#quotes[1]) {
-                return value;
-            }
-            return value[this.#quotes[0] ? 'trimEnd' : 'trim']();
-        }
-        return this.type === 'ext-attr' || '';
+        return this.#equal ? this.lastChild.text().trim() : this.type === 'ext-attr' || '';
     }
 }
 exports.AttributeToken = AttributeToken;

package/dist/src/attributes.js

@@ -123,7 +123,7 @@ class AttributesToken extends index_2.Token {
                     duplicated.add(name);
                     attrs.get(name).push(attr);
                 }
-                else if (name !== 'class') {
+                else {
                     attrs.set(name, [attr]);
                 }
             }

package/dist/src/converter.d.ts

@@ -7,7 +7,7 @@ import { ConverterRuleToken } from './converterRule';
  * @classdesc `{childNodes: [ConverterFlagsToken, ...ConverterRuleToken]}`
  */
 export declare abstract class ConverterToken extends Token {
-    readonly childNodes: readonly [ConverterFlagsToken, ...ConverterRuleToken[]];
+    readonly childNodes: readonly [ConverterFlagsToken, ConverterRuleToken, ...ConverterRuleToken[]];
     abstract get firstChild(): ConverterFlagsToken;
     abstract get lastChild(): ConverterFlagsToken | ConverterRuleToken;
     get type(): 'converter';

package/dist/src/converter.js

@@ -25,7 +25,8 @@ class ConverterToken extends index_2.Token {
         const [firstRule] = rules, hasColon = firstRule.includes(':'), 
         // @ts-expect-error abstract class
         firstRuleToken = new converterRule_1.ConverterRuleToken(firstRule, hasColon, config, accum);
-        if (hasColon && firstRuleToken.length === 1) {
+        if (hasColon && firstRuleToken.length === 1
+            || !hasColon && rules.length === 2 && !(0, string_1.removeComment)(rules[1]).trim()) {
             // @ts-expect-error abstract class
             this.insertAt(new converterRule_1.ConverterRuleToken(rules.join(';'), false, config, accum));
         }
@@ -36,9 +37,9 @@ class ConverterToken extends index_2.Token {
         }
     }
     /** @private */
-    toString() {
+    toString(skip) {
         const { childNodes: [flags, ...rules] } = this;
-        return `-{${flags.toString()}${flags.length > 0 ? '|' : ''}${rules.map(String).join(';')}}-`;
+        return `-{${flags.toString(skip)}${flags.length > 0 ? '|' : ''}${rules.map(rule => rule.toString(skip)).join(';')}}-`;
     }
     /** @private */
     text() {

package/dist/src/converterFlags.js

@@ -27,8 +27,8 @@ class ConverterFlagsToken extends index_2.Token {
         super.afterBuild();
     }
     /** @private */
-    toString() {
-        return super.toString(';');
+    toString(skip) {
+        return super.toString(skip, ';');
     }
     /** @private */
     text() {

package/dist/src/converterRule.js

@@ -31,22 +31,18 @@ class ConverterRuleToken extends index_2.Token {
         }
     }
     /** @private */
-    toString() {
-        const { childNodes } = this;
-        if (childNodes.length === 3) {
-            const [from, variant, to] = childNodes;
-            return `${from.toString()}=>${variant.toString()}:${to.toString()}`;
-        }
-        return super.toString(':');
+    toString(skip) {
+        const { childNodes, firstChild, lastChild } = this;
+        return childNodes.length === 3
+            ? `${firstChild.toString(skip)}=>${childNodes[1].toString(skip)}:${lastChild.toString(skip)}`
+            : super.toString(skip, ':');
     }
     /** @private */
     text() {
-        const { childNodes } = this;
-        if (childNodes.length === 3) {
-            const [from, variant, to] = childNodes;
-            return `${from.text()}=>${variant.text()}:${to.text()}`;
-        }
-        return super.text(':');
+        const { childNodes, firstChild, lastChild } = this;
+        return childNodes.length === 3
+            ? `${firstChild.text()}=>${childNodes[1].text()}:${lastChild.text()}`
+            : super.text(':');
     }
     /** @private */
     getGaps(i) {

package/dist/src/extLink.js

@@ -36,11 +36,11 @@ class ExtLinkToken extends index_2.Token {
         }
     }
     /** @private */
-    toString() {
+    toString(skip) {
         if (this.length === 1) {
-            return `[${super.toString()}${this.#space}]`;
+            return `[${super.toString(skip)}${this.#space}]`;
         }
-        return `[${super.toString(this.#space)}]`;
+        return `[${super.toString(skip, this.#space)}]`;
     }
     /** @private */
     text() {

package/dist/src/gallery.js

@@ -42,8 +42,8 @@ class GalleryToken extends index_2.Token {
         return this.normalizeTitle(file, 6, true, true).valid;
     }
     /** @private */
-    toString() {
-        return super.toString('\n');
+    toString(skip) {
+        return super.toString(skip, '\n');
     }
     /** @private */
     text() {

package/dist/src/heading.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.HeadingToken = void 0;
 const lint_1 = require("../util/lint");
 const rect_1 = require("../lib/rect");
+const debug_1 = require("../util/debug");
 const index_1 = require("../index");
 const index_2 = require("./index");
 const syntax_1 = require("./syntax");
@@ -37,9 +38,9 @@ class HeadingToken extends index_2.Token {
         this.append(token, trail);
     }
     /** @private */
-    toString() {
+    toString(skip) {
         const equals = this.#equals;
-        return equals + this.firstChild.toString() + equals + this.lastChild.toString();
+        return equals + this.firstChild.toString(skip) + equals + this.lastChild.toString(skip);
     }
     /** @private */
     text() {
@@ -56,7 +57,7 @@ class HeadingToken extends index_2.Token {
     }
     /** @private */
     lint(start = this.getAbsoluteIndex(), re) {
-        const errors = super.lint(start, re), { firstChild, level } = this, innerStr = firstChild.toString(), quotes = firstChild.childNodes.filter((node) => node.type === 'quote'), boldQuotes = quotes.filter(({ bold }) => bold), italicQuotes = quotes.filter(({ italic }) => italic), rect = new rect_1.BoundingRect(this, start);
+        const errors = super.lint(start, re), { firstChild, level } = this, innerStr = firstChild.toString(), quotes = firstChild.childNodes.filter((0, debug_1.isToken)('quote')), boldQuotes = quotes.filter(({ bold }) => bold), italicQuotes = quotes.filter(({ italic }) => italic), rect = new rect_1.BoundingRect(this, start);
         if (this.level === 1) {
             errors.push((0, lint_1.generateForChild)(firstChild, rect, 'h1', '<h1>'));
         }

package/dist/src/hidden.js

@@ -39,7 +39,7 @@ const hidden_1 = require("../mixin/hidden");
 const index_1 = require("./index");
 /** 不可见的节点 */
 let HiddenToken = (() => {
-    let _classDecorators = [(0, hidden_1.hiddenToken)(true)];
+    let _classDecorators = [(0, hidden_1.hiddenToken)()];
     let _classDescriptor;
     let _classExtraInitializers = [];
     let _classThis;

package/dist/src/html.js

@@ -66,8 +66,8 @@ class HtmlToken extends index_1.Token {
         this.#tag = name;
     }
     /** @private */
-    toString() {
-        return `<${this.closing ? '/' : ''}${this.#tag}${super.toString()}${this.#selfClosing ? '/' : ''}>`;
+    toString(skip) {
+        return `<${this.closing ? '/' : ''}${this.#tag}${super.toString(skip)}${this.#selfClosing ? '/' : ''}>`;
     }
     /** @private */
     text() {

package/dist/src/imageParameter.js

@@ -86,8 +86,8 @@ class ImageParameterToken extends index_2.Token {
         super.afterBuild();
     }
     /** @private */
-    toString() {
-        return this.#syntax ? this.#syntax.replace('$1', super.toString()) : super.toString();
+    toString(skip) {
+        return this.#syntax ? this.#syntax.replace('$1', super.toString(skip)) : super.toString(skip);
     }
     /** @private */
     text() {

package/dist/src/imagemap.js

@@ -77,8 +77,8 @@ class ImagemapToken extends index_2.Token {
         }
     }
     /** @private */
-    toString() {
-        return super.toString('\n');
+    toString(skip) {
+        return super.toString(skip, '\n');
     }
     /** @private */
     text() {

package/dist/src/index.js

@@ -80,7 +80,7 @@ class Token extends element_1.AstElement {
     }
     /** @private */
     parseOnce(n = this.#stage, include = false) {
-        if (n < this.#stage || !this.getAttribute('plain') || this.length === 0) {
+        if (n < this.#stage || this.length === 0 || !this.getAttribute('plain')) {
             return this;
         }
         else if (this.#stage >= constants_1.MAX_STAGE) {
@@ -89,7 +89,7 @@ class Token extends element_1.AstElement {
         switch (n) {
             case 0:
                 if (this.type === 'root') {
-                    this.#accum.shift();
+                    this.#accum.pop();
                     const isRedirect = this.#parseRedirect();
                     include &&= !isRedirect;
                 }
@@ -129,7 +129,7 @@ class Token extends element_1.AstElement {
         }
         if (this.type === 'root') {
             for (const token of this.#accum) {
-                token.parseOnce(n, include);
+                token?.parseOnce(n, include); // eslint-disable-line @typescript-eslint/no-unnecessary-condition
             }
         }
         this.#stage++;
@@ -163,7 +163,7 @@ class Token extends element_1.AstElement {
             this.normalize();
             if (this.type === 'root') {
                 for (const token of this.#accum) {
-                    token.build();
+                    token?.build(); // eslint-disable-line @typescript-eslint/no-unnecessary-condition
                 }
             }
         }
@@ -172,7 +172,7 @@ class Token extends element_1.AstElement {
     afterBuild() {
         if (this.type === 'root') {
             for (const token of this.#accum) {
-                token.afterBuild();
+                token?.afterBuild(); // eslint-disable-line @typescript-eslint/no-unnecessary-condition
             }
         }
         this.#built = true;
@@ -401,14 +401,15 @@ class Token extends element_1.AstElement {
         return errors;
     }
     /** @private */
-    toString(separator) {
+    toString(skip, separator) {
         const { rev } = debug_1.Shadow, root = this.getRootNode();
-        if (root.type === 'root'
+        if (!skip
+            && root.type === 'root'
             && root.#built) {
-            this.#string ??= [rev, super.toString(separator)];
+            this.#string ??= [rev, super.toString(false, separator)];
             return this.#string[1];
         }
-        return super.toString(separator);
+        return super.toString(skip, separator);
     }
 }
 exports.Token = Token;

package/dist/src/link/base.js

@@ -7,6 +7,11 @@ const constants_1 = require("../../util/constants");
 const index_1 = require("../../index");
 const index_2 = require("../index");
 const atom_1 = require("../atom");
+/**
+ * 是否为普通内链
+ * @param type 节点类型
+ */
+const isLink = (type) => type === 'redirect-target' || type === 'link';
 /**
  * 内链
  * @classdesc `{childNodes: [AtomToken, ...Token]}`
@@ -53,8 +58,8 @@ class LinkBaseToken extends index_2.Token {
         }
     }
     /** @private */
-    toString() {
-        const str = super.toString(this.#delimiter);
+    toString(skip) {
+        const str = super.toString(skip, this.#delimiter);
         return this.#bracket ? `[[${str}]]` : str;
     }
     /** @private */
@@ -75,14 +80,14 @@ class LinkBaseToken extends index_2.Token {
     }
     /** @private */
     lint(start = this.getAbsoluteIndex(), re) {
-        const errors = super.lint(start, re), { childNodes: [target, linkText], type: linkType } = this, { encoded, fragment } = this.#title, rect = new rect_1.BoundingRect(this, start);
-        if (target.childNodes.some(({ type }) => type === 'template')) {
+        const errors = super.lint(start, re), { childNodes: [target, linkText], type } = this, { encoded, fragment } = this.#title, rect = new rect_1.BoundingRect(this, start);
+        if (target.childNodes.some(({ type: t }) => t === 'template')) {
             errors.push((0, lint_1.generateForChild)(target, rect, 'unknown-page', 'template in an internal link target', 'warning'));
         }
         if (encoded) {
             errors.push((0, lint_1.generateForChild)(target, rect, 'url-encoding', 'unnecessary URL encoding in an internal link'));
         }
-        if (linkType === 'link' || linkType === 'category') {
+        if (type === 'link' || type === 'category') {
             const textNode = linkText?.childNodes.find((c) => c.type === 'text' && c.data.includes('|'));
             if (textNode) {
                 const e = (0, lint_1.generateForChild)(linkText, rect, 'pipe-like', 'additional "|" in the link text', 'warning');
@@ -99,7 +104,7 @@ class LinkBaseToken extends index_2.Token {
                 errors.push(e);
             }
         }
-        if (linkType !== 'link' && linkType !== 'redirect-target' && fragment !== undefined) {
+        if (fragment !== undefined && !isLink(type)) {
             const e = (0, lint_1.generateForChild)(target, rect, 'no-ignored', 'useless fragment'), textNode = target.childNodes.find((c) => c.type === 'text' && c.data.includes('#'));
             if (textNode) {
                 e.fix = {
@@ -113,7 +118,7 @@ class LinkBaseToken extends index_2.Token {
     }
     /** @private */
     getTitle(halfParsed) {
-        return this.normalizeTitle(this.firstChild.text(), 0, halfParsed, true, true);
+        return this.normalizeTitle(this.firstChild.toString(true), 0, halfParsed, true, true);
     }
 }
 exports.LinkBaseToken = LinkBaseToken;

package/dist/src/link/file.js

@@ -57,7 +57,7 @@ class FileToken extends base_1.LinkBaseToken {
         const { extension } = this.getTitle(true);
         this.append(...explode('-{', '}-', '|', text).map(
         // @ts-expect-error abstract class
-        part => new imageParameter_1.ImageParameterToken(part, extension, config, accum)));
+        (part) => new imageParameter_1.ImageParameterToken(part, extension, config, accum)));
     }
     /** @private */
     lint(start = this.getAbsoluteIndex(), re) {

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

@@ -6,7 +6,7 @@ import type { Title } from '../../lib/title';
 import type { Token, AtomToken } from '../../internal';
 /**
  * 重定向目标
- * @classdesc `{childNodes: [AtomToken, ?Token]}`
+ * @classdesc `{childNodes: [AtomToken, ?NoincludeToken]}`
  */
 export declare abstract class RedirectTargetToken extends LinkBaseToken {
     readonly childNodes: readonly [AtomToken] | readonly [AtomToken, NoincludeToken];

package/dist/src/link/redirectTarget.js

@@ -7,7 +7,7 @@ const base_1 = require("./base");
 const noinclude_1 = require("../nowiki/noinclude");
 /**
  * 重定向目标
- * @classdesc `{childNodes: [AtomToken, ?Token]}`
+ * @classdesc `{childNodes: [AtomToken, ?NoincludeToken]}`
  */
 class RedirectTargetToken extends base_1.LinkBaseToken {
     get type() {
@@ -30,12 +30,8 @@ class RedirectTargetToken extends base_1.LinkBaseToken {
         return this.normalizeTitle(this.firstChild.toString(), 0, true, true);
     }
     /** @private */
-    text() {
-        return `[[${this.firstChild.toString()}]]`;
-    }
-    /** @private */
     lint(start = this.getAbsoluteIndex()) {
-        const errors = super.lint(start, /\]\]/u);
+        const errors = super.lint(start, false);
         if (this.length === 2) {
             const e = (0, lint_1.generateForChild)(this.lastChild, { start }, 'no-ignored', 'useless link text');
             e.startIndex--;

package/dist/src/magicLink.d.ts

@@ -13,6 +13,8 @@ export declare abstract class MagicLinkToken extends Token {
     abstract get firstChild(): AstText | TranscludeToken;
     abstract get lastChild(): AstText | CommentToken | IncludeToken | NoincludeToken | TranscludeToken;
     get type(): ExtLinkTypes;
+    /** 链接显示文字 */
+    get innerText(): string;
     /** 和内链保持一致 */
     get link(): string;
     /**

package/dist/src/magicLink.js

@@ -16,21 +16,26 @@ class MagicLinkToken extends index_2.Token {
     get type() {
         return this.#type;
     }
-    /** 和内链保持一致 */
-    get link() {
-        const map = { '!': '|', '=': '=' };
+    /** 链接显示文字 */
+    get innerText() {
+        const map = new Map([['!', '|'], ['=', '=']]);
         let link = (0, string_1.text)(this.childNodes.map(child => {
-            const { type, name } = child;
-            return type === 'magic-word' && String(name) in map ? map[name] : child;
+            const { type } = child, name = String(child.name);
+            return type === 'magic-word' && map.has(name) ? map.get(name) : child;
         }));
         if (this.type === 'magic-link') {
             link = link.replace(spaceRegex, ' ');
-            if (link.startsWith('ISBN')) {
-                link = `ISBN ${link.slice(5).replace(/[- ]/gu, '').replace(/x$/u, 'X')}`;
-            }
         }
         return link;
     }
+    /** 和内链保持一致 */
+    get link() {
+        let { innerText } = this;
+        if (this.type === 'magic-link' && innerText.startsWith('ISBN')) {
+            innerText = `ISBN ${innerText.slice(5).replace(/[- ]/gu, '').replace(/x$/u, 'X')}`;
+        }
+        return innerText;
+    }
     /**
      * @param url 网址
      * @param type 类型
@@ -55,51 +60,30 @@ class MagicLinkToken extends index_2.Token {
             }
             return errors;
         }
-        const pipe = this.type === 'ext-link-url', source = pipe ? String.raw `\|+` : '[，；。：！？（）]+', regex = new RegExp(source, 'u'), regexGlobal = new RegExp(source, 'gu');
-        for (const child of this.childNodes) {
-            const { type, data } = child;
-            if (type !== 'text' || !regex.test(data)) {
-                continue;
-            }
-            const refError = (0, lint_1.generateForChild)(child, rect, 'unterminated-url', '', 'warning');
-            regexGlobal.lastIndex = 0;
-            for (let mt = regexGlobal.exec(data); mt; mt = regexGlobal.exec(data)) {
-                const { index, 0: s } = mt, lines = data.slice(0, index).split('\n'), top = lines.length, left = lines[top - 1].length, startIndex = refError.startIndex + index, startLine = refError.startLine + top - 1, startCol = top === 1 ? refError.startCol + left : left;
-                const e = {
-                    ...refError,
-                    message: index_1.default.msg('$1 in URL', pipe ? '"|"' : 'full-width punctuation'),
-                    startIndex,
-                    endIndex: startIndex + s.length,
-                    startLine,
-                    endLine: startLine,
-                    startCol,
-                    endCol: startCol + s.length,
-                };
-                if (!pipe) {
-                    e.suggestions = [
-                        {
-                            desc: 'whitespace',
-                            range: [startIndex, startIndex],
-                            text: ' ',
-                        },
-                        {
-                            desc: 'escape',
-                            range: [startIndex, e.endIndex],
-                            text: encodeURI(s),
-                        },
-                    ];
-                }
-                else if (s.length === 1) {
-                    e.suggestions = [
-                        {
-                            desc: 'whitespace',
-                            range: [startIndex, startIndex + 1],
-                            text: ' ',
-                        },
-                    ];
-                }
-                errors.push(e);
-            }
+        const pipe = this.type === 'ext-link-url', regex = pipe ? /\|/u : /[，；。：！？（）]+/u, child = this.childNodes.find((c) => c.type === 'text' && regex.test(c.data));
+        if (child) {
+            const { data } = child, e = (0, lint_1.generateForChild)(child, rect, 'unterminated-url', index_1.default.msg('$1 in URL', pipe ? '"|"' : 'full-width punctuation'), 'warning'), { index, 0: s } = regex.exec(data), i = e.startIndex + index;
+            e.suggestions = pipe
+                ? [
+                    {
+                        desc: 'whitespace',
+                        range: [i, i + 1],
+                        text: ' ',
+                    },
+                ]
+                : [
+                    {
+                        desc: 'whitespace',
+                        range: [i, i],
+                        text: ' ',
+                    },
+                    {
+                        desc: 'escape',
+                        range: [i, i + s.length],
+                        text: encodeURI(s),
+                    },
+                ];
+            errors.push(e);
         }
         return errors;
     }

package/dist/src/nowiki/comment.js

@@ -41,7 +41,7 @@ const index_1 = require("../../index");
 const base_1 = require("./base");
 /** HTML注释，不可见 */
 let CommentToken = (() => {
-    let _classDecorators = [(0, hidden_1.hiddenToken)()];
+    let _classDecorators = [(0, hidden_1.hiddenToken)(false)];
     let _classDescriptor;
     let _classExtraInitializers = [];
     let _classThis;
@@ -81,8 +81,8 @@ let CommentToken = (() => {
             return [e];
         }
         /** @private */
-        toString() {
-            return `<!--${this.innerText}${this.closed ? '-->' : ''}`;
+        toString(skip) {
+            return skip ? '' : `<!--${this.innerText}${this.closed ? '-->' : ''}`;
         }
     };
     return CommentToken = _classThis;

package/dist/src/nowiki/doubleUnderscore.js

@@ -39,7 +39,7 @@ const hidden_1 = require("../../mixin/hidden");
 const base_1 = require("./base");
 /** 状态开关 */
 let DoubleUnderscoreToken = (() => {
-    let _classDecorators = [(0, hidden_1.hiddenToken)(true)];
+    let _classDecorators = [(0, hidden_1.hiddenToken)()];
     let _classDescriptor;
     let _classExtraInitializers = [];
     let _classThis;

package/dist/src/nowiki/noinclude.js

@@ -39,7 +39,7 @@ const hidden_1 = require("../../mixin/hidden");
 const base_1 = require("./base");
 /** `<noinclude>`和`</noinclude>`，不可进行任何更改 */
 let NoincludeToken = (() => {
-    let _classDecorators = [(0, hidden_1.hiddenToken)(true)];
+    let _classDecorators = [(0, hidden_1.hiddenToken)()];
     let _classDescriptor;
     let _classExtraInitializers = [];
     let _classThis;
@@ -56,6 +56,10 @@ let NoincludeToken = (() => {
         get type() {
             return 'noinclude';
         }
+        /** @private */
+        toString(skip) {
+            return skip ? '' : super.toString();
+        }
     };
     return NoincludeToken = _classThis;
 })();

package/dist/src/onlyinclude.js

@@ -11,8 +11,8 @@ class OnlyincludeToken extends index_1.Token {
         return 'onlyinclude';
     }
     /** @private */
-    toString() {
-        return `<onlyinclude>${super.toString()}</onlyinclude>`;
+    toString(skip) {
+        return `<onlyinclude>${super.toString(skip)}</onlyinclude>`;
     }
     /** @private */
     getAttribute(key) {

package/dist/src/paramTag/index.js

@@ -23,8 +23,8 @@ class ParamTagToken extends index_2.Token {
         }
     }
     /** @private */
-    toString() {
-        return super.toString('\n');
+    toString(skip) {
+        return super.toString(skip, '\n');
     }
     /** @private */
     text() {

package/dist/src/parameter.js

@@ -5,11 +5,6 @@ const string_1 = require("../util/string");
 const lint_1 = require("../util/lint");
 const index_1 = require("../index");
 const index_2 = require("./index");
-/**
- * 准确获取参数名
- * @param name 预定的参数名
- */
-const getName = (name) => name.text().replace(/^[ \t\n\0\v]+|([^ \t\n\0\v])[ \t\n\0\v]+$/gu, '$1');
 const linkRegex = new RegExp(`https?://${string_1.extUrlCharFirst}${string_1.extUrlChar}$`, 'iu');
 /**
  * 模板或魔术字参数
@@ -31,15 +26,22 @@ class ParameterToken extends index_2.Token {
         super(undefined, config, accum);
         const keyToken = new index_2.Token(typeof key === 'number' ? undefined : key, config, accum, {}), token = new index_2.Token(value, config, accum);
         keyToken.type = 'parameter-key';
+        keyToken.setAttribute('stage', 2);
         token.type = 'parameter-value';
         token.setAttribute('stage', 2);
         this.append(keyToken, token);
     }
     /** @private */
+    trimName(name, set = true) {
+        const trimmed = (typeof name === 'string' ? name : name.toString(true))
+            .replace(/^[ \t\n\0\v]+|([^ \t\n\0\v])[ \t\n\0\v]+$/gu, '$1');
+        this.setAttribute('name', trimmed);
+        return trimmed;
+    }
+    /** @private */
     afterBuild() {
         if (!this.anon) {
-            const { parentNode, firstChild } = this, name = getName(firstChild);
-            this.setAttribute('name', name);
+            const { parentNode, firstChild } = this, name = this.trimName(firstChild);
             if (parentNode) {
                 parentNode.getArgs(name, false, false).add(this);
             }
@@ -47,8 +49,8 @@ class ParameterToken extends index_2.Token {
         super.afterBuild();
     }
     /** @private */
-    toString() {
-        return this.anon ? this.lastChild.toString() : super.toString('=');
+    toString(skip) {
+        return this.anon ? this.lastChild.toString(skip) : super.toString(skip, '=');
     }
     text() {
         return this.anon ? this.lastChild.text() : super.text('=');

package/dist/src/redirect.js

@@ -45,7 +45,7 @@ const redirectTarget_1 = require("./link/redirectTarget");
  * @classdesc `{childNodes: [SyntaxToken, LinkToken]}`
  */
 let RedirectToken = (() => {
-    let _classDecorators = [(0, hidden_1.hiddenToken)()];
+    let _classDecorators = [(0, hidden_1.hiddenToken)(false, false)];
     let _classDescriptor;
     let _classExtraInitializers = [];
     let _classThis;
@@ -85,8 +85,8 @@ let RedirectToken = (() => {
             return key === 'padding' ? this.#pre.length : super.getAttribute(key);
         }
         /** @private */
-        toString() {
-            return this.#pre + super.toString() + this.#post;
+        toString(skip) {
+            return this.#pre + super.toString(skip) + this.#post;
         }
         /** @private */
         lint(start = this.getAbsoluteIndex()) {

package/dist/src/syntax.d.ts

@@ -1,5 +1,5 @@
 import { Token } from './index';
-import type { Config } from '../base';
+import type { Config, LintError } from '../base';
 declare type SyntaxTypes = 'heading-trail' | 'magic-word-name' | 'table-syntax' | 'redirect-syntax';
 /** 满足特定语法格式的plain Token */
 export declare class SyntaxToken extends Token {

package/dist/src/syntax.js

@@ -14,8 +14,8 @@ class SyntaxToken extends index_1.Token {
         this.#type = type;
     }
     /** @private */
-    lint() {
-        return [];
+    lint(start = this.getAbsoluteIndex()) {
+        return super.lint(start, false);
     }
 }
 exports.SyntaxToken = SyntaxToken;

package/dist/src/table/td.js

@@ -82,9 +82,9 @@ class TdToken extends base_1.TableBaseToken {
         super.afterBuild();
     }
     /** @private */
-    toString() {
+    toString(skip) {
         const { childNodes: [syntax, attr, inner] } = this;
-        return syntax.toString() + attr.toString() + this.#innerSyntax + inner.toString();
+        return syntax.toString(skip) + attr.toString(skip) + this.#innerSyntax + inner.toString(skip);
     }
     /** @private */
     text() {

package/dist/src/table/trBase.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TrBaseToken = void 0;
 const lint_1 = require("../../util/lint");
-const debug_1 = require("../../util/debug");
 const base_1 = require("./base");
 const td_1 = require("./td");
 /** 表格行或表格 */
@@ -13,13 +12,13 @@ class TrBaseToken extends base_1.TableBaseToken {
         if (!inter) {
             return errors;
         }
-        const first = inter.childNodes.find(child => child.text().trim()), tdPattern = /^\s*(?:!|\{\{\s*![!-]?\s*\}\})/u, isArg = (0, debug_1.isToken)('arg'), isTransclude = (0, debug_1.isToken)('magic-word');
+        const first = inter.childNodes.find(child => child.text().trim()), tdPattern = /^\s*(?:!|\{\{\s*![!-]?\s*\}\})/u;
         if (!first
             || tdPattern.test(first.toString())
-            || isArg(first) && tdPattern.test(first.default || '')) {
+            || first.is('arg') && tdPattern.test(first.default || '')) {
             return errors;
         }
-        else if (isTransclude(first)) {
+        else if (first.is('magic-word')) {
             try {
                 if (first.getPossibleValues().every(token => tdPattern.test(token.text()))) {
                     return errors;

package/dist/src/tagPair/include.js

@@ -44,7 +44,7 @@ const index_2 = require("./index");
  * @classdesc `{childNodes: [AstText, AstText]}`
  */
 let IncludeToken = (() => {
-    let _classDecorators = [(0, hidden_1.hiddenToken)()];
+    let _classDecorators = [(0, hidden_1.hiddenToken)(false)];
     let _classDescriptor;
     let _classExtraInitializers = [];
     let _classThis;
@@ -71,6 +71,10 @@ let IncludeToken = (() => {
             super(name, attr, inner ?? '', inner === undefined ? closed : closed ?? '', config, accum);
         }
         /** @private */
+        toString(skip) {
+            return skip ? '' : super.toString();
+        }
+        /** @private */
         lint(start = this.getAbsoluteIndex()) {
             if (this.closed) {
                 return [];

package/dist/src/tagPair/index.js

@@ -28,11 +28,11 @@ class TagPairToken extends index_1.Token {
         accum.splice(index === -1 ? Infinity : index, 0, this);
     }
     /** @private */
-    toString() {
+    toString(skip) {
         const { selfClosing, firstChild, lastChild, } = this, [opening, closing] = this.#tags;
         return selfClosing
-            ? `<${opening}${firstChild.toString()}/>`
-            : `<${opening}${firstChild.toString()}>${lastChild.toString()}${this.closed ? `</${closing}>` : ''}`;
+            ? `<${opening}${firstChild.toString(skip)}/>`
+            : `<${opening}${firstChild.toString(skip)}>${lastChild.toString(skip)}${this.closed ? `</${closing}>` : ''}`;
     }
     /** @private */
     text() {

package/dist/src/transclude.js

@@ -124,7 +124,7 @@ class TranscludeToken extends index_2.Token {
     /** 获取模板或模块名 */
     #getTitle() {
         const isTemplate = this.type === 'template', child = this.childNodes[isTemplate ? 0 : 1];
-        return this.normalizeTitle(child.text(), isTemplate ? 10 : 828);
+        return this.normalizeTitle(child.toString(true), isTemplate ? 10 : 828);
     }
     /** @private */
     afterBuild() {
@@ -134,10 +134,10 @@ class TranscludeToken extends index_2.Token {
         super.afterBuild();
     }
     /** @private */
-    toString() {
+    toString(skip) {
         return `{{${this.modifier}${this.type === 'magic-word'
-            ? `${this.firstChild.toString()}${this.length === 1 ? '' : ':'}${this.childNodes.slice(1).map(String).join('|')}`
-            : super.toString('|')}}}`;
+            ? `${this.firstChild.toString(skip)}${this.length === 1 ? '' : ':'}${this.childNodes.slice(1).map(child => child.toString(skip)).join('|')}`
+            : super.toString(skip, '|')}}}`;
     }
     /** @private */
     text() {
@@ -163,25 +163,26 @@ class TranscludeToken extends index_2.Token {
     }
     /** @private */
     lint(start = this.getAbsoluteIndex(), re) {
-        const errors = super.lint(start, re), { type, childNodes, length } = this, rect = new rect_1.BoundingRect(this, start);
+        const errors = super.lint(start, re);
         if (!this.isTemplate()) {
             return errors;
         }
-        const title = this.#getTitle();
-        if (title.fragment !== undefined) {
-            const child = childNodes[type === 'template' ? 0 : 1], e = (0, lint_1.generateForChild)(child, rect, 'no-ignored', 'useless fragment'), textNode = child.childNodes.find((c) => c.type === 'text' && c.data.includes('#'));
+        const { type, childNodes, length } = this, rect = new rect_1.BoundingRect(this, start), invoke = type === 'magic-word';
+        if (invoke && !this.#getTitle().valid) {
+            errors.push((0, lint_1.generateForChild)(childNodes[1], rect, 'invalid-invoke', 'illegal module name'));
+        }
+        else {
+            const child = childNodes[invoke ? 1 : 0], textNode = child.childNodes.find((c) => c.type === 'text' && c.data.includes('#'));
             if (textNode) {
+                const e = (0, lint_1.generateForChild)(child, rect, 'no-ignored', 'useless fragment');
                 e.fix = {
                     range: [e.startIndex + textNode.getRelativeIndex() + textNode.data.indexOf('#'), e.endIndex],
                     text: '',
                 };
+                errors.push(e);
             }
-            errors.push(e);
-        }
-        if (!title.valid) {
-            errors.push((0, lint_1.generateForChild)(childNodes[1], rect, 'invalid-invoke', 'illegal module name'));
         }
-        if (type === 'magic-word' && length === 2) {
+        if (invoke && length === 2) {
             errors.push((0, lint_1.generateForSelf)(this, rect, 'invalid-invoke', 'missing module function'));
             return errors;
         }

package/dist/util/lint.js

@@ -8,7 +8,7 @@ const index_1 = require("../index");
  * @param func lint函数
  */
 const factory = (func) => (token, rect, rule, msg, severity = 'error') => {
-    const { start } = rect, { top, left } = 'top' in rect ? rect : new rect_1.BoundingRect(token, start), { offsetHeight, offsetWidth } = token, { startIndex, startLine, startCol } = func(token, start, top, left);
+    const { start } = rect, { top, left } = rect instanceof rect_1.BoundingRect ? rect : new rect_1.BoundingRect(token, start), { offsetHeight, offsetWidth } = token, { startIndex, startLine, startCol } = func(token, start, top, left);
     return {
         rule,
         message: index_1.default.msg(msg),

package/errors/README

@@ -1 +1,3 @@
 这里记录解析失败时处于半解析状态的维基文本以及错误信息。
+
+When parsing fails, the half-parsed wikitext and the error message are recorded here.

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wikilint",
-	"version": "2.9.3",
+	"version": "2.10.0",
 	"description": "A Node.js linter for MediaWiki markup",
 	"keywords": [
 		"mediawiki",