wikilint 2.6.1 → 2.7.0

package/config/.schema.json

@@ -121,6 +121,14 @@
 				"pattern": "^[-a-z]+$"
 			}
 		},
+		"redirection": {
+			"description": "magic words for redirection",
+			"type": "array",
+			"items": {
+				"type": "string",
+				"pattern": "^#.+$"
+			}
+		},
 		"variants": {
 			"description": "variants for language conversion",
 			"type": "array",
@@ -166,6 +174,7 @@
 		"protocol",
 		"interwiki",
 		"img",
+		"redirection",
 		"variants"
 	],
 	"additionalProperties": false

package/config/default.json

@@ -832,6 +832,11 @@
 		"页数=$1": "page",
 		"$1页": "page"
 	},
+	"redirection": [
+		"#redirect",
+		"#重定向",
+		"#重新導向"
+	],
 	"variants": [
 		"zh",
 		"zh-hans",

package/config/enwiki.json

@@ -406,5 +406,8 @@
 		"page=$1": "page",
 		"page $1": "page"
 	},
+	"redirection": [
+		"#redirect"
+	],
 	"variants": []
 }

package/config/llwiki.json

@@ -583,6 +583,10 @@
 		"页数=$1": "page",
 		"$1页": "page"
 	},
+	"redirection": [
+		"#redirect",
+		"#重定向"
+	],
 	"variants": [
 		"zh",
 		"zh-hans",

package/config/minimum.json

@@ -132,5 +132,8 @@
 	"protocol": "bitcoin:|ftp://|ftps://|geo:|git://|gopher://|http://|https://|irc://|ircs://|magnet:|mailto:|matrix:|mms://|news:|nntp://|redis://|sftp://|sip:|sips:|sms:|ssh://|svn://|tel:|telnet://|urn:|worldwind://|xmpp:",
 	"interwiki": [],
 	"img": {},
+	"redirection": [
+		"#redirect"
+	],
 	"variants": []
 }

package/config/moegirl.json

@@ -676,6 +676,10 @@
 		"页数=$1": "page",
 		"$1页": "page"
 	},
+	"redirection": [
+		"#redirect",
+		"#重定向"
+	],
 	"variants": [
 		"zh",
 		"zh-hans",

package/config/zhwiki.json

@@ -790,6 +790,11 @@
 		"頁=$1": "page",
 		"$1頁": "page"
 	},
+	"redirection": [
+		"#redirect",
+		"#重定向",
+		"#重新導向"
+	],
 	"variants": [
 		"zh",
 		"zh-hans",

package/dist/base.d.ts

@@ -7,9 +7,11 @@ export interface Config {
     readonly doubleUnderscore: [string[], string[]];
     readonly protocol: string;
     readonly img: Record<string, string>;
+    readonly redirection: string[];
     readonly variants: string[];
     readonly excludes?: string[];
 }
+export type TokenTypes = 'root' | 'plain' | 'redirect' | 'redirect-syntax' | 'redirect-target' | 'onlyinclude' | 'noinclude' | 'include' | 'comment' | 'ext' | 'ext-attrs' | 'ext-attr-dirty' | 'ext-attr' | 'attr-key' | 'attr-value' | 'ext-inner' | 'arg' | 'arg-name' | 'arg-default' | 'hidden' | 'magic-word' | 'magic-word-name' | 'invoke-function' | 'invoke-module' | 'template' | 'template-name' | 'parameter' | 'parameter-key' | 'parameter-value' | 'heading' | 'heading-title' | 'heading-trail' | 'html' | 'html-attrs' | 'html-attr-dirty' | 'html-attr' | 'table' | 'tr' | 'td' | 'table-syntax' | 'table-attrs' | 'table-attr-dirty' | 'table-attr' | 'table-inter' | 'td-inner' | 'hr' | 'double-underscore' | 'link' | 'link-target' | 'link-text' | 'category' | 'file' | 'gallery-image' | 'imagemap-image' | 'image-parameter' | 'quote' | 'ext-link' | 'ext-link-text' | 'ext-link-url' | 'free-ext-link' | 'list' | 'dd' | 'converter' | 'converter-flags' | 'converter-flag' | 'converter-rule' | 'converter-rule-variant' | 'converter-rule-to' | 'converter-rule-from' | 'param-line' | 'imagemap-link';
 export declare const rules: readonly ["bold-header", "format-leakage", "fostered-content", "h1", "illegal-attr", "insecure-style", "invalid-gallery", "invalid-imagemap", "invalid-invoke", "lonely-apos", "lonely-bracket", "lonely-http", "nested-link", "no-arg", "no-duplicate", "no-ignored", "obsolete-attr", "obsolete-tag", "parsing-order", "pipe-like", "table-layout", "tag-like", "unbalanced-header", "unclosed-comment", "unclosed-quote", "unclosed-table", "unescaped", "unknown-page", "unmatched-tag", "unterminated-url", "url-encoding", "var-anchor", "void-ext"];
 export declare namespace LintError {
     type Severity = 'error' | 'warning';
@@ -45,11 +47,8 @@ export interface AstNode {
 interface AstElement extends AstNode {
 }
 export interface Parser {
-    config: string | Config;
-    i18n: string | Record<string, string> | undefined;
-    rules: readonly LintError.Rule[];
-    /** 获取解析设置 */
-    getConfig(): Config;
+    config: Config | string;
+    i18n: Record<string, string> | string | undefined;
     /**
      * 解析wikitext
      * @param include 是否嵌入

package/dist/bin/cli.js

@@ -118,7 +118,7 @@ for (const file of files) {
         let start = Infinity;
         for (const { range: [from, to], text } of fixable) {
             if (to <= start) {
-                wikitext = `${wikitext.slice(0, from)}${text}${wikitext.slice(to)}`;
+                wikitext = wikitext.slice(0, from) + text + wikitext.slice(to);
                 start = from;
             }
         }

package/dist/index.d.ts

@@ -2,6 +2,7 @@ import type { Config, LintError, Parser as ParserBase } from './base';
 import type { Title } from './lib/title';
 import type { Token } from './internal';
 declare interface Parser extends ParserBase {
+    rules: readonly LintError.Rule[];
     /**
      * 规范化页面标题
      * @param title 标题（含或不含命名空间前缀）
@@ -18,3 +19,6 @@ declare const Parser: Parser;
 export = Parser;
 export type { Config, LintError };
 export type * from './internal';
+declare global {
+	type Acceptable = unknown;
+}

package/dist/index.js

@@ -37,13 +37,21 @@ const Parser = {
         return msg && (this.i18n?.[msg] ?? msg).replace('$1', this.msg(arg));
     },
     /** @implements */
-    normalizeTitle(title, defaultNs = 0, include = false, config = Parser.getConfig(), halfParsed = false, decode = false, selfLink = false) {
+    normalizeTitle(title, defaultNs = 0, include, config = Parser.getConfig(), halfParsed, decode = false, selfLink = false) {
         const { Title } = require('./lib/title');
         if (halfParsed) {
             return new Title(title, defaultNs, config, decode, selfLink);
         }
         const { Token } = require('./src/index');
         const token = debug_1.Shadow.run(() => new Token(title, config).parseOnce(0, include).parseOnce()), titleObj = new Title(String(token), defaultNs, config, decode, selfLink);
+        debug_1.Shadow.run(() => {
+            for (const key of ['main', 'fragment']) {
+                const str = titleObj[key];
+                if (str?.includes('\0')) {
+                    titleObj[key] = token.buildFromStr(str, constants_1.BuildMethod.Text);
+                }
+            }
+        });
         return titleObj;
     },
     /** @implements */
@@ -60,9 +68,7 @@ const Parser = {
                     const file = path.join(__dirname, '..', 'errors', new Date().toISOString()), stage = token.getAttribute('stage');
                     fs.writeFileSync(file, stage === constants_1.MAX_STAGE ? wikitext : String(token));
                     fs.writeFileSync(`${file}.err`, e.stack);
-                    fs.writeFileSync(`${file}.json`, JSON.stringify({
-                        stage, include: token.getAttribute('include'), config: this.config,
-                    }, null, '\t'));
+                    fs.writeFileSync(`${file}.json`, JSON.stringify({ stage, include, config }, null, '\t'));
                 }
                 throw e;
             }

package/dist/internal.d.ts

@@ -1,6 +1,8 @@
 export type { AstNodes, } from './lib/node';
 export type * from './lib/text';
-export type * from './src/index';
+export type { Token } from './src/index';
+export type * from './src/redirect';
+export type * from './src/link/redirectTarget';
 export type * from './src/onlyinclude';
 export type * from './src/nowiki/noinclude';
 export type * from './src/tagPair/include';

package/dist/lib/element.d.ts

@@ -31,6 +31,16 @@ export declare abstract class AstElement extends AstNode {
      * @param selector 选择器
      */
     closest<T = Token>(selector: string): T | undefined;
+    /**
+     * 符合选择器的第一个后代节点
+     * @param selector 选择器
+     */
+    querySelector<T = Token>(selector: string): T | undefined;
+    /**
+     * 符合选择器的所有后代节点
+     * @param selector 选择器
+     */
+    querySelectorAll<T = Token>(selector: string): T[];
     /**
      * 在末尾批量插入子节点
      * @param elements 插入节点

package/dist/lib/element.js

@@ -20,13 +20,20 @@ class AstElement extends node_1.AstNode {
     /** 合并相邻的文本子节点 */
     normalize() {
         const childNodes = [...this.childNodes];
+        /**
+         * 移除子节点
+         * @param i 移除位置
+         */
+        const remove = (i) => {
+            childNodes.splice(i, 1);
+        };
         for (let i = childNodes.length - 1; i >= 0; i--) {
             const { type, data } = childNodes[i];
             if (type !== 'text' || this.getGaps(i - 1)) {
                 //
             }
             else if (data === '') {
-                childNodes.splice(i, 1);
+                remove(i);
             }
         }
         this.setAttribute('childNodes', childNodes);
@@ -70,6 +77,58 @@ class AstElement extends node_1.AstNode {
         }
         return undefined;
     }
+    /**
+     * 符合条件的第一个后代节点
+     * @param condition 条件
+     */
+    #getElementBy(condition) {
+        for (const child of this.childNodes) {
+            if (child.type === 'text') {
+                continue;
+            }
+            else if (condition(child)) {
+                return child;
+            }
+            const descendant = child.#getElementBy(condition);
+            if (descendant) {
+                return descendant;
+            }
+        }
+        return undefined;
+    }
+    /**
+     * 符合选择器的第一个后代节点
+     * @param selector 选择器
+     */
+    querySelector(selector) {
+        const condition = this.#getCondition(selector);
+        return this.#getElementBy(condition);
+    }
+    /**
+     * 符合条件的所有后代节点
+     * @param condition 条件
+     */
+    #getElementsBy(condition) {
+        const descendants = [];
+        for (const child of this.childNodes) {
+            if (child.type === 'text') {
+                continue;
+            }
+            else if (condition(child)) {
+                descendants.push(child);
+            }
+            descendants.push(...child.#getElementsBy(condition));
+        }
+        return descendants;
+    }
+    /**
+     * 符合选择器的所有后代节点
+     * @param selector 选择器
+     */
+    querySelectorAll(selector) {
+        const condition = this.#getCondition(selector);
+        return this.#getElementsBy(condition);
+    }
     /**
      * 在末尾批量插入子节点
      * @param elements 插入节点

package/dist/lib/node.d.ts

@@ -1,6 +1,5 @@
-import type { LintError, AstNode as AstNodeBase } from '../base';
+import type { LintError, AstNode as AstNodeBase, TokenTypes } from '../base';
 import type { AstText, Token } from '../internal';
-import type { TokenTypes } from '../util/constants';
 export type AstNodes = AstText | Token;
 export interface Dimension {
     readonly height: number;

package/dist/lib/node.js

@@ -1,6 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AstNode = void 0;
+/**
+ * 计算字符串的行列数
+ * @param str 字符串
+ */
+const getDimension = (str) => {
+    const lines = str.split('\n'), height = lines.length;
+    return { height, width: lines[height - 1].length };
+};
+/**
+ * 获取子节点相对于父节点的字符位置
+ * @param j 子节点序号
+ * @param parent 父节点
+ */
+const getIndex = (j, parent) => parent.childNodes.slice(0, j).reduce((acc, cur, i) => acc + String(cur).length + parent.getGaps(i), 0)
+    + parent.getAttribute('padding');
 /** 类似Node */
 class AstNode {
     childNodes = [];
@@ -66,15 +81,14 @@ class AstNode {
     posFromIndex(index) {
         const str = String(this);
         if (index >= -str.length && index <= str.length) {
-            const lines = str.slice(0, index).split('\n'), top = lines.length - 1;
-            return { top, left: lines[top].length };
+            const { height, width } = getDimension(str.slice(0, index));
+            return { top: height - 1, left: width };
         }
         return undefined;
     }
     /** 获取行数和最后一行的列数 */
     #getDimension() {
-        const lines = String(this).split('\n'), height = lines.length;
-        return { height, width: lines[height - 1].length };
+        return getDimension(String(this));
     }
     /** @private */
     getGaps(i) {
@@ -85,23 +99,10 @@ class AstNode {
      * @param j 子节点序号
      */
     getRelativeIndex(j) {
-        let childNodes;
-        /**
-         * 获取子节点相对于父节点的字符位置，使用前需要先给`childNodes`赋值
-         * @param end 子节点序号
-         * @param parent 父节点
-         */
-        const getIndex = (end, parent) => childNodes.slice(0, end).reduce((acc, cur, i) => acc + String(cur).length + parent.getGaps(i), 0)
-            + parent.getAttribute('padding');
         if (j === undefined) {
             const { parentNode } = this;
-            if (parentNode) {
-                ({ childNodes } = parentNode);
-                return getIndex(childNodes.indexOf(this), parentNode);
-            }
-            return 0;
+            return parentNode ? getIndex(parentNode.childNodes.indexOf(this), parentNode) : 0;
         }
-        ({ childNodes } = this);
         return getIndex(j, this);
     }
     /** 获取当前节点的绝对位置 */

package/dist/lib/text.d.ts

@@ -13,6 +13,7 @@ export declare class AstText extends AstNode {
     /**
      * @override
      * @param start
+     * @throws `Error` 孤立文本节点
      */
     lint(start?: number, errorRegex?: RegExp): LintError[];
     /**

package/dist/lib/text.js

@@ -1,10 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AstText = void 0;
+const string_1 = require("../util/string");
 const index_1 = require("../index");
 const node_1 = require("./node");
-// eslint-disable-next-line @typescript-eslint/no-unused-expressions
-/<\s*(?:\/\s*)?([a-z]\w*)|\{+|\}+|\[{2,}|\[(?![^[]*?\])|((?:^|\])[^[]*?)\]+|https?[:/]\/+/giu;
 const source = '<\\s*(?:\\/\\s*)?([a-z]\\w*)' // 疑似标签
     + '|'
     + '\\{+|\\}+' // `{`、`}`
@@ -12,7 +11,7 @@ const source = '<\\s*(?:\\/\\s*)?([a-z]\\w*)' // 疑似标签
     + '\\[{2,}|\\[(?![^[]*?\\])' // `[`
     + '|'
     + '((?:^|\\])[^[]*?)\\]+', // `]`
-errorSyntax = new RegExp(`${source}|https?[:/]\\/+`, 'giu'), errorSyntaxUrl = new RegExp(source, 'giu'), regexes = {
+errorSyntax = new RegExp(`${source}|https?[:/]\\/+`, 'giu'), errorSyntaxUrl = new RegExp(source, 'giu'), extImage = new RegExp(`^https?:\\/\\/${string_1.extUrlCharFirst}${string_1.extUrlChar}\\.(?:gif|png|jpg|jpeg)$`, 'iu'), regexes = {
     '[': /[[\]]/u,
     '{': /[{}]/u,
     ']': /[[\]](?=[^[\]]*$)/u,
@@ -77,11 +76,12 @@ class AstText extends node_1.AstNode {
     /**
      * @override
      * @param start
+     * @throws `Error` 孤立文本节点
      */
     lint(start = this.getAbsoluteIndex(), errorRegex) {
         const { data, parentNode, nextSibling, previousSibling } = this;
         if (!parentNode) {
-            return [];
+            throw new Error('无法对孤立文本节点进行语法分析！');
         }
         const { type, name, parentNode: grandparent } = parentNode;
         let isHtmlAttrVal = false;
@@ -126,6 +126,9 @@ class AstText extends node_1.AstNode {
             else if (char === ']' && (index || length > 1)) {
                 errorRegex.lastIndex--;
             }
+            else if (char === 'h' && index === 0 && type === 'ext-link-text' && extImage.test(data)) {
+                continue;
+            }
             const startIndex = start + index, endIndex = startIndex + length, rootStr = String(root), nextChar = rootStr[endIndex], previousChar = rootStr[startIndex - 1], severity = length > 1 && !(char === '<' && !/[\s/>]/u.test(nextChar ?? '')
                 || isHtmlAttrVal && (char === '[' || char === ']'))
                 || char === '{' && (nextChar === char || previousChar === '-')

package/dist/lib/title.d.ts

@@ -1,20 +1,27 @@
-import Parser from '../index';
+import type { Config } from '../base';
 /** MediaWiki页面标题对象 */
 export declare class Title {
     #private;
-    readonly valid: boolean;
     ns: number;
     fragment: string | undefined;
+    interwiki: string;
+    readonly valid: boolean;
     /** 不含命名空间的标题主体部分 */
     get main(): string;
     set main(title: string);
+    /** 命名空间前缀 */
+    get prefix(): string;
+    /** 完整标题 */
+    get title(): string;
     /** 扩展名 */
     get extension(): string | undefined;
     /**
+     * @see MediaWikiTitleCodec::splitTitleString
+     *
      * @param title 标题（含或不含命名空间前缀）
      * @param defaultNs 命名空间
      * @param decode 是否需要解码
      * @param selfLink 是否允许selfLink
      */
-    constructor(title: string, defaultNs?: number, config?: Parser.Config, decode?: boolean, selfLink?: boolean);
+    constructor(title: string, defaultNs: number, config: Config, decode: boolean, selfLink: boolean);
 }

package/dist/lib/title.js

@@ -2,22 +2,40 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Title = void 0;
 const string_1 = require("../util/string");
-const index_1 = require("../index");
+/**
+ * PHP的`rawurldecode`函数的JavaScript实现
+ * @param str 要解码的字符串
+ */
+const rawurldecode = (str) => decodeURIComponent(str.replace(/%(?![\da-f]{2})/giu, '%25'));
 /** MediaWiki页面标题对象 */
 class Title {
-    valid;
+    #main;
+    #namespaces;
     ns;
     fragment;
+    interwiki = '';
+    valid;
     /** @private */
     encoded = false;
-    #main;
     /** 不含命名空间的标题主体部分 */
     get main() {
         return this.#main;
     }
     set main(title) {
         title = title.replace(/_/gu, ' ').trim();
-        this.#main = title && `${title[0].toUpperCase()}${title.slice(1)}`;
+        this.#main = title && title[0].toUpperCase() + title.slice(1);
+    }
+    /** 命名空间前缀 */
+    get prefix() {
+        const namespace = this.#namespaces[this.ns];
+        return namespace + (namespace && ':');
+    }
+    /** 完整标题 */
+    get title() {
+        const prefix = this.interwiki + (this.interwiki && ':') + this.prefix;
+        // eslint-disable-next-line prefer-const
+        let title = (prefix + this.main).replace(/ /gu, '_');
+        return title;
     }
     /** 扩展名 */
     get extension() {
@@ -25,51 +43,69 @@ class Title {
         return i === -1 ? undefined : main.slice(i + 1).toLowerCase();
     }
     /**
+     * @see MediaWikiTitleCodec::splitTitleString
+     *
      * @param title 标题（含或不含命名空间前缀）
      * @param defaultNs 命名空间
      * @param decode 是否需要解码
      * @param selfLink 是否允许selfLink
      */
-    constructor(title, defaultNs = 0, config = index_1.default.getConfig(), decode = false, selfLink = false) {
+    constructor(title, defaultNs, config, decode, selfLink) {
+        const subpage = title.trim().startsWith('../');
         title = (0, string_1.decodeHtml)(title);
         if (decode && title.includes('%')) {
             try {
                 const encoded = /%(?!21|3[ce]|5[bd]|7[b-d])[\da-f]{2}/iu.test(title);
-                title = decodeURIComponent(title);
+                title = rawurldecode(title);
                 this.encoded = encoded;
             }
             catch { }
         }
         title = title.replace(/_/gu, ' ').trim();
-        let ns = defaultNs;
-        if (title.startsWith(':')) {
-            ns = 0;
-            title = title.slice(1).trim();
+        if (subpage) {
+            this.ns = 0;
         }
-        const m = title.split(':');
-        if (m.length > 1) {
-            const id = config.nsid[m[0].trim().toLowerCase()];
-            if (id) {
-                ns = id;
-                title = m.slice(1).join(':').trim();
+        else {
+            let ns = defaultNs;
+            if (title.startsWith(':')) {
+                ns = 0;
+                title = title.slice(1).trim();
+            }
+            const m = title.split(':');
+            if (m.length > 1) {
+                const id = config.nsid[m[0].trim().toLowerCase()];
+                if (id) {
+                    ns = id;
+                    title = m.slice(1).join(':').trim();
+                }
             }
+            this.ns = ns;
         }
-        this.ns = ns;
         const i = title.indexOf('#');
         if (i !== -1) {
             let fragment = title.slice(i + 1).trimEnd();
             if (fragment.includes('%')) {
                 try {
-                    fragment = decodeURIComponent(fragment);
+                    fragment = rawurldecode(fragment);
                 }
                 catch { }
             }
             this.fragment = fragment;
             title = title.slice(0, i).trim();
         }
-        this.valid = Boolean(title || this.interwiki || selfLink && this.fragment !== undefined)
-            && !/^:|\0\d+[eh!+-]\x7F|[<>[\]{}|]|%[\da-f]{2}/iu.test(title);
+        this.valid = Boolean(title || this.interwiki || selfLink && this.ns === 0 && this.fragment !== undefined)
+            && !/^:|\0\d+[eh!+-]\x7F|[<>[\]{}|\n]|%[\da-f]{2}|(?:^|\/)\.{1,2}(?:$|\/)/iu.test(subpage ? /^(?:\.\.\/)+(.*)/u.exec(title)[1] : title);
         this.main = title;
+        Object.defineProperties(this, {
+            encoded: { enumerable: false, writable: false },
+        });
+        this.#namespaces = config.namespaces;
+    }
+    /** @private */
+    toString() {
+        return `${this.title}${this.fragment === undefined
+            ? ''
+            : `#${this.fragment}`}`;
     }
 }
 exports.Title = Title;

package/dist/mixin/attributesParent.d.ts

@@ -11,4 +11,3 @@ export interface AttributesParentBase {
  * @param constructor 基类
  * @param _ context
  */
-export declare const attributesParent: (i?: number) => <T extends AstConstructor>(constructor: T, _?: unknown) => T;

package/dist/mixin/hidden.d.ts

@@ -2,4 +2,3 @@
  * 解析后不可见的类
  * @param constructor 基类
  */
-export declare const hiddenToken: <T extends AstConstructor>(constructor: T) => T;

package/dist/parser/braces.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseBraces = void 0;
 const string_1 = require("../util/string");
-const index_1 = require("../index");
 const heading_1 = require("../src/heading");
 const transclude_1 = require("../src/transclude");
 const arg_1 = require("../src/arg");
@@ -13,7 +12,7 @@ const arg_1 = require("../src/arg");
  * @param accum
  * @throws TranscludeToken.constructor()
  */
-const parseBraces = (wikitext, config = index_1.default.getConfig(), accum = []) => {
+const parseBraces = (wikitext, config, accum) => {
     const source = `${config.excludes?.includes('heading') ? '' : '^(\0\\d+c\x7F)*={1,6}|'}\\[\\[|\\{{2,}|-\\{(?!\\{)`, { parserFunction: [, , , subst] } = config, stack = [], closes = { '=': '\n', '{': '\\}{2,}|\\|', '-': '\\}-', '[': '\\]\\]' }, marks = new Map([['!', '!'], ['!!', '+'], ['(!', '{'], ['!)', '}'], ['!-', '-'], ['=', '~']]);
     let regex = new RegExp(source, 'gmu'), mt = regex.exec(wikitext), moreBraces = wikitext.includes('}}'), lastIndex;
     while (mt

package/dist/parser/commentAndExt.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseCommentAndExt = void 0;
-const index_1 = require("../index");
 const onlyinclude_1 = require("../src/onlyinclude");
 const noinclude_1 = require("../src/nowiki/noinclude");
 const include_1 = require("../src/tagPair/include");
@@ -14,7 +13,7 @@ const comment_1 = require("../src/nowiki/comment");
  * @param accum
  * @param includeOnly 是否嵌入
  */
-const parseCommentAndExt = (wikitext, config = index_1.default.getConfig(), accum = [], includeOnly = false) => {
+const parseCommentAndExt = (wikitext, config, accum, includeOnly) => {
     const onlyincludeLeft = '<onlyinclude>', onlyincludeRight = '</onlyinclude>', { length } = onlyincludeLeft;
     /** 更新`<onlyinclude>`和`</onlyinclude>`的位置 */
     const update = () => {
@@ -50,14 +49,9 @@ const parseCommentAndExt = (wikitext, config = index_1.default.getConfig(), accu
             return str;
         }
     }
-    /* eslint-disable @typescript-eslint/no-unused-expressions */
-    /<foo(?:\s[^>]*)?>|<\/foo\s*>/giu;
-    /<(bar)(\s[^>]*?)?(?:\/>|>(.*?)<\/(\1\s*)>)/gisu;
-    /<(baz)(\s[^>]*?)?(?:\/>|>(.*?)(?:<\/(baz\s*)>|$))/gisu;
-    /* eslint-enable @typescript-eslint/no-unused-expressions */
     const ext = config.ext.join('|'), noincludeRegex = includeOnly ? 'includeonly' : '(?:no|only)include', includeRegex = includeOnly ? 'noinclude' : 'includeonly', regex = new RegExp('<!--.*?(?:-->|$)' // comment
         + '|'
-        + `<${noincludeRegex}(?:\\s[^>]*)?>|</${noincludeRegex}\\s*>` // <noinclude>
+        + `<${noincludeRegex}(?:\\s[^>]*)?/?>|</${noincludeRegex}\\s*>` // <noinclude>
         + '|'
         + `<(${ext})(\\s[^>]*?)?(?:/>|>(.*?)</(\\1\\s*)>)` // 扩展标签
         + '|'