wikilint 2.20.1 → 2.20.3

package/dist/bin/config.js

@@ -116,7 +116,6 @@ exports.default = async (site, url, force, internal) => {
             ...ns.map(([id, canonical]) => [canonical.toLowerCase(), Number(id)]),
             ...namespacealiases.filter(({ id }) => filterGadget(id)).map(({ id, alias }) => [alias.toLowerCase(), id]),
         ]),
-        functionHook: [...functionhooks.map(s => s.toLowerCase()), 'msgnw'],
         articlePath: articlepath,
     };
     config.doubleUnderscore[0] = [];
@@ -124,6 +123,9 @@ exports.default = async (site, url, force, internal) => {
     Object.assign(config.parserFunction[0], (0, cm_1.getConfig)(magicwords, ({ name }) => name === 'msgnw'));
     config.parserFunction[2] = getAliases(magicwords, new Set(['msg', 'raw']));
     config.parserFunction[3] = getAliases(magicwords, new Set(['subst', 'safesubst']));
+    if (!mwConfig.functionHooks) {
+        Object.assign(config, { functionHook: [...functionhooks.map(s => s.toLowerCase()), 'msgnw'] });
+    }
     if (!mwConfig.variableIDs) {
         const { query: { variables } } = await (await fetch(`${url}/api.php?${new URLSearchParams({ ...params, siprop: 'variables' }).toString()}`)).json();
         Object.assign(config, { variable: [...new Set([...variables, '='])] });

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 */ {
@@ -101,6 +101,7 @@ class AstText extends node_1.AstNode {
                 isHtmlAttrVal = true;
             }
             else if (tag === 'ref' && (grandName === 'name' || grandName === 'extends' || grandName === 'follow')
+                || grandName === 'group' && (tag === 'ref' || tag === 'references')
                 || tag === 'choose' && (grandName === 'before' || grandName === 'after')) {
                 return [];
             }
@@ -116,7 +117,7 @@ class AstText extends node_1.AstNode {
             return [];
         }
         errorRegex.lastIndex = 0;
-        const errors = [], nextType = nextSibling?.type, nextName = nextSibling?.name, previousType = previousSibling?.type, root = this.getRootNode(), rootStr = root.toString(), { ext, html } = root.getAttribute('config'), { top, left } = root.posFromIndex(start), tags = new Set([
+        const errors = [], nextType = nextSibling?.type, nextName = nextSibling?.name, previousType = previousSibling?.type, root = this.getRootNode(), rootStr = root.toString(), { ext, html, variants } = root.getAttribute('config'), { top, left } = root.posFromIndex(start), tags = new Set([
             'onlyinclude',
             'noinclude',
             'includeonly',
@@ -135,7 +136,8 @@ class AstText extends node_1.AstNode {
                 error = error.slice(length);
             }
             error = error.toLowerCase();
-            const { 0: char, length } = error, magicLink = char === 'r' || char === 'p' || char === 'i';
+            const [char] = error, magicLink = char === 'r' || char === 'p' || char === 'i';
+            let { length } = error;
             if (char === '<' && !tags.has(tag.toLowerCase())
                 || char === '[' && type === 'ext-link-text' && (/&(?:rbrack|#93|#x5[Dd];);/u.test(data.slice(index + 1))
                     || nextSibling?.is('ext') && nextName === 'nowiki'
@@ -146,12 +148,14 @@ class AstText extends node_1.AstNode {
             else if (char === ']' && (index || length > 1)) {
                 errorRegex.lastIndex--;
             }
-            const startIndex = start + index, endIndex = startIndex + length, nextChar = rootStr[endIndex], previousChar = rootStr[startIndex - 1], severity = length > 1 && !(char === '<' && (/^<\s/u.test(error) || !/[\s/>]/u.test(nextChar ?? '') || disallowedTags.has(tag))
+            let startIndex = start + index, endIndex = startIndex + length;
+            const nextChar = rootStr[endIndex], previousChar = rootStr[startIndex - 1];
+            let severity = length > 1 && !(char === '<' && (/^<\s/u.test(error) || !/[\s/>]/u.test(nextChar ?? '') || disallowedTags.has(tag))
                 || isHtmlAttrVal && (char === '[' || char === ']')
                 || magicLink && type === 'parameter-value'
                 || /^(?:rfc|pmid|isbn)$/iu.test(error))
-                || char === '{' && (nextChar === char || previousChar === '-')
-                || char === '}' && (previousChar === char || nextChar === '-')
+                || char === '{' && (nextChar === char || previousChar === '-' && variants.length > 0)
+                || char === '}' && (previousChar === char || nextChar === '-' && variants.length > 0)
                 || char === '[' && (type === 'ext-link-text' || nextType === 'free-ext-link' && !data.slice(index + 1).trim())
                 || char === ']' && previousType === 'free-ext-link'
                     && !data.slice(0, index).includes(']')
@@ -178,9 +182,26 @@ class AstText extends node_1.AstNode {
             if (magicLink) {
                 error = error.toUpperCase();
             }
+            else if (error === '{' && previousChar === '-' && severity === 'error') {
+                severity = 'warning';
+                if (index > 0) {
+                    error = '-{';
+                    index--;
+                    startIndex--;
+                    length = 2;
+                }
+            }
+            else if (error === '}' && nextChar === '-' && severity === 'error') {
+                severity = 'warning';
+                if (index < data.length - 1) {
+                    error = '}-';
+                    endIndex++;
+                    length = 2;
+                }
+            }
             const pos = this.posFromIndex(index), { line: startLine, character: startCol } = (0, lint_1.getEndPos)(top, left, pos.top + 1, pos.left), e = {
                 rule: ruleMap[char],
-                message: index_1.default.msg('lonely "$1"', magicLink || char === 'h' ? error : char),
+                message: index_1.default.msg('lonely "$1"', magicLink || char === 'h' || error === '-{' || error === '}-' ? error : char),
                 severity,
                 startIndex,
                 endIndex,

package/dist/src/arg.js

@@ -114,13 +114,6 @@ let ArgToken = (() => {
         /** @private */
         lint(start = this.getAbsoluteIndex(), re) {
             const { childNodes: [argName, argDefault, ...rest] } = this;
-            if (!this.getAttribute('include')) {
-                const e = (0, lint_1.generateForSelf)(this, { start }, 'no-arg', 'unexpected template argument');
-                if (argDefault) {
-                    e.suggestions = [{ range: [start, e.endIndex], text: argDefault.text(), desc: 'expand' }];
-                }
-                return [e];
-            }
             argName.setAttribute('aIndex', start + 3);
             const errors = argName.lint(start + 3, re);
             if (argDefault) {
@@ -144,6 +137,13 @@ let ArgToken = (() => {
                     return e;
                 }));
             }
+            if (!this.getAttribute('include')) {
+                const e = (0, lint_1.generateForSelf)(this, { start }, 'no-arg', 'unexpected template argument', 'warning');
+                if (argDefault) {
+                    e.suggestions = [{ range: [start, e.endIndex], text: argDefault.text(), desc: 'expand' }];
+                }
+                errors.push(e);
+            }
             return errors;
         }
     };

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/base.js

@@ -157,7 +157,7 @@ let LinkBaseToken = (() => {
                 }
             }
             if (fragment !== undefined && !isLink(type)) {
-                const e = (0, lint_1.generateForChild)(target, rect, 'no-ignored', 'useless fragment'), j = target.childNodes.findIndex(c => c.type === 'text' && c.data.includes('#')), textNode = target.childNodes[j];
+                const e = (0, lint_1.generateForChild)(target, rect, 'no-ignored', 'useless fragment', 'warning'), j = target.childNodes.findIndex(c => c.type === 'text' && c.data.includes('#')), textNode = target.childNodes[j];
                 if (textNode) {
                     e.fix = {
                         range: [

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);
@@ -274,7 +274,7 @@ let TranscludeToken = (() => {
                 const child = childNodes[invoke ? 1 : 0], i = child.childNodes
                     .findIndex(c => c.type === 'text' && (0, string_1.decodeHtml)(c.data).includes('#')), textNode = child.childNodes[i];
                 if (textNode) {
-                    const e = (0, lint_1.generateForChild)(child, rect, 'no-ignored', 'useless fragment');
+                    const e = (0, lint_1.generateForChild)(child, rect, 'no-ignored', 'useless fragment', 'warning');
                     e.fix = {
                         range: [
                             e.startIndex + child.getRelativeIndex(i) + textNode.data.indexOf('#'),

package/i18n/zh-hans.json

@@ -4,7 +4,7 @@
 	"additional \"|\" in a table cell": "表格单元格中多余的\"|\"",
 	"additional \"|\" in the link text": "链接文本中多余的\"|\"",
 	"attributes of a closing tag": "位于闭合标签的属性",
-	"bold": "粗体单引号",
+	"bold apostrophes": "粗体单引号",
 	"bold in section header": "段落标题中的粗体",
 	"conflicting image $1 parameter": "冲突的图片$1参数",
 	"containing invalid attribute": "包含无效属性",
@@ -35,7 +35,7 @@
 	"invalid parameter of <$1>": "<$1>的无效参数",
 	"invalid self-closing tag": "无效自封闭标签",
 	"invisible content inside triple braces": "三重括号内的不可见部分",
-	"italic": "斜体单引号",
+	"italic apostrophes": "斜体单引号",
 	"lonely \"$1\"": "孤立的\"$1\"",
 	"missing module function": "缺少模块函数",
 	"nonzero tabindex": "不为0的tabindex",

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wikilint",
-	"version": "2.20.1",
+	"version": "2.20.3",
 	"description": "A Node.js linter for MediaWiki markup",
 	"keywords": [
 		"mediawiki",
@@ -66,7 +66,7 @@
 		]
 	},
 	"dependencies": {
-		"@bhsd/common": "^0.9.3",
+		"@bhsd/common": "^0.10.0",
 		"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"