wikilint 2.48.0 → 2.48.1

package/README.md

@@ -97,6 +97,6 @@ repos:
         # You can add any CLI options as needed
         entry: wikilint
         language: node
-        additional_dependencies: ['wikilint@2.48.0']
+        additional_dependencies: ['wikilint@2.48.1']
         files: \.(mediawiki|wiki|wikitext)$
 ```

package/config/.schema.json

@@ -1,5 +1,5 @@
 {
-	"$schema": "http://json-schema.org/draft-07/schema#",
+	"$schema": "https://json-schema.org/draft/2020-12/schema",
 	"type": "object",
 	"properties": {
 		"ext": {

package/dist/base.d.mts

@@ -2,7 +2,7 @@ import type { Range, Position, ColorInformation, ColorPresentation, CompletionIt
 export interface Config {
     ext: string[];
     readonly html: [string[], string[], string[]];
-    readonly namespaces: Record<string, string>;
+    readonly namespaces: Record<number, string>;
     readonly nsid: Record<string, number>;
     readonly parserFunction: [Record<string, string>, Record<string, string>, string[], string[]];
     readonly doubleUnderscore: [string[], string[], Record<string, string>, Record<string, string>];

package/dist/base.d.ts

@@ -2,7 +2,7 @@ import type { Range, Position, ColorInformation, ColorPresentation, CompletionIt
 export interface Config {
     ext: string[];
     readonly html: [string[], string[], string[]];
-    readonly namespaces: Record<string, string>;
+    readonly namespaces: Record<number, string>;
     readonly nsid: Record<string, number>;
     readonly parserFunction: [Record<string, string>, Record<string, string>, string[], string[]];
     readonly doubleUnderscore: [string[], string[], Record<string, string>, Record<string, string>];

package/dist/bin/cli.js

@@ -404,9 +404,9 @@ const { mtimeMs } = fs_1.default.statSync(config), obj = cache?.[include ? 'incl
         exiting ||= Boolean(nLocalErr || strict && nLocalWarn);
     }
     if (nErr || nWarn) {
-        console.error(styleText(['red', 'bold'], '%s'), `\n✖ ${plural(nErr + nWarn, 'problem')} (${plural(nErr, 'error')}, ${plural(nWarn, 'warning')})`);
+        console.error(styleText(['red', 'bold'], '\n✖ %s (%s, %s)'), plural(nErr + nWarn, 'problem'), plural(nErr, 'error'), plural(nWarn, 'warning'));
         if (nFixableErr || nFixableWarn) {
-            console.error(styleText(['red', 'bold'], '%s'), `  ${plural(nFixableErr, 'error')} and ${plural(nFixableWarn, 'warning')} potentially fixable with the \`--fix\` option.`);
+            console.error(styleText(['red', 'bold'], '  %s and %s potentially fixable with the `--fix` option.'), plural(nFixableErr, 'error'), plural(nFixableWarn, 'warning'));
         }
         console.error();
     }

package/dist/bin/config.js

@@ -41,7 +41,7 @@ const filterGadget = (id) => {
     const n = Number(id);
     return n < 2300 || n > 2303; // Gadget, Gadget talk, Gadget definition, Gadget definition talk
 };
-const pkg = 'wikilint', version = '2.48.0';
+const pkg = 'wikilint', version = '2.48.1';
 /**
  * Get the parser configuration for a Wikimedia Foundation project.
  * @param site site nickname

package/dist/lib/document.d.ts

@@ -1,8 +1,8 @@
 import type { Position } from 'vscode-languageserver-types';
 import type { TextDocument, Range } from 'vscode-languageserver-textdocument';
-import type { JSONDocument, LanguageService as JSONLanguageService } from 'vscode-json-languageservice';
-import type { Stylesheet, LanguageService as CSSLanguageService } from 'vscode-css-languageservice';
-import type { IHTMLDataProvider } from 'vscode-html-languageservice';
+import type * as JsonLanguageService from 'vscode-json-languageservice';
+import type * as CssLanguageService from 'vscode-css-languageservice';
+import type * as HtmlLanguageService from 'vscode-html-languageservice';
 import type { PublicApi } from 'stylelint';
 import type { Token } from '../internal';
 export interface TexvcLocation {
@@ -32,9 +32,9 @@ declare interface Texvcjs {
     }): TexvcReport;
 }
 export declare const loadTexvcjs: () => Texvcjs | null;
-export declare const loadJsonLSP: () => JSONLanguageService | null;
-export declare const loadCssLSP: () => CSSLanguageService | null;
-export declare const loadHtmlData: () => IHTMLDataProvider | null;
+export declare const loadJsonLSP: () => JsonLanguageService.LanguageService | null;
+export declare const loadCssLSP: () => CssLanguageService.LanguageService | null;
+export declare const loadHtmlData: () => HtmlLanguageService.IHTMLDataProvider | null;
 export declare const loadStylelint: () => PublicApi | null;
 /** embedded document */
 declare abstract class EmbeddedDocument implements TextDocument {
@@ -65,7 +65,7 @@ declare abstract class EmbeddedDocument implements TextDocument {
 }
 /** embedded JSON document */
 export declare class EmbeddedJSONDocument extends EmbeddedDocument {
-    jsonDoc: JSONDocument;
+    jsonDoc: JsonLanguageService.JSONDocument;
     abstract getLineRange(): Range;
     abstract getEOLCharacters(): string;
     /**
@@ -76,7 +76,7 @@ export declare class EmbeddedJSONDocument extends EmbeddedDocument {
 }
 /** embedded CSS document */
 export declare class EmbeddedCSSDocument extends EmbeddedDocument {
-    styleSheet: Stylesheet;
+    styleSheet: CssLanguageService.Stylesheet;
     abstract getLineRange(): Range;
     abstract getEOLCharacters(): string;
     /**

package/dist/lib/document.js

@@ -27,8 +27,7 @@ let jsonLSP;
 const loadJsonLSP = () => {
     if (jsonLSP === undefined) {
         try {
-            jsonLSP = require('vscode-json-languageservice')
-                .getLanguageService({
+            jsonLSP = require('vscode-json-languageservice').getLanguageService({
                 /* c8 ignore start */
                 /** @implements */
                 async schemaRequestService(uri) {
@@ -67,8 +66,7 @@ let cssLSP;
 const loadCssLSP = () => {
     if (cssLSP === undefined) {
         try {
-            cssLSP = require('vscode-css-languageservice')
-                .getCSSLanguageService();
+            cssLSP = require('vscode-css-languageservice').getCSSLanguageService();
         }
         catch /* c8 ignore start */ {
             cssLSP = null;

package/dist/lib/node.js

@@ -90,7 +90,7 @@ let AstNode = (() => {
         /** @private */
         getChildNodes() {
             const { childNodes } = this;
-            if (Object.isFrozen(childNodes)) { // NOT FOR TEMPLATE
+            if (Object.isFrozen(childNodes)) { // eslint-disable-line unicorn/prefer-ternary
                 return [...childNodes];
             }
             return childNodes;

package/dist/lib/text.js

@@ -70,7 +70,7 @@ class AstText extends node_1.AstNode {
     }
     /** @private */
     toString(skip) {
-        if (skip && !this.parentNode?.getAttribute('built')) { // NOT FOR TEMPLATE
+        if (skip && !this.parentNode?.getAttribute('built')) { // eslint-disable-line unicorn/prefer-ternary
             return (0, string_1.removeComment)(this.data);
         }
         return this.data;

package/dist/src/attribute.js

@@ -178,19 +178,19 @@ class AttributeToken extends index_2.Token {
                 }
             }
         }
-        else if ((/^xmlns:[\w:.-]+$/u.test(name) || urlAttrs.has(name)) && evil.test(value)
-            || simple
-                && (name === 'href' || type === 'ext-attr' && tag === 'img' && name === 'src')
-                && !new RegExp(String.raw `^(?:${this.getAttribute('config').protocol}|//)\S+$`, 'iu')
-                    .test(value)) {
-            LINT: {
-                const s = lintConfig.getSeverity(rule, 'value');
-                return s && (0, lint_1.generateForChild)(lastChild, rect, rule, 'illegal-attribute-value', s);
+        else {
+            let valueIssue = (/^xmlns:[\w:.-]+$/u.test(name) || urlAttrs.has(name)) && evil.test(value)
+                || simple
+                    && (name === 'href' || type === 'ext-attr' && tag === 'img' && name === 'src')
+                    && !new RegExp(String.raw `^(?:${this.getAttribute('config').protocol}|//)\S+$`, 'iu')
+                        .test(value);
+            if (simple && !valueIssue && type !== 'ext-attr') {
+                const data = (0, lint_1.provideValues)(tag, name), v = value.toLowerCase();
+                if (data.length > 0 && data.every(n => n !== v)) {
+                    valueIssue = true;
+                }
             }
-        }
-        else if (simple && type !== 'ext-attr') {
-            const data = (0, lint_1.provideValues)(tag, name), v = value.toLowerCase();
-            if (data.length > 0 && data.every(n => n !== v)) {
+            if (valueIssue) {
                 LINT: {
                     const s = lintConfig.getSeverity(rule, 'value');
                     return s && (0, lint_1.generateForChild)(lastChild, rect, rule, 'illegal-attribute-value', s);

package/dist/src/converterRule.js

@@ -86,7 +86,7 @@ let ConverterRuleToken = (() => {
          */
         constructor(rule, hasColon = true, config = index_1.default.getConfig(), accum = []) {
             super(undefined, config, accum, {});
-            const i = rule.indexOf(':'), j = rule.slice(0, i).indexOf('=>'), v = j === -1 ? rule.slice(0, i) : rule.slice(j + 2, i);
+            const i = rule.indexOf(':'), j = rule.slice(0, i).indexOf('=>'), v = rule.slice(j === -1 ? 0 : j + 2, i);
             if (hasColon && config.variants.includes(v.trim())) {
                 super.insertAt(new atom_1.AtomToken(v, 'converter-rule-variant', config, accum));
                 super.insertAt(getRuleFromTo(rule.slice(i + 1), 'to', config, accum));

package/dist/src/index.js

@@ -113,6 +113,7 @@ class Token extends element_1.AstElement {
             return this;
         }
         /* c8 ignore start */
+        // eslint-disable-next-line unicorn/prefer-combined-guards
         if (this.#stage >= constants_1.MAX_STAGE) {
             return this;
         }

package/dist/src/link/base.js

@@ -124,7 +124,7 @@ let LinkBaseToken = (() => {
         /** @private */
         toString(skip) {
             const str = super.toString(skip, this.#delimiter);
-            if (this.#bracket) { // NOT FOR TEMPLATE
+            if (this.#bracket) { // eslint-disable-line unicorn/prefer-ternary
                 return `[[${str}]]`;
             }
             return str;
@@ -137,7 +137,7 @@ let LinkBaseToken = (() => {
                     'trim']()
                 : `${target.trim()}|${(0, string_1.text)(childNodes.slice(1)
                     .filter(({ type: t, name }) => t !== 'image-parameter' || name !== 'invalid'), '|')}`;
-            if (this.#bracket) { // NOT FOR TEMPLATE
+            if (this.#bracket) { // eslint-disable-line unicorn/prefer-ternary
                 return `[[${str}]]`;
             }
             return str;

package/dist/src/multiLine/gallery.js

@@ -28,7 +28,7 @@ class GalleryToken extends index_2.MultiLineToken {
                     continue;
                 }
                 const [, file, alt] = matches;
-                if (this.#checkFile(file)) {
+                if (this.#checkFile(file)) { // eslint-disable-line unicorn/prefer-ternary
                     // @ts-expect-error abstract class
                     super.insertAt(new galleryImage_1.GalleryImageToken('gallery', file, alt, config, accum));
                 }

package/dist/src/transclude.js

@@ -333,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);

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/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.48.0",
+	"version": "2.48.1",
 	"description": "A Node.js linter for MediaWiki markup",
 	"keywords": [
 		"mediawiki",
@@ -39,7 +39,7 @@
 		"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",
@@ -47,15 +47,15 @@
 		"diff": "bash diff.sh",
 		"diff:stat": "f() { git diff --stat -w --color=always $1 $2 -- . | grep '\\.ts'; }; f",
 		"lint:ts": "[ ! -f dist/bin/config.js ] && npm run build:core; 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: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,26 +98,26 @@
 		}
 	},
 	"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.1.0",
-		"vscode-languageserver-types": "^3.18.3"
+		"vscode-languageserver-types": "^3.18.4"
 	},
 	"devDependencies": {
-		"@bhsd/code-standard": "^4.3.0",
+		"@bhsd/code-standard": "^5.0.0",
 		"@bhsd/nodejs": "^1.2.1",
-		"@bhsd/test-util": "^3.2.1",
+		"@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.11.0",
-		"markdownlint-cli2": "^0.23.3",
+		"eslint": "^10.13.0",
 		"mathoid-texvcjs": "^0.6.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",