wikiparser-node 1.21.2 → 1.22.0

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

@@ -277,7 +277,7 @@ class AstRange {
      *
      * 比较端点和Range的位置
      * @param referenceNode node container / 端点容器
-     * @param offset 端点位置
+     * @param offset node offset / 端点位置
      * @throws `RangeError` 不在同一个文档
      */
     comparePoint(referenceNode, offset) {
@@ -297,7 +297,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

@@ -50,6 +50,7 @@ const node_1 = require("./node");
 const constants_1 = require("../util/constants");
 const debug_1 = require("../util/debug");
 const readOnly_1 = require("../mixin/readOnly");
+const cached_1 = require("../mixin/cached");
 /* NOT FOR BROWSER END */
 const sp = String.raw `[${string_1.zs}\t]*`, source = String.raw `<\s*(?:/\s*)?([a-z]\w*)|\{+|\}+|\[{2,}|\[(?![^[]*?\])|((?:^|\])[^[]*?)\]+|(?:rfc|pmid)(?=[-:：]?${sp}\d)|isbn(?=[-:：]?${sp}(?:\d(?:${sp}|-)){6})`;
 // eslint-disable-next-line @typescript-eslint/no-unused-expressions
@@ -62,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',
@@ -142,10 +133,12 @@ let AstText = (() => {
     let _instanceExtraInitializers = [];
     let _private_setData_decorators;
     let _private_setData_descriptor;
+    let _toHtmlInternal_decorators;
     return class AstText extends _classSuper {
         static {
             const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
             _private_setData_decorators = [(0, readOnly_1.readOnly)()];
+            _toHtmlInternal_decorators = [(0, cached_1.cached)()];
             __esDecorate(this, _private_setData_descriptor = { value: __setFunctionName(function (text) {
                     /* NOT FOR BROWSER */
                     const { data } = this, e = new Event('text', { bubbles: true });
@@ -156,6 +149,7 @@ let AstText = (() => {
                         this.dispatchEvent(e, { type: 'text', oldText: data });
                     }
                 }, "#setData") }, _private_setData_decorators, { kind: "method", name: "#setData", static: false, private: true, access: { has: obj => #setData in obj, get: obj => obj.#setData }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(this, null, _toHtmlInternal_decorators, { kind: "method", name: "toHtmlInternal", static: false, private: false, access: { has: obj => "toHtmlInternal" in obj, get: obj => obj.toHtmlInternal }, metadata: _metadata }, null, _instanceExtraInitializers);
             if (_metadata) Object.defineProperty(this, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
         }
         data = (__runInitializers(this, _instanceExtraInitializers), '');
@@ -206,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 [];
@@ -222,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) {
@@ -248,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,
@@ -322,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/attributesParent.d.ts

@@ -8,19 +8,19 @@ export interface AttributesParentBase {
     /** id attribute / id属性 */
     id: string;
     /**
-     * Get the attribute
+     * Check if the token has a certain attribute
      *
-     * 获取指定属性
+     * 是否具有某属性
      * @param key attribute name / 属性键
      */
-    getAttr(key: string): string | true | undefined;
+    hasAttr(key: string): boolean;
     /**
-     * Check if the token has a certain attribute
+     * Get the attribute
      *
-     * 是否具有某属性
+     * 获取指定属性
      * @param key attribute name / 属性键
      */
-    hasAttr(key: string): boolean;
+    getAttr(key: string): string | true | undefined;
     /**
      * Get all attribute names
      *

package/dist/mixin/attributesParent.js

@@ -43,15 +43,15 @@ const attributesParent = (i = 0) => (constructor) => {
             return this.childNodes[i];
         }
         /** @implements */
+        hasAttr(key) {
+            return this.#getAttributesChild().hasAttr(key);
+        }
+        /** @implements */
         getAttr(key) {
             return this.#getAttributesChild().getAttr(key);
         }
         /* NOT FOR BROWSER */
         /** @implements */
-        hasAttr(key) {
-            return this.#getAttributesChild().hasAttr(key);
-        }
-        /** @implements */
         getAttrNames() {
             return this.#getAttributesChild().getAttrNames();
         }

package/dist/mixin/cached.d.ts

@@ -0,0 +1,5 @@
+import type { Token } from '../internal';
+/**
+ * 缓存计算结果
+ * @param force 是否强制缓存
+ */

package/dist/mixin/cached.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.cached = void 0;
+const lint_1 = require("../util/lint");
+/* NOT FOR BROWSER */
+const constants_1 = require("../util/constants");
+/* NOT FOR BROWSER END */
+/**
+ * 缓存计算结果
+ * @param force 是否强制缓存
+ */
+const cached = (force = true) => (method) => {
+    const stores = new WeakMap();
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    return function (...args) {
+        return (0, lint_1.cache)(stores.get(this), () => method.apply(this, args), value => {
+            stores.set(this, value);
+        }, force);
+    };
+};
+exports.cached = cached;
+constants_1.mixins['cached'] = __filename;

package/dist/mixin/clone.d.ts

@@ -0,0 +1,5 @@
+import type { Token } from '../internal';
+/**
+ * 深拷贝节点
+ * @param method 方法
+ */

package/dist/mixin/clone.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.clone = void 0;
+const debug_1 = require("../util/debug");
+const constants_1 = require("../util/constants");
+/**
+ * 深拷贝节点
+ * @param method 方法
+ */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const clone = (method) => function () {
+    const cloned = this.cloneChildNodes(), { type, name } = this;
+    return debug_1.Shadow.run(() => {
+        const newToken = method.call(this);
+        newToken.safeAppend(cloned);
+        if (type === 'ext-inner' && name) {
+            newToken.setAttribute('name', name);
+        }
+        return newToken;
+    });
+};
+exports.clone = clone;
+constants_1.mixins['clone'] = __filename;

package/dist/mixin/hidden.js

@@ -1,9 +1,44 @@
 "use strict";
+var __runInitializers = (this && this.__runInitializers) || function (thisArg, initializers, value) {
+    var useValue = arguments.length > 2;
+    for (var i = 0; i < initializers.length; i++) {
+        value = useValue ? initializers[i].call(thisArg, value) : initializers[i].call(thisArg);
+    }
+    return useValue ? value : void 0;
+};
+var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
+    function accept(f) { if (f !== void 0 && typeof f !== "function") throw new TypeError("Function expected"); return f; }
+    var kind = contextIn.kind, key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
+    var target = !descriptorIn && ctor ? contextIn["static"] ? ctor : ctor.prototype : null;
+    var descriptor = descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
+    var _, done = false;
+    for (var i = decorators.length - 1; i >= 0; i--) {
+        var context = {};
+        for (var p in contextIn) context[p] = p === "access" ? {} : contextIn[p];
+        for (var p in contextIn.access) context.access[p] = contextIn.access[p];
+        context.addInitializer = function (f) { if (done) throw new TypeError("Cannot add initializers after decoration has completed"); extraInitializers.push(accept(f || null)); };
+        var result = (0, decorators[i])(kind === "accessor" ? { get: descriptor.get, set: descriptor.set } : descriptor[key], context);
+        if (kind === "accessor") {
+            if (result === void 0) continue;
+            if (result === null || typeof result !== "object") throw new TypeError("Object expected");
+            if (_ = accept(result.get)) descriptor.get = _;
+            if (_ = accept(result.set)) descriptor.set = _;
+            if (_ = accept(result.init)) initializers.unshift(_);
+        }
+        else if (_ = accept(result)) {
+            if (kind === "field") initializers.unshift(_);
+            else descriptor[key] = _;
+        }
+    }
+    if (target) Object.defineProperty(target, contextIn.name, descriptor);
+    done = true;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.hiddenToken = void 0;
 const debug_1 = require("../util/debug");
 /* NOT FOR BROWSER */
 const constants_1 = require("../util/constants");
+const cached_1 = require("./cached");
 /* NOT FOR BROWSER END */
 /**
  * 解析后不可见的类
@@ -12,24 +47,39 @@ const constants_1 = require("../util/constants");
  */
 const hiddenToken = (linter = true, html = true) => (constructor) => {
     /** 解析后不可见的类 */
-    class AnyHiddenToken extends constructor {
-        /** 没有可见部分 */
-        text() {
-            return '';
-        }
-        lint(start) {
-            // @ts-expect-error private argument
-            return linter ? [] : super.lint(start);
-        }
-        /* NOT FOR BROWSER */
-        /** @private */
-        dispatchEvent() {
-            //
-        }
-        toHtmlInternal(opt) {
-            return html ? '' : super.toHtmlInternal(opt);
-        }
-    }
+    let AnyHiddenToken = (() => {
+        let _classSuper = constructor;
+        let _instanceExtraInitializers = [];
+        let _toHtmlInternal_decorators;
+        return class AnyHiddenToken extends _classSuper {
+            static {
+                const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
+                _toHtmlInternal_decorators = [(0, cached_1.cached)()];
+                __esDecorate(this, null, _toHtmlInternal_decorators, { kind: "method", name: "toHtmlInternal", static: false, private: false, access: { has: obj => "toHtmlInternal" in obj, get: obj => obj.toHtmlInternal }, metadata: _metadata }, null, _instanceExtraInitializers);
+                if (_metadata) Object.defineProperty(this, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+            }
+            /** 没有可见部分 */
+            text() {
+                return '';
+            }
+            lint(start) {
+                // @ts-expect-error private argument
+                return linter ? [] : super.lint(start);
+            }
+            /* NOT FOR BROWSER */
+            /** @private */
+            dispatchEvent() {
+                //
+            }
+            toHtmlInternal(opt) {
+                return html ? '' : super.toHtmlInternal(opt);
+            }
+            constructor() {
+                super(...arguments);
+                __runInitializers(this, _instanceExtraInitializers);
+            }
+        };
+    })();
     (0, debug_1.mixin)(AnyHiddenToken, constructor);
     return AnyHiddenToken;
 };

package/dist/mixin/sol.js

@@ -21,7 +21,7 @@ const sol = (self) => (constructor) => {
             }
             return parentNode?.type === 'root'
                 || type === 'list' && parentNode?.is('list-range')
-                || type !== 'heading' && parentNode?.type === 'ext-inner' && parentNode.name === 'poem'
+                || parentNode?.type === 'ext-inner' && parentNode.name === 'poem'
                 ? ''
                 : '\n';
         }

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.getRegex)(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) {