wikiparser-node 1.35.1 → 1.36.0

package/dist/index.js

@@ -24,10 +24,17 @@ const re = new RegExp(String.raw `^https?:\/\/([^./]+)\.(${common_1.wmf})\.org`,
  * 从根路径require
  * @param file 文件名
  * @param dir 子路径
+ * @throws {RangeError} 仅支持JSON文件
  */
-const rootRequire = (file, dir) => require(path_1.default.isAbsolute(file)
-    ? /* c8 ignore next */ file
-    : path_1.default.join('..', file.includes('/') ? '' : dir, file));
+const rootRequire = (file, dir) => {
+    const fullPath = require.resolve(path_1.default.isAbsolute(file)
+        ? /* c8 ignore next */ file
+        : path_1.default.join('..', file.includes('/') ? '' : dir, file));
+    if (!fullPath.endsWith('.json')) {
+        throw new RangeError('Only JSON files are supported!');
+    }
+    return require(fullPath);
+};
 /* NOT FOR BROWSER ONLY END */
 let viewOnly = false;
 /* NOT FOR BROWSER */
@@ -333,7 +340,6 @@ const Parser = {
     },
     /** @implements */
     callParserFunction(name, arg, ...args) {
-        const { expandMagicWord } = require('./render/magicWords');
         if (typeof arg === 'string') {
             args.unshift(arg);
         }
@@ -349,9 +355,9 @@ const Parser = {
                 args.push(`${key}=${value}`);
             }
         }
-        const { parserFunction } = this.getConfig(), [lcName, canonicalName] = (0, debug_1.getCanonicalName)(name, parserFunction);
+        const { parserFunction } = this.getConfig(), [lcName, canonicalName] = (0, debug_1.getCanonicalName)(name, parserFunction), custom = constants_1.functionHooks.has(lcName);
         let result;
-        if (constants_1.functionHooks.has(lcName)) {
+        if (custom) {
             if (!canonicalName) {
                 const [insensitive, sensitive] = parserFunction, entry = Object.entries(sensitive).find(([, v]) => v === lcName)
                     || Object.entries(insensitive).find(([, v]) => v === lcName);
@@ -366,11 +372,12 @@ const Parser = {
                 && constants_1.functionHooks.get(lcName)(firstChild);
         }
         else {
+            const { expandMagicWord } = require('./render/magicWords');
             result = expandMagicWord(lcName, args);
         }
         /* c8 ignore next 3 */
         if (result === false) {
-            throw new RangeError(`Unable to resolve parser function: ${name}`);
+            throw new RangeError(`Unable to resolve ${custom ? 'custom' : 'built-in'} parser function: ${name}`);
         }
         return result;
     },
@@ -438,8 +445,15 @@ const Parser = {
         if (!main) {
             throw new RangeError(`找不到对应时间戳的错误记录：${date}`);
         }
-        const file = path_1.default.join(dir, main), wikitext = fs_1.default.readFileSync(file, 'utf8');
-        const { stage, include, config, page } = require(`${file}.json`), { Token } = require('./src/index');
+        const { Token } = require('./src/index');
+        const file = path_1.default.join(dir, main), wikitext = fs_1.default.readFileSync(file, 'utf8'), { stage = constants_1.MAX_STAGE, include, config, page } = (() => {
+            try {
+                return require(`${file}.json`);
+            }
+            catch {
+                return {};
+            }
+        })();
         debug_1.Shadow.run(() => {
             const halfParsed = stage < constants_1.MAX_STAGE, token = new Token(halfParsed ? wikitext : (0, string_1.tidy)(wikitext), config);
             token.type = 'root';
@@ -452,8 +466,8 @@ const Parser = {
                 token.parse(undefined, include);
             }
             fs_1.default.unlinkSync(file);
-            fs_1.default.unlinkSync(`${file}.err`);
-            fs_1.default.unlinkSync(`${file}.json`);
+            fs_1.default.rmSync(`${file}.err`, { force: true });
+            fs_1.default.rmSync(`${file}.json`, { force: true });
         }, this);
     },
     /* c8 ignore stop */

package/dist/lib/lintConfig.js

@@ -239,14 +239,12 @@ const defaultLintRuleConfig = {
     ],
     'invalid-math': 2,
 };
-Object.freeze(defaultLintRuleConfig);
 const defaultLintConfig = {
     configurationComment: 'lint',
     ignoreDisables: false,
     fix: true,
     computeEditInfo: true,
 };
-Object.freeze(defaultLintConfig);
 /**
  * 验证错误级别是否符合规范
  * @param severity 错误级别

package/dist/lib/node.d.ts

@@ -1,4 +1,4 @@
-import type { LintError, AstNode as AstNodeBase, TokenTypes } from '../base';
+import type { AstNode as AstNodeBase, TokenTypes, LintError } from '../base';
 import type { NodeLike } from '../mixin/nodeLike';
 import type { AstText, Token } from '../internal';
 export type AstNodes = AstText | Token;

package/dist/lib/text.js

@@ -54,8 +54,8 @@ const cached_1 = require("../mixin/cached");
 /* NOT FOR BROWSER END */
 const sp = /* #__PURE__ */ (() => String.raw `[${string_1.zs}\t]*`)(), source = /* #__PURE__ */ (() => String.raw `<(?:/[^\S\n]*)?([a-z]\w*)|\{+|\}+|\[{2,}|\[(?![^[]*?\])|((?:^|\])[^[]*?)\]+|\n={2,}`)();
 // eslint-disable-next-line @typescript-eslint/no-unused-expressions
-/https?[:/]\/+|(?:rfc|pmid)(?=[-:：]?\s*\d)|isbn(?=[-:：]?\s*(?:\d(?:\s*|-)){6})/giu;
-const errorSyntax = /* #__PURE__ */ (() => new RegExp(String.raw `${source}|https?[:/]/+|(?:rfc|pmid)(?=[-:：]?${sp}\d)|isbn(?=[-:：]?${sp}(?:\d(?:${sp}|-)){6})`, 'giu'))();
+/\bhttps?[:/]\/+|\b(?:rfc|pmid)(?=[-:：]?\s*\d)|\bisbn(?=[-:：]?\s*(?:\d(?:\s*|-)){6})/giu;
+const errorSyntax = /* #__PURE__ */ (() => new RegExp(String.raw `${source}|\bhttps?[:/]/+|\b(?:rfc|pmid)(?=[-:：]?${sp}\d)|\bisbn(?=[-:：]?${sp}(?:\d(?:${sp}|-)){6})`, 'giu'))();
 // eslint-disable-next-line @typescript-eslint/no-unused-expressions
 /<(?:\/[^\S\n]*)?([a-z]\w*)|\{+|\}+|\[{2,}|\[(?![^[]*?\])|((?:^|\])[^[]*?)\]+|\n={2,}/giu;
 const errorSyntaxUrl = /* #__PURE__ */ new RegExp(source, 'giu'), noLinkTypes = new Set(['attr-value', 'ext-link-text', 'link-text']), regexes = {

package/dist/lib/title.js

@@ -300,10 +300,10 @@ class Title {
         if (!valid || ns !== 6 || interwiki) {
             throw new Error('Title.getFileUrl method is only for files!');
         }
-        const { expandMagicWord } = require('../render/magicWords');
         if (height) {
             width ||= 1e4;
         }
+        const { expandMagicWord } = require('../render/magicWords');
         return expandMagicWord('filepath', [main, `${width || ''}${height ? `x${height}` : ''}`]);
     }
     /** @private */

package/dist/src/index.d.ts

@@ -1,7 +1,7 @@
 import Parser from '../index';
 import { AstElement } from '../lib/element';
 import { AstText } from '../lib/text';
-import type { LintError, TokenTypes } from '../base';
+import type { TokenTypes, LintError } from '../base';
 import type { Title, TitleOptions } from '../lib/title';
 import type { AstNodes, IncludeToken, HtmlToken, ExtToken, CommentToken } from '../internal';
 import { Ranges } from '../lib/ranges';

package/dist/src/nowiki/comment.d.ts

@@ -1,5 +1,5 @@
 import { NowikiBaseToken } from './base';
-import type { LintError, Config } from '../../base';
+import type { Config, LintError } from '../../base';
 import type { Token } from '../../internal';
 /**
  * invisible HTML comment

package/dist/src/parameter.d.ts

@@ -1,6 +1,6 @@
 import { Token } from './index';
 import type { Config, LintError, AST } from '../base';
-import type { AtomToken, SyntaxToken, TranscludeToken } from '../internal';
+import type { AtomToken, TranscludeToken, SyntaxToken } from '../internal';
 /**
  * template or magic word parameter
  *

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/extensions/dist/base.js

@@ -1,6 +1,6 @@
 (() => {
 var _a;
-const version = '1.35.1', 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.36.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 = () => {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wikiparser-node",
-	"version": "1.35.1",
+	"version": "1.36.0",
 	"description": "A Node.js parser for MediaWiki markup with AST",
 	"keywords": [
 		"mediawiki",
@@ -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",
@@ -93,43 +94,43 @@
 		"mathoid-texvcjs": "^0.6.0",
 		"prism-wiki": "^1.3.0",
 		"prismjs": "^1.30.0",
-		"stylelint": "^17.1.1",
-		"vscode-css-languageservice": "^6.3.9",
-		"vscode-html-languageservice": "^5.6.1",
-		"vscode-json-languageservice": "^5.7.1"
+		"stylelint": "^17.4.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.0",
-		"@bhsd/nodejs": "^0.1.0",
+		"@bhsd/code-standard": "^2.1.0",
+		"@bhsd/nodejs": "^0.1.1",
 		"@bhsd/test-util": "^0.3.0",
-		"@codemirror/lint": "^6.9.3",
+		"@codemirror/lint": "^6.9.4",
 		"@eslint/markdown": "^7.5.1",
-		"@stylistic/eslint-plugin": "^5.7.1",
+		"@stylistic/eslint-plugin": "^5.9.0",
 		"@types/color-name": "^2.0.0",
 		"@types/color-rgba": "^2.1.3",
 		"@types/mocha": "^10.0.10",
-		"@types/node": "^24.10.11",
-		"@types/prismjs": "^1.26.5",
+		"@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",
+		"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.2",
+		"eslint": "^9.39.3",
 		"eslint-plugin-eslint-comments": "^3.2.0",
-		"eslint-plugin-jsdoc": "^62.5.3",
-		"eslint-plugin-jsonc": "^2.21.0",
-		"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-unicorn": "^62.0.0",
-		"markdownlint-cli2": "^0.20.0",
+		"eslint-plugin-unicorn": "^63.0.0",
+		"markdownlint-cli2": "^0.21.0",
 		"mocha": "^11.7.5",
 		"monaco-editor": "^0.55.1",
 		"typescript": "^5.9.3",
-		"v8r": "^5.1.0",
+		"v8r": "^6.0.0",
 		"vscode-languageserver-textdocument": "^1.0.12"
 	},
 	"engines": {