wikilint 2.13.3 → 2.13.5

package/config/default.json

@@ -383,7 +383,6 @@
 			"#匹配式": "ifeq",
 			"#若相等": "ifeq",
 			"#如果相等": "ifeq",
-			"#若表達式": "ifeq",
 			"#ifeq": "ifeq",
 			"#多选式": "switch",
 			"#多条件式": "switch",
@@ -397,6 +396,7 @@
 			"#如有": "ifexist",
 			"#ifexist": "ifexist",
 			"#若表达式": "ifexpr",
+			"#若表達式": "ifexpr",
 			"#ifexpr": "ifexpr",
 			"#错误式": "iferror",
 			"#如果错误": "iferror",

package/config/zhwiki.json

@@ -364,7 +364,6 @@
 			"#匹配式": "ifeq",
 			"#若相等": "ifeq",
 			"#如果相等": "ifeq",
-			"#若表達式": "ifeq",
 			"#ifeq": "ifeq",
 			"#多选式": "switch",
 			"#多条件式": "switch",
@@ -378,6 +377,7 @@
 			"#如有": "ifexist",
 			"#ifexist": "ifexist",
 			"#若表达式": "ifexpr",
+			"#若表達式": "ifexpr",
 			"#ifexpr": "ifexpr",
 			"#错误式": "iferror",
 			"#如果错误": "iferror",

package/dist/lib/node.d.ts

@@ -39,6 +39,12 @@ export declare abstract class AstNode implements AstNodeBase {
     get offsetWidth(): number;
     /** 获取根节点 */
     getRootNode(): Token | this;
+    /**
+     * 将行列号转换为字符位置
+     * @param top 行号
+     * @param left 列号
+     */
+    indexFromPos(top: number, left: number): number | undefined;
     /**
      * 将字符位置转换为行列号
      * @param index 字符位置

package/dist/lib/node.js

@@ -71,6 +71,17 @@ class AstNode {
         }
         return parentNode ?? this;
     }
+    /**
+     * 将行列号转换为字符位置
+     * @param top 行号
+     * @param left 列号
+     */
+    indexFromPos(top, left) {
+        const lines = String(this).split('\n');
+        return top >= 0 && left >= 0 && top <= lines.length - 1 && left <= lines[top].length
+            ? lines.slice(0, top).reduce((acc, cur) => acc + cur.length + 1, 0) + left
+            : undefined;
+    }
     /**
      * 将字符位置转换为行列号
      * @param index 字符位置

package/dist/src/transclude.js

@@ -59,7 +59,7 @@ class TranscludeToken extends index_2.Token {
         if (isFunction || parts.length === 0 && !this.#raw) {
             const [magicWord, ...arg] = title.split(':'), cleaned = (0, string_1.removeComment)(magicWord), name = cleaned[arg.length > 0 ? 'trimStart' : 'trim'](), lcName = name.toLowerCase(), canonicalName = Object.prototype.hasOwnProperty.call(insensitive, lcName) && insensitive[lcName], isSensitive = sensitive.includes(name), isVar = isSensitive || insensitiveVars.has(canonicalName);
             if (isVar || isFunction && canonicalName) {
-                this.setAttribute('name', canonicalName || lcName);
+                this.setAttribute('name', canonicalName || lcName.replace(/^#/u, ''));
                 this.#type = 'magic-word';
                 const pattern = new RegExp(String.raw `^\s*${name}\s*$`, isSensitive ? 'u' : 'iu'), token = new syntax_1.SyntaxToken(magicWord, pattern, 'magic-word-name', config, accum, {});
                 super.insertAt(token);

package/dist/util/sharable.d.ts

@@ -0,0 +1 @@
+export declare const commonHtmlAttrs: Set<string>, htmlAttrs: Record<string, Set<string>>, extAttrs: Record<string, Set<string>>, obsoleteAttrs: Record<string, Set<string>>;

package/dist/util/string.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.noWrap = exports.decodeNumber = exports.decodeHtml = exports.text = exports.rawurldecode = exports.escapeRegExp = exports.removeComment = exports.tidy = exports.extUrlChar = exports.extUrlCharFirst = void 0;
+exports.noWrap = exports.decodeNumber = exports.decodeHtml = exports.text = exports.escapeRegExp = exports.removeComment = exports.tidy = exports.extUrlChar = exports.extUrlCharFirst = exports.rawurldecode = void 0;
+var common_1 = require("@bhsd/common");
+Object.defineProperty(exports, "rawurldecode", { enumerable: true, get: function () { return common_1.rawurldecode; } });
 const commonExtUrlChar = String.raw `[^[\]<>"\0-\x1F\x7F\p{Zs}\uFFFD]`;
 exports.extUrlCharFirst = String.raw `(?:\[[\da-f:.]+\]|${commonExtUrlChar})`;
 exports.extUrlChar = String.raw `(?:${commonExtUrlChar}|\0\d+[cn!~]\x7F)*`;
@@ -16,12 +18,6 @@ exports.tidy = factory(/[\0\x7F]|\r$/gmu, '');
 exports.removeComment = factory(/\0\d+[cn]\x7F/gu, '');
 /** escape special chars for RegExp constructor */
 exports.escapeRegExp = factory(/[\\{}()|.?*+^$[\]]/gu, String.raw `\$&`);
-/**
- * PHP的`rawurldecode`函数的JavaScript实现
- * @param str 要解码的字符串
- */
-const rawurldecode = (str) => decodeURIComponent(str.replace(/%(?![\da-f]{2})/giu, '%25'));
-exports.rawurldecode = rawurldecode;
 /**
  * extract effective wikitext
  * @param childNodes a Token's contents

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wikilint",
-	"version": "2.13.3",
+	"version": "2.13.5",
 	"description": "A Node.js linter for MediaWiki markup",
 	"keywords": [
 		"mediawiki",
@@ -51,8 +51,27 @@
 		"chalk": "^4.1.2"
 	},
 	"devDependencies": {
-		"@bhsd/common": "^0.4.2",
+		"@bhsd/common": "^0.4.5",
+		"@stylistic/eslint-plugin": "^2.3.0",
+		"@stylistic/stylelint-plugin": "^2.0.0",
 		"@types/node": "^22.9.0",
+		"@typescript-eslint/eslint-plugin": "^7.15.0",
+		"@typescript-eslint/parser": "^7.15.0",
+		"esbuild": "^0.21.4",
+		"eslint": "^8.56.0",
+		"eslint-plugin-es-x": "^8.0.0",
+		"eslint-plugin-eslint-comments": "^3.2.0",
+		"eslint-plugin-jsdoc": "^48.5.2",
+		"eslint-plugin-json-es": "^1.6.0",
+		"eslint-plugin-markdown": "^4.0.1",
+		"eslint-plugin-n": "^17.9.0",
+		"eslint-plugin-promise": "^6.2.0",
+		"eslint-plugin-regexp": "^2.6.0",
+		"eslint-plugin-unicorn": "^54.0.0",
+		"http-server": "^14.1.0",
+		"stylelint": "^16.6.1",
+		"stylelint-config-recommended": "^14.0.0",
+		"typescript": "^5.5.3",
 		"v8r": "^3.0.0"
 	},
 	"engines": {