wikilint 2.41.0 → 2.43.0

package/README.md

@@ -16,6 +16,25 @@ You can also directly lint Wikitext articles in the command line using this pack
 npx wikilint --config zhwiki --include --lang zh-hans *.wiki
 ```
 
+## Installation
+
+```sh
+npm i wikilint
+```
+
+### Optional dependencies
+
+You can install any of the following optional packages to enable advanced features:
+
+| Package | Purpose |
+| :-: | --- |
+| `mathoid-texvcjs` | Linting `<math>` and `<chem>` extension tags |
+| `vscode-css-languageservice` | Linting `style` attributes |
+
+```sh
+npm i mathoid-texvcjs vscode-css-languageservice
+```
+
 ## CLI Options
 
 | Option | Argument | Description | Default |

package/dist/bin/config.js

@@ -40,7 +40,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.41.0";
+const pkg = "wikilint", version = "2.43.0";
 /**
  * Get the parser configuration for a Wikimedia Foundation project.
  * @param site site nickname

package/dist/lib/document.js

@@ -7,19 +7,19 @@ exports.EmbeddedCSSDocument = exports.EmbeddedJSONDocument = exports.loadStyleli
 const path_1 = __importDefault(require("path"));
 const common_1 = require("@bhsd/common");
 const constants_1 = require("../util/constants");
-let texcvjs;
+let texvcjs;
 const loadTexvcjs = () => {
     NPM: {
-        if (texcvjs === undefined) {
+        if (texvcjs === undefined) {
             try {
-                texcvjs = require('mathoid-texvcjs');
+                texvcjs = require('mathoid-texvcjs');
             }
             catch /* c8 ignore start */ {
-                texcvjs = null;
+                texvcjs = null;
             }
             /* c8 ignore stop */
         }
-        return texcvjs;
+        return texvcjs;
     }
 };
 exports.loadTexvcjs = loadTexvcjs;

package/dist/lib/element.d.ts

@@ -33,13 +33,6 @@ export declare abstract class AstElement extends AstNode {
      * @param i position to be inserted at / 插入位置
      */
     insertAt<T extends AstNodes>(node: T, i?: number): T;
-    /**
-     * Get the closest ancestor node that matches the selector
-     *
-     * 最近的符合选择器的祖先节点
-     * @param selector selector / 选择器
-     */
-    closest<T = Token>(selector: string): T | undefined;
     /**
      * Insert a batch of child nodes at the end
      *

package/dist/lib/element.js

@@ -37,7 +37,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AstElement = void 0;
 const string_1 = require("../util/string");
 const debug_1 = require("../util/debug");
-const selector_1 = require("../util/selector");
 const node_1 = require("./node");
 const elementLike_1 = require("../mixin/elementLike");
 /**
@@ -88,23 +87,6 @@ let AstElement = (() => {
             (0, debug_1.setChildNodes)(this, i, 0, [node]);
             return node;
         }
-        /**
-         * Get the closest ancestor node that matches the selector
-         *
-         * 最近的符合选择器的祖先节点
-         * @param selector selector / 选择器
-         */
-        closest(selector) {
-            const condition = (0, selector_1.getCondition)(selector, this);
-            let { parentNode } = this;
-            while (parentNode) {
-                if (condition(parentNode)) {
-                    return parentNode;
-                }
-                ({ parentNode } = parentNode);
-            }
-            return undefined;
-        }
         /** @private */
         isInside(type) {
             return this.closest(`${type},ext`)?.type === type;

package/dist/lib/lsp.d.ts

@@ -3,6 +3,7 @@ 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 { Config, LanguageService as LanguageServiceBase, CompletionItem, SignatureData } from '../base';
 import type { AttributeToken } from '../internal';
+import type { TokenTypeMap, SelectedTokenTypes } from '../map';
 export interface QuickFixData extends TextEdit {
     title: string;
     fix: boolean;
@@ -128,6 +129,7 @@ export declare class LanguageService implements LanguageServiceBase {
      * @since v1.16.3
      */
     provideInlayHints(text: string): Promise<InlayHint[]>;
+    querySelectorAll<T = Token>(selector: string): T[];
     /**
      * Provide refactoring actions
      *

package/dist/lib/lsp.js

@@ -157,15 +157,6 @@ const getRefName = (token) => getRefAttr(token, refTags, nameAttrs);
  * @param token `group` attribute token
  */
 const getRefGroup = (token) => getRefAttr(token, referencesTags, groupAttrs);
-/**
- * Get the attribute of a `<ref>` tag.
- * @param token extension token
- * @param target attribute name
- */
-const getRefTagAttr = (token, target) => {
-    const attr = token?.getAttr(target);
-    return attr !== true && attr || false;
-};
 /**
  * Get the effective name of a token.
  * @param token
@@ -673,8 +664,7 @@ class LanguageService {
                 }),
                 ...match.startsWith('#')
                     ? []
-                    : getCompletion(root.querySelectorAll('template').filter(token => token !== cur)
-                        .map(token => {
+                    : getCompletion(root.querySelectorAll('template').filter(token => token !== cur).map(token => {
                         const { name } = token;
                         if (colon) {
                             return name;
@@ -1164,8 +1154,7 @@ class LanguageService {
      * @param position position / 位置
      */
     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'))
+        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)) {
@@ -1192,13 +1181,13 @@ class LanguageService {
         }
         const ext = node.is('ext') && node.name === 'ref'
             ? node
-            : node.closest('ext#ref'), refName = getRefTagAttr(ext, 'name');
+            : node.closest('ext#ref'), refName = ext?.getAttr('name');
         if (!refName) {
             return undefined;
         }
-        const refGroup = getRefTagAttr(ext, 'group'), refs = root.querySelectorAll('ext#ref').filter(token => token.innerText
-            && getRefTagAttr(token, 'name') === refName
-            && getRefTagAttr(token, 'group') === refGroup).reverse().map(({ lastChild }) => ({
+        const refGroup = ext.getAttr('group'), refs = root.querySelectorAll('ext#ref').filter(token => token.innerText
+            && token.getAttr('name') === refName
+            && token.getAttr('group') === refGroup).reverse().map(({ lastChild }) => ({
             range: createNodeRange(lastChild),
         }));
         return refs.length === 0 ? undefined : refs;
@@ -1235,7 +1224,7 @@ class LanguageService {
         if (!node) {
             return undefined;
         }
-        const { type } = node, refName = getRefName(node), refNameGroup = refName && getRefTagAttr(node.parentNode.parentNode, 'group'), refGroup = getRefGroup(node), name = getName(node), refs = root.querySelectorAll(type).filter(token => {
+        const { type } = node, refName = getRefName(node), refNameGroup = refName && node.parentNode.parentNode.getAttr('group'), refGroup = getRefGroup(node), name = getName(node), refs = root.querySelectorAll(type).filter(token => {
             const { type: t } = token.parentNode;
             if (type === 'link-target' && t !== 'link' && t !== 'redirect-target') {
                 return false;
@@ -1243,7 +1232,7 @@ class LanguageService {
             return type === 'attr-value'
                 ? getRefGroup(token) === refGroup
                     || getRefName(token) === refName
-                        && getRefTagAttr(token.parentNode.parentNode, 'group') === refNameGroup
+                        && token.parentNode.parentNode.getAttr('group') === refNameGroup
                 : getName(token) === name;
         });
         return refs.length === 0
@@ -1443,7 +1432,6 @@ class LanguageService {
         }
         return hints;
     }
-    /** @private */
     querySelectorAll(selector) {
         return this.#done.querySelectorAll(selector);
     }

package/dist/lib/node.d.ts

@@ -1,6 +1,7 @@
 import type { AstNode as AstNodeBase, TokenTypes, LintError } from '../base';
 import type { NodeLike } from '../mixin/nodeLike';
 import type { AstText, Token } from '../internal';
+import type { TokenTypeMap, SelectedTokenTypes } from '../map';
 export type AstNodes = AstText | Token;
 export interface Dimension {
     readonly height: number;
@@ -93,6 +94,7 @@ export declare abstract class AstNode implements AstNodeBase {
      * @param type token type / 节点类型
      * @since v1.10.0
      */
+    is<K extends SelectedTokenTypes>(type: K): this is TokenTypeMap[K];
     is<T extends Token>(type: TokenTypes): this is T;
     /**
      * Get the text and the start/end positions of all lines

package/dist/lib/node.js

@@ -238,13 +238,6 @@ let AstNode = (() => {
                 ...this.getRootNode().posFromIndex(this.getAbsoluteIndex()),
             };
         }
-        /**
-         * Whether to be of a certain type
-         *
-         * 是否是某种类型的节点
-         * @param type token type / 节点类型
-         * @since v1.10.0
-         */
         is(type) {
             return this.type === type;
         }

package/dist/lib/text.js

@@ -144,8 +144,7 @@ class AstText extends node_1.AstNode {
                 // Rule & Severity
                 let startIndex = start + index, endIndex = startIndex + length, rule, severity, endLine, endCol;
                 const nextChar = rootStr[endIndex], previousChar = rootStr[startIndex - 1], leftBracket = lbrace || lbrack, lConverter = error === '{' && previousChar === '-' && variants.length > 0, rConverter = error === '}' && nextChar === '-' && variants.length > 0, brokenExtLink = lbrack && nextType === 'free-ext-link' && !data.slice(index + 1).trim()
-                    || rbrack && previousType === 'free-ext-link'
-                        && !data.slice(0, index).includes(']');
+                    || rbrack && previousType === 'free-ext-link' && index === 0;
                 if (magicLink) {
                     rule = 'lonely-http';
                     error = error.toUpperCase();

package/dist/map.d.ts

@@ -0,0 +1,65 @@
+import type { RedirectToken, RedirectTargetToken, OnlyincludeToken, IncludeToken, CommentToken, ExtToken, AttributesToken, AttributeToken, AtomToken, ArgToken, TranscludeToken, SyntaxToken, ParameterToken, HeadingToken, HtmlToken, TableToken, TrToken, TdToken, DoubleUnderscoreToken, HrToken, LinkToken, CategoryToken, FileToken, ImageParameterToken, QuoteToken, ExtLinkToken, MagicLinkToken, ListToken, DdToken, ConverterToken, ConverterFlagsToken, ConverterRuleToken, TranslateToken, TvarToken, HiddenToken, GalleryImageToken, ParamLineToken, ImagemapLinkToken } from './internal';
+export interface TokenTypeMap {
+    redirect: RedirectToken;
+    'redirect-syntax': SyntaxToken;
+    'redirect-target': RedirectTargetToken;
+    translate: TranslateToken;
+    'translate-attr': SyntaxToken;
+    tvar: TvarToken;
+    'tvar-name': SyntaxToken;
+    onlyinclude: OnlyincludeToken;
+    include: IncludeToken;
+    comment: CommentToken;
+    ext: ExtToken;
+    'ext-attrs': AttributesToken;
+    'ext-attr-dirty': AtomToken;
+    'ext-attr': AttributeToken;
+    'attr-key': AtomToken;
+    arg: ArgToken;
+    'arg-name': AtomToken;
+    hidden: HiddenToken;
+    'magic-word': TranscludeToken;
+    'magic-word-name': SyntaxToken;
+    'invoke-function': AtomToken;
+    'invoke-module': AtomToken;
+    template: TranscludeToken;
+    'template-name': AtomToken;
+    parameter: ParameterToken;
+    heading: HeadingToken;
+    'heading-trail': SyntaxToken;
+    html: HtmlToken;
+    'html-attrs': AttributesToken;
+    'html-attr-dirty': AtomToken;
+    'html-attr': AttributeToken;
+    table: TableToken;
+    tr: TrToken;
+    td: TdToken;
+    'table-syntax': SyntaxToken;
+    'table-attrs': AttributesToken;
+    'table-attr-dirty': AtomToken;
+    'table-attr': AttributeToken;
+    hr: HrToken;
+    'double-underscore': DoubleUnderscoreToken;
+    link: LinkToken;
+    'link-target': AtomToken;
+    category: CategoryToken;
+    file: FileToken;
+    'gallery-image': GalleryImageToken;
+    'imagemap-image': GalleryImageToken;
+    'image-parameter': ImageParameterToken;
+    quote: QuoteToken;
+    'ext-link': ExtLinkToken;
+    'ext-link-url': MagicLinkToken;
+    'free-ext-link': MagicLinkToken;
+    'magic-link': MagicLinkToken;
+    list: ListToken;
+    dd: DdToken;
+    converter: ConverterToken;
+    'converter-flags': ConverterFlagsToken;
+    'converter-flag': AtomToken;
+    'converter-rule': ConverterRuleToken;
+    'converter-rule-variant': AtomToken;
+    'param-line': ParamLineToken;
+    'imagemap-link': ImagemapLinkToken;
+}
+export type SelectedTokenTypes = keyof TokenTypeMap;

package/dist/map.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/mixin/attributesParent.d.ts

@@ -12,7 +12,7 @@ export interface AttributesParentBase {
      * 获取指定属性
      * @param key attribute name / 属性键
      */
-    getAttr(key: string): string | true | undefined;
+    getAttr(key: string): string | undefined;
 }
 /**
  * 子节点含有AttributesToken的类

package/dist/mixin/elementLike.d.ts

@@ -1,14 +1,25 @@
 import type { AstNodes, Token } from '../internal';
+import type { TokenTypeMap, SelectedTokenTypes } from '../map';
 declare type ElementConstructor = abstract new (...args: any[]) => {
+    readonly parentNode: Token | undefined;
     readonly childNodes: readonly AstNodes[];
 };
 export interface ElementLike {
+    /**
+     * Get the closest ancestor node that matches the selector
+     *
+     * 最近的符合选择器的祖先节点
+     * @param selector selector / 选择器
+     */
+    closest<K extends SelectedTokenTypes>(selector: K): TokenTypeMap[K] | undefined;
+    closest<T = Token>(selector: string): T | undefined;
     /**
      * Get the first descendant that matches the selector
      *
      * 符合选择器的第一个后代节点
      * @param selector selector / 选择器
      */
+    querySelector<K extends SelectedTokenTypes>(selector: K): TokenTypeMap[K] | undefined;
     querySelector<T = Token>(selector: string): T | undefined;
     /**
      * Get all descendants that match the selector
@@ -16,6 +27,7 @@ export interface ElementLike {
      * 符合选择器的所有后代节点
      * @param selector selector / 选择器
      */
+    querySelectorAll<K extends SelectedTokenTypes>(selector: K): TokenTypeMap[K][];
     querySelectorAll<T = Token>(selector: string): T[];
     /**
      * Escape `=` and `|`

package/dist/mixin/elementLike.js

@@ -5,12 +5,23 @@ const debug_1 = require("../util/debug");
 const selector_1 = require("../util/selector");
 /** @ignore */
 const elementLike = (constructor) => {
-    LINT: {
-        class ElementLike extends constructor {
-            #getCondition(selector) {
-                return (0, selector_1.getCondition)(selector, this);
+    class ElementLike extends constructor {
+        #getCondition(selector) {
+            return (0, selector_1.getCondition)(selector, this);
+        }
+        closest(selector) {
+            const condition = this.#getCondition(selector);
+            let { parentNode } = this;
+            while (parentNode) {
+                if (condition(parentNode)) {
+                    return parentNode;
+                }
+                ({ parentNode } = parentNode);
             }
-            getElementBy(condition) {
+            return undefined;
+        }
+        getElementBy(condition) {
+            LINT: {
                 const stack = [...this.childNodes].reverse();
                 while (stack.length > 0) {
                     const child = stack.pop(), { type, childNodes } = child;
@@ -26,10 +37,12 @@ const elementLike = (constructor) => {
                 }
                 return undefined;
             }
-            querySelector(selector) {
-                return this.getElementBy(this.#getCondition(selector));
-            }
-            getElementsBy(condition) {
+        }
+        querySelector(selector) {
+            LINT: return this.getElementBy(this.#getCondition(selector));
+        }
+        getElementsBy(condition) {
+            LINT: {
                 const stack = [...this.childNodes].reverse(), descendants = [];
                 while (stack.length > 0) {
                     const child = stack.pop(), { type, childNodes } = child;
@@ -45,19 +58,19 @@ const elementLike = (constructor) => {
                 }
                 return descendants;
             }
-            querySelectorAll(selector) {
-                return this.getElementsBy(this.#getCondition(selector));
-            }
-            escape() {
-                LSP: {
-                    for (const child of this.childNodes) {
-                        child.escape();
-                    }
+        }
+        querySelectorAll(selector) {
+            LINT: return this.getElementsBy(this.#getCondition(selector));
+        }
+        escape() {
+            LSP: {
+                for (const child of this.childNodes) {
+                    child.escape();
                 }
             }
         }
-        (0, debug_1.mixin)(ElementLike, constructor);
-        return ElementLike;
     }
+    (0, debug_1.mixin)(ElementLike, constructor);
+    return ElementLike;
 };
 exports.elementLike = elementLike;

package/dist/src/attribute.d.ts

@@ -40,5 +40,5 @@ export declare abstract class AttributeToken extends Token {
      *
      * 获取属性值
      */
-    getValue(): string | true;
+    getValue(): string;
 }

package/dist/src/attribute.js

@@ -151,14 +151,14 @@ class AttributeToken extends index_2.Token {
                 }
             }
         }
-        else if (name === 'style' && typeof value === 'string' && insecureStyle.test(value)) {
+        else if (name === 'style' && insecureStyle.test(value)) {
             LINT: {
                 rule = 'insecure-style';
                 const s = lintConfig.getSeverity(rule);
                 return s && (0, lint_1.generateForChild)(lastChild, rect, rule, 'insecure-style', s);
             }
         }
-        else if (name === 'tabindex' && typeof value === 'string' && value !== '0') {
+        else if (name === 'tabindex' && value !== '0') {
             LINT: {
                 const s = lintConfig.getSeverity(rule, 'tabindex');
                 if (s) {
@@ -173,18 +173,18 @@ class AttributeToken extends index_2.Token {
                 }
             }
         }
-        else if (typeof value === 'string' && ((/^xmlns:[\w:.-]+$/u.test(name) || urlAttrs.has(name)) && evil.test(value)
+        else if ((/^xmlns:[\w:.-]+$/u.test(name) || urlAttrs.has(name)) && evil.test(value)
             || simple
                 && (name === 'href' || type === 'ext-attr' && tag === 'img' && name === 'src')
                 && !new RegExp(String.raw `^(?:${this.getAttribute('config').protocol}|//)\S+$`, 'iu')
-                    .test(value))) {
+                    .test(value)) {
             LINT: {
                 const s = lintConfig.getSeverity(rule, 'value');
                 return s && (0, lint_1.generateForChild)(lastChild, rect, rule, 'illegal-attribute-value', s);
             }
         }
         else if (simple && type !== 'ext-attr') {
-            const data = (0, lint_1.provideValues)(tag, name), v = String(value).toLowerCase();
+            const data = (0, lint_1.provideValues)(tag, name), v = value.toLowerCase();
             if (data.length > 0 && data.every(n => n !== v)) {
                 LINT: {
                     const s = lintConfig.getSeverity(rule, 'value');
@@ -249,7 +249,7 @@ class AttributeToken extends index_2.Token {
      * 获取属性值
      */
     getValue() {
-        return this.#equal ? this.lastChild.text().trim() : this.type === 'ext-attr' || '';
+        return this.#equal ? this.lastChild.text().replace(/[\t\r\n ]+/gu, ' ').trim() : '';
     }
     /** @private */
     escape() {

package/dist/src/attributes.d.ts

@@ -59,6 +59,6 @@ export declare abstract class AttributesToken extends Token {
      * 获取指定属性
      * @param key attribute name / 属性键
      */
-    getAttr(key: string): string | true | undefined;
+    getAttr(key: string): string | undefined;
 }
 export {};

package/dist/src/attributes.js

@@ -185,11 +185,8 @@ class AttributesToken extends index_2.Token {
                 const severity = lintConfig.getSeverity(rules[1], tag);
                 if (severity) {
                     for (const key of required.get(tag)) {
-                        const keys = typeof key === 'string' ? [key] : key, missing = keys.every(k => {
-                            const value = this.getAttr(k);
-                            return value === true || !value;
-                        });
-                        if (missing) {
+                        const keys = typeof key === 'string' ? [key] : key;
+                        if (!keys.some(k => this.getAttr(k))) {
                             errors.push((0, lint_1.generateForSelf)(this, rect, rules[1], index_1.default.msg('required-attribute', keys.join('/')), severity));
                         }
                     }
@@ -198,10 +195,7 @@ class AttributesToken extends index_2.Token {
             const severity = lintConfig.getSeverity(rules[2], 'attribute');
             if (severity && duplicated.size > 0) {
                 for (const key of duplicated) {
-                    const pairs = attrs.get(key).map(attr => {
-                        const value = attr.getValue();
-                        return [attr, value === true ? '' : value];
-                    });
+                    const pairs = attrs.get(key).map(attr => [attr, attr.getValue()]);
                     Array.prototype.push.apply(errors, pairs.map(([attr, value], i) => {
                         const e = (0, lint_1.generateForChild)(attr, rect, rules[2], index_1.default.msg('duplicate-attribute', key), severity);
                         if (computeEditInfo || fix) {

package/dist/src/index.js

@@ -372,9 +372,8 @@ class Token extends element_1.AstElement {
     }
     /** @private */
     inTableAttrs() {
-        return this.isInside('table-attrs') && (this.closest('table-attrs,arg,parameter')?.is('table-attrs')
-            ? 2
-            : 1);
+        return this.isInside('table-attrs')
+            && (this.closest('table-attrs,arg,parameter')?.is('table-attrs') ? 2 : 1);
     }
     /** @private */
     inHtmlAttrs() {
@@ -395,7 +394,7 @@ class Token extends element_1.AstElement {
                         }
                         else {
                             const value = cat.getValue();
-                            if (value && value !== true) {
+                            if (value) {
                                 key = `#${value}`;
                             }
                         }

package/dist/src/magicLink.js

@@ -142,7 +142,7 @@ class MagicLinkToken extends index_2.Token {
                     .getUrl(articlePath)
                 : new URL(link.startsWith('RFC')
                     ? `https://datatracker.ietf.org/doc/html/rfc${link.slice(4)}`
-                    : `https://pubmed.ncbi.nlm.nih.gov/${link.slice(5)}`);
+                    : `https://www.ncbi.nlm.nih.gov/pubmed/${link.slice(5)}?dopt=Abstract`);
         }
     }
 }

package/dist/src/nowiki/doubleUnderscore.js

@@ -44,7 +44,7 @@ const base_1 = require("./base");
  * 状态开关
  */
 let DoubleUnderscoreToken = (() => {
-    let _classDecorators = [(0, hidden_1.hiddenToken)(), (0, padded_1.padded)('__')];
+    let _classDecorators = [(0, hidden_1.hiddenToken)(true, false), (0, padded_1.padded)('__')];
     let _classDescriptor;
     let _classExtraInitializers = [];
     let _classThis;

package/dist/src/nowiki/quote.js

@@ -46,9 +46,7 @@ class QuoteToken extends base_1.NowikiBaseToken {
     /** @private */
     text() {
         const { parentNode, innerText } = this;
-        return parentNode?.is('image-parameter') && parentNode.name !== 'caption'
-            ? ''
-            : innerText;
+        return parentNode?.is('image-parameter') && parentNode.name !== 'caption' ? '' : innerText;
     }
     /** @private */
     lint(start = this.getAbsoluteIndex()) {

package/dist/src/table/td.d.ts

@@ -7,7 +7,7 @@ export interface TdSpanAttrs {
     rowspan?: number;
     colspan?: number;
 }
-declare type TdAttrGetter<T extends string> = T extends keyof TdSpanAttrs ? number : string | true | undefined;
+declare type TdAttrGetter<T extends string> = T extends keyof TdSpanAttrs ? number : string | undefined;
 /**
  * `<td>`, `<th>` or `<caption>`
  *

package/dist/src/table/td.js

@@ -184,7 +184,7 @@ let TdToken = (() => {
         getAttr(key) {
             LINT: {
                 const value = super.getAttr(key);
-                return (key === 'rowspan' || key === 'colspan' ? parseInt(value) || 1 : value);
+                return (key === 'rowspan' || key === 'colspan' ? parseInt(value || '') || 1 : value);
             }
         }
         /** @private */

package/dist/src/tagPair/ext.js

@@ -94,6 +94,7 @@ let ExtToken = (() => {
                         innerToken = new PreToken(inner, newConfig, accum);
                         break;
                     }
+                    newConfig.excludes.push('list');
                 // fall through
                 case 'indicator':
                 case 'poem':
@@ -116,7 +117,9 @@ let ExtToken = (() => {
                         case 'tab':
                             newConfig.ext = newConfig.ext.filter(e => e !== 'tabs');
                             break;
-                        // No default
+                        case 'ref':
+                            newConfig.ext = newConfig.ext.filter(e => e !== 'references');
+                        // no default
                     }
                     innerToken = new index_2.Token(inner, newConfig, accum);
                     break;

package/dist/src/transclude.js

@@ -388,7 +388,7 @@ let TranscludeToken = (() => {
          * @throws `Error` 不是可接受的魔术字
          */
         getPossibleValues() {
-            const { type, name, childNodes } = this;
+            const { type, name, childNodes, length: l } = this;
             if (type === 'template') {
                 throw new Error('TranscludeToken.getPossibleValues method is only for specific magic words!');
             }
@@ -397,12 +397,14 @@ let TranscludeToken = (() => {
                 case 'if':
                 case 'ifexist':
                 case 'ifexpr':
-                case 'iferror':
                     start = 2;
                     break;
                 case 'ifeq':
                     start = 3;
                     break;
+                case 'iferror':
+                    start = l > 3 ? 2 : 1;
+                    break;
                 case 'switch': {
                     const parameters = childNodes.slice(2), last = parameters[parameters.length - 1];
                     queue = [

package/dist/util/debug.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mixin = exports.emptyArray = exports.getMagicWordInfo = exports.setChildNodes = exports.isLink = exports.isRowEnd = exports.isToken = exports.Shadow = void 0;
+exports.mixin = exports.emptyArray = exports.getMagicWordInfo = exports.setChildNodes = exports.isLink = exports.isRowEnd = exports.Shadow = void 0;
+exports.isToken = isToken;
 exports.Shadow = {
     running: false,
     /** @private */
@@ -33,12 +34,9 @@ exports.Shadow = {
     },
     rev: 0,
 };
-/**
- * 是否是某一特定类型的节点
- * @param type 节点类型
- */
-const isToken = (type) => (node) => node.type === type;
-exports.isToken = isToken;
+function isToken(type) {
+    return (node) => node.type === type;
+}
 /**
  * 是否是行尾
  * @param token 节点

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wikilint",
-	"version": "2.41.0",
+	"version": "2.43.0",
 	"description": "A Node.js linter for MediaWiki markup",
 	"keywords": [
 		"mediawiki",
@@ -74,39 +74,62 @@
 		]
 	},
 	"dependencies": {
-		"@bhsd/cm-util": "^2.0.1",
+		"@bhsd/cm-util": "^2.1.0",
 		"@bhsd/common": "^2.2.1",
 		"@bhsd/stylelint-util": "^1.0.3",
 		"binary-search": "^1.3.6",
+		"entities": "^8.0.0",
 		"vscode-languageserver-types": "^3.17.5"
 	},
-	"optionalDependencies": {
-		"color-name": "~2.0.2",
-		"entities": "^8.0.0",
-		"mathoid-texvcjs": "^0.6.0",
-		"stylelint": "^17.12.0",
-		"vscode-css-languageservice": "^6.3.10",
-		"vscode-html-languageservice": "^5.6.2",
-		"vscode-json-languageservice": "^5.7.2"
+	"peerDependencies": {
+		"color-name": ">=2.0.0",
+		"mathoid-texvcjs": ">=0.4.0",
+		"stylelint": ">=16.0.0",
+		"vscode-css-languageservice": ">=3.0.0",
+		"vscode-html-languageservice": ">=3.1.0",
+		"vscode-json-languageservice": ">=3.2.0"
+	},
+	"peerDependenciesMeta": {
+		"color-name": {
+			"optional": true
+		},
+		"mathoid-texvcjs": {
+			"optional": true
+		},
+		"stylelint": {
+			"optional": true
+		},
+		"vscode-css-languageservice": {
+			"optional": true
+		},
+		"vscode-html-languageservice": {
+			"optional": true
+		},
+		"vscode-json-languageservice": {
+			"optional": true
+		}
 	},
 	"devDependencies": {
-		"@bhsd/code-standard": "^2.5.1",
+		"@bhsd/code-standard": "^2.6.2",
 		"@bhsd/nodejs": "^1.0.1",
-		"@bhsd/test-util": "^1.3.1",
+		"@bhsd/test-util": "^1.5.0",
 		"@types/color-name": "^2.0.0",
 		"@types/color-rgba": "^2.1.3",
-		"@types/mocha": "^10.0.10",
-		"@types/node": "^25.9.0",
-		"@typescript-eslint/parser": "^8.59.4",
 		"c8": "^11.0.0",
+		"color-name": "~2.0.2",
 		"color-rgba": "^3.0.0",
 		"diff2html-cli": "^5.2.15",
 		"esbuild": "^0.28.0",
-		"eslint": "^10.4.0",
+		"eslint": "^10.4.1",
 		"markdownlint-cli2": "^0.22.1",
-		"mocha": "^11.7.5",
+		"mathoid-texvcjs": "^0.6.0",
+		"mocha": "^11.7.6",
+		"stylelint": "^17.12.0",
 		"typescript": "^6.0.3",
 		"v8r": "^6.1.0",
+		"vscode-css-languageservice": "^6.3.10",
+		"vscode-html-languageservice": "^5.6.2",
+		"vscode-json-languageservice": "^5.7.2",
 		"vscode-languageserver-textdocument": "^1.0.12"
 	},
 	"engines": {