wikiparser-node 1.1.1 → 1.1.2

package/README.en.md

@@ -16,7 +16,7 @@ wikiparser-node is an offline [Wikitext](https://www.mediawiki.org/wiki/Wikitext
 
 This version provides a [CLI](https://en.wikipedia.org/wiki/Command-line_interface), but only retains the parsing functionality and linting functionality. The parsed AST cannot be modified. It is used in the [eslint-plugin-wikitext](https://www.npmjs.com/package/eslint-plugin-wikitext) plugin.
 
-## Browser
+## Browser-compatible
 
 A browser-compatible version, which can be used for code highlighting or as a linting plugin in conjunction with the [CodeMirror5](https://codemirror.net/5/) editor. ([Usage example](https://bhsd-harry.github.io/wikiparser-node))
 

package/README.md

@@ -16,7 +16,7 @@ wikiparser-node 是一款由 Bhsd 开发的基于 [Node.js](https://nodejs.org/)
 
 提供了 [CLI](https://en.wikipedia.org/wiki/Command-line_interface)，但仅保留了解析功能和语法错误分析功能，解析生成的语法树不能修改。这个版本被应用于 [eslint-plugin-wikitext](https://www.npmjs.com/package/eslint-plugin-wikitext) 插件。
 
-## Browser
+## Browser-compatible
 
 兼容浏览器的版本，可用于代码高亮或是搭配 [CodeMirror5](https://codemirror.net/5/) 编辑器作为语法分析插件。（[使用实例展示](https://bhsd-harry.github.io/wikiparser-node)）
 

package/dist/base.d.ts

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

package/dist/bin/toc.js

@@ -6,7 +6,7 @@ const { argv: [, , filename] } = process;
 if (!filename) {
     throw new RangeError('请指定文档文件！');
 }
-const fullpath = path.join(__dirname, '..', '..', 'wiki', `${filename}.md`), isEnglish = filename.endsWith('.en');
+const fullpath = path.join(__dirname, '..', '..', 'wiki', `${filename}.md`), isEnglish = filename.endsWith('-(EN)');
 if (!fs.existsSync(fullpath)) {
     throw new RangeError(`文档 ${filename}.md 不存在！`);
 }
@@ -15,4 +15,4 @@ if (/^- \[[^\]]+\]\(#[^)]+\)$/mu.test(content)) {
     throw new Error(`文档 ${filename}.md 中已包含目录！`);
 }
 const toc = content.split('\n').filter(line => line.startsWith('#')).map(line => line.replace(/^(#+)\s+(\S.*)$/u, (_, { length }, title) => `${'\t'.repeat(length - 1)}- [${title}](#${title.toLowerCase().replaceAll(' ', '-').replaceAll('.', '')})`)).join('\n');
-fs.writeFileSync(fullpath, `<details>\n\t<summary>${isEnglish ? 'Table of Contents' : '目录'}</summary>\n\n${toc}\n</details>\n\n# Other Languages\n\n- [${isEnglish ? '简体中文' : 'English'}](./${isEnglish ? filename.slice(0, -3) : `${filename}.en`})\n\n${content}`);
+fs.writeFileSync(fullpath, `<details>\n\t<summary>${isEnglish ? 'Table of Contents' : '目录'}</summary>\n\n${toc}\n\n</details>\n\n# Other Languages\n\n- [${isEnglish ? '简体中文' : 'English'}](./${isEnglish ? filename.slice(0, -5) : `${filename}-%28EN%29`})\n\n${content}`);

package/dist/index.d.ts

@@ -1,34 +1,9 @@
+import { Shadow } from './util/debug';
 import type { Title } from './lib/title';
 import type { Token } from './internal';
-export interface Config {
-    ext: string[];
-    html: [string[], string[], string[]];
-    namespaces: Record<string, string>;
-    nsid: Record<string, number>;
-    parserFunction: [Record<string, string>, string[], string[], string[]];
-    doubleUnderscore: [string[], string[]];
-    protocol: string;
-    img: Record<string, string>;
-    variants: string[];
-    interwiki: string[];
-    excludes?: string[];
-    conversionTable?: [string, string][];
-    redirects?: [string, string][];
-}
-export interface LintError {
-    message: string;
-    severity: 'error' | 'warning';
-    startIndex: number;
-    endIndex: number;
-    startLine: number;
-    startCol: number;
-    endLine: number;
-    endCol: number;
-    excerpt: string;
-}
-declare interface Parser {
-    config: string | Config;
-    i18n: string | Record<string, string> | undefined;
+import type { Config, LintError, Parser as ParserBase } from './base';
+declare interface Parser extends ParserBase {
+    Shadow: typeof Shadow;
     conversionTable: Map<string, string>;
     redirects: Map<string, string>;
     warning: boolean;
@@ -44,7 +19,7 @@ declare interface Parser {
      */
     normalizeTitle(title: string, defaultNs?: number, include?: boolean, config?: Config, halfParsed?: boolean, decode?: boolean, selfLink?: boolean): Title;
     /**
-     * 解析wikitext
+     * @override
      * @param include 是否嵌入
      * @param maxStage 最大解析层级
      */
@@ -57,4 +32,5 @@ declare interface Parser {
 }
 declare const Parser: Parser;
 export = Parser;
+export type { Config, LintError };
 export type * from './internal';

package/dist/index.js

@@ -21,6 +21,7 @@ const Parser = {
     config: 'default',
     i18n: undefined,
     /* NOT FOR BROWSER */
+    Shadow: debug_1.Shadow,
     conversionTable: new Map(),
     redirects: new Map(),
     warning: true,
@@ -143,7 +144,6 @@ const Parser = {
             ...Object.entries(constants_1.classes),
             ...Object.entries(constants_1.mixins),
             ...Object.entries(constants_1.parsers),
-            ...Object.entries(constants_1.utils),
         ];
         for (const [, filePath] of entries) {
             try {

package/dist/lib/element.d.ts

@@ -1,5 +1,5 @@
 import { AstNode } from './node';
-import type { LintError } from '../index';
+import type { LintError } from '../base';
 import type { AstNodes, AstText, Token } from '../internal';
 /** 类似HTMLElement */
 export declare abstract class AstElement extends AstNode {
@@ -73,12 +73,12 @@ export declare abstract class AstElement extends AstNode {
      */
     setText(str: string, i?: number): string;
     /**
-     * Linter
+     * @override
      * @param start
      */
     lint(start?: number): LintError[];
     /**
-     * 以HTML格式打印
+     * @override
      * @param opt 选项
      */
     print(opt?: PrintOpt): string;

package/dist/lib/element.js

@@ -244,7 +244,7 @@ class AstElement extends node_1.AstNode {
             : this.childNodes.map(child => child.toString(omit)).join(separator);
     }
     /**
-     * Linter
+     * @override
      * @param start
      */
     lint(start = this.getAbsoluteIndex()) {
@@ -262,7 +262,7 @@ class AstElement extends node_1.AstNode {
         return errors;
     }
     /**
-     * 以HTML格式打印
+     * @override
      * @param opt 选项
      */
     print(opt = {}) {

package/dist/lib/node.d.ts

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

package/dist/lib/node.js

@@ -23,7 +23,6 @@ class AstNode {
     /* NOT FOR BROWSER */
     #optional = new Set();
     #events = new EventEmitter();
-    /* NOT FOR BROWSER END */
     /** 首位子节点 */
     get firstChild() {
         return this.childNodes[0];

package/dist/lib/text.d.ts

@@ -1,5 +1,5 @@
 import { AstNode } from './node';
-import type { LintError } from '../index';
+import type { LintError } from '../base';
 /** 文本节点 */
 export declare class AstText extends AstNode {
     #private;
@@ -13,7 +13,7 @@ export declare class AstText extends AstNode {
     /** 可见部分 */
     text(): string;
     /**
-     * Linter
+     * @override
      * @param start
      */
     lint(start?: number): LintError[];
@@ -22,6 +22,8 @@ export declare class AstText extends AstNode {
      * @param text 替换的字符串
      */
     replaceData(text: string): void;
+    /** @override */
+    print(): string;
     /** 复制 */
     cloneNode(): AstText;
     /**

package/dist/lib/text.js

@@ -56,6 +56,7 @@ const errorSyntax = /https?:\/\/|\{+|\}+|\[{2,}|\[(?![^[]*\])|(?<=^|\])([^[]*?)\
     'param',
     'xmp',
 ];
+const entities = { '&': 'amp', '<': 'lt', '>': 'gt' };
 /** 文本节点 */
 class AstText extends node_1.AstNode {
     type = 'text';
@@ -84,7 +85,7 @@ class AstText extends node_1.AstNode {
         return this.data;
     }
     /**
-     * Linter
+     * @override
      * @param start
      */
     lint(start = this.getAbsoluteIndex()) {
@@ -142,6 +143,10 @@ class AstText extends node_1.AstNode {
     replaceData(text) {
         this.#setData(text);
     }
+    /** @override */
+    print() {
+        return this.data.replace(/[&<>]/gu, p => `&${entities[p]};`);
+    }
     /* NOT FOR BROWSER */
     /** 复制 */
     cloneNode() {

package/dist/src/arg.d.ts

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

package/dist/src/atom.d.ts

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

package/dist/src/attribute.d.ts

@@ -1,7 +1,7 @@
 import * as Parser from '../index';
 import { Token } from './index';
 import { AtomToken } from './atom';
-import type { LintError } from '../index';
+import type { LintError } from '../base';
 import type { AttributesToken } from '../internal';
 export type AttributeTypes = 'ext-attr' | 'html-attr' | 'table-attr';
 declare const AttributeToken_base: ((abstract new (...args: any[]) => {

package/dist/src/attributes.d.ts

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

package/dist/src/attributes.js

@@ -258,7 +258,6 @@ class AttributesToken extends index_1.Token {
             return;
         }
         const token = debug_1.Shadow.run(() => new attribute_1.AttributeToken(this.type.slice(0, -1), this.name, key, value === true ? '' : '=', value === true ? '' : value, ['"', '"'], this.getAttribute('config')));
-        token.setAttribute('name', key);
         this.insertAt(token);
     }
     /**

package/dist/src/converterFlags.d.ts

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

package/dist/src/converterRule.js

@@ -61,21 +61,16 @@ class ConverterRuleToken extends index_1.Token {
      */
     constructor(rule, hasColon = true, config = Parser.getConfig(), accum = []) {
         super(undefined, config, accum);
-        if (hasColon) {
-            const i = rule.indexOf(':'), j = rule.slice(0, i).indexOf('=>'), v = j === -1 ? rule.slice(0, i) : rule.slice(j + 2, i);
-            if (config.variants.includes(v.trim())) {
-                super.insertAt(new atom_1.AtomToken(v, 'converter-rule-variant', config, accum));
-                super.insertAt(new atom_1.AtomToken(rule.slice(i + 1), 'converter-rule-to', config, accum));
-                if (j !== -1) {
-                    super.insertAt(new atom_1.AtomToken(rule.slice(0, j), 'converter-rule-from', config, accum), 0);
-                }
-            }
-            else {
-                super.insertAt(new atom_1.AtomToken(rule, 'converter-rule-noconvert', config, accum));
+        const i = rule.indexOf(':'), j = rule.slice(0, i).indexOf('=>'), v = j === -1 ? rule.slice(0, i) : rule.slice(j + 2, i);
+        if (hasColon && config.variants.includes(v.trim())) {
+            super.insertAt(new atom_1.AtomToken(v, 'converter-rule-variant', config, accum));
+            super.insertAt(new atom_1.AtomToken(rule.slice(i + 1), 'converter-rule-to', config, accum));
+            if (j !== -1) {
+                super.insertAt(new atom_1.AtomToken(rule.slice(0, j), 'converter-rule-from', config, accum), 0);
             }
         }
         else {
-            super.insertAt(new atom_1.AtomToken(rule, 'converter-rule-noconvert', config, accum));
+            super.insertAt(new atom_1.AtomToken(rule, 'converter-rule-to', config, accum));
         }
         this.protectChildren('1:');
     }
@@ -146,11 +141,7 @@ class ConverterRuleToken extends index_1.Token {
         if (this.length === 1) {
             throw new Error(`${this.constructor.name} 需至少保留 1 个子节点！`);
         }
-        const removed = super.removeAt(i);
-        if (this.length === 1) {
-            this.firstChild.type = 'converter-rule-noconvert';
-        }
-        return removed;
+        return super.removeAt(i);
     }
     /**
      * @override

package/dist/src/gallery.d.ts

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

package/dist/src/heading.d.ts

@@ -1,7 +1,7 @@
 import * as Parser from '../index';
 import { Token } from './index';
 import { SyntaxToken } from './syntax';
-import type { LintError } from '../index';
+import type { LintError } from '../base';
 declare const HeadingToken_base: (abstract new (...args: any[]) => {
     prependNewLine(): string;
     toString(omit?: Set<string> | undefined): string;
@@ -26,10 +26,7 @@ declare const HeadingToken_base: (abstract new (...args: any[]) => {
     addEventListener(events: string | string[], listener: AstListener): void;
     replaceChildren(...elements: (string | Parser.AstNodes)[]): void;
 }) & {
-    readonly fixed: true; /**
-     * 章节标题
-     * @classdesc `{childNodes: [Token, SyntaxToken]}`
-     */
+    readonly fixed: true;
 }) & typeof Parser.Token;
 /**
  * 章节标题
@@ -38,7 +35,6 @@ declare const HeadingToken_base: (abstract new (...args: any[]) => {
 export declare class HeadingToken extends HeadingToken_base {
     #private;
     readonly type = "heading";
-    name: string;
     childNodes: [Token, SyntaxToken];
     abstract get children(): [Token, SyntaxToken];
     abstract get firstChild(): Token;

package/dist/src/heading.js

@@ -15,13 +15,14 @@ const syntax_1 = require("./syntax");
  */
 class HeadingToken extends (0, sol_1.sol)((0, fixed_1.fixed)(index_1.Token)) {
     type = 'heading';
+    #level;
     /** 标题格式的等号 */
     get #equals() {
         return '='.repeat(this.level);
     }
     /** 标题层级 */
     get level() {
-        return Number(this.name);
+        return this.#level;
     }
     /* NOT FOR BROWSER */
     set level(n) {
@@ -46,7 +47,7 @@ class HeadingToken extends (0, sol_1.sol)((0, fixed_1.fixed)(index_1.Token)) {
      */
     constructor(level, input, config = Parser.getConfig(), accum = []) {
         super(undefined, config, accum);
-        this.setAttribute('name', String(level));
+        this.#level = level;
         const token = new index_1.Token(input[0], config, accum);
         token.type = 'heading-title';
         token.setAttribute('stage', 2);
@@ -81,7 +82,7 @@ class HeadingToken extends (0, sol_1.sol)((0, fixed_1.fixed)(index_1.Token)) {
     lint(start = this.getAbsoluteIndex()) {
         const errors = super.lint(start), innerStr = String(this.firstChild);
         let refError;
-        if (this.name === '1') {
+        if (this.level === 1) {
             refError = (0, lint_1.generateForSelf)(this, { start }, '<h1>');
             errors.push(refError);
         }
@@ -116,7 +117,7 @@ class HeadingToken extends (0, sol_1.sol)((0, fixed_1.fixed)(index_1.Token)) {
      * @param n 标题层级
      */
     setLevel(n) {
-        this.setAttribute('name', String(Math.min(Math.max(n, 1), 6)));
+        this.#level = Math.min(Math.max(n, 1), 6);
     }
     /** 移除标题后的不可见内容 */
     removeTrail() {

package/dist/src/html.d.ts

@@ -1,6 +1,6 @@
 import * as Parser from '../index';
 import { Token } from './index';
-import type { LintError } from '../index';
+import type { LintError } from '../base';
 import type { AttributesToken } from '../internal';
 declare const HtmlToken_base: (abstract new (...args: any[]) => {
     childNodes: Parser.AstNodes[];
@@ -14,8 +14,7 @@ declare const HtmlToken_base: (abstract new (...args: any[]) => {
     getAttrNames(): Set<string>;
     getAttrs(): Record<string, string | true>;
     setAttr(key: string, value: string | boolean): void;
-    removeAttr(key: string): void;
-    /**
+    removeAttr(key: string): void; /**
      * @param name 标签名
      * @param attr 标签属性
      * @param closing 是否闭合

package/dist/src/imageParameter.d.ts

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

package/dist/src/imagemap.d.ts

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

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

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

package/dist/src/link/base.js

@@ -14,17 +14,18 @@ const atom_1 = require("../atom");
 class LinkBaseToken extends index_1.Token {
     #bracket = true;
     #delimiter;
+    #title;
     /* NOT FOR BROWSER */
     /** 完整链接 */
     get link() {
-        return this.#getTitle();
+        return this.#title;
     }
     set link(link) {
         this.setTarget(link);
     }
     /** fragment */
     get fragment() {
-        return this.#getTitle().fragment;
+        return this.#title.fragment;
     }
     set fragment(fragment) {
         if (fragment === undefined) {
@@ -57,14 +58,15 @@ class LinkBaseToken extends index_1.Token {
     }
     /** @private */
     afterBuild() {
-        this.setAttribute('name', this.#getTitle().title);
+        this.#title = this.getTitle();
+        this.setAttribute('name', this.#title.title);
         if (this.#delimiter.includes('\0')) {
             this.#delimiter = this.buildFromStr(this.#delimiter, 'string');
         }
         const /** @implements */ linkListener = (e, data) => {
             const { prevTarget } = e;
             if (prevTarget?.type === 'link-target') {
-                const name = prevTarget.text(), { title, interwiki, ns, valid } = this.#getTitle();
+                const name = prevTarget.text(), titleObj = this.getTitle(), { title, interwiki, ns, valid } = titleObj;
                 if (!valid) {
                     (0, debug_1.undo)(e, data);
                     throw new Error(`非法的内链目标：${name}`);
@@ -84,6 +86,7 @@ class LinkBaseToken extends index_1.Token {
                         prevTarget.prepend(':');
                     }
                 }
+                this.#title = titleObj;
                 this.setAttribute('name', title);
             }
         };
@@ -94,6 +97,9 @@ class LinkBaseToken extends index_1.Token {
         if (key === 'bracket') {
             this.#bracket = Boolean(value);
         }
+        else if (key === 'title') {
+            this.#title = value;
+        }
         else {
             super.setAttribute(key, value);
         }
@@ -113,6 +119,9 @@ class LinkBaseToken extends index_1.Token {
     }
     /** @private */
     getAttribute(key) {
+        if (key === 'title') {
+            return this.#title;
+        }
         return key === 'padding' ? 2 : super.getAttribute(key);
     }
     /** @private */
@@ -121,7 +130,7 @@ class LinkBaseToken extends index_1.Token {
     }
     /** @override */
     lint(start = this.getAbsoluteIndex()) {
-        const errors = super.lint(start), { childNodes: [target, linkText], type: linkType } = this, { encoded, fragment } = this.#getTitle();
+        const errors = super.lint(start), { childNodes: [target, linkText], type: linkType } = this, { encoded, fragment } = this.#title;
         let rect;
         if (linkType === 'link' && target.childNodes.some(({ type }) => type === 'template')) {
             rect = { start, ...this.getRootNode().posFromIndex(start) };
@@ -141,8 +150,8 @@ class LinkBaseToken extends index_1.Token {
         }
         return errors;
     }
-    /** 生成Title对象 */
-    #getTitle() {
+    /** @private */
+    getTitle() {
         return this.normalizeTitle(this.firstChild.text(), 0, false, true, true);
     }
     /** @override */

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

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

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

@@ -1,7 +1,7 @@
 import * as Parser from '../../index';
 import { Token } from '../index';
 import type { Title } from '../../lib/title';
-import type { LintError } from '../../index';
+import type { LintError } from '../../base';
 import type { AtomToken, ImageParameterToken } from '../../internal';
 declare const GalleryImageToken_base: (abstract new (...args: any[]) => {
     toString(omit?: Set<string> | undefined): string;
@@ -27,6 +27,8 @@ export declare class GalleryImageToken extends GalleryImageToken_base {
      * @param text 图片参数
      */
     constructor(type: 'gallery' | 'imagemap', link: string, text?: string, config?: Parser.Config, accum?: Token[]);
+    /** private */
+    getTitle(): Title;
     /** @override */
     lint(start?: number): LintError[];
     /**

package/dist/src/link/galleryImage.js

@@ -42,8 +42,8 @@ class GalleryImageToken extends (0, singleLine_1.singleLine)(file_1.FileToken) {
         this.setAttribute('bracket', false);
         this.type = `${type}-image`;
     }
-    /** 生成Title对象 */
-    #getTitle() {
+    /** private */
+    getTitle() {
         const imagemap = this.type === 'imagemap-image';
         return this.normalizeTitle(String(this.firstChild), imagemap ? 0 : 6, true, !imagemap);
     }
@@ -53,20 +53,27 @@ class GalleryImageToken extends (0, singleLine_1.singleLine)(file_1.FileToken) {
     }
     /** @override */
     lint(start = this.getAbsoluteIndex()) {
-        const errors = super.lint(start), { interwiki, ns, } = this.#getTitle();
+        const errors = super.lint(start), { interwiki, ns, } = this.getAttribute('title');
         if (interwiki || ns !== 6) {
             errors.push((0, lint_1.generateForSelf)(this, { start }, 'invalid gallery image'));
         }
         return errors;
     }
-    /* NOT FOR BROWSER */
+    /**
+     * 设置`#title`
+     * @param title Title对象
+     */
+    #setName(title) {
+        this.setAttribute('title', title);
+        this.setAttribute('name', title.title);
+    }
     /** @private */
     afterBuild() {
-        this.setAttribute('name', this.#getTitle().title);
+        this.#setName(this.getTitle());
         const /** @implements */ linkListener = (e, data) => {
             const { prevTarget } = e;
             if (prevTarget?.type === 'link-target') {
-                const name = String(prevTarget), { title, interwiki, ns, valid } = this.#getTitle();
+                const name = String(prevTarget), title = this.getTitle(), { interwiki, ns, valid } = title;
                 if (!valid) {
                     (0, debug_1.undo)(e, data);
                     throw new Error(`非法的图片文件名：${name}`);
@@ -75,11 +82,12 @@ class GalleryImageToken extends (0, singleLine_1.singleLine)(file_1.FileToken) {
                     (0, debug_1.undo)(e, data);
                     throw new Error(`图片链接不可更改命名空间：${name}`);
                 }
-                this.setAttribute('name', title);
+                this.#setName(title);
             }
         };
         this.addEventListener(['remove', 'insert', 'replace', 'text'], linkListener);
     }
+    /* NOT FOR BROWSER */
     /**
      * @override
      * @param token 待插入的子节点

package/dist/src/magicLink.d.ts

@@ -1,6 +1,6 @@
 import * as Parser from '../index';
 import { Token } from './index';
-import type { LintError } from '../index';
+import type { LintError } from '../base';
 import type { AstText, CommentToken, IncludeToken, NoincludeToken } from '../internal';
 declare const MagicLinkToken_base: (abstract new (...args: any[]) => {
     "__#5@#pattern": RegExp;

package/dist/src/nested.d.ts

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

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

@@ -1,6 +1,6 @@
 import * as Parser from '../../index';
 import { NowikiBaseToken } from './base';
-import type { LintError } from '../../index';
+import type { LintError } from '../../base';
 import type { Token } from '../index';
 declare const CommentToken_base: ((abstract new (...args: any[]) => {
     text(): string;
@@ -19,7 +19,7 @@ declare const CommentToken_base: ((abstract new (...args: any[]) => {
 export declare class CommentToken extends CommentToken_base {
     readonly type = "comment";
     closed: boolean;
-    /** 内部wikitext */
+    /** 内部文本 */
     get innerText(): string;
     set innerText(text: string);
     /** @param closed 是否闭合 */

package/dist/src/nowiki/comment.js

@@ -13,7 +13,7 @@ class CommentToken extends (0, hidden_1.hidden)(base_1.NowikiBaseToken) {
     type = 'comment';
     closed;
     /* NOT FOR BROWSER */
-    /** 内部wikitext */
+    /** 内部文本 */
     get innerText() {
         return super.innerText;
     }

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

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

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

@@ -1,6 +1,6 @@
 import * as Parser from '../../index';
 import { NowikiBaseToken } from './base';
-import type { LintError } from '../../index';
+import type { LintError } from '../../base';
 declare const QuoteToken_base: (abstract new (...args: any[]) => {
     "__#5@#pattern": RegExp;
     afterBuild(): void;

package/dist/src/nowiki/quote.js

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

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

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

package/dist/src/parameter.d.ts

@@ -1,6 +1,6 @@
 import * as Parser from '../index';
 import { Token } from './index';
-import type { LintError } from '../index';
+import type { LintError } from '../base';
 import type { AtomToken, SyntaxToken, TranscludeToken } from '../internal';
 declare const ParameterToken_base: ((abstract new (...args: any[]) => {
     removeAt(): never;

package/dist/src/parameter.js

@@ -160,10 +160,6 @@ class ParameterToken extends (0, fixed_1.fixed)(index_1.Token) {
      * @param value 参数值
      */
     setValue(value) {
-        const { anon, parentNode } = this;
-        if (anon && parentNode?.isTemplate()) {
-            parentNode.anonToNamed();
-        }
         const { childNodes } = Parser.parse(value, this.getAttribute('include'), undefined, this.getAttribute('config'));
         this.lastChild.replaceChildren(...childNodes);
     }

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

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

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

@@ -1,7 +1,7 @@
 import * as Parser from '../../index';
 import { Token } from '../index';
 import { TableBaseToken } from './base';
-import type { LintError } from '../../index';
+import type { LintError } from '../../base';
 import type { SyntaxToken, AttributesToken, TrToken, TableToken } from '../../internal';
 export type TdSubtypes = 'td' | 'th' | 'caption';
 declare type TdAttrGetter<T extends string> = T extends 'rowspan' | 'colspan' ? number : string | true | undefined;

package/dist/src/table/td.js

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

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

@@ -1,7 +1,7 @@
 import { Token } from '..';
 import { TableBaseToken } from './base';
 import { TdToken } from './td';
-import type { LintError } from '../../index';
+import type { LintError } from '../../base';
 import type { AstNodes, SyntaxToken, TrToken } from '../../internal';
 import type { TdAttrs, TdSubtypes } from './td';
 export interface TableCoords {

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

@@ -2,7 +2,7 @@ import * as Parser from '../../index';
 import { Token } from '../index';
 import { TagPairToken } from './index';
 import { AttributesToken } from '../attributes';
-import type { LintError } from '../../index';
+import type { LintError } from '../../base';
 declare const ExtToken_base: (abstract new (...args: any[]) => {
     childNodes: Parser.AstNodes[];
     readonly "__#8@#attributesChild": Parser.AttributesToken;

package/dist/src/transclude.d.ts

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

package/dist/src/transclude.js

@@ -668,8 +668,7 @@ class TranscludeToken extends index_1.Token {
      * @throws `Error` 转义失败
      */
     escapeTables() {
-        const count = this.hasDuplicatedArgs(), str = this.text(), i = str.search(/\n[^\S\n]*(?::+[^\S\n]*)?\{\|/u);
-        if (i === -1 || str.slice(i).search(/\n[^\S\n]*\|\}/u) === -1) {
+        if (!/\n[^\S\n]*(?::+[^\S\n]*)?\{\|/u.test(this.text())) {
             return this;
         }
         const stripped = String(this).slice(2, -2), include = this.getAttribute('include'), config = this.getAttribute('config'), parsed = Parser.parse(stripped, include, 4, config);
@@ -682,10 +681,6 @@ class TranscludeToken extends index_1.Token {
         if (length !== 1 || !(firstChild instanceof TranscludeToken)) {
             throw new Error('转义表格失败！');
         }
-        const fixed = count - firstChild.hasDuplicatedArgs();
-        if (fixed) {
-            Parser.info(`共修复了 ${fixed} 个重复参数。`);
-        }
         this.safeReplaceWith(firstChild);
         return firstChild;
     }

package/dist/util/constants.js

@@ -1,12 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.promises = exports.typeAliases = exports.aliases = exports.utils = exports.parsers = exports.mixins = exports.classes = exports.MAX_STAGE = void 0;
+exports.promises = exports.typeAliases = exports.aliases = exports.parsers = exports.mixins = exports.classes = exports.MAX_STAGE = void 0;
 exports.MAX_STAGE = 11;
 /* NOT FOR BROWSER */
 exports.classes = {};
 exports.mixins = {};
 exports.parsers = {};
-exports.utils = {};
 exports.aliases = [
     ['AstText'],
     ['CommentToken', 'ExtToken', 'IncludeToken', 'NoincludeToken'],
@@ -98,9 +97,8 @@ exports.typeAliases = {
     'converter-flags': ['convert-flags', 'conversion-flags'],
     'converter-flag': ['convert-flag', 'conversion-flag'],
     'converter-rule': ['convert-rule', 'conversion-rule'],
-    'converter-rule-noconvert': ['convert-rule-noconvert', 'conversion-rule-noconvert'],
     'converter-rule-variant': ['convert-rule-variant', 'conversion-rule-variant'],
-    'converter-rule-to': ['convert-rule-to', 'conversion-rule-to'],
+    'converter-rule-to': ['convert-rule-to', 'conversion-rule-to', 'converter-rule-noconvert'],
     'converter-rule-from': ['convert-rule-from', 'conversion-rule-from'],
     // specific extensions
     'param-line': ['parameter-line'],

package/dist/util/debug.js

@@ -1,13 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.undo = exports.Shadow = void 0;
-const constants_1 = require("./constants");
-// eslint-disable-next-line @typescript-eslint/no-redeclare
 exports.Shadow = {
     /* NOT FOR BROWSER */
     running: false,
     /* NOT FOR BROWSER END */
-    /** @implements */
+    /** @private */
     run(callback) {
         const { running } = this;
         this.running = true;
@@ -62,4 +60,3 @@ const undo = (e, data) => {
     }
 };
 exports.undo = undo;
-constants_1.utils['debug'] = __filename;

package/dist/util/diff.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.diff = exports.cmd = void 0;
 const fs = require("fs/promises");
 const child_process_1 = require("child_process");
-const constants_1 = require("./constants");
 process.on('unhandledRejection', e => {
     console.error(e);
 });
@@ -71,4 +70,3 @@ const diff = async (oldStr, newStr, uid = -1) => {
     console.log(stdout?.split('\n').slice(4).join('\n'));
 };
 exports.diff = diff;
-constants_1.utils['diff'] = __filename;

package/dist/util/lint.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateForSelf = exports.generateForChild = void 0;
-const constants_1 = require("./constants");
 const Parser = require("../index");
 /**
  * 生成对于子节点的LintError对象
@@ -47,4 +46,3 @@ const generateForSelf = (token, boundingRect, msg, severity = 'error') => {
     };
 };
 exports.generateForSelf = generateForSelf;
-constants_1.utils['lint'] = __filename;

package/dist/util/string.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeSpace = exports.print = exports.noWrap = exports.decodeHtml = exports.text = exports.escapeRegExp = exports.removeComment = exports.extUrlChar = exports.extUrlCharFirst = void 0;
-const constants_1 = require("./constants");
 exports.extUrlCharFirst = '(?:\\[[\\da-f:.]+\\]|[^[\\]<>"\\0-\\x1F\\x7F\\p{Zs}\\uFFFD])';
 exports.extUrlChar = '(?:[^[\\]<>"\\0-\\x1F\\x7F\\p{Zs}\\uFFFD]|\\0\\d+c\\x7F)*';
 /**
@@ -41,10 +40,8 @@ exports.noWrap = noWrap;
  * @param opt 选项
  */
 const print = (childNodes, opt = {}) => {
-    const { pre = '', post = '', sep = '' } = opt, entities = { '&': 'amp', '<': 'lt', '>': 'gt' };
-    return `${pre}${childNodes.map(child => child.type === 'text'
-        ? child.data.replace(/[&<>]/gu, p => `&${entities[p]};`)
-        : child.print()).join(sep)}${post}`;
+    const { pre = '', post = '', sep = '' } = opt;
+    return `${pre}${childNodes.map(child => child.print()).join(sep)}${post}`;
 };
 exports.print = print;
 /* NOT FOR BROWSER */
@@ -62,4 +59,3 @@ const normalizeSpace = (token) => {
     }
 };
 exports.normalizeSpace = normalizeSpace;
-constants_1.utils['string'] = __filename;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wikiparser-node",
-	"version": "1.1.1",
+	"version": "1.1.2",
 	"description": "A Node.js parser for MediaWiki markup with AST",
 	"keywords": [
 		"mediawiki",
@@ -27,7 +27,7 @@
 	},
 	"scripts": {
 		"toc": "node ./dist/bin/toc.js",
-		"prepublishOnly": "npm run build; rm dist/internal.js; rm -r dist/test; rm dist/[bmpu]*/*.d.ts; grep -rl --include='*.d.ts' '@private' dist/ | xargs gsed -i '/@private/,+1d'",
+		"prepublishOnly": "npm run build; rm dist/internal.js dist/base.js dist/[bmpu]*/*.d.ts; rm -r dist/test; grep -rl --include='*.d.ts' '@private' dist/ | xargs gsed -i '/@private/,+1d'",
 		"build": "rm -rf dist/; tsc; grep -rl --include='*.d.ts' '@private' dist/ | xargs gsed -i '/@private/,+1d'",
 		"diff": "git diff --ignore-all-space --color-moved",
 		"lint:ts": "tsc --noEmit && eslint --cache .",