wikiparser-node 1.35.2 → 1.37.0

package/dist/src/parameter.js

@@ -82,11 +82,10 @@ let ParameterToken = (() => {
         /* PRINT ONLY */
         /** whether to be a duplicated parameter / 是否是重复参数 */
         get duplicated() {
-            LSP: try {
-                return Boolean(this.parentNode?.getDuplicatedArgs().some(([key]) => key === this.name));
-            }
-            catch {
-                return false;
+            LSP: {
+                const { parentNode, name } = this;
+                return Boolean(parentNode?.isTemplate())
+                    && parentNode.getArgs(name, false, false).size > 1;
             }
         }
         /* PRINT ONLY END */

package/dist/src/tagPair/include.d.ts

@@ -1,5 +1,5 @@
 import { TagPairToken } from './index';
-import type { LintError, Config } from '../../base';
+import type { Config, LintError } from '../../base';
 import type { AstText, Token } from '../../internal';
 /**
  * `<includeonly>`, `<noinclude>` or `<onlyinclude>`

package/dist/src/transclude.d.ts

@@ -42,6 +42,13 @@ export declare abstract class TranscludeToken extends Token {
     /** whether to contain duplicated parameters / 是否存在重复参数 */
     get duplication(): boolean;
     set duplication(duplication: boolean);
+    /**
+     * number of anonymous parameters
+     *
+     * 匿名参数的个数
+     * @since v1.36.0
+     */
+    get anonCount(): number;
     /**
      * @param title 模板标题或魔术字
      * @param parts 参数各部分
@@ -67,18 +74,6 @@ export declare abstract class TranscludeToken extends Token {
      * @param i position to be inserted at / 插入位置
      */
     insertAt<T extends ParameterToken>(token: T, i?: number): T;
-    /**
-     * Get all parameters
-     *
-     * 获取所有参数
-     */
-    getAllArgs(): ParameterToken[];
-    /**
-     * Get all anonymous parameters
-     *
-     * 获取所有匿名参数
-     */
-    getAnonArgs(): ParameterToken[];
     /**
      * Get parameters with the specified name
      *
@@ -86,8 +81,9 @@ export declare abstract class TranscludeToken extends Token {
      * @param key parameter name / 参数名
      * @param exact whether to match anonymosity / 是否匹配匿名性
      * @param copy whether to return a copy / 是否返回一个备份
+     * @param init whether to initialize during parsing / 是否在解析时进行初始化
      */
-    getArgs(key: string | number, exact?: boolean, copy?: boolean): Set<ParameterToken>;
+    getArgs(key: string | number, exact?: boolean, copy?: boolean, init?: boolean): Set<ParameterToken>;
     /**
      * Get duplicated parameters
      *
@@ -120,6 +116,18 @@ export declare abstract class TranscludeToken extends Token {
      * @param i position of the child node / 移除位置
      */
     removeAt(i: number): ParameterToken;
+    /**
+     * Get all parameters
+     *
+     * 获取所有参数
+     */
+    getAllArgs(): ParameterToken[];
+    /**
+     * Get all anonymous parameters
+     *
+     * 获取所有匿名参数
+     */
+    getAnonArgs(): ParameterToken[];
     /**
      * Check if there is a parameter with the specified name
      *

package/dist/src/transclude.js

@@ -83,6 +83,7 @@ let TranscludeToken = (() => {
         #colon = ':';
         #raw = false;
         #args = new Map();
+        #anonCount = 0;
         #title;
         /* NOT FOR BROWSER */
         #keys = new Set();
@@ -121,6 +122,15 @@ let TranscludeToken = (() => {
                 this.fixDuplication();
             }
         }
+        /**
+         * number of anonymous parameters
+         *
+         * 匿名参数的个数
+         * @since v1.36.0
+         */
+        get anonCount() {
+            return this.#anonCount;
+        }
         /* NOT FOR BROWSER END */
         /**
          * @param title 模板标题或魔术字
@@ -392,23 +402,44 @@ let TranscludeToken = (() => {
                 return errors;
             }
         }
-        /**
-         * 处理匿名参数更改
-         * @param addedToken 新增的参数
-         */
-        #handleAnonArgChange(addedToken) {
-            const args = this.getAnonArgs(), added = typeof addedToken !== 'number';
+        #handleAnonArgChange(addedToken, append) {
             /* NOT FOR BROWSER */
-            const maxAnon = String(args.length + (added ? 0 : 1));
-            if (added) {
+            const removing = typeof addedToken === 'number';
+            /* NOT FOR BROWSER END */
+            /* eslint-disable @stylistic/operator-linebreak */
+            this.#anonCount +=
+                removing ?
+                    -1 :
+                    1;
+            /* eslint-enable @stylistic/operator-linebreak */
+            /* NOT FOR BROWSER */
+            const maxAnon = String(this.#anonCount + (removing ? 1 : 0));
+            if (!removing) {
                 this.#keys.add(maxAnon);
             }
             else if (!this.hasArg(maxAnon, true)) {
                 this.#keys.delete(maxAnon);
             }
+            let args;
             /* NOT FOR BROWSER END */
-            for (let i = added ? args.indexOf(addedToken) : addedToken - 1; i < args.length; i++) {
-                const token = args[i], { name } = token, newName = String(i + 1);
+            let i;
+            if (append) {
+                i = this.#anonCount - 1;
+                /* NOT FOR BROWSER */
+            }
+            else {
+                args = this.getAnonArgs();
+                i = removing ? addedToken - 1 : args.indexOf(addedToken);
+            }
+            for (; i < this.#anonCount; i++) {
+                /* NOT FOR BROWSER END */
+                const token = 
+                /* eslint-disable @stylistic/operator-linebreak, unicorn/no-negated-condition */
+                !append ?
+                    args[i] :
+                    addedToken, 
+                /* eslint-enable @stylistic/operator-linebreak, unicorn/no-negated-condition */
+                { name } = token, newName = String(i + 1);
                 if (name !== newName || token === addedToken) {
                     token.setAttribute('name', newName);
                     this.getArgs(newName, false, false).add(token);
@@ -427,7 +458,7 @@ let TranscludeToken = (() => {
         insertAt(token, i = this.length) {
             super.insertAt(token, i);
             if (token.anon) {
-                this.#handleAnonArgChange(token);
+                this.#handleAnonArgChange(token, i === this.length - 1);
             }
             else if (token.name) {
                 this.getArgs(token.name, false, false).add(token);
@@ -436,22 +467,6 @@ let TranscludeToken = (() => {
             }
             return token;
         }
-        /**
-         * Get all parameters
-         *
-         * 获取所有参数
-         */
-        getAllArgs() {
-            return this.childNodes.filter((0, debug_1.isToken)('parameter'));
-        }
-        /**
-         * Get all anonymous parameters
-         *
-         * 获取所有匿名参数
-         */
-        getAnonArgs() {
-            return this.getAllArgs().filter(({ anon }) => anon);
-        }
         /**
          * Get parameters with the specified name
          *
@@ -459,8 +474,9 @@ let TranscludeToken = (() => {
          * @param key parameter name / 参数名
          * @param exact whether to match anonymosity / 是否匹配匿名性
          * @param copy whether to return a copy / 是否返回一个备份
+         * @param init whether to initialize during parsing / 是否在解析时进行初始化
          */
-        getArgs(key, exact, copy = true) {
+        getArgs(key, exact, copy = true, init = true) {
             const keyStr = String(key)
                 .replace(/^[ \t\n\0\v]+|([^ \t\n\0\v])[ \t\n\0\v]+$/gu, '$1');
             let args;
@@ -468,7 +484,7 @@ let TranscludeToken = (() => {
                 args = this.#args.get(keyStr);
             }
             else {
-                args = new Set(this.getAllArgs().filter(({ name }) => keyStr === name));
+                args = new Set(init ? [] : this.getAllArgs().filter(({ name }) => keyStr === name));
                 this.#args.set(keyStr, args);
             }
             /* NOT FOR BROWSER */
@@ -618,6 +634,23 @@ let TranscludeToken = (() => {
             }
             return token;
         }
+        /**
+         * Get all parameters
+         *
+         * 获取所有参数
+         */
+        getAllArgs() {
+            const { childNodes } = this, i = childNodes.findIndex(({ type }) => type === 'parameter');
+            return i === -1 ? [] : childNodes.slice(i);
+        }
+        /**
+         * Get all anonymous parameters
+         *
+         * 获取所有匿名参数
+         */
+        getAnonArgs() {
+            return this.getAllArgs().filter(({ anon }) => anon);
+        }
         /**
          * Check if there is a parameter with the specified name
          *
@@ -626,7 +659,7 @@ let TranscludeToken = (() => {
          * @param exact whether to match anonymosity / 是否匹配匿名性
          */
         hasArg(key, exact) {
-            return this.getArgs(key, exact, false).size > 0;
+            return this.getArgs(key, exact, false, false).size > 0;
         }
         /**
          * Get the effective parameter with the specified name

package/dist/util/constants.js

@@ -1,7 +1,7 @@
 "use strict";
 /* NOT FOR BROWSER */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.tagHooks = exports.functionHooks = exports.states = exports.aliases = exports.parsers = exports.mixins = exports.classes = exports.mathTags = exports.extensions = exports.galleryParams = exports.enMsg = exports.BuildMethod = exports.MAX_STAGE = void 0;
+exports.tagHooks = exports.functionHooks = exports.states = exports.aliases = exports.parsers = exports.mixins = exports.classes = exports.mathTags = exports.jsonTags = exports.extensions = exports.galleryParams = exports.enMsg = exports.BuildMethod = exports.MAX_STAGE = void 0;
 /* NOT FOR BROWSER END */
 exports.MAX_STAGE = 11;
 var BuildMethod;
@@ -15,6 +15,7 @@ exports.enMsg = (() => {
 })();
 exports.galleryParams = new Set(['alt', 'link', 'lang', 'page', 'caption']);
 exports.extensions = new Set(['tiff', 'tif', 'png', 'gif', 'jpg', 'jpeg', 'webp', 'xcf', 'pdf', 'svg', 'djvu']);
+exports.jsonTags = ['templatedata', 'mapframe', 'maplink'];
 /* NOT FOR BROWSER ONLY */
 exports.mathTags = new Set(['math', 'chem', 'ce']);
 /* NOT FOR BROWSER ONLY END */

package/dist/util/diff.js

@@ -18,40 +18,42 @@ process.on('unhandledRejection', e => {
  * @param args shell输入参数
  */
 const cmd = (command, args) => new Promise(resolve => {
-    let timer, shell;
-    /**
-     * 清除进程并返回
-     * @param val 返回值
-     */
-    const r = (val) => {
-        clearTimeout(timer);
-        shell?.kill('SIGINT');
-        resolve(val);
-    };
-    try {
-        shell = (0, child_process_1.spawn)(command, args);
-        timer = setTimeout(() => {
-            /* c8 ignore next */
-            shell.kill('SIGINT');
-        }, 60 * 1e3);
-        let buf = '';
-        shell.stdout.on('data', data => {
-            buf += String(data);
-        });
-        shell.stdout.on('end', () => {
-            r(buf);
-        });
-        shell.on('exit', () => {
-            r(shell.killed ? undefined : '');
-        });
-        shell.on('error', () => {
+    NPM: {
+        let timer, shell;
+        /**
+         * 清除进程并返回
+         * @param val 返回值
+         */
+        const r = (val) => {
+            clearTimeout(timer);
+            shell?.kill('SIGINT');
+            resolve(val);
+        };
+        try {
+            shell = (0, child_process_1.spawn)(command, args);
+            timer = setTimeout(() => {
+                /* c8 ignore next */
+                shell.kill('SIGINT');
+            }, 60 * 1e3);
+            let buf = '';
+            shell.stdout.on('data', data => {
+                buf += String(data);
+            });
+            shell.stdout.on('end', () => {
+                r(buf);
+            });
+            shell.on('exit', () => {
+                r(shell.killed ? undefined : '');
+            });
+            shell.on('error', () => {
+                r(undefined);
+            });
+        }
+        catch /* c8 ignore start */ {
             r(undefined);
-        });
+        }
+        /* c8 ignore stop */
     }
-    catch /* c8 ignore start */ {
-        r(undefined);
-    }
-    /* c8 ignore stop */
 });
 exports.cmd = cmd;
 /* c8 ignore start */
@@ -62,37 +64,37 @@ exports.cmd = cmd;
  * @param uid 唯一标识
  */
 const diff = async (oldStr, newStr, uid) => {
-    if (oldStr === newStr) {
-        return;
+    NPM: {
+        if (oldStr === newStr) {
+            return;
+        }
+        const oldFile = `diffOld${uid}`, newFile = `diffNew${uid}`;
+        await Promise.all([promises_1.default.writeFile(oldFile, oldStr), promises_1.default.writeFile(newFile, newStr)]);
+        const stdout = await (0, exports.cmd)('git', [
+            'diff',
+            '--color-words=[\xC0-\xFF][\x80-\xBF]+|<?/?\\w+/?>?|[^[:space:]]',
+            '-U0',
+            '--no-index',
+            oldFile,
+            newFile,
+        ]);
+        console.log(stdout?.split('\n').slice(4).join('\n'));
+        await Promise.allSettled([promises_1.default.unlink(oldFile), promises_1.default.unlink(newFile)]);
     }
-    const oldFile = `diffOld${uid}`, newFile = `diffNew${uid}`;
-    await Promise.all([promises_1.default.writeFile(oldFile, oldStr), promises_1.default.writeFile(newFile, newStr)]);
-    const stdout = await (0, exports.cmd)('git', [
-        'diff',
-        '--color-words=[\xC0-\xFF][\x80-\xBF]+|<?/?\\w+/?>?|[^[:space:]]',
-        '-U0',
-        '--no-index',
-        oldFile,
-        newFile,
-    ]);
-    console.log(stdout?.split('\n').slice(4).join('\n'));
-    await Promise.allSettled([promises_1.default.unlink(oldFile), promises_1.default.unlink(newFile)]);
 };
 exports.diff = diff;
 /* c8 ignore stop */
 /* c8 ignore start */
 /** @implements */
 const error = (msg, ...args) => {
-    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-    console.error(util_1.default.styleText?.('red', msg) ?? msg, ...args);
+    console.error(util_1.default.styleText('red', msg), ...args);
 };
 exports.error = error;
 /* c8 ignore stop */
 /* c8 ignore start */
 /** @implements */
 const info = (msg, ...args) => {
-    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-    console.info(util_1.default.styleText?.('green', msg) ?? msg, ...args);
+    NPM: console.info(util_1.default.styleText('green', msg), ...args);
 };
 exports.info = info;
 /* c8 ignore stop */

package/extensions/dist/base.js

@@ -1,6 +1,6 @@
 (() => {
 var _a;
-const version = '1.35.2', src = (_a = document.currentScript) === null || _a === void 0 ? void 0 : _a.src, file = /\/extensions\/dist\/base\.(?:min\.)?js$/u, CDN = src && file.test(src)
+const version = '1.37.0', src = (_a = document.currentScript) === null || _a === void 0 ? void 0 : _a.src, file = /\/extensions\/dist\/base\.(?:min\.)?js$/u, CDN = src && file.test(src)
     ? src.replace(file, '')
     : `https://fastly.jsdelivr.net/npm/wikiparser-node@${version}`;
 const workerJS = () => {
@@ -226,11 +226,11 @@ const workerJS = () => {
                     getLSP(qid).findStyleTokens().map(token => token.json(undefined, 2)),
                 ]);
                 break;
-            case 'findTemplateTokens':
+            case 'querySelectorAll':
                 postMessage([
                     command,
                     qid,
-                    getLSP(qid).findTemplateTokens().map(token => token.json(undefined, 1)),
+                    getLSP(qid).querySelectorAll(wikitext).map(node => node.json(undefined, include)),
                 ]);
         }
     };
@@ -264,7 +264,7 @@ const getConfig = () => getFeedback('getConfig', -3);
 const json = (wikitext, include, qid = -4, stage) => getFeedback('json', qid, false, wikitext, include, stage);
 const print = (wikitext, include, stage, qid = -1) => getFeedback('print', qid, false, wikitext, include, stage);
 const lint = (wikitext, include, qid = -2) => getFeedback('lint', qid, true, wikitext, include);
-const provide = (command, qid, wikitext, ...args) => getFeedback(command, qid, typeof wikitext === 'string', wikitext, ...args);
+const provide = (command, qid, wikitext, ...args) => getFeedback(command, qid, typeof wikitext === 'string' && command !== 'querySelectorAll', wikitext, ...args);
 const append = (parent, text) => {
     if (text) {
         parent.append(text);

package/extensions/dist/lsp.js

@@ -74,11 +74,14 @@ class LanguageService {
     resolveCodeAction(rule = '') {
         return wikiparse.provide('resolveCodeAction', __classPrivateFieldGet(this, _LanguageService_id, "f"), rule, __classPrivateFieldGet(this, _LanguageService_include, "f"));
     }
+    querySelectorAll(selector, depth) {
+        return wikiparse.provide('querySelectorAll', __classPrivateFieldGet(this, _LanguageService_id, "f"), selector, depth);
+    }
     findStyleTokens() {
         return wikiparse.provide('findStyleTokens', __classPrivateFieldGet(this, _LanguageService_id, "f"));
     }
     findTemplateTokens() {
-        return wikiparse.provide('findTemplateTokens', __classPrivateFieldGet(this, _LanguageService_id, "f"));
+        return this.querySelectorAll('template', 1);
     }
 }
 _LanguageService_id = new WeakMap(), _LanguageService_include = new WeakMap(), _LanguageService_hasData = new WeakMap(), _LanguageService_instances = new WeakSet(), _LanguageService_loadData = async function _LanguageService_loadData() {

package/extensions/editor.css

@@ -3,7 +3,7 @@
 	display: block;
 	box-sizing: border-box;
 	width: 100%;
-	resize: vertical; /* stylelint-disable-line plugin/use-baseline */
+	resize: vertical;
 	font-family: monospace;
 	background: none !important;
 	caret-color: #000;

package/extensions/typings.d.ts

@@ -43,6 +43,7 @@ export interface LanguageServiceBase extends Omit<
 	provideDocumentColors(text: string): Promise<ColorInformation[]>;
 	provideColorPresentations(color: ColorInformation): Promise<ColorPresentation[]>;
 	resolveCodeAction(rule?: string): Promise<CodeAction>;
+	querySelectorAll(selector: string): Promise<AST[]>;
 	findStyleTokens(): Promise<AST[]>;
 	findTemplateTokens(): Promise<AST[]>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wikiparser-node",
-	"version": "1.35.2",
+	"version": "1.37.0",
 	"description": "A Node.js parser for MediaWiki markup with AST",
 	"keywords": [
 		"mediawiki",
@@ -12,7 +12,7 @@
 	"bugs": {
 		"url": "https://github.com/bhsd-harry/wikiparser-node/issues"
 	},
-	"license": "GPL-3.0",
+	"license": "GPL-3.0-or-later",
 	"author": "Bhsd",
 	"files": [
 		"/bundle/bundle*.js",
@@ -62,6 +62,7 @@
 		"test:unit": "mocha dist/test/test.js",
 		"test:clonenode": "CLONENODE=1 npm run test:unit",
 		"test:parser": "LC_ALL=en.UTF-8 mocha dist/test/parserTests.js",
+		"test:perf": "mocha --reporter spec dist/test/perf.js",
 		"test": "npm run test:unit && npm run test:clonenode && npm run test:parser",
 		"test:parseronly": "LSP=0 npm run test:parser",
 		"test:ci": "LSP=0 npm test",
@@ -81,58 +82,58 @@
 		]
 	},
 	"dependencies": {
-		"@bhsd/cm-util": "^0.1.0",
-		"@bhsd/common": "^1.3.1",
+		"@bhsd/cm-util": "^1.0.0",
+		"@bhsd/common": "^2.0.0",
 		"@bhsd/stylelint-util": "^1.0.1",
 		"binary-search": "^1.3.6",
 		"vscode-languageserver-types": "^3.17.5"
 	},
 	"optionalDependencies": {
 		"color-name": "^2.0.0",
-		"entities": "^7.0.1",
+		"entities": "^8.0.0",
 		"mathoid-texvcjs": "^0.6.0",
-		"prism-wiki": "^1.3.0",
+		"prism-wiki": "^2.0.0",
 		"prismjs": "^1.30.0",
-		"stylelint": "^17.3.0",
-		"vscode-css-languageservice": "^6.3.9",
-		"vscode-html-languageservice": "^5.6.1",
-		"vscode-json-languageservice": "^5.7.1"
+		"stylelint": "^17.5.0",
+		"vscode-css-languageservice": "^6.3.10",
+		"vscode-html-languageservice": "^5.6.2",
+		"vscode-json-languageservice": "^5.7.2"
 	},
 	"devDependencies": {
-		"@bhsd/code-standard": "^2.0.1",
-		"@bhsd/nodejs": "^0.1.0",
-		"@bhsd/test-util": "^0.3.0",
-		"@codemirror/lint": "^6.9.4",
+		"@bhsd/code-standard": "^2.1.1",
+		"@bhsd/nodejs": "^1.0.0",
+		"@bhsd/test-util": "^0.4.0",
+		"@codemirror/lint": "^6.9.5",
 		"@eslint/markdown": "^7.5.1",
-		"@stylistic/eslint-plugin": "^5.8.0",
+		"@stylistic/eslint-plugin": "^5.10.0",
 		"@types/color-name": "^2.0.0",
 		"@types/color-rgba": "^2.1.3",
 		"@types/mocha": "^10.0.10",
-		"@types/node": "^24.10.13",
+		"@types/node": "^24.11.0",
 		"@types/prismjs": "^1.26.6",
-		"@typescript-eslint/eslint-plugin": "^8.54.0",
-		"@typescript-eslint/parser": "^8.54.0",
-		"c8": "^10.1.3",
+		"@typescript-eslint/eslint-plugin": "^8.57.0",
+		"@typescript-eslint/parser": "^8.57.0",
+		"c8": "^11.0.0",
 		"codejar-async": "^4.3.0",
 		"color-rgba": "^3.0.0",
 		"diff2html-cli": "^5.2.15",
-		"esbuild": "^0.27.3",
-		"eslint": "^9.39.3",
+		"esbuild": "^0.27.4",
+		"eslint": "^9.39.4",
 		"eslint-plugin-eslint-comments": "^3.2.0",
-		"eslint-plugin-jsdoc": "^62.7.0",
-		"eslint-plugin-jsonc": "^2.21.1",
-		"eslint-plugin-n": "^17.23.2",
+		"eslint-plugin-jsdoc": "^62.7.1",
+		"eslint-plugin-jsonc": "^3.1.1",
+		"eslint-plugin-n": "^17.24.0",
 		"eslint-plugin-promise": "^7.2.1",
-		"eslint-plugin-regexp": "^3.0.0",
+		"eslint-plugin-regexp": "^3.1.0",
 		"eslint-plugin-unicorn": "^63.0.0",
 		"markdownlint-cli2": "^0.21.0",
 		"mocha": "^11.7.5",
-		"monaco-editor": "^0.55.1",
+		"monaco-editor": "~0.53.0",
 		"typescript": "^5.9.3",
-		"v8r": "^5.1.0",
+		"v8r": "^6.0.0",
 		"vscode-languageserver-textdocument": "^1.0.12"
 	},
 	"engines": {
-		"node": ">=20.19.0"
+		"node": "^20.19.0 || ^22.13.0 || >=24.11.0"
 	}
 }