wikilint 2.44.0 → 2.46.0

package/dist/src/tagPair/ext.js

@@ -104,8 +104,6 @@ let ExtToken = (() => {
                 case 'combooption':
                 case 'tab':
                 case 'tabs':
-                case 'poll':
-                case 'seo':
                 case 'langconvert':
                 case 'phonos':
                     switch (lcName) {
@@ -124,6 +122,12 @@ let ExtToken = (() => {
                     }
                     innerToken = new index_2.Token(inner, newConfig, accum);
                     break;
+                case 'poll': {
+                    const { MultiLineToken } = require('../multiLine/index');
+                    // @ts-expect-error abstract class
+                    innerToken = new MultiLineToken(inner, newConfig, accum);
+                    break;
+                }
                 case 'dynamicpagelist': {
                     const { ParamTagToken } = require('../multiLine/paramTag');
                     // @ts-expect-error abstract class
@@ -182,6 +186,18 @@ let ExtToken = (() => {
                     innerToken = new CategorytreeToken(inner, undefined, newConfig, accum);
                     break;
                 }
+                case 'seo': {
+                    const { FuncTagToken } = require('../funcTag');
+                    // @ts-expect-error abstract class
+                    innerToken = new FuncTagToken(inner, newConfig, accum);
+                    break;
+                }
+                case 'charinsert': {
+                    const { CharinsertToken } = require('../multiLine/charinsert');
+                    // @ts-expect-error abstract class
+                    innerToken = new CharinsertToken(inner, newConfig, accum);
+                    break;
+                }
                 // 更多定制扩展的代码示例：
                 // ```
                 // case 'extensionName': {
@@ -222,6 +238,11 @@ let ExtToken = (() => {
             }
         }
         /** @private */
+        text() {
+            const { name, firstChild, lastChild, selfClosing } = this;
+            return `<${name}${firstChild.text()}${selfClosing ? '/>' : `>${lastChild.text()}</${name}>`}`;
+        }
+        /** @private */
         lint(start = this.getAbsoluteIndex(), re) {
             LINT: {
                 const errors = super.lint(start, re), { name } = this, { lintConfig } = index_1.default, rect = new rect_1.BoundingRect(this, start);

package/dist/src/tagPair/index.js

@@ -88,16 +88,7 @@ let TagPairToken = (() => {
         /** @private */
         toString(skip) {
             const { firstChild, lastChild, } = this, [opening, closing] = this.#tags;
-            return this.#selfClosing
-                ? `<${opening}${firstChild.toString(skip)}/>`
-                : `<${opening}${firstChild.toString(skip)}>${lastChild.toString(skip)}${this.closed ? `</${closing}>` : ''}`;
-        }
-        /** @private */
-        text() {
-            const [opening, closing] = this.#tags;
-            return this.#selfClosing
-                ? `<${opening}${this.firstChild.text()}/>`
-                : `<${opening}${super.text('>')}${this.closed ? `</${closing}>` : ''}`;
+            return `<${opening}${firstChild.toString(skip)}${this.#selfClosing ? '/>' : `>${lastChild.toString(skip)}${this.closed ? `</${closing}>` : ''}`}`;
         }
         /** @private */
         getAttribute(key) {

package/dist/src/transclude.js

@@ -129,9 +129,7 @@ let TranscludeToken = (() => {
             }
             const colon = title.search(/[:：]/u), fullWidth = title[colon] === '：', isFunction = colon !== -1;
             if (isFunction || parts.length === 0 && !this.#raw) {
-                const magicWord = isFunction ? title.slice(0, colon) : title, arg = isFunction && title.slice(colon + 1), cleaned = (0, string_1.removeComment)(magicWord), name = isFunction
-                    ? cleaned.slice(cleaned.search(/\S/u)) + (fullWidth ? '：' : '')
-                    : cleaned.trim(), 
+                const magicWord = isFunction ? title.slice(0, colon) : title, arg = isFunction && title.slice(colon + 1), cleaned = (0, string_1.removeComment)(magicWord), name = isFunction ? (0, string_1.trimStart)(cleaned) + (fullWidth ? '：' : '') : cleaned.trim(), 
                 // eslint-disable-next-line @typescript-eslint/no-unused-vars
                 [, isSensitive, canonicalName] = (0, debug_1.getMagicWordInfo)(name, parserFunction), isFunc = !('functionHook' in config) || functionHook.includes(canonicalName), isVar = variable.includes(canonicalName);
                 if (isFunction ? canonicalName && isFunc : isVar) {
@@ -254,11 +252,11 @@ let TranscludeToken = (() => {
             if (type === 'magic-word' && name === 'vardefine') {
                 return '';
             }
-            return `{{${modifier}${type === 'magic-word'
-                ? firstChild.text()
-                    + (length === 1 ? '' : this.#colon)
-                    + (0, string_1.text)(childNodes.slice(1), '|')
-                : super.text('|')}}}`;
+            const delimiter = type === 'magic-word' ? this.#colon : '|';
+            return `{{${modifier.trim().toLowerCase()}${firstChild.text().trim()}${length === 1 ? '' : delimiter}${childNodes.slice(1).map(child => {
+                const str = child.text();
+                return child.type === 'parameter' ? str : str.trim();
+            }).join('|')}}}`;
         }
         /** @private */
         getAttribute(key) {
@@ -280,7 +278,7 @@ let TranscludeToken = (() => {
                 if (!this.isTemplate()) {
                     return errors;
                 }
-                const { type, childNodes, length } = this, rect = new rect_1.BoundingRect(this, start), { lintConfig } = index_1.default, { computeEditInfo } = lintConfig, invoke = type === 'magic-word';
+                const { type, childNodes, length: l } = this, rect = new rect_1.BoundingRect(this, start), { lintConfig } = index_1.default, { computeEditInfo } = lintConfig, invoke = type === 'magic-word';
                 let rule = 'no-ignored', s = lintConfig.getSeverity(rule, 'fragment');
                 if (invoke && !this.#getTitle().valid) {
                     rule = 'invalid-invoke';
@@ -304,7 +302,7 @@ let TranscludeToken = (() => {
                 }
                 rule = 'invalid-invoke';
                 s = lintConfig.getSeverity(rule, 'function');
-                if (s && invoke && length === 2) {
+                if (s && invoke && l === 2) {
                     errors.push((0, lint_1.generateForSelf)(this, rect, rule, 'missing-function', s));
                     return errors;
                 }
@@ -312,15 +310,17 @@ let TranscludeToken = (() => {
                 s = lintConfig.getSeverity(rule, 'parameter');
                 if (s) {
                     const duplicatedArgs = this.getDuplicatedArgs()
-                        .filter(([, parameter]) => !parameter[0].querySelector('ext')), msg = 'duplicate-parameter';
+                        .filter(([, parameter]) => !parameter[0].querySelector('ext'));
                     for (const [, args] of duplicatedArgs) {
-                        Array.prototype.push.apply(errors, args.map(arg => {
-                            const e = (0, lint_1.generateForChild)(arg, rect, rule, msg, s);
+                        const { length } = args, duplication = Array.from({ length });
+                        for (let i = length - 1; i >= 0; i--) {
+                            const arg = args[i], e = (0, lint_1.generateForChild)(arg, rect, rule, 'duplicate-parameter', s);
                             if (computeEditInfo) {
                                 e.suggestions = [(0, lint_1.fixByRemove)(e, -1)];
                             }
-                            return e;
-                        }));
+                            duplication[i] = e;
+                        }
+                        Array.prototype.push.apply(errors, duplication);
                     }
                 }
                 return errors;

package/dist/util/sharable.js

@@ -276,4 +276,26 @@ exports.extParams = (() => ({
         'tour',
         'arialabel',
     ],
+    seo: [
+        'hreflang_$1',
+        'title',
+        'title_mode',
+        'title_separator',
+        'keywords',
+        'description',
+        'canonical',
+        'robots',
+        'googlebot',
+        'image',
+        'image_width',
+        'image_height',
+        'image_alt',
+        'type',
+        'site_name',
+        'locale',
+        'section',
+        'author',
+        'published_time',
+        'twitter_site',
+    ],
 }))();

package/dist/util/sharable.mjs

@@ -273,6 +273,28 @@ const extParams = /* @__PURE__ */ (() => ({
     "searchfilter",
     "tour",
     "arialabel"
+  ],
+  seo: [
+    "hreflang_$1",
+    "title",
+    "title_mode",
+    "title_separator",
+    "keywords",
+    "description",
+    "canonical",
+    "robots",
+    "googlebot",
+    "image",
+    "image_width",
+    "image_height",
+    "image_alt",
+    "type",
+    "site_name",
+    "locale",
+    "section",
+    "author",
+    "published_time",
+    "twitter_site"
   ]
 }))();
 export {

package/dist/util/string.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toLowerCase = exports.decodeNumber = exports.decodeHtml = exports.decodeHtmlBasic = exports.text = exports.removeComment = exports.tidy = exports.trimLc = exports.extUrlChar = exports.extUrlCharFirst = exports.zs = void 0;
+exports.toLowerCase = exports.decodeNumber = exports.decodeHtml = exports.decodeHtmlBasic = exports.text = exports.removeCommentLine = exports.removeComment = exports.tidy = exports.trimStart = exports.trimLc = exports.extUrlChar = exports.extUrlCharFirst = exports.zs = void 0;
 exports.restore = restore;
+const common_1 = require("@bhsd/common");
 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})`;
@@ -12,6 +13,12 @@ exports.extUrlChar = String.raw `(?:${commonExtUrlChar}|\0\d+[cn!~]\x7F)*`;
  */
 const trimLc = (s) => s.trim().toLowerCase();
 exports.trimLc = trimLc;
+/**
+ * trim starting whitespaces
+ * @param s 字符串
+ */
+const trimStart = (s) => s.slice((0, common_1.numLeadingSpaces)(s));
+exports.trimStart = trimStart;
 function restore(s, stack, translate) {
     if (translate === 1) {
         return s.replace(/\0(\d+)g\x7F/gu, (_, p1) => restore(String(stack[p1]), stack, 2));
@@ -31,6 +38,24 @@ const factory = (regex, replace) => (str) => str.replace(regex, replace);
 exports.tidy = factory(/[\0\x7F]|\r$/gmu, '');
 /** remove half-parsed comment-like tokens */
 exports.removeComment = factory(/\0\d+[cn]\x7F/gu, '');
+/**
+ * remove lines that only contain comments
+ * @param str
+ * @param standalone whether for a standalone document
+ */
+const removeCommentLine = (str, standalone) => {
+    const lines = str.split('\n'), { length } = lines;
+    if (!standalone && length < 3) {
+        return (0, exports.removeComment)(str);
+    }
+    const offset = standalone ? 0 : 1, end = length - offset;
+    return (0, exports.removeComment)([
+        ...lines.slice(0, offset),
+        ...lines.slice(offset, end).filter(line => !/^(?!\s*$)(?:\s|\0\d+c\x7F)*$/u.test(line)),
+        ...lines.slice(end),
+    ].join('\n'));
+};
+exports.removeCommentLine = removeCommentLine;
 /**
  * extract effective wikitext
  * @param childNodes a Token's contents
@@ -52,7 +77,7 @@ const decodeHtml = (str) => {
     decodeHtmlResolved ??= (() => {
         /* NOT FOR BROWSER ONLY */
         // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-        if (typeof process === 'object' && typeof process.versions?.node === 'string') {
+        NPM: if (typeof process === 'object' && typeof process.versions?.node === 'string') {
             try {
                 const { decodeHTMLStrict } = require('entities');
                 return (s) => decodeHTMLStrict(s).replaceAll('\xA0', ' ');

package/i18n/en.json

@@ -14,6 +14,7 @@
 	"delink": null,
 	"duplicate-attribute": "duplicate $1 attribute",
 	"duplicate-category": "duplicate category",
+	"duplicate-ext-parameter": "duplicate parameter of <$1>",
 	"duplicate-id": "duplicate HTML id",
 	"duplicate-image-parameter": "duplicate image $1 parameter",
 	"duplicate-parameter": "duplicate template parameter",
@@ -39,6 +40,7 @@
 	"invalid-category": "invalid category name",
 	"invalid-content": "invalid content in <$1>",
 	"invalid-conversion-flag": "invalid conversion flag",
+	"invalid-coord": "invalid coordinates",
 	"invalid-gallery": "invalid gallery image",
 	"invalid-gallery-link": "invalid link in gallery image",
 	"invalid-image-parameter": "invalid image parameter",
@@ -46,6 +48,7 @@
 	"invalid-isbn": "invalid ISBN",
 	"invalid-parameter": "invalid parameter of <$1>",
 	"invalid-self-closing": "invalid self-closing tag",
+	"invalid-space": "invalid whitespace in <$1>",
 	"invalid-thumb": "invalid thumbnail filename",
 	"invalid-url": "invalid URL",
 	"invisible-triple-braces": "invisible content inside triple braces",
@@ -86,6 +89,7 @@
 	"unexpected-argument": "unexpected template argument",
 	"unmatched-closing": "unmatched closing tag",
 	"unnecessary-encoding": "unnecessary percent-encoding in an internal link",
+	"unrecognized-shape": "unrecognized shape, which must be one of \"default\", \"rect\", \"circle\", or \"poly\"",
 	"uppercase": null,
 	"useless-attribute": "useless attribute",
 	"useless-fragment": "useless fragment",

package/i18n/zh-hans.json

@@ -14,6 +14,7 @@
 	"delink": "移除链接",
 	"duplicate-attribute": "重复的$1属性",
 	"duplicate-category": "重复的分类",
+	"duplicate-ext-parameter": "重复的<$1>参数",
 	"duplicate-id": "重复的HTML id属性",
 	"duplicate-image-parameter": "重复的图像$1参数",
 	"duplicate-parameter": "重复的模板参数",
@@ -39,6 +40,7 @@
 	"invalid-category": "无效的分类名",
 	"invalid-content": "<$1>中的无效内容",
 	"invalid-conversion-flag": "无效的转换旗标",
+	"invalid-coord": "不正确的坐标",
 	"invalid-gallery": "无效的图库图像",
 	"invalid-gallery-link": "图库图像中的无效链接",
 	"invalid-image-parameter": "无效的图像参数",
@@ -46,6 +48,7 @@
 	"invalid-isbn": "无效的ISBN",
 	"invalid-parameter": "无效的<$1>参数",
 	"invalid-self-closing": "无效自封闭标签",
+	"invalid-space": "<$1>中的无效空白字符",
 	"invalid-thumb": "无效的缩略图文件名",
 	"invalid-url": "无效的URL",
 	"invisible-triple-braces": "三重括号内的不可见内容",
@@ -86,6 +89,7 @@
 	"unexpected-argument": "未预期的模板参数",
 	"unmatched-closing": "未匹配的结束标签",
 	"unnecessary-encoding": "内部链接中不必要的百分号编码",
+	"unrecognized-shape": "未能认出的形状，必须是这些字面量：\"default\"、\"rect\"、\"circle\"、\"poly\"",
 	"uppercase": "大写",
 	"useless-attribute": "无用的属性",
 	"useless-fragment": "无用的片段",

package/i18n/zh-hant.json

@@ -14,6 +14,7 @@
 	"delink": "解除連結",
 	"duplicate-attribute": "重複的$1屬性",
 	"duplicate-category": "重複的分類",
+	"duplicate-ext-parameter": "重複的<$1>參數",
 	"duplicate-id": "重複的HTML id屬性",
 	"duplicate-image-parameter": "重複的圖片$1參數",
 	"duplicate-parameter": "重複的模板參數",
@@ -39,6 +40,7 @@
 	"invalid-category": "無效的分類名",
 	"invalid-content": "<$1>有無效內容",
 	"invalid-conversion-flag": "無效的轉換旗標",
+	"invalid-coord": "不正確的座標",
 	"invalid-gallery": "無效的圖庫圖片",
 	"invalid-gallery-link": "圖庫圖片裡有無效連結",
 	"invalid-image-parameter": "無效的圖片參數",
@@ -46,6 +48,7 @@
 	"invalid-isbn": "無效的ISBN",
 	"invalid-parameter": "無效的<$1>參數",
 	"invalid-self-closing": "無效自封閉標籤",
+	"invalid-space": "<$1>裡有無效空白字元",
 	"invalid-thumb": "無效的縮略圖檔名",
 	"invalid-url": "無效的URL",
 	"invisible-triple-braces": "三重括號內有不可見內容",
@@ -86,6 +89,7 @@
 	"unexpected-argument": "未預期的模板參數",
 	"unmatched-closing": "未匹配的結束標籤",
 	"unnecessary-encoding": "內部連結中有不需要的百分比編碼",
+	"unrecognized-shape": "無法辨識的形狀，必須使用下列其中一組字：\"default\"、\"rect\"、\"circle\"或\"poly\"",
 	"uppercase": "大寫",
 	"useless-attribute": "無用屬性",
 	"useless-fragment": "無用的片段內容",

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wikilint",
-	"version": "2.44.0",
+	"version": "2.46.0",
 	"description": "A Node.js linter for MediaWiki markup",
 	"keywords": [
 		"mediawiki",
@@ -42,19 +42,19 @@
 		"ls": "npm i --package-lock-only && npm ls --package-lock-only --all --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: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 && mocha dist/test/json.js",
+		"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",
 		"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",
-		"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:unit": "testUtil dist/test/test.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:parseronly": "LSP=0 npm run test:parser",
 		"test:ci": "LSP=0 npm test",
@@ -74,7 +74,6 @@
 		]
 	},
 	"peerDependencies": {
-		"color-name": ">=2.0.0",
 		"mathoid-texvcjs": ">=0.4.0",
 		"stylelint": ">=16.0.0",
 		"vscode-css-languageservice": ">=3.0.0",
@@ -82,9 +81,6 @@
 		"vscode-json-languageservice": ">=3.2.0"
 	},
 	"peerDependenciesMeta": {
-		"color-name": {
-			"optional": true
-		},
 		"mathoid-texvcjs": {
 			"optional": true
 		},
@@ -102,28 +98,24 @@
 		}
 	},
 	"dependencies": {
-		"@bhsd/cm-util": "^2.2.0",
-		"@bhsd/common": "^2.2.1",
+		"@bhsd/cm-util": "^2.3.0",
+		"@bhsd/common": "^4.0.0",
 		"@bhsd/stylelint-util": "^1.1.0",
 		"entities": "^8.0.0",
-		"vscode-languageserver-types": "^3.17.5"
+		"vscode-languageserver-types": "^3.18.0"
 	},
 	"devDependencies": {
-		"@bhsd/code-standard": "^2.6.2",
-		"@bhsd/nodejs": "^1.0.1",
-		"@bhsd/test-util": "^1.5.0",
-		"@types/color-name": "^2.0.0",
-		"@types/color-rgba": "^2.1.3",
+		"@bhsd/code-standard": "^3.1.0",
+		"@bhsd/nodejs": "^1.2.1",
+		"@bhsd/test-util": "^3.1.0",
 		"c8": "^11.0.0",
-		"color-name": "~2.0.2",
-		"color-rgba": "^3.0.0",
+		"culori": "^4.0.2",
 		"diff2html-cli": "^5.2.15",
-		"esbuild": "^0.28.0",
-		"eslint": "^10.4.1",
-		"markdownlint-cli2": "^0.22.1",
+		"esbuild": "^0.28.1",
+		"eslint": "^10.7.0",
+		"markdownlint-cli2": "^0.23.0",
 		"mathoid-texvcjs": "^0.6.0",
-		"mocha": "^11.7.6",
-		"stylelint": "^17.13.0",
+		"stylelint": "^17.14.0",
 		"typescript": "^6.0.3",
 		"v8r": "^6.1.0",
 		"vscode-css-languageservice": "^6.3.10",

package/dist/src/imagemapLink.js

@@ -1,34 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ImagemapLinkToken = void 0;
-const index_1 = require("./index");
-const noinclude_1 = require("./nowiki/noinclude");
-const index_2 = require("./link/index");
-const extLink_1 = require("./extLink");
-/**
- * link inside the `<imagemap>`
- *
- * `<imagemap>`内的链接
- * @classdesc `{childNodes: [AstText, LinkToken|ExtLinkToken, NoincludeToken]}`
- */
-class ImagemapLinkToken extends index_1.Token {
-    get type() {
-        return 'imagemap-link';
-    }
-    /**
-     * @param pre 链接前的文本
-     * @param linkStuff 内外链接
-     * @param post 链接后的文本
-     */
-    constructor(pre, linkStuff, post, config, accum = []) {
-        super(undefined, config, accum);
-        this.append(pre, linkStuff.length === 2
-            // @ts-expect-error abstract class
-            ? new index_2.LinkToken(...linkStuff, config, accum)
-            // @ts-expect-error abstract class
-            : new extLink_1.ExtLinkToken(...linkStuff, config, accum), 
-        // @ts-expect-error abstract class
-        new noinclude_1.NoincludeToken(post, config, accum));
-    }
-}
-exports.ImagemapLinkToken = ImagemapLinkToken;