wikilint 2.8.0 → 2.9.1

package/dist/base.d.ts

@@ -11,8 +11,8 @@ export interface Config {
     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 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' | 'magic-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", "invalid-isbn", "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';
     type Rule = typeof rules[number];
@@ -49,6 +49,8 @@ interface AstElement extends AstNode {
 export interface Parser {
     config: Config | string;
     i18n: Record<string, string> | string | undefined;
+    /** 获取当前的解析设置 */
+    getConfig(): Config;
     /**
      * 解析wikitext
      * @param include 是否嵌入

package/dist/base.js

@@ -11,6 +11,7 @@ exports.rules = [
     'invalid-gallery',
     'invalid-imagemap',
     'invalid-invoke',
+    'invalid-isbn',
     'lonely-apos',
     'lonely-bracket',
     'lonely-http',

package/dist/index.d.ts

@@ -8,18 +8,14 @@ declare interface Parser extends ParserBase {
      * @param title 标题（含或不含命名空间前缀）
      * @param defaultNs 命名空间
      * @param include 是否嵌入
-     * @param halfParsed 是否是半解析状态
-     * @param decode 是否需要解码
-     * @param selfLink 是否允许selfLink
      */
-    normalizeTitle(title: string, defaultNs?: number, include?: boolean, config?: Config, halfParsed?: boolean, decode?: boolean, selfLink?: boolean): Title;
+    normalizeTitle(title: string, defaultNs?: number, include?: boolean, config?: Config): Title;
     parse(wikitext: string, include?: boolean, maxStage?: number, config?: Config): Token;
 }
 declare const Parser: Parser;
 // @ts-expect-error mixed export styles
 export = Parser;
+export default Parser;
 export type { Config, LintError };
 export type * from './internal';
-declare global {
-	type Acceptable = unknown;
-}
+declare global { type Acceptable = unknown; }

package/dist/index.js

@@ -43,7 +43,11 @@ const Parser = {
             return new Title(title, defaultNs, config, decode, selfLink);
         }
         const { Token } = require('./src/index');
-        const token = debug_1.Shadow.run(() => new Token(title, config).parseOnce(0, include).parseOnce()), titleObj = new Title(String(token), defaultNs, config, decode, selfLink);
+        const token = debug_1.Shadow.run(() => {
+            const root = new Token(title, config);
+            root.type = 'root';
+            return root.parseOnce(0, include).parseOnce();
+        }), titleObj = new Title(token.toString(), defaultNs, config, decode, selfLink);
         debug_1.Shadow.run(() => {
             for (const key of ['main', 'fragment']) {
                 const str = titleObj[key];
@@ -60,13 +64,14 @@ const Parser = {
         const { Token } = require('./src/index');
         const root = debug_1.Shadow.run(() => {
             const token = new Token(wikitext, config);
+            token.type = 'root';
             try {
                 return token.parse(maxStage, include);
             }
             catch (e) {
                 if (e instanceof Error) {
                     const file = path.join(__dirname, '..', 'errors', new Date().toISOString()), stage = token.getAttribute('stage');
-                    fs.writeFileSync(file, stage === constants_1.MAX_STAGE ? wikitext : String(token));
+                    fs.writeFileSync(file, stage === constants_1.MAX_STAGE ? wikitext : token.toString());
                     fs.writeFileSync(`${file}.err`, e.stack);
                     fs.writeFileSync(`${file}.json`, JSON.stringify({ stage, include, config }, null, '\t'));
                 }
@@ -88,4 +93,5 @@ for (const key in Parser) {
     }
 }
 Object.defineProperties(Parser, def);
+exports.default = Parser;
 module.exports = Parser;

package/dist/lib/element.d.ts

@@ -8,13 +8,6 @@ export declare abstract class AstElement extends AstNode {
     readonly data: undefined;
     /** 子节点总数 */
     get length(): number;
-    /**
-     * 可见部分
-     * @param separator 子节点间的连接符
-     */
-    text(separator?: string): string;
-    /** 合并相邻的文本子节点 */
-    normalize(): void;
     /**
      * 移除子节点
      * @param i 移除位置
@@ -57,10 +50,4 @@ export declare abstract class AstElement extends AstNode {
      * @param i 子节点位置
      */
     setText(str: string, i?: number): string;
-    /**
-     * @override
-     * @param start
-     * @param re 用于`AstText`后代节点的正则表达式
-     */
-    lint(start?: number, re?: RegExp): LintError[];
 }

package/dist/lib/element.js

@@ -10,14 +10,11 @@ class AstElement extends node_1.AstNode {
     get length() {
         return this.childNodes.length;
     }
-    /**
-     * 可见部分
-     * @param separator 子节点间的连接符
-     */
+    /** @private */
     text(separator) {
         return (0, string_1.text)(this.childNodes, separator);
     }
-    /** 合并相邻的文本子节点 */
+    /** @private */
     normalize() {
         const childNodes = [...this.childNodes];
         /**
@@ -164,17 +161,13 @@ class AstElement extends node_1.AstNode {
     toString(separator = '') {
         return this.childNodes.map(String).join(separator);
     }
-    /**
-     * @override
-     * @param start
-     * @param re 用于`AstText`后代节点的正则表达式
-     */
+    /** @private */
     lint(start = this.getAbsoluteIndex(), re) {
         const errors = [];
         for (let i = 0, cur = start + this.getAttribute('padding'); i < this.length; i++) {
             const child = this.childNodes[i];
             errors.push(...child.lint(cur, re));
-            cur += String(child).length + this.getGaps(i);
+            cur += child.toString().length + this.getGaps(i);
         }
         return errors;
     }

package/dist/lib/node.d.ts

@@ -19,7 +19,7 @@ export declare abstract class AstNode implements AstNodeBase {
     type: TokenTypes | 'text';
     data?: string | undefined;
     readonly childNodes: readonly AstNodes[];
-    abstract lint(): LintError[];
+    lint(): LintError[];
     /** 首位子节点 */
     get firstChild(): AstNodes | undefined;
     /** 末位子节点 */

package/dist/lib/node.js

@@ -14,7 +14,7 @@ const getDimension = (str) => {
  * @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)
+const getIndex = (j, parent) => parent.childNodes.slice(0, j).reduce((acc, cur, i) => acc + cur.toString().length + parent.getGaps(i), 0)
     + parent.getAttribute('padding');
 /** 类似Node */
 class AstNode {

package/dist/lib/rect.d.ts

@@ -0,0 +1,18 @@
+import type { AstNodes, Position } from './node';
+/** 节点位置 */
+export declare class BoundingRect {
+    #private;
+    readonly token: AstNodes;
+    readonly start: number;
+    /** 起点行 */
+    get top(): number;
+    /** 起点列 */
+    get left(): number;
+    /**
+     * @param token 节点
+     * @param start 起点
+     */
+    constructor(token: AstNodes, start: number);
+    /** 计算位置 */
+    getPosition(): Position;
+}

package/dist/lib/rect.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BoundingRect = void 0;
+/** 节点位置 */
+class BoundingRect {
+    #pos;
+    token;
+    start;
+    /** 起点行 */
+    get top() {
+        this.#pos ??= this.getPosition();
+        return this.#pos.top;
+    }
+    /** 起点列 */
+    get left() {
+        this.#pos ??= this.getPosition();
+        return this.#pos.left;
+    }
+    /**
+     * @param token 节点
+     * @param start 起点
+     */
+    constructor(token, start) {
+        this.token = token;
+        this.start = start;
+    }
+    /** 计算位置 */
+    getPosition() {
+        return this.token.getRootNode().posFromIndex(this.start);
+    }
+}
+exports.BoundingRect = BoundingRect;

package/dist/lib/text.d.ts

@@ -10,12 +10,6 @@ export declare class AstText extends AstNode {
     constructor(text: string);
     /** 可见部分 */
     text(): string;
-    /**
-     * @override
-     * @param start
-     * @throws `Error` 孤立文本节点
-     */
-    lint(start?: number, errorRegex?: RegExp): LintError[];
     /**
      * 替换字符串
      * @param text 替换的字符串

package/dist/lib/text.js

@@ -4,14 +4,7 @@ exports.AstText = void 0;
 const string_1 = require("../util/string");
 const index_1 = require("../index");
 const node_1 = require("./node");
-const source = '<\\s*(?:\\/\\s*)?([a-z]\\w*)' // 疑似标签
-    + '|'
-    + '\\{+|\\}+' // `{`、`}`
-    + '|'
-    + '\\[{2,}|\\[(?![^[]*?\\])' // `[`
-    + '|'
-    + '((?:^|\\])[^[]*?)\\]+', // `]`
-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 = {
+const source = String.raw `<\s*(?:/\s*)?([a-z]\w*)|\{+|\}+|\[{2,}|\[(?![^[]*?\])|((?:^|\])[^[]*?)\]+`, errorSyntax = new RegExp(String.raw `${source}|https?[:/]/+`, 'giu'), errorSyntaxUrl = new RegExp(source, 'giu'), extImage = new RegExp(String.raw `^https?://${string_1.extUrlCharFirst}${string_1.extUrlChar}\.(?:gif|png|jpg|jpeg)$`, 'iu'), regexes = {
     '[': /[[\]]/u,
     '{': /[{}]/u,
     ']': /[[\]](?=[^[\]]*$)/u,
@@ -73,15 +66,11 @@ class AstText extends node_1.AstNode {
     text() {
         return this.data;
     }
-    /**
-     * @override
-     * @param start
-     * @throws `Error` 孤立文本节点
-     */
+    /** @private */
     lint(start = this.getAbsoluteIndex(), errorRegex) {
         const { data, parentNode, nextSibling, previousSibling } = this;
         if (!parentNode) {
-            throw new Error('无法对孤立文本节点进行语法分析！');
+            throw new Error('An isolated text node cannot be linted!');
         }
         const { type, name, parentNode: grandparent } = parentNode;
         let isHtmlAttrVal = false;
@@ -129,7 +118,7 @@ class AstText extends node_1.AstNode {
             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 ?? '')
+            const startIndex = start + index, endIndex = startIndex + length, rootStr = root.toString(), nextChar = rootStr[endIndex], previousChar = rootStr[startIndex - 1], severity = length > 1 && !(char === '<' && !/[\s/>]/u.test(nextChar ?? '')
                 || isHtmlAttrVal && (char === '[' || char === ']'))
                 || char === '{' && (nextChar === char || previousChar === '-')
                 || char === '}' && (previousChar === char || nextChar === '-')
@@ -190,7 +179,7 @@ class AstText extends node_1.AstNode {
                 ];
             }
             else if (char === '[' && type === 'ext-link-text') {
-                const i = parentNode.getAbsoluteIndex() + String(parentNode).length;
+                const i = parentNode.getAbsoluteIndex() + parentNode.toString().length;
                 e.suggestions = [
                     {
                         desc: 'escape',
@@ -200,7 +189,7 @@ class AstText extends node_1.AstNode {
                 ];
             }
             else if (char === ']' && previousType === 'free-ext-link' && severity === 'error') {
-                const i = start - String(previousSibling).length;
+                const i = start - previousSibling.toString().length;
                 e.fix = {
                     range: [i, i],
                     text: '[',

package/dist/mixin/attributesParent.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.attributesParent = void 0;
+const debug_1 = require("../util/debug");
 /**
  * 子节点含有AttributesToken的类
  * @param i AttributesToken子节点的位置
@@ -19,7 +20,7 @@ const attributesParent = (i = 0) => (constructor, _) => {
             return this.#attributesChild.getAttr(key);
         }
     }
-    Object.defineProperty(AttributesParent, 'name', { value: constructor.name });
+    (0, debug_1.mixin)(AttributesParent, constructor);
     return AttributesParent;
 };
 exports.attributesParent = attributesParent;

package/dist/mixin/hidden.d.ts

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

package/dist/mixin/hidden.js

@@ -1,22 +1,27 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.hiddenToken = void 0;
+const debug_1 = require("../util/debug");
 /**
  * 解析后不可见的类
+ * @param linter 是否覆写 lint 方法
  * @param constructor 基类
+ * @param _ context
  */
-const hiddenToken = (constructor) => {
+const hiddenToken = (linter) => (constructor, _) => {
     /** 解析后不可见的类 */
     class AnyHiddenToken extends constructor {
         /** 没有可见部分 */
         text() {
             return '';
         }
-        /** @override */
-        lint() {
-            return [];
+        /** @private */
+        lint(start) {
+            // @ts-expect-error private argument
+            return linter ? [] : super.lint(start);
         }
     }
+    (0, debug_1.mixin)(AnyHiddenToken, constructor);
     return AnyHiddenToken;
 };
 exports.hiddenToken = hiddenToken;

package/dist/parser/braces.js

@@ -5,6 +5,12 @@ const string_1 = require("../util/string");
 const heading_1 = require("../src/heading");
 const transclude_1 = require("../src/transclude");
 const arg_1 = require("../src/arg");
+const closes = {
+    '=': '\n',
+    '{': String.raw `\}{2,}|\|`,
+    '-': String.raw `\}-`,
+    '[': String.raw `\]\]`,
+}, marks = new Map([['!', '!'], ['!!', '+'], ['(!', '{'], ['!)', '}'], ['!-', '-'], ['=', '~']]), re = new RegExp(String.raw `\{\{\s*(${[...marks.keys()].map(string_1.escapeRegExp).join('|')})\s*\}\}(?!\})`, 'gu');
 /**
  * 解析花括号
  * @param wikitext
@@ -13,8 +19,14 @@ const arg_1 = require("../src/arg");
  * @throws TranscludeToken.constructor()
  */
 const parseBraces = (wikitext, config, accum) => {
-    const source = `${config.excludes?.includes('heading') ? '' : '^(\0\\d+c\x7F)*={1,6}|'}\\[\\[|\\{{2,}|-\\{(?!\\{)`, { parserFunction: [, , , subst] } = config, stack = [], closes = { '=': '\n', '{': '\\}{2,}|\\|', '-': '\\}-', '[': '\\]\\]' }, marks = new Map([['!', '!'], ['!!', '+'], ['(!', '{'], ['!)', '}'], ['!-', '-'], ['=', '~']]);
-    let regex = new RegExp(source, 'gmu'), mt = regex.exec(wikitext), moreBraces = wikitext.includes('}}'), lastIndex;
+    const source = String.raw `${config.excludes?.includes('heading') ? '' : String.raw `^(\0\d+c\x7F)*={1,6}|`}\[\[|\{{2,}|-\{(?!\{)`, { parserFunction: [, , , subst] } = config, stack = [];
+    wikitext = wikitext.replace(re, (m, p1) => {
+        // @ts-expect-error abstract class
+        new transclude_1.TranscludeToken(m.slice(2, -2), [], config, accum);
+        return `\0${accum.length - 2}${marks.get(p1)}\x7F`;
+    });
+    const lastBraces = wikitext.lastIndexOf('}}') - wikitext.length;
+    let regex = new RegExp(source, 'gmu'), mt = regex.exec(wikitext), moreBraces = lastBraces + wikitext.length !== -1, lastIndex;
     while (mt
         || lastIndex !== undefined && lastIndex <= wikitext.length && stack[stack.length - 1]?.[0]?.startsWith('=')) {
         if (mt?.[1]) {
@@ -86,7 +98,7 @@ const parseBraces = (wikitext, config, accum) => {
                     }
                 }
                 catch (e) {
-                    if (e instanceof SyntaxError && e.message === '非法的模板名称') {
+                    if (e instanceof SyntaxError && e.message === 'Invalid template name') {
                         skip = true;
                     }
                     else {
@@ -113,7 +125,7 @@ const parseBraces = (wikitext, config, accum) => {
             }
             stack.push(...'0' in top ? [top] : [], mt);
         }
-        moreBraces &&= wikitext.slice(lastIndex).includes('}}');
+        moreBraces &&= lastBraces + wikitext.length >= lastIndex;
         let curTop = stack[stack.length - 1];
         if (!moreBraces && curTop?.[0]?.startsWith('{')) {
             stack.pop();

package/dist/parser/commentAndExt.js

@@ -49,14 +49,7 @@ const parseCommentAndExt = (wikitext, config, accum, includeOnly) => {
             return str;
         }
     }
-    const ext = config.ext.join('|'), noincludeRegex = includeOnly ? 'includeonly' : '(?:no|only)include', includeRegex = includeOnly ? 'noinclude' : 'includeonly', regex = new RegExp('<!--.*?(?:-->|$)' // comment
-        + '|'
-        + `<${noincludeRegex}(?:\\s[^>]*)?/?>|</${noincludeRegex}\\s*>` // <noinclude>
-        + '|'
-        + `<(${ext})(\\s[^>]*?)?(?:/>|>(.*?)</(\\1\\s*)>)` // 扩展标签
-        + '|'
-        + `<(${includeRegex})(\\s[^>]*?)?(?:/>|>(.*?)(?:</(${includeRegex}\\s*)>|$))`, // <includeonly>
-    'gisu');
+    const ext = config.ext.join('|'), noincludeRegex = includeOnly ? 'includeonly' : '(?:no|only)include', includeRegex = includeOnly ? 'noinclude' : 'includeonly', regex = new RegExp(String.raw `<!--.*?(?:-->|$)|<${noincludeRegex}(?:\s[^>]*)?/?>|</${noincludeRegex}\s*>|<(${ext})(\s[^>]*?)?(?:/>|>(.*?)</(\1\s*)>)|<(${includeRegex})(\s[^>]*?)?(?:/>|>(.*?)(?:</(${includeRegex}\s*)>|$))`, 'gisu');
     return wikitext.replace(regex, (substr, name, attr, inner, closing, include, includeAttr, includeInner, includeClosing) => {
         const str = `\0${accum.length}${name ? 'e' : 'c'}\x7F`;
         if (name) {

package/dist/parser/converter.js

@@ -9,13 +9,12 @@ const converter_1 = require("../src/converter");
  * @param accum
  */
 const parseConverter = (text, config, accum) => {
-    const regex1 = /-\{/gu, regex2 = /-\{|\}-/gu, stack = [];
+    const variants = `(?:${config.variants.join('|')})`, regex1 = /-\{/gu, regex2 = /-\{|\}-/gu, regex3 = new RegExp(String.raw `;(?=(?:[^;]*?=>)?\s*${variants}\s*:|(?:\s|\0\d+c\x7F)*$)`, 'u'), stack = [];
     let regex = regex1, mt = regex.exec(text);
     while (mt) {
         const { 0: syntax, index } = mt;
         if (syntax === '}-') {
-            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, ';'));
+            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'), rules = temp.split(regex3).map(rule => rule.replace(/\x01/gu, ';'));
             // @ts-expect-error abstract class
             new converter_1.ConverterToken(flags, rules, config, accum);
             text = `${text.slice(0, top.index)}\0${length}v\x7F${text.slice(index + 2)}`;

package/dist/parser/externalLinks.js

@@ -12,14 +12,7 @@ const magicLink_1 = require("../src/magicLink");
  * @param inFile 是否在图链中
  */
 const parseExternalLinks = (wikitext, config, accum, inFile) => {
-    const regex = new RegExp('\\[' // 左括号
-        + `(${'\0\\d+f\x7F' // 预先解析的MagicLinkToken
-            + '|'
-            + `(?:(?:${config.protocol}|//)${string_1.extUrlCharFirst}|\0\\d+m\x7F)${string_1.extUrlChar}(?=[[\\]<>"\\t\\p{Zs}]|\0\\d)`})` // 链接网址
-        + '(\\p{Zs}*(?=\\P{Zs}))' // 空格
-        + '([^\\]\x01-\x08\x0A-\x1F\uFFFD]*)' // 链接文字
-        + '\\]', // 右括号
-    'giu');
+    const regex = new RegExp(String.raw `\[(\0\d+f\x7F|(?:(?:${config.protocol}|//)${string_1.extUrlCharFirst}|\0\d+m\x7F)${string_1.extUrlChar}(?=[[\]<>"\t\p{Zs}]|\0\d))(\p{Zs}*(?!\p{Zs}))([^\]\x01-\x08\x0A-\x1F\uFFFD]*)\]`, 'giu');
     return wikitext.replace(regex, (_, url, space, text) => {
         const { length } = accum, mt = /&[lg]t;/u.exec(url);
         if (mt) {
@@ -29,7 +22,7 @@ const parseExternalLinks = (wikitext, config, accum, inFile) => {
         }
         if (inFile) {
             // @ts-expect-error abstract class
-            new magicLink_1.MagicLinkToken(url, true, config, accum);
+            new magicLink_1.MagicLinkToken(url, 'ext-link-url', config, accum);
             return `[\0${length}f\x7F${space}${text}]`;
         }
         // @ts-expect-error abstract class

package/dist/parser/hrAndDoubleUnderscore.js

@@ -19,7 +19,7 @@ const parseHrAndDoubleUnderscore = ({ firstChild: { data }, type, name }, config
         // @ts-expect-error abstract class
         new hr_1.HrToken(m, config, accum);
         return `${lead}\0${accum.length - 1}r\x7F`;
-    }).replace(new RegExp(`__(${doubleUnderscore.flat().join('|')})__`, 'giu'), (m, p1) => {
+    }).replace(new RegExp(`__(${[...doubleUnderscore[0], ...doubleUnderscore[1]].join('|')})__`, 'giu'), (m, p1) => {
         const caseSensitive = sensitive.has(p1);
         if (caseSensitive || insensitive.has(p1.toLowerCase())) {
             // @ts-expect-error abstract class

package/dist/parser/html.js

@@ -10,7 +10,7 @@ const html_1 = require("../src/html");
  * @param accum
  */
 const parseHtml = (wikitext, config, accum) => {
-    const regex = /^(\/?)([a-z][^\s/>]*)((?:\s|\/(?!>))[^>]*?)?(\/?>)([^<]*)$/iu, elements = new Set(config.html.flat()), bits = wikitext.split('<');
+    const regex = /^(\/?)([a-z][^\s/>]*)((?:\s|\/(?!>))[^>]*?)?(\/?>)([^<]*)$/iu, { html } = config, elements = new Set([...html[0], ...html[1], ...html[2]]), bits = wikitext.split('<');
     let text = bits.shift();
     for (const x of bits) {
         const mt = regex.exec(x), t = mt?.[2], name = t?.toLowerCase();

package/dist/parser/links.js

@@ -16,7 +16,7 @@ const category_1 = require("../src/link/category");
 const parseLinks = (wikitext, config, accum) => {
     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('[[');
+        : /^((?:(?!\0\d+!\x7F)[^\n[\]{}|])+)(?:(\||\0\d+!\x7F)(.*?[^\]])?)?\]\](.*)$/su, regexImg = /^((?:(?!\0\d+!\x7F)[^\n[\]{}|])+)(\||\0\d+!\x7F)(.*)$/su, regexExt = new RegExp(String.raw `^\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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseMagicLinks = void 0;
 const string_1 = require("../util/string");
 const magicLink_1 = require("../src/magicLink");
+const sepRegex = /[^,;\\.:!?)][,;\\.:!?)]+$/u, sepLparRegex = /[^,;\\.:!?][,;\\.:!?]+$/u;
 /**
  * 解析自由外链
  * @param wikitext
@@ -10,29 +11,39 @@ const magicLink_1 = require("../src/magicLink");
  * @param accum
  */
 const parseMagicLinks = (wikitext, config, accum) => {
-    const regex = new RegExp(`(^|[^\\p{L}\\d_])(?:${config.protocol})(${string_1.extUrlCharFirst}${string_1.extUrlChar})`, 'giu');
+    const space = String.raw `[\p{Zs}\t]| |&#0*160;|&#x0*a0;`, spdash = `(?:${space}|-)`, regex = new RegExp(String.raw `(^|[^\p{L}\d_])(?:(?:${config.protocol})(${string_1.extUrlCharFirst}${string_1.extUrlChar})|(?:RFC|PMID)(?:${space})+\d+\b|ISBN(?:${space})+(?:97[89]${spdash}?)?(?:\d${spdash}?){9}[\dx]\b)`, 'giu');
     return wikitext.replace(regex, (m, lead, p1) => {
-        let trail = '', url = lead ? m.slice(lead.length) : m;
-        const m2 = /&(?:lt|gt|nbsp|#x0*(?:3[ce]|a0)|#0*(?:6[02]|160));/iu.exec(url);
-        if (m2) {
-            trail = url.slice(m2.index);
-            url = url.slice(0, m2.index);
-        }
-        const sep = new RegExp(`[,;\\\\.:!?${url.includes('(') ? '' : ')'}]+$`, 'u'), sepChars = sep.exec(url);
-        if (sepChars) {
-            let correction = 0;
-            if (sepChars[0].startsWith(';') && /&(?:[a-z]+|#x[\da-f]+|#\d+)$/iu.test(url.slice(0, sepChars.index))) {
-                correction = 1;
+        let url = lead ? m.slice(lead.length) : m;
+        if (p1) {
+            let trail = '';
+            const m2 = /&(?:lt|gt|nbsp|#x0*(?:3[ce]|a0)|#0*(?:6[02]|160));/iu.exec(url);
+            if (m2) {
+                trail = url.slice(m2.index);
+                url = url.slice(0, m2.index);
+            }
+            const sep = url.includes('(') ? sepLparRegex : sepRegex, sepChars = sep.exec(url);
+            if (sepChars) {
+                let correction = 1;
+                if (sepChars[0][1] === ';'
+                    && /&(?:[a-z]+|#x[\da-f]+|#\d+)$/iu.test(url.slice(0, sepChars.index))) {
+                    correction = 2;
+                }
+                trail = url.slice(sepChars.index + correction) + trail;
+                url = url.slice(0, sepChars.index + correction);
+            }
+            if (trail.length >= p1.length) {
+                return m;
             }
-            trail = url.slice(sepChars.index + correction) + trail;
-            url = url.slice(0, sepChars.index + correction);
+            // @ts-expect-error abstract class
+            new magicLink_1.MagicLinkToken(url, undefined, config, accum);
+            return `${lead}\0${accum.length - 1}w\x7F${trail}`;
         }
-        if (trail.length >= p1.length) {
+        else if (!/^(?:RFC|PMID|ISBN)/u.test(url)) {
             return m;
         }
         // @ts-expect-error abstract class
-        new magicLink_1.MagicLinkToken(url, false, config, accum);
-        return `${lead}\0${accum.length - 1}w\x7F${trail}`;
+        new magicLink_1.MagicLinkToken(url, 'magic-link', config, accum);
+        return `${lead}\0${accum.length - 1}i\x7F`;
     });
 };
 exports.parseMagicLinks = parseMagicLinks;

package/dist/parser/redirect.js

@@ -10,7 +10,7 @@ const redirect_1 = require("../src/redirect");
  * @param accum
  */
 const parseRedirect = (text, config, accum) => {
-    const re = new RegExp(`^(\\s*)((?:${config.redirection.join('|')})\\s*(?::\\s*)?)\\[\\[([^\\n|\\]]+)(\\|.*?)?\\]\\](\\s*)`, 'iu'), mt = re.exec(text);
+    const re = new RegExp(String.raw `^(\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

package/dist/parser/table.js

@@ -40,7 +40,7 @@ const parseTable = ({ firstChild: { data }, type, name }, config, accum) => {
             topToken.insertAt(token);
         }
         else {
-            lastChild.setText(String(lastChild) + str);
+            lastChild.setText(lastChild.toString() + str);
         }
     }, 
     /** 取出最近的表格行 */

package/dist/src/arg.d.ts

@@ -16,8 +16,4 @@ export declare abstract class ArgToken extends Token {
     get default(): string | false;
     /** @param parts 以'|'分隔的各部分 */
     constructor(parts: readonly string[], config?: Parser.Config, accum?: Token[]);
-    /** @override */
-    text(): string;
-    /** @override */
-    lint(start?: number, re?: RegExp): LintError[];
 }