wikilint 2.47.0 → 2.48.1

package/dist/src/transclude.d.ts

@@ -3,6 +3,7 @@ import { ParameterToken } from './parameter';
 import { AtomToken } from './atom';
 import { SyntaxToken } from './syntax';
 import type { Config, LintError } from '../base';
+export declare const invalidTemplateMsg = "Invalid template name";
 /**
  * template or magic word
  *
@@ -78,7 +79,7 @@ export declare abstract class TranscludeToken extends Token {
      * Get possible values of some magic words
      *
      * 对特定魔术字获取可能的取值
-     * @throws `Error` 不是可接受的魔术字
+     * @throws `Error` if not a supported magic word
      */
     getPossibleValues(): Token[];
 }

package/dist/src/transclude.js

@@ -37,11 +37,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TranscludeToken = void 0;
+exports.TranscludeToken = exports.invalidTemplateMsg = void 0;
 const string_1 = require("../util/string");
 const lint_1 = require("../util/lint");
 const debug_1 = require("../util/debug");
-const constants_1 = require("../util/constants");
 const rect_1 = require("../lib/rect");
 const gapped_1 = require("../mixin/gapped");
 const noEscape_1 = require("../mixin/noEscape");
@@ -50,6 +49,8 @@ const index_2 = require("./index");
 const parameter_1 = require("./parameter");
 const atom_1 = require("./atom");
 const syntax_1 = require("./syntax");
+exports.invalidTemplateMsg = 'Invalid template name';
+const sortArgs = /** @ignore */ ({ childNodes }, args) => [...args].sort((a, b) => childNodes.indexOf(a) - childNodes.indexOf(b));
 /**
  * template or magic word
  *
@@ -159,7 +160,7 @@ let TranscludeToken = (() => {
                 const name = (0, string_1.removeComment)(title).trim();
                 if (!this.normalizeTitle(name, 10, { halfParsed: true, temporary: true }).valid) {
                     accum.pop();
-                    throw new SyntaxError('Invalid template name');
+                    throw new SyntaxError(exports.invalidTemplateMsg);
                 }
                 const token = new atom_1.AtomToken(title, 'template-name', config, accum, {});
                 super.insertAt(token);
@@ -226,7 +227,7 @@ let TranscludeToken = (() => {
         /** @private */
         afterBuild() {
             if (this.modifier.includes('\0')) {
-                this.setAttribute('modifier', this.buildFromStr(this.modifier, constants_1.BuildMethod.String));
+                this.setAttribute('modifier', this.buildFromStr(this.modifier, 0 /* BuildMethod.String */));
             }
             super.afterBuild();
             if (this.isTemplate()) {
@@ -332,7 +333,7 @@ let TranscludeToken = (() => {
             this.#anonCount +=
                 1;
             let i;
-            // eslint-disable-next-line prefer-const
+            // eslint-disable-next-line prefer-const, unicorn/no-immediate-mutation
             i = this.#anonCount - 1;
             const token = addedToken, newName = String(i + 1);
             token.setAttribute('name', newName);
@@ -371,6 +372,9 @@ let TranscludeToken = (() => {
                 args = new Set();
                 this.#args.set(keyStr, args);
             }
+            if (copy) {
+                args = new Set(sortArgs(this, args));
+            }
             return args;
         }
         /**
@@ -382,7 +386,7 @@ let TranscludeToken = (() => {
             LINT: {
                 const isTemplate = this.isTemplate();
                 const duplicatedArgs = [...this.#args].filter(([, { size }]) => size > 1)
-                    .map(([key, args]) => [key, [...args]]);
+                    .map(([key, args]) => [key, sortArgs(this, args)]);
                 return isTemplate
                     ? duplicatedArgs
                     : duplicatedArgs
@@ -394,7 +398,7 @@ let TranscludeToken = (() => {
          * Get possible values of some magic words
          *
          * 对特定魔术字获取可能的取值
-         * @throws `Error` 不是可接受的魔术字
+         * @throws `Error` if not a supported magic word
          */
         getPossibleValues() {
             const { type, name, childNodes, length: l } = this;

package/dist/util/ajv.js

@@ -0,0 +1,26 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs_1 = __importDefault(require("fs"));
+/**
+ * 验证JSON数据并返回错误信息
+ * @param schemaPath JSON Schema文件路径
+ * @param dataVar 错误信息前缀
+ */
+exports.default = (schemaPath, dataVar = '#') => {
+    const schema = JSON.parse(fs_1.default.readFileSync(schemaPath, 'utf8'));
+    const Ajv = require(schema.$schema?.includes('draft-07') ? 'ajv' : 'ajv/dist/2020'), ajvErrors = require('ajv-errors');
+    const ajv = new Ajv({ allErrors: true });
+    ajvErrors(ajv, { singleError: true });
+    ajv.addKeyword('markdownDescription');
+    const v = ajv.compile(schema);
+    return data => {
+        if (v(data)) {
+            return '';
+        }
+        const errors = v.errors, { instancePath } = errors[0], related = errors.filter(error => error.instancePath === instancePath);
+        return ajv.errorsText([related.find(({ keyword }) => keyword === 'errorMessage') || related[0]], { dataVar });
+    };
+};

package/dist/util/constants.js

@@ -1,12 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mathTags = exports.jsonTags = exports.extensions = exports.galleryParams = exports.enMsg = exports.BuildMethod = exports.MAX_STAGE = void 0;
+exports.mathTags = exports.jsonTags = exports.extensions = exports.galleryParams = exports.enMsg = exports.MAX_STAGE = void 0;
 exports.MAX_STAGE = 11;
-var BuildMethod;
-(function (BuildMethod) {
-    BuildMethod[BuildMethod["String"] = 0] = "String";
-    BuildMethod[BuildMethod["Text"] = 1] = "Text";
-})(BuildMethod || (exports.BuildMethod = BuildMethod = {}));
 exports.enMsg = (() => {
     LSP: return require(
     // eslint-disable-next-line n/no-missing-require

package/dist/util/string.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.toLowerCase = exports.decodeNumber = exports.decodeHtml = exports.decodeHtmlBasic = exports.text = exports.removeCommentLine = exports.removeComment = exports.tidy = exports.trimLc = exports.extUrlChar = exports.extUrlCharFirst = exports.zs = void 0;
 exports.restore = restore;
+/* NOT FOR BROWSER ONLY END */
 exports.zs = String.raw ` \xA0\u1680\u2000-\u200A\u202F\u205F\u3000`;
 const commonExtUrlChar = String.raw `[^[\]<>"\0-\x1F\x7F${exports.zs}\uFFFD]`;
 exports.extUrlCharFirst = String.raw `(?:\[[\da-f:.]+\]|${commonExtUrlChar})`;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wikilint",
-	"version": "2.47.0",
+	"version": "2.48.1",
 	"description": "A Node.js linter for MediaWiki markup",
 	"keywords": [
 		"mediawiki",
@@ -39,23 +39,23 @@
 		"url": "git+https://github.com/bhsd-harry/wikiparser-node.git"
 	},
 	"scripts": {
-		"ls": "npm i --package-lock-only && npm ls --package-lock-only --all --include=peer --omit=dev",
+		"ls": "npm i --package-lock-only && npm ls --package-lock-only -a --include=peer --omit=dev",
 		"prepublishOnly": "npm run build:core",
 		"build:core": "bash build.sh",
 		"build:define": "bash sed.sh -i \"s/pkg = \\$PKG/pkg = '$(npm pkg get name)'/; s/version = \\$VERSION/version = '$(npm pkg get version)'/\" dist/bin/config.js",
 		"build": "npm run build:core",
 		"diff": "bash diff.sh",
 		"diff:stat": "f() { git diff --stat -w --color=always $1 $2 -- . | grep '\\.ts'; }; f",
-		"lint:ts": "tsc --noEmit && eslint --cache .",
-		"lint:json": "v8r -s config/.schema.json config/*.json && v8r -s data/.schema.json data/*.json && testUtil dist/test/json.js",
-		"lint:md": "markdownlint-cli2 '*.md'",
-		"lint": "npm run lint:ts && npm run lint:json && npm run lint:md",
+		"lint:ts": "[ ! -f dist/bin/config.js ] && npm run build:core; tsc --noEmit && eslint --cache .",
+		"lint:md": "myMarkdownlint",
+		"lint": "npm run lint:ts && npm run lint:md",
 		"prof": "node dist/test/prof.js",
-		"coverage": "tsc --declaration false --target es2024 && npm run build:define && c8 npm run test:ci && node dist/script/coverage.js && open coverage/index.html",
+		"coverage": "tsc -d false -t es2024 && npm run build:define && c8 npm run test:ci && node dist/script/coverage.js && open coverage/index.html",
 		"test:unit": "testUtil dist/test/test.js",
+		"test:json": "testUtil dist/test/json.js",
 		"test:parser": "LC_ALL=en.UTF-8 testUtil dist/test/parserTests.js",
 		"test:perf": "testUtil --test-reporter=spec dist/test/perf.js",
-		"test": "npm run test:unit && npm run test:parser",
+		"test": "npm run test:unit && npm run test:parser && npm run test:json",
 		"test:parseronly": "LSP=0 npm run test:parser",
 		"test:ci": "LSP=0 npm test",
 		"test:end": "pkill -x http-server",
@@ -98,30 +98,30 @@
 		}
 	},
 	"dependencies": {
-		"@bhsd/cm-util": "^2.4.1",
+		"@bhsd/cm-util": "^2.4.2",
 		"@bhsd/common": "^4.1.0",
 		"@bhsd/stylelint-util": "^1.1.0",
 		"culori": "^4.0.2",
-		"entities": "^8.0.0",
-		"vscode-languageserver-types": "^3.18.3"
+		"entities": "^8.1.0",
+		"vscode-languageserver-types": "^3.18.4"
 	},
 	"devDependencies": {
-		"@bhsd/code-standard": "^4.2.0",
+		"@bhsd/code-standard": "^5.0.0",
 		"@bhsd/nodejs": "^1.2.1",
-		"@bhsd/test-util": "^3.2.0",
+		"@bhsd/test-util": "^3.3.0",
+		"ajv": "^8.20.0",
+		"ajv-errors": "^3.0.0",
 		"c8": "^12.0.0",
 		"diff2html-cli": "^5.2.15",
 		"esbuild": "^0.28.2",
-		"eslint": "^10.10.0",
-		"markdownlint-cli2": "^0.23.2",
+		"eslint": "^10.13.0",
 		"mathoid-texvcjs": "^0.6.0",
-		"stylelint": "^17.15.0",
+		"stylelint": "^17.16.0",
 		"typescript": "^6.0.3",
-		"v8r": "^6.1.0",
 		"vscode-css-languageservice": "^6.3.10",
 		"vscode-html-languageservice": "^5.6.2",
 		"vscode-json-languageservice": "^5.7.2",
-		"vscode-languageserver-textdocument": "^1.0.14"
+		"vscode-languageserver-textdocument": "^1.0.15"
 	},
 	"engines": {
 		"node": "^20.19.0 || ^22.13.0 || >=24.11.0"