wikilint 2.48.0 → 3.0.0

package/dist/src/tag/index.js

@@ -8,7 +8,7 @@ const index_1 = require("../index");
  * HTML tag
  *
  * HTML标签
- * @classdesc `{childNodes: [AttributesToken]}`
+ * @classdesc `{childNodes: [AttributesToken|SyntaxToken]}`
  */
 class TagToken extends index_1.Token {
     #closing;
@@ -47,7 +47,6 @@ class TagToken extends index_1.Token {
     findMatchingTag() {
         LINT: return (0, lint_1.cache)(this.#match, () => {
             const { type, name, closing, selfClosing, } = this;
-            // eslint-disable-next-line prefer-const
             let { parentNode } = this, isVoid = false, isFlexible = false;
             if (type === 'html') {
                 const [, flexibleTags, voidTags] = this.getAttribute('config').html;
@@ -63,9 +62,15 @@ class TagToken extends index_1.Token {
             }
             const { childNodes } = parentNode, i = childNodes.indexOf(this), siblings = closing ? childNodes.slice(0, i) : childNodes.slice(i + 1).reverse(), stack = [this], { rev } = debug_1.Shadow;
             let cur = siblings.pop(), until;
-            while (cur) {
-                // eslint-disable-next-line no-empty, @typescript-eslint/no-unnecessary-condition
+            while (cur || parentNode.is('list-range') && parentNode.parentNode) {
                 if (!cur) {
+                    const parent = parentNode.parentNode, ch = parent.childNodes, j = ch.indexOf(parentNode);
+                    Array.prototype.push.apply(siblings, closing ? ch.slice(0, j) : ch.slice(j + 1).reverse());
+                    parentNode = parent;
+                }
+                else if (cur.is('list-range')) {
+                    const ch = cur.childNodes;
+                    Array.prototype.push.apply(siblings, closing ? ch : [...ch].reverse());
                 }
                 else if (until) {
                     if (cur === until) {

package/dist/src/tagPair/ext.js

@@ -223,7 +223,7 @@ let ExtToken = (() => {
             LINT: {
                 const refName = this.getAttr('name'), text = this.innerText?.trim();
                 let msg = '';
-                if (this.closest('ext#references')) {
+                if (this.closest('ext-inner#references')) {
                     if (!refName) {
                         msg = 'no-named-in-references';
                     }

package/dist/src/transclude.d.ts

@@ -8,7 +8,7 @@ export declare const invalidTemplateMsg = "Invalid template name";
  * template or magic word
  *
  * 模板或魔术字
- * @classdesc `{childNodes: [AtomToken|SyntaxToken, ...AtomToken[], ...ParameterToken[]]}`
+ * @classdesc `{childNodes: [AtomToken|SyntaxToken, ...ParameterToken[]]}`
  */
 export declare abstract class TranscludeToken extends Token {
     #private;

package/dist/src/transclude.js

@@ -55,7 +55,7 @@ const sortArgs = /** @ignore */ ({ childNodes }, args) => [...args].sort((a, b)
  * template or magic word
  *
  * 模板或魔术字
- * @classdesc `{childNodes: [AtomToken|SyntaxToken, ...AtomToken[], ...ParameterToken[]]}`
+ * @classdesc `{childNodes: [AtomToken|SyntaxToken, ...ParameterToken[]]}`
  */
 let TranscludeToken = (() => {
     let _classDecorators = [noEscape_1.noEscape, (0, gapped_1.gapped)()];
@@ -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/debug.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mixin = exports.emptyArray = exports.getMagicWordInfo = exports.setChildNodes = exports.isLink = exports.isRowEnd = exports.Shadow = void 0;
+exports.mixin = exports.emptyArray = exports.getMagicWordInfo = exports.setChildNodes = exports.isLink = exports.isRowEnd = exports.isIsolated = exports.Shadow = void 0;
 exports.isToken = isToken;
 exports.Shadow = {
     running: false,
@@ -37,6 +37,12 @@ exports.Shadow = {
 function isToken(type) {
     return (node) => node.type === type;
 }
+/**
+ * 扩展节点是否提供独立解析环境
+ * @param name 扩展节点名称
+ */
+const isIsolated = (name) => name === 'poem' || name === 'indicator';
+exports.isIsolated = isIsolated;
 /**
  * 是否是行尾
  * @param token 节点

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/i18n/en.json

@@ -17,6 +17,7 @@
 	"duplicate-ext-parameter": "duplicate parameter of <$1>",
 	"duplicate-id": "duplicate HTML id",
 	"duplicate-image-parameter": "duplicate image $1 parameter",
+	"duplicate-name": "duplicate name of <indicator>",
 	"duplicate-parameter": "duplicate template parameter",
 	"encode": null,
 	"escape": null,

package/i18n/zh-hans.json

@@ -17,6 +17,7 @@
 	"duplicate-ext-parameter": "重复的<$1>参数",
 	"duplicate-id": "重复的HTML id属性",
 	"duplicate-image-parameter": "重复的图像$1参数",
+	"duplicate-name": "重复的<indicator> name属性",
 	"duplicate-parameter": "重复的模板参数",
 	"encode": "编码",
 	"escape": "转义",

package/i18n/zh-hant.json

@@ -17,6 +17,7 @@
 	"duplicate-ext-parameter": "重複的<$1>參數",
 	"duplicate-id": "重複的HTML id屬性",
 	"duplicate-image-parameter": "重複的圖片$1參數",
+	"duplicate-name": "重複的<indicator> name屬性",
 	"duplicate-parameter": "重複的模板參數",
 	"encode": "編碼",
 	"escape": "跳脫",

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wikilint",
-	"version": "2.48.0",
+	"version": "3.0.0",
 	"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,32 +98,32 @@
 		}
 	},
 	"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.5"
 	},
 	"devDependencies": {
-		"@bhsd/code-standard": "^4.3.0",
+		"@bhsd/code-standard": "^5.1.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.14.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",
-		"vscode-languageserver-textdocument": "^1.0.15"
+		"vscode-languageserver-textdocument": "^1.0.16"
 	},
 	"engines": {
-		"node": "^20.19.0 || ^22.13.0 || >=24.11.0"
+		"node": "^22.13.0 || >=24.11.0"
 	}
 }