wikiparser-node 1.16.5 → 1.16.6

package/dist/lib/element.js

@@ -303,6 +303,7 @@ class AstElement extends node_1.AstNode {
                 acc += self.getAttribute('padding');
                 for (let i = 0; acc <= index && i < childNodes.length; i++) {
                     const cur = childNodes[i], { nextSibling } = cur, str = cur.toString(), l = str.length;
+                    cur.setAttribute('aIndex', acc);
                     acc += l;
                     // 优先选择靠前的非文本兄弟节点，但永不进入假节点
                     if (acc > index

package/dist/lib/lsp.js

@@ -172,18 +172,24 @@ const getSectionEnd = (section, lines, line) => {
 /** VSCode-style language service */
 class LanguageService {
     #text;
+    #text2;
     #running;
+    #running2;
     #done;
+    #done2;
     #config;
+    #config2;
     #completionConfig;
-    #signature;
     /** @private */
     data;
     /** @param uri 任务标识 */
     constructor(uri) {
         exports.tasks.set(uri, this);
         /* NOT FOR BROWSER ONLY */
-        this.data = require(path.join('..', '..', 'data', 'signatures'));
+        Object.defineProperty(this, 'data', {
+            value: require(path.join('..', '..', 'data', 'signatures')),
+            enumerable: false,
+        });
     }
     /** @implements */
     destroy() {
@@ -193,7 +199,7 @@ class LanguageService {
      * 提交解析任务
      * @param text 源代码
      * @description
-     * - 总是更新`text`以便`parse`完成时可以判断是否需要重新解析
+     * - 总是更新`#text`以便`#parse`完成时可以判断是否需要重新解析
      * - 如果已有进行中或已完成的解析，则返回该解析的结果
      * - 否则开始新的解析
      */
@@ -209,7 +215,7 @@ class LanguageService {
     /**
      * 执行解析
      * @description
-     * - 完成后会检查`text`是否已更新，如果是则重新解析
+     * - 完成后会检查`#text`是否已更新，如果是则重新解析
      * - 总是返回最新的解析结果
      */
     async #parse() {
@@ -227,14 +233,41 @@ class LanguageService {
         return this.#running;
     }
     /**
-     * 检查是否为签名语言服务器
-     * @throws `Error` 是签名语言服务器
+     * 提交签名解析任务
+     * @param text 源代码
+     * @description
+     * - 总是更新`#text2`以便`#parseSignature`完成时可以判断是否需要重新解析
+     * - 如果已有进行中或已完成的解析，则返回该解析的结果
+     * - 否则开始新的解析
+     */
+    async #queueSignature(text) {
+        text = (0, string_1.tidy)(text);
+        if (this.#text2 === text && this.#config2 === index_1.default.config && !this.#running2) {
+            return this.#done2;
+        }
+        this.#text2 = text;
+        this.#running2 ??= this.#parseSignature(); // 不要提交多个解析任务
+        return this.#running2;
+    }
+    /**
+     * 执行签名解析
+     * @description
+     * - 完成后会检查`#text2`是否已更新，如果是则重新解析
+     * - 总是返回最新的解析结果
      */
-    #checkSignature() {
-        /* istanbul ignore if */
-        if (this.#signature) {
-            throw new Error('This is a signature language server!');
+    async #parseSignature() {
+        const config = index_1.default.getConfig();
+        this.#config2 = index_1.default.config;
+        const text = this.#text2, root = await index_1.default.partialParse(text, () => this.#text2, true, config);
+        if (this.#text2 === text && this.#config2 === index_1.default.config) {
+            this.#done2 = root;
+            this.#running2 = undefined;
+            return root;
         }
+        /* istanbul ignore next */
+        this.#running2 = this.#parseSignature();
+        /* istanbul ignore next */
+        return this.#running2;
     }
     /**
      * Provide color decorators
@@ -245,9 +278,8 @@ class LanguageService {
      * @param hsl whether HSL colors are treated / 是否允许HSL颜色
      */
     async provideDocumentColors(rgba, text, hsl = true) {
-        this.#checkSignature();
         const root = await this.#queue(text);
-        return root.querySelectorAll('attr-value,parameter-value,arg-default')
+        return root.querySelectorAll('attr-value,parameter-value,arg-default').reverse()
             .flatMap(({ type, childNodes }) => {
             if (type !== 'attr-value' && !isPlain(childNodes)) {
                 return [];
@@ -336,7 +368,6 @@ class LanguageService {
      * @param position 位置
      */
     async provideCompletionItems(text, position) {
-        this.#checkSignature();
         const { re, allTags, functions, switches, protocols, params, tags, ext } = this.#prepareCompletionConfig(), { line, character } = position, curLine = text.split(/\r?\n/u, line + 1)[line], mt = re.exec(curLine?.slice(0, character) ?? '');
         if (mt?.[1] !== undefined) { // tag
             const closing = mt[1].startsWith('/');
@@ -448,7 +479,6 @@ class LanguageService {
      * @param warning whether to include warnings / 是否包含警告
      */
     async provideDiagnostics(text, warning = true) {
-        this.#checkSignature();
         const root = await this.#queue(text), errors = root.lint();
         return (warning ? errors : errors.filter(({ severity }) => severity === 'error'))
             .map(({ startLine, startCol, endLine, endCol, severity, rule, message, fix, suggestions }) => ({
@@ -474,34 +504,36 @@ class LanguageService {
      * @param text source Wikitext / 源代码
      */
     async provideFoldingRanges(text) {
-        this.#checkSignature();
         const root = await this.#queue(text), { length } = root.getLines(), ranges = [], levels = new Array(6), tokens = root.querySelectorAll('heading-title,table,template,magic-word');
         for (const token of [...tokens].reverse()) { // 提高 getBoundingClientRect 的性能
             token.getRelativeIndex();
         }
         for (const token of tokens) {
-            const { top, height } = token.getBoundingClientRect();
-            if (token.type === 'heading-title') {
-                const { level } = token.parentNode;
-                for (let i = level - 1; i < 6; i++) {
-                    const startLine = levels[i];
-                    if (startLine !== undefined && startLine < top - 1) {
-                        ranges.push({
-                            startLine,
-                            endLine: top - 1,
-                            kind: 'region',
-                        });
+            const { offsetHeight } = token;
+            if (token.type === 'heading-title' || offsetHeight > 2) {
+                const { top } = token.getBoundingClientRect();
+                if (token.type === 'heading-title') {
+                    const { level } = token.parentNode;
+                    for (let i = level - 1; i < 6; i++) {
+                        const startLine = levels[i];
+                        if (startLine !== undefined && startLine < top - 1) {
+                            ranges.push({
+                                startLine,
+                                endLine: top - 1,
+                                kind: 'region',
+                            });
+                        }
+                        levels[i] = undefined;
                     }
-                    levels[i] = undefined;
+                    levels[level - 1] = top + offsetHeight - 1; // 从标题的最后一行开始折叠
+                }
+                else {
+                    ranges.push({
+                        startLine: top, // 从表格或模板的第一行开始折叠
+                        endLine: top + offsetHeight - 2,
+                        kind: 'region',
+                    });
                 }
-                levels[level - 1] = top + height - 1; // 从标题的最后一行开始折叠
-            }
-            else if (height > 2) {
-                ranges.push({
-                    startLine: top, // 从表格或模板的第一行开始折叠
-                    endLine: top + height - 2,
-                    kind: 'region',
-                });
             }
         }
         for (const startLine of levels) {
@@ -522,13 +554,13 @@ class LanguageService {
      * @param text source Wikitext / 源代码
      */
     async provideLinks(text) {
-        this.#checkSignature();
         /^(?:http:\/\/|\/\/)/iu; // eslint-disable-line @typescript-eslint/no-unused-expressions
         const { articlePath, protocol } = index_1.default.getConfig(), absolute = articlePath?.includes('//'), protocolRegex = new RegExp(`^(?:${protocol}|//)`, 'iu');
         return (await this.#queue(text))
-            .querySelectorAll(`magic-link,ext-link-url,free-ext-link,attr-value,image-parameter#link${absolute ? ',link-target,template-name,invoke-module' : ''}`).reverse()
+            .querySelectorAll(`magic-link,ext-link-url,free-ext-link,attr-value,image-parameter#link${absolute ? ',link-target,template-name,invoke-module' : ''}`)
+            .reverse()
             .map((token) => {
-            const { type, parentNode, firstChild, lastChild, childNodes } = token, { name, tag } = parentNode;
+            const { type, parentNode, firstChild, lastChild, childNodes, length } = token, { name, tag } = parentNode;
             if (!(type !== 'attr-value'
                 || name === 'src' && ['templatestyles', 'img'].includes(tag)
                 || name === 'cite' && ['blockquote', 'del', 'ins', 'q'].includes(tag))
@@ -536,7 +568,9 @@ class LanguageService {
                 return false;
             }
             let target = childNodes.filter((node) => node.type === 'text')
-                .map(({ data }) => data).join('').trim();
+                .map(({ data }) => data)
+                .join('')
+                .trim();
             if (!target) {
                 return false;
             }
@@ -583,7 +617,7 @@ class LanguageService {
                 }
                 target = new URL(target).href;
                 if (type === 'image-parameter') {
-                    const { top, left, height, width } = lastChild.getBoundingClientRect(), rect = firstChild.getBoundingClientRect();
+                    const rect = firstChild.getBoundingClientRect(), { top, left, height, width } = length === 1 ? rect : lastChild.getBoundingClientRect();
                     return {
                         range: {
                             start: { line: rect.top, character: rect.left },
@@ -597,7 +631,8 @@ class LanguageService {
             catch {
                 return false;
             }
-        }).filter(Boolean);
+        })
+            .filter(Boolean);
     }
     /**
      * Provide references
@@ -607,7 +642,6 @@ class LanguageService {
      * @param position 位置
      */
     async provideReferences(text, position) {
-        this.#checkSignature();
         const root = await this.#queue(text), { offsetNode, offset } = caretPositionFromWord(root, position), element = offsetNode.type === 'text' ? offsetNode.parentNode : offsetNode, node = offset === 0 && (element.type === 'ext-attr-dirty' || element.type === 'html-attr-dirty')
             ? element.parentNode.parentNode
             : element, { type } = node, refName = getRefName(node), refGroup = getRefGroup(node);
@@ -616,7 +650,7 @@ class LanguageService {
         }
         const name = getName(node), refs = root.querySelectorAll(type === 'heading-title' ? 'heading' : type).filter(token => type === 'attr-value'
             ? getRefName(token) === refName || getRefGroup(token) === refGroup
-            : getName(token) === name).map((token) => ({
+            : getName(token) === name).reverse().map((token) => ({
             range: createNodeRange(token.type === 'parameter-key' ? token.parentNode : token),
         }));
         return refs.length === 0 ? undefined : refs;
@@ -629,7 +663,6 @@ class LanguageService {
      * @param position 位置
      */
     async provideDefinition(text, position) {
-        this.#checkSignature();
         const root = await this.#queue(text), node = root.elementFromPoint(position.character, position.line), ext = node.is('ext') && node.name === 'ref'
             ? node
             : node.closest('ext#ref'), refName = getRefTagAttr(ext, 'name');
@@ -638,7 +671,7 @@ class LanguageService {
         }
         const refGroup = getRefTagAttr(ext, 'group'), refs = root.querySelectorAll('ext#ref').filter(token => token.innerText
             && getRefTagAttr(token, 'name') === refName
-            && getRefTagAttr(token, 'group') === refGroup).map(({ lastChild }) => ({
+            && getRefTagAttr(token, 'group') === refGroup).reverse().map(({ lastChild }) => ({
             range: createNodeRange(lastChild),
         }));
         return refs.length === 0 ? undefined : refs;
@@ -651,7 +684,6 @@ class LanguageService {
      * @param position 位置
      */
     async resolveRenameLocation(text, position) {
-        this.#checkSignature();
         const root = await this.#queue(text), node = root.elementFromPoint(position.character, position.line), { type } = node, refName = getRefName(node), refGroup = getRefGroup(node);
         return !refName && !refGroup && (!renameTypes.has(type)
             || type === 'parameter-key' && /^[1-9]\d*$/u.test(node.parentNode.name)
@@ -668,7 +700,6 @@ class LanguageService {
      * @param newName new name / 新名称
      */
     async provideRenameEdits(text, position, newName) {
-        this.#checkSignature();
         const root = await this.#queue(text), node = root.elementFromPoint(position.character, position.line), { type } = node, refName = getRefName(node), refNameGroup = refName && getRefTagAttr(node.parentNode.parentNode, 'group'), refGroup = getRefGroup(node), name = getName(node), refs = root.querySelectorAll(type).filter(token => {
             const { type: t } = token.parentNode;
             if (type === 'link-target' && t !== 'link' && t !== 'redirect-target') {
@@ -684,7 +715,7 @@ class LanguageService {
             ? undefined
             : {
                 changes: {
-                    '': refs.map((ref) => ({
+                    '': refs.reverse().map((ref) => ({
                         range: createNodeRange(ref),
                         newText: newName,
                     })),
@@ -711,7 +742,6 @@ class LanguageService {
         if (!this.data) {
             return undefined;
         }
-        this.#checkSignature();
         const root = await this.#queue(text), { offsetNode, offset } = caretPositionFromWord(root, position), token = offsetNode.type === 'text' ? offsetNode.parentNode : offsetNode, { type, parentNode, length, name } = token;
         let info, f, range;
         if (token.is('double-underscore') && offset > 0) {
@@ -760,13 +790,8 @@ class LanguageService {
         /* istanbul ignore next */
         if (!this.data) {
             return undefined;
-            // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
         }
-        else if (this.#text !== undefined && !this.#signature) {
-            throw new Error('This is a regular language server!');
-        }
-        this.#signature = true;
-        const { line, character } = position, curLine = text.split(/\r?\n/u, line + 1)[line], { lastChild } = await this.#queue(`${curLine.slice(0, character + /^[^{}<]*/u.exec(curLine.slice(character))[0].length)}}}`);
+        const { line, character } = position, curLine = text.split(/\r?\n/u, line + 1)[line], { lastChild } = await this.#queueSignature(`${curLine.slice(0, character + /^[^{}<]*/u.exec(curLine.slice(character))[0].length)}}}`);
         if (!lastChild.is('magic-word') || lastChild.length === 1) {
             return undefined;
         }
@@ -809,12 +834,12 @@ class LanguageService {
      * @param text source Wikitext / 源代码
      */
     async provideInlayHints(text) {
-        this.#checkSignature();
         const hints = [], root = await this.#queue(text);
-        for (const template of root.querySelectorAll('template,magic-word#invoke')) {
-            const { type, childNodes } = template;
+        for (const token of root.querySelectorAll('template,magic-word#invoke').reverse()) {
+            const { type, childNodes } = token;
             hints.push(...childNodes.slice(type === 'template' ? 1 : 3).filter(({ anon }) => anon)
-                .reverse().map((parameter) => ({
+                .reverse()
+                .map((parameter) => ({
                 position: positionAt(root, parameter.getAbsoluteIndex()),
                 label: `${parameter.name}=`,
                 kind: 2,
@@ -848,40 +873,36 @@ class LanguageService {
      * @param text source Wikitext / 源代码
      */
     async provideDocumentSymbols(text) {
-        this.#checkSignature();
         const root = await this.#queue(text), lines = root.getLines(), { length } = lines, symbols = [], names = new Set(), sections = new Array(6), tokens = root.querySelectorAll('heading-title');
         for (const token of [...tokens].reverse()) { // 提高 getBoundingClientRect 的性能
             token.getRelativeIndex();
         }
         for (const token of tokens) {
-            const { top, height, left, width } = token.getBoundingClientRect();
-            if (token.type === 'heading-title') {
-                const { level } = token.parentNode;
-                for (let i = level - 1; i < 6; i++) {
-                    getSectionEnd(sections[i], lines, top - 1);
-                    sections[i] = undefined;
-                }
-                const section = token.text().trim() || ' ', name = names.has(section)
-                    ? new Array(names.size).fill('').map((_, i) => `${section.trim()}_${i + 2}`)
-                        .find(s => !names.has(s))
-                    : section, container = sections.slice(0, level - 1).reverse().find(Boolean), selectionRange = {
-                    start: { line: top, character: left - level },
-                    end: (0, lint_1.getEndPos)(top, left, height, width + level),
-                }, info = {
-                    name,
-                    kind: 15,
-                    range: { start: selectionRange.start },
-                    selectionRange,
-                };
-                names.add(name);
-                sections[level - 1] = info;
-                if (container) {
-                    container.children ??= [];
-                    container.children.push(info);
-                }
-                else {
-                    symbols.push(info);
-                }
+            const { top, height, left, width } = token.getBoundingClientRect(), { level } = token.parentNode;
+            for (let i = level - 1; i < 6; i++) {
+                getSectionEnd(sections[i], lines, top - 1);
+                sections[i] = undefined;
+            }
+            const section = token.text().trim() || ' ', name = names.has(section)
+                ? new Array(names.size).fill('').map((_, i) => `${section.trim()}_${i + 2}`)
+                    .find(s => !names.has(s))
+                : section, container = sections.slice(0, level - 1).reverse().find(Boolean), selectionRange = {
+                start: { line: top, character: left - level },
+                end: (0, lint_1.getEndPos)(top, left, height, width + level),
+            }, info = {
+                name,
+                kind: 15,
+                range: { start: selectionRange.start },
+                selectionRange,
+            };
+            names.add(name);
+            sections[level - 1] = info;
+            if (container) {
+                container.children ??= [];
+                container.children.push(info);
+            }
+            else {
+                symbols.push(info);
             }
         }
         for (const section of sections) {

package/dist/parser/braces.js

@@ -13,7 +13,24 @@ const closes = {
     '{': String.raw `\}{2,}|\|`,
     '-': String.raw `\}-`,
     '[': String.raw `\]\]`,
-}, openBraces = String.raw `|\{{2,}`, marks = new Map([['!', '!'], ['!!', '+'], ['(!', '{'], ['!)', '}'], ['!-', '-'], ['=', '~'], ['server', 'm']]), re = /\{\{\s*([^\s\0<>[\]{}|_#&%:.]+)\s*\}\}(?!\})/gu;
+}, openBraces = String.raw `|\{{2,}`, marks = new Map([['!', '!'], ['!!', '+'], ['(!', '{'], ['!)', '}'], ['!-', '-'], ['=', '~'], ['server', 'm']]);
+/**
+ * 获取模板或魔术字对应的字符
+ * @param s 模板或魔术字名
+ */
+const getSymbol = (s) => {
+    const name = (0, string_1.removeComment)(s).trim().toLowerCase();
+    if (marks.has(name)) {
+        return marks.get(name); // 标记{{!}}等
+    }
+    else if (/^(?:filepath|(?:full|canonical)urle?):./u.test(name)) {
+        return 'm';
+    }
+    else if (/^#vardefine:./u.test(name)) {
+        return 'n';
+    }
+    return 't';
+};
 /**
  * 解析花括号
  * @param wikitext
@@ -22,11 +39,32 @@ const closes = {
  * @throws TranscludeToken.constructor()
  */
 const parseBraces = (wikitext, config, accum) => {
-    const source = String.raw `${config.excludes?.includes('heading') ? '' : String.raw `^((?:\0\d+[cno]\x7F)*)={1,6}|`}\[\[|-\{(?!\{)`, { parserFunction: [, , , subst] } = config, stack = [];
-    wikitext = wikitext.replace(re, (m, p1) => {
-        // @ts-expect-error abstract class
-        new transclude_1.TranscludeToken(m.slice(2, -2), [], config, accum);
-        return `\0${accum.length - 2}${marks.get(p1.toLowerCase()) ?? 't'}\x7F`;
+    const source = String.raw `${config.excludes?.includes('heading') ? '' : String.raw `^((?:\0\d+[cno]\x7F)*)={1,6}|`}\[\[|-\{(?!\{)`, { parserFunction: [, , , subst] } = config, stack = [], linkStack = [];
+    /**
+     * 恢复内链
+     * @param s 不含内链的字符串
+     */
+    const restore = (s) => s.replace(/\0(\d+)\x7F/gu, (_, p1) => linkStack[p1]);
+    wikitext = wikitext.replace(/\{\{([^\n{}[]*)\}\}(?!\})|\[\[[^\n[\]{]*\]\]/gu, (m, p1) => {
+        if (p1 !== undefined) {
+            try {
+                const { length } = accum, parts = p1.split('|');
+                // @ts-expect-error abstract class
+                new transclude_1.TranscludeToken(parts[0], parts.slice(1).map(part => {
+                    const i = part.indexOf('=');
+                    return i === -1 ? [part] : [part.slice(0, i), part.slice(i + 1)];
+                }), config, accum);
+                return `\0${length}${getSymbol(parts[0])}\x7F`;
+            }
+            catch (e) {
+                /* istanbul ignore if */
+                if (!(e instanceof SyntaxError) || e.message !== 'Invalid template name') {
+                    throw e;
+                }
+            }
+        }
+        linkStack.push(m);
+        return `\0${linkStack.length - 1}\x7F`;
     });
     const lastBraces = wikitext.lastIndexOf('}}') - wikitext.length;
     let moreBraces = lastBraces + wikitext.length !== -1;
@@ -47,7 +85,7 @@ const parseBraces = (wikitext, config, accum) => {
          * @param text wikitext全文
          */
         const push = (text) => {
-            parts[parts.length - 1].push(text.slice(topPos, curIndex));
+            parts[parts.length - 1].push(restore(text.slice(topPos, curIndex)));
         };
         if (syntax === ']]' || syntax === '}-') { // 情形1：闭合内链或转换
             lastIndex = curIndex + 2;
@@ -61,6 +99,7 @@ const parseBraces = (wikitext, config, accum) => {
                 if (rmt) {
                     wikitext = `${wikitext.slice(0, index)}\0${accum.length}h\x7F${wikitext.slice(curIndex)}`;
                     lastIndex = index + 4 + String(accum.length).length;
+                    rmt[2] = restore(rmt[2]);
                     // @ts-expect-error abstract class
                     new heading_1.HeadingToken(rmt[1].length, rmt.slice(2), config, accum);
                 }
@@ -94,16 +133,7 @@ const parseBraces = (wikitext, config, accum) => {
                 try {
                     // @ts-expect-error abstract class
                     new transclude_1.TranscludeToken(parts[0][0], parts.slice(1), config, accum);
-                    const name = (0, string_1.removeComment)(parts[0][0]).trim();
-                    if (marks.has(name.toLowerCase())) {
-                        ch = marks.get(name.toLowerCase()); // 标记{{!}}等
-                    }
-                    else if (/^(?:filepath|(?:full|canonical)urle?):./iu.test(name)) {
-                        ch = 'm';
-                    }
-                    else if (/^#vardefine:./iu.test(name)) {
-                        ch = 'n';
-                    }
+                    ch = getSymbol(parts[0][0]);
                 }
                 catch (e) {
                     /* istanbul ignore else */
@@ -149,7 +179,7 @@ const parseBraces = (wikitext, config, accum) => {
         regex.lastIndex = lastIndex;
         mt = regex.exec(wikitext);
     }
-    return wikitext;
+    return restore(wikitext);
 };
 exports.parseBraces = parseBraces;
 constants_1.parsers['parseBraces'] = __filename;

package/dist/parser/commentAndExt.js

@@ -9,7 +9,24 @@ const comment_1 = require("../src/nowiki/comment");
 /* NOT FOR BROWSER */
 const constants_1 = require("../util/constants");
 /* NOT FOR BROWSER END */
-const onlyincludeLeft = '<onlyinclude>', onlyincludeRight = '</onlyinclude>', { length } = onlyincludeLeft;
+const onlyincludeLeft = '<onlyinclude>', onlyincludeRight = '</onlyinclude>', { length } = onlyincludeLeft, regexInclude = new WeakMap(), regexNoinclude = new WeakMap();
+/**
+ * 获取正则表达式
+ * @param ext 扩展标签
+ * @param includeOnly 是否嵌入
+ */
+const getRegex = (ext, includeOnly) => {
+    const regex = includeOnly ? regexInclude : regexNoinclude;
+    if (regex.has(ext)) {
+        return regex.get(ext);
+    }
+    const noincludeRegex = includeOnly ? 'includeonly' : '(?:no|only)include', includeRegex = includeOnly ? 'noinclude' : 'includeonly';
+    // eslint-disable-next-line @typescript-eslint/no-unused-expressions
+    /<!--[\s\S]*?(?:-->|$)|<foo(?:\s[^>]*)?\/?>|<\/foo\s*>|<(bar)(\s[^>]*?)?(?:\/>|>([\s\S]*?)<\/(\1\s*)>)|<(baz)(\s[^>]*?)?(?:\/>|>([\s\S]*?)(?:<\/(baz\s*)>|$))/giu;
+    const re = new RegExp(String.raw `<!--[\s\S]*?(?:-->|$)|<${noincludeRegex}(?:\s[^>]*)?/?>|</${noincludeRegex}\s*>|<(${ext.join('|')})(\s[^>]*?)?(?:/>|>([\s\S]*?)</(\1\s*)>)|<(${includeRegex})(\s[^>]*?)?(?:/>|>([\s\S]*?)(?:</(${includeRegex}\s*)>|$))`, 'giu');
+    regex.set(ext, re);
+    return re;
+};
 /**
  * 更新`<onlyinclude>`和`</onlyinclude>`的位置
  * @param wikitext
@@ -55,11 +72,7 @@ const parseCommentAndExt = (wikitext, config, accum, includeOnly) => {
             return str;
         }
     }
-    const ext = config.ext.join('|'), noincludeRegex = includeOnly ? 'includeonly' : '(?:no|only)include', includeRegex = includeOnly ? 'noinclude' : 'includeonly';
-    // eslint-disable-next-line @typescript-eslint/no-unused-expressions
-    /<!--[\s\S]*?(?:-->|$)|<foo(?:\s[^>]*)?\/?>|<\/foo\s*>|<(bar)(\s[^>]*?)?(?:\/>|>([\s\S]*?)<\/(\1\s*)>)|<(baz)(\s[^>]*?)?(?:\/>|>([\s\S]*?)(?:<\/(baz\s*)>|$))/giu;
-    const /** Never cached due to the possibility of nested extension tags */ regex = new RegExp(String.raw `<!--[\s\S]*?(?:-->|$)|<${noincludeRegex}(?:\s[^>]*)?/?>|</${noincludeRegex}\s*>|<(${ext})(\s[^>]*?)?(?:/>|>([\s\S]*?)</(\1\s*)>)|<(${includeRegex})(\s[^>]*?)?(?:/>|>([\s\S]*?)(?:</(${includeRegex}\s*)>|$))`, 'giu');
-    return wikitext.replace(regex, (substr, name, attr, inner, closing, include, includeAttr, includeInner, includeClosing) => {
+    return wikitext.replace(getRegex(config.ext, includeOnly), (substr, name, attr, inner, closing, include, includeAttr, includeInner, includeClosing) => {
         const l = accum.length;
         let ch = 'n';
         if (name) {

package/dist/src/table/index.js

@@ -575,7 +575,8 @@ class TableToken extends trBase_1.TrBaseToken {
         const filter = (token) => token.childNodes.filter((0, debug_1.isToken)('table-inter'));
         const { childNodes } = this, tr = childNodes.filter((0, debug_1.isToken)('tr')), newOpt = { ...opt, nowrap: true };
         return `${[this, ...tr].flatMap(filter) // eslint-disable-line es-x/no-array-prototype-flat
-            .map(token => token.toHtmlInternal(newOpt).trim()).join(' ')}<table${childNodes[1].toHtmlInternal()}>${opt?.nowrap ? ' ' : '\n'}<tbody>${super.toHtmlInternal(opt)}${(0, html_1.html)(tr, '', opt)}</tbody></table>`;
+            .map(token => token.toHtmlInternal(newOpt).trim())
+            .join(' ')}<table${childNodes[1].toHtmlInternal()}>${opt?.nowrap ? ' ' : '\n'}<tbody>${super.toHtmlInternal(opt)}${(0, html_1.html)(tr, '', opt)}</tbody></table>`;
     }
 }
 exports.TableToken = TableToken;

package/dist/src/table/td.js

@@ -158,7 +158,9 @@ let TdToken = (() => {
                 const str = previousSibling.lastChild.toString();
                 result.escape ||= esc;
                 result.correction = str.includes('\n') && debug_1.Shadow.run(() => new index_2.Token(str, this.getAttribute('config'))
-                    .parseOnce(0, this.getAttribute('include')).parseOnce().parseOnce()
+                    .parseOnce(0, this.getAttribute('include'))
+                    .parseOnce()
+                    .parseOnce()
                     .toString()
                     .includes('\n'));
                 if (subtype === 'th' && result.subtype !== 'th') {

package/extensions/dist/base.js

@@ -1,6 +1,6 @@
 (() => {
 var _a;
-const version = '1.16.5', src = (_a = document.currentScript) === null || _a === void 0 ? void 0 : _a.src, file = /\/extensions\/dist\/base\.(?:min\.)?js$/u, CDN = src && file.test(src)
+const version = '1.16.6', src = (_a = document.currentScript) === null || _a === void 0 ? void 0 : _a.src, file = /\/extensions\/dist\/base\.(?:min\.)?js$/u, CDN = src && file.test(src)
     ? src.replace(file, '')
     : `https://testingcf.jsdelivr.net/npm/wikiparser-node@${version}`;
 const workerJS = () => {
@@ -18,11 +18,8 @@ const workerJS = () => {
         }
         return root;
     };
-    const getLSP = (qid, signature) => {
-        let id = Math.floor(qid);
-        if (signature) {
-            id += 0.5;
-        }
+    const getLSP = (qid) => {
+        const id = Math.floor(qid);
         if (lsps.has(id)) {
             return lsps.get(id);
         }
@@ -85,13 +82,10 @@ const workerJS = () => {
                 break;
             case 'destroy':
                 getLSP(qid).destroy();
-                getLSP(qid, true).destroy();
                 lsps.delete(qid);
-                lsps.delete(qid + 0.5);
                 break;
             case 'data':
                 getLSP(qid).data = wikitext;
-                getLSP(qid, true).data = wikitext;
                 break;
             case 'colorPresentations':
                 postMessage([qid, getLSP(qid).provideColorPresentations(wikitext)]);
@@ -148,7 +142,7 @@ const workerJS = () => {
                 break;
             case 'signatureHelp':
                 (async () => {
-                    postMessage([qid, await getLSP(qid, true).provideSignatureHelp(wikitext, include), wikitext]);
+                    postMessage([qid, await getLSP(qid).provideSignatureHelp(wikitext, include), wikitext]);
                 })();
                 break;
             case 'inlayHints':

package/extensions/es7/base.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 var _a;
-const version = '1.16.5', src = (_a = document.currentScript) === null || _a === void 0 ? void 0 : _a.src, file = /\/extensions\/dist\/base\.(?:min\.)?js$/u, CDN = src && file.test(src)
+const version = '1.16.6', src = (_a = document.currentScript) === null || _a === void 0 ? void 0 : _a.src, file = /\/extensions\/dist\/base\.(?:min\.)?js$/u, CDN = src && file.test(src)
     ? src.replace(file, '')
     : `https://testingcf.jsdelivr.net/npm/wikiparser-node@${version}`;
 const workerJS = () => {
@@ -27,11 +27,8 @@ const workerJS = () => {
         }
         return root;
     };
-    const getLSP = (qid, signature) => {
-        let id = Math.floor(qid);
-        if (signature) {
-            id += 0.5;
-        }
+    const getLSP = (qid) => {
+        const id = Math.floor(qid);
         if (lsps.has(id)) {
             return lsps.get(id);
         }
@@ -94,13 +91,10 @@ const workerJS = () => {
                 break;
             case 'destroy':
                 getLSP(qid).destroy();
-                getLSP(qid, true).destroy();
                 lsps.delete(qid);
-                lsps.delete(qid + 0.5);
                 break;
             case 'data':
                 getLSP(qid).data = wikitext;
-                getLSP(qid, true).data = wikitext;
                 break;
             case 'colorPresentations':
                 postMessage([qid, getLSP(qid).provideColorPresentations(wikitext)]);
@@ -157,7 +151,7 @@ const workerJS = () => {
                 break;
             case 'signatureHelp':
                 (() => __awaiter(void 0, void 0, void 0, function* () {
-                    postMessage([qid, yield getLSP(qid, true).provideSignatureHelp(wikitext, include), wikitext]);
+                    postMessage([qid, yield getLSP(qid).provideSignatureHelp(wikitext, include), wikitext]);
                 }))();
                 break;
             case 'inlayHints':