wikilint 2.35.2 → 2.37.0

package/LICENSE

@@ -1,3 +1,21 @@
+WikiLint
+Copyright (C) 2022  Bhsd
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+
+
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 

package/dist/bin/cli.js

@@ -78,16 +78,8 @@ const throwOnLintConfig = (config) => {
  * load lintConfig
  * @param file lintConfig file path
  */
-const loadLintConfig = async (file) => {
-    const symbol = Symbol('lintConfig');
-    let lintConfig = symbol;
-    try {
-        lintConfig = require(file);
-    }
-    catch { }
-    if (lintConfig === symbol) {
-        lintConfig = await import(file);
-    }
+const loadLintConfig = (file) => {
+    let lintConfig = require(file);
     if (lintConfig && typeof lintConfig === 'object' && 'default' in lintConfig) {
         lintConfig = lintConfig.default;
     }
@@ -292,42 +284,28 @@ config = (config.includes('/')
     ? path_1.default.resolve(index_1.default.config)
     : path_1.default.join(configPath, index_1.default.config)) + (config.endsWith('.json') ? '' : '.json');
 const { mtimeMs } = fs_1.default.statSync(config), obj = cache?.[include ? 'include' : 'noinclude'];
-let minimatch;
-try {
-    ({ minimatch } = require('minimatch'));
-}
-catch {
-    /* eslint-disable n/no-unsupported-features/node-builtins */
-    if (typeof path_1.default.matchesGlob !== 'function') {
-        exit('Cannot load Node.js package "minimatch"');
-    }
-    minimatch = path_1.default.matchesGlob.bind(path_1.default);
-    /* eslint-enable n/no-unsupported-features/node-builtins */
-}
 (async () => {
     if (lintConfigFile) {
         try {
-            index_1.default.lintConfig = await loadLintConfig(lintConfigFile);
+            index_1.default.lintConfig = loadLintConfig(lintConfigFile);
         }
         catch {
             exit(`Cannot load lint config file: ${lintConfigFile}`);
         }
     }
     else {
-        await (async () => {
-            let cur = process.cwd(), last;
-            while (last !== cur) {
-                for (const file of lintConfigDefaults) {
-                    try {
-                        index_1.default.lintConfig = await loadLintConfig(path_1.default.join(cur, file));
-                        return;
-                    }
-                    catch { }
+        let cur = process.cwd(), last;
+        while (last !== cur) {
+            for (const file of lintConfigDefaults) {
+                try {
+                    index_1.default.lintConfig = loadLintConfig(path_1.default.join(cur, file));
+                    return;
                 }
-                last = cur;
-                cur = path_1.default.dirname(cur);
+                catch { }
             }
-        })();
+            last = cur;
+            cur = path_1.default.dirname(cur);
+        }
     }
     index_1.default.lintConfig.computeEditInfo = false;
     index_1.default.lintConfig.fix = true;
@@ -338,7 +316,7 @@ catch {
             exiting = true;
             continue;
         }
-        else if (ignorePatterns.some(ignore => minimatch(file, ignore))) {
+        else if (ignorePatterns.some(ignore => path_1.default.matchesGlob(file, ignore))) {
             continue;
         }
         const fileCache = obj?.[file];

package/dist/bin/config.js

@@ -39,46 +39,7 @@ const filterGadget = (id) => {
     const n = Number(id);
     return n < 2300 || n > 2303; // Gadget, Gadget talk, Gadget definition, Gadget definition talk
 };
-/**
- * Execute the data script.
- * @param obj MediaWiki module implementation
- */
-const execute = (obj) => {
-    Object.entries(obj.files).find(([k]) => k.endsWith('.data.js'))[1]();
-};
-const mw = {
-    loader: {
-        done: false,
-        /** @ignore */
-        impl(callback) {
-            execute(callback()[1]);
-        },
-        /** @ignore */
-        implement(name, callback) {
-            if (typeof callback === 'object') {
-                execute(callback);
-            }
-            else if (!this.done) {
-                callback();
-            }
-            if (name.startsWith('ext.CodeMirror.data')) {
-                this.done = true;
-            }
-        },
-        /** @ignore */
-        state() {
-            //
-        },
-    },
-    config: {
-        /** @ignore */
-        set({ extCodeMirrorConfig }) {
-            mwConfig = extCodeMirrorConfig;
-        },
-    },
-};
-const pkg = "wikilint", version = "2.35.2";
-let mwConfig;
+const pkg = "wikilint", version = "2.37.0";
 /**
  * Get the parser configuration for a Wikimedia Foundation project.
  * @param site site nickname
@@ -122,15 +83,28 @@ exports.default = async (site, url, user, force, internal) => {
         siprop: 'general|magicwords|functionhooks|namespaces|namespacealiases',
         format: 'json',
         formatversion: '2',
-    }, { general: { articlepath, variants, langconversion }, magicwords, namespaces, namespacealiases, functionhooks, } = (await (await fetch(`${url}/api.php?${new URLSearchParams(params).toString()}`, headers)).json()).query;
-    try {
-        eval(m); // eslint-disable-line no-eval
+    }, { general: { articlepath, variants, langconversion }, magicwords, namespaces, namespacealiases, functionhooks, } = (await (await fetch(`${url}/api.php?${new URLSearchParams(params).toString()}`, headers)).json()).query, tempFile = path_1.default.join(__dirname, 'mw.js');
+    fs_1.default.writeFileSync(tempFile, m);
+    const { stdout, stderr } = (0, child_process_1.spawnSync)(process.execPath, [
+        '-r',
+        './env.js',
+        process.allowedNodeEnvironmentFlags.has('--permission')
+            ? '--permission'
+            : '--experimental-permission',
+        `--allow-fs-read=${__dirname}`,
+        '--disable-warning=ExperimentalWarning',
+        tempFile,
+    ], { cwd: __dirname, encoding: 'utf8' });
+    fs_1.default.unlinkSync(tempFile);
+    if (stderr) {
+        console.error(stderr);
+        throw new Error('Failed to execute the fetched MediaWiki module!', { cause: m });
     }
-    catch (e) {
-        console.log(m);
-        throw e;
+    let mwConfig;
+    try {
+        mwConfig = JSON.parse(stdout);
     }
-    if (!mwConfig) {
+    catch {
         throw new RangeError('Extension:CodeMirror is not installed!');
     }
     const ns = Object.entries(namespaces).filter(([id]) => filterGadget(id))
@@ -138,7 +112,7 @@ exports.default = async (site, url, user, force, internal) => {
         [id, name],
         ...name === canonical ? [] : [[id, canonical]],
     ]), config = {
-        ...(0, cm_util_1.getParserConfig)(require(path_1.default.join(dir, 'minimum')), mwConfig),
+        ...(0, cm_util_1.getParserConfig)(require(path_1.default.join(dir, 'minimum.json')), mwConfig),
         ...(0, cm_util_1.getKeywords)(magicwords),
         variants: langconversion ? (0, cm_util_1.getVariants)(variants) : [],
         namespaces: Object.fromEntries(ns),

package/dist/bin/env.js

@@ -0,0 +1,42 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+/**
+ * Execute the data script.
+ * @param obj MediaWiki module implementation
+ */
+const execute = (obj) => {
+    Object.entries(obj.files).find(([k]) => k.endsWith('.data.js'))[1]();
+};
+Object.assign(globalThis, {
+    mw: {
+        loader: {
+            done: false,
+            /** @ignore */
+            impl(callback) {
+                execute(callback()[1]);
+            },
+            /** @ignore */
+            implement(name, callback) {
+                if (typeof callback === 'object') {
+                    execute(callback);
+                }
+                else if (!this.done) {
+                    callback();
+                }
+                if (name.startsWith('ext.CodeMirror.data')) {
+                    this.done = true;
+                }
+            },
+            /** @ignore */
+            state() {
+                //
+            },
+        },
+        config: {
+            /** @ignore */
+            set({ extCodeMirrorConfig }) {
+                console.log(JSON.stringify(extCodeMirrorConfig));
+            },
+        },
+    },
+});

package/dist/index.js

@@ -16,12 +16,24 @@ const common_1 = require("@bhsd/common");
 const diff_1 = require("./util/diff");
 /* NOT FOR BROWSER ONLY */
 const re = new RegExp(String.raw `^https?:\/\/([^./]+)\.(${common_1.wmf})\.org`, 'iu');
+/**
+ * require一个JSON文件
+ * @param file 文件名
+ * @throws {RangeError} 仅支持JSON文件
+ */
+const jsonRequire = (file) => {
+    const fullPath = require.resolve(file);
+    if (fullPath.endsWith('.json')) {
+        return require(fullPath);
+    }
+    throw new RangeError('Only JSON files are supported!');
+};
 /**
  * 从根路径require
  * @param file 文件名
  * @param dir 子路径
  */
-const rootRequire = (file, dir) => require(path_1.default.isAbsolute(file)
+const rootRequire = (file, dir) => jsonRequire(path_1.default.isAbsolute(file)
     ? /* c8 ignore next */ file
     : path_1.default.join('..', file.includes('/') ? '' : dir, file));
 /* NOT FOR BROWSER ONLY END */
@@ -85,7 +97,7 @@ const Parser = {
             if (!path_1.default.isAbsolute(this.config)) {
                 for (const p of this.configPaths) {
                     try {
-                        this.config = require(path_1.default.resolve(process.cwd(), p, this.config));
+                        this.config = jsonRequire(path_1.default.resolve(process.cwd(), p, this.config));
                         break;
                     }
                     catch { }

package/dist/lib/document.d.ts

@@ -29,11 +29,10 @@ declare interface Texvcjs {
     };
 }
 export declare const loadTexvcjs: () => Texvcjs | null;
-export declare const jsonTags: string[];
 export declare const loadJsonLSP: () => JSONLanguageService | null;
 export declare const loadCssLSP: () => CSSLanguageService | null;
 export declare const loadHtmlData: () => IHTMLDataProvider | null;
-export declare const loadStylelint: () => Promise<PublicApi | null>;
+export declare const loadStylelint: () => PublicApi | null;
 /** embedded document */
 declare class EmbeddedDocument implements TextDocument {
     #private;

package/dist/lib/document.js

@@ -3,9 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EmbeddedCSSDocument = exports.EmbeddedJSONDocument = exports.loadStylelint = exports.loadHtmlData = exports.loadCssLSP = exports.loadJsonLSP = exports.jsonTags = exports.loadTexvcjs = void 0;
+exports.EmbeddedCSSDocument = exports.EmbeddedJSONDocument = exports.loadStylelint = exports.loadHtmlData = exports.loadCssLSP = exports.loadJsonLSP = exports.loadTexvcjs = void 0;
 const path_1 = __importDefault(require("path"));
 const common_1 = require("@bhsd/common");
+const constants_1 = require("../util/constants");
 let texcvjs;
 const loadTexvcjs = () => {
     NPM: {
@@ -22,7 +23,6 @@ const loadTexvcjs = () => {
     }
 };
 exports.loadTexvcjs = loadTexvcjs;
-exports.jsonTags = ['templatedata', 'mapframe', 'maplink'];
 let jsonLSP;
 const loadJsonLSP = () => {
     if (jsonLSP === undefined) {
@@ -38,10 +38,10 @@ const loadJsonLSP = () => {
             });
             const dir = path_1.default.join('..', '..', 'data', 'ext');
             jsonLSP.configure({
-                schemas: exports.jsonTags.map((tag) => {
-                    const uri = path_1.default.join(dir, tag);
+                schemas: constants_1.jsonTags.map((tag) => {
+                    const uri = path_1.default.join(dir, `${tag}.json`);
                     try {
-                        const schema = require(tag === 'maplink' ? path_1.default.join(dir, 'mapframe') : uri);
+                        const schema = require(tag === 'maplink' ? path_1.default.join(dir, 'mapframe.json') : uri);
                         return {
                             uri,
                             fileMatch: [tag],
@@ -96,15 +96,15 @@ exports.loadHtmlData = loadHtmlData;
 let stylelint;
 const loadStylelint = () => {
     NPM: {
-        stylelint ??= (async () => {
+        if (stylelint === undefined) {
             try {
-                return (await import('stylelint')).default;
+                stylelint = require('stylelint');
             }
             catch /* c8 ignore start */ {
-                return null;
+                stylelint = null;
             }
             /* c8 ignore stop */
-        })();
+        }
         return stylelint;
     }
 };

package/dist/lib/lintConfig.js

@@ -236,14 +236,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/lsp.d.ts

@@ -1,4 +1,5 @@
 import Parser from '../index';
+import { Token } from '../src/index';
 import type { Range, Position, ColorInformation, ColorPresentation, FoldingRange, DocumentLink, Location, WorkspaceEdit, Diagnostic as DiagnosticBase, TextEdit, Hover, SignatureHelp, InlayHint, CodeAction, DocumentSymbol } from 'vscode-languageserver-types';
 import type { Config, LanguageService as LanguageServiceBase, CompletionItem, SignatureData } from '../base';
 import type { AttributeToken } from '../internal';

package/dist/lib/lsp.js

@@ -22,6 +22,7 @@ const child_process_1 = require("child_process");
 const crypto_1 = require("crypto");
 const stylelint_util_1 = require("@bhsd/stylelint-util");
 const search_1 = __importDefault(require("../util/search"));
+const constants_2 = require("../util/constants");
 const document_1 = require("./document");
 exports.tasks = new WeakMap();
 const refTags = new Set(['ref']), referencesTags = new Set(['ref', 'references']), nameAttrs = new Set(['name', 'follow']), groupAttrs = new Set(['group']), renameTypes = new Set([
@@ -279,7 +280,7 @@ const partialParse = async (wikitext, watch, include, config = index_1.default.g
 };
 /* NOT FOR BROWSER ONLY */
 /** @see https://www.npmjs.com/package/stylelint-config-recommended */
-const cssRules = { 'block-no-empty': null }, sources = { 'invalid-css': 'css', 'invalid-math': 'texvc' }, jsonSelector = document_1.jsonTags.map(s => `ext#${s}`).join(), scores = new Map();
+const cssRules = { 'block-no-empty': null }, sources = { 'invalid-css': 'css', 'invalid-math': 'texvc' }, jsonSelector = constants_2.jsonTags.map(s => `ext#${s}`).join(), scores = new Map();
 let colors;
 /**
  * Correct the position of an error.
@@ -372,15 +373,15 @@ class LanguageService {
         exports.tasks.set(uri, this);
         /* NOT FOR BROWSER ONLY */
         const dataDir = path_1.default.join('..', '..', 'data'), extDir = path_1.default.join(dataDir, 'ext');
-        this.#lilypondData = require(path_1.default.join(extDir, 'score'));
-        this.#mathData = require(path_1.default.join(extDir, 'math'));
+        this.#lilypondData = require(path_1.default.join(extDir, 'score.json'));
+        this.#mathData = require(path_1.default.join(extDir, 'math.json'));
         /* NOT FOR BROWSER ONLY END */
         Object.defineProperties(this, {
             config: { enumerable: false },
             data: {
                 enumerable: false,
                 /* NOT FOR BROWSER ONLY */
-                value: require(path_1.default.join(dataDir, 'signatures')),
+                value: require(path_1.default.join(dataDir, 'signatures.json')),
             },
         });
     }
@@ -491,15 +492,15 @@ class LanguageService {
     async provideDocumentColors(rgba, text, hsl = true) {
         const root = await this.#queue(text);
         /* NOT FOR BROWSER ONLY */
-        colors ??= (async () => {
+        if (colors === undefined) {
             try {
-                return new RegExp(String.raw `\b${Object.keys((await import('color-name')).default).join('|')}\b`, 'giu');
+                const { default: colorName } = require('color-name');
+                colors = new RegExp(String.raw `\b${Object.keys(colorName).join('|')}\b`, 'giu');
             }
             catch {
-                return false;
+                colors = false;
             }
-        })();
-        const re = await colors;
+        }
         /* NOT FOR BROWSER ONLY END */
         return root.querySelectorAll('attr-value,parameter-value,arg-default').reverse().flatMap(token => {
             const { type, childNodes, 
@@ -515,13 +516,13 @@ class LanguageService {
                 /* NOT FOR BROWSER ONLY END */
             }
             /* NOT FOR BROWSER ONLY */
-            const isStyle = re && type === 'attr-value' && parentNode.name === 'style';
+            const isStyle = colors && type === 'attr-value' && parentNode.name === 'style';
             /* NOT FOR BROWSER ONLY END */
             return childNodes.filter((child) => child.type === 'text').reverse().flatMap(child => {
                 const { data } = child, parts = (0, common_1.splitColors)(data, hsl).filter(([, , , isColor]) => isColor);
                 /* NOT FOR BROWSER ONLY */
                 if (isStyle) {
-                    parts.push(...[...data.matchAll(re)].map(({ index, 0: s }) => [s, index, index + s.length, true]));
+                    parts.push(...[...data.matchAll(colors)].map(({ index, 0: s }) => [s, index, index + s.length, true]));
                 }
                 /* NOT FOR BROWSER ONLY END */
                 if (parts.length === 0) {
@@ -762,7 +763,7 @@ class LanguageService {
                 },
             }));
         }
-        else if (type === 'ext-inner' && document_1.jsonTags.includes(cur.name)) {
+        else if (type === 'ext-inner' && constants_2.jsonTags.includes(cur.name)) {
             const jsonLSP = (0, document_1.loadJsonLSP)();
             if (!jsonLSP) {
                 return undefined;
@@ -822,7 +823,7 @@ class LanguageService {
         const root = await this.#queue(text), { lintConfig } = index_1.default, needFix = lintConfig.fix;
         lintConfig.fix = false;
         /* NOT FOR BROWSER ONLY */
-        const stylelint = await (0, document_1.loadStylelint)(), jsonLSP = (0, document_1.loadJsonLSP)();
+        const stylelint = (0, document_1.loadStylelint)(), jsonLSP = (0, document_1.loadJsonLSP)();
         let s;
         NPM: if (jsonLSP) {
             s = lintConfig.rules['invalid-json'];
@@ -1314,7 +1315,7 @@ class LanguageService {
             const textDoc = new document_1.EmbeddedCSSDocument(root, offsetNode);
             return (0, document_1.loadCssLSP)().doHover(textDoc, position, textDoc.styleSheet) ?? undefined;
         }
-        else if (type === 'ext-inner' && document_1.jsonTags.includes(name)) {
+        else if (type === 'ext-inner' && constants_2.jsonTags.includes(name)) {
             const jsonLSP = (0, document_1.loadJsonLSP)();
             if (!jsonLSP) {
                 return undefined;
@@ -1434,8 +1435,12 @@ class LanguageService {
         return hints;
     }
     /** @private */
+    querySelectorAll(selector) {
+        return this.#done.querySelectorAll(selector);
+    }
+    /** @private */
     findStyleTokens() {
-        return this.#done.querySelectorAll(cssSelector).filter(({ lastChild }) => isAttr(lastChild));
+        return this.querySelectorAll(cssSelector).filter(({ lastChild }) => isAttr(lastChild));
     }
     /**
      * Provide refactoring actions
@@ -1577,7 +1582,7 @@ class LanguageService {
     async setTargetWikipedia(wiki, user) {
         const [site, host] = index_1.default.getWMFSite(wiki);
         try {
-            const config = require(path_1.default.join('..', '..', 'config', site));
+            const config = require(path_1.default.join('..', '..', 'config', `${site}.json`));
             this.config = index_1.default.getConfig(config);
         }
         catch {

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/node.js

@@ -196,10 +196,13 @@ let AstNode = (() => {
                     : 0;
             }
             return (0, lint_1.cache)(this.#rIndex[j], () => {
-                const { childNodes } = this, n = j + (j < 0 ? childNodes.length : 0);
+                const { childNodes } = this, parentAIndex = this.#aIndex?.[0] === debug_1.Shadow.rev && this.#aIndex[1], n = j + (j < 0 ? childNodes.length : 0);
                 let acc = this.getAttribute('padding');
                 for (let i = 0; i < n; i++) {
                     this.#rIndex[i] = [debug_1.Shadow.rev, acc];
+                    if (parentAIndex !== false) {
+                        childNodes[i].#aIndex = [debug_1.Shadow.rev, parentAIndex + acc];
+                    }
                     acc += childNodes[i].toString().length + this.getGaps(i);
                 }
                 return acc;

package/dist/src/converterFlags.js

@@ -108,14 +108,18 @@ let ConverterFlagsToken = (() => {
         }
         /** @private */
         // eslint-disable-next-line @typescript-eslint/class-methods-use-this
-        isInvalidFlag(flag, variant, unknown, valid) {
-            return Boolean(flag) && !variant.has(flag) && !unknown.has(flag) && (variant.size > 0 || !valid.has(flag));
+        isInvalidFlag(flag, variant, unknown) {
+            return Boolean(flag)
+                && !variant.has(flag)
+                && !unknown.has(flag)
+                && (variant.size > 0 || !definedFlags.has(flag));
         }
         /** @private */
         lint(start = this.getAbsoluteIndex(), re) {
             LINT: {
-                const variantFlags = this.getVariantFlags(), unknownFlags = this.getUnknownFlags(), validFlags = new Set(this.#flags.filter(flag => definedFlags.has(flag))), emptyFlagCount = this.#flags.filter(flag => !flag).length, knownFlagCount = this.#flags.length - unknownFlags.size - emptyFlagCount, { lintConfig } = index_1.default, { computeEditInfo, fix } = lintConfig, errors = super.lint(start, re);
-                if (variantFlags.size === knownFlagCount || validFlags.size === knownFlagCount) {
+                const variantFlags = this.getVariantFlags(), unknownFlags = this.getUnknownFlags(), emptyFlagCount = this.#flags.filter(flag => !flag).length, knownFlagCount = this.#flags.length - unknownFlags.size - emptyFlagCount, { lintConfig } = index_1.default, { computeEditInfo, fix } = lintConfig, errors = super.lint(start, re);
+                if (variantFlags.size === knownFlagCount
+                    || this.#flags.filter(flag => definedFlags.has(flag)).length === knownFlagCount) {
                     return errors;
                 }
                 const rule = 'no-ignored', s = lintConfig.getSeverity(rule, 'conversionFlag');
@@ -123,7 +127,7 @@ let ConverterFlagsToken = (() => {
                     const rect = new rect_1.BoundingRect(this, start);
                     for (let i = 0; i < this.length; i++) {
                         const child = this.childNodes[i], flag = child.text().trim();
-                        if (this.isInvalidFlag(flag, variantFlags, unknownFlags, validFlags)) {
+                        if (this.isInvalidFlag(flag, variantFlags, unknownFlags)) {
                             const e = (0, lint_1.generateForChild)(child, rect, rule, 'invalid-conversion-flag', s);
                             if (computeEditInfo || fix) {
                                 if (variantFlags.size === 0 && definedFlags.has(flag.toUpperCase())) {

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 } from '../internal';
 declare type ExtendedLintError = LintError[] & {

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/nowiki/index.js

@@ -5,12 +5,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NowikiToken = void 0;
 const common_1 = require("@bhsd/common");
+const constants_1 = require("../../util/constants");
 const lint_1 = require("../../util/lint");
 const rect_1 = require("../../lib/rect");
 const index_1 = __importDefault(require("../../index"));
 const base_1 = require("./base");
 /* NOT FOR BROWSER ONLY */
-const constants_1 = require("../../util/constants");
+const constants_2 = require("../../util/constants");
 const document_1 = require("../../lib/document");
 /** @ignore */
 const updateLocation = ({ startIndex, startLine, startCol, endIndex, endLine, endCol }, { offset, line, column }, n) => {
@@ -56,22 +57,10 @@ class NowikiToken extends base_1.NowikiBaseToken {
             }
             NPM: {
                 rule = 'invalid-json';
-                const sSyntax = lintConfig.getSeverity(rule);
-                /* NOT FOR BROWSER ONLY */
-                const sDuplicate = lintConfig.getSeverity(rule, 'duplicate');
-                /* NOT FOR BROWSER ONLY END */
-                if (name === 'templatedata' && (sSyntax
-                    || sDuplicate)) {
-                    // browser版本使用`lintJSONNative()`
-                    return (0, common_1.lintJSON)(innerText).map(({ message, from, to = from, line, endLine = line, column, endColumn = column, 
-                    /* NOT FOR BROWSER ONLY */
-                    severity, }) => {
-                        s =
-                            /* eslint-disable @stylistic/operator-linebreak */
-                            severity === 'warning' ?
-                                sDuplicate :
-                                /* eslint-enable @stylistic/operator-linebreak */
-                                sSyntax;
+                const sSyntax = lintConfig.getSeverity(rule), sDuplicate = lintConfig.getSeverity(rule, 'duplicate');
+                if (constants_1.jsonTags.includes(name) && (sSyntax || sDuplicate)) {
+                    return (name === 'templatedata' ? common_1.lintJSON : common_1.lintJSONC)(innerText).map(({ message, from, to = from, line, endLine = line, column, endColumn = column, severity, }) => {
+                        s = severity === 'warning' ? sDuplicate : sSyntax;
                         if (!s) {
                             return false;
                         }
@@ -92,7 +81,7 @@ class NowikiToken extends base_1.NowikiBaseToken {
                 /* NOT FOR BROWSER ONLY */
                 rule = 'invalid-math';
                 s = lintConfig.getSeverity(rule);
-                if (s && constants_1.mathTags.has(name)) {
+                if (s && constants_2.mathTags.has(name)) {
                     const texvcjs = (0, document_1.loadTexvcjs)();
                     if (texvcjs) {
                         const isChem = name !== 'math', display = previousSibling?.getAttr('display') ?? 'block';

package/dist/src/parameter.d.ts

@@ -1,6 +1,6 @@
 import { Token } from './index';
 import type { Config, LintError } 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

@@ -56,25 +56,13 @@ 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
      *
      * 获取指定参数
      * @param key parameter name / 参数名
      */
-    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
      *

package/dist/src/transclude.js

@@ -76,6 +76,7 @@ let TranscludeToken = (() => {
         #colon = ':';
         #raw = false;
         #args = new Map();
+        #anonCount = 0;
         #title;
         get type() {
             return this.#type;
@@ -317,19 +318,17 @@ let TranscludeToken = (() => {
                 return errors;
             }
         }
-        /**
-         * 处理匿名参数更改
-         * @param addedToken 新增的参数
-         */
-        #handleAnonArgChange(addedToken) {
-            const args = this.getAnonArgs(), added = typeof addedToken !== 'number';
-            for (let i = added ? args.indexOf(addedToken) : addedToken - 1; i < args.length; i++) {
-                const token = args[i], { name } = token, newName = String(i + 1);
-                if (name !== newName || token === addedToken) {
-                    token.setAttribute('name', newName);
-                    this.getArgs(newName, false, false).add(token);
-                }
-            }
+        #handleAnonArgChange(addedToken, append) {
+            /* eslint-disable @stylistic/operator-linebreak */
+            this.#anonCount +=
+                1;
+            /* eslint-enable @stylistic/operator-linebreak */
+            let i;
+            // eslint-disable-next-line prefer-const
+            i = this.#anonCount - 1;
+            const token = addedToken, newName = String(i + 1);
+            token.setAttribute('name', newName);
+            this.getArgs(newName, false, false).add(token);
         }
         /**
          * @override
@@ -346,22 +345,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);
-        }
         // eslint-disable-next-line jsdoc/require-param
         /**
          * Get parameters with the specified name
@@ -369,7 +352,7 @@ let TranscludeToken = (() => {
          * 获取指定参数
          * @param key parameter name / 参数名
          */
-        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;
@@ -377,7 +360,9 @@ let TranscludeToken = (() => {
                 args = this.#args.get(keyStr);
             }
             else {
-                args = new Set(this.getAllArgs().filter(({ name }) => keyStr === name));
+                /* eslint-disable @stylistic/function-paren-newline */
+                args = new Set();
+                /* eslint-enable @stylistic/function-paren-newline */
                 this.#args.set(keyStr, args);
             }
             return args;

package/dist/util/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mathTags = exports.extensions = exports.galleryParams = exports.enMsg = exports.BuildMethod = exports.MAX_STAGE = void 0;
+exports.mathTags = exports.jsonTags = exports.extensions = exports.galleryParams = exports.enMsg = exports.BuildMethod = exports.MAX_STAGE = void 0;
 exports.MAX_STAGE = 11;
 var BuildMethod;
 (function (BuildMethod) {
@@ -13,5 +13,6 @@ 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']);

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/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wikilint",
-	"version": "2.35.2",
+	"version": "2.37.0",
 	"description": "A Node.js linter for MediaWiki markup",
 	"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": [
 		"/errors/README",
@@ -53,6 +53,7 @@
 		"coverage": "tsc --declaration false --target es2024 && npm run build:define && c8 npm run test:ci && node dist/script/coverage.js && open coverage/index.html",
 		"test:unit": "mocha dist/test/test.js",
 		"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:parser",
 		"test:parseronly": "LSP=0 npm run test:parser",
 		"test:ci": "LSP=0 npm test",
@@ -72,52 +73,51 @@
 		]
 	},
 	"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",
-		"minimatch": "^10.2.2",
-		"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",
-		"@stylistic/eslint-plugin": "^5.8.0",
+		"@bhsd/code-standard": "^2.1.1",
+		"@bhsd/nodejs": "^1.0.0",
+		"@bhsd/test-util": "^0.4.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",
-		"@typescript-eslint/eslint-plugin": "^8.54.0",
-		"@typescript-eslint/parser": "^8.54.0",
-		"c8": "^10.1.3",
+		"@types/node": "^24.11.0",
+		"@typescript-eslint/eslint-plugin": "^8.57.0",
+		"@typescript-eslint/parser": "^8.57.0",
+		"c8": "^11.0.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",
 		"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"
 	}
 }