wikilint 2.10.0 → 2.11.0

package/dist/base.d.ts

@@ -11,7 +11,7 @@ export interface Config {
     readonly variants: string[];
     readonly excludes?: string[];
 }
-export type TokenTypes = 'root' | 'plain' | 'redirect' | 'redirect-syntax' | 'redirect-target' | 'onlyinclude' | 'noinclude' | 'include' | 'comment' | 'ext' | 'ext-attrs' | 'ext-attr-dirty' | 'ext-attr' | 'attr-key' | 'attr-value' | 'ext-inner' | 'arg' | 'arg-name' | 'arg-default' | 'hidden' | 'magic-word' | 'magic-word-name' | 'invoke-function' | 'invoke-module' | 'template' | 'template-name' | 'parameter' | 'parameter-key' | 'parameter-value' | 'heading' | 'heading-title' | 'heading-trail' | 'html' | 'html-attrs' | 'html-attr-dirty' | 'html-attr' | 'table' | 'tr' | 'td' | 'table-syntax' | 'table-attrs' | 'table-attr-dirty' | 'table-attr' | 'table-inter' | 'td-inner' | 'hr' | 'double-underscore' | 'link' | 'link-target' | 'link-text' | 'category' | 'file' | 'gallery-image' | 'imagemap-image' | 'image-parameter' | 'quote' | 'ext-link' | 'ext-link-text' | 'ext-link-url' | 'free-ext-link' | 'magic-link' | 'list' | 'dd' | 'converter' | 'converter-flags' | 'converter-flag' | 'converter-rule' | 'converter-rule-variant' | 'converter-rule-to' | 'converter-rule-from' | 'param-line' | 'imagemap-link';
+export type TokenTypes = 'root' | 'plain' | 'redirect' | 'redirect-syntax' | 'redirect-target' | 'onlyinclude' | 'noinclude' | 'include' | 'comment' | 'ext' | 'ext-attrs' | 'ext-attr-dirty' | 'ext-attr' | 'attr-key' | 'attr-value' | 'ext-inner' | 'arg' | 'arg-name' | 'arg-default' | 'hidden' | 'magic-word' | 'magic-word-name' | 'invoke-function' | 'invoke-module' | 'template' | 'template-name' | 'parameter' | 'parameter-key' | 'parameter-value' | 'heading' | 'heading-title' | 'heading-trail' | 'html' | 'html-attrs' | 'html-attr-dirty' | 'html-attr' | 'table' | 'tr' | 'td' | 'table-syntax' | 'table-attrs' | 'table-attr-dirty' | 'table-attr' | 'table-inter' | 'td-inner' | 'hr' | 'double-underscore' | 'link' | 'link-target' | 'link-text' | 'category' | 'file' | 'gallery-image' | 'imagemap-image' | 'image-parameter' | 'quote' | 'ext-link' | 'ext-link-text' | 'ext-link-url' | 'free-ext-link' | 'magic-link' | 'list' | 'dd' | 'list-range' | 'converter' | 'converter-flags' | 'converter-flag' | 'converter-rule' | 'converter-rule-variant' | 'converter-rule-to' | 'converter-rule-from' | 'param-line' | 'imagemap-link';
 export declare const rules: readonly ["bold-header", "format-leakage", "fostered-content", "h1", "illegal-attr", "insecure-style", "invalid-gallery", "invalid-imagemap", "invalid-invoke", "invalid-isbn", "lonely-apos", "lonely-bracket", "lonely-http", "nested-link", "no-arg", "no-duplicate", "no-ignored", "obsolete-attr", "obsolete-tag", "parsing-order", "pipe-like", "table-layout", "tag-like", "unbalanced-header", "unclosed-comment", "unclosed-quote", "unclosed-table", "unescaped", "unknown-page", "unmatched-tag", "unterminated-url", "url-encoding", "var-anchor", "void-ext"];
 export declare namespace LintError {
     type Severity = 'error' | 'warning';

package/dist/index.js

@@ -38,23 +38,27 @@ const Parser = {
     /** @implements */
     normalizeTitle(title, defaultNs = 0, include, config = Parser.getConfig(), halfParsed, decode = false, selfLink = false) {
         const { Title } = require('./lib/title');
+        let titleObj;
         if (halfParsed) {
-            return new Title(title, defaultNs, config, decode, selfLink);
+            titleObj = new Title(title, defaultNs, config, decode, selfLink);
         }
-        const { Token } = require('./src/index');
-        return debug_1.Shadow.run(() => {
-            const root = new Token(title, config);
-            root.type = 'root';
-            root.parseOnce(0, include).parseOnce();
-            const titleObj = new Title(root.toString(), defaultNs, config, decode, selfLink);
-            for (const key of ['main', 'fragment']) {
-                const str = titleObj[key];
-                if (str?.includes('\0')) {
-                    titleObj[key] = root.buildFromStr(str, constants_1.BuildMethod.Text);
+        else {
+            const { Token } = require('./src/index');
+            titleObj = debug_1.Shadow.run(() => {
+                const root = new Token(title, config);
+                root.type = 'root';
+                root.parseOnce(0, include).parseOnce();
+                const t = new Title(root.toString(), defaultNs, config, decode, selfLink);
+                for (const key of ['main', 'fragment']) {
+                    const str = t[key];
+                    if (str?.includes('\0')) {
+                        t[key] = root.buildFromStr(str, constants_1.BuildMethod.Text);
+                    }
                 }
-            }
-            return titleObj;
-        });
+                return t;
+            });
+        }
+        return titleObj;
     },
     /** @implements */
     parse(wikitext, include, maxStage = constants_1.MAX_STAGE, config = Parser.getConfig()) {

package/dist/lib/text.js

@@ -60,8 +60,8 @@ class AstText extends node_1.AstNode {
         });
     }
     /** @private */
-    toString() {
-        return this.data;
+    toString(skip) {
+        return skip && !this.parentNode?.getAttribute('built') ? (0, string_1.removeComment)(this.data) : this.data;
     }
     /** @private */
     text() {
@@ -192,10 +192,7 @@ class AstText extends node_1.AstNode {
             }
             else if (char === ']' && previousType === 'free-ext-link' && severity === 'error') {
                 const i = start - previousSibling.toString().length;
-                e.fix = {
-                    range: [i, i],
-                    text: '[',
-                };
+                e.fix = { range: [i, i], text: '[' };
             }
             errors.push(e);
         }

package/dist/lib/title.js

@@ -2,11 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Title = void 0;
 const string_1 = require("../util/string");
-/**
- * PHP的`rawurldecode`函数的JavaScript实现
- * @param str 要解码的字符串
- */
-const rawurldecode = (str) => decodeURIComponent(str.replace(/%(?![\da-f]{2})/giu, '%25'));
 /** MediaWiki页面标题对象 */
 class Title {
     #main;
@@ -56,12 +51,12 @@ class Title {
         if (decode && title.includes('%')) {
             try {
                 const encoded = /%(?!21|3[ce]|5[bd]|7[b-d])[\da-f]{2}/iu.test(title);
-                title = rawurldecode(title);
+                title = (0, string_1.rawurldecode)(title);
                 this.encoded = encoded;
             }
             catch { }
         }
-        title = title.replace(/_/gu, ' ').trim();
+        title = title.replace(/[_ ]+/gu, ' ').trim();
         if (subpage) {
             this.ns = 0;
         }
@@ -73,7 +68,7 @@ class Title {
             }
             const m = title.split(':');
             if (m.length > 1) {
-                const id = config.nsid[m[0].trim().toLowerCase()];
+                const k = m[0].trim().toLowerCase(), id = Object.prototype.hasOwnProperty.call(config.nsid, k) && config.nsid[k];
                 if (id) {
                     ns = id;
                     title = m.slice(1).join(':').trim();
@@ -86,7 +81,7 @@ class Title {
             let fragment = title.slice(i + 1).trimEnd();
             if (fragment.includes('%')) {
                 try {
-                    fragment = rawurldecode(fragment);
+                    fragment = (0, string_1.rawurldecode)(fragment);
                 }
                 catch { }
             }

package/dist/parser/list.js

@@ -1,21 +1,36 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseList = void 0;
+const html_1 = require("../util/html");
 const list_1 = require("../src/nowiki/list");
 const dd_1 = require("../src/nowiki/dd");
 /**
  * 解析列表
  * @param wikitext
+ * @param state
+ * @param state.lastPrefix 上一个列表的前缀
  * @param config
  * @param accum
  */
-const parseList = (wikitext, config, accum) => {
+const parseList = (wikitext, state, config, accum) => {
     const mt = /^((?:\0\d+c\x7F)*)([;:*#]+\s*)/u.exec(wikitext);
     if (!mt) {
+        state.lastPrefix = '';
         return wikitext;
     }
-    const [total, comment, prefix] = mt, parts = prefix.split(/(?=;)/u);
-    let text = comment + parts.map((_, i) => `\0${accum.length + i}d\x7F`).join('') + wikitext.slice(total.length), dt = parts.length - (parts[0].startsWith(';') ? 0 : 1);
+    const [total, comment, prefix] = mt, prefix2 = prefix.replace(/;/gu, ':'), commonPrefixLength = (0, html_1.getCommon)(prefix2, state.lastPrefix), parts = (commonPrefixLength > 1 ? prefix.slice(commonPrefixLength - 1) : prefix).split(/(?=;)/u), isDt = parts[0].startsWith(';');
+    let dt = parts.length - (isDt ? 0 : 1);
+    if (commonPrefixLength > 1) {
+        const commonPrefix = prefix.slice(0, commonPrefixLength - 1);
+        if (isDt) {
+            parts.unshift(commonPrefix);
+        }
+        else {
+            parts[0] = commonPrefix + parts[0];
+        }
+    }
+    state.lastPrefix = prefix2;
+    let text = comment + parts.map((_, i) => `\0${accum.length + i}d\x7F`).join('') + wikitext.slice(total.length);
     for (const part of parts) {
         // @ts-expect-error abstract class
         new list_1.ListToken(part, config, accum);
@@ -23,7 +38,7 @@ const parseList = (wikitext, config, accum) => {
     if (!dt) {
         return text;
     }
-    const { html: [normalTags] } = config, fullRegex = /:+\s*|-\{|\0\d+[xq]\x7F/gu;
+    const { html: [normalTags] } = config, fullRegex = /:+|-\{|\0\d+[xq]\x7F/gu;
     let regex = fullRegex, ex = regex.exec(text), lt = 0, lb = false, li = false, lc = 0;
     /**
      * 创建`DdToken`

package/dist/parser/magicLinks.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseMagicLinks = void 0;
 const string_1 = require("../util/string");
 const magicLink_1 = require("../src/magicLink");
-const sepRegex = /[^,;\\.:!?)][,;\\.:!?)]+$/u, sepLparRegex = /[^,;\\.:!?][,;\\.:!?]+$/u;
 /**
  * 解析自由外链
  * @param wikitext
@@ -21,7 +20,7 @@ const parseMagicLinks = (wikitext, config, accum) => {
                 trail = url.slice(m2.index);
                 url = url.slice(0, m2.index);
             }
-            const sep = url.includes('(') ? sepLparRegex : sepRegex, sepChars = sep.exec(url);
+            const sep = url.includes('(') ? /[^,;\\.:!?][,;\\.:!?]+$/u : /[^,;\\.:!?)][,;\\.:!?)]+$/u, sepChars = sep.exec(url);
             if (sepChars) {
                 let correction = 1;
                 if (sepChars[0][1] === ';'

package/dist/src/arg.js

@@ -62,10 +62,7 @@ class ArgToken extends index_2.Token {
         if (!this.getAttribute('include')) {
             const e = (0, lint_1.generateForSelf)(this, { start }, 'no-arg', 'unexpected template argument');
             if (argDefault) {
-                e.fix = {
-                    range: [start, e.endIndex],
-                    text: argDefault.text(),
-                };
+                e.fix = { range: [start, e.endIndex], text: argDefault.text() };
             }
             return [e];
         }

package/dist/src/attribute.js

@@ -252,10 +252,7 @@ class AttributeToken extends index_2.Token {
             const e = (0, lint_1.generateForChild)(lastChild, rect, 'unclosed-quote', index_1.default.msg('unclosed $1', 'quotes'), 'warning');
             e.startIndex--;
             e.startCol--;
-            const fix = {
-                range: [e.endIndex, e.endIndex],
-                text: this.#quotes[0],
-            };
+            const fix = { range: [e.endIndex, e.endIndex], text: this.#quotes[0] };
             if (lastChild.childNodes.some(({ type: t, data }) => t === 'text' && /\s/u.test(data))) {
                 e.suggestions = [
                     {

package/dist/src/attributes.js

@@ -8,7 +8,6 @@ const index_1 = require("../index");
 const index_2 = require("./index");
 const atom_1 = require("./atom");
 const attribute_1 = require("./attribute");
-const regex = /([^\s/](?:(?!\0\d+~\x7F)[^\s/=])*)(?:((?:\s(?:\s|\0\d+c\x7F)*)?(?:=|\0\d+~\x7F)(?:\s|\0\d+c\x7F)*)(?:(["'])(.*?)(\3|$)|(\S*)))?/gsu;
 /**
  * 将属性类型转换为单属性类型
  * @param type 属性类型
@@ -38,7 +37,7 @@ class AttributesToken extends index_2.Token {
         this.#type = type;
         this.setAttribute('name', name);
         if (attr) {
-            regex.lastIndex = 0;
+            const regex = /([^\s/](?:(?!\0\d+~\x7F)[^\s/=])*)(?:((?:\s(?:\s|\0\d+c\x7F)*)?(?:=|\0\d+~\x7F)(?:\s|\0\d+c\x7F)*)(?:(["'])(.*?)(\3|$)|(\S*)))?/gsu;
             let out = '', mt = regex.exec(attr), lastIndex = 0;
             const insertDirty = /** 插入无效属性 */ () => {
                 if (out) {

package/dist/src/converterFlags.js

@@ -62,16 +62,13 @@ class ConverterFlagsToken extends index_2.Token {
                 && (variantFlags.size > 0 || !validFlags.has(flag))) {
                 const e = (0, lint_1.generateForChild)(child, rect, 'no-ignored', 'invalid conversion flag');
                 if (variantFlags.size === 0 && definedFlags.has(flag.toUpperCase())) {
-                    e.fix = {
-                        range: [e.startIndex, e.endIndex],
-                        text: flag.toUpperCase(),
-                    };
+                    e.fix = { range: [e.startIndex, e.endIndex], text: flag.toUpperCase() };
                 }
                 else {
                     e.suggestions = [
                         {
                             desc: 'remove',
-                            range: [e.startIndex, e.endIndex],
+                            range: [e.startIndex - (i && 1), e.endIndex],
                             text: '',
                         },
                     ];

package/dist/src/gallery.js

@@ -59,12 +59,13 @@ class GalleryToken extends index_2.Token {
         for (let i = 0; i < this.length; i++) {
             const child = this.childNodes[i], str = child.toString(), { length } = str, trimmed = str.trim(), startLine = top + i, startCol = i ? 0 : left;
             if (child.type === 'noinclude' && trimmed && !/^<!--.*-->$/u.test(trimmed)) {
+                const endIndex = start + length;
                 errors.push({
                     rule: 'no-ignored',
                     message: index_1.default.msg('invalid content in <$1>', 'gallery'),
                     severity: trimmed.startsWith('|') ? 'warning' : 'error',
                     startIndex: start,
-                    endIndex: start + length,
+                    endIndex,
                     startLine,
                     endLine: startLine,
                     startCol,
@@ -72,12 +73,12 @@ class GalleryToken extends index_2.Token {
                     suggestions: [
                         {
                             desc: 'remove',
-                            range: [start, start + length],
+                            range: [start, endIndex],
                             text: '',
                         },
                         {
                             desc: 'comment',
-                            range: [start, start + length],
+                            range: [start, endIndex],
                             text: `<!--${str}-->`,
                         },
                     ],

package/dist/src/html.js

@@ -125,10 +125,7 @@ class HtmlToken extends index_1.Token {
                 else if (msg === 'tag that is both closing and self-closing') {
                     const { html: [, , voidTags] } = this.getAttribute('config');
                     if (voidTags.includes(this.name)) {
-                        error.fix = {
-                            range: [start + 1, start + 2],
-                            text: '',
-                        };
+                        error.fix = { range: [start + 1, start + 2], text: '' };
                     }
                 }
                 errors.push(error);

package/dist/src/imageParameter.js

@@ -8,7 +8,7 @@ const index_2 = require("./index");
 exports.galleryParams = new Set(['alt', 'link', 'lang', 'page', 'caption']);
 function validate(key, val, config, halfParsed, ext) {
     val = val.trim();
-    let value = val.replace(/\0\d+t\x7F/gu, '').trim();
+    let value = val.replace(key === 'link' ? /\0\d+[tq]\x7F/gu : /\0\d+t\x7F/gu, '').trim();
     switch (key) {
         case 'width':
             return !value || /^(?:\d+x?|\d*x\d+)(?:\s*px)?$/u.test(value);
@@ -16,9 +16,9 @@ function validate(key, val, config, halfParsed, ext) {
             if (!value) {
                 return val;
             }
-            const regex = new RegExp(String.raw `^(?:(?:${config.protocol}|//)${string_1.extUrlCharFirst}|\0\d+m\x7F)${string_1.extUrlChar}$`, 'iu');
-            if (regex.test(value)) {
-                return val;
+            const re1 = new RegExp(String.raw `^(?:${config.protocol}|//|\0\d+m\x7F)`, 'iu'), re2 = new RegExp(String.raw `^(?:(?:${config.protocol}|//)${string_1.extUrlCharFirst}|\0\d+m\x7F)${string_1.extUrlChar}$`, 'iu');
+            if (re1.test(value)) {
+                return re2.test(value) && val;
             }
             else if (value.startsWith('[[') && value.endsWith(']]')) {
                 value = value.slice(2, -2);
@@ -106,11 +106,8 @@ class ImageParameterToken extends index_2.Token {
     lint(start = this.getAbsoluteIndex(), re) {
         const errors = super.lint(start, re), { link, name } = this;
         if (name === 'invalid') {
-            const e = (0, lint_1.generateForSelf)(this, { start }, 'invalid-gallery', 'invalid gallery image parameter');
-            e.fix = {
-                range: [start, start + e.endIndex],
-                text: '',
-            };
+            const e = (0, lint_1.generateForSelf)(this, { start }, 'invalid-gallery', 'invalid image parameter');
+            e.fix = { range: [start - 1, e.endIndex], text: '' };
             errors.push(e);
         }
         else if (typeof link === 'object' && link.encoded) {

package/dist/src/index.js

@@ -275,10 +275,10 @@ class Token extends element_1.AstElement {
             return;
         }
         const { parseList } = require('../parser/list');
-        const lines = this.firstChild.toString().split('\n');
+        const lines = this.firstChild.toString().split('\n'), state = { lastPrefix: '' };
         let i = this.type === 'root' || this.type === 'ext-inner' && this.name === 'poem' ? 0 : 1;
         for (; i < lines.length; i++) {
-            lines[i] = parseList(lines[i], this.#config, this.#accum);
+            lines[i] = parseList(lines[i], state, this.#config, this.#accum);
         }
         this.setText(lines.join('\n'));
     }

package/dist/src/link/base.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LinkBaseToken = void 0;
 const lint_1 = require("../../util/lint");
-const rect_1 = require("../../lib/rect");
 const constants_1 = require("../../util/constants");
+const rect_1 = require("../../lib/rect");
 const index_1 = require("../../index");
 const index_2 = require("../index");
 const atom_1 = require("../atom");
@@ -90,14 +90,11 @@ class LinkBaseToken extends index_2.Token {
         if (type === 'link' || type === 'category') {
             const textNode = linkText?.childNodes.find((c) => c.type === 'text' && c.data.includes('|'));
             if (textNode) {
-                const e = (0, lint_1.generateForChild)(linkText, rect, 'pipe-like', 'additional "|" in the link text', 'warning');
+                const e = (0, lint_1.generateForChild)(linkText, rect, 'pipe-like', 'additional "|" in the link text', 'warning'), i = e.startIndex + textNode.getRelativeIndex();
                 e.suggestions = [
                     {
                         desc: 'escape',
-                        range: [
-                            e.startIndex + textNode.getRelativeIndex(),
-                            e.startIndex + textNode.getRelativeIndex() + textNode.data.length,
-                        ],
+                        range: [i, i + textNode.data.length],
                         text: textNode.data.replace(/\|/gu, '|'),
                     },
                 ];

package/dist/src/link/file.d.ts

@@ -8,7 +8,6 @@ import type { Token, AtomToken } from '../../internal';
  * @classdesc `{childNodes: [AtomToken, ...ImageParameterToken]}`
  */
 export declare abstract class FileToken extends LinkBaseToken {
-    #private;
     readonly childNodes: readonly [AtomToken, ...ImageParameterToken[]];
     abstract get lastChild(): AtomToken | ImageParameterToken;
     get type(): 'file' | 'gallery-image' | 'imagemap-image';
@@ -27,12 +26,6 @@ export declare abstract class FileToken extends LinkBaseToken {
      * @param key 参数名
      */
     getArgs(key: string): ImageParameterToken[];
-    /** 获取图片框架属性参数节点 */
-    getFrameArgs(): ImageParameterToken[];
-    /** 获取图片水平对齐参数节点 */
-    getHorizAlignArgs(): ImageParameterToken[];
-    /** 获取图片垂直对齐参数节点 */
-    getVertAlignArgs(): ImageParameterToken[];
     /**
      * 获取生效的指定图片参数
      * @param key 参数名

package/dist/src/link/file.js

@@ -7,7 +7,12 @@ const rect_1 = require("../../lib/rect");
 const index_1 = require("../../index");
 const base_1 = require("./base");
 const imageParameter_1 = require("../imageParameter");
-const frame = new Set(['manualthumb', 'frameless', 'framed', 'thumbnail']), horizAlign = new Set(['left', 'right', 'center', 'none']), vertAlign = new Set(['baseline', 'sub', 'super', 'top', 'text-top', 'middle', 'bottom', 'text-bottom']);
+const frame = new Map([
+    ['manualthumb', 'Thumb'],
+    ['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']);
 /**
  * a more sophisticated string-explode function
  * @param start start syntax of a nested AST node
@@ -64,10 +69,17 @@ class FileToken extends base_1.LinkBaseToken {
         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))].filter(key => key !== 'invalid'), frameKeys = keys.filter(key => frame.has(key)), horizAlignKeys = keys.filter(key => horizAlign.has(key)), vertAlignKeys = keys.filter(key => vertAlign.has(key)), rect = new rect_1.BoundingRect(this, start);
+        }), 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'));
         }
+        if (unscaled) {
+            for (const arg of args.filter(({ name }) => name === 'width')) {
+                const e = (0, lint_1.generateForChild)(arg, rect, 'invalid-gallery', 'invalid image parameter');
+                e.fix = { range: [e.startIndex - 1, e.endIndex], text: '' };
+                errors.push(e);
+            }
+        }
         if (args.length === keys.length
             && frameKeys.length < 2
             && horizAlignKeys.length < 2
@@ -81,6 +93,9 @@ class FileToken extends base_1.LinkBaseToken {
          */
         const generate = (msg, p1) => (arg) => (0, lint_1.generateForChild)(arg, rect, 'no-duplicate', index_1.default.msg(`${msg} image $1 parameter`, p1));
         for (const key of keys) {
+            if (key === 'invalid' || key === 'width' && unscaled) {
+                continue;
+            }
             let relevantArgs = args.filter(({ name }) => name === key);
             if (key === 'caption') {
                 relevantArgs = [...relevantArgs.slice(0, -1).filter(arg => arg.text()), ...relevantArgs.slice(-1)];
@@ -111,34 +126,13 @@ class FileToken extends base_1.LinkBaseToken {
     getArgs(key) {
         return this.getAllArgs().filter(({ name }) => key === name);
     }
-    /**
-     * 获取特定类型的图片属性参数节点
-     * @param keys 接受的参数名
-     * @param type 类型名
-     */
-    #getTypedArgs(keys, type) {
-        const args = this.getAllArgs().filter(({ name }) => keys.has(name));
-        return args;
-    }
-    /** 获取图片框架属性参数节点 */
-    getFrameArgs() {
-        return this.#getTypedArgs(frame, 'frame');
-    }
-    /** 获取图片水平对齐参数节点 */
-    getHorizAlignArgs() {
-        return this.#getTypedArgs(horizAlign, 'horizontal-align');
-    }
-    /** 获取图片垂直对齐参数节点 */
-    getVertAlignArgs() {
-        return this.#getTypedArgs(vertAlign, 'vertical-align');
-    }
     /**
      * 获取生效的指定图片参数
      * @param key 参数名
      */
     getArg(key) {
         const args = this.getArgs(key);
-        return args[args.length - 1];
+        return args[key === 'manualthumb' ? 0 : args.length - 1];
     }
     /**
      * 获取生效的指定图片参数值

package/dist/src/link/redirectTarget.js

@@ -36,10 +36,7 @@ class RedirectTargetToken extends base_1.LinkBaseToken {
             const e = (0, lint_1.generateForChild)(this.lastChild, { start }, 'no-ignored', 'useless link text');
             e.startIndex--;
             e.startCol--;
-            e.fix = {
-                range: [e.startIndex, e.endIndex],
-                text: '',
-            };
+            e.fix = { range: [e.startIndex, e.endIndex], text: '' };
             errors.push(e);
         }
         return errors;

package/dist/src/nested.js

@@ -61,7 +61,7 @@ class NestedToken extends index_2.Token {
                     },
                     {
                         desc: 'comment',
-                        range: [e.startIndex, e.startIndex],
+                        range: [e.startIndex, e.endIndex],
                         text: `<!--${child.toString()}-->`,
                     },
                 ];

package/dist/src/nowiki/comment.js

@@ -74,10 +74,7 @@ let CommentToken = (() => {
                 return [];
             }
             const e = (0, lint_1.generateForSelf)(this, { start }, 'unclosed-comment', index_1.default.msg('unclosed $1', 'HTML comment'));
-            e.fix = {
-                range: [e.endIndex, e.endIndex],
-                text: '-->',
-            };
+            e.fix = { range: [e.endIndex, e.endIndex], text: '-->' };
             return [e];
         }
         /** @private */

package/dist/src/nowiki/index.js

@@ -14,10 +14,7 @@ class NowikiToken extends base_1.NowikiBaseToken {
         const { name, firstChild: { data } } = this;
         if ((name === 'templatestyles' || name === 'section') && data) {
             const e = (0, lint_1.generateForSelf)(this, { start }, 'void-ext', index_1.default.msg('nothing should be in <$1>', name));
-            e.fix = {
-                range: [start - 1, e.endIndex + name.length + 3],
-                text: '/>',
-            };
+            e.fix = { range: [start, e.endIndex], text: '' };
             return [e];
         }
         return super.lint(start, new RegExp(String.raw `<\s*(?:/\s*)${name === 'nowiki' ? '' : '?'}(${name})\b`, 'giu'));

package/dist/src/nowiki/quote.js

@@ -19,6 +19,11 @@ class QuoteToken extends base_1.NowikiBaseToken {
         return this.innerText.length !== 3;
     }
     /** @private */
+    text() {
+        const { parentNode, innerText } = this;
+        return parentNode?.type === 'image-parameter' && parentNode.name !== 'caption' ? '' : innerText;
+    }
+    /** @private */
     lint(start = this.getAbsoluteIndex()) {
         const { previousSibling, nextSibling, bold } = this, message = index_1.default.msg('lonely "$1"', `'`), errors = [], rect = new rect_1.BoundingRect(this, start);
         let refError;

package/dist/src/parameter.js

@@ -33,8 +33,7 @@ class ParameterToken extends index_2.Token {
     }
     /** @private */
     trimName(name, set = true) {
-        const trimmed = (typeof name === 'string' ? name : name.toString(true))
-            .replace(/^[ \t\n\0\v]+|([^ \t\n\0\v])[ \t\n\0\v]+$/gu, '$1');
+        const trimmed = (0, string_1.trimPHP)(typeof name === 'string' ? name : name.toString(true));
         this.setAttribute('name', trimmed);
         return trimmed;
     }
@@ -69,10 +68,7 @@ class ParameterToken extends index_2.Token {
             e.startCol = e.endCol;
             e.endIndex++;
             e.endCol++;
-            e.fix = {
-                range: [e.startIndex, e.endIndex],
-                text: '{{=}}',
-            };
+            e.fix = { range: [e.startIndex, e.endIndex], text: '{{=}}' };
             errors.push(e);
         }
         return errors;

package/dist/src/tagPair/ext.js

@@ -75,19 +75,19 @@ class ExtToken extends index_3.TagPairToken {
             case 'references': {
                 const { NestedToken } = require('../nested');
                 // @ts-expect-error abstract class
-                innerToken = new NestedToken(inner, /<!--.*?(?:-->|$)|<(ref)(\s[^>]*)?>(.*?)<\/(ref\s*)>/gisu, ['ref'], newConfig, accum);
+                innerToken = new NestedToken(inner, /<!--.*?(?:-->|$)|<(ref)(\s[^>]*?)?(?:\/>|>(.*?)<\/(ref\s*)>)/gisu, ['ref'], newConfig, accum);
                 break;
             }
             case 'choose': {
                 const { NestedToken } = require('../nested');
                 // @ts-expect-error abstract class
-                innerToken = new NestedToken(inner, /<(option|choicetemplate)(\s[^>]*)?>(.*?)<\/(\1)>/gsu, ['option', 'choicetemplate'], newConfig, accum);
+                innerToken = new NestedToken(inner, /<(option|choicetemplate)(\s[^>]*?)?(?:\/>|>(.*?)<\/(\1)>)/gsu, ['option', 'choicetemplate'], newConfig, accum);
                 break;
             }
             case 'combobox': {
                 const { NestedToken } = require('../nested');
                 // @ts-expect-error abstract class
-                innerToken = new NestedToken(inner, /<(combooption)(\s[^>]*)?>(.*?)<\/(combooption\s*)>/gisu, ['combooption'], newConfig, accum);
+                innerToken = new NestedToken(inner, /<(combooption)(\s[^>]*?)?(?:\/>|>(.*?)<\/(combooption\s*)>)/gisu, ['combooption'], newConfig, accum);
                 break;
             }
             case 'gallery': {

package/dist/src/transclude.js

@@ -51,9 +51,9 @@ class TranscludeToken extends index_2.Token {
         }
         const isFunction = title.includes(':');
         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 = insensitive[lcName], isSensitive = sensitive.includes(name), isVar = isSensitive || insensitiveVars.has(canonicalName);
+            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);
                 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/html.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getCommon = void 0;
+/**
+ * get common prefix length
+ * @param prefix
+ * @param lastPrefix
+ */
+const getCommon = (prefix, lastPrefix) => prefix.startsWith(lastPrefix) ? lastPrefix.length : [...lastPrefix].findIndex((ch, i) => ch !== prefix[i]);
+exports.getCommon = getCommon;

package/dist/util/string.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.noWrap = exports.decodeHtml = exports.text = exports.escapeRegExp = exports.removeComment = exports.tidy = exports.extUrlChar = exports.extUrlCharFirst = void 0;
+exports.noWrap = exports.decodeHtml = exports.text = exports.trimPHP = exports.rawurldecode = exports.escapeRegExp = exports.removeComment = exports.tidy = exports.extUrlChar = exports.extUrlCharFirst = void 0;
 const commonExtUrlChar = String.raw `[^[\]<>"\0-\x1F\x7F\p{Zs}\uFFFD]`;
 exports.extUrlCharFirst = String.raw `(?:\[[\da-f:.]+\]|${commonExtUrlChar})`;
 exports.extUrlChar = String.raw `(?:${commonExtUrlChar}|\0\d+[c!~]\x7F)*`;
@@ -16,6 +16,14 @@ exports.tidy = factory(/[\0\x7F]|\r$/gmu, '');
 exports.removeComment = factory(/\0\d+c\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;
+/** PHP的`trim`函数的JavaScript实现 */
+exports.trimPHP = factory(/^[ \t\n\0\v]+|([^ \t\n\0\v])[ \t\n\0\v]+$/gu, '$1');
 /**
  * extract effective wikitext
  * @param childNodes a Token's contents
@@ -23,9 +31,9 @@ exports.escapeRegExp = factory(/[\\{}()|.?*+^$[\]]/gu, String.raw `\$&`);
  */
 const text = (childNodes, separator = '') => childNodes.map(child => typeof child === 'string' ? child : child.text()).join(separator);
 exports.text = text;
-const names = { lt: '<', gt: '>', lbrack: '[', rbrack: ']', lbrace: '{', rbrace: '}' };
+const names = { lt: '<', gt: '>', lbrack: '[', rbrack: ']', lbrace: '{', rbrace: '}', nbsp: ' ' };
 /** decode HTML entities */
-exports.decodeHtml = factory(/&(?:#(\d+|x[\da-fA-F]+)|([lLgG][tT]|[lr]brac[ke]));/gu, (_, code, name) => code
+exports.decodeHtml = factory(/&(?:#(\d+|x[\da-fA-F]+)|([lLgG][tT]|[lr]brac[ke]|nbsp));/gu, (_, code, name) => code
     ? String.fromCodePoint(Number((/^x/iu.test(code) ? '0' : '') + code))
     : names[name.toLowerCase()]);
 /** escape newlines */

package/i18n/zh-hans.json

@@ -27,7 +27,7 @@
 	"invalid content in <$1>": "<$1>内的无效内容",
 	"invalid conversion flag": "无效的转换标记",
 	"invalid gallery image": "无效的图库图片",
-	"invalid gallery image parameter": "无效的图库图片参数",
+	"invalid image parameter": "无效的图片参数",
 	"invalid ISBN": "无效的ISBN",
 	"invalid link in <imagemap>": "无效的<imagemap>链接",
 	"invalid parameter of <$1>": "<$1>的无效参数",

package/i18n/zh-hant.json

@@ -27,7 +27,7 @@
 	"invalid content in <$1>": "<$1>內的無效內容",
 	"invalid conversion flag": "無效的轉換標記",
 	"invalid gallery image": "無效的圖庫圖片",
-	"invalid gallery image parameter": "無效的圖庫圖片參數",
+	"invalid image parameter": "無效的圖片參數",
 	"invalid ISBN": "無效的ISBN",
 	"invalid link in <imagemap>": "無效的<imagemap>連結",
 	"invalid parameter of <$1>": "<$1>的無效參數",

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wikilint",
-	"version": "2.10.0",
+	"version": "2.11.0",
 	"description": "A Node.js linter for MediaWiki markup",
 	"keywords": [
 		"mediawiki",
@@ -51,20 +51,20 @@
 		"chalk": "^4.1.2"
 	},
 	"devDependencies": {
-		"@stylistic/eslint-plugin": "^2.1.0",
+		"@stylistic/eslint-plugin": "^2.3.0",
 		"@types/node": "^20.11.6",
-		"@typescript-eslint/eslint-plugin": "^7.10.0",
-		"@typescript-eslint/parser": "^7.10.0",
+		"@typescript-eslint/eslint-plugin": "^7.15.0",
+		"@typescript-eslint/parser": "^7.15.0",
 		"eslint": "^8.56.0",
-		"eslint-plugin-es-x": "^7.5.0",
+		"eslint-plugin-es-x": "^8.0.0",
 		"eslint-plugin-eslint-comments": "^3.2.0",
-		"eslint-plugin-jsdoc": "^48.0.2",
+		"eslint-plugin-jsdoc": "^48.5.2",
 		"eslint-plugin-json-es": "^1.6.0",
-		"eslint-plugin-n": "^17.6.0",
-		"eslint-plugin-promise": "^6.1.1",
-		"eslint-plugin-regexp": "^2.2.0",
-		"eslint-plugin-unicorn": "^53.0.0",
-		"typescript": "^5.4.5",
+		"eslint-plugin-n": "^17.9.0",
+		"eslint-plugin-promise": "^6.2.0",
+		"eslint-plugin-regexp": "^2.6.0",
+		"eslint-plugin-unicorn": "^54.0.0",
+		"typescript": "^5.5.3",
 		"v8r": "^3.0.0"
 	},
 	"engines": {