wikilint 2.18.2 → 2.18.3

package/README.md

@@ -6,7 +6,7 @@
 
 # WikiLint
 
-This is a minimal version of [WikiParser-Node](https://www.npmjs.com/package/wikiparser-node) customized for [eslint-plugin-wikitext](https://www.npmjs.com/package/eslint-plugin-wikitext).
+This is a minimal version of [WikiParser-Node](https://www.npmjs.com/package/wikiparser-node). The [WikiParser Language Server](https://marketplace.visualstudio.com/items?itemName=Bhsd.vscode-extension-wikiparser) VSCode extension is written based on this package.
 
 You can also directly lint Wikitext articles in the command line using this package:
 

package/bin/cli.js

@@ -1,3 +1,3 @@
 #!/usr/bin/env node
 'use strict';
-require('../dist/bin/cli.js');
+require('../dist/bin/cli.js'); // eslint-disable-line n/no-missing-require

package/config/minimum.json

@@ -98,6 +98,13 @@
 	],
 	"parserFunction": [
 		{
+			"msgnw": "msgnw",
+			"pageid": "pageid",
+			"articlepath": "articlepath",
+			"server": "server",
+			"servername": "servername",
+			"scriptpath": "scriptpath",
+			"stylepath": "stylepath",
 			"#language": "language",
 			"#special": "special",
 			"#speciale": "speciale",

package/dist/base.d.mts

@@ -41,6 +41,7 @@ export declare const stages: {
     list: number;
     dd: number;
     converter: number;
+    'list-range': number;
 };
 export type Stage = keyof typeof stages;
 export declare const rules: readonly ["bold-header", "format-leakage", "fostered-content", "h1", "illegal-attr", "insecure-style", "invalid-gallery", "invalid-imagemap", "invalid-invoke", "invalid-isbn", "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", "invalid-css"];
@@ -271,6 +272,7 @@ export interface Parser {
      *
      * 创建语言服务
      * @param uri document URI / 文档标识
+     * @since v1.16.1
      */
     createLanguageService(uri: object): LanguageService;
 }

package/dist/base.d.ts

@@ -41,6 +41,7 @@ export declare const stages: {
     list: number;
     dd: number;
     converter: number;
+    'list-range': number;
 };
 export type Stage = keyof typeof stages;
 export declare const rules: readonly ["bold-header", "format-leakage", "fostered-content", "h1", "illegal-attr", "insecure-style", "invalid-gallery", "invalid-imagemap", "invalid-invoke", "invalid-isbn", "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", "invalid-css"];
@@ -271,6 +272,7 @@ export interface Parser {
      *
      * 创建语言服务
      * @param uri document URI / 文档标识
+     * @since v1.16.1
      */
     createLanguageService(uri: object): LanguageService;
 }

package/dist/base.js

@@ -27,6 +27,7 @@ exports.stages = (() => {
         list: 10,
         dd: 10,
         converter: 11,
+        'list-range': 11,
     };
     Object.setPrototypeOf(obj, null);
     return obj;

package/dist/base.mjs

@@ -23,7 +23,8 @@ const stages = /* @__PURE__ */ (() => {
     "magic-link": 9,
     list: 10,
     dd: 10,
-    converter: 11
+    converter: 11,
+    "list-range": 11
   };
   Object.setPrototypeOf(obj, null);
   return obj;

package/dist/bin/config.js

@@ -81,8 +81,9 @@ let mwConfig;
  * @param site site nickname
  * @param url script path
  * @param force whether to overwrite the existing configuration
+ * @param internal for internal use
  */
-exports.default = async (site, url, force) => {
+exports.default = async (site, url, force, internal) => {
     if (!site || !url) {
         console.error('Usage: npx getParserConfig <site> <script path> [force]');
         process.exit(1);
@@ -133,7 +134,7 @@ exports.default = async (site, url, force) => {
     if (force || !fs_1.default.existsSync(file)) {
         fs_1.default.writeFileSync(file, `${JSON.stringify(config, null, '\t')}\n`);
     }
-    else {
+    else if (!internal) {
         assert_1.default.deepStrictEqual(arrToObj(require(file)), arrToObj(config));
     }
     return config;

package/dist/index.d.ts

@@ -1,8 +1,9 @@
 import type { Config, LintError, TokenTypes, Parser as ParserBase, Stage } from './base';
-import type { Title } from './lib/title';
+import type { Title, TitleOptions } from './lib/title';
 import type { LanguageService, QuickFixData } from './lib/lsp';
 import type { Token } from './internal';
 declare interface Parser extends ParserBase {
+    /** @since v1.5.1 */
     rules: readonly LintError.Rule[];
     /**
      * Normalize page title
@@ -19,6 +20,7 @@ declare interface Parser extends ParserBase {
      *
      * 创建语言服务
      * @param uri document URI / 文档标识
+     * @since v1.16.1
      */
     createLanguageService(uri: object): LanguageService;
 }

package/dist/index.js

@@ -25,6 +25,9 @@ const Parser = {
     config: 'default',
     i18n: undefined,
     rules: base_1.rules,
+    /* NOT FOR BROWSER ONLY */
+    lintCSS: true,
+    /* NOT FOR BROWSER ONLY END */
     /** @implements */
     getConfig(config) {
         /* NOT FOR BROWSER ONLY */
@@ -39,7 +42,7 @@ const Parser = {
             return this.getConfig();
         }
         /* NOT FOR BROWSER ONLY END */
-        const parserConfig = config ?? this.config, { doubleUnderscore } = parserConfig;
+        const parserConfig = config ?? this.config, { doubleUnderscore, } = parserConfig;
         for (let i = 0; i < 2; i++) {
             if (doubleUnderscore.length > i + 2 && doubleUnderscore[i].length === 0) {
                 doubleUnderscore[i] = Object.keys(doubleUnderscore[i + 2]);
@@ -61,11 +64,11 @@ const Parser = {
         return msg && (this.i18n?.[msg] ?? msg).replace('$1', this.msg(arg));
     },
     /** @implements */
-    normalizeTitle(title, defaultNs = 0, include, config = Parser.getConfig(), temporary = false, halfParsed, decode = false, selfLink = false) {
+    normalizeTitle(title, defaultNs = 0, include, config = Parser.getConfig(), opt) {
         const { Title } = require('./lib/title');
         let titleObj;
-        if (halfParsed) {
-            titleObj = new Title(title, defaultNs, config, temporary, decode, selfLink);
+        if (opt?.halfParsed) {
+            titleObj = new Title(title, defaultNs, config, opt);
         }
         else {
             const { Token } = require('./src/index');
@@ -73,7 +76,7 @@ const Parser = {
                 const root = new Token(title, config);
                 root.type = 'root';
                 root.parseOnce(0, include).parseOnce();
-                const t = new Title(root.toString(), defaultNs, config, temporary, decode, selfLink);
+                const t = new Title(root.toString(), defaultNs, config, opt);
                 for (const key of ['main', 'fragment']) {
                     const str = t[key];
                     if (str?.includes('\0')) {
@@ -94,8 +97,9 @@ const Parser = {
     /** @implements */
     parse(wikitext, include, maxStage = constants_1.MAX_STAGE, config = Parser.getConfig()) {
         wikitext = (0, string_1.tidy)(wikitext);
+        let types;
         if (typeof maxStage !== 'number') {
-            const types = Array.isArray(maxStage) ? maxStage : [maxStage];
+            types = Array.isArray(maxStage) ? maxStage : [maxStage];
             maxStage = Math.max(...types.map(t => base_1.stages[t] || constants_1.MAX_STAGE));
         }
         const { Token } = require('./src/index');
@@ -132,28 +136,34 @@ const Parser = {
         const token = new Token((0, string_1.tidy)(wikitext), config);
         token.type = 'root';
         let i = 0;
-        await new Promise(resolve => {
-            const /** @ignore */ check = () => {
-                if (watch() === wikitext) {
-                    i++;
-                    set(parseOnce, 0);
-                }
-                else {
-                    resolve();
-                }
-            }, 
-            /** @ignore */ parseOnce = () => {
-                if (i === constants_1.MAX_STAGE + 1) {
-                    token.afterBuild();
-                    resolve();
-                }
-                else {
-                    token[i === constants_1.MAX_STAGE ? 'build' : 'parseOnce'](i, include);
-                    check();
-                }
-            };
-            set(parseOnce, 0);
-        });
+        try {
+            await new Promise(resolve => {
+                const /** @ignore */ check = () => {
+                    if (watch() === wikitext) {
+                        i++;
+                        set(parseOnce, 0);
+                    }
+                    else {
+                        resolve();
+                    }
+                }, 
+                /** @ignore */ parseOnce = () => {
+                    if (i === constants_1.MAX_STAGE + 1) {
+                        token.afterBuild();
+                        resolve();
+                    }
+                    else {
+                        token[i === constants_1.MAX_STAGE ? 'build' : 'parseOnce'](i, include);
+                        check();
+                    }
+                };
+                set(parseOnce, 0);
+            });
+        }
+        catch (e) /* istanbul ignore next */ {
+            debug_1.Shadow.running = running;
+            throw e;
+        }
         debug_1.Shadow.running = running;
         return token;
     },

package/dist/lib/lsp.d.ts

@@ -20,6 +20,7 @@ export declare const isAttr: ({ type, parentNode, length, firstChild }: Token, s
 /** VSCode-style language service */
 export declare class LanguageService implements LanguageServiceBase {
     #private;
+    /** @since v1.17.1 */
     include: boolean;
     lilypond: string;
     /** @param uri 任务标识 */

package/dist/lib/lsp.js

@@ -23,6 +23,7 @@ const cssRules = {
     'block-no-empty': null,
     'property-no-unknown': null,
 }, jsonSelector = document_1.jsonTags.map(s => `ext-inner#${s}`).join(), scores = new Map();
+let colors;
 /* NOT FOR BROWSER ONLY END */
 exports.tasks = new WeakMap();
 const refTags = new Set(['ref']), referencesTags = new Set(['ref', 'references']), nameAttrs = new Set(['name', 'extends', 'follow']), groupAttrs = new Set(['group']), renameTypes = new Set([
@@ -40,6 +41,7 @@ const refTags = new Set(['ref']), referencesTags = new Set(['ref', 'references']
     'magic-word-name',
     ...renameTypes,
 ]), plainTypes = new Set(['text', 'comment', 'noinclude', 'include']), cssSelector = ['ext', 'html', 'table'].map(s => `${s}-attr#style`).join();
+const getLinkRegex = (0, common_1.getRegex)(protocol => new RegExp(`^(?:${protocol}|//)`, 'iu'));
 /**
  * Check if a token is a plain attribute.
  * @param token
@@ -273,6 +275,7 @@ class LanguageService {
     #config;
     #include;
     #completionConfig;
+    /** @since v1.17.1 */
     include = true;
     /** @private */
     config;
@@ -406,11 +409,14 @@ class LanguageService {
     async provideDocumentColors(rgba, text, hsl = true) {
         const root = await this.#queue(text);
         /* NOT FOR BROWSER ONLY */
-        let colors;
+        /* eslint-disable require-atomic-updates */
         try {
-            colors = new RegExp(String.raw `\b${Object.keys((await import('color-name')).default).join('|')}\b`, 'giu');
+            colors ??= new RegExp(String.raw `\b${Object.keys((await import('color-name')).default).join('|')}\b`, 'giu');
         }
-        catch { }
+        catch {
+            colors = false;
+        }
+        /* eslint-enable require-atomic-updates */
         /* NOT FOR BROWSER ONLY END */
         return root.querySelectorAll('attr-value,parameter-value,arg-default').reverse()
             .flatMap(token => {
@@ -637,7 +643,7 @@ class LanguageService {
             if (t === 'magic-word' && n !== 'invoke') {
                 return undefined;
             }
-            const key = this.#text.slice(cur.getAbsoluteIndex(), root.indexFromPos(line, character)).trimStart(), [module, func] = t === 'magic-word' ? transclusion.getModule() : [];
+            const key = this.#text.slice(cur.getAbsoluteIndex(), root.indexFromPos(line, character)).trimStart(), [mod, func] = t === 'magic-word' ? transclusion.getModule() : [];
             return key
                 ? getCompletion(root.querySelectorAll('parameter').filter(token => {
                     if (token === parentNode
@@ -650,7 +656,7 @@ class LanguageService {
                         return true;
                     }
                     const [m, f] = token.parentNode.getModule();
-                    return m === module && f === func;
+                    return m === mod && f === func;
                 }).map(({ name }) => name), 'Variable', key, position, type === 'parameter-value' ? '=' : '')
                 : undefined;
             /* NOT FOR BROWSER ONLY */
@@ -893,7 +899,7 @@ class LanguageService {
      */
     async provideLinks(text) {
         this.config ??= index_1.default.getConfig();
-        const { articlePath, protocol } = this.config, absolute = articlePath?.includes('//'), protocolRegex = new RegExp(`^(?:${protocol}|//)`, 'iu');
+        const { articlePath, protocol } = this.config, absolute = articlePath?.includes('//'), protocolRegex = getLinkRegex(protocol);
         return (await this.#queue(text))
             .querySelectorAll(`magic-link,ext-link-url,free-ext-link,attr-value,image-parameter#link${absolute ? ',link-target,template-name,invoke-module,magic-word#filepath,magic-word#widget' : ''}`)
             .reverse()
@@ -953,8 +959,8 @@ class LanguageService {
                             ns = name === 'filepath' ? 6 : 274;
                         // no default
                     }
-                    const title = index_1.default.normalizeTitle(target, ns, false, this.config, true);
-                    /* istanbul ignore if */
+                    const title = index_1.default
+                        .normalizeTitle(target, ns, false, this.config, { temporary: true });
                     if (!title.valid) {
                         return false;
                     }
@@ -1331,7 +1337,7 @@ class LanguageService {
             this.config = index_1.default.getConfig(config);
         }
         catch {
-            this.config = index_1.default.getConfig(await (0, config_1.default)(site, `${mt[0]}/w`));
+            this.config = index_1.default.getConfig(await (0, config_1.default)(site, `${mt[0]}/w`, false, true));
         }
         Object.assign(this.config, { articlePath: `${mt[0]}/wiki/` });
     }

package/dist/lib/title.d.ts

@@ -1,4 +1,10 @@
 import type { Config } from '../base';
+export interface TitleOptions {
+    temporary?: boolean | undefined;
+    decode?: boolean | undefined;
+    selfLink?: boolean | undefined;
+    halfParsed?: boolean | undefined;
+}
 /**
  * title object of a MediaWiki page
  *
@@ -18,21 +24,28 @@ export declare class Title {
     get prefix(): string;
     /** full title / 完整标题 */
     get title(): string;
-    /** file extension / 扩展名 */
+    /**
+     * file extension / 扩展名
+     * @since v1.1.0
+     */
     get extension(): string | undefined;
     /**
      * @see MediaWikiTitleCodec::splitTitleString
      *
      * @param title 标题（含或不含命名空间前缀）
      * @param defaultNs 命名空间
-     * @param decode 是否需要解码
-     * @param selfLink 是否允许selfLink
+     * @param config
+     * @param opt 选项
+     * @param opt.temporary 是否是临时标题
+     * @param opt.decode 是否需要解码
+     * @param opt.selfLink 是否允许selfLink
      */
-    constructor(title: string, defaultNs: number, config: Config, temporary: boolean, decode: boolean, selfLink: boolean);
+    constructor(title: string, defaultNs: number, config: Config, { temporary, decode, selfLink }?: TitleOptions);
     /**
      * Check if the title is a redirect
      *
      * 检测是否是重定向
+     * @since v1.12.2
      */
     getRedirection(): [boolean, string];
     /**
@@ -40,6 +53,7 @@ export declare class Title {
      *
      * 生成URL
      * @param articlePath article path / 条目路径
+     * @since v1.10.0
      */
     getUrl(articlePath?: string): string;
 }

package/dist/lib/title.js

@@ -41,7 +41,10 @@ class Title {
     get title() {
         return this.getRedirection()[1];
     }
-    /** file extension / 扩展名 */
+    /**
+     * file extension / 扩展名
+     * @since v1.1.0
+     */
     get extension() {
         const { main } = this, i = main.lastIndexOf('.');
         return i === -1 ? undefined : main.slice(i + 1).toLowerCase();
@@ -51,10 +54,13 @@ class Title {
      *
      * @param title 标题（含或不含命名空间前缀）
      * @param defaultNs 命名空间
-     * @param decode 是否需要解码
-     * @param selfLink 是否允许selfLink
+     * @param config
+     * @param opt 选项
+     * @param opt.temporary 是否是临时标题
+     * @param opt.decode 是否需要解码
+     * @param opt.selfLink 是否允许selfLink
      */
-    constructor(title, defaultNs, config, temporary, decode, selfLink) {
+    constructor(title, defaultNs, config, { temporary, decode, selfLink } = {}) {
         const subpage = title.trim().startsWith('../');
         if (decode && title.includes('%')) {
             try {
@@ -116,6 +122,7 @@ class Title {
      * Check if the title is a redirect
      *
      * 检测是否是重定向
+     * @since v1.12.2
      */
     getRedirection() {
         // eslint-disable-next-line @typescript-eslint/prefer-destructuring
@@ -133,6 +140,7 @@ class Title {
      *
      * 生成URL
      * @param articlePath article path / 条目路径
+     * @since v1.10.0
      */
     getUrl(articlePath) {
         LSP: { // eslint-disable-line no-unused-labels

package/dist/parser/braces.js

@@ -1,16 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseBraces = void 0;
+const common_1 = require("@bhsd/common");
 const string_1 = require("../util/string");
 const heading_1 = require("../src/heading");
 const transclude_1 = require("../src/transclude");
 const arg_1 = require("../src/arg");
+/* NOT FOR BROWSER ONLY */
+const v8_1 = require("v8");
+const MAXHEAP = (0, v8_1.getHeapStatistics)().total_available_size * 0.9, MAXITER = MAXHEAP / 2e5;
+/* NOT FOR BROWSER ONLY END */
 const closes = {
     '=': String.raw `\n(?!(?:[^\S\n]|\0\d+[cn]\x7F)*\n)`,
     '{': String.raw `\}{2,}|\|`,
     '-': String.raw `\}-`,
     '[': String.raw `\]\]`,
-}, openBraces = String.raw `|\{{2,}`, marks = new Map([['!', '!'], ['!!', '+'], ['(!', '{'], ['!)', '}'], ['!-', '-'], ['=', '~'], ['server', 'm']]);
+}, openBraces = String.raw `|\{{2,}`, marks = new Map([['!', '!'], ['!!', '+'], ['(!', '{'], ['!)', '}'], ['!-', '-'], ['=', '~'], ['server', 'm']]), getExecRegex = (0, common_1.getRegex)(s => new RegExp(s, 'gmu'));
 /**
  * 获取模板或魔术字对应的字符
  * @param s 模板或魔术字名
@@ -33,7 +38,8 @@ const getSymbol = (s) => {
  * @param wikitext
  * @param config
  * @param accum
- * @throws TranscludeToken.constructor()
+ * @throws `RangeError` Maximum iteration exceeded
+ * @throws `TranscludeToken.constructor()`
  */
 const parseBraces = (wikitext, config, accum) => {
     const source = String.raw `${config.excludes?.includes('heading') ? '' : String.raw `^((?:\0\d+[cno]\x7F)*)={1,6}|`}\[\[|-\{(?!\{)`, { parserFunction: [, , , subst] } = config, stack = [], linkStack = [];
@@ -42,7 +48,17 @@ const parseBraces = (wikitext, config, accum) => {
      * @param s 不含内链的字符串
      */
     const restore = (s) => s.replace(/\0(\d+)\x7F/gu, (_, p1) => linkStack[p1]);
-    wikitext = wikitext.replace(/\{\{([^\n{}[]*)\}\}(?!\})|\[\[[^\n[\]{]*\]\]/gu, (m, p1) => {
+    /**
+     * 填入模板内容
+     * @param text wikitext全文
+     * @param parts 模板参数
+     * @param lastIndex 匹配的起始位置
+     * @param index 匹配位置
+     */
+    const push = (text, parts, lastIndex, index) => {
+        parts[parts.length - 1].push(restore(text.slice(lastIndex, index)));
+    };
+    wikitext = wikitext.replace(/\{\{([^\n{}[]*)\}\}(?!\})|\[\[[^\n[\]{]*\]\]|-\{[^\n{}[]*\}-/gu, (m, p1) => {
         if (p1 !== undefined) {
             try {
                 const { length } = accum, parts = p1.split('|');
@@ -65,23 +81,21 @@ const parseBraces = (wikitext, config, accum) => {
     });
     const lastBraces = wikitext.lastIndexOf('}}') - wikitext.length;
     let moreBraces = lastBraces + wikitext.length !== -1;
-    let regex = new RegExp(source + (moreBraces ? openBraces : ''), 'gmu'), mt = regex.exec(wikitext), lastIndex;
+    let regex = getExecRegex(source + (moreBraces ? openBraces : '')), mt = regex.exec(wikitext), iter = 0, lastIndex;
     while (mt
         || lastIndex !== undefined && lastIndex <= wikitext.length
             && stack[stack.length - 1]?.[0]?.startsWith('=')) {
+        /* NOT FOR BROWSER ONLY */
+        if (iter++ > MAXITER && process.memoryUsage().heapUsed > MAXHEAP) {
+            throw new RangeError('Maximum iteration exceeded');
+        }
+        /* NOT FOR BROWSER ONLY END */
         if (mt?.[1]) {
             const [, { length }] = mt;
             mt[0] = mt[0].slice(length);
             mt.index += length;
         }
         const { 0: syntax, index: curIndex } = mt ?? { 0: '\n', index: wikitext.length }, top = stack.pop() ?? {}, { 0: open, index, parts, findEqual: topFindEqual, pos: topPos } = top, innerEqual = syntax === '=' && topFindEqual;
-        /**
-         * 填入模板内容
-         * @param text wikitext全文
-         */
-        const push = (text) => {
-            parts[parts.length - 1].push(restore(text.slice(topPos, curIndex)));
-        };
         if (syntax === ']]' || syntax === '}-') { // 情形1：闭合内链或转换
             lastIndex = curIndex + 2;
         }
@@ -102,7 +116,7 @@ const parseBraces = (wikitext, config, accum) => {
         }
         else if (syntax === '|' || innerEqual) { // 情形3：模板内部，含行首单个'='
             lastIndex = curIndex + 1;
-            push(wikitext);
+            push(wikitext, parts, topPos, curIndex);
             if (syntax === '|') {
                 parts.push([]);
             }
@@ -113,7 +127,7 @@ const parseBraces = (wikitext, config, accum) => {
         else if (syntax.startsWith('}}')) { // 情形4：闭合模板
             const close = syntax.slice(0, Math.min(open.length, 3)), rest = open.length - close.length, { length } = accum;
             lastIndex = curIndex + close.length; // 这不是最终的lastIndex
-            push(wikitext);
+            push(wikitext, parts, topPos, curIndex);
             let skip = false, ch = 't';
             if (close.length === 3) {
                 const argParts = parts.map(part => part.join('=')), str = argParts.length > 1 && (0, string_1.removeComment)(argParts[1]).trim();
@@ -167,9 +181,9 @@ const parseBraces = (wikitext, config, accum) => {
                 curTop = stack[stack.length - 1];
             }
         }
-        regex = new RegExp(source
+        regex = getExecRegex(source
             + (moreBraces ? openBraces : '')
-            + (curTop ? `|${closes[curTop[0][0]]}${curTop.findEqual ? '|=' : ''}` : ''), 'gmu');
+            + (curTop ? `|${closes[curTop[0][0]]}${curTop.findEqual ? '|=' : ''}` : ''));
         regex.lastIndex = lastIndex;
         mt = regex.exec(wikitext);
     }

package/dist/parser/commentAndExt.js

@@ -1,27 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseCommentAndExt = void 0;
+const common_1 = require("@bhsd/common");
 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, regexInclude = new WeakMap(), regexNoinclude = new WeakMap();
-/**
- * 获取正则表达式
- * @param ext 扩展标签
- * @param includeOnly 是否嵌入
- */
-const getRegex = (ext, includeOnly) => {
-    const regex = includeOnly ? regexInclude : regexNoinclude;
-    if (regex.has(ext)) {
-        return regex.get(ext);
-    }
+const onlyincludeLeft = '<onlyinclude>', onlyincludeRight = '</onlyinclude>', { length } = onlyincludeLeft, getRegex = [false, true].map(includeOnly => {
     const noincludeRegex = includeOnly ? 'includeonly' : '(?:no|only)include', includeRegex = includeOnly ? 'noinclude' : 'includeonly';
-    const re = new RegExp(String.raw `<!--[\s\S]*?(?:-->|$)|<${noincludeRegex}(?:\s[^>]*)?/?>|</${noincludeRegex}\s*>|<(${ext.join('|')})(\s[^>]*?)?(?:/>|>([\s\S]*?)</(\1\s*)>)|<(${includeRegex})(\s[^>]*?)?(?:/>|>([\s\S]*?)(?:</(${includeRegex}\s*)>|$))`, 'giu');
-    regex.set(ext, re);
-    return re;
-};
+    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'));
+});
 /**
  * 更新`<onlyinclude>`和`</onlyinclude>`的位置
  * @param wikitext
@@ -67,7 +56,7 @@ const parseCommentAndExt = (wikitext, config, accum, includeOnly) => {
             return str;
         }
     }
-    return wikitext.replace(getRegex(config.ext, includeOnly), (substr, name, attr, inner, closing, include, includeAttr, includeInner, includeClosing) => {
+    return wikitext.replace(getRegex[includeOnly ? 1 : 0](config.ext), (substr, name, attr, inner, closing, include, includeAttr, includeInner, includeClosing) => {
         const l = accum.length;
         let ch = 'n';
         if (name) {

package/dist/parser/links.js

@@ -50,7 +50,7 @@ const parseLinks = (wikitext, config, accum, tidy) => {
             s += `[[${x}`;
             continue;
         }
-        const { ns, valid, } = index_1.default.normalizeTitle(link, 0, false, config, true, true, true, true);
+        const { ns, valid, } = index_1.default.normalizeTitle(link, 0, false, config, { halfParsed: true, temporary: true, decode: true, selfLink: true });
         if (!valid) {
             s += `[[${x}`;
             continue;

package/dist/parser/redirect.js

@@ -16,9 +16,7 @@ const parseRedirect = (text, config, accum) => {
     config.regexRedirect ??= new RegExp(String.raw `^(\s*)((?:${config.redirection.join('|')})\s*(?::\s*)?)\[\[([^\n|\]]+)(\|.*?)?\]\](\s*)`, 'iu');
     const mt = config.regexRedirect.exec(text);
     if (mt
-        && index_1.default
-            .normalizeTitle(mt[3], 0, false, config, true, true, true)
-            .valid) {
+        && index_1.default.normalizeTitle(mt[3], 0, false, config, { halfParsed: true, temporary: true, decode: true }).valid) {
         text = `\0${accum.length}o\x7F${text.slice(mt[0].length)}`;
         // @ts-expect-error abstract class
         new redirect_1.RedirectToken(...mt.slice(1), config, accum);

package/dist/src/converter.js

@@ -22,7 +22,7 @@ class ConverterToken extends index_1.Token {
     constructor(flags, rules, config, accum = []) {
         super(undefined, config, accum);
         // @ts-expect-error abstract class
-        this.append(new converterFlags_1.ConverterFlagsToken(flags, config, accum));
+        this.insertAt(new converterFlags_1.ConverterFlagsToken(flags, config, accum));
         const [firstRule] = rules, hasColon = firstRule.includes(':'), 
         // @ts-expect-error abstract class
         firstRuleToken = new converterRule_1.ConverterRuleToken(firstRule, hasColon, config, accum);

package/dist/src/gallery.js

@@ -44,7 +44,7 @@ class GalleryToken extends index_2.Token {
      * @param file 文件名
      */
     #checkFile(file) {
-        return this.normalizeTitle(file, 6, true, true, true).valid;
+        return this.normalizeTitle(file, 6, { halfParsed: true, temporary: true, decode: true }).valid;
     }
     /** @private */
     toString(skip) {

package/dist/src/heading.js

@@ -35,7 +35,7 @@ class HeadingToken extends index_2.Token {
         const token = new index_2.Token(input[0], config, accum);
         token.type = 'heading-title';
         token.setAttribute('stage', 2);
-        const trail = new syntax_1.SyntaxToken(input[1], /^\s*$/u, 'heading-trail', config, accum, {});
+        const trail = new syntax_1.SyntaxToken(input[1], 'heading-trail', config, accum);
         this.append(token, trail);
     }
     /** 标题格式的等号 */
@@ -102,7 +102,7 @@ class HeadingToken extends index_2.Token {
                 left: rect.left + level,
             }, 'format-leakage', index_1.default.msg('unbalanced $1 in a section header', 'bold apostrophes')), end = start + level + innerStr.length;
             if (rootStr.slice(e.endIndex, end).trim()) {
-                e.suggestions = [{ desc: 'close', range: [end, end], text: "'''" }];
+                e.suggestions = [{ desc: 'close', range: [end, end], text: `'''` }];
             }
             else {
                 e.fix = { desc: 'remove', range: [e.startIndex, e.endIndex], text: '' };
@@ -112,7 +112,7 @@ class HeadingToken extends index_2.Token {
         if (italicQuotes.length % 2) {
             const e = (0, lint_1.generateForChild)(italicQuotes[italicQuotes.length - 1], { start: start + level }, 'format-leakage', index_1.default.msg('unbalanced $1 in a section header', 'italic apostrophes')), end = start + level + innerStr.length;
             e.fix = rootStr.slice(e.endIndex, end).trim()
-                ? { desc: 'close', range: [end, end], text: "''" }
+                ? { desc: 'close', range: [end, end], text: `''` }
                 : { desc: 'remove', range: [e.startIndex, e.endIndex], text: '' };
             errors.push(e);
         }

package/dist/src/imageParameter.js

@@ -4,10 +4,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ImageParameterToken = exports.galleryParams = void 0;
+const common_1 = require("@bhsd/common");
 const string_1 = require("../util/string");
 const lint_1 = require("../util/lint");
 const index_1 = __importDefault(require("../index"));
 const index_2 = require("./index");
+const getUrlLikeRegex = (0, common_1.getRegex)(protocol => new RegExp(String.raw `^(?:${protocol}|//|\0\d+m\x7F)`, 'iu'));
+const getUrlRegex = (0, common_1.getRegex)(protocol => new RegExp(String.raw `^(?:(?:${protocol}|//)${string_1.extUrlCharFirst}|\0\d+m\x7F)${string_1.extUrlChar}$`, 'iu'));
+const getSyntaxRegex = (0, common_1.getRegex)(syntax => new RegExp(String.raw `^(\s*(?!\s))${syntax.replace('$1', '(.*)')}${syntax.endsWith('$1') ? '(?=$|\n)' : ''}(\s*)$`, 'u'));
 exports.galleryParams = new Set(['alt', 'link', 'lang', 'page', 'caption']);
 function validate(key, val, config, halfParsed, ext) {
     val = val.trim();
@@ -19,15 +23,13 @@ function validate(key, val, config, halfParsed, ext) {
             if (!value) {
                 return val;
             }
-            const re1 = new RegExp(String.raw `^(?:${config.protocol}|//|\0\d+m\x7F)`, 'iu');
-            const re2 = new RegExp(String.raw `^(?:(?:${config.protocol}|//)${string_1.extUrlCharFirst}|\0\d+m\x7F)${string_1.extUrlChar}$`, 'iu');
-            if (re1.test(value)) {
-                return re2.test(value) && val;
+            else if (getUrlLikeRegex(config.protocol).test(value)) {
+                return getUrlRegex(config.protocol).test(value) && val;
             }
             else if (value.startsWith('[[') && value.endsWith(']]')) {
                 value = value.slice(2, -2);
             }
-            const title = index_1.default.normalizeTitle(value, 0, false, config, false, halfParsed, true, true);
+            const title = index_1.default.normalizeTitle(value, 0, false, config, { halfParsed, decode: true, selfLink: true });
             return title.valid && title;
         }
         case 'lang':
@@ -59,10 +61,8 @@ class ImageParameterToken extends index_2.Token {
     /** @param str 图片参数 */
     constructor(str, extension, config, accum) {
         let mt;
-        const regexes = Object.entries(config.img).map(([syntax, param]) => {
-            const re = new RegExp(String.raw `^(\s*(?!\s))${syntax.replace('$1', '(.*)')}${syntax.endsWith('$1') ? '(?=$|\n)' : ''}(\s*)$`, 'u');
-            return [syntax, param, re];
-        }), param = regexes.find(([, key, regex]) => {
+        const regexes = Object.entries(config.img)
+            .map(([syntax, param]) => [syntax, param, getSyntaxRegex(syntax)]), param = regexes.find(([, key, regex]) => {
             mt = regex.exec(str);
             return mt
                 && (mt.length !== 4

package/dist/src/imagemap.js

@@ -38,7 +38,7 @@ class ImagemapToken extends index_2.Token {
                 //
             }
             else if (first) {
-                const pipe = line.indexOf('|'), file = pipe === -1 ? line : line.slice(0, pipe), { valid, ns, } = this.normalizeTitle(file, 0, true, true);
+                const pipe = line.indexOf('|'), file = pipe === -1 ? line : line.slice(0, pipe), { valid, ns, } = this.normalizeTitle(file, 0, { halfParsed: true, temporary: true });
                 if (valid
                     && ns === 6) {
                     // @ts-expect-error abstract class
@@ -59,7 +59,8 @@ class ImagemapToken extends index_2.Token {
                 const i = line.indexOf('['), substr = line.slice(i), mtIn = /^\[\[([^|]+)(?:\|([^\]]+))?\]\][\w\s]*$/u
                     .exec(substr);
                 if (mtIn) {
-                    if (this.normalizeTitle(mtIn[1], 0, true, true, false, true).valid) {
+                    if (this.normalizeTitle(mtIn[1], 0, { halfParsed: true, temporary: true, selfLink: true })
+                        .valid) {
                         // @ts-expect-error abstract class
                         super.insertAt(new imagemapLink_1.ImagemapLinkToken(line.slice(0, i), mtIn.slice(1), substr.slice(substr.indexOf(']]') + 2), config, accum));
                         continue;

package/dist/src/index.d.ts

@@ -2,7 +2,7 @@ import Parser from '../index';
 import { AstElement } from '../lib/element';
 import { AstText } from '../lib/text';
 import type { LintError, TokenTypes } from '../base';
-import type { Title } from '../lib/title';
+import type { Title, TitleOptions } from '../lib/title';
 import type { AstNodes } from '../internal';
 /**
  * base class for all tokens

package/dist/src/index.js

@@ -49,6 +49,7 @@ exports.Token = void 0;
 const string_1 = require("../util/string");
 const constants_1 = require("../util/constants");
 const lint_1 = require("../util/lint");
+const debug_1 = require("../util/debug");
 const index_1 = __importDefault(require("../index"));
 const element_1 = require("../lib/element");
 const text_1 = require("../lib/text");
@@ -168,7 +169,7 @@ class Token extends element_1.AstElement {
         this.#stage = constants_1.MAX_STAGE;
         const { length, firstChild } = this, str = firstChild?.toString();
         if (length === 1 && firstChild.type === 'text' && str.includes('\0')) {
-            this.replaceChildren(...this.buildFromStr(str));
+            (0, debug_1.setChildNodes)(this, 0, 1, this.buildFromStr(str));
             this.normalize();
             if (this.type === 'root') {
                 for (const token of this.#accum) {
@@ -317,6 +318,8 @@ class Token extends element_1.AstElement {
                 return this.#accum;
             case 'built':
                 return this.#built;
+            case 'stage':
+                return this.#stage;
             default:
                 return super.getAttribute(key);
         }
@@ -344,9 +347,8 @@ class Token extends element_1.AstElement {
         return token;
     }
     /** @private */
-    normalizeTitle(title, defaultNs = 0, temporary, halfParsed, decode, selfLink) {
-        return index_1.default
-            .normalizeTitle(title, defaultNs, this.#include, this.#config, temporary, halfParsed, decode, selfLink);
+    normalizeTitle(title, defaultNs = 0, opt) {
+        return index_1.default.normalizeTitle(title, defaultNs, this.#include, this.#config, opt);
     }
     /** @private */
     lint(start = this.getAbsoluteIndex(), re) {
@@ -423,7 +425,7 @@ class Token extends element_1.AstElement {
             });
             /* NOT FOR BROWSER ONLY */
         }
-        else if ((0, lsp_1.isAttr)(this, true)) {
+        else if (index_1.default.lintCSS && (0, lsp_1.isAttr)(this, true)) {
             const root = this.getRootNode(), textDoc = new document_1.EmbeddedCSSDocument(root, this);
             errors.push(...document_1.cssLSP.doValidation(textDoc, textDoc.styleSheet)
                 .filter(({ code }) => code !== 'css-ruleorselectorexpected')

package/dist/src/link/base.js

@@ -132,7 +132,7 @@ class LinkBaseToken extends index_2.Token {
     }
     /** @private */
     getTitle(temporary, halfParsed) {
-        return this.normalizeTitle(this.firstChild.toString(true), 0, temporary, halfParsed, true, true);
+        return this.normalizeTitle(this.firstChild.toString(true), 0, { halfParsed, temporary, decode: true, selfLink: true });
     }
 }
 exports.LinkBaseToken = LinkBaseToken;

package/dist/src/link/file.d.ts

@@ -13,6 +13,8 @@ export declare abstract class FileToken extends LinkBaseToken {
     readonly childNodes: readonly [AtomToken, ...ImageParameterToken[]];
     abstract get lastChild(): AtomToken | ImageParameterToken;
     get type(): 'file' | 'gallery-image' | 'imagemap-image';
+    /** file extension / 扩展名 */
+    get extension(): string | undefined;
     /**
      * @param link 文件名
      * @param text 图片参数

package/dist/src/link/file.js

@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FileToken = void 0;
-const string_1 = require("../../util/string");
 const lint_1 = require("../../util/lint");
 const rect_1 = require("../../lib/rect");
 const index_1 = __importDefault(require("../../index"));
@@ -15,24 +14,21 @@ const frame = new Map([
     ['frameless', 'Frameless'],
     ['framed', 'Frame'],
     ['thumbnail', 'Thumb'],
-]), horizAlign = new Set(['left', 'right', 'center', 'none']), vertAlign = new Set(['baseline', 'sub', 'super', 'top', 'text-top', 'middle', 'bottom', 'text-bottom']);
+]), horizAlign = new Set(['left', 'right', 'center', 'none']), vertAlign = new Set(['baseline', 'sub', 'super', 'top', 'text-top', 'middle', 'bottom', 'text-bottom']), extensions = new Set(['tiff', 'tif', 'png', 'gif', 'jpg', 'jpeg', 'webp', 'xcf', 'pdf', 'svg', 'djvu']);
 /**
  * a more sophisticated string-explode function
- * @param start start syntax of a nested AST node
- * @param end end syntax of a nested AST node
- * @param separator syntax for explosion
  * @param str string to be exploded
  */
-const explode = (start, end, separator, str) => {
+const explode = (str) => {
     if (str === undefined) {
         return [];
     }
-    const regex = new RegExp(`${[start, end, separator].map(string_1.escapeRegExp).join('|')}`, 'gu'), exploded = [];
+    const regex = /-\{|\}-|\|/gu, exploded = [];
     let mt = regex.exec(str), depth = 0, lastIndex = 0;
     while (mt) {
         const { 0: match, index } = mt;
-        if (match !== separator) {
-            depth += match === start ? 1 : -1;
+        if (match !== '|') {
+            depth += match === '-{' ? 1 : -1;
         }
         else if (depth === 0) {
             exploded.push(str.slice(lastIndex, index));
@@ -53,6 +49,10 @@ class FileToken extends base_1.LinkBaseToken {
     get type() {
         return 'file';
     }
+    /** file extension / 扩展名 */
+    get extension() {
+        return this.getAttribute('title').extension;
+    }
     /**
      * @param link 文件名
      * @param text 图片参数
@@ -61,7 +61,7 @@ class FileToken extends base_1.LinkBaseToken {
     constructor(link, text, config = index_1.default.getConfig(), accum = [], delimiter = '|') {
         super(link, undefined, config, accum, delimiter);
         const { extension } = this.getTitle(true, true);
-        this.append(...explode('-{', '}-', '|', text).map(
+        this.append(...explode(text).map(
         // @ts-expect-error abstract class
         (part) => new imageParameter_1.ImageParameterToken(part, extension, config, accum)));
     }
@@ -92,12 +92,14 @@ class FileToken extends base_1.LinkBaseToken {
          * 图片参数到语法错误的映射
          * @param msg 消息键
          * @param p1 替换$1
+         * @param severity 错误等级
          */
-        const generate = (msg, p1) => (arg) => {
-            const e = (0, lint_1.generateForChild)(arg, rect, 'no-duplicate', index_1.default.msg(`${msg} image $1 parameter`, p1));
+        const generate = (msg, p1, severity) => (arg) => {
+            const e = (0, lint_1.generateForChild)(arg, rect, 'no-duplicate', index_1.default.msg(`${msg} image $1 parameter`, p1), severity);
             e.suggestions = [{ desc: 'remove', range: [e.startIndex - 1, e.endIndex], text: '' }];
             return e;
         };
+        const { extension } = this;
         for (const key of keys) {
             if (key === 'invalid' || key === 'width' && unscaled) {
                 continue;
@@ -110,7 +112,7 @@ class FileToken extends base_1.LinkBaseToken {
                 ];
             }
             if (relevantArgs.length > 1) {
-                errors.push(...relevantArgs.map(generate('duplicated', key)));
+                errors.push(...relevantArgs.map(generate('duplicated', key, key === 'caption' && extension && !extensions.has(extension) ? 'warning' : 'error')));
             }
         }
         if (frameKeys.length > 1) {

package/dist/src/link/galleryImage.js

@@ -43,7 +43,7 @@ class GalleryImageToken extends file_1.FileToken {
     /** @private */
     getTitle(temporary) {
         const imagemap = this.type === 'imagemap-image';
-        return this.normalizeTitle(this.firstChild.toString(), imagemap ? 0 : 6, temporary, true, !imagemap);
+        return this.normalizeTitle(this.firstChild.toString(), imagemap ? 0 : 6, { halfParsed: true, temporary, decode: !imagemap });
     }
     /** @private */
     getAttribute(key) {

package/dist/src/link/redirectTarget.js

@@ -27,8 +27,7 @@ class RedirectTargetToken extends base_1.LinkBaseToken {
     }
     /** @private */
     getTitle() {
-        return this
-            .normalizeTitle(this.firstChild.toString(), 0, false, true, true);
+        return this.normalizeTitle(this.firstChild.toString(), 0, { halfParsed: true, decode: true });
     }
     /** @private */
     lint(start = this.getAbsoluteIndex()) {

package/dist/src/magicLink.js

@@ -95,7 +95,7 @@ class MagicLinkToken extends index_2.Token {
             if (type === 'magic-link') {
                 if (link.startsWith('ISBN')) {
                     return this
-                        .normalizeTitle(`BookSources/${link.slice(5)}`, -1, true)
+                        .normalizeTitle(`BookSources/${link.slice(5)}`, -1, { temporary: true })
                         .getUrl(articlePath);
                 }
                 link = link.startsWith('RFC')

package/dist/src/nested.js

@@ -12,7 +12,10 @@ const index_1 = __importDefault(require("../index"));
 const index_2 = require("./index");
 const ext_1 = require("./tagPair/ext");
 const noinclude_1 = require("./nowiki/noinclude");
-const childTypes = new Set(['comment', 'include', 'arg', 'template', 'magic-word']);
+const childTypes = new Set(['comment', 'include', 'arg', 'template', 'magic-word']), lintRegex = [false, true].map(article => {
+    const noinclude = article ? 'includeonly' : 'noinclude';
+    return new RegExp(String.raw `^(?:<${noinclude}(?:\s[^>]*)?/?>|</${noinclude}\s*>)$`, 'iu');
+});
 /**
  * extension tag that has a nested structure
  *
@@ -56,10 +59,7 @@ class NestedToken extends index_2.Token {
     }
     /** @private */
     lint(start = this.getAbsoluteIndex(), re) {
-        const rect = new rect_1.BoundingRect(this, start), noinclude = this.#regex ? 'includeonly' : 'noinclude';
-        const regex = typeof this.#regex === 'boolean'
-            ? new RegExp(String.raw `^(?:<${noinclude}(?:\s[^>]*)?/?>|</${noinclude}\s*>)$`, 'iu')
-            : /^<!--[\s\S]*-->$/u;
+        const rect = new rect_1.BoundingRect(this, start), regex = typeof this.#regex === 'boolean' ? lintRegex[this.#regex ? 1 : 0] : /^<!--[\s\S]*-->$/u;
         return [
             ...super.lint(start, re),
             ...this.childNodes.filter(child => {

package/dist/src/nowiki/index.js

@@ -4,9 +4,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NowikiToken = void 0;
+const common_1 = require("@bhsd/common");
 const lint_1 = require("../../util/lint");
 const index_1 = __importDefault(require("../../index"));
 const base_1 = require("./base");
+const getLintRegex = (0, common_1.getRegex)(name => new RegExp(String.raw `<\s*(?:/\s*)${name === 'nowiki' ? '' : '?'}(${name})\b`, 'giu'));
 /**
  * text-only token inside an extension tag
  *
@@ -24,8 +26,7 @@ class NowikiToken extends base_1.NowikiBaseToken {
             e.fix = { range: [start, e.endIndex], text: '', desc: 'empty' };
             return [e];
         }
-        const re = new RegExp(String.raw `<\s*(?:/\s*)${name === 'nowiki' ? '' : '?'}(${name})\b`, 'giu');
-        return super.lint(start, re);
+        return super.lint(start, getLintRegex(name));
     }
 }
 exports.NowikiToken = NowikiToken;

package/dist/src/redirect.js

@@ -76,8 +76,7 @@ let RedirectToken = (() => {
             super(undefined, config, accum);
             this.#pre = pre;
             this.#post = post;
-            const pattern = new RegExp(String.raw `^(?:${config.redirection.join('|')})\s*(?::\s*)?$`, 'iu');
-            this.append(new syntax_1.SyntaxToken(syntax, pattern, 'redirect-syntax', config, accum, {}), 
+            this.append(new syntax_1.SyntaxToken(syntax, 'redirect-syntax', config, accum), 
             // @ts-expect-error abstract class
             new redirectTarget_1.RedirectTargetToken(link, text?.slice(1), config, accum));
         }

package/dist/src/syntax.d.ts

@@ -9,7 +9,9 @@ declare type SyntaxTypes = 'heading-trail' | 'magic-word-name' | 'table-syntax'
 export declare class SyntaxToken extends Token {
     #private;
     get type(): SyntaxTypes;
-    /** @param pattern 语法正则 */
-    constructor(wikitext: string | undefined, pattern: RegExp, type: SyntaxTypes, config?: Config, accum?: Token[], acceptable?: Acceptable);
+    /**
+     * @class
+     */
+    constructor(wikitext: string | undefined, type: SyntaxTypes, config?: Config, accum?: Token[], acceptable?: Acceptable);
 }
 export {};

package/dist/src/syntax.js

@@ -12,8 +12,10 @@ class SyntaxToken extends index_1.Token {
     get type() {
         return this.#type;
     }
-    /** @param pattern 语法正则 */
-    constructor(wikitext, pattern, type, config, accum, acceptable) {
+    /**
+     * @class
+     */
+    constructor(wikitext, type, config, accum, acceptable) {
         super(wikitext, config, accum, acceptable);
         this.#type = type;
     }

package/dist/src/table/base.js

@@ -24,7 +24,7 @@ class TableBaseToken extends (0, attributesParent_1.attributesParent)(1)(index_2
      */
     constructor(pattern, syntax, type, attr, config = index_1.default.getConfig(), accum = [], acceptable) {
         super(undefined, config, accum, acceptable);
-        this.append(new syntax_1.SyntaxToken(syntax, pattern, 'table-syntax', config, accum, {}), 
+        this.append(new syntax_1.SyntaxToken(syntax, 'table-syntax', config, accum), 
         // @ts-expect-error abstract class
         new attributes_1.AttributesToken(attr, 'table-attrs', type, config, accum));
     }

package/dist/src/table/index.js

@@ -10,7 +10,6 @@ const rect_1 = require("../../lib/rect");
 const index_1 = __importDefault(require("../../index"));
 const trBase_1 = require("./trBase");
 const syntax_1 = require("../syntax");
-const closingPattern = /^\n[^\S\n]*(?:\|\}|\{\{\s*!\s*\}\}\}|\{\{\s*!\)\s*\}\})$/u;
 /**
  * 生成一个指定长度的空数组
  * @param n 数组长度
@@ -91,11 +90,9 @@ class TableToken extends trBase_1.TrBaseToken {
      * @param halfParsed
      */
     close(syntax = '\n|}', halfParsed) {
-        const config = this.getAttribute('config'), accum = this.getAttribute('accum'), inner = halfParsed
-            ? [syntax]
-            : index_1.default.parse(syntax, this.getAttribute('include'), 2, config).childNodes;
+        const config = this.getAttribute('config'), accum = this.getAttribute('accum'), inner = [syntax];
         debug_1.Shadow.run(() => {
-            const token = new syntax_1.SyntaxToken(undefined, closingPattern, 'table-syntax', config, accum);
+            const token = new syntax_1.SyntaxToken(undefined, 'table-syntax', config, accum);
             super.insertAt(token);
         });
         this.lastChild.replaceChildren(...inner);

package/dist/src/table/trBase.js

@@ -4,6 +4,7 @@ exports.TrBaseToken = void 0;
 const lint_1 = require("../../util/lint");
 const base_1 = require("./base");
 const td_1 = require("./td");
+const tableTags = new Set(['tr', 'td', 'th', 'caption']);
 /**
  * table row or table
  *
@@ -19,7 +20,8 @@ class TrBaseToken extends base_1.TableBaseToken {
         const first = inter.childNodes.find(child => child.text().trim()), tdPattern = /^\s*(?:!|\{\{\s*![!-]?\s*\}\})/u;
         if (!first
             || tdPattern.test(first.toString())
-            || first.is('arg') && tdPattern.test(first.default || '')) {
+            || first.is('arg') && tdPattern.test(first.default || '')
+            || first.is('html') && tableTags.has(first.name)) {
             return errors;
         }
         else if (first.is('magic-word')) {

package/dist/src/transclude.js

@@ -66,7 +66,7 @@ class TranscludeToken extends index_1.Token {
                 if (fullWidth) {
                     this.#colon = '：';
                 }
-                const pattern = new RegExp(String.raw `^\s*${name}\s*$`, isSensitive ? 'u' : 'iu'), token = new syntax_1.SyntaxToken(magicWord, pattern, 'magic-word-name', config, accum, {});
+                const token = new syntax_1.SyntaxToken(magicWord, 'magic-word-name', config, accum);
                 super.insertAt(token);
                 if (arg !== false) {
                     parts.unshift([arg]);
@@ -85,7 +85,7 @@ class TranscludeToken extends index_1.Token {
         }
         if (this.type === 'template') {
             const name = (0, string_1.removeComment)(title).trim();
-            if (!this.normalizeTitle(name, 10, true, true).valid) {
+            if (!this.normalizeTitle(name, 10, { halfParsed: true, temporary: true }).valid) {
                 accum.pop();
                 throw new SyntaxError('Invalid template name');
             }
@@ -144,7 +144,7 @@ class TranscludeToken extends index_1.Token {
     }
     /** 获取模板或模块名 */
     #getTitle() {
-        const isTemplate = this.type === 'template', title = this.normalizeTitle(this.childNodes[isTemplate ? 0 : 1].toString(true), isTemplate ? 10 : 828, true);
+        const isTemplate = this.type === 'template', title = this.normalizeTitle(this.childNodes[isTemplate ? 0 : 1].toString(true), isTemplate ? 10 : 828, { temporary: true });
         return title;
     }
     /**

package/dist/util/debug.js

@@ -37,7 +37,14 @@ exports.isToken = isToken;
  * @param inserted 插入的子节点
  */
 const setChildNodes = (parent, position, deleteCount, inserted = []) => {
-    const nodes = parent.getChildNodes(), removed = nodes.splice(position, deleteCount, ...inserted);
+    let nodes = parent.getChildNodes(), removed;
+    if (nodes.length === deleteCount) {
+        removed = nodes;
+        nodes = inserted;
+    }
+    else {
+        removed = nodes.splice(position, deleteCount, ...inserted);
+    }
     for (let i = 0; i < inserted.length; i++) {
         const node = inserted[i];
         node.setAttribute('parentNode', parent);
@@ -46,6 +53,9 @@ const setChildNodes = (parent, position, deleteCount, inserted = []) => {
     }
     nodes[position - 1]?.setAttribute('nextSibling', nodes[position]);
     nodes[position + inserted.length]?.setAttribute('previousSibling', nodes[position + inserted.length - 1]);
+    if (nodes === inserted) {
+        parent.setAttribute('childNodes', nodes);
+    }
     return removed;
 };
 exports.setChildNodes = setChildNodes;

package/dist/util/string.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.noWrap = exports.decodeNumber = exports.decodeHtml = exports.text = exports.escapeRegExp = exports.removeComment = exports.tidy = exports.extUrlChar = exports.extUrlCharFirst = exports.zs = exports.rawurldecode = void 0;
+exports.noWrap = exports.decodeNumber = exports.decodeHtml = exports.decodeHtmlBasic = exports.text = exports.escapeRegExp = exports.removeComment = exports.tidy = exports.extUrlChar = exports.extUrlCharFirst = exports.zs = exports.rawurldecode = void 0;
 var common_1 = require("@bhsd/common");
 Object.defineProperty(exports, "rawurldecode", { enumerable: true, get: function () { return common_1.rawurldecode; } });
 exports.zs = String.raw ` \xA0\u1680\u2000-\u200A\u202F\u205F\u3000`;
@@ -27,9 +27,8 @@ exports.escapeRegExp = factory(/[\\{}()|.?*+^$[\]]/gu, String.raw `\$&`);
 const text = (childNodes, separator = '') => childNodes.map(child => typeof child === 'string' ? child : child.text()).join(separator);
 exports.text = text;
 const names = { lt: '<', gt: '>', lbrack: '[', rbrack: ']', lbrace: '{', rbrace: '}', nbsp: ' ', amp: '&', quot: '"' };
-/* istanbul ignore next */
 /** decode HTML entities */
-const decodeHtmlBasic = factory(/&(?:#(\d+|[Xx][\da-fA-F]+)|([lg]t|[LG]T|[lr]brac[ke]|nbsp|amp|AMP|quot|QUOT));/gu, (_, code, name) => code
+exports.decodeHtmlBasic = factory(/&(?:#(\d+|[Xx][\da-fA-F]+)|([lg]t|[LG]T|[lr]brac[ke]|nbsp|amp|AMP|quot|QUOT));/gu, (_, code, name) => code
     ? String.fromCodePoint(Number((/^x/iu.test(code) ? '0' : '') + code))
     : names[name.toLowerCase()]);
 /**
@@ -48,7 +47,7 @@ const decodeHtml = (str) => {
     }
     /* istanbul ignore next */
     /* NOT FOR BROWSER ONLY END */
-    return decodeHtmlBasic(str);
+    return (0, exports.decodeHtmlBasic)(str);
 };
 exports.decodeHtml = decodeHtml;
 /** decode numbered HTML entities */

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wikilint",
-	"version": "2.18.2",
+	"version": "2.18.3",
 	"description": "A Node.js linter for MediaWiki markup",
 	"keywords": [
 		"mediawiki",
@@ -65,7 +65,7 @@
 		]
 	},
 	"dependencies": {
-		"@bhsd/common": "^0.8.1",
+		"@bhsd/common": "^0.9.0",
 		"vscode-languageserver-types": "^3.17.5"
 	},
 	"optionalDependencies": {