wikiparser-node 1.29.0 → 1.29.2

package/dist/addon/transclude.js

@@ -12,18 +12,32 @@ const index_2 = require("../src/index");
 const transclude_1 = require("../src/transclude");
 const parameter_1 = require("../src/parameter");
 const atom_1 = require("../src/atom");
+/**
+ * 调整最后一个子节点的换行符
+ * @param token 魔术字或模板节点
+ */
+const format = (token) => {
+    const { lastChild, type } = token, isParameter = lastChild.type === 'parameter';
+    if (!(type === 'template' ? isParameter && lastChild.anon : lastChild.type === 'magic-word-name')
+        && !lastChild.toString().endsWith('\n')) {
+        (isParameter ? lastChild.lastChild : lastChild).insertAt('\n');
+    }
+};
 transclude_1.TranscludeToken.prototype.newAnonArg =
     /** @implements */
-    function (val) {
+    function (val, newline) {
         const { childNodes } = index_1.default.parseWithRef(val, this), token = debug_1.Shadow.run(
         // @ts-expect-error abstract class
         () => new parameter_1.ParameterToken(undefined, undefined, this.getAttribute('config')));
         token.lastChild.concat(childNodes); // eslint-disable-line unicorn/prefer-spread
+        if (newline) {
+            format(this);
+        }
         return this.insertAt(token);
     };
 transclude_1.TranscludeToken.prototype.setValue =
     /** @implements */
-    function (key, value) {
+    function (key, value, newline) {
         /* istanbul ignore if */
         if (!this.isTemplate()) {
             throw new Error('TranscludeToken.setValue method is only for templates!');
@@ -38,6 +52,9 @@ transclude_1.TranscludeToken.prototype.setValue =
         () => new parameter_1.ParameterToken(undefined, undefined, this.getAttribute('config')));
         token.firstChild.safeAppend(k.childNodes);
         token.lastChild.concat(v.childNodes); // eslint-disable-line unicorn/prefer-spread
+        if (newline) {
+            format(this);
+        }
         this.insertAt(token);
     };
 transclude_1.TranscludeToken.prototype.replaceTemplate =

package/dist/bin/config.js

@@ -77,7 +77,7 @@ const mw = {
         },
     },
 };
-const pkg = "wikiparser-node", version = "1.29.0";
+const pkg = "wikiparser-node", version = "1.29.2";
 let mwConfig;
 /**
  * Get the parser configuration for a Wikimedia Foundation project.

package/dist/lib/document.js

@@ -9,12 +9,14 @@ const common_1 = require("@bhsd/common");
 /* NOT FOR BROWSER */
 const constants_1 = require("../util/constants");
 exports.texvcjs = (() => {
-    try {
-        return require('mathoid-texvcjs');
-    }
-    catch {
-        /* istanbul ignore next */
-        return undefined;
+    NPM: { // eslint-disable-line no-unused-labels
+        try {
+            return require('mathoid-texvcjs');
+        }
+        catch {
+            /* istanbul ignore next */
+            return undefined;
+        }
     }
 })();
 exports.jsonTags = ['templatedata', 'mapframe', 'maplink'];
@@ -72,12 +74,14 @@ exports.htmlData = (() => {
     }
 })();
 exports.stylelint = (async () => {
-    try {
-        return (await import('stylelint')).default;
-    }
-    catch {
-        /* istanbul ignore next */
-        return undefined;
+    NPM: { // eslint-disable-line no-unused-labels
+        try {
+            return (await import('stylelint')).default;
+        }
+        catch {
+            /* istanbul ignore next */
+            return undefined;
+        }
     }
 })();
 /** embedded document */

package/dist/lib/lsp.js

@@ -21,10 +21,6 @@ const stylelint_util_1 = require("@bhsd/stylelint-util");
 const search_1 = __importDefault(require("../util/search"));
 const constants_1 = require("../util/constants");
 const document_1 = require("./document");
-/** @see https://www.npmjs.com/package/stylelint-config-recommended */
-const cssRules = { 'block-no-empty': null }, sources = { 'invalid-css': 'css', 'invalid-math': 'texvc' }, jsonSelector = document_1.jsonTags.map(s => `ext#${s}`).join(), scores = new Map();
-let colors;
-/* NOT FOR BROWSER ONLY END */
 exports.tasks = new WeakMap();
 const refTags = new Set(['ref']), referencesTags = new Set(['ref', 'references']), nameAttrs = new Set(['name', 'follow']), groupAttrs = new Set(['group']), renameTypes = new Set([
     'arg-name',
@@ -232,6 +228,9 @@ const getFixAll = (root, rule) => {
         ];
 };
 /* NOT FOR BROWSER ONLY */
+/** @see https://www.npmjs.com/package/stylelint-config-recommended */
+const cssRules = { 'block-no-empty': null }, sources = { 'invalid-css': 'css', 'invalid-math': 'texvc' }, jsonSelector = document_1.jsonTags.map(s => `ext#${s}`).join(), scores = new Map();
+let colors;
 /**
  * Correct the position of an error.
  * @param height
@@ -250,21 +249,20 @@ const adjustPos = (height, width, line, column) => {
     }
     return [line, column];
 };
-/**
- * Get the position of a Stylelint error.
- * @param rect bounding client rect of the token
- * @param bottom bottom of the style block
- * @param lineOrCode line number or code string
- * @param columnOrOffset column number or offset in the code string
- */
-const getStylelintPos = (rect, bottom, lineOrCode, columnOrOffset) => {
+function getStylelintPos(rect, bottom, lineOrCode, columnOrOffset) {
+    if (Array.isArray(columnOrOffset)) {
+        return {
+            start: getStylelintPos(rect, bottom, lineOrCode, columnOrOffset[0]),
+            end: getStylelintPos(rect, bottom, lineOrCode, columnOrOffset[1]),
+        };
+    }
     const { top, left, height, width } = rect, start = bottom - height - 1;
     if (typeof lineOrCode === 'number') {
         return (0, lint_1.getEndPos)(top, left, ...adjustPos(height, width, lineOrCode - start, columnOrOffset));
     }
     const lines = lineOrCode.slice(0, columnOrOffset).split(/\r?\n/u);
     return getStylelintPos(rect, bottom, lines.length, lines.at(-1).length);
-};
+}
 /**
  * Convert LilyPond errors to VSCode diagnostics.
  * @param root root token
@@ -519,21 +517,23 @@ class LanguageService {
             this.config ??= index_1.default.getConfig();
             const { nsid, ext, html, parserFunction: [insensitive, sensitive, ...other], doubleUnderscore, protocol, img, } = this.config, tags = new Set([ext, html].flat(2));
             // eslint-disable-next-line @typescript-eslint/no-unused-expressions
-            /(?:<\/?(\w*)|(\{{2,4}|\[\[)\s*([^|{}<>[\]\s][^|{}<>[\]#]*)?|(__(?:(?!__)[\p{L}\p{N}_])*)|(?<!\[)\[([a-z:/]*)|\[\[\s*(?:file|image)\s*:[^[\]{}<>]+\|([^[\]{}<>|=]*)|<(\w+)(?:\s(?:[^<>{}|=\s]+(?:\s*=\s*(?:[^\s"']\S*|(["']).*?\8))?(?=\s))*)?\s(\w*))$/iu;
+            /(?:<(\/?\w*)|(\{{2,4}|\[\[)\s*([^|{}<>[\]\s][^|{}<>[\]#]*)?|(_(?:_(?:(?!__|＿{2})[\p{L}\p{N}_])*)?)|(＿(?:＿(?:(?!__|＿{2})[\p{L}\p{N}＿])*)?)|(?<!\[)\[([a-z:/]*)|\[\[\s*(?:file|image)\s*:[^[\]{}<>]+\|([^[\]{}<>|=]*)|<(\w+)(?:\s(?:[^<>{}|=\s]+(?:\s*=\s*(?:[^\s"']\S*|(["']).*?\9))?(?=\s))*)?\s(\w*))$/iu;
             const re = new RegExp('(?:' // eslint-disable-line prefer-template
-                + String.raw `<(\/?\w*)` // tag
+                + String.raw `<(\/?\w*)` // tag ($1)
                 + '|'
-                + String.raw `(\{{2,4}|\[\[)\s*([^|{}<>[\]\s][^|{}<>[\]#]*)?` // braces and brackets
+                + String.raw `(\{{2,4}|\[\[)\s*([^|{}<>[\]\s][^|{}<>[\]#]*)?` // braces and brackets ($2, $3)
                 + '|'
-                + String.raw `(__(?:(?!__)[\p{L}\p{N}_])*)` // behavior switch
+                + String.raw `(_(?:_(?:(?!__|＿{2})[\p{L}\p{N}_])*)?)` // behavior switch ($4)
                 + '|'
-                + String.raw `(?<!\[)\[([a-z:/]*)` // protocol
+                + String.raw `(＿(?:＿(?:(?!__|＿{2})[\p{L}\p{N}＿])*)?)` // Japanese behavior switch ($5)
                 + '|'
-                + String.raw `\[\[\s*(?:${Object.entries(nsid).filter(([, v]) => v === 6).map(([k]) => k).join('|')})\s*:[^[\]{}<>]+\|([^[\]{}<>|=]*)` // image parameter
+                + String.raw `(?<!\[)\[([a-z:/]*)` // protocol ($6)
                 + '|'
-                // attribute key
-                + String.raw `<(\w+)(?:\s(?:[^<>{}|=\s]+(?:\s*=\s*(?:[^\s"']\S*|(["']).*?\8))?(?=\s))*)?\s(\w*)`
-                + ')$', 'iu');
+                + String.raw `\[\[\s*(?:${Object.entries(nsid).filter(([, v]) => v === 6).map(([k]) => k).join('|')})\s*:[^[\]{}<>]+\|([^[\]{}<>|=]*)` // image parameter ($7)
+                + '|'
+                // attribute key ($8, $10)
+                + String.raw `<(\w+)(?:\s(?:[^<>{}|=\s]+(?:\s*=\s*(?:[^\s"']\S*|(["']).*?\9))?(?=\s))*)?\s(\w*)`
+                + ')$', 'iu'), allSwitches = doubleUnderscore.slice(0, 2).flat();
             this.#completionConfig = [
                 {
                     re,
@@ -545,9 +545,8 @@ class LanguageService {
                         Array.isArray(sensitive) ? /* istanbul ignore next */ sensitive : Object.keys(sensitive),
                         other,
                     ].flat(2),
-                    switches: doubleUnderscore.slice(0, 2).flat()
-                        .filter(cm_util_1.isUnderscore)
-                        .map(w => `__${w}__`),
+                    switches: allSwitches.filter(cm_util_1.isUnderscore).map(w => `__${w}__`),
+                    jaSwitches: allSwitches.filter(w => !(0, cm_util_1.isUnderscore)(w)),
                     protocols: protocol.split('|'),
                     params: Object.keys(img)
                         .filter(k => k.endsWith('$1') || !k.includes('$1'))
@@ -566,17 +565,20 @@ class LanguageService {
      * @param position position / 位置
      */
     async provideCompletionItems(text, position) {
-        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) ?? ''), [, , iAlias = {}, sAlias = {}] = this.config.doubleUnderscore;
+        const { re, allTags, functions, switches, jaSwitches, 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) ?? ''), [, , iAlias = {}, sAlias = {}] = this.config.doubleUnderscore;
         if (mt?.[1] !== undefined) { // tag
             const closing = mt[1].startsWith('/');
             return getCompletion(allTags, 'Class', mt[1].slice(closing ? 1 : 0), position, closing && !curLine?.slice(character).trim().startsWith('>') ? '>' : '');
         }
-        else if (mt?.[4]) { // behavior switch
-            return getCompletion(switches, 'Constant', mt[4], position, '', name => {
+        else if (mt?.[4] || mt?.[5] && jaSwitches.length > 0) { // behavior switch
+            const isJa = mt[5] !== undefined;
+            return getCompletion(isJa ? jaSwitches : switches, 'Constant', mt[isJa ? 5 : 4], position, '', name => {
                 if (!this.data) {
                     return undefined;
                 }
-                name = name.slice(2, -2);
+                else if (!isJa) {
+                    name = name.slice(2, -2);
+                }
                 if (name in iAlias) {
                     name = iAlias[name];
                 }
@@ -586,8 +588,8 @@ class LanguageService {
                 return this.#getBehaviorSwitch(name.toLowerCase());
             });
         }
-        else if (mt?.[5] !== undefined) { // protocol
-            return getCompletion(protocols, 'Reference', mt[5], position);
+        else if (mt?.[6] !== undefined) { // protocol
+            return getCompletion(protocols, 'Reference', mt[6], position);
         }
         const root = await this.#queue(text);
         let cur;
@@ -640,12 +642,12 @@ class LanguageService {
             ];
         }
         let type, parentNode;
-        if (mt?.[7] === undefined) {
+        if (mt?.[8] === undefined) {
             cur = root.elementFromPoint(character, line);
             ({ type, parentNode } = cur);
         }
-        if (mt?.[6] !== undefined || type === 'image-parameter') { // image parameter
-            const index = root.indexFromPos(line, character), match = mt?.[6]?.trimStart()
+        if (mt?.[7] !== undefined || type === 'image-parameter') { // image parameter
+            const index = root.indexFromPos(line, character), match = mt?.[7]?.trimStart()
                 ?? this.#text.slice(cur.getAbsoluteIndex(), index).trimStart(), equal = this.#text[index] === '=';
             return [
                 ...getCompletion(params, 'Property', match, position)
@@ -655,8 +657,8 @@ class LanguageService {
                     .map(width => width.text()), 'Unit', match, position),
             ];
         }
-        else if (mt?.[7] !== undefined || type === 'attr-key') { // attribute key
-            const tag = mt?.[7]?.toLowerCase() ?? parentNode.tag, key = mt?.[9]
+        else if (mt?.[8] !== undefined || type === 'attr-key') { // attribute key
+            const tag = mt?.[8]?.toLowerCase() ?? parentNode.tag, key = mt?.[10]
                 ?? cur.toString().slice(0, character - root.posFromIndex(cur.getAbsoluteIndex()).left);
             if (!tags.has(tag)) {
                 return undefined;
@@ -790,48 +792,47 @@ class LanguageService {
         /* eslint-disable @stylistic/operator-linebreak */
         cssDiagnostics = await document_1.stylelint ?
             await (async () => {
-                const tokens = this.findStyleTokens();
-                if (tokens.length === 0) {
-                    return [];
-                }
-                const code = tokens.map(({ type, tag, lastChild }, i) => `${type === 'ext-attr' ? 'div' : tag}#${i}{\n${(0, common_1.sanitizeInlineStyle)(lastChild.toString())}\n}`).join('\n'), cssErrors = await (0, stylelint_util_1.styleLint)((await document_1.stylelint), code, cssRules);
-                if (cssErrors.length === 0) {
-                    return [];
-                }
-                const rects = tokens.map(({ lastChild }) => lastChild.getBoundingClientRect());
-                let acc = 0;
-                const bottoms = rects.map(({ height }) => {
-                    acc += height + 2;
-                    return acc;
-                });
-                return cssErrors.map(({ rule, text: msg, severity, line, column, endLine = line, endColumn = column, fix, }) => {
-                    const i = (0, search_1.default)(bottoms, line, (bottom, needle) => bottom - needle);
-                    return {
-                        range: {
-                            start: getStylelintPos(rects[i], bottoms[i], line, column - 1),
-                            end: getStylelintPos(rects[i], bottoms[i], endLine, endColumn - 1),
-                        },
-                        severity: severity === 'error' ? 1 : 2,
-                        source: 'Stylelint',
-                        code: rule,
-                        message: msg.slice(0, msg.lastIndexOf('(') - 1),
-                        ...fix
-                            ? {
-                                data: [
-                                    {
-                                        range: {
-                                            start: getStylelintPos(rects[i], bottoms[i], code, fix.range[0]),
-                                            end: getStylelintPos(rects[i], bottoms[i], code, fix.range[1]),
+                NPM: { // eslint-disable-line no-unused-labels
+                    const tokens = this.findStyleTokens();
+                    if (tokens.length === 0) {
+                        return [];
+                    }
+                    const code = tokens.map(({ type, tag, lastChild }, i) => `${type === 'ext-attr' ? 'div' : tag}#${i}{\n${(0, common_1.sanitizeInlineStyle)(lastChild.toString())}\n}`).join('\n'), cssErrors = await (0, stylelint_util_1.styleLint)((await document_1.stylelint), code, cssRules);
+                    if (cssErrors.length === 0) {
+                        return [];
+                    }
+                    const rects = tokens.map(({ lastChild }) => lastChild.getBoundingClientRect());
+                    let acc = 0;
+                    const bottoms = rects.map(({ height }) => {
+                        acc += height + 2;
+                        return acc;
+                    });
+                    return cssErrors.map(({ rule, text: msg, severity, line, column, endLine = line, endColumn = column, fix, }) => {
+                        const i = (0, search_1.default)(bottoms, line, (bottom, needle) => bottom - needle);
+                        return {
+                            range: {
+                                start: getStylelintPos(rects[i], bottoms[i], line, column - 1),
+                                end: getStylelintPos(rects[i], bottoms[i], endLine, endColumn - 1),
+                            },
+                            severity: severity === 'error' ? 1 : 2,
+                            source: 'Stylelint',
+                            code: rule,
+                            message: msg.slice(0, msg.lastIndexOf('(') - 1),
+                            ...fix
+                                ? {
+                                    data: [
+                                        {
+                                            range: getStylelintPos(rects[i], bottoms[i], code, fix.range),
+                                            newText: fix.text,
+                                            title: `Fix: ${rule}`,
+                                            fix: true,
                                         },
-                                        newText: fix.text,
-                                        title: `Fix: ${rule}`,
-                                        fix: true,
-                                    },
-                                ],
-                            }
-                            : {},
-                    };
-                });
+                                    ],
+                                }
+                                : {},
+                        };
+                    });
+                }
             })() :
             [], jsonDiagnostics = document_1.jsonLSP ?
             await Promise.all(root.querySelectorAll(jsonSelector).map(async ({ name, lastChild, selfClosing }) => {
@@ -1032,7 +1033,7 @@ class LanguageService {
                 else if (type === 'link-target' && (parentNode.is('link')
                     || parentNode.is('redirect-target')
                     || parentNode.is('category'))) {
-                    if (target.startsWith('/')) {
+                    if (/^(?:\.\.)?\//u.test(target)) {
                         return false;
                     }
                     target = parentNode.link.getUrl(articlePath);
@@ -1095,7 +1096,8 @@ class LanguageService {
      * @param position position / 位置
      */
     async provideReferences(text, position) {
-        const root = await this.#queue(text), { offsetNode, offset } = caretPositionFromWord(root, this.#text, position), element = offsetNode.type === 'text' ? offsetNode.parentNode : offsetNode, node = offset === 0 && (element.type === 'ext-attr-dirty' || element.type === 'html-attr-dirty')
+        const root = await this.#queue(text), { offsetNode, offset } = caretPositionFromWord(root, this.#text, position), element = offsetNode.type === 'text' ? offsetNode.parentNode : offsetNode, node = offset === 0
+            && (element.is('ext-attr-dirty') || element.is('html-attr-dirty'))
             ? element.parentNode.parentNode
             : element, { type } = node, refName = getRefName(node), refGroup = getRefGroup(node);
         if (!refName && !refGroup && !referenceTypes.has(type)) {

package/dist/lib/text.js

@@ -52,12 +52,12 @@ const constants_1 = require("../util/constants");
 const readOnly_1 = require("../mixin/readOnly");
 const cached_1 = require("../mixin/cached");
 /* NOT FOR BROWSER END */
-const sp = /* #__PURE__ */ (() => String.raw `[${string_1.zs}\t]*`)(), anySp = /* #__PURE__ */ (() => String.raw `[^\S\n]*`)(), source = /* #__PURE__ */ (() => String.raw `<${anySp}(?:/${anySp})?([a-z]\w*)|\{+|\}+|\[{2,}|\[(?![^[]*?\])|((?:^|\])[^[]*?)\]+|(?:rfc|pmid)(?=[-:：]?${sp}\d)|isbn(?=[-:：]?${sp}(?:\d(?:${sp}|-)){6})`)();
+const sp = /* #__PURE__ */ (() => String.raw `[${string_1.zs}\t]*`)(), anySp = /* #__PURE__ */ (() => String.raw `[^\S\n]*`)(), source = /* #__PURE__ */ (() => String.raw `<${anySp}(?:/${anySp})?([a-z]\w*)|\{+|\}+|\[{2,}|\[(?![^[]*?\])|((?:^|\])[^[]*?)\]+`)();
 // eslint-disable-next-line @typescript-eslint/no-unused-expressions
-/<[^\S\n]*(?:\/[^\S\n]*)?([a-z]\w*)|\{+|\}+|\[{2,}|\[(?![^[]*?\])|((?:^|\])[^[]*?)\]+|https?[:/]\/+/giu;
-const errorSyntax = /* #__PURE__ */ (() => new RegExp(String.raw `${source}|https?[:/]/+`, 'giu'))();
+/https?[:/]\/+|(?:rfc|pmid)(?=[-:：]?\s*\d)|isbn(?=[-:：]?\s*(?:\d(?:\s*|-)){6})/giu;
+const errorSyntax = /* #__PURE__ */ (() => new RegExp(String.raw `${source}|https?[:/]/+|(?:rfc|pmid)(?=[-:：]?${sp}\d)|isbn(?=[-:：]?${sp}(?:\d(?:${sp}|-)){6})`, 'giu'))();
 // eslint-disable-next-line @typescript-eslint/no-unused-expressions
-/^https?:\/\/(?:\[[\da-f:.]+\]|[^[\]<>"\t\n\p{Zs}])[^[\]<>"\t\n\p{Zs}]*\.(?:gif|png|jpg|jpeg)$/iu;
+/<[^\S\n]*(?:\/[^\S\n]*)?([a-z]\w*)|\{+|\}+|\[{2,}|\[(?![^[]*?\])|((?:^|\])[^[]*?)\]+|https?[:/]\/+/giu;
 const errorSyntaxUrl = /* #__PURE__ */ new RegExp(source, 'giu'), noLinkTypes = new Set(['attr-value', 'ext-link-text', 'link-text']), regexes = {
     '[': /[[\]]/u,
     '{': /[{}]/u,
@@ -201,7 +201,7 @@ let AstText = (() => {
                 if (!parentNode) {
                     throw new Error('An isolated text node cannot be linted!');
                 }
-                const { type, name, parentNode: grandparent } = parentNode;
+                const { type, parentNode: grandparent } = parentNode;
                 if (type === 'attr-value') {
                     const { name: grandName, tag } = grandparent;
                     if (tag === 'ref' && (grandName === 'name' || grandName === 'follow')
@@ -210,13 +210,7 @@ let AstText = (() => {
                         return [];
                     }
                 }
-                errorRegex ??= type === 'free-ext-link'
-                    || type === 'ext-link-url'
-                    || type === 'ext-link-text'
-                    || type === 'image-parameter' && name === 'link'
-                    || type === 'attr-value'
-                    ? errorSyntaxUrl
-                    : errorSyntax;
+                errorRegex ??= parentNode.isPlain() && !noLinkTypes.has(type) ? errorSyntax : errorSyntaxUrl;
                 if (data.search(errorRegex) === -1) {
                     return [];
                 }
@@ -248,8 +242,7 @@ let AstText = (() => {
                     if (char === '<' && !tags.has(tag.toLowerCase())
                         || lbrack && type === 'ext-link-text' && (/&(?:rbrack|#93|#x5[Dd];);/u.test(data.slice(index + 1))
                             || nextSibling?.is('ext') && nextName === 'nowiki'
-                                && nextSibling.innerText?.includes(']'))
-                        || magicLink && (!parentNode.isPlain() || noLinkTypes.has(type))) {
+                                && nextSibling.innerText?.includes(']'))) {
                         continue;
                     }
                     else if (rbrack && (index || length > 1)) {

package/dist/mixin/elementLike.d.ts

@@ -34,7 +34,7 @@ export interface ElementLike {
      */
     escape(): void;
     /**
-     * Get all descendants of the types
+     * Get the first descendant of the types
      *
      * 类型选择器
      * @param types token types / 节点类型

package/dist/parser/commentAndExt.js

@@ -73,7 +73,7 @@ const parseCommentAndExt = (wikitext, config, accum, includeOnly) => {
         wikitext = wikitext.replace(/<nowiki>[\s\S]*?<\/nowiki>/giu, m => {
             stack.push(m);
             return `\0${stack.length - 1}\x7F`;
-        }).replace(/<translate( nowrap)?>([\s\S]+?)?<\/translate>/gu, (_, p1, p2) => {
+        }).replace(/<translate( nowrap)?>([\s\S]*?)<\/translate>/gu, (_, p1, p2) => {
             const l = accum.length;
             // @ts-expect-error abstract class
             new translate_1.TranslateToken(p1, p2 && (0, string_1.restore)(p2, stack), newConfig, accum);

package/dist/src/atom.d.ts

@@ -1,6 +1,6 @@
 import { Token } from './index';
 import type { Config } from '../base';
-declare const atomTypes: readonly ["arg-name", "attr-key", "attr-value", "ext-attr-dirty", "html-attr-dirty", "table-attr-dirty", "converter-flag", "converter-rule-variant", "converter-rule-to", "converter-rule-from", "invoke-function", "invoke-module", "template-name", "link-target"];
+declare const atomTypes: readonly ["arg-name", "attr-key", "attr-value", "ext-attr-dirty", "html-attr-dirty", "table-attr-dirty", "converter-flag", "converter-rule-variant", "invoke-function", "invoke-module", "template-name", "link-target"];
 declare type AtomTypes = typeof atomTypes[number];
 /**
  * plain Token that will not be parsed further

package/dist/src/atom.js

@@ -50,8 +50,6 @@ const atomTypes = [
     'table-attr-dirty',
     'converter-flag',
     'converter-rule-variant',
-    'converter-rule-to',
-    'converter-rule-from',
     'invoke-function',
     'invoke-module',
     'template-name',

package/dist/src/attribute.js

@@ -360,8 +360,10 @@ let AttributeToken = (() => {
         }
         escape() {
             LSP: { // eslint-disable-line no-unused-labels
-                this.#equal = '{{=}}';
-                this.lastChild.escape();
+                if (this.type !== 'ext-attr') {
+                    this.#equal = '{{=}}';
+                    this.lastChild.escape();
+                }
             }
         }
         /* PRINT ONLY */

package/dist/src/attributes.d.ts

@@ -74,6 +74,7 @@ export declare abstract class AttributesToken extends Token {
      * @param key attribute name / 属性键
      */
     getAttr(key: string): string | true | undefined;
+    escape(): void;
     /**
      * Sanitize invalid attributes
      *

package/dist/src/attributes.js

@@ -312,6 +312,13 @@ let AttributesToken = (() => {
                 return errors;
             }
         }
+        escape() {
+            LSP: { // eslint-disable-line no-unused-labels
+                if (this.type !== 'ext-attrs') {
+                    super.escape();
+                }
+            }
+        }
         /* PRINT ONLY */
         /** @private */
         getAttribute(key) {
@@ -378,7 +385,7 @@ let AttributesToken = (() => {
             else {
                 token.close();
             }
-            if (this.closest('parameter')) {
+            if (this.closest('parameter,ext')?.is('parameter')) {
                 token.escape();
             }
             super.insertAt(token, i);

package/dist/src/converter.js

@@ -101,8 +101,7 @@ let ConverterToken = (() => {
             const [firstRule] = rules, hasColon = firstRule.includes(':'), 
             // @ts-expect-error abstract class
             firstRuleToken = new converterRule_1.ConverterRuleToken(firstRule, hasColon, config, accum);
-            if (hasColon && firstRuleToken.length === 1
-                || !hasColon && rules.length === 2 && !(0, string_1.removeComment)(rules[1]).trim()) {
+            if (hasColon ? firstRuleToken.length === 1 : rules.length === 2 && !(0, string_1.removeComment)(rules[1]).trim()) {
                 this.insertAt(
                 // @ts-expect-error abstract class
                 new converterRule_1.ConverterRuleToken(rules.join(';'), false, config, accum));

package/dist/src/converterFlags.js

@@ -41,6 +41,7 @@ exports.ConverterFlagsToken = void 0;
 const lint_1 = require("../util/lint");
 const rect_1 = require("../lib/rect");
 const gapped_1 = require("../mixin/gapped");
+const noEscape_1 = require("../mixin/noEscape");
 const index_1 = __importDefault(require("../index"));
 const index_2 = require("./index");
 const atom_1 = require("./atom");
@@ -57,7 +58,7 @@ const definedFlags = new Set(['A', 'T', 'R', 'D', '-', 'H', 'N']);
  * @classdesc `{childNodes: AtomToken[]}`
  */
 let ConverterFlagsToken = (() => {
-    let _classDecorators = [(0, gapped_1.gapped)()];
+    let _classDecorators = [(0, gapped_1.gapped)(), noEscape_1.noEscape];
     let _classDescriptor;
     let _classExtraInitializers = [];
     let _classThis;

package/dist/src/converterRule.d.ts

@@ -7,18 +7,18 @@ import type { ConverterToken, ConverterFlagsToken } from '../internal';
  * language conversion rule
  *
  * 转换规则
- * @classdesc `{childNodes: AtomToken[]}`
+ * @classdesc `{childNodes: [Token?, AtomToken?, Token]}`
  */
 export declare abstract class ConverterRuleToken extends Token {
-    readonly childNodes: readonly [AtomToken] | readonly [AtomToken, AtomToken] | readonly [AtomToken, AtomToken, AtomToken];
-    abstract get firstChild(): AtomToken;
-    abstract get lastChild(): AtomToken;
+    readonly childNodes: readonly [Token] | readonly [AtomToken, Token] | readonly [Token, AtomToken, Token];
+    abstract get firstChild(): Token;
+    abstract get lastChild(): Token;
     abstract get parentNode(): ConverterToken | undefined;
     abstract get previousSibling(): ConverterFlagsToken | this | undefined;
     abstract get nextSibling(): this | undefined;
-    abstract get children(): [AtomToken] | [AtomToken, AtomToken] | [AtomToken, AtomToken, AtomToken];
-    abstract get firstElementChild(): AtomToken;
-    abstract get lastElementChild(): AtomToken;
+    abstract get children(): [Token] | [AtomToken, Token] | [Token, AtomToken, Token];
+    abstract get firstElementChild(): Token;
+    abstract get lastElementChild(): Token;
     abstract get parentElement(): ConverterToken | undefined;
     abstract get previousElementSibling(): ConverterFlagsToken | this | undefined;
     abstract get nextElementSibling(): this | undefined;
@@ -44,7 +44,7 @@ export declare abstract class ConverterRuleToken extends Token {
      * @override
      * @param i position of the child node / 移除位置
      */
-    removeAt(i: number): AtomToken;
+    removeAt(i: number): Token;
     insertAt(): never;
     /**
      * Prevent language conversion