wikilint 2.29.0 → 2.29.2

package/dist/bin/config.js

@@ -77,7 +77,7 @@ const mw = {
         },
     },
 };
-const pkg = "wikilint", version = "2.29.0";
+const pkg = "wikilint", version = "2.29.2";
 let mwConfig;
 /**
  * Get the parser configuration for a Wikimedia Foundation project.

package/dist/lib/document.js

@@ -7,12 +7,14 @@ exports.EmbeddedCSSDocument = exports.EmbeddedJSONDocument = exports.stylelint =
 const path_1 = __importDefault(require("path"));
 const common_1 = require("@bhsd/common");
 exports.texvcjs = (() => {
-    try {
-        return require('mathoid-texvcjs');
-    }
-    catch {
-        /* istanbul ignore next */
-        return undefined;
+    NPM: { // eslint-disable-line no-unused-labels
+        try {
+            return require('mathoid-texvcjs');
+        }
+        catch {
+            /* istanbul ignore next */
+            return undefined;
+        }
     }
 })();
 exports.jsonTags = ['templatedata', 'mapframe', 'maplink'];
@@ -70,12 +72,14 @@ exports.htmlData = (() => {
     }
 })();
 exports.stylelint = (async () => {
-    try {
-        return (await import('stylelint')).default;
-    }
-    catch {
-        /* istanbul ignore next */
-        return undefined;
+    NPM: { // eslint-disable-line no-unused-labels
+        try {
+            return (await import('stylelint')).default;
+        }
+        catch {
+            /* istanbul ignore next */
+            return undefined;
+        }
     }
 })();
 /** embedded document */

package/dist/lib/lsp.js

@@ -21,10 +21,6 @@ const stylelint_util_1 = require("@bhsd/stylelint-util");
 const search_1 = __importDefault(require("../util/search"));
 const constants_1 = require("../util/constants");
 const document_1 = require("./document");
-/** @see https://www.npmjs.com/package/stylelint-config-recommended */
-const cssRules = { 'block-no-empty': null }, sources = { 'invalid-css': 'css', 'invalid-math': 'texvc' }, jsonSelector = document_1.jsonTags.map(s => `ext#${s}`).join(), scores = new Map();
-let colors;
-/* NOT FOR BROWSER ONLY END */
 exports.tasks = new WeakMap();
 const refTags = new Set(['ref']), referencesTags = new Set(['ref', 'references']), nameAttrs = new Set(['name', 'follow']), groupAttrs = new Set(['group']), renameTypes = new Set([
     'arg-name',
@@ -231,6 +227,9 @@ const getFixAll = (root, rule) => {
         ];
 };
 /* NOT FOR BROWSER ONLY */
+/** @see https://www.npmjs.com/package/stylelint-config-recommended */
+const cssRules = { 'block-no-empty': null }, sources = { 'invalid-css': 'css', 'invalid-math': 'texvc' }, jsonSelector = document_1.jsonTags.map(s => `ext#${s}`).join(), scores = new Map();
+let colors;
 /**
  * Correct the position of an error.
  * @param height
@@ -249,21 +248,20 @@ const adjustPos = (height, width, line, column) => {
     }
     return [line, column];
 };
-/**
- * Get the position of a Stylelint error.
- * @param rect bounding client rect of the token
- * @param bottom bottom of the style block
- * @param lineOrCode line number or code string
- * @param columnOrOffset column number or offset in the code string
- */
-const getStylelintPos = (rect, bottom, lineOrCode, columnOrOffset) => {
+function getStylelintPos(rect, bottom, lineOrCode, columnOrOffset) {
+    if (Array.isArray(columnOrOffset)) {
+        return {
+            start: getStylelintPos(rect, bottom, lineOrCode, columnOrOffset[0]),
+            end: getStylelintPos(rect, bottom, lineOrCode, columnOrOffset[1]),
+        };
+    }
     const { top, left, height, width } = rect, start = bottom - height - 1;
     if (typeof lineOrCode === 'number') {
         return (0, lint_1.getEndPos)(top, left, ...adjustPos(height, width, lineOrCode - start, columnOrOffset));
     }
     const lines = lineOrCode.slice(0, columnOrOffset).split(/\r?\n/u);
     return getStylelintPos(rect, bottom, lines.length, lines.at(-1).length);
-};
+}
 /**
  * Convert LilyPond errors to VSCode diagnostics.
  * @param root root token
@@ -518,19 +516,21 @@ class LanguageService {
             this.config ??= index_1.default.getConfig();
             const { nsid, ext, html, parserFunction: [insensitive, sensitive, ...other], doubleUnderscore, protocol, img, } = this.config, tags = new Set([ext, html].flat(2));
             const re = new RegExp('(?:' // eslint-disable-line prefer-template
-                + String.raw `<(\/?\w*)` // tag
+                + String.raw `<(\/?\w*)` // tag ($1)
                 + '|'
-                + String.raw `(\{{2,4}|\[\[)\s*([^|{}<>[\]\s][^|{}<>[\]#]*)?` // braces and brackets
+                + String.raw `(\{{2,4}|\[\[)\s*([^|{}<>[\]\s][^|{}<>[\]#]*)?` // braces and brackets ($2, $3)
                 + '|'
-                + String.raw `(__(?:(?!__)[\p{L}\p{N}_])*)` // behavior switch
+                + String.raw `(_(?:_(?:(?!__|＿{2})[\p{L}\p{N}_])*)?)` // behavior switch ($4)
                 + '|'
-                + String.raw `(?<!\[)\[([a-z:/]*)` // protocol
+                + String.raw `(＿(?:＿(?:(?!__|＿{2})[\p{L}\p{N}＿])*)?)` // Japanese behavior switch ($5)
                 + '|'
-                + String.raw `\[\[\s*(?:${Object.entries(nsid).filter(([, v]) => v === 6).map(([k]) => k).join('|')})\s*:[^[\]{}<>]+\|([^[\]{}<>|=]*)` // image parameter
+                + String.raw `(?<!\[)\[([a-z:/]*)` // protocol ($6)
                 + '|'
-                // attribute key
-                + String.raw `<(\w+)(?:\s(?:[^<>{}|=\s]+(?:\s*=\s*(?:[^\s"']\S*|(["']).*?\8))?(?=\s))*)?\s(\w*)`
-                + ')$', 'iu');
+                + String.raw `\[\[\s*(?:${Object.entries(nsid).filter(([, v]) => v === 6).map(([k]) => k).join('|')})\s*:[^[\]{}<>]+\|([^[\]{}<>|=]*)` // image parameter ($7)
+                + '|'
+                // attribute key ($8, $10)
+                + String.raw `<(\w+)(?:\s(?:[^<>{}|=\s]+(?:\s*=\s*(?:[^\s"']\S*|(["']).*?\9))?(?=\s))*)?\s(\w*)`
+                + ')$', 'iu'), allSwitches = doubleUnderscore.slice(0, 2).flat();
             this.#completionConfig = [
                 {
                     re,
@@ -542,9 +542,8 @@ class LanguageService {
                         Array.isArray(sensitive) ? /* istanbul ignore next */ sensitive : Object.keys(sensitive),
                         other,
                     ].flat(2),
-                    switches: doubleUnderscore.slice(0, 2).flat()
-                        .filter(cm_util_1.isUnderscore)
-                        .map(w => `__${w}__`),
+                    switches: allSwitches.filter(cm_util_1.isUnderscore).map(w => `__${w}__`),
+                    jaSwitches: allSwitches.filter(w => !(0, cm_util_1.isUnderscore)(w)),
                     protocols: protocol.split('|'),
                     params: Object.keys(img)
                         .filter(k => k.endsWith('$1') || !k.includes('$1'))
@@ -563,17 +562,20 @@ class LanguageService {
      * @param position position / 位置
      */
     async provideCompletionItems(text, position) {
-        const { re, allTags, functions, switches, protocols, params, tags, ext } = this.#prepareCompletionConfig(), { line, character } = position, curLine = text.split(/\r?\n/u, line + 1)[line], mt = re.exec(curLine?.slice(0, character) ?? ''), [, , iAlias = {}, sAlias = {}] = this.config.doubleUnderscore;
+        const { re, allTags, functions, switches, jaSwitches, protocols, params, tags, ext, } = this.#prepareCompletionConfig(), { line, character } = position, curLine = text.split(/\r?\n/u, line + 1)[line], mt = re.exec(curLine?.slice(0, character) ?? ''), [, , iAlias = {}, sAlias = {}] = this.config.doubleUnderscore;
         if (mt?.[1] !== undefined) { // tag
             const closing = mt[1].startsWith('/');
             return getCompletion(allTags, 'Class', mt[1].slice(closing ? 1 : 0), position, closing && !curLine?.slice(character).trim().startsWith('>') ? '>' : '');
         }
-        else if (mt?.[4]) { // behavior switch
-            return getCompletion(switches, 'Constant', mt[4], position, '', name => {
+        else if (mt?.[4] || mt?.[5] && jaSwitches.length > 0) { // behavior switch
+            const isJa = mt[5] !== undefined;
+            return getCompletion(isJa ? jaSwitches : switches, 'Constant', mt[isJa ? 5 : 4], position, '', name => {
                 if (!this.data) {
                     return undefined;
                 }
-                name = name.slice(2, -2);
+                else if (!isJa) {
+                    name = name.slice(2, -2);
+                }
                 if (name in iAlias) {
                     name = iAlias[name];
                 }
@@ -583,8 +585,8 @@ class LanguageService {
                 return this.#getBehaviorSwitch(name.toLowerCase());
             });
         }
-        else if (mt?.[5] !== undefined) { // protocol
-            return getCompletion(protocols, 'Reference', mt[5], position);
+        else if (mt?.[6] !== undefined) { // protocol
+            return getCompletion(protocols, 'Reference', mt[6], position);
         }
         const root = await this.#queue(text);
         let cur;
@@ -637,12 +639,12 @@ class LanguageService {
             ];
         }
         let type, parentNode;
-        if (mt?.[7] === undefined) {
+        if (mt?.[8] === undefined) {
             cur = root.elementFromPoint(character, line);
             ({ type, parentNode } = cur);
         }
-        if (mt?.[6] !== undefined || type === 'image-parameter') { // image parameter
-            const index = root.indexFromPos(line, character), match = mt?.[6]?.trimStart()
+        if (mt?.[7] !== undefined || type === 'image-parameter') { // image parameter
+            const index = root.indexFromPos(line, character), match = mt?.[7]?.trimStart()
                 ?? this.#text.slice(cur.getAbsoluteIndex(), index).trimStart(), equal = this.#text[index] === '=';
             return [
                 ...getCompletion(params, 'Property', match, position)
@@ -652,8 +654,8 @@ class LanguageService {
                     .map(width => width.text()), 'Unit', match, position),
             ];
         }
-        else if (mt?.[7] !== undefined || type === 'attr-key') { // attribute key
-            const tag = mt?.[7]?.toLowerCase() ?? parentNode.tag, key = mt?.[9]
+        else if (mt?.[8] !== undefined || type === 'attr-key') { // attribute key
+            const tag = mt?.[8]?.toLowerCase() ?? parentNode.tag, key = mt?.[10]
                 ?? cur.toString().slice(0, character - root.posFromIndex(cur.getAbsoluteIndex()).left);
             if (!tags.has(tag)) {
                 return undefined;
@@ -787,48 +789,47 @@ class LanguageService {
         /* eslint-disable @stylistic/operator-linebreak */
         cssDiagnostics = await document_1.stylelint ?
             await (async () => {
-                const tokens = this.findStyleTokens();
-                if (tokens.length === 0) {
-                    return [];
-                }
-                const code = tokens.map(({ type, tag, lastChild }, i) => `${type === 'ext-attr' ? 'div' : tag}#${i}{\n${(0, common_1.sanitizeInlineStyle)(lastChild.toString())}\n}`).join('\n'), cssErrors = await (0, stylelint_util_1.styleLint)((await document_1.stylelint), code, cssRules);
-                if (cssErrors.length === 0) {
-                    return [];
-                }
-                const rects = tokens.map(({ lastChild }) => lastChild.getBoundingClientRect());
-                let acc = 0;
-                const bottoms = rects.map(({ height }) => {
-                    acc += height + 2;
-                    return acc;
-                });
-                return cssErrors.map(({ rule, text: msg, severity, line, column, endLine = line, endColumn = column, fix, }) => {
-                    const i = (0, search_1.default)(bottoms, line, (bottom, needle) => bottom - needle);
-                    return {
-                        range: {
-                            start: getStylelintPos(rects[i], bottoms[i], line, column - 1),
-                            end: getStylelintPos(rects[i], bottoms[i], endLine, endColumn - 1),
-                        },
-                        severity: severity === 'error' ? 1 : 2,
-                        source: 'Stylelint',
-                        code: rule,
-                        message: msg.slice(0, msg.lastIndexOf('(') - 1),
-                        ...fix
-                            ? {
-                                data: [
-                                    {
-                                        range: {
-                                            start: getStylelintPos(rects[i], bottoms[i], code, fix.range[0]),
-                                            end: getStylelintPos(rects[i], bottoms[i], code, fix.range[1]),
+                NPM: { // eslint-disable-line no-unused-labels
+                    const tokens = this.findStyleTokens();
+                    if (tokens.length === 0) {
+                        return [];
+                    }
+                    const code = tokens.map(({ type, tag, lastChild }, i) => `${type === 'ext-attr' ? 'div' : tag}#${i}{\n${(0, common_1.sanitizeInlineStyle)(lastChild.toString())}\n}`).join('\n'), cssErrors = await (0, stylelint_util_1.styleLint)((await document_1.stylelint), code, cssRules);
+                    if (cssErrors.length === 0) {
+                        return [];
+                    }
+                    const rects = tokens.map(({ lastChild }) => lastChild.getBoundingClientRect());
+                    let acc = 0;
+                    const bottoms = rects.map(({ height }) => {
+                        acc += height + 2;
+                        return acc;
+                    });
+                    return cssErrors.map(({ rule, text: msg, severity, line, column, endLine = line, endColumn = column, fix, }) => {
+                        const i = (0, search_1.default)(bottoms, line, (bottom, needle) => bottom - needle);
+                        return {
+                            range: {
+                                start: getStylelintPos(rects[i], bottoms[i], line, column - 1),
+                                end: getStylelintPos(rects[i], bottoms[i], endLine, endColumn - 1),
+                            },
+                            severity: severity === 'error' ? 1 : 2,
+                            source: 'Stylelint',
+                            code: rule,
+                            message: msg.slice(0, msg.lastIndexOf('(') - 1),
+                            ...fix
+                                ? {
+                                    data: [
+                                        {
+                                            range: getStylelintPos(rects[i], bottoms[i], code, fix.range),
+                                            newText: fix.text,
+                                            title: `Fix: ${rule}`,
+                                            fix: true,
                                         },
-                                        newText: fix.text,
-                                        title: `Fix: ${rule}`,
-                                        fix: true,
-                                    },
-                                ],
-                            }
-                            : {},
-                    };
-                });
+                                    ],
+                                }
+                                : {},
+                        };
+                    });
+                }
             })() :
             [], jsonDiagnostics = document_1.jsonLSP ?
             await Promise.all(root.querySelectorAll(jsonSelector).map(async ({ name, lastChild, selfClosing }) => {
@@ -1029,7 +1030,7 @@ class LanguageService {
                 else if (type === 'link-target' && (parentNode.is('link')
                     || parentNode.is('redirect-target')
                     || parentNode.is('category'))) {
-                    if (target.startsWith('/')) {
+                    if (/^(?:\.\.)?\//u.test(target)) {
                         return false;
                     }
                     target = parentNode.link.getUrl(articlePath);
@@ -1092,7 +1093,8 @@ 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.type === 'ext-attr-dirty' || element.type === '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)) {

package/dist/lib/text.js

@@ -9,8 +9,8 @@ const lint_1 = require("../util/lint");
 const debug_1 = require("../util/debug");
 const index_1 = __importDefault(require("../index"));
 const node_1 = require("./node");
-const sp = /* #__PURE__ */ (() => String.raw `[${string_1.zs}\t]*`)(), anySp = /* #__PURE__ */ (() => String.raw `[^\S\n]*`)(), source = /* #__PURE__ */ (() => String.raw `<${anySp}(?:/${anySp})?([a-z]\w*)|\{+|\}+|\[{2,}|\[(?![^[]*?\])|((?:^|\])[^[]*?)\]+|(?:rfc|pmid)(?=[-:：]?${sp}\d)|isbn(?=[-:：]?${sp}(?:\d(?:${sp}|-)){6})`)();
-const errorSyntax = /* #__PURE__ */ (() => new RegExp(String.raw `${source}|https?[:/]/+`, 'giu'))();
+const sp = /* #__PURE__ */ (() => String.raw `[${string_1.zs}\t]*`)(), anySp = /* #__PURE__ */ (() => String.raw `[^\S\n]*`)(), source = /* #__PURE__ */ (() => String.raw `<${anySp}(?:/${anySp})?([a-z]\w*)|\{+|\}+|\[{2,}|\[(?![^[]*?\])|((?:^|\])[^[]*?)\]+`)();
+const errorSyntax = /* #__PURE__ */ (() => new RegExp(String.raw `${source}|https?[:/]/+|(?:rfc|pmid)(?=[-:：]?${sp}\d)|isbn(?=[-:：]?${sp}(?:\d(?:${sp}|-)){6})`, 'giu'))();
 const errorSyntaxUrl = /* #__PURE__ */ new RegExp(source, 'giu'), noLinkTypes = new Set(['attr-value', 'ext-link-text', 'link-text']), regexes = {
     '[': /[[\]]/u,
     '{': /[{}]/u,
@@ -86,7 +86,7 @@ class AstText extends node_1.AstNode {
             if (!parentNode) {
                 throw new Error('An isolated text node cannot be linted!');
             }
-            const { type, name, parentNode: grandparent } = parentNode;
+            const { type, parentNode: grandparent } = parentNode;
             if (type === 'attr-value') {
                 const { name: grandName, tag } = grandparent;
                 if (tag === 'ref' && (grandName === 'name' || grandName === 'follow')
@@ -95,13 +95,7 @@ class AstText extends node_1.AstNode {
                     return [];
                 }
             }
-            errorRegex ??= type === 'free-ext-link'
-                || type === 'ext-link-url'
-                || type === 'ext-link-text'
-                || type === 'image-parameter' && name === 'link'
-                || type === 'attr-value'
-                ? errorSyntaxUrl
-                : errorSyntax;
+            errorRegex ??= parentNode.isPlain() && !noLinkTypes.has(type) ? errorSyntax : errorSyntaxUrl;
             if (data.search(errorRegex) === -1) {
                 return [];
             }
@@ -133,8 +127,7 @@ class AstText extends node_1.AstNode {
                 if (char === '<' && !tags.has(tag.toLowerCase())
                     || lbrack && type === 'ext-link-text' && (/&(?:rbrack|#93|#x5[Dd];);/u.test(data.slice(index + 1))
                         || nextSibling?.is('ext') && nextName === 'nowiki'
-                            && nextSibling.innerText?.includes(']'))
-                    || magicLink && (!parentNode.isPlain() || noLinkTypes.has(type))) {
+                            && nextSibling.innerText?.includes(']'))) {
                     continue;
                 }
                 else if (rbrack && (index || length > 1)) {

package/dist/parser/commentAndExt.js

@@ -68,7 +68,7 @@ const parseCommentAndExt = (wikitext, config, accum, includeOnly) => {
         wikitext = wikitext.replace(/<nowiki>[\s\S]*?<\/nowiki>/giu, m => {
             stack.push(m);
             return `\0${stack.length - 1}\x7F`;
-        }).replace(/<translate( nowrap)?>([\s\S]+?)?<\/translate>/gu, (_, p1, p2) => {
+        }).replace(/<translate( nowrap)?>([\s\S]*?)<\/translate>/gu, (_, p1, p2) => {
             const l = accum.length;
             // @ts-expect-error abstract class
             new translate_1.TranslateToken(p1, p2 && (0, string_1.restore)(p2, stack), newConfig, accum);

package/dist/src/atom.d.ts

@@ -1,6 +1,6 @@
 import { Token } from './index';
 import type { Config } from '../base';
-declare const atomTypes: readonly ["arg-name", "attr-key", "attr-value", "ext-attr-dirty", "html-attr-dirty", "table-attr-dirty", "converter-flag", "converter-rule-variant", "converter-rule-to", "converter-rule-from", "invoke-function", "invoke-module", "template-name", "link-target"];
+declare const atomTypes: readonly ["arg-name", "attr-key", "attr-value", "ext-attr-dirty", "html-attr-dirty", "table-attr-dirty", "converter-flag", "converter-rule-variant", "invoke-function", "invoke-module", "template-name", "link-target"];
 declare type AtomTypes = typeof atomTypes[number];
 /**
  * plain Token that will not be parsed further

package/dist/src/atom.js

@@ -12,8 +12,6 @@ const atomTypes = [
     'table-attr-dirty',
     'converter-flag',
     'converter-rule-variant',
-    'converter-rule-to',
-    'converter-rule-from',
     'invoke-function',
     'invoke-module',
     'template-name',

package/dist/src/attribute.js

@@ -247,8 +247,10 @@ class AttributeToken extends index_2.Token {
     }
     escape() {
         LSP: { // eslint-disable-line no-unused-labels
-            this.#equal = '{{=}}';
-            this.lastChild.escape();
+            if (this.type !== 'ext-attr') {
+                this.#equal = '{{=}}';
+                this.lastChild.escape();
+            }
         }
     }
 }

package/dist/src/converter.js

@@ -76,8 +76,7 @@ let ConverterToken = (() => {
             const [firstRule] = rules, hasColon = firstRule.includes(':'), 
             // @ts-expect-error abstract class
             firstRuleToken = new converterRule_1.ConverterRuleToken(firstRule, hasColon, config, accum);
-            if (hasColon && firstRuleToken.length === 1
-                || !hasColon && rules.length === 2 && !(0, string_1.removeComment)(rules[1]).trim()) {
+            if (hasColon ? firstRuleToken.length === 1 : rules.length === 2 && !(0, string_1.removeComment)(rules[1]).trim()) {
                 this.insertAt(
                 // @ts-expect-error abstract class
                 new converterRule_1.ConverterRuleToken(rules.join(';'), false, config, accum));

package/dist/src/converterRule.d.ts

@@ -6,12 +6,12 @@ import type { ConverterToken, ConverterFlagsToken } from '../internal';
  * language conversion rule
  *
  * 转换规则
- * @classdesc `{childNodes: AtomToken[]}`
+ * @classdesc `{childNodes: [Token?, AtomToken?, Token]}`
  */
 export declare abstract class ConverterRuleToken extends Token {
-    readonly childNodes: readonly [AtomToken] | readonly [AtomToken, AtomToken] | readonly [AtomToken, AtomToken, AtomToken];
-    abstract get firstChild(): AtomToken;
-    abstract get lastChild(): AtomToken;
+    readonly childNodes: readonly [Token] | readonly [AtomToken, Token] | readonly [Token, AtomToken, Token];
+    abstract get firstChild(): Token;
+    abstract get lastChild(): Token;
     abstract get parentNode(): ConverterToken | undefined;
     abstract get previousSibling(): ConverterFlagsToken | this | undefined;
     abstract get nextSibling(): this | undefined;

package/dist/src/converterRule.js

@@ -4,14 +4,28 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConverterRuleToken = void 0;
+const constants_1 = require("../util/constants");
 const index_1 = __importDefault(require("../index"));
 const index_2 = require("./index");
 const atom_1 = require("./atom");
+/**
+ * 生成转换原文或目标的节点
+ * @param text 文本
+ * @param type 节点类型
+ * @param config
+ * @param accum
+ */
+const getRuleFromTo = (text, type, config, accum) => {
+    const token = new index_2.Token(text, config, accum);
+    token.type = `converter-rule-${type}`;
+    token.setAttribute('stage', constants_1.MAX_STAGE);
+    return token;
+};
 /**
  * language conversion rule
  *
  * 转换规则
- * @classdesc `{childNodes: AtomToken[]}`
+ * @classdesc `{childNodes: [Token?, AtomToken?, Token]}`
  */
 class ConverterRuleToken extends index_2.Token {
     get type() {
@@ -22,17 +36,17 @@ class ConverterRuleToken extends index_2.Token {
      * @param hasColon 是否带有":"
      */
     constructor(rule, hasColon = true, config = index_1.default.getConfig(), accum = []) {
-        super(undefined, config, accum);
+        super(undefined, config, accum, {});
         const i = rule.indexOf(':'), j = rule.slice(0, i).indexOf('=>'), v = j === -1 ? rule.slice(0, i) : rule.slice(j + 2, i);
         if (hasColon && config.variants.includes(v.trim().toLowerCase())) {
             super.insertAt(new atom_1.AtomToken(v, 'converter-rule-variant', config, accum));
-            super.insertAt(new atom_1.AtomToken(rule.slice(i + 1), 'converter-rule-to', config, accum));
+            super.insertAt(getRuleFromTo(rule.slice(i + 1), 'to', config, accum));
             if (j !== -1) {
-                super.insertAt(new atom_1.AtomToken(rule.slice(0, j), 'converter-rule-from', config, accum), 0);
+                super.insertAt(getRuleFromTo(rule.slice(0, j), 'from', config, accum), 0);
             }
         }
         else {
-            super.insertAt(new atom_1.AtomToken(rule, 'converter-rule-to', config, accum));
+            super.insertAt(getRuleFromTo(rule, 'to', config, accum));
         }
     }
     /** @private */

package/dist/src/imageParameter.d.ts

@@ -15,7 +15,12 @@ export declare abstract class ImageParameterToken extends Token {
     abstract get nextSibling(): this | undefined;
     abstract get previousSibling(): AtomToken | this | undefined;
     get type(): 'image-parameter';
-    /** thumbnail / 缩略图 */
+    /**
+     * thumbnail
+     *
+     * 缩略图
+     * @since v1.29.0
+     */
     get thumb(): Title | undefined;
     /** image link / 图片链接 */
     get link(): string | Title | undefined;

package/dist/src/imageParameter.js

@@ -70,7 +70,12 @@ class ImageParameterToken extends index_2.Token {
     get type() {
         return 'image-parameter';
     }
-    /** thumbnail / 缩略图 */
+    /**
+     * thumbnail
+     *
+     * 缩略图
+     * @since v1.29.0
+     */
     get thumb() {
         LINT: return this.name === 'manualthumb' // eslint-disable-line no-unused-labels
             ? this.normalizeTitle(`File:${super.text().trim()}`, 6, { page: '' })

package/dist/src/nowiki/index.js

@@ -55,40 +55,42 @@ class NowikiToken extends base_1.NowikiBaseToken {
             }
             const errors = super.lint(start, getLintRegex(name));
             /* NOT FOR BROWSER ONLY */
-            rule = 'invalid-math';
-            s = lintConfig.getSeverity(rule);
-            if (s && document_1.texvcjs && constants_1.mathTags.has(name)) {
-                const isChem = name !== 'math', display = previousSibling?.getAttr('display') ?? 'block';
-                let tex = innerText, n = 0;
-                if (isChem) {
-                    tex = String.raw `\ce{${tex}}`;
-                    n = 4;
-                }
-                switch (display) {
-                    case 'block':
-                        tex = String.raw `{\displaystyle ${tex}}`;
-                        n += 15;
-                        break;
-                    case 'inline':
-                        tex = String.raw `{\textstyle ${tex}}`;
-                        n += 12;
-                        break;
-                    case 'linebreak':
-                        tex = String.raw `\[ ${tex} \]`;
-                        n += 3;
-                    // no default
-                }
-                const result = document_1.texvcjs.check(tex, {
-                    usemhchem: isChem || Boolean(previousSibling?.hasAttr('chem')),
-                });
-                if (result.status !== '+') {
-                    const e = (0, lint_1.generateForSelf)(this, { start }, rule, 'chem-required', s);
-                    if (result.status !== 'C') {
-                        const { error: { message, location } } = result, [endIndex, endLine, endCol] = updateLocation(e, location.end, n);
-                        [e.startIndex, e.startLine, e.startCol] = updateLocation(e, location.start, n);
-                        Object.assign(e, { endIndex, endLine, endCol, message });
+            NPM: { // eslint-disable-line no-unused-labels
+                rule = 'invalid-math';
+                s = lintConfig.getSeverity(rule);
+                if (s && document_1.texvcjs && constants_1.mathTags.has(name)) {
+                    const isChem = name !== 'math', display = previousSibling?.getAttr('display') ?? 'block';
+                    let tex = innerText, n = 0;
+                    if (isChem) {
+                        tex = String.raw `\ce{${tex}}`;
+                        n = 4;
+                    }
+                    switch (display) {
+                        case 'block':
+                            tex = String.raw `{\displaystyle ${tex}}`;
+                            n += 15;
+                            break;
+                        case 'inline':
+                            tex = String.raw `{\textstyle ${tex}}`;
+                            n += 12;
+                            break;
+                        case 'linebreak':
+                            tex = String.raw `\[ ${tex} \]`;
+                            n += 3;
+                        // no default
+                    }
+                    const result = document_1.texvcjs.check(tex, {
+                        usemhchem: isChem || Boolean(previousSibling?.hasAttr('chem')),
+                    });
+                    if (result.status !== '+') {
+                        const e = (0, lint_1.generateForSelf)(this, { start }, rule, 'chem-required', s);
+                        if (result.status !== 'C') {
+                            const { error: { message, location } } = result, [endIndex, endLine, endCol] = updateLocation(e, location.end, n);
+                            [e.startIndex, e.startLine, e.startCol] = updateLocation(e, location.start, n);
+                            Object.assign(e, { endIndex, endLine, endCol, message });
+                        }
+                        errors.push(e);
                     }
-                    errors.push(e);
                 }
             }
             /* NOT FOR BROWSER ONLY END */

package/dist/src/tag/html.js

@@ -197,7 +197,7 @@ let HtmlToken = (() => {
                         s = lintConfig.getSeverity(rule, 'opening');
                         const childNodes = parentNode?.childNodes;
                         if (formattingTags.has(name)) {
-                            if (childNodes?.slice(0, childNodes.indexOf(this)).some(tag => tag.type === 'html' && tag.name === name && !tag.findMatchingTag())) {
+                            if (childNodes?.slice(0, childNodes.indexOf(this)).some(tag => tag.is('html') && tag.name === name && !tag.findMatchingTag())) {
                                 error.suggestions = [(0, lint_1.fixByClose)(start + 1, '/')];
                             }
                             if (this.closest('heading-title')) {

package/dist/src/transclude.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wikilint",
-	"version": "2.29.0",
+	"version": "2.29.2",
 	"description": "A Node.js linter for MediaWiki markup",
 	"keywords": [
 		"mediawiki",
@@ -48,7 +48,7 @@
 		"lint:json": "v8r -s config/.schema.json config/*.json && v8r -s data/.schema.json data/*.json && mocha dist/test/json.js",
 		"lint": "npm run lint:ts && npm run lint:json",
 		"prof": "node dist/test/prof.js",
-		"coverage": "nyc --cache-dir=./.cache/nyc npm test && node dist/script/coverage.js && open coverage/index.html",
+		"coverage": "nyc --cache-dir=./.cache/nyc npm run test:ci && node dist/script/coverage.js && open coverage/index.html",
 		"test:unit": "mocha dist/test/test.js",
 		"test:parser": "mocha dist/test/parserTests.js",
 		"test": "npm run test:unit && npm run test:parser",