wikilint 2.11.1 → 2.12.4

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/magicLinks.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseMagicLinks = void 0;
 const string_1 = require("../util/string");
 const magicLink_1 = require("../src/magicLink");
+const space = String.raw `[\p{Zs}\t]| |&#0*160;|&#x0*a0;`, sp = `(?:${space})+`, spdash = `(?:${space}|-)`, magicLinkPattern = String.raw `(?:RFC|PMID)${sp}\d+\b|ISBN${sp}(?:97[89]${spdash}?)?(?:\d${spdash}?){9}[\dx]\b`;
 /**
  * 解析自由外链
  * @param wikitext
@@ -10,7 +11,7 @@ const magicLink_1 = require("../src/magicLink");
  * @param accum
  */
 const parseMagicLinks = (wikitext, config, accum) => {
-    const space = String.raw `[\p{Zs}\t]| |&#0*160;|&#x0*a0;`, spdash = `(?:${space}|-)`, regex = new RegExp(String.raw `(^|[^\p{L}\d_])(?:(?:${config.protocol})(${string_1.extUrlCharFirst}${string_1.extUrlChar})|(?:RFC|PMID)(?:${space})+\d+\b|ISBN(?:${space})+(?:97[89]${spdash}?)?(?:\d${spdash}?){9}[\dx]\b)`, 'giu');
+    const regex = new RegExp(String.raw `(^|[^\p{L}\d_])(?:(?:${config.protocol})(${string_1.extUrlCharFirst}${string_1.extUrlChar})|${magicLinkPattern})`, 'giu');
     return wikitext.replace(regex, (m, lead, p1) => {
         let url = lead ? m.slice(lead.length) : m;
         if (p1) {

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 */
@@ -64,7 +64,7 @@ class HeadingToken extends index_2.Token {
         if (innerStr.startsWith('=') || innerStr.endsWith('=')) {
             errors.push((0, lint_1.generateForChild)(firstChild, rect, 'unbalanced-header', index_1.default.msg('unbalanced $1 in a section header', '"="')));
         }
-        if (this.closest('html-attrs, table-attrs')) {
+        if (this.closest('html-attrs,table-attrs')) {
             errors.push((0, lint_1.generateForSelf)(this, rect, 'parsing-order', 'section header in a HTML tag'));
         }
         if (boldQuotes.length % 2) {

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();
@@ -335,27 +337,38 @@ class Token extends element_1.AstElement {
     lint(start = this.getAbsoluteIndex(), re) {
         let errors = super.lint(start, re);
         if (this.type === 'root') {
-            const record = {};
-            for (const cat of this.querySelectorAll('category')) {
-                const thisCat = record[cat.name];
+            const record = {}, selector = 'category,html-attr#id,ext-attr#id,table-attr#id';
+            for (const cat of this.querySelectorAll(selector)) {
+                let key;
+                if (cat.type === 'category') {
+                    key = cat.name;
+                }
+                else {
+                    const value = cat.getValue();
+                    key = `#${value === true ? '' : value}`;
+                }
+                const thisCat = record[key];
                 if (thisCat) {
                     thisCat.add(cat);
                 }
                 else {
-                    record[cat.name] = new Set([cat]);
+                    record[key] = new Set([cat]);
                 }
             }
-            for (const value of Object.values(record)) {
-                if (value.size > 1) {
+            for (const [key, value] of Object.entries(record)) {
+                if (value.size > 1 && !key.startsWith('#mw-customcollapsible-')) {
+                    const isCat = !key.startsWith('#'), msg = `duplicated ${isCat ? 'category' : 'id'}`, severity = isCat ? 'error' : 'warning';
                     errors.push(...[...value].map(cat => {
-                        const e = (0, lint_1.generateForSelf)(cat, { start: cat.getAbsoluteIndex() }, 'no-duplicate', 'duplicated category');
-                        e.suggestions = [
-                            {
-                                desc: 'remove',
-                                range: [e.startIndex, e.endIndex],
-                                text: '',
-                            },
-                        ];
+                        const e = (0, lint_1.generateForSelf)(cat, { start: cat.getAbsoluteIndex() }, 'no-duplicate', msg, severity);
+                        if (isCat) {
+                            e.suggestions = [
+                                {
+                                    desc: 'remove',
+                                    range: [e.startIndex, e.endIndex],
+                                    text: '',
+                                },
+                            ];
+                        }
                         return e;
                     }));
                 }

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') {
@@ -126,7 +120,7 @@ class ExtToken extends index_3.TagPairToken {
     /** @private */
     lint(start = this.getAbsoluteIndex(), re) {
         const errors = super.lint(start, re), rect = new rect_1.BoundingRect(this, start);
-        if (this.name !== 'nowiki' && this.closest('html-attrs, table-attrs')) {
+        if (this.name !== 'nowiki' && this.closest('html-attrs,table-attrs')) {
             errors.push((0, lint_1.generateForSelf)(this, rect, 'parsing-order', 'extension tag in HTML tag attributes'));
         }
         if (this.name === 'ref' && this.closest('heading-title')) {