wikilint 2.45.0 → 2.46.1

package/dist/base.d.mts

@@ -1,4 +1,4 @@
-import type { Range, Position, ColorInformation, ColorPresentation, CompletionItem as CompletionItemBase, CompletionItemKind, FoldingRange, DocumentLink, Location, WorkspaceEdit, Diagnostic, Hover, SignatureHelp, InlayHint, CodeAction, DocumentSymbol } from 'vscode-languageserver-types';
+import type { Range, Position, ColorInformation, ColorPresentation, CompletionItem as CompletionItemBase, CompletionItemKind, FoldingRange, DocumentLink, DocumentHighlight, Location, WorkspaceEdit, Diagnostic, Hover, SignatureHelp, InlayHint, CodeAction, DocumentSymbol } from 'vscode-languageserver-types';
 export interface Config {
     ext: string[];
     readonly html: [string[], string[], string[]];
@@ -177,6 +177,14 @@ export interface LanguageService {
      * @param text source Wikitext / 源代码
      */
     provideLinks(text: string): Promise<DocumentLink[]>;
+    /**
+     * Provide document highlights
+     *
+     * 提供文档高亮
+     * @param text source Wikitext / 源代码
+     * @param position position / 位置
+     */
+    provideDocumentHighlights(text: string, position: Position): Promise<DocumentHighlight[] | undefined>;
     /**
      * Provide references
      *

package/dist/base.d.ts

@@ -1,4 +1,4 @@
-import type { Range, Position, ColorInformation, ColorPresentation, CompletionItem as CompletionItemBase, CompletionItemKind, FoldingRange, DocumentLink, Location, WorkspaceEdit, Diagnostic, Hover, SignatureHelp, InlayHint, CodeAction, DocumentSymbol } from 'vscode-languageserver-types';
+import type { Range, Position, ColorInformation, ColorPresentation, CompletionItem as CompletionItemBase, CompletionItemKind, FoldingRange, DocumentLink, DocumentHighlight, Location, WorkspaceEdit, Diagnostic, Hover, SignatureHelp, InlayHint, CodeAction, DocumentSymbol } from 'vscode-languageserver-types';
 export interface Config {
     ext: string[];
     readonly html: [string[], string[], string[]];
@@ -177,6 +177,14 @@ export interface LanguageService {
      * @param text source Wikitext / 源代码
      */
     provideLinks(text: string): Promise<DocumentLink[]>;
+    /**
+     * Provide document highlights
+     *
+     * 提供文档高亮
+     * @param text source Wikitext / 源代码
+     * @param position position / 位置
+     */
+    provideDocumentHighlights(text: string, position: Position): Promise<DocumentHighlight[] | undefined>;
     /**
      * Provide references
      *

package/dist/bin/config.js

@@ -41,7 +41,7 @@ const filterGadget = (id) => {
     const n = Number(id);
     return n < 2300 || n > 2303; // Gadget, Gadget talk, Gadget definition, Gadget definition talk
 };
-const pkg = "wikilint", version = "2.45.0";
+const pkg = 'wikilint', version = '2.46.1';
 /**
  * Get the parser configuration for a Wikimedia Foundation project.
  * @param site site nickname

package/dist/lib/lsp.d.ts

@@ -1,6 +1,6 @@
 import Parser from '../index';
 import { Token } from '../src/index';
-import type { Range, Position, ColorInformation, ColorPresentation, FoldingRange, DocumentLink, Location, WorkspaceEdit, Diagnostic as DiagnosticBase, TextEdit, Hover, SignatureHelp, InlayHint, CodeAction, DocumentSymbol } from 'vscode-languageserver-types';
+import type { Range, Position, ColorInformation, ColorPresentation, FoldingRange, DocumentLink, Location, DocumentHighlight, WorkspaceEdit, Diagnostic as DiagnosticBase, TextEdit, Hover, SignatureHelp, InlayHint, CodeAction, DocumentSymbol } from 'vscode-languageserver-types';
 import type { Config, LanguageService as LanguageServiceBase, CompletionItem, SignatureData } from '../base';
 import type { AttributeToken } from '../internal';
 import type { TokenTypeMap, SelectedTokenTypes } from '../map';
@@ -71,6 +71,15 @@ export declare class LanguageService implements LanguageServiceBase {
      * @param text source Wikitext / 源代码
      */
     provideLinks(text: string): Promise<DocumentLink[]>;
+    /**
+     * Provide document highlights
+     *
+     * 提供文档高亮
+     * @param text source Wikitext / 源代码
+     * @param position position / 位置
+     * @since v1.46.1
+     */
+    provideDocumentHighlights(text: string, position: Position): Promise<DocumentHighlight[] | undefined>;
     /**
      * Provide references
      *

package/dist/lib/lsp.js

@@ -21,6 +21,7 @@ const util_1 = __importDefault(require("util"));
 const child_process_1 = require("child_process");
 const crypto_1 = require("crypto");
 const stylelint_util_1 = require("@bhsd/stylelint-util");
+const color_1 = require("@bhsd/common/color");
 const search_1 = __importDefault(require("../vendor/search"));
 const constants_2 = require("../util/constants");
 const document_1 = require("./document");
@@ -30,15 +31,17 @@ const refTags = new Set(['ref']), referencesTags = new Set(['ref', 'references']
     'template-name',
     'link-target',
     'parameter-key',
-]), referenceTypes = new Set([
+]), highlightTypes = new Set([
     'ext',
     'html',
     'attr-key',
+    'magic-word-name',
+    ...renameTypes,
+]), referenceTypes = new Set([
     'image-parameter',
     'heading-title',
     'heading',
-    'magic-word-name',
-    ...renameTypes,
+    ...highlightTypes,
 ]), plainTypes = new Set(['text', 'comment', 'noinclude', 'include']), rawLilyPondCommands = new Set(['paper', 'book', 'bookpart', 'score', 'markuplist'].map(c => `\\${c}`)), cssSelector = ['ext', 'html', 'table'].map(s => `${s}-attr#style`).join();
 const getLinkRegex = (0, common_1.getRegex)(protocol => new RegExp(`^(?:${protocol}|//)`, 'iu'));
 /**
@@ -168,8 +171,10 @@ const getName = (token) => {
             return token.level;
         case 'heading-title':
             return parentNode.level;
-        case 'parameter-key':
-            return `${parentNode.parentNode.name}|${parentNode.name}`;
+        case 'parameter-key': {
+            const { type: t, name: n } = parentNode.parentNode;
+            return n + (t === 'template' ? '|' : '#') + parentNode.name;
+        }
         case 'ext':
         case 'html':
         case 'image-parameter':
@@ -178,6 +183,22 @@ const getName = (token) => {
             return parentNode.name;
     }
 };
+/**
+ * Get the tokens that match the given token.
+ * @param root
+ * @param node the token to match
+ * @param types accepted token types
+ */
+const getMatchingTokens = (root, node, types) => {
+    const { type } = node, refName = getRefName(node), refGroup = getRefGroup(node);
+    if (!refName && !refGroup && !types.has(type)) {
+        return undefined;
+    }
+    const name = getName(node), refs = root.querySelectorAll(type === 'heading-title' ? 'heading' : type).filter(token => type === 'attr-value'
+        ? getRefName(token) === refName || getRefGroup(token) === refGroup
+        : getName(token) === name);
+    return refs.length === 0 ? undefined : refs.reverse();
+};
 /**
  * Get the quick fix data.
  * @param root root token
@@ -272,7 +293,7 @@ const partialParse = async (wikitext, watch, include, config = index_1.default.g
 };
 /* NOT FOR BROWSER ONLY */
 /** @see https://www.npmjs.com/package/stylelint-config-recommended */
-const cssRules = { 'block-no-empty': null }, colors = Object.keys(common_1.colorsNamed), sources = { 'invalid-css': 'css', 'invalid-math': 'texvc' }, jsonSelector = constants_2.jsonTags.map(s => `ext#${s}`).join(), scores = new Map();
+const cssRules = { 'block-no-empty': null }, colors = Object.keys(color_1.colorsNamed), sources = { 'invalid-css': 'css', 'invalid-math': 'texvc' }, jsonSelector = constants_2.jsonTags.map(s => `ext#${s}`).join(), scores = new Map();
 /**
  * Correct the position of an error.
  * @param height
@@ -911,7 +932,8 @@ class LanguageService {
                     catch (e) {
                         const { stderr } = e;
                         if (stderr) {
-                            const re = new RegExp(String.raw `^${file}:(\d+):(\d+): error: (.+)$`, 'gmu'), lilypondErrors = [...stderr.matchAll(re)].map(([, line, col, msg]) => {
+                            const re = new RegExp(String.raw `^${file}:(\d+):(\d+): error: (.+)$`, 'gmu'), lilypondErrors = [...stderr.matchAll(re)]
+                                .map(([, line, col, msg]) => {
                                 const { offsetHeight, offsetWidth } = token.lastChild, pos = adjustPos(offsetHeight, offsetWidth, Number(line) - 1, Number(col) - 1);
                                 return {
                                     line: pos[0],
@@ -1122,6 +1144,37 @@ class LanguageService {
         })
             .filter(link => link !== false);
     }
+    /**
+     * Provide document highlights
+     *
+     * 提供文档高亮
+     * @param text source Wikitext / 源代码
+     * @param position position / 位置
+     * @since v1.46.1
+     */
+    async provideDocumentHighlights(text, position) {
+        const root = await this.#queue(text), index = root.indexFromPos(position.line, position.character), node = root.elementFromIndex(index), type = node?.type;
+        if (!node || (type === 'ext' || type === 'html') && !/\w/u.test(text.charAt(index))) {
+            return undefined;
+        }
+        return getMatchingTokens(root, node, highlightTypes)?.map((token) => {
+            const range = createNodeRange(token);
+            if (type === 'ext' || type === 'html') {
+                const { start } = range;
+                start.character += token.closing ? 2 : 1;
+                return {
+                    range: {
+                        start,
+                        end: {
+                            line: start.line,
+                            character: start.character + token.name.length,
+                        },
+                    },
+                };
+            }
+            return { range };
+        });
+    }
     /**
      * Provide references
      *
@@ -1132,16 +1185,19 @@ class LanguageService {
     async provideReferences(text, position) {
         const root = await this.#queue(text), { offsetNode, offset } = caretPositionFromWord(root, this.#text, position), element = offsetNode.type === 'text' ? offsetNode.parentNode : offsetNode, node = offset === 0 && (element.is('ext-attr-dirty') || element.is('html-attr-dirty'))
             ? element.parentNode.parentNode
-            : element, { type } = node, refName = getRefName(node), refGroup = getRefGroup(node);
-        if (!refName && !refGroup && !referenceTypes.has(type)) {
-            return undefined;
-        }
-        const name = getName(node), refs = root.querySelectorAll(type === 'heading-title' ? 'heading' : type).filter(token => type === 'attr-value'
-            ? getRefName(token) === refName || getRefGroup(token) === refGroup
-            : getName(token) === name).reverse().map((token) => ({
+            : element;
+        return getMatchingTokens(root, node, referenceTypes)?.map((token) => ({
             range: createNodeRange(token.type === 'parameter-key' ? token.parentNode : token),
         }));
-        return refs.length === 0 ? undefined : refs;
+    }
+    /**
+     * 获取根节点和当前节点
+     * @param text 源代码
+     * @param position 位置
+     */
+    async #getRootAndNode(text, position) {
+        const root = await this.#queue(text), node = root.elementFromPoint(position.character, position.line);
+        return [root, node];
     }
     /**
      * Provide definitions
@@ -1151,7 +1207,7 @@ class LanguageService {
      * @param position position / 位置
      */
     async provideDefinition(text, position) {
-        const root = await this.#queue(text), node = root.elementFromPoint(position.character, position.line);
+        const [root, node] = await this.#getRootAndNode(text, position);
         if (!node) {
             return undefined;
         }
@@ -1176,7 +1232,7 @@ class LanguageService {
      * @param position position / 位置
      */
     async resolveRenameLocation(text, position) {
-        const root = await this.#queue(text), node = root.elementFromPoint(position.character, position.line);
+        const [, node] = await this.#getRootAndNode(text, position);
         if (!node) {
             return undefined;
         }
@@ -1196,7 +1252,7 @@ class LanguageService {
      * @param newName new name / 新名称
      */
     async provideRenameEdits(text, position, newName) {
-        const root = await this.#queue(text), node = root.elementFromPoint(position.character, position.line);
+        const [root, node] = await this.#getRootAndNode(text, position);
         if (!node) {
             return undefined;
         }

package/dist/mixin/paramLineParent.d.ts

@@ -4,6 +4,7 @@ export interface ParamLineParentBase {
      * Get all parameter keys
      *
      * 获取所有参数键
+     * @since v1.45.0
      */
     getKeys(): Set<string>;
     /**
@@ -11,12 +12,14 @@ export interface ParamLineParentBase {
      *
      * 获取指定参数
      * @param key parameter key / 参数键
+     * @since v1.45.0
      */
     getParams(key: string): ParamLineToken[];
     /**
      * Get duplicated parameters
      *
      * 获取重复参数
+     * @since v1.45.0
      */
     getDuplicatedParams(): [string, ParamLineToken[]][];
 }

package/dist/mixin/paramLineParent.js

@@ -30,8 +30,8 @@ const paramLineParent = (constructor) => {
                 if (s) {
                     const msg = index_1.default.msg('duplicate-ext-parameter', name), rect = new rect_1.BoundingRect(this, start), { computeEditInfo } = lintConfig;
                     for (const [, params] of this.getDuplicatedParams()) {
-                        const duplication = Array.from({ length: params.length });
-                        for (let i = params.length - 1; i >= 0; i--) {
+                        const { length } = params, duplication = Array.from({ length });
+                        for (let i = length - 1; i >= 0; i--) {
                             const param = params[i], e = (0, lint_1.generateForChild)(param, rect, rule, msg, s);
                             if (computeEditInfo) {
                                 e.suggestions = [(0, lint_1.fixByRemove)(e, param === firstChild ? 0 : -1)];

package/dist/src/attributes.js

@@ -159,7 +159,7 @@ class AttributesToken extends index_2.Token {
     /** @private */
     lint(start = this.getAbsoluteIndex(), re) {
         LINT: {
-            const errors = super.lint(start, re), { parentNode, childNodes, type, name: tag } = this, attrs = new Map(), duplicated = new Set(), rect = new rect_1.BoundingRect(this, start), rules = ['no-ignored', 'required-attr', 'invalid-ref', 'no-duplicate'], { lintConfig } = index_1.default, { computeEditInfo, fix } = lintConfig, s = ['closingTag', 'invalidAttributes', 'nonWordAttributes']
+            const errors = super.lint(start, re), { parentNode, childNodes, length: l, type, name: tag } = this, attrs = new Map(), duplicated = new Set(), rect = new rect_1.BoundingRect(this, start), rules = ['no-ignored', 'required-attr', 'invalid-ref', 'no-duplicate'], { lintConfig } = index_1.default, { computeEditInfo, fix } = lintConfig, s = ['closingTag', 'invalidAttributes', 'nonWordAttributes']
                 .map(k => lintConfig.getSeverity(rules[0], k));
             if (s[0] && this.#lint()) {
                 const e = (0, lint_1.generateForSelf)(this, rect, rules[0], 'attributes-of-closing-tag', s[0]);
@@ -172,7 +172,8 @@ class AttributesToken extends index_2.Token {
                 }
                 errors.push(e);
             }
-            for (const attr of childNodes) {
+            for (let i = l - 1; i >= 0; i--) {
+                const attr = childNodes[i];
                 if (attr instanceof attribute_1.AttributeToken) {
                     const { name } = attr;
                     if (attrs.has(name)) {
@@ -217,8 +218,8 @@ class AttributesToken extends index_2.Token {
             const severity = lintConfig.getSeverity(rules[3], 'attribute');
             if (severity && duplicated.size > 0) {
                 for (const key of duplicated) {
-                    const pairs = attrs.get(key).map(attr => [attr, attr.getValue()]), duplication = Array.from({ length: pairs.length }), values = new Set();
-                    for (let i = pairs.length - 1; i >= 0; i--) {
+                    const pairs = attrs.get(key).map(attr => [attr, attr.getValue()]), { length } = pairs, duplication = Array.from({ length }), values = new Set();
+                    for (let i = 0; i < length; i++) {
                         const [attr, value] = pairs[i], e = (0, lint_1.generateForChild)(attr, rect, rules[3], index_1.default.msg('duplicate-attribute', key), severity);
                         if (computeEditInfo || fix) {
                             const remove = (0, lint_1.fixByRemove)(e);
@@ -232,7 +233,7 @@ class AttributesToken extends index_2.Token {
                                 }
                             }
                         }
-                        duplication[i] = e;
+                        duplication[length - i - 1] = e;
                     }
                     Array.prototype.push.apply(errors, duplication);
                 }

package/dist/src/converterFlags.js

@@ -100,11 +100,7 @@ let ConverterFlagsToken = (() => {
          * 获取未知的转换类型标记
          */
         getUnknownFlags() {
-            return new Set(this.#flags.filter(flag => /\{{3}[^{}]+\}{3}/u.test(flag)));
-        }
-        /** 从解析设置中获取语言变体 */
-        #getVariants() {
-            return new Set((0, string_1.toLowerCase)(this.getAttribute('config').variants));
+            LINT: return new Set(this.#flags.filter(flag => /\{{3}[^{}]+\}{3}/u.test(flag)));
         }
         /**
          * Get language coversion flags that specify a language variant
@@ -112,16 +108,10 @@ let ConverterFlagsToken = (() => {
          * 获取指定语言变体的转换标记
          */
         getVariantFlags() {
-            const variants = this.#getVariants();
-            return new Set((0, string_1.toLowerCase)(this.#flags).filter(flag => variants.has(flag)));
-        }
-        /** @private */
-        // eslint-disable-next-line @typescript-eslint/class-methods-use-this
-        isInvalidFlag(flag, variant, unknown) {
-            return Boolean(flag)
-                && !variant.has(flag.toLowerCase())
-                && !unknown.has(flag)
-                && (variant.size > 0 || !definedFlags.has(flag));
+            LINT: {
+                const variants = new Set((0, string_1.toLowerCase)(this.getAttribute('config').variants));
+                return new Set((0, string_1.toLowerCase)(this.#flags).filter(flag => variants.has(flag)));
+            }
         }
         /** @private */
         lint(start = this.getAbsoluteIndex(), re) {
@@ -134,9 +124,12 @@ let ConverterFlagsToken = (() => {
                 const rule = 'no-ignored', s = lintConfig.getSeverity(rule, 'conversionFlag');
                 if (s) {
                     const rect = new rect_1.BoundingRect(this, start), { childNodes, length } = this;
-                    for (let i = 0; i < length; i++) {
+                    for (let i = length - 1; i >= 0; i--) {
                         const child = childNodes[i], flag = child.text().trim();
-                        if (this.isInvalidFlag(flag, variantFlags, unknownFlags)) {
+                        if (flag
+                            && !variantFlags.has(flag.toLowerCase())
+                            && !unknownFlags.has(flag)
+                            && (variantFlags.size > 0 || !definedFlags.has(flag))) {
                             const e = (0, lint_1.generateForChild)(child, rect, rule, 'invalid-conversion-flag', s);
                             if (computeEditInfo || fix) {
                                 if (variantFlags.size === 0 && definedFlags.has(flag.toUpperCase())) {

package/dist/src/link/file.js

@@ -111,8 +111,9 @@ class FileToken extends base_1.LinkBaseToken {
             }
             s = lintConfig.getSeverity(rule, 'parameter');
             if (s && unscaled) {
-                for (const arg of args.filter(({ name }) => name === 'width')) {
-                    const e = (0, lint_1.generateForChild)(arg, rect, rule, 'invalid-image-parameter', s);
+                const widths = args.filter(({ name }) => name === 'width');
+                for (let i = widths.length - 1; i >= 0; i--) {
+                    const e = (0, lint_1.generateForChild)(widths[i], rect, rule, 'invalid-image-parameter', s);
                     if (computeEditInfo || fix) {
                         e.fix = (0, lint_1.fixByRemove)(e, -1);
                     }
@@ -147,8 +148,8 @@ class FileToken extends base_1.LinkBaseToken {
              * @param severity 错误等级
              */
             const generate = (tokens, msg, p1, severity = true) => {
-                const duplication = Array.from({ length: tokens.length });
-                for (let i = tokens.length - 1; i >= 0; i--) {
+                const { length } = tokens, duplication = Array.from({ length });
+                for (let i = length - 1; i >= 0; i--) {
                     const arg = tokens[i];
                     s = severities[Number(typeof severity === 'function' ? severity(arg) : severity)];
                     if (!s) {

package/dist/src/multiLine/charinsert.js

@@ -30,21 +30,21 @@ class CharinsertToken extends index_2.MultiLineToken {
     /** @private */
     lint(start = this.getAbsoluteIndex()) {
         LINT: {
-            const { name, childNodes } = this, rule = 'no-ignored', { lintConfig } = index_1.default, { computeEditInfo } = lintConfig, s = lintConfig.getSeverity(rule, name);
+            const { name, childNodes, length: l } = this, rule = 'no-ignored', { lintConfig } = index_1.default, { computeEditInfo } = lintConfig, s = lintConfig.getSeverity(rule, name);
             if (!s) {
                 return [];
             }
-            const rect = new rect_1.BoundingRect(this, start), msg = index_1.default.msg('invalid-space', name), trailing = [];
-            let errors = super.lint(start), begin = false;
-            for (const child of childNodes) {
-                const str = String(child), trimmed = str.trim();
+            const rect = new rect_1.BoundingRect(this, start), msg = index_1.default.msg('invalid-space', name), leading = [], errors = super.lint(start);
+            let begin = false;
+            for (let i = l - 1; i >= 0; i--) {
+                const child = childNodes[i], str = child.toString(), trimmed = str.trim();
                 if (trimmed) {
                     if (begin) {
-                        const n = (0, common_1.numLeadingSpaces)(str);
-                        if (n) {
+                        const [, { length }] = /(?:^|\S)(\s*)$/u.exec(str);
+                        if (length) {
                             const e = (0, lint_1.generateForChild)(child, rect, rule, msg, s);
-                            e.endIndex = e.startIndex + n;
-                            e.endCol = e.startCol + n;
+                            e.startIndex = e.endIndex - length;
+                            e.startCol = e.endCol - length;
                             if (computeEditInfo) {
                                 e.fix = (0, lint_1.fixByRemove)(e);
                             }
@@ -54,21 +54,21 @@ class CharinsertToken extends index_2.MultiLineToken {
                     else {
                         begin = true;
                     }
-                    if (trailing.length > 0) {
-                        errors = [...errors, ...trailing];
-                        trailing.length = 0;
+                    if (leading.length > 0) {
+                        Array.prototype.push.apply(errors, leading);
+                        leading.length = 0;
                     }
                 }
                 if (begin) {
-                    const [, { length }] = /(?:^|\S)(\s*)$/u.exec(str);
-                    if (length) {
+                    const n = (0, common_1.numLeadingSpaces)(str);
+                    if (n) {
                         const e = (0, lint_1.generateForChild)(child, rect, rule, msg, s);
-                        e.startIndex = e.endIndex - length;
-                        e.startCol = e.endCol - length;
+                        e.endIndex = e.startIndex + n;
+                        e.endCol = e.startCol + n;
                         if (computeEditInfo) {
                             e.fix = (0, lint_1.fixByRemove)(e);
                         }
-                        trailing.push(e);
+                        leading.push(e);
                     }
                 }
             }

package/dist/src/multiLine/imagemap.js

@@ -83,20 +83,21 @@ class ImagemapToken extends index_2.MultiLineToken {
             const errors = super.lint(start, re), rect = new rect_1.BoundingRect(this, start), { childNodes, image } = this, rule = 'invalid-imagemap', { lintConfig } = index_1.default, { computeEditInfo } = lintConfig, s = lintConfig.getSeverity(rule, image ? 'link' : 'image');
             if (s) {
                 if (image) {
-                    Array.prototype.push.apply(errors, childNodes.filter(child => {
+                    const comments = childNodes.filter(child => {
                         const str = child.toString().trim();
                         return child.is('noinclude')
                             && str && !str.startsWith('#');
-                    }).map(child => {
-                        const e = (0, lint_1.generateForChild)(child, rect, rule, 'invalid-imagemap-link', s);
+                    });
+                    for (let i = comments.length - 1; i >= 0; i--) {
+                        const e = (0, lint_1.generateForChild)(comments[i], rect, rule, 'invalid-imagemap-link', s);
                         if (computeEditInfo) {
                             e.suggestions = [
                                 (0, lint_1.fixByRemove)(e, -1),
                                 (0, lint_1.fixBy)(e, 'comment', '# '),
                             ];
                         }
-                        return e;
-                    }));
+                        errors.push(e);
+                    }
                 }
                 else {
                     errors.push((0, lint_1.generateForSelf)(this, rect, rule, 'imagemap-without-image', s));

package/dist/src/nested.js

@@ -64,30 +64,28 @@ class NestedToken extends index_2.Token {
             if (!s) {
                 return errors;
             }
-            const rect = new rect_1.BoundingRect(this, start), msg = index_1.default.msg('invalid-content', name), regex = typeof this.#regex === 'boolean' ? lintRegex[this.#regex ? 1 : 0] : /^<!--[\s\S]*-->$/u;
-            return [
-                ...errors,
-                ...childNodes.filter(child => {
-                    const { type, name: n } = child;
-                    if (type === 'ext') {
-                        return !this.#tags.includes(n);
-                    }
-                    else if (childTypes.has(type)) {
-                        return false;
-                    }
-                    const str = child.toString().trim();
-                    return str && !regex.test(str);
-                }).map(child => {
-                    const e = (0, lint_1.generateForChild)(child, rect, rule, msg, s);
-                    if (computeEditInfo) {
-                        e.suggestions = [
-                            (0, lint_1.fixByRemove)(e),
-                            (0, lint_1.fixByComment)(e, child.toString()),
-                        ];
-                    }
-                    return e;
-                }),
-            ];
+            const rect = new rect_1.BoundingRect(this, start), msg = index_1.default.msg('invalid-content', name), regex = typeof this.#regex === 'boolean' ? lintRegex[this.#regex ? 1 : 0] : /^<!--[\s\S]*-->$/u, ignored = childNodes.filter(child => {
+                const { type, name: n } = child;
+                if (type === 'ext') {
+                    return !this.#tags.includes(n);
+                }
+                else if (childTypes.has(type)) {
+                    return false;
+                }
+                const str = child.toString().trim();
+                return str && !regex.test(str);
+            }), { length } = ignored, ignoredErrors = Array.from({ length });
+            for (let i = length - 1; i >= 0; i--) {
+                const child = ignored[i], e = (0, lint_1.generateForChild)(child, rect, rule, msg, s);
+                if (computeEditInfo) {
+                    e.suggestions = [
+                        (0, lint_1.fixByRemove)(e),
+                        (0, lint_1.fixByComment)(e, child.toString()),
+                    ];
+                }
+                ignoredErrors[i] = e;
+            }
+            return [...errors, ...ignoredErrors];
         }
     }
 }

package/dist/src/paramLine.d.ts

@@ -17,7 +17,12 @@ export declare abstract class ParamLineToken extends Token {
     abstract get nextSibling(): this | undefined;
     abstract get previousSibling(): this | undefined;
     get type(): 'param-line';
-    /** A reasonable parameter name / 合理的参数名 */
+    /**
+     * A reasonable parameter name
+     *
+     * 合理的参数名
+     * @since v1.45.0
+     */
     get key(): string | undefined;
     /** @param name 扩展标签名 */
     constructor(name: string, wikitext: string, config: Config, accum: Token[], acceptable?: WikiParserAcceptable);
@@ -25,6 +30,7 @@ export declare abstract class ParamLineToken extends Token {
      * Get a reasonable parameter name
      *
      * 获取合理的参数名
+     * @since v1.45.0
      */
     getKey(): string | undefined;
 }

package/dist/src/paramLine.js

@@ -69,7 +69,12 @@ let ParamLineToken = (() => {
         get type() {
             return 'param-line';
         }
-        /** A reasonable parameter name / 合理的参数名 */
+        /**
+         * A reasonable parameter name
+         *
+         * 合理的参数名
+         * @since v1.45.0
+         */
         get key() {
             LINT: return this.getKey();
         }
@@ -131,6 +136,7 @@ let ParamLineToken = (() => {
          * Get a reasonable parameter name
          *
          * 获取合理的参数名
+         * @since v1.45.0
          */
         getKey() {
             LINT: {

package/dist/src/table/td.js

@@ -148,8 +148,9 @@ let TdToken = (() => {
         /** @private */
         lint(start = this.getAbsoluteIndex(), re) {
             LINT: {
-                const errors = super.lint(start, re), rect = new rect_1.BoundingRect(this, start + this.getRelativeIndex(this.length - 1)), rule = 'pipe-like', { lintConfig } = index_1.default, { computeEditInfo, fix } = lintConfig, severities = ['td', 'double'].map(key => lintConfig.getSeverity(rule, key));
-                for (const child of this.lastChild.childNodes) {
+                const errors = super.lint(start, re), rect = new rect_1.BoundingRect(this, start + this.getRelativeIndex(this.length - 1)), rule = 'pipe-like', { lintConfig } = index_1.default, { computeEditInfo, fix } = lintConfig, severities = ['td', 'double'].map(key => lintConfig.getSeverity(rule, key)), { childNodes, length } = this.lastChild, pipes = [];
+                for (let i = length - 1; i >= 0; i--) {
+                    const child = childNodes[i];
                     if (child.type === 'text') {
                         const { data } = child;
                         if (data.includes('|')) {
@@ -165,12 +166,12 @@ let TdToken = (() => {
                                         e.suggestions = [(0, lint_1.fixByPipe)(e.startIndex, data)];
                                     }
                                 }
-                                errors.push(e);
+                                pipes.push(e);
                             }
                         }
                     }
                 }
-                return errors;
+                return [...errors, ...pipes.reverse()];
             }
         }
         /**

package/dist/src/tag/index.js

@@ -62,11 +62,16 @@ class TagToken extends index_1.Token {
                 return undefined;
             }
             const { childNodes } = parentNode, i = childNodes.indexOf(this), siblings = closing ? childNodes.slice(0, i) : childNodes.slice(i + 1).reverse(), stack = [this], { rev } = debug_1.Shadow;
-            let cur = siblings.pop();
+            let cur = siblings.pop(), until;
             while (cur) {
                 // eslint-disable-next-line no-empty, @typescript-eslint/no-unnecessary-condition
                 if (!cur) {
                 }
+                else if (until) {
+                    if (cur === until) {
+                        until = undefined;
+                    }
+                }
                 else if (!cur.is(type)
                     || type === 'html' && (cur.name !== name || isFlexible && cur.selfClosing)) {
                     //
@@ -76,6 +81,13 @@ class TagToken extends index_1.Token {
                     if (type === 'tvar') {
                         return undefined;
                     }
+                    else if (cur.#match?.[0] === rev) {
+                        const [, matched] = cur.#match;
+                        if (!matched) {
+                            return undefined;
+                        }
+                        until = matched;
+                    }
                     stack.push(cur);
                 }
                 else {

package/dist/src/transclude.js

@@ -278,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';
@@ -302,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,8 +312,8 @@ let TranscludeToken = (() => {
                     const duplicatedArgs = this.getDuplicatedArgs()
                         .filter(([, parameter]) => !parameter[0].querySelector('ext'));
                     for (const [, args] of duplicatedArgs) {
-                        const duplication = Array.from({ length: args.length });
-                        for (let i = args.length - 1; i >= 0; i--) {
+                        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)];

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wikilint",
-	"version": "2.45.0",
+	"version": "2.46.1",
 	"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",
@@ -98,23 +98,23 @@
 		}
 	},
 	"dependencies": {
-		"@bhsd/cm-util": "^2.2.0",
-		"@bhsd/common": "^3.0.0",
+		"@bhsd/cm-util": "^2.3.0",
+		"@bhsd/common": "^4.0.0",
 		"@bhsd/stylelint-util": "^1.1.0",
+		"culori": "^4.0.2",
 		"entities": "^8.0.0",
 		"vscode-languageserver-types": "^3.18.0"
 	},
 	"devDependencies": {
 		"@bhsd/code-standard": "^3.1.0",
-		"@bhsd/nodejs": "^1.1.0",
-		"@bhsd/test-util": "^2.0.0",
+		"@bhsd/nodejs": "^1.2.1",
+		"@bhsd/test-util": "^3.1.0",
 		"c8": "^11.0.0",
 		"diff2html-cli": "^5.2.15",
 		"esbuild": "^0.28.1",
-		"eslint": "^10.6.0",
+		"eslint": "^10.7.0",
 		"markdownlint-cli2": "^0.23.0",
 		"mathoid-texvcjs": "^0.6.0",
-		"mocha": "^11.7.6",
 		"stylelint": "^17.14.0",
 		"typescript": "^6.0.3",
 		"v8r": "^6.1.0",