wikilint 2.48.1 → 2.48.2

package/README.md

@@ -97,6 +97,6 @@ repos:
         # You can add any CLI options as needed
         entry: wikilint
         language: node
-        additional_dependencies: ['wikilint@2.48.1']
+        additional_dependencies: ['wikilint@2.48.2']
         files: \.(mediawiki|wiki|wikitext)$
 ```

package/dist/bin/config.js

@@ -41,7 +41,7 @@ const filterGadget = (id) => {
     const n = Number(id);
     return n < 2300 || n > 2303; // Gadget, Gadget talk, Gadget definition, Gadget definition talk
 };
-const pkg = 'wikilint', version = '2.48.1';
+const pkg = 'wikilint', version = '2.48.2';
 /**
  * Get the parser configuration for a Wikimedia Foundation project.
  * @param site site nickname

package/dist/index.js

@@ -16,7 +16,7 @@ const path_1 = __importDefault(require("path"));
 const common_1 = require("@bhsd/common");
 const diff_1 = require("./util/diff");
 /* NOT FOR BROWSER ONLY */
-const re = new RegExp(String.raw `^https?:\/\/([^./]+)\.(${common_1.wmf})\.org`, 'iu');
+const re = new RegExp(String.raw `^https?://([^./]+)\.(${common_1.wmf})\.org`, 'iu');
 /**
  * require一个JSON文件
  * @param file 文件名

package/dist/lib/lsp.js

@@ -583,7 +583,7 @@ 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));
             const re = new RegExp('(?:' // eslint-disable-line prefer-template
-                + String.raw `<(\/?\w*)` // tag ($1)
+                + String.raw `<(/?\w*)` // tag ($1)
                 + '|'
                 + String.raw `(\{{2,4}|\[\[)\s*([^|{}<>[\]\s][^|{}<>[\]#]*)?` // braces and brackets ($2, $3)
                 + '|'
@@ -625,7 +625,7 @@ class LanguageService {
      * @param position position / 位置
      */
     async provideCompletionItems(text, position) {
-        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) ?? '');
+        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(Math.max(0, character - 1e4), character) ?? '');
         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).trimStart().startsWith('>') ? '>' : '');

package/dist/lib/text.js

@@ -43,16 +43,6 @@ const errorSyntaxUrl = /* #__PURE__ */ new RegExp(source, 'giu'), noLinkTypes =
     'select',
     'textarea',
 ]);
-const wordRegex = /* #__PURE__ */ (() => {
-    try {
-        // eslint-disable-next-line prefer-regex-literals
-        return new RegExp(String.raw `[\p{L}\p{N}_]`, 'u');
-    }
-    catch /* c8 ignore start */ {
-        return /\w/u;
-    }
-    /* c8 ignore stop */
-})();
 /**
  * text node
  *
@@ -274,7 +264,7 @@ class AstText extends node_1.AstNode {
                     if (char === '<') {
                         e.suggestions = [(0, lint_1.fixByEscape)(startIndex, '&lt;')];
                     }
-                    else if (char === 'h' && type !== 'link-text' && wordRegex.test(previousChar ?? '')) {
+                    else if (char === 'h' && type !== 'link-text' && /[\p{L}\p{N}_]/u.test(previousChar ?? '')) {
                         e.suggestions = [(0, lint_1.fixBySpace)(startIndex)];
                     }
                     else if (lbrackInExtLinkText) {

package/dist/parser/commentAndExt.js

@@ -3,24 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseCommentAndExt = void 0;
 const common_1 = require("@bhsd/common");
 const string_1 = require("../util/string");
+const replace_1 = require("../util/replace");
 const onlyinclude_1 = require("../src/onlyinclude");
 const noinclude_1 = require("../src/nowiki/noinclude");
 const include_1 = require("../src/tagPair/include");
 const ext_1 = require("../src/tagPair/ext");
 const comment_1 = require("../src/nowiki/comment");
-const onlyincludeLeft = '<onlyinclude>', onlyincludeRight = '</onlyinclude>', { length } = onlyincludeLeft, getExtRegex = [false, true].map(includeOnly => {
+const onlyincludeLeft = '<onlyinclude>', onlyincludeRight = '</onlyinclude>', getExtRegex = [false, true].map(includeOnly => {
     const noincludeRegex = includeOnly ? 'includeonly' : '(?:no|only)include', includeRegex = includeOnly ? 'noinclude' : 'includeonly';
-    return (0, common_1.getRegex)(exts => new RegExp(String.raw `<!--.*?(?:-->|$)|<${noincludeRegex}(?:\s[^>]*)?/?>|</${noincludeRegex}\s*>|<(${exts // eslint-disable-next-line unicorn/prefer-string-raw
-    })(\s[^>]*?)?(?:/>|>(.*?)</(${'\\1'}\s*)>)|<(${includeRegex})(\s[^>]*?)?(?:/>|>(.*?)(?:</(${includeRegex}\s*)>|$))`, 'gisu'));
+    return (0, common_1.getRegex)(exts => new RegExp(String.raw `<!--.*?(?:-->|$)|<${noincludeRegex}(?=\s|\/?>)|</${noincludeRegex}\s*>|<(${exts})(?=\s|\/?>)|<(${includeRegex})(?=\s|\/?>)`, 'gisu'));
 });
-/**
- * 更新`<onlyinclude>`和`</onlyinclude>`的位置
- * @param wikitext
- */
-const update = (wikitext) => {
-    const i = wikitext.indexOf(onlyincludeLeft);
-    return { i, j: wikitext.indexOf(onlyincludeRight, i + length) };
-};
 /**
  * 解析HTML注释和扩展标签
  * @param wikitext
@@ -30,32 +22,20 @@ const update = (wikitext) => {
  */
 const parseCommentAndExt = (wikitext, config, accum, includeOnly) => {
     if (includeOnly) {
-        let { i, j } = update(wikitext);
-        if (i !== -1 && j !== -1) { // `<onlyinclude>`拥有最高优先级
-            let str = '';
-            /**
-             * 忽略未被`<onlyinclude>`和`</onlyinclude>`包裹的内容
-             * @param text 未被包裹的内容
-             */
-            const noinclude = (text) => {
-                // @ts-expect-error abstract class
-                new noinclude_1.NoincludeToken(text, config, accum);
-                str += `\0${accum.length - 1}n\x7F`;
-            };
-            while (i !== -1 && j !== -1) {
+        const i = wikitext.indexOf(onlyincludeLeft);
+        if (i !== -1 && wikitext.includes(onlyincludeRight, i)) { // `<onlyinclude>`拥有最高优先级
+            return (0, replace_1.safeStringReplace)(wikitext, onlyincludeLeft, onlyincludeRight, false, inner => {
                 const token = `\0${accum.length}g\x7F`;
-                new onlyinclude_1.OnlyincludeToken(wikitext.slice(i + length, j), config, accum);
-                if (i > 0) {
-                    noinclude(wikitext.slice(0, i));
+                new onlyinclude_1.OnlyincludeToken(inner, config, accum);
+                return token;
+            }, s => {
+                if (!s) {
+                    return '';
                 }
-                str += token;
-                wikitext = wikitext.slice(j + length + 1);
-                ({ i, j } = update(wikitext));
-            }
-            if (wikitext) {
-                noinclude(wikitext);
-            }
-            return str;
+                // @ts-expect-error abstract class
+                new noinclude_1.NoincludeToken(s, config, accum);
+                return `\0${accum.length - 1}n\x7F`;
+            });
         }
     }
     const { ext } = config;
@@ -65,45 +45,103 @@ const parseCommentAndExt = (wikitext, config, accum, includeOnly) => {
         const stack = [];
         newExt = ext.filter(e => e !== 'translate' && e !== 'tvar');
         newConfig = { ...config, ext: newExt };
-        wikitext = wikitext.replace(/<nowiki>.*?<\/nowiki>/gisu, m => {
-            stack.push(m);
+        // 隐藏`<nowiki>`标签
+        const text = (0, replace_1.safeStringReplace)(wikitext, '<nowiki>', '</nowiki>', true, (inner, open, close) => {
+            stack.push(open + inner + close);
             return `\0${stack.length - 1}\x7F`;
-        }).replace(/<translate( nowrap)?>(.*?)<\/translate>/gsu, (_, p1, p2) => {
+        });
+        // 解析`<translate>`标签
+        wikitext = (0, replace_1.safePatternReplace)(text, /<translate( nowrap)?>/gu, '</translate>', (inner, [, p1]) => {
             const l = accum.length;
             // @ts-expect-error abstract class
-            new TranslateToken(p1, p2 && (0, string_1.restore)(p2, stack), newConfig, accum);
+            new TranslateToken(p1, inner && (0, string_1.restore)(inner, stack), newConfig, accum);
             return `\0${l}g\x7F`;
         });
         wikitext = (0, string_1.restore)(wikitext, stack);
     }
-    const re = getExtRegex[includeOnly ? 1 : 0](newExt.join('|'));
+    const re = getExtRegex[includeOnly ? 1 : 0](newExt.join('|')), noMoreTags = new Set();
     re.lastIndex = 0;
-    return re.test(wikitext)
-        ? wikitext.replace(re, (substr, name, attr, inner, closing, include, includeAttr, includeInner, includeClosing) => {
-            const l = accum.length;
-            let ch = 'n';
-            if (name) {
-                ch = 'e';
-                // @ts-expect-error abstract class
-                new ext_1.ExtToken(name, attr, inner, closing, newConfig, include, accum);
+    let lastIndex = 0, text = '', noMoreGt = false;
+    for (let mt = re.exec(wikitext); mt; mt = re.exec(wikitext)) {
+        const [substr, name, include] = mt, tag = name || include, { index } = mt, l = accum.length;
+        text += wikitext.slice(lastIndex, index);
+        ({ lastIndex } = re);
+        let ch = 'n', matched = true;
+        if (substr.startsWith('<!--')) {
+            ch = 'c';
+            const closed = substr.endsWith('-->');
+            // @ts-expect-error abstract class
+            new comment_1.CommentToken((0, string_1.restore)(substr, accum, 1)
+                .slice(4, closed ? -3 : undefined), closed, config, accum);
+        }
+        else if (noMoreGt) {
+            matched = false;
+        }
+        else if (tag) {
+            const i = wikitext.indexOf('>', lastIndex);
+            let attr, inner, closing;
+            if (i === -1) {
+                matched = false;
+                noMoreGt = true;
             }
-            else if (substr.startsWith('<!--')) {
-                ch = 'c';
-                const closed = substr.endsWith('-->');
-                // @ts-expect-error abstract class
-                new comment_1.CommentToken((0, string_1.restore)(substr, accum, 1)
-                    .slice(4, closed ? -3 : undefined), closed, config, accum);
+            else if (wikitext[i - 1] === '/') {
+                attr = wikitext.slice(lastIndex, i - 1);
+                lastIndex = i + 1;
+                re.lastIndex = lastIndex;
             }
-            else if (include) {
-                // @ts-expect-error abstract class
-                new include_1.IncludeToken(include, includeAttr && (0, string_1.restore)(includeAttr, accum, 1), includeInner && (0, string_1.restore)(includeInner, accum, 1), includeClosing, config, accum);
+            else if (noMoreTags.has(tag.toLowerCase())) {
+                matched = false;
             }
             else {
+                attr = wikitext.slice(lastIndex, i);
+                const after = wikitext.slice(i + 1), m = new RegExp(String.raw `</(${tag}\s*)>`, 'iu').exec(after);
+                if (m) {
+                    inner = after.slice(0, m.index);
+                    [, closing] = m;
+                    lastIndex = i + 1 + m.index + m[0].length;
+                    re.lastIndex = lastIndex;
+                }
+                else if (include) {
+                    inner = after;
+                    lastIndex = wikitext.length;
+                    re.lastIndex = lastIndex;
+                }
+                else {
+                    matched = false;
+                    noMoreTags.add(tag.toLowerCase());
+                }
+            }
+            if (matched) {
+                if (name) {
+                    ch = 'e';
+                    // @ts-expect-error abstract class
+                    new ext_1.ExtToken(name, attr, inner, closing, newConfig, include, accum);
+                }
+                else {
+                    // @ts-expect-error abstract class
+                    new include_1.IncludeToken(include, attr && (0, string_1.restore)(attr, accum, 1), inner && (0, string_1.restore)(inner, accum, 1), closing, config, accum);
+                }
+            }
+        }
+        else if (substr.startsWith('</')) {
+            // @ts-expect-error abstract class
+            new noinclude_1.NoincludeToken(wikitext.slice(index, lastIndex), config, accum, true);
+        }
+        else {
+            const i = wikitext.indexOf('>', lastIndex);
+            if (i === -1) {
+                matched = false;
+                noMoreGt = true;
+            }
+            else {
+                lastIndex = i + 1;
+                re.lastIndex = lastIndex;
                 // @ts-expect-error abstract class
-                new noinclude_1.NoincludeToken(substr, config, accum, true);
+                new noinclude_1.NoincludeToken(wikitext.slice(index, lastIndex), config, accum, true);
             }
-            return `\0${l}${ch}\x7F`;
-        })
-        : wikitext;
+        }
+        text += matched ? `\0${l}${ch}\x7F` : substr;
+    }
+    return text + wikitext.slice(lastIndex);
 };
 exports.parseCommentAndExt = parseCommentAndExt;

package/dist/parser/converter.js

@@ -11,8 +11,8 @@ const converter_1 = require("../src/converter");
 const parseConverter = (text, config, accum) => {
     config.regexConverter ??= new RegExp(String.raw `;(?=(?:[^;]*?=>)?\s*(?:${config.variants.join('|')})\s*:|(?:\s|\0\d+[cn]\x7F)*$)`, 'u');
     const regex1 = /-\{/gu, regex2 = /-\{|\}-/gu, stack = [];
-    let regex = regex1, mt = regex.exec(text);
-    while (mt) {
+    let regex = regex1;
+    for (let mt = regex.exec(text); mt; mt = regex.exec(text)) {
         const { 0: syntax, index } = mt;
         if (syntax === '}-') {
             const top = stack.pop(), { length } = accum, str = text.slice(top.index + 2, index), i = str.indexOf('|'), [flags, raw] = i === -1 ? [[], str] : [str.slice(0, i).split(';'), str.slice(i + 1)], temp = raw.replace(/(&[#a-z\d]+);/giu, '$1\x01'), rules = temp.split(config.regexConverter)
@@ -30,7 +30,6 @@ const parseConverter = (text, config, accum) => {
             regex = regex2;
             regex.lastIndex = index + 2;
         }
-        mt = regex.exec(text);
     }
     return text;
 };

package/dist/parser/externalLinks.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseExternalLinks = void 0;
 const string_1 = require("../util/string");
+const replace_1 = require("../util/replace");
 const extLink_1 = require("../src/extLink");
 const magicLink_1 = require("../src/magicLink");
 /**
@@ -12,13 +13,17 @@ const magicLink_1 = require("../src/magicLink");
  * @param inFile 是否在图链中
  */
 const parseExternalLinks = (wikitext, config, accum, inFile) => {
-    config.regexExternalLinks ??= new RegExp(String.raw `\[((?:\0\d+[cn]\x7F)*(?:\0\d+f\x7F|(?:(?:${config.protocol}|//)${string_1.extUrlCharFirst}|\0\d+m\x7F)${string_1.extUrlChar}(?=[[\]<>"\t${string_1.zs}]|\0\d)))([${string_1.zs}]*(?![${string_1.zs}]))([^\]\x01-\x08\x0A-\x1F\uFFFD]*)\]`, 'giu');
-    return wikitext.replace(config.regexExternalLinks, (_, url, space, text) => {
-        const { length } = accum, mt = /&[lg]t;/u.exec(url);
-        if (mt) {
+    config.regexExternalLinks ??= new RegExp(String.raw `\[((?:\0\d+[cn]\x7F)*(?:\0\d+f\x7F|(?:(?:${config.protocol}|//)${string_1.extUrlCharFirst}|\0\d+m\x7F)${string_1.extUrlChar}(?=[[\]<>"\t${string_1.zs}]|\0\d)))([${string_1.zs}]*(?![${string_1.zs}]))`, 'giu');
+    const re = config.regexExternalLinks;
+    return (0, replace_1.safePatternReplace)(wikitext, re, ']', (text, [, url, space]) => {
+        if (/[\x01-\x08\x0A-\x1F\uFFFD]/u.test(text)) {
+            return false;
+        }
+        const { length } = accum, i = url.search(/&[lg]t;/u);
+        if (i !== -1) {
             space = '';
-            text = url.slice(mt.index) + space + text;
-            url = url.slice(0, mt.index);
+            text = url.slice(i) + space + text;
+            url = url.slice(0, i);
         }
         if (inFile) {
             // @ts-expect-error abstract class

package/dist/parser/magicLinks.js

@@ -11,23 +11,15 @@ const space = String.raw `[${string_1.zs}\t]| |&#0*160;|&#x0*a0;`, sp = `(?
  * @param accum
  */
 const parseMagicLinks = (wikitext, config, accum) => {
-    if (!config.regexMagicLinks) {
-        try {
-            config.regexMagicLinks = new RegExp(String.raw `(^|[^\p{L}\p{N}_])(?:(?:${config.protocol})(${string_1.extUrlCharFirst}${string_1.extUrlChar})|${magicLinkPattern})`, 'giu');
-        }
-        catch /* c8 ignore start */ {
-            config.regexMagicLinks = new RegExp(String.raw `(^|\W)(?:(?:${config.protocol})(${string_1.extUrlCharFirst}${string_1.extUrlChar})|${magicLinkPattern})`, 'giu');
-        }
-        /* c8 ignore stop */
-    }
+    config.regexMagicLinks ??= new RegExp(String.raw `(^|[^\p{L}\p{N}_])(?:(?:${config.protocol})(${string_1.extUrlCharFirst}${string_1.extUrlChar})|${magicLinkPattern})`, 'giu');
     return wikitext.replace(config.regexMagicLinks, (m, lead, p1) => {
         let url = lead ? m.slice(lead.length) : m;
         if (p1) {
             let trail = '';
-            const m2 = /&(?:[lg]t|nbsp|#x0*(?:3[ce]|a0)|#0*(?:6[02]|160));/iu.exec(url);
-            if (m2) {
-                trail = url.slice(m2.index);
-                url = url.slice(0, m2.index);
+            const index = url.search(/&(?:[lg]t|nbsp|#x0*(?:3[ce]|a0)|#0*(?:6[02]|160));/iu);
+            if (index !== -1) {
+                trail = url.slice(index);
+                url = url.slice(0, index);
             }
             const sep = url.includes('(') ? /[^,;\\.:!?][,;\\.:!?]+$/u : /[^,;\\.:!?)][,;\\.:!?)]+$/u, sepChars = sep.exec(url);
             if (sepChars) {

package/dist/parser/table.js

@@ -99,7 +99,7 @@ const parseTable = ({ firstChild: { data }, type, name }, config, accum) => {
         else {
             top = pop(top, stack);
             const regex = cell === '!' ? /!!|(?:\||\0\d+!\x7F){2}|\0\d+\+\x7F/gu : /(?:\||\0\d+!\x7F){2}|\0\d+\+\x7F/gu;
-            let mt = regex.exec(attr), lastIndex = 0, lastSyntax = `\n${spaces}${cell}`;
+            let lastIndex = 0, lastSyntax = `\n${spaces}${cell}`, mt;
             /**
              * 创建表格单元格
              * @param tr 当前表格行
@@ -110,11 +110,10 @@ const parseTable = ({ firstChild: { data }, type, name }, config, accum) => {
                 tr.insertAt(td);
                 return td;
             };
-            while (mt) {
+            for (mt = regex.exec(attr); mt; mt = regex.exec(attr)) {
                 newTd(top);
                 ({ lastIndex } = regex);
                 [lastSyntax] = mt;
-                mt = regex.exec(attr);
             }
             stack.push(top, newTd(top));
         }

package/dist/src/attribute.js

@@ -14,7 +14,7 @@ const index_2 = require("./index");
 const atom_1 = require("./atom");
 /* NOT FOR BROWSER ONLY */
 const document_1 = require("../lib/document");
-const insecureStyle = /expression|(?:accelerator|-o-link(?:-source)?|-o-replace)\s*:|(?:url|src|image(?:-set)?)\s*\(|attr\s*\([^)]+[\s,]url/u, evil = /(?:^|\s|\*\/)(?:java|vb)script(?:\W|$)/iu, complexTypes = new Set(['ext', 'arg', 'magic-word', 'template']), itemAttrs = new Set(['itemtype', 'itemid', 'itemref']), urlAttrs = new Set([
+const insecureStyle = /expression|(?:accelerator|-o-link(?:-source)?|-o-replace)\s*:|(?:url|src|image(?:-set)?)\s*\(|attr\s*\((?:(?!attr\s*\()[^)])+[\s,]url/u, evil = /(?:^|\s|\*\/)(?:java|vb)script(?:\W|$)/iu, complexTypes = new Set(['ext', 'arg', 'magic-word', 'template']), itemAttrs = new Set(['itemtype', 'itemid', 'itemref']), urlAttrs = new Set([
     'about',
     'property',
     'resource',

package/dist/src/attributes.js

@@ -22,16 +22,6 @@ exports.toAttributeType = toAttributeType;
  * @param type 属性类型
  */
 const toDirty = (type) => `${(0, exports.toAttributeType)(type)}-dirty`;
-const wordRegex = /* #__PURE__ */ (() => {
-    try {
-        // eslint-disable-next-line prefer-regex-literals
-        return new RegExp(String.raw `[\p{L}\p{N}]`, 'u');
-    }
-    catch /* c8 ignore start */ {
-        return /[^\W_]/u;
-    }
-    /* c8 ignore stop */
-})();
 const required = new Map([
     ['indicator', ['name']],
     ['langconvert', ['from', 'to']],
@@ -63,14 +53,14 @@ class AttributesToken extends index_2.Token {
         this.setAttribute('name', name);
         if (attr) {
             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;
+            let out = '', lastIndex = 0;
             const insertDirty = /** 插入无效属性 */ () => {
                 if (out) {
                     super.insertAt(new atom_1.AtomToken(out, toDirty(type), config, accum));
                     out = '';
                 }
             };
-            while (mt) {
+            for (let mt = regex.exec(attr); mt; mt = regex.exec(attr)) {
                 const { index, 0: full, 1: key, 2: equal, 3: quoteStart, 4: quoted, 5: quoteEnd, 6: unquoted } = mt;
                 out += attr.slice(lastIndex, index);
                 if (/^(?:[\w:]|\0\d+t\x7F)(?:[\w:.-]|\0\d+t\x7F)*$/u
@@ -85,7 +75,6 @@ class AttributesToken extends index_2.Token {
                     out += full;
                 }
                 ({ lastIndex } = regex);
-                mt = regex.exec(attr);
             }
             out += attr.slice(lastIndex);
             insertDirty();
@@ -185,7 +174,7 @@ class AttributesToken extends index_2.Token {
                     }
                 }
                 else {
-                    const str = attr.text().trim(), severity = s[wordRegex.test(str) ? 1 : 2];
+                    const str = attr.text().trim(), severity = s[/[\p{L}\p{N}]/u.test(str) ? 1 : 2];
                     if (str && severity) {
                         const e = (0, lint_1.generateForChild)(attr, rect, rules[0], 'invalid-attribute', severity);
                         if (computeEditInfo) {

package/dist/src/commented.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CommentedToken = void 0;
+const replace_1 = require("../util/replace");
 const index_1 = require("./index");
 const comment_1 = require("./nowiki/comment");
 /**
@@ -15,25 +16,19 @@ class CommentedToken extends index_1.Token {
     constructor(wikitext, config, accum = []) {
         super(undefined, config, accum, {});
         if (wikitext) {
-            let i = wikitext.indexOf('<!--'), j = i !== -1 && wikitext.indexOf('-->', i + 4), lastIndex = 0;
-            while (j !== false && j !== -1) {
-                if (i > lastIndex) {
-                    this.insertAt(wikitext.slice(lastIndex, i));
-                }
+            (0, replace_1.safeStringReplace)(wikitext, '<!--', '-->', false, inner => {
                 // @ts-expect-error abstract class
-                this.insertAt(new comment_1.CommentToken(wikitext.slice(i + 4, j), true, config, accum));
-                lastIndex = j + 3;
-                i = wikitext.indexOf('<!--', lastIndex);
-                j = i !== -1 && wikitext.indexOf('-->', i + 4);
-            }
-            if (lastIndex < wikitext.length) {
-                this.insertAt(wikitext.slice(lastIndex));
-            }
+                this.insertAt(new comment_1.CommentToken(inner, true, config, accum));
+                return '';
+            }, s => {
+                this.insertAt(s);
+                return '';
+            });
         }
     }
     /** @private */
     lint(start = this.getAbsoluteIndex()) {
-        LINT: return super.lint(start, new RegExp(String.raw `<\s*(?:\/\s*)?(${this.name})\b`, 'giu'));
+        LINT: return super.lint(start, new RegExp(String.raw `<\s*(?:/\s*)?(${this.name})\b`, 'giu'));
     }
 }
 exports.CommentedToken = CommentedToken;

package/dist/src/index.js

@@ -424,8 +424,7 @@ class Token extends element_1.AstElement {
                 }
                 if (!ignoreDisables) {
                     const regex = new RegExp(String.raw `<!--\s*${configurationComment}-(disable(?:(?:-next)?-line)?|enable)(\s[\sa-z,-]*)?-->`, 'gu'), ignores = [];
-                    let mt = regex.exec(wikitext);
-                    while (mt) {
+                    for (let mt = regex.exec(wikitext); mt; mt = regex.exec(wikitext)) {
                         const { 1: type, index } = mt, detail = mt[2]?.trim();
                         let line;
                         if (type === 'disable-line' || type === 'disable-next-line') {
@@ -437,7 +436,6 @@ class Token extends element_1.AstElement {
                             to: type === 'enable' ? regex.lastIndex : undefined,
                             rules: detail ? new Set(detail.split(',').map(rule => rule.trim())) : undefined,
                         });
-                        mt = regex.exec(wikitext);
                     }
                     errors = errors.filter(({ rule, startLine, startIndex }) => {
                         const nearest = { pos: 0 };

package/dist/src/link/file.js

@@ -25,8 +25,8 @@ const explode = (str) => {
         return [];
     }
     const regex = /-\{|\}-|\|/gu, exploded = [];
-    let mt = regex.exec(str), depth = 0, lastIndex = 0;
-    while (mt) {
+    let depth = 0, lastIndex = 0;
+    for (let mt = regex.exec(str); mt; mt = regex.exec(str)) {
         const { 0: match, index } = mt;
         if (match !== '|') {
             depth += match === '-{' ? 1 : -1;
@@ -35,7 +35,6 @@ const explode = (str) => {
             exploded.push(str.slice(lastIndex, index));
             ({ lastIndex } = regex);
         }
-        mt = regex.exec(str);
     }
     exploded.push(str.slice(lastIndex));
     return exploded;

package/dist/src/nested.js

@@ -40,13 +40,51 @@ class NestedToken extends index_2.Token {
             wikitext &&= (0, braces_1.parseBraces)(wikitext, config, accum);
             accum.splice(length, 1);
         }
-        else {
-            wikitext &&= wikitext.replace(regex, (_, name, attr, inner, closing) => {
-                const str = `\0${accum.length + 1}e\x7F`;
-                // @ts-expect-error abstract class
-                new ext_1.ExtToken(name, attr, inner, closing, config, false, accum);
-                return str;
-            });
+        else if (wikitext) {
+            const noMoreTags = new Set();
+            regex.lastIndex = 0;
+            let lastIndex = 0, text = '';
+            for (let mt = regex.exec(wikitext); mt; mt = regex.exec(wikitext)) {
+                const i = wikitext.indexOf('>', regex.lastIndex);
+                if (i === -1) {
+                    break;
+                }
+                const [substr, name] = mt, { index } = mt;
+                text += wikitext.slice(lastIndex, index);
+                ({ lastIndex } = regex);
+                let matched = true, attr, inner, closing;
+                if (wikitext[i - 1] === '/') {
+                    attr = wikitext.slice(lastIndex, i - 1);
+                    lastIndex = i + 1;
+                    regex.lastIndex = lastIndex;
+                }
+                else if (noMoreTags.has(name.toLowerCase())) {
+                    matched = false;
+                }
+                else {
+                    const after = wikitext.slice(i + 1), m = new RegExp(String.raw `</(${name}\s*)>`, 'iu').exec(after);
+                    if (m) {
+                        inner = after.slice(0, m.index);
+                        [, closing] = m;
+                        lastIndex = i + 1 + m.index + m[0].length;
+                        regex.lastIndex = lastIndex;
+                    }
+                    else {
+                        matched = false;
+                        noMoreTags.add(name.toLowerCase());
+                    }
+                }
+                if (matched) {
+                    const str = `\0${accum.length + 1}e\x7F`;
+                    // @ts-expect-error abstract class
+                    new ext_1.ExtToken(name, attr, inner, closing, config, false, accum);
+                    text += str;
+                }
+                else {
+                    text += substr;
+                }
+            }
+            wikitext = text + wikitext.slice(lastIndex);
         }
         wikitext &&= wikitext.replace(/(^|\0\d+.\x7F)([^\0]+)(?=$|\0\d+.\x7F)/gu, (_, lead, substr) => {
             // @ts-expect-error abstract class

package/dist/src/parameter.js

@@ -8,7 +8,7 @@ const string_1 = require("../util/string");
 const lint_1 = require("../util/lint");
 const index_1 = __importDefault(require("../index"));
 const index_2 = require("./index");
-const linkRegex = /* #__PURE__ */ (() => new RegExp(`https?://${string_1.extUrlCharFirst}${string_1.extUrlChar}$`, 'iu'))();
+const linkRegex = /* #__PURE__ */ (() => new RegExp(`^https?://${string_1.extUrlCharFirst}${string_1.extUrlChar}$`, 'u'))();
 /**
  * template or magic word parameter
  *
@@ -74,9 +74,9 @@ class ParameterToken extends index_2.Token {
         LINT: {
             const errors = super.lint(start, re), rule = 'unescaped', { lintConfig } = index_1.default, s = lintConfig.getSeverity(rule);
             if (s) {
-                const { firstChild } = this, link = linkRegex.exec(firstChild.text())?.[0];
+                const { firstChild } = this, key = firstChild.text().toLowerCase(), i = Math.max(key.lastIndexOf('http://'), key.lastIndexOf('https://')), link = i !== -1 && key.slice(i);
                 try {
-                    if (link && new URL(link).search) {
+                    if (link && linkRegex.test(link) && new URL(link).search) {
                         const e = (0, lint_1.generateForChild)(firstChild, { start }, rule, 'unescaped-query', s);
                         e.startIndex = e.endIndex;
                         e.startLine = e.endLine;

package/dist/src/pre.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PreToken = void 0;
 const constants_1 = require("../util/constants");
+const replace_1 = require("../util/replace");
 const index_1 = require("./index");
 const noinclude_1 = require("./nowiki/noinclude");
 /**
@@ -14,29 +15,13 @@ class PreToken extends index_1.Token {
     }
     /** @class */
     constructor(wikitext, config, accum = []) {
-        if (wikitext) {
-            const opening = /<nowiki>/giu, closing = /<\/nowiki>/giu, { length } = opening.source;
-            let i = opening.exec(wikitext);
-            if (i) {
-                closing.lastIndex = i.index + length;
-            }
-            let j = closing.exec(wikitext), lastIndex = 0, str = '';
-            while (i && j) {
-                // @ts-expect-error abstract class
-                new noinclude_1.NoincludeToken(i[0], config, accum, true);
-                // @ts-expect-error abstract class
-                new noinclude_1.NoincludeToken(j[0], config, accum, true);
-                str += `${wikitext.slice(lastIndex, i.index)}\0${accum.length - 1}n\x7F${wikitext.slice(i.index + length, j.index)}\0${accum.length}n\x7F`;
-                lastIndex = j.index + length + 1;
-                opening.lastIndex = lastIndex;
-                i = opening.exec(wikitext);
-                if (i) {
-                    closing.lastIndex = i.index + length;
-                }
-                j = closing.exec(wikitext);
-            }
-            wikitext = str + wikitext.slice(lastIndex);
-        }
+        wikitext &&= (0, replace_1.safeStringReplace)(wikitext, '<nowiki>', '</nowiki>', true, (inner, opening, closing) => {
+            // @ts-expect-error abstract class
+            new noinclude_1.NoincludeToken(opening, config, accum, true);
+            // @ts-expect-error abstract class
+            new noinclude_1.NoincludeToken(closing, config, accum, true);
+            return `\0${accum.length - 1}n\x7F${inner}\0${accum.length}n\x7F`;
+        });
         super(wikitext, config, accum, {});
         this.setAttribute('stage', constants_1.MAX_STAGE - 1);
     }

package/dist/src/singleLine/charinsertLine.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CharinsertLineToken = void 0;
 const lint_1 = require("../../util/lint");
+const replace_1 = require("../../util/replace");
 const rect_1 = require("../../lib/rect");
 const index_1 = __importDefault(require("../../index"));
 const index_2 = require("./index");
@@ -21,9 +22,9 @@ class CharinsertLineToken extends index_2.SingleLineToken {
     }
     /** @class */
     constructor(wikitext, config, accum) {
-        super(wikitext?.replace(/<(nowiki)>(.*?)<\/(nowiki)>/giu, (_, opening, content, closing) => {
+        super(wikitext && (0, replace_1.safeStringReplace)(wikitext, '<nowiki>', '</nowiki>', true, (content, opening, closing) => {
             // @ts-expect-error abstract class
-            new ext_1.ExtToken(opening, undefined, content, closing, config, false, accum);
+            new ext_1.ExtToken(opening.slice(1, -1), undefined, content, closing.slice(2, -1), config, false, accum);
             return `\0${accum.length - 2}e\x7F`;
         }), config, accum);
     }
@@ -37,22 +38,21 @@ class CharinsertLineToken extends index_2.SingleLineToken {
             const errors = [], str = this.childNodes.map(child => child.type === 'text'
                 ? child.data
                 : `<nowiki>${child.innerText.replace(/[^+]/gu, '_')}</nowiki>`).join(''), re = /(?:^|\s)\S+/gu, rect = new rect_1.BoundingRect(this, start), msg = index_1.default.msg('invalid-content', 'charinsert');
-            let mt = re.exec(str);
-            while (mt) {
+            for (let mt = re.exec(str); mt; mt = re.exec(str)) {
                 const [item] = mt;
                 let i = item.indexOf('+');
                 if (i !== -1 && item.slice(0, i).trim()) {
                     i = item.indexOf('+', i + 1);
                 }
-                if (i !== -1) {
-                    const e = (0, lint_1.generateForSelf)(this, rect, rule, msg, s), startOffset = mt.index + i, endOffset = mt.index + item.length;
-                    e.endIndex = start + endOffset;
-                    e.endCol = e.startCol + endOffset;
-                    e.startIndex += startOffset;
-                    e.startCol += startOffset;
-                    errors.push(e);
+                if (i === -1) {
+                    continue;
                 }
-                mt = re.exec(str);
+                const e = (0, lint_1.generateForSelf)(this, rect, rule, msg, s), startOffset = mt.index + i, endOffset = mt.index + item.length;
+                e.endIndex = start + endOffset;
+                e.endCol = e.startCol + endOffset;
+                e.startIndex += startOffset;
+                e.startCol += startOffset;
+                errors.push(e);
             }
             return errors;
         }

package/dist/src/tagPair/ext.js

@@ -152,14 +152,14 @@ let ExtToken = (() => {
                     // NestedToken 依赖 ExtToken
                     const { NestedToken } = require('../nested');
                     // @ts-expect-error abstract class
-                    innerToken = new NestedToken(inner, /<(option|choicetemplate)(\s[^>]*?)?(?:\/>|>(.*?)<\/(\1)>)/gsu, ['option', 'choicetemplate'], newConfig, accum);
+                    innerToken = new NestedToken(inner, /<(option|choicetemplate)(?=\s|\/?>)/gu, ['option', 'choicetemplate'], newConfig, accum);
                     break;
                 }
                 case 'combobox': {
                     // NestedToken 依赖 ExtToken
                     const { NestedToken } = require('../nested');
                     // @ts-expect-error abstract class
-                    innerToken = new NestedToken(inner, /<(combooption)(\s[^>]*?)?(?:\/>|>(.*?)<\/(combooption\s*)>)/gisu, ['combooption'], newConfig, accum);
+                    innerToken = new NestedToken(inner, /<(combooption)(?=\s|\/?>)/gu, ['combooption'], newConfig, accum);
                     break;
                 }
                 case 'gallery': {

package/dist/src/tagPair/translate.js

@@ -22,19 +22,49 @@ class TranslateToken extends index_2.TagPairToken {
      */
     constructor(attr, inner, config, accum = []) {
         const attrToken = new syntax_1.SyntaxToken(attr, 'translate-attr', config, accum);
-        inner = inner?.replace(/<tvar(\|[^>]+)>(.*?)<\/>/gsu, (_, p1, p2) => {
-            // @ts-expect-error abstract class
-            new tvar_1.TvarToken('tvar', p1, false, config, accum);
-            // @ts-expect-error abstract class
-            new tvar_1.TvarToken('', '', true, config, accum);
-            return `\0${accum.length - 2}n\x7F${p2}\0${accum.length}n\x7F`;
-        }).replace(/<(tvar)(\s+name\s*=(?:\s*(?:(["']).*?\3|[^"'\s>]+))?\s*)>(.*?)<\/(tvar)(\s*)>/gisu, (_, p1, p2, __, p3, p4, p5) => {
-            // @ts-expect-error abstract class
-            new tvar_1.TvarToken(p1, p2, false, config, accum);
-            // @ts-expect-error abstract class
-            new tvar_1.TvarToken(p4, p5, true, config, accum);
-            return `\0${accum.length - 2}n\x7F${p3}\0${accum.length}n\x7F`;
-        });
+        if (inner) {
+            let result = '', lastIndex = 0, i, j, k, index;
+            const update = /** @ignore */ () => {
+                i = inner.indexOf('<tvar|', lastIndex);
+                index = i + 6;
+                j = inner.indexOf('>', index);
+                k = inner.indexOf('</>', j + 1);
+                return [i, j === index ? -1 : j, k];
+            };
+            for ([i, j, k] = update(); i !== -1 && j !== -1 && k !== -1; [i, j, k] = update()) {
+                result += inner.slice(lastIndex, i);
+                lastIndex = k + 3;
+                // @ts-expect-error abstract class
+                new tvar_1.TvarToken('tvar', inner.slice(index - 1, j), false, config, accum);
+                // @ts-expect-error abstract class
+                new tvar_1.TvarToken('', '', true, config, accum);
+                result += `\0${accum.length - 2}n\x7F${inner.slice(j + 1, k)}\0${accum.length}n\x7F`;
+            }
+            inner = result + inner.slice(lastIndex);
+            result = '';
+            lastIndex = 0;
+            const start = /<(tvar)(\s+name\s*=)/giu, end = /<\/(tvar)(\s*)>/giu;
+            for (let mt = start.exec(inner); mt; mt = start.exec(inner)) {
+                i = inner.indexOf('>', start.lastIndex);
+                const name = inner.slice(start.lastIndex, i);
+                if (i === -1 || !/^(?:\s*(?:(["']).*?\1|[^"'\s>]+))?\s*$/su.test(name)) {
+                    break;
+                }
+                end.lastIndex = i + 1;
+                const mt2 = end.exec(inner);
+                if (!mt2) {
+                    break;
+                }
+                // @ts-expect-error abstract class
+                new tvar_1.TvarToken(mt[1], mt[2] + name, false, config, accum);
+                // @ts-expect-error abstract class
+                new tvar_1.TvarToken(mt2[1], mt2[2], true, config, accum);
+                result += `${inner.slice(lastIndex, mt.index)}\0${accum.length - 2}n\x7F${inner.slice(i + 1, mt2.index)}\0${accum.length}n\x7F`;
+                ({ lastIndex } = end);
+                start.lastIndex = lastIndex;
+            }
+            inner = result + inner.slice(lastIndex);
+        }
         const innerToken = new index_1.Token(inner, config, accum);
         innerToken.type = 'translate-inner';
         super('translate', attrToken, innerToken, 'translate', config, accum);

package/dist/util/replace.js

@@ -0,0 +1,59 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.safePatternReplace = exports.safeStringReplace = void 0;
+/**
+ * 使用`String#indexOf`避免正则表达式的回溯
+ * @param wikitext 源文本
+ * @param start 起始字符串
+ * @param end 结束字符串
+ * @param insensitive 是否忽略大小写
+ * @param matched 匹配到的内容处理函数
+ * @param unmatched 未匹配到的内容处理函数
+ */
+const safeStringReplace = (wikitext, start, end, insensitive, matched, unmatched = (str) => str) => {
+    const text = insensitive ? wikitext.toLowerCase() : wikitext, lStart = start.length, lEnd = end.length;
+    let result = '', lastIndex = 0, i, j, index;
+    const update = /** @ignore */ () => {
+        i = text.indexOf(start, lastIndex);
+        index = i + lStart;
+        return [i, text.indexOf(end, index), index];
+    };
+    for ([i, j, index] = update(); i !== -1 && j !== -1; [i, j, index] = update()) {
+        result += unmatched(wikitext.slice(lastIndex, i));
+        lastIndex = j + lEnd;
+        result += matched(wikitext.slice(index, j), insensitive ? wikitext.slice(i, index) : start, insensitive ? wikitext.slice(j, lastIndex) : end);
+    }
+    return result + unmatched(wikitext.slice(lastIndex));
+};
+exports.safeStringReplace = safeStringReplace;
+/**
+ * 使用`RegExp#exec`避免正则表达式的回溯
+ * @param wikitext 源文本
+ * @param start 起始正则表达式
+ * @param end 结束字符串
+ * @param matched 匹配到的内容处理函数
+ */
+const safePatternReplace = (wikitext, start, end, matched) => {
+    let result = '', lastIndex = 0;
+    start.lastIndex = 0;
+    for (let mt = start.exec(wikitext); mt; mt = start.exec(wikitext)) {
+        const i = wikitext.indexOf(end, start.lastIndex);
+        if (i === -1) {
+            break;
+        }
+        const { index } = mt;
+        result += wikitext.slice(lastIndex, index);
+        lastIndex = i + end.length;
+        const r = matched(wikitext.slice(start.lastIndex, i), mt);
+        if (r === false) {
+            ({ lastIndex } = start);
+            result += wikitext.slice(index, lastIndex);
+        }
+        else {
+            result += r;
+            start.lastIndex = lastIndex;
+        }
+    }
+    return result + wikitext.slice(lastIndex);
+};
+exports.safePatternReplace = safePatternReplace;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wikilint",
-	"version": "2.48.1",
+	"version": "2.48.2",
 	"description": "A Node.js linter for MediaWiki markup",
 	"keywords": [
 		"mediawiki",
@@ -75,7 +75,7 @@
 	},
 	"peerDependencies": {
 		"mathoid-texvcjs": ">=0.4.0",
-		"stylelint": ">=16.0.0",
+		"stylelint-config-recommended": ">=14.0.0",
 		"vscode-css-languageservice": ">=3.0.0",
 		"vscode-html-languageservice": ">=3.1.0",
 		"vscode-json-languageservice": ">=3.2.0"
@@ -84,7 +84,7 @@
 		"mathoid-texvcjs": {
 			"optional": true
 		},
-		"stylelint": {
+		"stylelint-config-recommended": {
 			"optional": true
 		},
 		"vscode-css-languageservice": {
@@ -100,13 +100,13 @@
 	"dependencies": {
 		"@bhsd/cm-util": "^2.4.2",
 		"@bhsd/common": "^4.1.0",
-		"@bhsd/stylelint-util": "^1.1.0",
+		"@bhsd/stylelint-util": "^2.0.0",
 		"culori": "^4.0.2",
 		"entities": "^8.1.0",
-		"vscode-languageserver-types": "^3.18.4"
+		"vscode-languageserver-types": "^3.18.5"
 	},
 	"devDependencies": {
-		"@bhsd/code-standard": "^5.0.0",
+		"@bhsd/code-standard": "^5.1.0",
 		"@bhsd/nodejs": "^1.2.1",
 		"@bhsd/test-util": "^3.3.0",
 		"ajv": "^8.20.0",
@@ -114,14 +114,15 @@
 		"c8": "^12.0.0",
 		"diff2html-cli": "^5.2.15",
 		"esbuild": "^0.28.2",
-		"eslint": "^10.13.0",
+		"eslint": "^10.14.0",
 		"mathoid-texvcjs": "^0.6.0",
 		"stylelint": "^17.16.0",
+		"stylelint-config-recommended": "^18.0.0",
 		"typescript": "^6.0.3",
 		"vscode-css-languageservice": "^6.3.10",
 		"vscode-html-languageservice": "^5.6.2",
 		"vscode-json-languageservice": "^5.7.2",
-		"vscode-languageserver-textdocument": "^1.0.15"
+		"vscode-languageserver-textdocument": "^1.0.16"
 	},
 	"engines": {
 		"node": "^20.19.0 || ^22.13.0 || >=24.11.0"