wikilint 2.11.1 → 2.12.2

package/config/.schema.json

@@ -45,7 +45,7 @@
 		},
 		"parserFunction": {
 			"type": "array",
-			"items": [
+			"prefixItems": [
 				{
 					"description": "case-insensitive parser functions",
 					"type": "object",
@@ -93,14 +93,31 @@
 		"doubleUnderscore": {
 			"description": "behavior switches",
 			"type": "array",
-			"items": {
-				"type": "array",
-				"items": {
-					"type": "string"
+			"prefixItems": [
+				{
+					"description": "case-insensitive behavior switches",
+					"type": "array",
+					"items": {
+						"type": "string"
+					}
+				},
+				{
+					"description": "case-sensitive behavior switches",
+					"type": "array",
+					"items": {
+						"type": "string"
+					}
+				},
+				{
+					"description": "case-insensitive behavior switches",
+					"type": "object",
+					"additionalProperties": {
+						"type": "string"
+					}
 				}
-			},
+			],
 			"minItems": 2,
-			"maxItems": 2
+			"maxItems": 3
 		},
 		"protocol": {
 			"description": "external link protocols",

package/config/default.json

@@ -717,34 +717,7 @@
 		]
 	],
 	"doubleUnderscore": [
-		[
-			"forcetoc",
-			"强显目录",
-			"強制目錄",
-			"nocc",
-			"nocontentconvert",
-			"不转换内容",
-			"不轉換內容",
-			"noeditsection",
-			"无段落编辑",
-			"无编辑段落",
-			"無段落編輯",
-			"nogallery",
-			"无图库",
-			"無圖庫",
-			"notc",
-			"notitleconvert",
-			"不转换标题",
-			"不轉換標題",
-			"notoc",
-			"无目录",
-			"無目錄",
-			"toc",
-			"目录",
-			"目錄",
-			"archivedtalk",
-			"notalk"
-		],
+		[],
 		[
 			"EXPECTUNUSEDCATEGORY",
 			"DISAMBIG",
@@ -765,7 +738,35 @@
 			"靜態重新導向",
 			"NOGLOBAL",
 			"EXPECTED_UNCONNECTED_PAGE"
-		]
+		],
+		{
+			"forcetoc": "forcetoc",
+			"强显目录": "forcetoc",
+			"強制目錄": "forcetoc",
+			"nocc": "nocontentconvert",
+			"nocontentconvert": "nocontentconvert",
+			"不转换内容": "nocontentconvert",
+			"不轉換內容": "nocontentconvert",
+			"noeditsection": "noeditsection",
+			"无段落编辑": "noeditsection",
+			"无编辑段落": "noeditsection",
+			"無段落編輯": "noeditsection",
+			"nogallery": "nogallery",
+			"无图库": "nogallery",
+			"無圖庫": "nogallery",
+			"notc": "notitleconvert",
+			"notitleconvert": "notitleconvert",
+			"不转换标题": "notitleconvert",
+			"不轉換標題": "notitleconvert",
+			"notoc": "notoc",
+			"无目录": "notoc",
+			"無目錄": "notoc",
+			"toc": "toc",
+			"目录": "toc",
+			"目錄": "toc",
+			"archivedtalk": "archivedtalk",
+			"notalk": "notalk"
+		}
 	],
 	"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": [],

package/config/enwiki.json

@@ -343,19 +343,7 @@
 		]
 	],
 	"doubleUnderscore": [
-		[
-			"forcetoc",
-			"nocc",
-			"nocontentconvert",
-			"noeditsection",
-			"nogallery",
-			"notc",
-			"notitleconvert",
-			"notoc",
-			"toc",
-			"archivedtalk",
-			"notalk"
-		],
+		[],
 		[
 			"EXPECTUNUSEDCATEGORY",
 			"DISAMBIG",
@@ -367,7 +355,20 @@
 			"STATICREDIRECT",
 			"NOGLOBAL",
 			"EXPECTED_UNCONNECTED_PAGE"
-		]
+		],
+		{
+			"forcetoc": "forcetoc",
+			"nocc": "nocontentconvert",
+			"nocontentconvert": "nocontentconvert",
+			"noeditsection": "noeditsection",
+			"nogallery": "nogallery",
+			"notc": "notitleconvert",
+			"notitleconvert": "notitleconvert",
+			"notoc": "notoc",
+			"toc": "toc",
+			"archivedtalk": "archivedtalk",
+			"notalk": "notalk"
+		}
 	],
 	"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": [],

package/config/llwiki.json

@@ -483,25 +483,7 @@
 		]
 	],
 	"doubleUnderscore": [
-		[
-			"forcetoc",
-			"强显目录",
-			"nocc",
-			"nocontentconvert",
-			"不转换内容",
-			"noeditsection",
-			"无段落编辑",
-			"无编辑段落",
-			"nogallery",
-			"无图库",
-			"notc",
-			"notitleconvert",
-			"不转换标题",
-			"notoc",
-			"无目录",
-			"toc",
-			"目录"
-		],
+		[],
 		[
 			"EXPECTUNUSEDCATEGORY",
 			"HIDDENCAT",
@@ -516,7 +498,26 @@
 			"无新段落链接",
 			"STATICREDIRECT",
 			"静态重定向"
-		]
+		],
+		{
+			"forcetoc": "forcetoc",
+			"强显目录": "forcetoc",
+			"nocc": "nocontentconvert",
+			"nocontentconvert": "nocontentconvert",
+			"不转换内容": "nocontentconvert",
+			"noeditsection": "noeditsection",
+			"无段落编辑": "noeditsection",
+			"无编辑段落": "noeditsection",
+			"nogallery": "nogallery",
+			"无图库": "nogallery",
+			"notc": "notitleconvert",
+			"notitleconvert": "notitleconvert",
+			"不转换标题": "notitleconvert",
+			"notoc": "notoc",
+			"无目录": "notoc",
+			"toc": "toc",
+			"目录": "toc"
+		}
 	],
 	"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": [],

package/config/moegirl.json

@@ -575,25 +575,7 @@
 		]
 	],
 	"doubleUnderscore": [
-		[
-			"forcetoc",
-			"强显目录",
-			"nocc",
-			"nocontentconvert",
-			"不转换内容",
-			"noeditsection",
-			"无段落编辑",
-			"无编辑段落",
-			"nogallery",
-			"无图库",
-			"notc",
-			"notitleconvert",
-			"不转换标题",
-			"notoc",
-			"无目录",
-			"toc",
-			"目录"
-		],
+		[],
 		[
 			"DISAMBIG",
 			"消除歧义",
@@ -609,7 +591,26 @@
 			"无新段落链接",
 			"STATICREDIRECT",
 			"静态重定向"
-		]
+		],
+		{
+			"forcetoc": "forcetoc",
+			"强显目录": "forcetoc",
+			"nocc": "nocontentconvert",
+			"nocontentconvert": "nocontentconvert",
+			"不转换内容": "nocontentconvert",
+			"noeditsection": "noeditsection",
+			"无段落编辑": "noeditsection",
+			"无编辑段落": "noeditsection",
+			"nogallery": "nogallery",
+			"无图库": "nogallery",
+			"notc": "notitleconvert",
+			"notitleconvert": "notitleconvert",
+			"不转换标题": "notitleconvert",
+			"notoc": "notoc",
+			"无目录": "notoc",
+			"toc": "toc",
+			"目录": "toc"
+		}
 	],
 	"protocol": "bitcoin:|ftp://|ftps://|geo:|git://|gopher://|http://|https://|irc://|ircs://|magnet:|mailto:|mms://|news:|nntp://|redis://|sftp://|sip:|sips:|sms:|ssh://|svn://|tel:|telnet://|urn:|worldwind://|xmpp:",
 	"interwiki": [],

package/config/zhwiki.json

@@ -659,32 +659,7 @@
 		]
 	],
 	"doubleUnderscore": [
-		[
-			"forcetoc",
-			"强显目录",
-			"強制目錄",
-			"nocc",
-			"nocontentconvert",
-			"不转换内容",
-			"不轉換內容",
-			"noeditsection",
-			"无段落编辑",
-			"无编辑段落",
-			"無段落編輯",
-			"nogallery",
-			"无图库",
-			"無圖庫",
-			"notc",
-			"notitleconvert",
-			"不转换标题",
-			"不轉換標題",
-			"notoc",
-			"无目录",
-			"無目錄",
-			"toc",
-			"目录",
-			"目錄"
-		],
+		[],
 		[
 			"EXPECTUNUSEDCATEGORY",
 			"DISAMBIG",
@@ -705,7 +680,33 @@
 			"靜態重新導向",
 			"NOGLOBAL",
 			"EXPECTED_UNCONNECTED_PAGE"
-		]
+		],
+		{
+			"forcetoc": "forcetoc",
+			"强显目录": "forcetoc",
+			"強制目錄": "forcetoc",
+			"nocc": "nocontentconvert",
+			"nocontentconvert": "nocontentconvert",
+			"不转换内容": "nocontentconvert",
+			"不轉換內容": "nocontentconvert",
+			"noeditsection": "noeditsection",
+			"无段落编辑": "noeditsection",
+			"无编辑段落": "noeditsection",
+			"無段落編輯": "noeditsection",
+			"nogallery": "nogallery",
+			"无图库": "nogallery",
+			"無圖庫": "nogallery",
+			"notc": "notitleconvert",
+			"notitleconvert": "notitleconvert",
+			"不转换标题": "notitleconvert",
+			"不轉換標題": "notitleconvert",
+			"notoc": "notoc",
+			"无目录": "notoc",
+			"無目錄": "notoc",
+			"toc": "toc",
+			"目录": "toc",
+			"目錄": "toc"
+		}
 	],
 	"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": [],

package/dist/base.d.ts

@@ -4,7 +4,7 @@ export interface Config {
     readonly namespaces: Record<string, string>;
     readonly nsid: Record<string, number>;
     readonly parserFunction: [Record<string, string>, string[], string[], string[]];
-    readonly doubleUnderscore: [string[], string[]];
+    readonly doubleUnderscore: [string[], string[], Record<string, string>?];
     readonly protocol: string;
     readonly img: Record<string, string>;
     readonly redirection: string[];

package/dist/index.js

@@ -6,6 +6,8 @@ const base_1 = require("./base");
 const debug_1 = require("./util/debug");
 const constants_1 = require("./util/constants");
 const string_1 = require("./util/string");
+/* NOT FOR BROWSER */
+const diff_1 = require("./util/diff");
 /**
  * 从根路径require
  * @param file 文件名
@@ -22,6 +24,13 @@ const Parser = {
             this.config = rootRequire(this.config, 'config');
             return this.getConfig();
         }
+        const { doubleUnderscore } = this.config;
+        if (doubleUnderscore.length === 2) {
+            (0, diff_1.error)(`The schema (${path.resolve(__dirname, '..', 'config', '.schema.json')}) of parser configuration is updated.`);
+        }
+        else if (doubleUnderscore[0].length === 0) {
+            doubleUnderscore[0] = Object.keys(doubleUnderscore[2]);
+        }
         return {
             ...this.config,
             excludes: [],
@@ -52,7 +61,13 @@ const Parser = {
                 for (const key of ['main', 'fragment']) {
                     const str = t[key];
                     if (str?.includes('\0')) {
-                        t[key] = root.buildFromStr(str, constants_1.BuildMethod.Text);
+                        const s = root.buildFromStr(str, constants_1.BuildMethod.Text);
+                        if (key === 'main') {
+                            t.main = s;
+                        }
+                        else {
+                            t.setFragment(s);
+                        }
                     }
                 }
                 return t;

package/dist/lib/text.js

@@ -89,6 +89,7 @@ class AstText extends node_1.AstNode {
         }
         errorRegex ??= type === 'free-ext-link'
             || type === 'ext-link-url'
+            || type === 'ext-link-text'
             || type === 'image-parameter' && name === 'link'
             || isHtmlAttrVal
             ? errorSyntaxUrl

package/dist/lib/title.d.ts

@@ -2,10 +2,12 @@ import type { Config } from '../base';
 /** MediaWiki页面标题对象 */
 export declare class Title {
     #private;
-    ns: number;
-    fragment: string | undefined;
     interwiki: string;
     readonly valid: boolean;
+    /** 命名空间 */
+    get ns(): number;
+    /** 片段标识符 */
+    get fragment(): string | undefined;
     /** 不含命名空间的标题主体部分 */
     get main(): string;
     set main(title: string);
@@ -24,4 +26,6 @@ export declare class Title {
      * @param selfLink 是否允许selfLink
      */
     constructor(title: string, defaultNs: number, config: Config, decode: boolean, selfLink: boolean);
+    /** 检测是否是重定向 */
+    getRedirection(): [boolean, string];
 }

package/dist/lib/title.js

@@ -6,12 +6,20 @@ const string_1 = require("../util/string");
 class Title {
     #main;
     #namespaces;
-    ns;
-    fragment;
+    #ns;
+    #fragment;
     interwiki = '';
     valid;
     /** @private */
     encoded = false;
+    /** 命名空间 */
+    get ns() {
+        return this.#ns;
+    }
+    /** 片段标识符 */
+    get fragment() {
+        return this.#fragment;
+    }
     /** 不含命名空间的标题主体部分 */
     get main() {
         return this.#main;
@@ -27,10 +35,7 @@ class Title {
     }
     /** 完整标题 */
     get title() {
-        const prefix = this.interwiki + (this.interwiki && ':') + this.prefix;
-        // eslint-disable-next-line prefer-const
-        let title = (prefix + this.main).replace(/ /gu, '_');
-        return title;
+        return this.getRedirection()[1];
     }
     /** 扩展名 */
     get extension() {
@@ -58,7 +63,7 @@ class Title {
         }
         title = title.replace(/[_ ]+/gu, ' ').trim();
         if (subpage) {
-            this.ns = 0;
+            this.#ns = 0;
         }
         else {
             let ns = defaultNs;
@@ -74,7 +79,7 @@ class Title {
                     title = m.slice(1).join(':').trim();
                 }
             }
-            this.ns = ns;
+            this.#ns = ns;
         }
         const i = title.indexOf('#');
         if (i !== -1) {
@@ -85,10 +90,11 @@ class Title {
                 }
                 catch { }
             }
-            this.fragment = fragment;
+            this.#fragment = fragment.replace(/ /gu, '_');
             title = title.slice(0, i).trim();
         }
-        this.valid = Boolean(title || this.interwiki || selfLink && this.ns === 0 && this.fragment !== undefined)
+        this.valid = Boolean(title || this.interwiki || selfLink && this.ns === 0 && this.#fragment !== undefined)
+            && (0, string_1.decodeHtml)(title) === title
             && !/^:|\0\d+[eh!+-]\x7F|[<>[\]{}|\n]|%[\da-f]{2}|(?:^|\/)\.{1,2}(?:$|\/)/iu.test(subpage ? /^(?:\.\.\/)+(.*)/u.exec(title)[1] : title);
         this.main = title;
         Object.defineProperties(this, {
@@ -97,10 +103,21 @@ class Title {
         this.#namespaces = config.namespaces;
     }
     /** @private */
-    toString() {
-        return `${this.title}${this.fragment === undefined
+    toString(display) {
+        return `${display ? this.title.replace(/_/gu, ' ') : this.title}${this.#fragment === undefined
             ? ''
-            : `#${this.fragment}`}`;
+            : `#${this.#fragment}`}`;
+    }
+    /** 检测是否是重定向 */
+    getRedirection() {
+        const prefix = this.interwiki + (this.interwiki && ':') + this.prefix;
+        // eslint-disable-next-line prefer-const
+        let title = (prefix + this.main).replace(/ /gu, '_');
+        return [false, title];
+    }
+    /** @private */
+    setFragment(fragment) {
+        this.#fragment = fragment;
     }
 }
 exports.Title = Title;

package/dist/parser/braces.js

@@ -6,7 +6,7 @@ const heading_1 = require("../src/heading");
 const transclude_1 = require("../src/transclude");
 const arg_1 = require("../src/arg");
 const closes = {
-    '=': '\n',
+    '=': String.raw `\n(?!(?:[^\S\n]|\0\d+[cn]\x7F)*\n)`,
     '{': String.raw `\}{2,}|\|`,
     '-': String.raw `\}-`,
     '[': String.raw `\]\]`,
@@ -19,7 +19,7 @@ const closes = {
  * @throws TranscludeToken.constructor()
  */
 const parseBraces = (wikitext, config, accum) => {
-    const source = String.raw `${config.excludes?.includes('heading') ? '' : String.raw `^(\0\d+c\x7F)*={1,6}|`}\[\[|-\{(?!\{)`, openBraces = String.raw `|\{{2,}`, { parserFunction: [, , , subst] } = config, stack = [];
+    const source = String.raw `${config.excludes?.includes('heading') ? '' : String.raw `^((?:\0\d+[cno]\x7F)*)={1,6}|`}\[\[|-\{(?!\{)`, openBraces = String.raw `|\{{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);
@@ -49,7 +49,7 @@ const parseBraces = (wikitext, config, accum) => {
             lastIndex = curIndex + 1;
             const { pos, findEqual } = stack[stack.length - 1] ?? {};
             if (pos === undefined || findEqual || (0, string_1.removeComment)(wikitext.slice(pos, index)) !== '') {
-                const rmt = /^(={1,6})(.+)\1((?:\s|\0\d+c\x7F)*)$/u
+                const rmt = /^(={1,6})(.+)\1((?:\s|\0\d+[cn]\x7F)*)$/u
                     .exec(wikitext.slice(index, curIndex));
                 if (rmt) {
                     wikitext = `${wikitext.slice(0, index)}\0${accum.length}h\x7F${wikitext.slice(curIndex)}`;
@@ -94,7 +94,7 @@ const parseBraces = (wikitext, config, accum) => {
                         ch = 'm';
                     }
                     else if (/^#vardefine:./iu.test(name)) {
-                        ch = 'c';
+                        ch = 'n';
                     }
                 }
                 catch (e) {

package/dist/parser/commentAndExt.js

@@ -31,7 +31,7 @@ const parseCommentAndExt = (wikitext, config, accum, includeOnly) => {
             const noinclude = (text) => {
                 // @ts-expect-error abstract class
                 new noinclude_1.NoincludeToken(text, config, accum);
-                str += `\0${accum.length - 1}c\x7F`;
+                str += `\0${accum.length - 1}n\x7F`;
             };
             while (i !== -1 && j !== -1) {
                 const token = `\0${accum.length}e\x7F`;
@@ -51,12 +51,15 @@ const parseCommentAndExt = (wikitext, config, accum, includeOnly) => {
     }
     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`;
+        const l = accum.length;
+        let ch = 'n';
         if (name) {
+            ch = 'e';
             // @ts-expect-error abstract class
             new ext_1.ExtToken(name, attr, inner, closing, config, accum);
         }
         else if (substr.startsWith('<!--')) {
+            ch = 'c';
             const closed = substr.endsWith('-->');
             // @ts-expect-error abstract class
             new comment_1.CommentToken(substr.slice(4, closed ? -3 : undefined), closed, config, accum);
@@ -69,7 +72,7 @@ const parseCommentAndExt = (wikitext, config, accum, includeOnly) => {
             // @ts-expect-error abstract class
             new noinclude_1.NoincludeToken(substr, config, accum);
         }
-        return str;
+        return `\0${l}${ch}\x7F`;
     });
 };
 exports.parseCommentAndExt = parseCommentAndExt;

package/dist/parser/converter.js

@@ -9,7 +9,7 @@ const converter_1 = require("../src/converter");
  * @param accum
  */
 const parseConverter = (text, config, accum) => {
-    const variants = `(?:${config.variants.join('|')})`, regex1 = /-\{/gu, regex2 = /-\{|\}-/gu, regex3 = new RegExp(String.raw `;(?=(?:[^;]*?=>)?\s*${variants}\s*:|(?:\s|\0\d+c\x7F)*$)`, 'u'), stack = [];
+    const variants = `(?:${config.variants.join('|')})`, regex1 = /-\{/gu, regex2 = /-\{|\}-/gu, regex3 = new RegExp(String.raw `;(?=(?:[^;]*?=>)?\s*${variants}\s*:|(?:\s|\0\d+[cn]\x7F)*$)`, 'u'), stack = [];
     let regex = regex1, mt = regex.exec(text);
     while (mt) {
         const { 0: syntax, index } = mt;

package/dist/parser/hrAndDoubleUnderscore.js

@@ -15,19 +15,19 @@ const parseHrAndDoubleUnderscore = ({ firstChild: { data }, type, name }, config
     if (type !== 'root' && (type !== 'ext-inner' || name !== 'poem')) {
         data = `\0${data}`;
     }
-    data = data.replace(/^((?:\0\d+c\x7F)*)(-{4,})/gmu, (_, lead, m) => {
+    data = data.replace(/^((?:\0\d+[cno]\x7F)*)(-{4,})/gmu, (_, lead, m) => {
         // @ts-expect-error abstract class
         new hr_1.HrToken(m, config, accum);
         return `${lead}\0${accum.length - 1}r\x7F`;
-    }).replace(new RegExp(`__(${[...doubleUnderscore[0], ...doubleUnderscore[1]].join('|')})__`, 'giu'), (m, p1) => {
-        const caseSensitive = sensitive.has(p1);
-        if (caseSensitive || insensitive.has(p1.toLowerCase())) {
+    }).replace(new RegExp(`__(${[...insensitive, ...sensitive].join('|')})__`, 'giu'), (m, p1) => {
+        const caseSensitive = sensitive.has(p1), lc = p1.toLowerCase(), caseInsensitive = insensitive.has(lc);
+        if (caseSensitive || caseInsensitive) {
             // @ts-expect-error abstract class
             new doubleUnderscore_1.DoubleUnderscoreToken(p1, caseSensitive, config, accum);
-            return `\0${accum.length - 1}u\x7F`;
+            return `\0${accum.length - 1}${caseInsensitive && (doubleUnderscore[2]?.[lc] ?? lc) === 'toc' ? 'u' : 'n'}\x7F`;
         }
         return m;
-    }).replace(/^((?:\0\d+c\x7F)*)(={1,6})(.+)\2((?:[^\S\n]|\0\d+c\x7F)*)$/gmu, (_, lead, equals, heading, trail) => {
+    }).replace(/^((?:\0\d+[cn]\x7F)*)(={1,6})(.+)\2((?:\s|\0\d+[cn]\x7F)*)$/gmu, (_, lead, equals, heading, trail) => {
         const text = `${lead}\0${accum.length}h\x7F`;
         // @ts-expect-error abstract class
         new heading_1.HeadingToken(equals.length, [heading, trail], config, accum);

package/dist/parser/list.js

@@ -13,7 +13,7 @@ const dd_1 = require("../src/nowiki/dd");
  * @param accum
  */
 const parseList = (wikitext, state, config, accum) => {
-    const mt = /^((?:\0\d+c\x7F)*)([;:*#]+\s*)/u.exec(wikitext);
+    const mt = /^((?:\0\d+[cno]\x7F)*)([;:*#]+\s*)/u.exec(wikitext);
     if (!mt) {
         state.lastPrefix = '';
         return wikitext;

package/dist/parser/redirect.js

@@ -12,7 +12,7 @@ const redirect_1 = require("../src/redirect");
 const parseRedirect = (text, config, accum) => {
     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)}`;
+        text = `\0${accum.length}o\x7F${text.slice(mt[0].length)}`;
         // @ts-expect-error abstract class
         new redirect_1.RedirectToken(...mt.slice(1), config, accum);
         return text;

package/dist/parser/table.js

@@ -47,7 +47,7 @@ const parseTable = ({ firstChild: { data }, type, name }, config, accum) => {
     pop = () => top.type === 'td' ? stack.pop() : top;
     for (const outLine of lines) {
         top = stack.pop();
-        const [spaces] = /^(?:\s|\0\d+c\x7F)*/u.exec(outLine), line = outLine.slice(spaces.length), matchesStart = /^(:*)((?:\s|\0\d+c\x7F)*)(\{\||\{(?:\0\d+c\x7F)*\0\d+!\x7F|\0\d+\{\x7F)(.*)$/u
+        const [spaces] = /^(?:\s|\0\d+[cno]\x7F)*/u.exec(outLine), line = outLine.slice(spaces.length), matchesStart = /^(:*)((?:\s|\0\d+[cn]\x7F)*)(\{\||\{(?:\0\d+[cn]\x7F)*\0\d+!\x7F|\0\d+\{\x7F)(.*)$/u
             .exec(line);
         if (matchesStart) {
             while (top && top.type !== 'td') {

package/dist/src/arg.js

@@ -23,17 +23,17 @@ class ArgToken extends index_2.Token {
     /** @param parts 以'|'分隔的各部分 */
     constructor(parts, config = index_1.default.getConfig(), accum = []) {
         super(undefined, config, accum, {});
-        for (let i = 0; i < parts.length; i++) {
+        for (const [i, part] of parts.entries()) {
             if (i === 0) {
-                const token = new atom_1.AtomToken(parts[i], 'arg-name', config, accum, {});
+                const token = new atom_1.AtomToken(part, 'arg-name', config, accum, {});
                 super.insertAt(token);
             }
             else if (i > 1) {
-                const token = new hidden_1.HiddenToken(parts[i], config, accum);
+                const token = new hidden_1.HiddenToken(part, config, accum);
                 super.insertAt(token);
             }
             else {
-                const token = new index_2.Token(parts[i], config, accum);
+                const token = new index_2.Token(part, config, accum);
                 token.type = 'arg-default';
                 token.setAttribute('stage', 2);
                 super.insertAt(token);

package/dist/src/attribute.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AttributeToken = void 0;
 const lint_1 = require("../util/lint");
-const rect_1 = require("../lib/rect");
 const string_1 = require("../util/string");
 const constants_1 = require("../util/constants");
+const rect_1 = require("../lib/rect");
 const index_1 = require("../index");
 const index_2 = require("./index");
 const atom_1 = require("./atom");
@@ -270,7 +270,7 @@ class AttributeToken extends index_2.Token {
         if (attrs && !attrs.has(name)
             || (type === 'ext-attr' ? tag in htmlAttrs : !/\{\{[^{]+\}\}/u.test(name))
                 && !htmlAttrs[tag]?.has(name)
-                && !/^(?:xmlns:[\w:.-]+|data-[^:]*)$/u.test(name)
+                && !/^(?:xmlns:[\w:.-]+|data-(?!ooui|mw|parsoid)[^:]*)$/u.test(name)
                 && (tag === 'meta' || tag === 'link' || !commonHtmlAttrs.has(name))) {
             errors.push((0, lint_1.generateForChild)(firstChild, rect, 'illegal-attr', 'illegal attribute name'));
         }

package/dist/src/attributes.d.ts

@@ -3,7 +3,7 @@ import { Token } from './index';
 import { AtomToken } from './atom';
 import { AttributeToken } from './attribute';
 import type { LintError } from '../base';
-import type { ExtToken, HtmlToken, TdToken, TrToken, TableToken } from '../internal';
+import type { ExtToken, HtmlToken, TdToken, TrToken, TableToken, SyntaxToken } from '../internal';
 import type { AttributeTypes } from './attribute';
 declare type AttributesTypes = `${AttributeTypes}s`;
 /**
@@ -17,6 +17,7 @@ export declare abstract class AttributesToken extends Token {
     abstract get firstChild(): AtomToken | AttributeToken | undefined;
     abstract get lastChild(): AtomToken | AttributeToken | undefined;
     abstract get parentNode(): ExtToken | HtmlToken | TableToken | TrToken | TdToken | undefined;
+    abstract get previousSibling(): SyntaxToken | undefined;
     get type(): AttributesTypes;
     /**
      * @param attr 标签属性

package/dist/src/attributes.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AttributesToken = void 0;
 const lint_1 = require("../util/lint");
-const rect_1 = require("../lib/rect");
 const string_1 = require("../util/string");
+const rect_1 = require("../lib/rect");
 const index_1 = require("../index");
 const index_2 = require("./index");
 const atom_1 = require("./atom");
@@ -37,7 +37,7 @@ class AttributesToken extends index_2.Token {
         this.#type = type;
         this.setAttribute('name', name);
         if (attr) {
-            const regex = /([^\s/](?:(?!\0\d+~\x7F)[^\s/=])*)(?:((?:\s(?:\s|\0\d+c\x7F)*)?(?:=|\0\d+~\x7F)(?:\s|\0\d+c\x7F)*)(?:(["'])(.*?)(\3|$)|(\S*)))?/gsu;
+            const regex = /([^\s/](?:(?!\0\d+~\x7F)[^\s/=])*)(?:((?:\s(?:\s|\0\d+[cn]\x7F)*)?(?:=|\0\d+~\x7F)(?:\s|\0\d+[cn]\x7F)*)(?:(["'])(.*?)(\3|$)|(\S*)))?/gsu;
             let out = '', mt = regex.exec(attr), lastIndex = 0;
             const insertDirty = /** 插入无效属性 */ () => {
                 if (out) {
@@ -97,14 +97,13 @@ class AttributesToken extends index_2.Token {
     }
     /** @private */
     lint(start = this.getAbsoluteIndex(), re) {
-        const errors = super.lint(start, re), { parentNode, length, childNodes } = this, attrs = new Map(), duplicated = new Set(), rect = new rect_1.BoundingRect(this, start);
+        const errors = super.lint(start, re), { parentNode, childNodes } = this, attrs = new Map(), duplicated = new Set(), rect = new rect_1.BoundingRect(this, start);
         if (parentNode?.type === 'html' && parentNode.closing && this.text().trim()) {
             const e = (0, lint_1.generateForSelf)(this, rect, 'no-ignored', 'attributes of a closing tag');
             e.fix = { range: [start, e.endIndex], text: '' };
             errors.push(e);
         }
-        for (let i = 0; i < length; i++) {
-            const attr = childNodes[i];
+        for (const attr of childNodes) {
             if (attr instanceof atom_1.AtomToken && attr.text().trim()) {
                 const e = (0, lint_1.generateForChild)(attr, rect, 'no-ignored', 'containing invalid attribute');
                 e.suggestions = [

package/dist/src/converterFlags.js

@@ -53,9 +53,9 @@ class ConverterFlagsToken extends index_2.Token {
         if (variantFlags.size === knownFlagCount || validFlags.size === knownFlagCount) {
             return errors;
         }
-        const rect = new rect_1.BoundingRect(this, start), { childNodes, length } = this;
-        for (let i = 0; i < length; i++) {
-            const child = childNodes[i], flag = child.text().trim();
+        const rect = new rect_1.BoundingRect(this, start);
+        for (const [i, child] of this.childNodes.entries()) {
+            const flag = child.text().trim();
             if (flag
                 && !variantFlags.has(flag)
                 && !unknownFlags.has(flag)

package/dist/src/extLink.js

@@ -22,7 +22,7 @@ class ExtLinkToken extends index_2.Token {
      */
     constructor(url, space = '', text = '', config = index_1.default.getConfig(), accum = []) {
         super(undefined, config, accum, {});
-        const link = url && /\0\d+f\x7F/u.test(url)
+        const link = url && /^\0\d+f\x7F$/u.test(url)
             ? accum[Number(url.slice(1, -2))]
             // @ts-expect-error abstract class
             : new magicLink_1.MagicLinkToken(url, 'ext-link-url', config, accum);

package/dist/src/gallery.js

@@ -56,8 +56,8 @@ class GalleryToken extends index_2.Token {
     /** @private */
     lint(start = this.getAbsoluteIndex(), re) {
         const { top, left } = this.getRootNode().posFromIndex(start), errors = [];
-        for (let i = 0; i < this.length; i++) {
-            const child = this.childNodes[i], str = child.toString(), { length } = str, trimmed = str.trim(), startLine = top + i, startCol = i ? 0 : left;
+        for (const [i, child] of this.childNodes.entries()) {
+            const str = child.toString(), { length } = str, trimmed = str.trim(), startLine = top + i, startCol = i ? 0 : left;
             if (child.type === 'noinclude' && trimmed && !/^<!--.*-->$/u.test(trimmed)) {
                 const endIndex = start + length;
                 errors.push({

package/dist/src/heading.d.ts

@@ -2,6 +2,7 @@ import Parser from '../index';
 import { Token } from './index';
 import { SyntaxToken } from './syntax';
 import type { LintError } from '../base';
+import type { AstText } from '../internal';
 /**
  * 章节标题
  * @classdesc `{childNodes: [Token, SyntaxToken]}`
@@ -11,6 +12,7 @@ export declare abstract class HeadingToken extends Token {
     readonly childNodes: readonly [Token, SyntaxToken];
     abstract get firstChild(): Token;
     abstract get lastChild(): SyntaxToken;
+    abstract get nextSibling(): AstText | undefined;
     get type(): 'heading';
     /** 标题层级 */
     get level(): number;

package/dist/src/heading.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HeadingToken = void 0;
 const lint_1 = require("../util/lint");
-const rect_1 = require("../lib/rect");
 const debug_1 = require("../util/debug");
+const rect_1 = require("../lib/rect");
 const index_1 = require("../index");
 const index_2 = require("./index");
 const syntax_1 = require("./syntax");
@@ -34,7 +34,7 @@ class HeadingToken extends index_2.Token {
         const token = new index_2.Token(input[0], config, accum);
         token.type = 'heading-title';
         token.setAttribute('stage', 2);
-        const trail = new syntax_1.SyntaxToken(input[1], /^[^\S\n]*$/u, 'heading-trail', config, accum, {});
+        const trail = new syntax_1.SyntaxToken(input[1], /^\s*$/u, 'heading-trail', config, accum, {});
         this.append(token, trail);
     }
     /** @private */

package/dist/src/html.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HtmlToken = void 0;
 const lint_1 = require("../util/lint");
-const rect_1 = require("../lib/rect");
 const string_1 = require("../util/string");
+const rect_1 = require("../lib/rect");
 const index_1 = require("./index");
 const magicWords = new Set(['if', 'ifeq', 'ifexpr', 'ifexist', 'iferror', 'switch']), formattingTags = new Set([
     'b',

package/dist/src/imagemap.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ImagemapToken = void 0;
 const lint_1 = require("../util/lint");
-const rect_1 = require("../lib/rect");
 const debug_1 = require("../util/debug");
+const rect_1 = require("../lib/rect");
 const index_1 = require("../index");
 const index_2 = require("./index");
 const noinclude_1 = require("./nowiki/noinclude");

package/dist/src/imagemapLink.d.ts

@@ -3,7 +3,7 @@ import { Token } from './index';
 import { NoincludeToken } from './nowiki/noinclude';
 import { LinkToken } from './link/index';
 import { ExtLinkToken } from './extLink';
-import type { AstText, ImagemapToken } from '../internal';
+import type { AstText, ImagemapToken, GalleryImageToken } from '../internal';
 /**
  * `<imagemap>`内的链接
  * @classdesc `{childNodes: [AstText, LinkToken|ExtLinkToken, NoincludeToken]}`
@@ -13,6 +13,8 @@ export declare abstract class ImagemapLinkToken extends Token {
     abstract get firstChild(): AstText;
     abstract get lastChild(): NoincludeToken;
     abstract get parentNode(): ImagemapToken | undefined;
+    abstract get previousSibling(): GalleryImageToken | this | NoincludeToken | AstText;
+    abstract get nextSibling(): this | NoincludeToken | AstText | undefined;
     get type(): 'imagemap-link';
     /**
      * @param pre 链接前的文本

package/dist/src/index.js

@@ -23,7 +23,7 @@
 // ~: `{{=}}`专用
 // a: AttributeToken
 // b: TableToken
-// c: CommentToken、NoIncludeToken和IncludeToken
+// c: CommentToke
 // d: ListToken
 // e: ExtToken
 // f: MagicLinkToken inside ImageParameterToken
@@ -31,11 +31,13 @@
 // i: RFC/PMID/ISBN
 // l: LinkToken
 // m: `{{fullurl:}}`、`{{canonicalurl:}}`或`{{filepath:}}`
+// n: NoIncludeToken和IncludeToken
+// o: RedirectToken
 // q: QuoteToken
 // r: HrToken
 // s: `{{{|subst:}}}`
 // t: ArgToken或TranscludeToken
-// u: DoubleUnderscoreToken
+// u: `__toc__`
 // v: ConverterToken
 // w: ExtLinkToken
 // x: HtmlToken
@@ -157,7 +159,7 @@ class Token extends element_1.AstElement {
     /** @private */
     build() {
         this.#stage = constants_1.MAX_STAGE;
-        const { length, firstChild } = this, str = String(firstChild);
+        const { length, firstChild } = this, str = firstChild?.toString();
         if (length === 1 && firstChild.type === 'text' && str.includes('\0')) {
             this.replaceChildren(...this.buildFromStr(str));
             this.normalize();

package/dist/src/magicLink.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MagicLinkToken = void 0;
 const lint_1 = require("../util/lint");
-const rect_1 = require("../lib/rect");
 const string_1 = require("../util/string");
+const rect_1 = require("../lib/rect");
 const index_1 = require("../index");
 const index_2 = require("./index");
 const space = String.raw `(?:[\p{Zs}\t]| |&#0*160;|&#[xX]0*[aA]0;)`, spaceRegex = new RegExp(`${space}+`, 'gu');
@@ -30,11 +30,13 @@ class MagicLinkToken extends index_2.Token {
     }
     /** 和内链保持一致 */
     get link() {
-        let { innerText } = this;
-        if (this.type === 'magic-link' && innerText.startsWith('ISBN')) {
-            innerText = `ISBN ${innerText.slice(5).replace(/[- ]/gu, '').replace(/x$/u, 'X')}`;
+        const { innerText } = this;
+        if (this.type === 'magic-link') {
+            return innerText.startsWith('ISBN')
+                ? `ISBN ${innerText.slice(5).replace(/[- ]/gu, '').replace(/x$/u, 'X')}`
+                : innerText;
         }
-        return innerText;
+        return (0, string_1.decodeNumber)(innerText);
     }
     /**
      * @param url 网址

package/dist/src/nested.js

@@ -33,10 +33,10 @@ class NestedToken extends index_2.Token {
                 new comment_1.CommentToken(comment.slice(4, closed ? -3 : undefined), closed, config, accum);
             }
             return str;
-        }).replace(/(^|\0\d+[ce]\x7F)([^\0]+)(?=$|\0\d+[ce]\x7F)/gu, (_, lead, substr) => {
+        }).replace(/(^|\0\d+[cne]\x7F)([^\0]+)(?=$|\0\d+[cne]\x7F)/gu, (_, lead, substr) => {
             // @ts-expect-error abstract class
             new noinclude_1.NoincludeToken(substr, config, accum);
-            return `${lead}\0${accum.length}c\x7F`;
+            return `${lead}\0${accum.length}n\x7F`;
         });
         super(wikitext, config, accum, {});
     }

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

@@ -1,5 +1,5 @@
+import Parser from '../../index';
 import { NowikiBaseToken } from './base';
-import type { Config } from '../../base';
 import type { Token } from '../index';
 /** 状态开关 */
 export declare abstract class DoubleUnderscoreToken extends NowikiBaseToken {
@@ -8,5 +8,5 @@ export declare abstract class DoubleUnderscoreToken extends NowikiBaseToken {
      * @param word 状态开关名
      * @param sensitive 是否固定大小写
      */
-    constructor(word: string, sensitive: boolean, config?: Config, accum?: Token[]);
+    constructor(word: string, sensitive: boolean, config?: Parser.Config, accum?: Token[]);
 }

package/dist/src/nowiki/doubleUnderscore.js

@@ -36,6 +36,7 @@ var __runInitializers = (this && this.__runInitializers) || function (thisArg, i
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DoubleUnderscoreToken = void 0;
 const hidden_1 = require("../../mixin/hidden");
+const index_1 = require("../../index");
 const base_1 = require("./base");
 /** 状态开关 */
 let DoubleUnderscoreToken = (() => {
@@ -60,7 +61,7 @@ let DoubleUnderscoreToken = (() => {
          * @param word 状态开关名
          * @param sensitive 是否固定大小写
          */
-        constructor(word, sensitive, config, accum) {
+        constructor(word, sensitive, config = index_1.default.getConfig(), accum) {
             super(word, config, accum);
         }
         /** @private */

package/dist/src/parameter.js

@@ -33,7 +33,8 @@ class ParameterToken extends index_2.Token {
     }
     /** @private */
     trimName(name, set = true) {
-        const trimmed = (0, string_1.trimPHP)(typeof name === 'string' ? name : name.toString(true));
+        const trimmed = (typeof name === 'string' ? name : name.toString(true))
+            .replace(/^[ \t\n\0\v]+|([^ \t\n\0\v])[ \t\n\0\v]+$/gu, '$1');
         this.setAttribute('name', trimmed);
         return trimmed;
     }

package/dist/src/pre.js

@@ -23,7 +23,7 @@ class PreToken extends index_2.Token {
                 new noinclude_1.NoincludeToken(opening, config, accum);
                 // @ts-expect-error abstract class
                 new noinclude_1.NoincludeToken(closing, config, accum);
-                str += `${wikitext.slice(0, i)}\0${accum.length - 1}c\x7F${wikitext.slice(i + length, j)}\0${accum.length}c\x7F`;
+                str += `${wikitext.slice(0, i)}\0${accum.length - 1}n\x7F${wikitext.slice(i + length, j)}\0${accum.length}n\x7F`;
                 wikitext = wikitext.slice(j + length + 1);
                 i = wikitext.indexOf(opening);
                 j = wikitext.indexOf(closing, i + length);

package/dist/src/table/index.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TableToken = exports.Layout = exports.isRowEnd = void 0;
 const lint_1 = require("../../util/lint");
-const rect_1 = require("../../lib/rect");
 const debug_1 = require("../../util/debug");
+const rect_1 = require("../../lib/rect");
 const index_1 = require("../../index");
 const trBase_1 = require("./trBase");
 const syntax_1 = require("../syntax");
@@ -91,8 +91,7 @@ class TableToken extends trBase_1.TrBaseToken {
      */
     getLayout(stop) {
         const rows = this.getAllRows(), { length } = rows, layout = new Layout(...(0, debug_1.emptyArray)(length, () => []));
-        for (let i = 0; i < length; i++) {
-            const rowLayout = layout[i];
+        for (const [i, rowLayout] of layout.entries()) {
             let j = 0, k = 0, last;
             for (const cell of rows[i].childNodes.slice(2)) {
                 if (cell.type === 'td') {

package/dist/src/table/td.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TdToken = void 0;
 const lint_1 = require("../../util/lint");
-const rect_1 = require("../../lib/rect");
 const constants_1 = require("../../util/constants");
 const debug_1 = require("../../util/debug");
+const rect_1 = require("../../lib/rect");
 const index_1 = require("../../index");
 const index_2 = require("../index");
 const base_1 = require("./base");

package/dist/src/tagPair/ext.js

@@ -7,6 +7,12 @@ const index_1 = require("../../index");
 const index_2 = require("../index");
 const index_3 = require("./index");
 const attributes_1 = require("../attributes");
+const pre_1 = require("../pre");
+const index_4 = require("../paramTag/index");
+const inputbox_1 = require("../paramTag/inputbox");
+const gallery_1 = require("../gallery");
+const imagemap_1 = require("../imagemap");
+const index_5 = require("../nowiki/index");
 /**
  * 从数组中删除指定元素
  * @param arr 数组
@@ -53,25 +59,19 @@ class ExtToken extends index_3.TagPairToken {
                 }
                 innerToken = new index_2.Token(inner, newConfig, accum);
                 break;
-            case 'pre': {
-                const { PreToken } = require('../pre');
+            case 'pre':
                 // @ts-expect-error abstract class
-                innerToken = new PreToken(inner, newConfig, accum);
+                innerToken = new pre_1.PreToken(inner, newConfig, accum);
                 break;
-            }
-            case 'dynamicpagelist': {
-                const { ParamTagToken } = require('../paramTag/index');
+            case 'dynamicpagelist':
                 // @ts-expect-error abstract class
-                innerToken = new ParamTagToken(inner, newConfig, accum);
+                innerToken = new index_4.ParamTagToken(inner, newConfig, accum);
                 break;
-            }
-            case 'inputbox': {
+            case 'inputbox':
                 newConfig.excludes.push('heading');
-                const { InputboxToken } = require('../paramTag/inputbox');
                 // @ts-expect-error abstract class
-                innerToken = new InputboxToken(inner, newConfig, accum);
+                innerToken = new inputbox_1.InputboxToken(inner, newConfig, accum);
                 break;
-            }
             case 'references': {
                 const { NestedToken } = require('../nested');
                 // @ts-expect-error abstract class
@@ -90,18 +90,14 @@ class ExtToken extends index_3.TagPairToken {
                 innerToken = new NestedToken(inner, /<(combooption)(\s[^>]*?)?(?:\/>|>(.*?)<\/(combooption\s*)>)/gisu, ['combooption'], newConfig, accum);
                 break;
             }
-            case 'gallery': {
-                const { GalleryToken } = require('../gallery');
+            case 'gallery':
                 // @ts-expect-error abstract class
-                innerToken = new GalleryToken(inner, newConfig, accum);
+                innerToken = new gallery_1.GalleryToken(inner, newConfig, accum);
                 break;
-            }
-            case 'imagemap': {
-                const { ImagemapToken } = require('../imagemap');
+            case 'imagemap':
                 // @ts-expect-error abstract class
-                innerToken = new ImagemapToken(inner, newConfig, accum);
+                innerToken = new imagemap_1.ImagemapToken(inner, newConfig, accum);
                 break;
-            }
             // 更多定制扩展的代码示例：
             // ```
             // case 'extensionName': {
@@ -110,11 +106,9 @@ class ExtToken extends index_3.TagPairToken {
             //   break;
             // }
             // ```
-            default: {
-                const { NowikiToken } = require('../nowiki/index');
+            default:
                 // @ts-expect-error abstract class
-                innerToken = new NowikiToken(inner, newConfig, accum);
-            }
+                innerToken = new index_5.NowikiToken(inner, newConfig, accum);
         }
         innerToken.setAttribute('name', lcName);
         if (innerToken.type === 'plain') {

package/dist/src/transclude.js

@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TranscludeToken = void 0;
 const string_1 = require("../util/string");
 const lint_1 = require("../util/lint");
-const rect_1 = require("../lib/rect");
 const debug_1 = require("../util/debug");
 const constants_1 = require("../util/constants");
+const rect_1 = require("../lib/rect");
 const index_1 = require("../index");
 const index_2 = require("./index");
 const parameter_1 = require("./parameter");
@@ -38,13 +38,13 @@ class TranscludeToken extends index_2.Token {
      */
     constructor(title, parts, config = index_1.default.getConfig(), accum = []) {
         super(undefined, config, accum, {});
-        const { parserFunction: [insensitive, sensitive] } = config, argSubst = /^(?:\s|\0\d+c\x7F)*\0\d+s\x7F/u.exec(title)?.[0];
+        const { parserFunction: [insensitive, sensitive] } = config, argSubst = /^(?:\s|\0\d+[cn]\x7F)*\0\d+s\x7F/u.exec(title)?.[0];
         if (argSubst) {
             this.setAttribute('modifier', argSubst);
             title = title.slice(argSubst.length);
         }
         else if (title.includes(':')) {
-            const [modifier, ...arg] = title.split(':'), [mt] = /^(?:\s|\0\d+c\x7F)*/u.exec(arg[0] ?? '');
+            const [modifier, ...arg] = title.split(':'), [mt] = /^(?:\s|\0\d+[cn]\x7F)*/u.exec(arg[0] ?? '');
             if (this.setModifier(`${modifier}:${mt}`)) {
                 title = arg.join(':').slice(mt.length);
             }
@@ -83,8 +83,7 @@ class TranscludeToken extends index_2.Token {
         }
         const templateLike = this.isTemplate();
         let i = 1;
-        for (let j = 0; j < parts.length; j++) {
-            const part = parts[j];
+        for (const [j, part] of parts.entries()) {
             if (!templateLike && !(this.name === 'switch' && j > 0)) {
                 part[0] = part.join('=');
                 part.length = 1;

package/dist/util/string.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.noWrap = exports.decodeHtml = exports.text = exports.trimPHP = exports.rawurldecode = exports.escapeRegExp = exports.removeComment = exports.tidy = exports.extUrlChar = exports.extUrlCharFirst = void 0;
+exports.noWrap = exports.decodeNumber = exports.decodeHtml = exports.text = exports.rawurldecode = exports.escapeRegExp = exports.removeComment = exports.tidy = exports.extUrlChar = exports.extUrlCharFirst = void 0;
 const commonExtUrlChar = String.raw `[^[\]<>"\0-\x1F\x7F\p{Zs}\uFFFD]`;
 exports.extUrlCharFirst = String.raw `(?:\[[\da-f:.]+\]|${commonExtUrlChar})`;
-exports.extUrlChar = String.raw `(?:${commonExtUrlChar}|\0\d+[c!~]\x7F)*`;
+exports.extUrlChar = String.raw `(?:${commonExtUrlChar}|\0\d+[cn!~]\x7F)*`;
 /**
  * 生成正则替换函数
  * @param regex 正则表达式
@@ -13,7 +13,7 @@ const factory = (regex, replace) => (str) => str.replace(regex, replace);
 /** 清理解析专用的不可见字符 */
 exports.tidy = factory(/[\0\x7F]|\r$/gmu, '');
 /** remove half-parsed comment-like tokens */
-exports.removeComment = factory(/\0\d+c\x7F/gu, '');
+exports.removeComment = factory(/\0\d+[cn]\x7F/gu, '');
 /** escape special chars for RegExp constructor */
 exports.escapeRegExp = factory(/[\\{}()|.?*+^$[\]]/gu, String.raw `\$&`);
 /**
@@ -22,8 +22,6 @@ exports.escapeRegExp = factory(/[\\{}()|.?*+^$[\]]/gu, String.raw `\$&`);
  */
 const rawurldecode = (str) => decodeURIComponent(str.replace(/%(?![\da-f]{2})/giu, '%25'));
 exports.rawurldecode = rawurldecode;
-/** PHP的`trim`函数的JavaScript实现 */
-exports.trimPHP = factory(/^[ \t\n\0\v]+|([^ \t\n\0\v])[ \t\n\0\v]+$/gu, '$1');
 /**
  * extract effective wikitext
  * @param childNodes a Token's contents
@@ -31,10 +29,12 @@ exports.trimPHP = factory(/^[ \t\n\0\v]+|([^ \t\n\0\v])[ \t\n\0\v]+$/gu, '$1');
  */
 const text = (childNodes, separator = '') => childNodes.map(child => typeof child === 'string' ? child : child.text()).join(separator);
 exports.text = text;
-const names = { lt: '<', gt: '>', lbrack: '[', rbrack: ']', lbrace: '{', rbrace: '}', nbsp: ' ' };
+const names = { lt: '<', gt: '>', lbrack: '[', rbrack: ']', lbrace: '{', rbrace: '}', nbsp: ' ', amp: '&', quot: '"' };
 /** decode HTML entities */
-exports.decodeHtml = factory(/&(?:#(\d+|x[\da-fA-F]+)|([lLgG][tT]|[lr]brac[ke]|nbsp));/gu, (_, code, name) => code
+exports.decodeHtml = factory(/&(?:#(\d+|[Xx][\da-fA-F]+)|([lLgG][tT]|[lr]brac[ke]|nbsp|amp|AMP|quot|QUOT));/gu, (_, code, name) => code
     ? String.fromCodePoint(Number((/^x/iu.test(code) ? '0' : '') + code))
     : names[name.toLowerCase()]);
+/** decode numbered HTML entities */
+exports.decodeNumber = factory(/&#(\d+|x[\da-f]+);/giu, (_, code) => String.fromCodePoint(Number((/^x/iu.test(code) ? '0' : '') + code)));
 /** escape newlines */
 exports.noWrap = factory(/\n/gu, String.raw `\n`);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wikilint",
-	"version": "2.11.1",
+	"version": "2.12.2",
 	"description": "A Node.js linter for MediaWiki markup",
 	"keywords": [
 		"mediawiki",
@@ -42,7 +42,7 @@
 		"lint:ts": "tsc --noEmit && eslint --cache .",
 		"lint:json": "v8r -s config/.schema.json config/*.json",
 		"lint": "npm run lint:ts && npm run lint:json",
-		"prof": "node --prof dist/test/prof.js && node --prof-process isolate-0x*-v8.log > test/prof.txt && bash sed.sh -i '0,/Bottom up/d' test/prof.txt && rm isolate-0x*-v8.log",
+		"prof": "node dist/test/prof.js",
 		"test": "node dist/test/test.js",
 		"test:end": "pkill -x http-server",
 		"test:real": "node dist/test/real.js"