wikiparser-node 1.21.3 → 1.22.1

package/dist/lib/lsp.js

@@ -18,7 +18,7 @@ const path_1 = __importDefault(require("path"));
 const util_1 = __importDefault(require("util"));
 const child_process_1 = require("child_process");
 const crypto_1 = require("crypto");
-const stylelint_1 = require("@bhsd/common/dist/stylelint");
+const stylelint_util_1 = require("@bhsd/stylelint-util");
 const document_1 = require("./document");
 /** @see https://www.npmjs.com/package/stylelint-config-recommended */
 const cssRules = {
@@ -227,14 +227,16 @@ const adjustPos = (height, width, 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 line line number
- * @param column column number
+ * @param lineOrCode line number or code string
+ * @param columnOrOffset column number or offset in the code string
  */
-const getStylelintPos = (rect, bottom, line, column) => {
+const getStylelintPos = (rect, bottom, lineOrCode, columnOrOffset) => {
     const { top, left, height, width } = rect, start = bottom - height - 1;
-    line -= start;
-    [line, column] = adjustPos(height, width, line, column);
-    return (0, lint_1.getEndPos)(top, left, line, column);
+    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.
@@ -534,7 +536,7 @@ class LanguageService {
      *
      * 提供自动补全
      * @param text source Wikitext / 源代码
-     * @param position 位置
+     * @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;
@@ -762,7 +764,7 @@ class LanguageService {
                 if (tokens.length === 0) {
                     return [];
                 }
-                const cssErrors = await (0, stylelint_1.styleLint)((await document_1.stylelint), tokens.map(({ type, tag, lastChild }, i) => `${type === 'ext-attr' ? 'div' : tag}#${i}{\n${(0, common_1.sanitizeInlineStyle)(lastChild.toString())}\n}`).join('\n'), cssRules);
+                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 [];
                 }
@@ -772,7 +774,7 @@ class LanguageService {
                     acc += height + 2;
                     return acc;
                 });
-                return cssErrors.map(({ rule, text: msg, severity, line, column, endLine = line, endColumn = column, }) => {
+                return cssErrors.map(({ rule, text: msg, severity, line, column, endLine = line, endColumn = column, fix, }) => {
                     const i = bottoms.findIndex(bottom => bottom >= line);
                     return {
                         range: {
@@ -783,6 +785,21 @@ class LanguageService {
                         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]),
+                                        },
+                                        newText: fix.text,
+                                        title: `Fix: ${rule}`,
+                                        fix: true,
+                                    },
+                                ],
+                            }
+                            : {},
                     };
                 });
             })() :
@@ -1056,7 +1073,7 @@ class LanguageService {
      *
      * 提供引用
      * @param text source Wikitext / 源代码
-     * @param position 位置
+     * @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')
@@ -1077,7 +1094,7 @@ class LanguageService {
      *
      * 提供定义
      * @param text source Wikitext / 源代码
-     * @param position 位置
+     * @param position position / 位置
      */
     async provideDefinition(text, position) {
         const root = await this.#queue(text), node = root.elementFromPoint(position.character, position.line), ext = node.is('ext') && node.name === 'ref'
@@ -1098,7 +1115,7 @@ class LanguageService {
      *
      * 提供变量更名准备
      * @param text source Wikitext / 源代码
-     * @param position 位置
+     * @param position position / 位置
      */
     async resolveRenameLocation(text, position) {
         const root = await this.#queue(text), node = root.elementFromPoint(position.character, position.line), { type } = node, refName = getRefName(node), refGroup = getRefGroup(node);
@@ -1113,7 +1130,7 @@ class LanguageService {
      *
      * 变量更名
      * @param text source Wikitext / 源代码
-     * @param position 位置
+     * @param position position / 位置
      * @param newName new name / 新名称
      */
     async provideRenameEdits(text, position, newName) {
@@ -1159,7 +1176,7 @@ class LanguageService {
      *
      * 提供悬停信息
      * @param text source Wikitext / 源代码
-     * @param position 位置
+     * @param position position / 位置
      */
     async provideHover(text, position) {
         /* istanbul ignore next */
@@ -1255,7 +1272,7 @@ class LanguageService {
      *
      * 提供魔术字帮助
      * @param text source Wikitext / 源代码
-     * @param position 位置
+     * @param position position / 位置
      */
     async provideSignatureHelp(text, position) {
         /* istanbul ignore next */
@@ -1396,19 +1413,15 @@ class LanguageService {
      * @since v1.18.1
      */
     async setTargetWikipedia(wiki) {
-        const mt = /^https?:\/\/([^./]+)\.wikipedia\.org/iu.exec(wiki);
-        if (!mt) {
-            throw new RangeError('Invalid Wikipedia URL!');
-        }
-        const site = `${mt[1].toLowerCase()}wiki`;
+        const [site, host] = index_1.default.getWMFSite(wiki);
         try {
             const config = require(path_1.default.join('..', '..', 'config', site));
             this.config = index_1.default.getConfig(config);
         }
         catch {
-            this.config = await index_1.default.fetchConfig(site, `${mt[0]}/w`);
+            this.config = await index_1.default.fetchConfig(site, `${host}/w`);
         }
-        Object.assign(this.config, { articlePath: `${mt[0]}/wiki/` });
+        Object.assign(this.config, { articlePath: `${host}/wiki/` });
     }
 }
 exports.LanguageService = LanguageService;

package/dist/lib/node.d.ts

@@ -197,7 +197,7 @@ export declare abstract class AstNode implements AstNodeBase {
      * 添加事件监听
      * @param types event type / 事件类型
      * @param listener listener function / 监听函数
-     * @param options 选项
+     * @param options options / 选项
      * @param options.once to be executed only once / 仅执行一次
      */
     addEventListener(types: string | string[], listener: (...args: any[]) => void, options?: {

package/dist/lib/node.js

@@ -514,7 +514,7 @@ let AstNode = (() => {
          * 添加事件监听
          * @param types event type / 事件类型
          * @param listener listener function / 监听函数
-         * @param options 选项
+         * @param options options / 选项
          * @param options.once to be executed only once / 仅执行一次
          */
         addEventListener(types, listener, options) {

package/dist/lib/range.d.ts

@@ -99,7 +99,7 @@ export declare class AstRange {
      *
      * 比较端点和Range的位置
      * @param referenceNode node container / 端点容器
-     * @param offset 端点位置
+     * @param offset node offset / 端点位置
      * @throws `RangeError` 不在同一个文档
      */
     comparePoint(referenceNode: AstNodes, offset: number): -1 | 0 | 1;
@@ -108,7 +108,7 @@ export declare class AstRange {
      *
      * 端点是否在Range中
      * @param referenceNode node container / 端点容器
-     * @param offset 端点位置
+     * @param offset node offset / 端点位置
      */
     isPointInRange(referenceNode: AstNodes, offset: number): boolean;
     /**

package/dist/lib/range.js

@@ -6,8 +6,13 @@ const constants_1 = require("../util/constants");
  * 计算绝对位置
  * @param referenceNode 容器
  * @param offset 相对位置
+ * @param end 是否是终点
  */
-const getIndex = (referenceNode, offset) => referenceNode.getAbsoluteIndex() + referenceNode.getRelativeIndex(offset);
+const getIndex = (referenceNode, offset, end) => {
+    end &&= referenceNode.type !== 'text';
+    return referenceNode.getAbsoluteIndex() + referenceNode.getRelativeIndex(offset - (end ? 1 : 0))
+        + (end ? referenceNode.childNodes[offset - 1].toString().length : 0);
+};
 /**
  * 获取父节点或抛出错误
  * @param node 参考节点
@@ -66,7 +71,8 @@ class AstRange {
     }
     /** end character index / 终点绝对位置 */
     get endIndex() {
-        return getIndex(this.endContainer, this.endOffset);
+        const { endContainer, endOffset } = this;
+        return getIndex(endContainer, endOffset, this.#startContainer ? !this.collapsed : endOffset > 0);
     }
     /** end position / 终点行列位置 */
     get endPos() {
@@ -277,7 +283,7 @@ class AstRange {
      *
      * 比较端点和Range的位置
      * @param referenceNode node container / 端点容器
-     * @param offset 端点位置
+     * @param offset node offset / 端点位置
      * @throws `RangeError` 不在同一个文档
      */
     comparePoint(referenceNode, offset) {
@@ -297,7 +303,7 @@ class AstRange {
      *
      * 端点是否在Range中
      * @param referenceNode node container / 端点容器
-     * @param offset 端点位置
+     * @param offset node offset / 端点位置
      */
     isPointInRange(referenceNode, offset) {
         return this.comparePoint(referenceNode, offset) === 0;

package/dist/lib/text.js

@@ -63,16 +63,6 @@ const errorSyntaxUrl = new RegExp(source, 'giu'), noLinkTypes = new Set(['attr-v
     '{': /[{}]/u,
     ']': /[[\]](?=[^[\]]*$)/u,
     '}': /[{}](?=[^{}]*$)/u,
-}, ruleMap = {
-    '<': 'tag-like',
-    '[': 'lonely-bracket',
-    '{': 'lonely-bracket',
-    ']': 'lonely-bracket',
-    '}': 'lonely-bracket',
-    h: 'lonely-http',
-    r: 'lonely-http',
-    p: 'lonely-http',
-    i: 'lonely-http',
 }, disallowedTags = new Set([
     'html',
     'base',
@@ -210,13 +200,9 @@ let AstText = (() => {
                 throw new Error('An isolated text node cannot be linted!');
             }
             const { type, name, parentNode: grandparent } = parentNode;
-            let isHtmlAttrVal = false;
             if (type === 'attr-value') {
-                const { type: grandType, name: grandName, tag } = grandparent;
-                if (grandType !== 'ext-attr') {
-                    isHtmlAttrVal = true;
-                }
-                else if (tag === 'ref' && (grandName === 'name' || grandName === 'extends' || grandName === 'follow')
+                const { name: grandName, tag } = grandparent;
+                if (tag === 'ref' && (grandName === 'name' || grandName === 'extends' || grandName === 'follow')
                     || grandName === 'group' && (tag === 'ref' || tag === 'references')
                     || tag === 'choose' && (grandName === 'before' || grandName === 'after')) {
                     return [];
@@ -226,7 +212,7 @@ let AstText = (() => {
                 || type === 'ext-link-url'
                 || type === 'ext-link-text'
                 || type === 'image-parameter' && name === 'link'
-                || isHtmlAttrVal
+                || type === 'attr-value'
                 ? errorSyntaxUrl
                 : errorSyntax;
             if (data.search(errorRegex) === -1) {
@@ -252,72 +238,95 @@ let AstText = (() => {
                     error = error.slice(length);
                 }
                 error = error.toLowerCase();
-                const [char] = error, magicLink = char === 'r' || char === 'p' || char === 'i';
+                const [char] = error, magicLink = char === 'r' || char === 'p' || char === 'i', lbrace = char === '{', rbrace = char === '}', lbrack = char === '[', rbrack = char === ']';
                 let { length } = error;
                 if (char === '<' && !tags.has(tag.toLowerCase())
-                    || char === '[' && type === 'ext-link-text' && (/&(?:rbrack|#93|#x5[Dd];);/u.test(data.slice(index + 1))
+                    || 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))) {
                     continue;
                 }
-                else if (char === ']' && (index || length > 1)) {
+                else if (rbrack && (index || length > 1)) {
                     errorRegex.lastIndex--;
                 }
-                let startIndex = start + index, endIndex = startIndex + length;
-                const nextChar = rootStr[endIndex], previousChar = rootStr[startIndex - 1];
-                let severity = length > 1 && !(char === '<' && (/^<\s/u.test(error) || !/[\s/>]/u.test(nextChar ?? '') || disallowedTags.has(tag))
-                    || isHtmlAttrVal && (char === '[' || char === ']')
-                    || magicLink && type === 'parameter-value'
-                    || /^(?:rfc|pmid|isbn)$/iu.test(error))
-                    || char === '{' && (nextChar === char || previousChar === '-' && variants.length > 0)
-                    || char === '}' && (previousChar === char || nextChar === '-' && variants.length > 0)
-                    || char === '[' && (type === 'ext-link-text' || nextType === 'free-ext-link' && !data.slice(index + 1).trim())
-                    || char === ']' && previousType === 'free-ext-link'
-                        && !data.slice(0, index).includes(']')
-                    ? 'error'
-                    : 'warning';
-                const leftBracket = char === '{' || char === '[', rightBracket = char === ']' || char === '}';
-                if (severity === 'warning' && (leftBracket || rightBracket)) {
-                    const regex = regexes[char], remains = leftBracket ? data.slice(index + 1) : data.slice(0, index);
-                    if (char === '{' && regex.exec(remains)?.[0] === '}'
-                        || char === '}' && regex.exec(remains)?.[0] === '{') {
-                        continue;
-                    }
-                    else if (!remains.includes(char)) {
-                        const sibling = leftBracket ? 'nextSibling' : 'previousSibling';
-                        let cur = this[sibling];
-                        while (cur && (cur.type !== 'text' || !regex.test(cur.data))) {
-                            cur = cur[sibling];
-                        }
-                        if (cur && regex.exec(cur.data)[0] !== char) {
-                            continue;
-                        }
-                    }
-                }
+                // Rule & Severity
+                let startIndex = start + index, endIndex = startIndex + length, rule, severity;
+                const nextChar = rootStr[endIndex], previousChar = rootStr[startIndex - 1], leftBracket = lbrace || lbrack, lConverter = lbrace && previousChar === '-' && variants.length > 0, rConverter = rbrace && nextChar === '-' && variants.length > 0, brokenExtLink = lbrack && nextType === 'free-ext-link' && !data.slice(index + 1).trim()
+                    || rbrack && previousType === 'free-ext-link'
+                        && !data.slice(0, index).includes(']');
                 if (magicLink) {
+                    rule = 'lonely-http';
                     error = error.toUpperCase();
+                    severity = index_1.default.lintConfig.getSeverity(rule, error);
                 }
-                else if (error === '{' && previousChar === '-' && severity === 'error') {
-                    severity = 'warning';
-                    if (index > 0) {
+                else if (char === '<') {
+                    rule = 'tag-like';
+                    let key;
+                    if (/^<\s/u.test(error) || !/[\s/>]/u.test(nextChar ?? '')) {
+                        key = 'invalid';
+                    }
+                    else if (disallowedTags.has(tag)) {
+                        key = 'disallowed';
+                    }
+                    severity = index_1.default.lintConfig.getSeverity(rule, key);
+                }
+                else if (lConverter || rConverter) {
+                    rule = 'lonely-bracket';
+                    severity = index_1.default.lintConfig.getSeverity(rule, 'converter');
+                    if (lConverter && index > 0) {
                         error = '-{';
                         index--;
                         startIndex--;
                         length = 2;
                     }
-                }
-                else if (error === '}' && nextChar === '-' && severity === 'error') {
-                    severity = 'warning';
-                    if (index < data.length - 1) {
+                    else if (rConverter && index < data.length - 1) {
                         error = '}-';
                         endIndex++;
                         length = 2;
                     }
                 }
+                else if (brokenExtLink) {
+                    rule = 'lonely-bracket';
+                    severity = index_1.default.lintConfig.getSeverity(rule, 'extLink');
+                }
+                else if (leftBracket || rbrace || rbrack) {
+                    rule = 'lonely-bracket';
+                    if (length > 1 || lbrace && nextChar === char || rbrace && previousChar === char) {
+                        severity = index_1.default.lintConfig.getSeverity(rule, 'double');
+                    }
+                    else {
+                        if (!lbrack || type !== 'ext-link-text') {
+                            const regex = regexes[char], remains = leftBracket ? data.slice(index + 1) : data.slice(0, index);
+                            if (lbrace && regex.exec(remains)?.[0] === '}'
+                                || rbrace && regex.exec(remains)?.[0] === '{') {
+                                continue;
+                            }
+                            else if (!remains.includes(char)) {
+                                const sibling = leftBracket ? 'nextSibling' : 'previousSibling';
+                                let cur = this[sibling];
+                                while (cur && (cur.type !== 'text' || !regex.test(cur.data))) {
+                                    cur = cur[sibling];
+                                }
+                                if (cur && regex.exec(cur.data)[0] !== char) {
+                                    continue;
+                                }
+                            }
+                        }
+                        severity = index_1.default.lintConfig.getSeverity(rule, 'single');
+                    }
+                }
+                else {
+                    rule = 'lonely-http';
+                    severity = index_1.default.lintConfig.getSeverity(rule);
+                }
+                if (!severity) {
+                    continue;
+                }
+                // LintError
                 const pos = this.posFromIndex(index), { line: startLine, character: startCol } = (0, lint_1.getEndPos)(top, left, pos.top + 1, pos.left), e = {
-                    rule: ruleMap[char],
-                    message: index_1.default.msg('lonely "$1"', magicLink || char === 'h' || error === '-{' || error === '}-' ? error : char),
+                    rule,
+                    message: index_1.default.msg('lonely "$1"', magicLink || char === 'h' || lConverter || rConverter ? error : char),
                     severity,
                     startIndex,
                     endIndex,
@@ -326,17 +335,18 @@ let AstText = (() => {
                     startCol,
                     endCol: startCol + length,
                 };
+                // Suggestions
                 if (char === '<') {
                     e.suggestions = [{ desc: 'escape', range: [startIndex, startIndex + 1], text: '&lt;' }];
                 }
                 else if (char === 'h' && type !== 'link-text' && wordRegex.test(previousChar || '')) {
                     e.suggestions = [{ desc: 'whitespace', range: [startIndex, startIndex], text: ' ' }];
                 }
-                else if (char === '[' && type === 'ext-link-text') {
+                else if (lbrack && type === 'ext-link-text') {
                     const i = parentNode.getAbsoluteIndex() + parentNode.toString().length;
                     e.suggestions = [{ desc: 'escape', range: [i, i + 1], text: '&#93;' }];
                 }
-                else if (char === ']' && previousType === 'free-ext-link' && severity === 'error') {
+                else if (rbrack && brokenExtLink) {
                     const i = start - previousSibling.toString().length;
                     e.suggestions = [{ desc: 'left bracket', range: [i, i], text: '[' }];
                 }

package/dist/lib/title.d.ts

@@ -36,6 +36,13 @@ export declare class Title {
     /** @throws `RangeError` undefined namespace */
     set ns(ns: number);
     set fragment(fragment: string | undefined);
+    /**
+     * display title
+     *
+     * 用于显示的标题
+     * @since v1.22.0
+     */
+    get displayTitle(): string;
     /**
      * @see MediaWikiTitleCodec::splitTitleString
      *
@@ -75,14 +82,14 @@ export declare class Title {
      * 转换为主页面
      * @since v1.1.0
      */
-    toSubjectPage(): void;
+    toSubjectPage(): this;
     /**
      * Get the title of its talk page
      *
      * 转换为讨论页面
      * @since v1.1.0
      */
-    toTalkPage(): void;
+    toTalkPage(): this;
     /**
      * Check if the title is a talk page
      *
@@ -96,12 +103,12 @@ export declare class Title {
      * 转换为上一级页面
      * @since v1.1.0
      */
-    toBasePage(): void;
+    toBasePage(): this;
     /**
      * Get the title of its root page
      *
      * 转换为根页面
      * @since v1.1.0
      */
-    toRootPage(): void;
+    toRootPage(): this;
 }

package/dist/lib/title.js

@@ -94,6 +94,15 @@ class Title {
                 .replaceAll(' ', '_');
         }
     }
+    /**
+     * display title
+     *
+     * 用于显示的标题
+     * @since v1.22.0
+     */
+    get displayTitle() {
+        return this.title.replaceAll('_', ' ');
+    }
     /* NOT FOR BROWSER END */
     /**
      * @see MediaWikiTitleCodec::splitTitleString
@@ -236,12 +245,9 @@ class Title {
     /* NOT FOR BROWSER */
     /** @private */
     toString(display) {
-        return (display ? this.title.replace(/_/gu, ' ') : this.title)
-            + (this.#fragment === undefined
-                && this.#redirectFragment === undefined
-                ? ''
-                : `#${this.#fragment
-                    ?? this.#redirectFragment}`);
+        return (display ? this.displayTitle : this.title) + (this.#fragment === undefined && this.#redirectFragment === undefined
+            ? ''
+            : `#${this.#fragment ?? this.#redirectFragment}`);
     }
     /**
      * 处理重定向
@@ -283,6 +289,7 @@ class Title {
         if (this.isTalkPage()) {
             this.#ns--;
         }
+        return this;
     }
     /**
      * Get the title of its talk page
@@ -294,6 +301,7 @@ class Title {
         if (!this.isTalkPage()) {
             this.#ns++;
         }
+        return this;
     }
     /**
      * Check if the title is a talk page
@@ -312,6 +320,7 @@ class Title {
      */
     toBasePage() {
         this.main = this.main.replace(/\/[^/]*$/u, '');
+        return this;
     }
     /**
      * Get the title of its root page
@@ -321,6 +330,7 @@ class Title {
      */
     toRootPage() {
         this.main = this.main.replace(/\/.*/u, '');
+        return this;
     }
     /** @private */
     getTitleAttr() {

package/dist/mixin/readOnly.js

@@ -19,7 +19,9 @@ const readOnly = (readonly = false) =>
         index_1.default.viewOnly = readonly;
     }
     const result = method.apply(this, args);
-    index_1.default.viewOnly = viewOnly;
+    if (!debug_1.Shadow.running) {
+        index_1.default.viewOnly = viewOnly;
+    }
     return result;
 };
 exports.readOnly = readOnly;

package/dist/parser/commentAndExt.js

@@ -16,7 +16,9 @@ const onlyincludeLeft = '<onlyinclude>', onlyincludeRight = '</onlyinclude>', {
     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;
-    return (0, common_1.getObjRegex)(ext => new RegExp(String.raw `<!--[\s\S]*?(?:-->|$)|<${noincludeRegex}(?:\s[^>]*)?/?>|</${noincludeRegex}\s*>|<(${ext.join('|')})(\s[^>]*?)?(?:/>|>([\s\S]*?)</(\1\s*)>)|<(${includeRegex})(\s[^>]*?)?(?:/>|>([\s\S]*?)(?:</(${includeRegex}\s*)>|$))`, 'giu'));
+    return (0, common_1.getObjRegex)(ext => new RegExp(String.raw `<!--[\s\S]*?(?:-->|$)|<${noincludeRegex}(?:\s[^>]*)?/?>|</${noincludeRegex}\s*>|<(${ext.filter(tag => tag !== 'img').join('|')
+    // eslint-disable-next-line unicorn/prefer-string-raw
+    })(\s[^>]*?)?(?:/>|>([\s\S]*?)</(${'\\1'}\s*)>)|<(${includeRegex})(\s[^>]*?)?(?:/>|>([\s\S]*?)(?:</(${includeRegex}\s*)>|$))${ext.includes('img') ? String.raw `|<img(\s[^>]*?)?(/?)>` : ''}`, 'giu'));
 });
 /**
  * 更新`<onlyinclude>`和`</onlyinclude>`的位置
@@ -77,13 +79,13 @@ const parseCommentAndExt = (wikitext, config, accum, includeOnly) => {
         });
         wikitext = (0, string_1.restore)(wikitext, stack);
     }
-    return wikitext.replace(getRegex[includeOnly ? 1 : 0](newExt), (substr, name, attr, inner, closing, include, includeAttr, includeInner, includeClosing) => {
+    return wikitext.replace(getRegex[includeOnly ? 1 : 0](newExt), (substr, name, attr, inner, closing, include, includeAttr, includeInner, includeClosing, imgAttr, imgClosing) => {
         const l = accum.length;
         let ch = 'n';
-        if (name) {
+        if (name || newExt.includes('img') && imgClosing !== undefined) {
             ch = 'e';
             // @ts-expect-error abstract class
-            new ext_1.ExtToken(name, attr, inner, closing, newConfig, include, accum);
+            new ext_1.ExtToken(name ?? 'img', name ? attr : imgAttr, inner, name ? closing : imgClosing && undefined, newConfig, include, accum);
         }
         else if (substr.startsWith('<!--')) {
             ch = 'c';

package/dist/parser/converter.js

@@ -14,7 +14,7 @@ const constants_1 = require("../util/constants");
 const parseConverter = (text, config, accum) => {
     // eslint-disable-next-line @typescript-eslint/no-unused-expressions
     /;(?=(?:[^;]*?=>)?\s*zh\s*:|(?:\s|\0\d+[cn]\x7F)*$)/u;
-    config.regexConverter ??= new RegExp(String.raw `;(?=(?:[^;]*?=>)?\s*(?:${config.variants.join('|')})\s*:|(?:\s|\0\d+[cn]\x7F)*$)`, 'u');
+    config.regexConverter ??= new RegExp(String.raw `;(?=(?:[^;]*?=>)?\s*(?:${config.variants.join('|')})\s*:|(?:\s|\0\d+[cn]\x7F)*$)`, 'iu');
     const regex1 = /-\{/gu, regex2 = /-\{|\}-/gu, stack = [];
     let regex = regex1, mt = regex.exec(text);
     while (mt) {

package/dist/parser/selector.js

@@ -15,8 +15,8 @@ const attributes_1 = require("../lib/attributes");
  */
 const basic = (selector, type, name) => {
     if (selector.includes('#')) {
-        const [t, ...names] = selector.split('#');
-        return (!t || t === type) && names.every(n => n === name);
+        const i = selector.indexOf('#');
+        return (i === 0 || selector.slice(0, i) === type) && selector.slice(i + 1) === name;
     }
     return !selector || selector === type;
 };
@@ -450,12 +450,14 @@ const checkToken = (selector, scope, has) => (token) => {
  * @param scope 作用对象
  * @param has `:has()`伪选择器
  */
-const getCondition = (selector, scope, has) => (
-/* eslint-disable @stylistic/operator-linebreak */
-/[^a-z\-,#\s]|(?<![\s,])\s+(?![\s,])/u.test(selector.trim()) ?
-    checkToken(selector, scope, has) :
-    ({ type, name }) => selector.split(',').some(str => basic(str.trim(), type, name))
-/* eslint-enable @stylistic/operator-linebreak */
-);
+const getCondition = (selector, scope, has) => {
+    /* NOT FOR BROWSER */
+    if (/[^a-z\-,#\s]|(?<![\s,])\s+(?![\s,])/u.test(selector.trim())) {
+        return checkToken(selector, scope, has);
+    }
+    /* NOT FOR BROWSER END */
+    const parts = selector.split(',');
+    return (({ type, name }) => parts.some(str => basic(str.trim(), type, name)));
+};
 exports.getCondition = getCondition;
 constants_1.parsers['parseSelector'] = __filename;