wikilint 2.6.2 → 2.7.0

package/config/.schema.json

@@ -121,6 +121,14 @@
 				"pattern": "^[-a-z]+$"
 			}
 		},
+		"redirection": {
+			"description": "magic words for redirection",
+			"type": "array",
+			"items": {
+				"type": "string",
+				"pattern": "^#.+$"
+			}
+		},
 		"variants": {
 			"description": "variants for language conversion",
 			"type": "array",
@@ -166,6 +174,7 @@
 		"protocol",
 		"interwiki",
 		"img",
+		"redirection",
 		"variants"
 	],
 	"additionalProperties": false

package/config/default.json

@@ -832,6 +832,11 @@
 		"页数=$1": "page",
 		"$1页": "page"
 	},
+	"redirection": [
+		"#redirect",
+		"#重定向",
+		"#重新導向"
+	],
 	"variants": [
 		"zh",
 		"zh-hans",

package/config/enwiki.json

@@ -406,5 +406,8 @@
 		"page=$1": "page",
 		"page $1": "page"
 	},
+	"redirection": [
+		"#redirect"
+	],
 	"variants": []
 }

package/config/llwiki.json

@@ -583,6 +583,10 @@
 		"页数=$1": "page",
 		"$1页": "page"
 	},
+	"redirection": [
+		"#redirect",
+		"#重定向"
+	],
 	"variants": [
 		"zh",
 		"zh-hans",

package/config/minimum.json

@@ -132,5 +132,8 @@
 	"protocol": "bitcoin:|ftp://|ftps://|geo:|git://|gopher://|http://|https://|irc://|ircs://|magnet:|mailto:|matrix:|mms://|news:|nntp://|redis://|sftp://|sip:|sips:|sms:|ssh://|svn://|tel:|telnet://|urn:|worldwind://|xmpp:",
 	"interwiki": [],
 	"img": {},
+	"redirection": [
+		"#redirect"
+	],
 	"variants": []
 }

package/config/moegirl.json

@@ -676,6 +676,10 @@
 		"页数=$1": "page",
 		"$1页": "page"
 	},
+	"redirection": [
+		"#redirect",
+		"#重定向"
+	],
 	"variants": [
 		"zh",
 		"zh-hans",

package/config/zhwiki.json

@@ -790,6 +790,11 @@
 		"頁=$1": "page",
 		"$1頁": "page"
 	},
+	"redirection": [
+		"#redirect",
+		"#重定向",
+		"#重新導向"
+	],
 	"variants": [
 		"zh",
 		"zh-hans",

package/dist/base.d.ts

@@ -7,9 +7,11 @@ export interface Config {
     readonly doubleUnderscore: [string[], string[]];
     readonly protocol: string;
     readonly img: Record<string, string>;
+    readonly redirection: string[];
     readonly variants: string[];
     readonly excludes?: string[];
 }
+export type TokenTypes = 'root' | 'plain' | 'redirect' | 'redirect-syntax' | 'redirect-target' | '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 declare const rules: readonly ["bold-header", "format-leakage", "fostered-content", "h1", "illegal-attr", "insecure-style", "invalid-gallery", "invalid-imagemap", "invalid-invoke", "lonely-apos", "lonely-bracket", "lonely-http", "nested-link", "no-arg", "no-duplicate", "no-ignored", "obsolete-attr", "obsolete-tag", "parsing-order", "pipe-like", "table-layout", "tag-like", "unbalanced-header", "unclosed-comment", "unclosed-quote", "unclosed-table", "unescaped", "unknown-page", "unmatched-tag", "unterminated-url", "url-encoding", "var-anchor", "void-ext"];
 export declare namespace LintError {
     type Severity = 'error' | 'warning';
@@ -45,8 +47,8 @@ export interface AstNode {
 interface AstElement extends AstNode {
 }
 export interface Parser {
-    config: string | Config;
-    i18n: string | Record<string, string> | undefined;
+    config: Config | string;
+    i18n: Record<string, string> | string | undefined;
     /**
      * 解析wikitext
      * @param include 是否嵌入

package/dist/bin/cli.js

@@ -118,7 +118,7 @@ for (const file of files) {
         let start = Infinity;
         for (const { range: [from, to], text } of fixable) {
             if (to <= start) {
-                wikitext = `${wikitext.slice(0, from)}${text}${wikitext.slice(to)}`;
+                wikitext = wikitext.slice(0, from) + text + wikitext.slice(to);
                 start = from;
             }
         }

package/dist/index.d.ts

@@ -19,3 +19,6 @@ declare const Parser: Parser;
 export = Parser;
 export type { Config, LintError };
 export type * from './internal';
+declare global {
+	type Acceptable = unknown;
+}

package/dist/internal.d.ts

@@ -1,6 +1,8 @@
 export type { AstNodes, } from './lib/node';
 export type * from './lib/text';
-export type * from './src/index';
+export type { Token } from './src/index';
+export type * from './src/redirect';
+export type * from './src/link/redirectTarget';
 export type * from './src/onlyinclude';
 export type * from './src/nowiki/noinclude';
 export type * from './src/tagPair/include';

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 选择器
+     */
+    querySelector<T = Token>(selector: string): T | undefined;
     /**
      * 符合选择器的所有后代节点
      * @param selector 选择器

package/dist/lib/element.js

@@ -20,13 +20,20 @@ class AstElement extends node_1.AstNode {
     /** 合并相邻的文本子节点 */
     normalize() {
         const childNodes = [...this.childNodes];
+        /**
+         * 移除子节点
+         * @param i 移除位置
+         */
+        const remove = (i) => {
+            childNodes.splice(i, 1);
+        };
         for (let i = childNodes.length - 1; i >= 0; i--) {
             const { type, data } = childNodes[i];
             if (type !== 'text' || this.getGaps(i - 1)) {
                 //
             }
             else if (data === '') {
-                childNodes.splice(i, 1);
+                remove(i);
             }
         }
         this.setAttribute('childNodes', childNodes);
@@ -70,6 +77,33 @@ class AstElement extends node_1.AstNode {
         }
         return undefined;
     }
+    /**
+     * 符合条件的第一个后代节点
+     * @param condition 条件
+     */
+    #getElementBy(condition) {
+        for (const child of this.childNodes) {
+            if (child.type === 'text') {
+                continue;
+            }
+            else if (condition(child)) {
+                return child;
+            }
+            const descendant = child.#getElementBy(condition);
+            if (descendant) {
+                return descendant;
+            }
+        }
+        return undefined;
+    }
+    /**
+     * 符合选择器的第一个后代节点
+     * @param selector 选择器
+     */
+    querySelector(selector) {
+        const condition = this.#getCondition(selector);
+        return this.#getElementBy(condition);
+    }
     /**
      * 符合条件的所有后代节点
      * @param condition 条件

package/dist/lib/node.d.ts

@@ -1,6 +1,5 @@
-import type { LintError, AstNode as AstNodeBase } from '../base';
+import type { LintError, AstNode as AstNodeBase, TokenTypes } from '../base';
 import type { AstText, Token } from '../internal';
-import type { TokenTypes } from '../util/constants';
 export type AstNodes = AstText | Token;
 export interface Dimension {
     readonly height: number;

package/dist/lib/node.js

@@ -1,6 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AstNode = void 0;
+/**
+ * 计算字符串的行列数
+ * @param str 字符串
+ */
+const getDimension = (str) => {
+    const lines = str.split('\n'), height = lines.length;
+    return { height, width: lines[height - 1].length };
+};
+/**
+ * 获取子节点相对于父节点的字符位置
+ * @param j 子节点序号
+ * @param parent 父节点
+ */
+const getIndex = (j, parent) => parent.childNodes.slice(0, j).reduce((acc, cur, i) => acc + String(cur).length + parent.getGaps(i), 0)
+    + parent.getAttribute('padding');
 /** 类似Node */
 class AstNode {
     childNodes = [];
@@ -66,15 +81,14 @@ class AstNode {
     posFromIndex(index) {
         const str = String(this);
         if (index >= -str.length && index <= str.length) {
-            const lines = str.slice(0, index).split('\n'), top = lines.length - 1;
-            return { top, left: lines[top].length };
+            const { height, width } = getDimension(str.slice(0, index));
+            return { top: height - 1, left: width };
         }
         return undefined;
     }
     /** 获取行数和最后一行的列数 */
     #getDimension() {
-        const lines = String(this).split('\n'), height = lines.length;
-        return { height, width: lines[height - 1].length };
+        return getDimension(String(this));
     }
     /** @private */
     getGaps(i) {
@@ -85,23 +99,10 @@ class AstNode {
      * @param j 子节点序号
      */
     getRelativeIndex(j) {
-        let childNodes;
-        /**
-         * 获取子节点相对于父节点的字符位置，使用前需要先给`childNodes`赋值
-         * @param end 子节点序号
-         * @param parent 父节点
-         */
-        const getIndex = (end, parent) => childNodes.slice(0, end).reduce((acc, cur, i) => acc + String(cur).length + parent.getGaps(i), 0)
-            + parent.getAttribute('padding');
         if (j === undefined) {
             const { parentNode } = this;
-            if (parentNode) {
-                ({ childNodes } = parentNode);
-                return getIndex(childNodes.indexOf(this), parentNode);
-            }
-            return 0;
+            return parentNode ? getIndex(parentNode.childNodes.indexOf(this), parentNode) : 0;
         }
-        ({ childNodes } = this);
         return getIndex(j, this);
     }
     /** 获取当前节点的绝对位置 */

package/dist/lib/text.d.ts

@@ -13,6 +13,7 @@ export declare class AstText extends AstNode {
     /**
      * @override
      * @param start
+     * @throws `Error` 孤立文本节点
      */
     lint(start?: number, errorRegex?: RegExp): LintError[];
     /**

package/dist/lib/text.js

@@ -1,10 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AstText = void 0;
+const string_1 = require("../util/string");
 const index_1 = require("../index");
 const node_1 = require("./node");
-// eslint-disable-next-line @typescript-eslint/no-unused-expressions
-/<\s*(?:\/\s*)?([a-z]\w*)|\{+|\}+|\[{2,}|\[(?![^[]*?\])|((?:^|\])[^[]*?)\]+|https?[:/]\/+/giu;
 const source = '<\\s*(?:\\/\\s*)?([a-z]\\w*)' // 疑似标签
     + '|'
     + '\\{+|\\}+' // `{`、`}`
@@ -12,7 +11,7 @@ const source = '<\\s*(?:\\/\\s*)?([a-z]\\w*)' // 疑似标签
     + '\\[{2,}|\\[(?![^[]*?\\])' // `[`
     + '|'
     + '((?:^|\\])[^[]*?)\\]+', // `]`
-errorSyntax = new RegExp(`${source}|https?[:/]\\/+`, 'giu'), errorSyntaxUrl = new RegExp(source, 'giu'), regexes = {
+errorSyntax = new RegExp(`${source}|https?[:/]\\/+`, 'giu'), errorSyntaxUrl = new RegExp(source, 'giu'), extImage = new RegExp(`^https?:\\/\\/${string_1.extUrlCharFirst}${string_1.extUrlChar}\\.(?:gif|png|jpg|jpeg)$`, 'iu'), regexes = {
     '[': /[[\]]/u,
     '{': /[{}]/u,
     ']': /[[\]](?=[^[\]]*$)/u,
@@ -77,11 +76,12 @@ class AstText extends node_1.AstNode {
     /**
      * @override
      * @param start
+     * @throws `Error` 孤立文本节点
      */
     lint(start = this.getAbsoluteIndex(), errorRegex) {
         const { data, parentNode, nextSibling, previousSibling } = this;
         if (!parentNode) {
-            return [];
+            throw new Error('无法对孤立文本节点进行语法分析！');
         }
         const { type, name, parentNode: grandparent } = parentNode;
         let isHtmlAttrVal = false;
@@ -126,6 +126,9 @@ class AstText extends node_1.AstNode {
             else if (char === ']' && (index || length > 1)) {
                 errorRegex.lastIndex--;
             }
+            else if (char === 'h' && index === 0 && type === 'ext-link-text' && extImage.test(data)) {
+                continue;
+            }
             const startIndex = start + index, endIndex = startIndex + length, rootStr = String(root), nextChar = rootStr[endIndex], previousChar = rootStr[startIndex - 1], severity = length > 1 && !(char === '<' && !/[\s/>]/u.test(nextChar ?? '')
                 || isHtmlAttrVal && (char === '[' || char === ']'))
                 || char === '{' && (nextChar === char || previousChar === '-')

package/dist/lib/title.js

@@ -23,18 +23,18 @@ class Title {
     }
     set main(title) {
         title = title.replace(/_/gu, ' ').trim();
-        this.#main = title && `${title[0].toUpperCase()}${title.slice(1)}`;
+        this.#main = title && title[0].toUpperCase() + title.slice(1);
     }
     /** 命名空间前缀 */
     get prefix() {
         const namespace = this.#namespaces[this.ns];
-        return `${namespace}${namespace && ':'}`;
+        return namespace + (namespace && ':');
     }
     /** 完整标题 */
     get title() {
-        const prefix = `${this.interwiki}${this.interwiki && ':'}${this.prefix}`;
+        const prefix = this.interwiki + (this.interwiki && ':') + this.prefix;
         // eslint-disable-next-line prefer-const
-        let title = `${prefix}${this.main}`.replace(/ /gu, '_');
+        let title = (prefix + this.main).replace(/ /gu, '_');
         return title;
     }
     /** 扩展名 */
@@ -103,7 +103,9 @@ class Title {
     }
     /** @private */
     toString() {
-        return `${this.title}${this.fragment === undefined ? '' : `#${this.fragment}`}`;
+        return `${this.title}${this.fragment === undefined
+            ? ''
+            : `#${this.fragment}`}`;
     }
 }
 exports.Title = Title;

package/dist/mixin/attributesParent.d.ts

@@ -11,4 +11,3 @@ export interface AttributesParentBase {
  * @param constructor 基类
  * @param _ context
  */
-export declare const attributesParent: (i?: number) => <T extends AstConstructor>(constructor: T, _?: unknown) => T;

package/dist/mixin/hidden.d.ts

@@ -2,4 +2,3 @@
  * 解析后不可见的类
  * @param constructor 基类
  */
-export declare const hiddenToken: <T extends AstConstructor>(constructor: T) => T;

package/dist/parser/commentAndExt.js

@@ -49,14 +49,9 @@ const parseCommentAndExt = (wikitext, config, accum, includeOnly) => {
             return str;
         }
     }
-    /* eslint-disable @typescript-eslint/no-unused-expressions */
-    /<foo(?:\s[^>]*)?>|<\/foo\s*>/giu;
-    /<(bar)(\s[^>]*?)?(?:\/>|>(.*?)<\/(\1\s*)>)/gisu;
-    /<(baz)(\s[^>]*?)?(?:\/>|>(.*?)(?:<\/(baz\s*)>|$))/gisu;
-    /* eslint-enable @typescript-eslint/no-unused-expressions */
     const ext = config.ext.join('|'), noincludeRegex = includeOnly ? 'includeonly' : '(?:no|only)include', includeRegex = includeOnly ? 'noinclude' : 'includeonly', regex = new RegExp('<!--.*?(?:-->|$)' // comment
         + '|'
-        + `<${noincludeRegex}(?:\\s[^>]*)?>|</${noincludeRegex}\\s*>` // <noinclude>
+        + `<${noincludeRegex}(?:\\s[^>]*)?/?>|</${noincludeRegex}\\s*>` // <noinclude>
         + '|'
         + `<(${ext})(\\s[^>]*?)?(?:/>|>(.*?)</(\\1\\s*)>)` // 扩展标签
         + '|'

package/dist/parser/converter.js

@@ -14,8 +14,6 @@ const parseConverter = (text, config, accum) => {
     while (mt) {
         const { 0: syntax, index } = mt;
         if (syntax === '}-') {
-            // eslint-disable-next-line @typescript-eslint/no-unused-expressions
-            /;(?=(?:[^;]*?=>)?\s*foo\s*:|(?:\s|\0\d+c\x7F)*$)/u;
             const top = stack.pop(), { length } = accum, str = text.slice(top.index + 2, index), i = str.indexOf('|'), [flags, raw] = i === -1 ? [[], str] : [str.slice(0, i).split(';'), str.slice(i + 1)], temp = raw.replace(/(&[#a-z\d]+);/giu, '$1\x01'), variants = `(?:${config.variants.join('|')})`, rules = temp.split(new RegExp(`;(?=(?:[^;]*?=>)?\\s*${variants}\\s*:|(?:\\s|\0\\d+c\x7F)*$)`, 'u'))
                 .map(rule => rule.replace(/\x01/gu, ';'));
             // @ts-expect-error abstract class

package/dist/parser/externalLinks.js

@@ -12,8 +12,6 @@ const magicLink_1 = require("../src/magicLink");
  * @param inFile 是否在图链中
  */
 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('\\[' // 左括号
         + `(${'\0\\d+f\x7F' // 预先解析的MagicLinkToken
             + '|'
@@ -23,12 +21,11 @@ const parseExternalLinks = (wikitext, config, accum, inFile) => {
         + '\\]', // 右括号
     'giu');
     return wikitext.replace(regex, (_, url, space, text) => {
-        const { length } = accum;
-        const mt = /&[lg]t;/u.exec(url);
+        const { length } = accum, mt = /&[lg]t;/u.exec(url);
         if (mt) {
             url = url.slice(0, mt.index);
             space = '';
-            text = `${url.slice(mt.index)}${space}${text}`;
+            text = url.slice(mt.index) + space + text;
         }
         if (inFile) {
             // @ts-expect-error abstract class

package/dist/parser/links.js

@@ -14,7 +14,9 @@ const category_1 = require("../src/link/category");
  * @param accum
  */
 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('[[');
+    const regex = true // eslint-disable-line no-constant-condition, @typescript-eslint/no-unnecessary-condition
+        ? /^((?:(?!\0\d+!\x7F)[^\n[\]{}|])+)(?:(\||\0\d+!\x7F)(.*?[^\]]))?\]\](.*)$/su
+        : /^((?:(?!\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++) {
         let mightBeImg = false, link, delimiter, text, after;

package/dist/parser/magicLinks.js

@@ -10,8 +10,6 @@ const magicLink_1 = require("../src/magicLink");
  * @param 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(lead.length) : m;
@@ -26,7 +24,7 @@ const parseMagicLinks = (wikitext, config, accum) => {
             if (sepChars[0].startsWith(';') && /&(?:[a-z]+|#x[\da-f]+|#\d+)$/iu.test(url.slice(0, sepChars.index))) {
                 correction = 1;
             }
-            trail = `${url.slice(sepChars.index + correction)}${trail}`;
+            trail = url.slice(sepChars.index + correction) + trail;
             url = url.slice(0, sepChars.index + correction);
         }
         if (trail.length >= p1.length) {

package/dist/parser/redirect.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseRedirect = void 0;
+const index_1 = require("../index");
+const redirect_1 = require("../src/redirect");
+/**
+ * 解析重定向
+ * @param text
+ * @param config
+ * @param accum
+ */
+const parseRedirect = (text, config, accum) => {
+    const re = new RegExp(`^(\\s*)((?:${config.redirection.join('|')})\\s*(?::\\s*)?)\\[\\[([^\\n|\\]]+)(\\|.*?)?\\]\\](\\s*)`, 'iu'), mt = re.exec(text);
+    if (mt && index_1.default.normalizeTitle(mt[3], 0, false, config, true, true).valid) {
+        text = `\0${accum.length}c\x7F${text.slice(mt[0].length)}`;
+        // @ts-expect-error abstract class
+        new redirect_1.RedirectToken(...mt.slice(1), config, accum);
+        return text;
+    }
+    return false;
+};
+exports.parseRedirect = parseRedirect;

package/dist/src/attribute.js

@@ -244,7 +244,7 @@ class AttributeToken extends index_2.Token {
     /** @private */
     toString() {
         const [quoteStart = '', quoteEnd = ''] = this.#quotes;
-        return this.#equal ? `${super.toString(`${this.#equal}${quoteStart}`)}${quoteEnd}` : String(this.firstChild);
+        return this.#equal ? super.toString(this.#equal + quoteStart) + quoteEnd : String(this.firstChild);
     }
     /** @override */
     text() {
@@ -268,7 +268,7 @@ class AttributeToken extends index_2.Token {
                 range: [e.endIndex, e.endIndex],
                 text: this.#quotes[0],
             };
-            if (lastChild.childNodes.some(child => child.type === 'text' && /\s/u.test(child.text()))) {
+            if (lastChild.childNodes.some(({ type: t, data }) => t === 'text' && /\s/u.test(data))) {
                 e.suggestions = [
                     {
                         desc: 'close',

package/dist/src/attributes.js

@@ -32,8 +32,6 @@ class AttributesToken extends index_2.Token {
         this.type = type;
         this.setAttribute('name', name);
         if (attr) {
-            // eslint-disable-next-line @typescript-eslint/no-unused-expressions
-            /([^\s/](?:(?!\0\d+~\x7F)[^\s/=])*)(?:(\s*(?:=|\0\d+~\x7F)\s*)(?:(["'])(.*?)(\3|$)|(\S*)))?/gsu;
             const regex = new RegExp('([^\\s/](?:(?!\0\\d+~\x7F)[^\\s/=])*)' // 属性名
                 + `(?:${'((?:\\s|\0\\d+c\x7F)*(?:=|\0\\d+~\x7F)(?:\\s|\0\\d+c\x7F)*)' // `=`和前后的空白字符
                     + `(?:(["'])(.*?)(\\3|$)|(\\S*))` // 属性值

package/dist/src/heading.js

@@ -36,12 +36,12 @@ class HeadingToken extends index_2.Token {
     /** @private */
     toString() {
         const equals = this.#equals;
-        return `${equals}${String(this.firstChild)}${equals}${String(this.lastChild)}`;
+        return equals + String(this.firstChild) + equals + String(this.lastChild);
     }
     /** @override */
     text() {
         const equals = this.#equals;
-        return `${equals}${this.firstChild.text()}${equals}`;
+        return equals + this.firstChild.text() + equals;
     }
     /** @private */
     getAttribute(key) {

package/dist/src/html.js

@@ -69,7 +69,7 @@ class HtmlToken extends index_2.Token {
     }
     /** @override */
     text() {
-        const { closing, } = this, tag = `${this.#tag}${closing ? '' : super.text()}`;
+        const { closing, } = this, tag = this.#tag + (closing ? '' : super.text());
         return `<${closing ? '/' : ''}${tag}${this.#selfClosing ? '/' : ''}>`;
     }
     /** @private */

package/dist/src/imageParameter.js

@@ -16,8 +16,6 @@ function validate(key, val, config, halfParsed, ext) {
             if (!value) {
                 return val;
             }
-            // eslint-disable-next-line @typescript-eslint/no-unused-expressions
-            /^(?:\/\/(?:\[[\da-f:.]+\]|[^[\]<>"\t\n\p{Zs}])|\0\d+m\x7F)(?:[^[\]<>"\0\t\n\p{Zs}]|\0\d+c\x7F)*$/iu;
             const regex = new RegExp(`^(?:(?:${config.protocol}|//)${string_1.extUrlCharFirst}|\0\\d+m\x7F)${string_1.extUrlChar}$`, 'iu');
             if (regex.test(value)) {
                 return val;
@@ -69,7 +67,7 @@ class ImageParameterToken extends index_2.Token {
             }
             else {
                 super(mt[2], config, accum, {});
-                this.#syntax = `${mt[1]}${param[0]}${mt[3]}`;
+                this.#syntax = mt[1] + param[0] + mt[3];
             }
             this.setAttribute('name', param[1]);
             return;

package/dist/src/index.d.ts

@@ -1,11 +1,9 @@
-import { BuildMethod } from '../util/constants';
 import Parser from '../index';
 import { AstElement } from '../lib/element';
 import { AstText } from '../lib/text';
-import type { LintError } from '../base';
+import type { LintError, TokenTypes } from '../base';
 import type { Title } from '../lib/title';
 import type { AstNodes } from '../internal';
-import type { TokenTypes } from '../util/constants';
 /**
  * 所有节点的基类
  * @classdesc `{childNodes: ...(AstText|Token)}`

package/dist/src/index.js

@@ -80,6 +80,8 @@ class Token extends element_1.AstElement {
             case 0:
                 if (this.type === 'root') {
                     this.#accum.shift();
+                    const isRedirect = this.#parseRedirect();
+                    include &&= !isRedirect;
                 }
                 this.#include = include;
                 this.#parseCommentAndExt(include);
@@ -176,6 +178,15 @@ class Token extends element_1.AstElement {
         }
         return this;
     }
+    /** 解析重定向 */
+    #parseRedirect() {
+        const { parseRedirect } = require('../parser/redirect');
+        const wikitext = String(this.firstChild), parsed = parseRedirect(wikitext, this.#config, this.#accum);
+        if (parsed) {
+            this.setText(parsed);
+        }
+        return Boolean(parsed);
+    }
     /**
      * 解析HTML注释和扩展标签
      * @param includeOnly 是否嵌入

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

@@ -9,7 +9,7 @@ import type { Title } from '../../lib/title';
  */
 export declare abstract class LinkBaseToken extends Token {
     #private;
-    type: 'link' | 'category' | 'file' | 'gallery-image' | 'imagemap-image';
+    type: 'link' | 'category' | 'file' | 'gallery-image' | 'imagemap-image' | 'redirect-target';
     readonly name: string;
     readonly childNodes: readonly [AtomToken, ...Token[]];
     abstract get firstChild(): AtomToken;

package/dist/src/link/base.js

@@ -101,7 +101,7 @@ class LinkBaseToken extends index_2.Token {
                 errors.push(e);
             }
         }
-        if (linkType !== 'link' && fragment !== undefined) {
+        if (linkType !== 'link' && linkType !== 'redirect-target' && fragment !== undefined) {
             rect ??= { start, ...this.getRootNode().posFromIndex(start) };
             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) {

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

@@ -1,5 +1,10 @@
 import { LinkBaseToken } from './base';
-/** 分类 */
+import type { Token, AtomToken } from '../../internal';
+/**
+ * 分类
+ * @classdesc `{childNodes: [AtomToken, ?Token]}`
+ */
 export declare abstract class CategoryToken extends LinkBaseToken {
     readonly type = "category";
+    readonly childNodes: readonly [AtomToken] | readonly [AtomToken, Token];
 }

package/dist/src/link/category.js

@@ -2,7 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CategoryToken = void 0;
 const base_1 = require("./base");
-/** 分类 */
+/**
+ * 分类
+ * @classdesc `{childNodes: [AtomToken, ?Token]}`
+ */
 class CategoryToken extends base_1.LinkBaseToken {
     type = 'category';
 }

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

@@ -0,0 +1,25 @@
+import Parser from '../../index';
+import { LinkBaseToken } from './base';
+import { NoincludeToken } from '../nowiki/noinclude';
+import type { LintError } from '../../base';
+import type { Title } from '../../lib/title';
+import type { Token, AtomToken } from '../../internal';
+/**
+ * 重定向目标
+ * @classdesc `{childNodes: [AtomToken, ?Token]}`
+ */
+export declare abstract class RedirectTargetToken extends LinkBaseToken {
+    readonly type = "redirect-target";
+    readonly childNodes: readonly [AtomToken] | readonly [AtomToken, NoincludeToken];
+    abstract get lastChild(): AtomToken | NoincludeToken;
+    /**
+     * @param link 链接标题
+     * @param linkText 链接显示文字
+     * @param delimiter `|`
+     */
+    constructor(link: string, linkText?: string, config?: Parser.Config, accum?: Token[]);
+    /** @override */
+    text(): string;
+    /** @override */
+    lint(start?: number): LintError[];
+}

package/dist/src/link/redirectTarget.js

@@ -0,0 +1,50 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RedirectTargetToken = void 0;
+const lint_1 = require("../../util/lint");
+const index_1 = require("../../index");
+const base_1 = require("./base");
+const noinclude_1 = require("../nowiki/noinclude");
+/**
+ * 重定向目标
+ * @classdesc `{childNodes: [AtomToken, ?Token]}`
+ */
+class RedirectTargetToken extends base_1.LinkBaseToken {
+    type = 'redirect-target';
+    /**
+     * @param link 链接标题
+     * @param linkText 链接显示文字
+     * @param delimiter `|`
+     */
+    constructor(link, linkText, config = index_1.default.getConfig(), accum = []) {
+        super(link, undefined, config, accum);
+        if (linkText !== undefined) {
+            // @ts-expect-error abstract class
+            this.insertAt(new noinclude_1.NoincludeToken(linkText, config, accum));
+        }
+    }
+    /** @private */
+    getTitle() {
+        return this.normalizeTitle(String(this.firstChild), 0, true, true);
+    }
+    /** @override */
+    text() {
+        return `[[${String(this.firstChild)}]]`;
+    }
+    /** @override */
+    lint(start = this.getAbsoluteIndex()) {
+        const errors = super.lint(start, /\]\]/u);
+        if (this.length === 2) {
+            const e = (0, lint_1.generateForChild)(this.lastChild, { start }, 'no-ignored', 'useless link text');
+            e.startIndex--;
+            e.startCol--;
+            e.fix = {
+                range: [e.startIndex, e.endIndex],
+                text: '',
+            };
+            errors.push(e);
+        }
+        return errors;
+    }
+}
+exports.RedirectTargetToken = RedirectTargetToken;

package/dist/src/parameter.js

@@ -56,8 +56,6 @@ class ParameterToken extends index_2.Token {
     }
     /** @override */
     lint(start = this.getAbsoluteIndex(), re) {
-        // eslint-disable-next-line @typescript-eslint/no-unused-expressions
-        /https?:\/\/(?:\[[\da-f:.]+\]|[^[\]<>"\t\n\p{Zs}])(?:[^[\]<>"\0\t\n\p{Zs}]|\0\d+c\x7F)*$/iu;
         const errors = super.lint(start, re), { firstChild } = this, link = new RegExp(`https?://${string_1.extUrlCharFirst}${string_1.extUrlChar}$`, 'iu').exec(firstChild.text())?.[0];
         if (link && new URL(link).search) {
             const e = (0, lint_1.generateForChild)(firstChild, { start }, 'unescaped', 'unescaped query string in an anonymous parameter');

package/dist/src/pre.js

@@ -26,7 +26,7 @@ class PreToken extends index_2.Token {
                 i = wikitext.indexOf(opening);
                 j = wikitext.indexOf(closing, i + length);
             }
-            wikitext = `${str}${wikitext}`;
+            wikitext = str + wikitext;
         }
         super(wikitext, config, accum, {});
         this.setAttribute('stage', constants_1.MAX_STAGE - 1);

package/dist/src/redirect.d.ts

@@ -0,0 +1,26 @@
+import Parser from '../index';
+import { Token } from './index';
+import { SyntaxToken } from './syntax';
+import { RedirectTargetToken } from './link/redirectTarget';
+import type { LintError } from '../base';
+export declare abstract class RedirectToken extends Token {
+    #private;
+    readonly type = "redirect";
+    readonly childNodes: readonly [SyntaxToken, RedirectTargetToken];
+    abstract get firstChild(): SyntaxToken;
+    abstract get lastChild(): RedirectTargetToken;
+    abstract get previousSibling(): undefined;
+    /**
+     * @param pre leading whitespace
+     * @param syntax 重定向魔术字
+     * @param link 重定向目标
+     * @param text 重定向显示文本（无效）
+     * @param post trailing whitespace
+     */
+    constructor(pre: string, syntax: string | undefined, link: string, text: string | undefined, post: string, config?: Parser.Config, accum?: Token[]);
+    /** @override */
+    toString(): string;
+    /** @override */
+    lint(start?: number): LintError[];
+}
+export {};

package/dist/src/redirect.js

@@ -0,0 +1,46 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RedirectToken = void 0;
+const hidden_1 = require("../mixin/hidden");
+const index_1 = require("../index");
+const index_2 = require("./index");
+const syntax_1 = require("./syntax");
+const redirectTarget_1 = require("./link/redirectTarget");
+/**
+ * 重定向
+ * @classdesc `{childNodes: [SyntaxToken, LinkToken]}`
+ */
+class RedirectToken extends (0, hidden_1.hiddenToken)(index_2.Token) {
+    type = 'redirect';
+    #pre;
+    #post;
+    /**
+     * @param pre leading whitespace
+     * @param syntax 重定向魔术字
+     * @param link 重定向目标
+     * @param text 重定向显示文本（无效）
+     * @param post trailing whitespace
+     */
+    constructor(pre, syntax, link, text, post, config = index_1.default.getConfig(), accum = []) {
+        super(undefined, config, accum);
+        this.#pre = pre;
+        this.#post = post;
+        const pattern = new RegExp(`^(?:${config.redirection.join('|')})\\s*(?::\\s*)?$`, 'iu');
+        this.append(new syntax_1.SyntaxToken(syntax, pattern, 'redirect-syntax', config, accum, {}), 
+        // @ts-expect-error abstract class
+        new redirectTarget_1.RedirectTargetToken(link, text?.slice(1), config, accum));
+    }
+    /** @private */
+    getAttribute(key) {
+        return key === 'padding' ? this.#pre.length : super.getAttribute(key);
+    }
+    /** @override */
+    toString() {
+        return this.#pre + super.toString() + this.#post;
+    }
+    /** @override */
+    lint(start = this.getAbsoluteIndex()) {
+        return this.lastChild.lint(start + this.#pre.length + String(this.firstChild).length);
+    }
+}
+exports.RedirectToken = RedirectToken;

package/dist/src/syntax.d.ts

@@ -1,13 +1,12 @@
 import Parser from '../index';
 import { Token } from './index';
-import type { LintError } from '../base';
-declare type SyntaxTypes = 'plain' | 'heading-trail' | 'magic-word-name' | 'table-syntax';
+declare type SyntaxTypes = 'plain' | 'heading-trail' | 'magic-word-name' | 'table-syntax' | 'redirect-syntax';
 /** 满足特定语法格式的plain Token */
 export declare class SyntaxToken extends Token {
     type: SyntaxTypes;
     /** @param pattern 语法正则 */
     constructor(wikitext: string | undefined, pattern: RegExp, type?: SyntaxTypes, config?: Parser.Config, accum?: Token[], acceptable?: Acceptable);
     /** @override */
-    lint(): LintError[];
+    lint(): [];
 }
 export {};

package/dist/src/table/index.js

@@ -132,10 +132,9 @@ class TableToken extends trBase_1.TrBaseToken {
     getNthCell(
     // eslint-disable-next-line @stylistic/comma-dangle
     coords) {
+        // eslint-disable-next-line prefer-const, @typescript-eslint/no-unnecessary-type-assertion
+        let rawCoords = 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, insert) {

package/dist/src/table/td.js

@@ -72,12 +72,12 @@ class TdToken extends base_1.TableBaseToken {
     /** @private */
     toString() {
         const { childNodes: [syntax, attr, inner] } = this;
-        return `${String(syntax)}${String(attr)}${this.#innerSyntax}${String(inner)}`;
+        return String(syntax) + String(attr) + this.#innerSyntax + String(inner);
     }
     /** @override */
     text() {
         const { childNodes: [syntax, attr, inner] } = this;
-        return `${syntax.text()}${attr.text()}${this.#innerSyntax}${inner.text()}`;
+        return syntax.text() + attr.text() + this.#innerSyntax + inner.text();
     }
     /** @private */
     getGaps(i) {

package/dist/src/transclude.js

@@ -140,7 +140,7 @@ class TranscludeToken extends index_2.Token {
         return type === 'magic-word' && name === 'vardefine'
             ? ''
             : `{{${modifier}${type === 'magic-word'
-                ? `${firstChild.text()}${length === 1 ? '' : ':'}${(0, string_1.text)(childNodes.slice(1), '|')}`
+                ? firstChild.text() + (length === 1 ? '' : ':') + (0, string_1.text)(childNodes.slice(1), '|')
                 : super.text('|')}}}`;
     }
     /** @private */
@@ -184,7 +184,7 @@ class TranscludeToken extends index_2.Token {
             errors.push((0, lint_1.generateForSelf)(this, rect, 'invalid-invoke', 'missing module function'));
             return errors;
         }
-        const duplicatedArgs = this.getDuplicatedArgs();
+        const duplicatedArgs = this.getDuplicatedArgs().filter(([, parameter]) => !parameter[0].querySelector('ext'));
         if (duplicatedArgs.length > 0) {
             rect ??= { start, ...this.getRootNode().posFromIndex(start) };
             errors.push(...duplicatedArgs.flatMap(([, args]) => args).map(arg => (0, lint_1.generateForChild)(arg, rect, 'no-duplicate', 'duplicated parameter')));

package/dist/util/string.js

@@ -26,7 +26,7 @@ exports.text = text;
 const names = { lt: '<', gt: '>', lbrack: '[', rbrack: ']', lbrace: '{', rbrace: '}' };
 /** decode HTML entities */
 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}`))
+    ? String.fromCodePoint(Number((/^x/iu.test(code) ? '0' : '') + code))
     : names[name.toLowerCase()]);
 /** escape newlines */
 exports.noWrap = factory(/\n/gu, '\\n');

package/i18n/zh-hans.json

@@ -51,7 +51,8 @@
 	"unexpected template argument": "未预期的模板参数",
 	"unmatched closing tag": "未匹配的闭合标签",
 	"unnecessary URL encoding in an internal link": "内链中不必要的URL编码",
-	"useless fragment": "多余的fragment",
+	"useless fragment": "无用的fragment",
+	"useless link text": "无用的链接文字",
 	"variable anchor in a section header": "段落标题中可变的锚点",
 	"vertical-alignment": "垂直对齐"
 }

package/i18n/zh-hant.json

@@ -51,7 +51,8 @@
 	"unexpected template argument": "未預期的模板參數",
 	"unmatched closing tag": "未匹配的閉合標籤",
 	"unnecessary URL encoding in an internal link": "內部連結中不必要的URL編碼",
-	"useless fragment": "多餘的fragment",
+	"useless fragment": "無用的fragment",
+	"useless link text": "無用的連結文字",
 	"variable anchor in a section header": "段落標題中可變的錨點",
 	"vertical-alignment": "垂直對齊"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wikilint",
-	"version": "2.6.2",
+	"version": "2.7.0",
 	"description": "A Node.js linter for MediaWiki markup",
 	"keywords": [
 		"mediawiki",
@@ -32,13 +32,14 @@
 		"url": "git+https://github.com/bhsd-harry/wikiparser-node.git"
 	},
 	"scripts": {
-		"declaration": "grep -rl --include='*.d.ts' '@private' dist/ | xargs bash sed.sh -i -E '/^\\s+\\/\\*\\* @private/,+1d'; node ./dist/bin/declaration.js",
-		"prepublishOnly": "npm run build && rm dist/internal.js dist/[bpu]*/*.d.ts",
-		"build": "bash build.sh",
+		"declaration": "grep -rl --include='*.d.ts' '@private' dist/ | xargs bash sed.sh -i -E '/^\\s+\\/\\*\\* @private/,+1d'; grep -rl --include='*.d.ts' '/util/' dist/ | xargs bash sed.sh -i -E '/^import .+\\/util\\//d'; node ./dist/bin/declaration.js",
+		"prepublishOnly": "npm run build",
+		"build:core": "bash build.sh",
+		"build": "npm run build:core",
 		"diff": "bash diff.sh",
 		"diff:stat": "f() { git diff --stat --ignore-all-space --color=always $1 $2 -- . ':!extensions/' ':!bin/' | grep '\\.ts'; }; f",
 		"lint:ts": "tsc --noEmit && eslint --cache .",
-		"lint:json": "ajv -s config/.schema.json -d 'config/*.json' --strict=true --strict-required=false",
+		"lint:json": "v8r -s config/.schema.json config/*.json",
 		"lint": "npm run lint:ts && npm run lint:json",
 		"test": "node dist/test/test.js",
 		"test:end": "pkill -x http-server",
@@ -54,17 +55,17 @@
 		"@types/request": "^2.48.12",
 		"@typescript-eslint/eslint-plugin": "^7.1.0",
 		"@typescript-eslint/parser": "^7.1.0",
-		"ajv-cli": "^5.0.0",
 		"eslint": "^8.56.0",
 		"eslint-plugin-es-x": "^7.5.0",
 		"eslint-plugin-eslint-comments": "^3.2.0",
 		"eslint-plugin-jsdoc": "^48.0.2",
 		"eslint-plugin-json-es": "^1.5.7",
-		"eslint-plugin-n": "^16.6.2",
+		"eslint-plugin-n": "^17.4.0",
 		"eslint-plugin-promise": "^6.1.1",
 		"eslint-plugin-regexp": "^2.2.0",
-		"eslint-plugin-unicorn": "^51.0.1",
-		"typescript": "^5.3.3"
+		"eslint-plugin-unicorn": "^52.0.0",
+		"typescript": "^5.3.3",
+		"v8r": "^3.0.0"
 	},
 	"engines": {
 		"node": "^20.9.0"