wikilint 2.20.1 → 2.20.2

package/dist/lib/text.js

@@ -54,7 +54,7 @@ const errorSyntaxUrl = new RegExp(source, 'giu'), noLinkTypes = new Set(['attr-v
 ]);
 let wordRegex;
 try {
-    // eslint-disable-next-line prefer-regex-literals, es-x/no-regexp-unicode-property-escapes
+    // eslint-disable-next-line prefer-regex-literals
     wordRegex = new RegExp(String.raw `[\p{L}\p{N}_]`, 'u');
 }
 catch /* istanbul ignore next */ {

package/dist/src/attributes.js

@@ -23,7 +23,7 @@ const toAttributeType = (type) => type.slice(0, -1);
 const toDirty = (type) => `${toAttributeType(type)}-dirty`;
 let wordRegex;
 try {
-    // eslint-disable-next-line prefer-regex-literals, es-x/no-regexp-unicode-property-escapes
+    // eslint-disable-next-line prefer-regex-literals
     wordRegex = new RegExp(String.raw `[\p{L}\p{N}]`, 'u');
 }
 catch /* istanbul ignore next */ {

package/dist/src/link/file.js

@@ -14,7 +14,7 @@ const frame = new Map([
     ['frameless', 'Frameless'],
     ['framed', 'Frame'],
     ['thumbnail', 'Thumb'],
-]), horizAlign = new Set(['left', 'right', 'center', 'none']), vertAlign = new Set(['baseline', 'sub', 'super', 'top', 'text-top', 'middle', 'bottom', 'text-bottom']), extensions = new Set(['tiff', 'tif', 'png', 'gif', 'jpg', 'jpeg', 'webp', 'xcf', 'pdf', 'svg', 'djvu']);
+]), argTypes = new Set(['arg']), transclusion = new Set(['template', 'magic-word']), horizAlign = new Set(['left', 'right', 'center', 'none']), vertAlign = new Set(['baseline', 'sub', 'super', 'top', 'text-top', 'middle', 'bottom', 'text-bottom']), extensions = new Set(['tiff', 'tif', 'png', 'gif', 'jpg', 'jpeg', 'webp', 'xcf', 'pdf', 'svg', 'djvu']);
 /**
  * a more sophisticated string-explode function
  * @param str string to be exploded
@@ -39,6 +39,15 @@ const explode = (str) => {
     exploded.push(str.slice(lastIndex));
     return exploded;
 };
+/**
+ * filter out the image parameters that are not of the specified type
+ * @param args image parameter tokens
+ * @param types token types to be filtered
+ */
+const filterArgs = (args, types) => args.filter(({ childNodes }) => {
+    const visibleNodes = childNodes.filter(node => node.text().trim());
+    return visibleNodes.length !== 1 || !types.has(visibleNodes[0].type);
+});
 /**
  * image
  *
@@ -67,10 +76,7 @@ class FileToken extends base_1.LinkBaseToken {
     }
     /** @private */
     lint(start = this.getAbsoluteIndex(), re) {
-        const errors = super.lint(start, re), args = this.getAllArgs().filter(({ childNodes }) => {
-            const visibleNodes = childNodes.filter(node => node.text().trim());
-            return visibleNodes.length !== 1 || visibleNodes[0].type !== 'arg';
-        }), keys = [...new Set(args.map(({ name }) => name))], frameKeys = keys.filter(key => frame.has(key)), horizAlignKeys = keys.filter(key => horizAlign.has(key)), vertAlignKeys = keys.filter(key => vertAlign.has(key)), [fr] = frameKeys, unscaled = fr === 'framed' || fr === 'manualthumb', rect = new rect_1.BoundingRect(this, start);
+        const errors = super.lint(start, re), args = filterArgs(this.getAllArgs(), argTypes), keys = [...new Set(args.map(({ name }) => name))], frameKeys = keys.filter(key => frame.has(key)), horizAlignKeys = keys.filter(key => horizAlign.has(key)), vertAlignKeys = keys.filter(key => vertAlign.has(key)), [fr] = frameKeys, unscaled = fr === 'framed' || fr === 'manualthumb', rect = new rect_1.BoundingRect(this, start);
         if (this.closest('ext-link-text')
             && this.getValue('link')?.trim() !== '') {
             errors.push((0, lint_1.generateForSelf)(this, rect, 'nested-link', 'internal link in an external link'));
@@ -94,8 +100,8 @@ class FileToken extends base_1.LinkBaseToken {
          * @param p1 替换$1
          * @param severity 错误等级
          */
-        const generate = (msg, p1, severity) => (arg) => {
-            const e = (0, lint_1.generateForChild)(arg, rect, 'no-duplicate', index_1.default.msg(`${msg} image $1 parameter`, p1), severity);
+        const generate = (msg, p1, severity = true) => (arg) => {
+            const isError = typeof severity === 'function' ? severity(arg) : severity, e = (0, lint_1.generateForChild)(arg, rect, 'no-duplicate', index_1.default.msg(`${msg} image $1 parameter`, p1), isError ? 'error' : 'warning');
             e.suggestions = [{ desc: 'remove', range: [e.startIndex - 1, e.endIndex], text: '' }];
             return e;
         };
@@ -104,15 +110,21 @@ class FileToken extends base_1.LinkBaseToken {
             if (key === 'invalid' || key === 'width' && unscaled) {
                 continue;
             }
+            const isCaption = key === 'caption';
             let relevantArgs = args.filter(({ name }) => name === key);
-            if (key === 'caption') {
+            if (isCaption) {
                 relevantArgs = [
                     ...relevantArgs.slice(0, -1).filter(arg => arg.text()),
                     ...relevantArgs.slice(-1),
                 ];
             }
             if (relevantArgs.length > 1) {
-                errors.push(...relevantArgs.map(generate('duplicated', key, key === 'caption' && extension && !extensions.has(extension) ? 'warning' : 'error')));
+                let severity = !isCaption || !extension || extensions.has(extension);
+                if (isCaption && severity) {
+                    const plainArgs = filterArgs(relevantArgs, transclusion);
+                    severity = plainArgs.length > 1 && ((arg) => plainArgs.includes(arg));
+                }
+                errors.push(...relevantArgs.map(generate('duplicated', key, severity)));
             }
         }
         if (frameKeys.length > 1) {

package/dist/src/transclude.js

@@ -174,8 +174,8 @@ let TranscludeToken = (() => {
             }
             const magicWord = lcModifier.slice(0, -1).toLowerCase(), isRaw = raw.includes(magicWord), isSubst = subst.includes(magicWord);
             if (this.#raw && isRaw
-                || !this.#raw && (isSubst || modifier === '')
-                || (debug_1.Shadow.running || this.length > 1) && (isRaw || isSubst || modifier === '')) {
+                || !this.#raw && (isSubst || !modifier)
+                || (debug_1.Shadow.running || this.length > 1) && (isRaw || isSubst || !modifier)) {
                 this.setAttribute('modifier', modifier);
                 this.#raw = isRaw;
                 return Boolean(modifier);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wikilint",
-	"version": "2.20.1",
+	"version": "2.20.2",
 	"description": "A Node.js linter for MediaWiki markup",
 	"keywords": [
 		"mediawiki",
@@ -66,7 +66,7 @@
 		]
 	},
 	"dependencies": {
-		"@bhsd/common": "^0.9.3",
+		"@bhsd/common": "^0.9.4",
 		"vscode-languageserver-types": "^3.17.5"
 	},
 	"optionalDependencies": {
@@ -75,7 +75,7 @@
 		"entities": "^6.0.0",
 		"mathjax": "^3.2.2",
 		"minimatch": "^10.0.1",
-		"stylelint": "^16.14.1",
+		"stylelint": "^16.19.1",
 		"vscode-css-languageservice": "^6.3.4",
 		"vscode-html-languageservice": "^5.3.3",
 		"vscode-json-languageservice": "^5.4.4"
@@ -92,7 +92,6 @@
 		"color-rgba": "^3.0.0",
 		"esbuild": "^0.25.2",
 		"eslint": "^8.57.1",
-		"eslint-plugin-es-x": "^8.4.1",
 		"eslint-plugin-eslint-comments": "^3.2.0",
 		"eslint-plugin-jsdoc": "^50.6.3",
 		"eslint-plugin-json-es": "^1.6.0",
@@ -104,7 +103,6 @@
 		"http-server": "^14.1.1",
 		"mocha": "^11.1.0",
 		"nyc": "^17.1.0",
-		"stylelint-config-recommended": "^15.0.0",
 		"typescript": "^5.8.2",
 		"v8r": "^4.2.1",
 		"vscode-languageserver-textdocument": "^1.0.12"