wikilint 2.33.0 → 2.35.0

package/config/default.json

@@ -41,6 +41,7 @@
 		"templatedata",
 		"timeline",
 		"page-collection",
+		"wish",
 		"img"
 	],
 	"html": [

package/dist/base.d.mts

@@ -44,7 +44,7 @@ export declare const stages: {
     converter: number;
 };
 export type Stage = keyof typeof stages;
-export declare const rules: readonly ["arg-in-ext", "bold-header", "format-leakage", "fostered-content", "h1", "illegal-attr", "insecure-style", "invalid-gallery", "invalid-imagemap", "invalid-invoke", "invalid-isbn", "invalid-url", "lonely-apos", "lonely-bracket", "lonely-http", "nested-link", "no-arg", "no-duplicate", "no-ignored", "obsolete-attr", "obsolete-tag", "parsing-order", "pipe-like", "syntax-like", "table-layout", "tag-like", "unbalanced-header", "unclosed-comment", "unclosed-quote", "unclosed-table", "unescaped", "unknown-page", "unmatched-tag", "unterminated-url", "url-encoding", "var-anchor", "void-ext", "invalid-css", "invalid-math"];
+export declare const rules: readonly ["arg-in-ext", "bold-header", "format-leakage", "fostered-content", "h1", "illegal-attr", "insecure-style", "invalid-gallery", "invalid-imagemap", "invalid-invoke", "invalid-isbn", "invalid-json", "invalid-url", "lonely-apos", "lonely-bracket", "lonely-http", "nested-link", "no-arg", "no-duplicate", "no-ignored", "obsolete-attr", "obsolete-tag", "parsing-order", "pipe-like", "syntax-like", "table-layout", "tag-like", "unbalanced-header", "unclosed-comment", "unclosed-quote", "unclosed-table", "unescaped", "unknown-page", "unmatched-tag", "unterminated-url", "url-encoding", "var-anchor", "void-ext", "invalid-css", "invalid-math"];
 export declare namespace LintError {
     type Severity = 'error' | 'warning';
     type Rule = typeof rules[number];

package/dist/base.d.ts

@@ -44,7 +44,7 @@ export declare const stages: {
     converter: number;
 };
 export type Stage = keyof typeof stages;
-export declare const rules: readonly ["arg-in-ext", "bold-header", "format-leakage", "fostered-content", "h1", "illegal-attr", "insecure-style", "invalid-gallery", "invalid-imagemap", "invalid-invoke", "invalid-isbn", "invalid-url", "lonely-apos", "lonely-bracket", "lonely-http", "nested-link", "no-arg", "no-duplicate", "no-ignored", "obsolete-attr", "obsolete-tag", "parsing-order", "pipe-like", "syntax-like", "table-layout", "tag-like", "unbalanced-header", "unclosed-comment", "unclosed-quote", "unclosed-table", "unescaped", "unknown-page", "unmatched-tag", "unterminated-url", "url-encoding", "var-anchor", "void-ext", "invalid-css", "invalid-math"];
+export declare const rules: readonly ["arg-in-ext", "bold-header", "format-leakage", "fostered-content", "h1", "illegal-attr", "insecure-style", "invalid-gallery", "invalid-imagemap", "invalid-invoke", "invalid-isbn", "invalid-json", "invalid-url", "lonely-apos", "lonely-bracket", "lonely-http", "nested-link", "no-arg", "no-duplicate", "no-ignored", "obsolete-attr", "obsolete-tag", "parsing-order", "pipe-like", "syntax-like", "table-layout", "tag-like", "unbalanced-header", "unclosed-comment", "unclosed-quote", "unclosed-table", "unescaped", "unknown-page", "unmatched-tag", "unterminated-url", "url-encoding", "var-anchor", "void-ext", "invalid-css", "invalid-math"];
 export declare namespace LintError {
     type Severity = 'error' | 'warning';
     type Rule = typeof rules[number];

package/dist/base.js

@@ -44,6 +44,7 @@ exports.rules = (() => {
         'invalid-imagemap',
         'invalid-invoke',
         'invalid-isbn',
+        'invalid-json',
         'invalid-url',
         'lonely-apos',
         'lonely-bracket',

package/dist/base.mjs

@@ -41,6 +41,7 @@ const rules = /* @__PURE__ */ (() => {
     "invalid-imagemap",
     "invalid-invoke",
     "invalid-isbn",
+    "invalid-json",
     "invalid-url",
     "lonely-apos",
     "lonely-bracket",

package/dist/bin/cli.js

@@ -7,21 +7,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const assert_1 = __importDefault(require("assert"));
+const util_1 = __importDefault(require("util"));
 const index_1 = __importDefault(require("../index"));
-const chalk = (() => {
-    try {
-        return require('chalk');
-    }
-    catch {
-        const f = ((text) => text), proxy = new Proxy(f, {
-            /** @private */
-            get() {
-                return proxy;
-            },
-        });
-        return proxy;
-    }
-})();
 const man = `
 Available options:
 -c, --config <path or preset config>    Choose parser's configuration
@@ -159,11 +146,13 @@ const throwOnCacheFile = (input) => {
  * @param word item name
  */
 const plural = (n, word) => `${n} ${word}${n === 1 ? '' : 's'}`;
+// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+const styleText = util_1.default.styleText ?? ((_, text) => text);
 /**
  * color the severity
  * @param severity problem severity
  */
-const coloredSeverity = (severity) => chalk[severity === 'error' ? 'red' : 'yellow'](severity.padEnd(7));
+const coloredSeverity = (severity) => styleText(severity === 'error' ? 'red' : 'yellow', severity.padEnd(7));
 for (let i = 2; i < argv.length; i++) {
     option = argv[i];
     switch (option) {
@@ -374,10 +363,10 @@ catch {
             nFixableWarn += nLocalFixableWarn;
         }
         if (problems.length > 0) {
-            console.error(`\n${chalk.underline('%s')}`, file);
+            console.error('\n%s', styleText('underline', file));
             const maxLineChars = String(Math.max(...problems.map(({ startLine }) => startLine))).length, maxColChars = String(Math.max(...problems.map(({ startCol }) => startCol))).length, maxMessageChars = Math.max(...problems.map(({ message: { length } }) => length));
             for (const { rule, message, severity, startLine, startCol } of problems) {
-                console.error(`  ${chalk.dim('%s:%s')}  %s  %s  ${chalk.dim('%s')}`, String(startLine).padStart(maxLineChars), String(startCol).padEnd(maxColChars), coloredSeverity(severity), message.padEnd(maxMessageChars), rule);
+                console.error(`  ${styleText('dim', '%s:%s')}  %s  %s  %s`, String(startLine).padStart(maxLineChars), String(startCol).padEnd(maxColChars), coloredSeverity(severity), message.padEnd(maxMessageChars), styleText('dim', rule));
             }
         }
         nErr += nLocalErr;
@@ -385,9 +374,9 @@ catch {
         exiting ||= Boolean(nLocalErr || strict && nLocalWarn);
     }
     if (nErr || nWarn) {
-        console.error(chalk.red.bold('%s'), `\n✖ ${plural(nErr + nWarn, 'problem')} (${plural(nErr, 'error')}, ${plural(nWarn, 'warning')})`);
+        console.error(styleText(['red', 'bold'], '%s'), `\n✖ ${plural(nErr + nWarn, 'problem')} (${plural(nErr, 'error')}, ${plural(nWarn, 'warning')})`);
         if (nFixableErr || nFixableWarn) {
-            console.error(chalk.red.bold('%s'), `  ${plural(nFixableErr, 'error')} and ${plural(nFixableWarn, 'warning')} potentially fixable with the \`--fix\` option.`);
+            console.error(styleText(['red', 'bold'], '%s'), `  ${plural(nFixableErr, 'error')} and ${plural(nFixableWarn, 'warning')} potentially fixable with the \`--fix\` option.`);
         }
         console.error();
     }

package/dist/bin/config.js

@@ -77,7 +77,7 @@ const mw = {
         },
     },
 };
-const pkg = "wikilint", version = "2.33.0";
+const pkg = "wikilint", version = "2.35.0";
 let mwConfig;
 /**
  * Get the parser configuration for a Wikimedia Foundation project.
@@ -122,7 +122,7 @@ exports.default = async (site, url, user, force, internal) => {
         siprop: 'general|magicwords|functionhooks|namespaces|namespacealiases',
         format: 'json',
         formatversion: '2',
-    }, { query: { general: { articlepath, variants }, magicwords, namespaces, namespacealiases, functionhooks, }, } = await (await fetch(`${url}/api.php?${new URLSearchParams(params).toString()}`, headers)).json();
+    }, { query: { general: { articlepath, variants, langconversion }, magicwords, namespaces, namespacealiases, functionhooks, }, } = await (await fetch(`${url}/api.php?${new URLSearchParams(params).toString()}`, headers)).json();
     try {
         eval(m); // eslint-disable-line no-eval
     }
@@ -140,7 +140,7 @@ exports.default = async (site, url, user, force, internal) => {
     ]), config = {
         ...(0, cm_util_1.getParserConfig)(require(path_1.default.join(dir, 'minimum')), mwConfig),
         ...(0, cm_util_1.getKeywords)(magicwords),
-        variants: (0, cm_util_1.getVariants)(variants),
+        variants: langconversion ? (0, cm_util_1.getVariants)(variants) : [],
         namespaces: Object.fromEntries(ns),
         nsid: Object.fromEntries([
             ...ns.map(([id, canonical]) => [canonical.toLowerCase(), Number(id)]),

package/dist/index.js

@@ -172,11 +172,9 @@ const Parser = {
         maxStage ??= constants_1.MAX_STAGE;
         config ??= this.getConfig();
         let types;
-        LINT: {
-            if (typeof maxStage !== 'number') {
-                types = Array.isArray(maxStage) ? maxStage : [maxStage];
-                maxStage = Math.max(...types.map(t => base_1.stages[t] || constants_1.MAX_STAGE));
-            }
+        LINT: if (typeof maxStage !== 'number') {
+            types = Array.isArray(maxStage) ? maxStage : [maxStage];
+            maxStage = Math.max(...types.map(t => base_1.stages[t] || constants_1.MAX_STAGE));
         }
         const { Token } = require('./src/index');
         const root = debug_1.Shadow.run(() => {

package/dist/internal.d.ts

@@ -45,5 +45,8 @@ export type { GalleryToken } from './src/multiLine/gallery';
 export type { ImagemapLinkToken } from './src/imagemapLink';
 export type { ImagemapToken } from './src/multiLine/imagemap';
 export type { CommentedToken } from './src/commented';
+export type { CategorytreeToken } from './src/link/categorytree';
+export type { ParamLineToken } from './src/paramLine';
+export type { CommentLineToken } from './src/nowiki/commentLine';
 export type { TranslateToken } from './src/tagPair/translate';
 export type { TvarToken } from './src/tag/tvar';

package/dist/lib/lintConfig.js

@@ -72,6 +72,12 @@ const defaultLintRuleConfig = {
         },
     ],
     'invalid-isbn': 2,
+    'invalid-json': [
+        2,
+        {
+            duplicate: 1,
+        },
+    ],
     'invalid-url': 1,
     'lonely-apos': [
         1,

package/dist/lib/lsp.js

@@ -820,8 +820,21 @@ class LanguageService {
     async provideDiagnostics(text, warning = true) {
         const root = await this.#queue(text), { lintConfig } = index_1.default, needFix = lintConfig.fix;
         lintConfig.fix = false;
+        /* NOT FOR BROWSER ONLY */
+        const stylelint = await (0, document_1.loadStylelint)(), jsonLSP = (0, document_1.loadJsonLSP)();
+        let s;
+        NPM: if (jsonLSP) {
+            s = lintConfig.rules['invalid-json'];
+            lintConfig.rules['invalid-json'] = 0;
+        }
+        /* NOT FOR BROWSER ONLY END */
         const errors = root.lint();
         lintConfig.fix = needFix;
+        /* NOT FOR BROWSER ONLY */
+        NPM: if (jsonLSP) {
+            lintConfig.rules['invalid-json'] = s;
+        }
+        /* NOT FOR BROWSER ONLY END */
         const diagnostics = (warning ? errors : errors.filter(({ severity }) => severity === 'error')).map(({ startLine, startCol, endLine, endCol, severity, rule, message, fix, suggestions, 
         /* NOT FOR BROWSER ONLY */
         code, }) => ({
@@ -843,9 +856,6 @@ class LanguageService {
                 ...suggestions ? suggestions.map(suggestion => getQuickFix(root, suggestion)) : [],
             ],
         })), 
-        /* NOT FOR BROWSER ONLY */
-        stylelint = await (0, document_1.loadStylelint)(), jsonLSP = (0, document_1.loadJsonLSP)(), 
-        /* NOT FOR BROWSER ONLY END */
         /* eslint-disable @stylistic/operator-linebreak */
         cssDiagnostics = stylelint ?
             await (async () => {

package/dist/lib/node.js

@@ -39,6 +39,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AstNode = void 0;
 /* eslint-disable @typescript-eslint/no-base-to-string */
+const common_1 = require("@bhsd/common");
 const search_1 = __importDefault(require("../util/search"));
 const lint_1 = require("../util/lint");
 const debug_1 = require("../util/debug");
@@ -141,7 +142,7 @@ let AstNode = (() => {
          * @param left column number / 列号
          */
         indexFromPos(top, left) {
-            LSP: {
+            LINT: {
                 if (top < 0 || left < 0) {
                     return undefined;
                 }
@@ -248,16 +249,7 @@ let AstNode = (() => {
          * @since v1.16.3
          */
         getLines() {
-            LINT: {
-                const results = [];
-                let start = 0;
-                for (const line of String(this).split('\n')) {
-                    const end = start + line.length;
-                    results.push([line, start, end]);
-                    start = end + 1;
-                }
-                return results;
-            }
+            LINT: return (0, common_1.splitLines)(String(this));
         }
     };
     return AstNode = _classThis;

package/dist/lib/text.js

@@ -114,9 +114,15 @@ class AstText extends node_1.AstNode {
                 ...lintConfig.getSeverity('tag-like', 'disallowed') ? disallowedTags : [],
             ]);
             for (let mt = errorRegex.exec(data); mt; mt = errorRegex.exec(data)) {
-                const [, tag, prefix] = mt;
                 let { index, 0: error } = mt;
-                if (prefix && prefix !== ']') {
+                const [, tag, prefix] = mt, lbrackInExtLinkText = error === '[' && type === 'ext-link-text';
+                if (error.startsWith('<') && !tags.has(tag.toLowerCase())
+                    || lbrackInExtLinkText && (/&(?:rbrack|#93|#x5[Dd];);/u.test(data.slice(index + 1))
+                        || nextSibling?.is('ext') && nextName === 'nowiki'
+                            && nextSibling.innerText?.includes(']'))) {
+                    continue;
+                }
+                else if (prefix && prefix !== ']') {
                     const { length } = prefix;
                     index += length;
                     error = error.slice(length);
@@ -126,20 +132,14 @@ class AstText extends node_1.AstNode {
                     error = error.slice(1);
                 }
                 error = error.toLowerCase();
-                const [char] = error, magicLink = char === 'r' || char === 'p' || char === 'i', lbrace = char === '{', rbrace = char === '}', lbrack = char === '[', rbrack = char === ']';
+                const [char] = error, magicLink = error === 'rfc' || error === 'pmid' || error === 'isbn', lbrace = char === '{', rbrace = char === '}', lbrack = char === '[', rbrack = char === ']';
                 let { length } = error;
-                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(']'))) {
-                    continue;
-                }
-                else if (rbrack && (index || length > 1)) {
+                if (rbrack && (index || length > 1)) {
                     errorRegex.lastIndex--;
                 }
                 // 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 = lbrace && previousChar === '-' && variants.length > 0, rConverter = rbrace && nextChar === '-' && variants.length > 0, brokenExtLink = lbrack && nextType === 'free-ext-link' && !data.slice(index + 1).trim()
+                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(']');
                 if (magicLink) {
@@ -190,7 +190,7 @@ class AstText extends node_1.AstNode {
                         severity = lintConfig.getSeverity(rule, 'double');
                     }
                     else {
-                        if (!lbrack || type !== 'ext-link-text') {
+                        if (!lbrackInExtLinkText) {
                             const regex = regexes[char], remains = leftBracket ? data.slice(index + 1) : data.slice(0, index);
                             if (lbrace && regex.exec(remains)?.[0] === '}'
                                 || rbrace && regex.exec(remains)?.[0] === '{') {
@@ -272,11 +272,11 @@ class AstText extends node_1.AstNode {
                     else if (char === 'h' && type !== 'link-text' && wordRegex.test(previousChar || '')) {
                         e.suggestions = [(0, lint_1.fixBySpace)(startIndex)];
                     }
-                    else if (lbrack && type === 'ext-link-text') {
+                    else if (lbrackInExtLinkText) {
                         const i = parentNode.getAbsoluteIndex() + parentNode.toString().length;
                         e.suggestions = [(0, lint_1.fixByEscape)(i, '&#93;')];
                     }
-                    else if (rbrack && brokenExtLink) {
+                    else if (error === ']' && brokenExtLink) {
                         const i = start - previousSibling.toString().length;
                         e.suggestions = [(0, lint_1.fixByInsert)(i, 'left-bracket', '[')];
                     }

package/dist/parser/magicLinks.js

@@ -23,7 +23,7 @@ const parseMagicLinks = (wikitext, config, accum) => {
         let url = lead ? m.slice(lead.length) : m;
         if (p1) {
             let trail = '';
-            const m2 = /&(?:lt|gt|nbsp|#x0*(?:3[ce]|a0)|#0*(?:6[02]|160));/iu.exec(url);
+            const m2 = /&(?:[lg]t|nbsp|#x0*(?:3[ce]|a0)|#0*(?:6[02]|160));/iu.exec(url);
             if (m2) {
                 trail = url.slice(m2.index);
                 url = url.slice(0, m2.index);

package/dist/src/attribute.d.ts

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

package/dist/src/attribute.js

@@ -14,7 +14,7 @@ const index_2 = require("./index");
 const atom_1 = require("./atom");
 /* NOT FOR BROWSER ONLY */
 const document_1 = require("../lib/document");
-const insecureStyle = /expression|(?:accelerator|-o-link(?:-source)?|-o-replace)\s*:|(?:url|src|image(?:-set)?)\s*\(|attr\s*\([^)]+[\s,]url/u, evil = /(?:^|\s|\*\/)(?:javascript|vbscript)(?:\W|$)/iu, complexTypes = new Set(['ext', 'arg', 'magic-word', 'template']), urlAttrs = new Set([
+const insecureStyle = /expression|(?:accelerator|-o-link(?:-source)?|-o-replace)\s*:|(?:url|src|image(?:-set)?)\s*\(|attr\s*\([^)]+[\s,]url/u, evil = /(?:^|\s|\*\/)(?:java|vb)script(?:\W|$)/iu, complexTypes = new Set(['ext', 'arg', 'magic-word', 'template']), urlAttrs = new Set([
     'about',
     'property',
     'resource',
@@ -250,12 +250,11 @@ class AttributeToken extends index_2.Token {
     getValue() {
         return this.#equal ? this.lastChild.text().trim() : this.type === 'ext-attr' || '';
     }
+    /** @private */
     escape() {
-        LSP: {
-            if (this.type !== 'ext-attr') {
-                this.#equal = '{{=}}';
-                this.lastChild.escape();
-            }
+        LSP: if (this.type !== 'ext-attr') {
+            this.#equal = '{{=}}';
+            this.lastChild.escape();
         }
     }
 }

package/dist/src/attributes.d.ts

@@ -60,6 +60,5 @@ export declare abstract class AttributesToken extends Token {
      * @param key attribute name / 属性键
      */
     getAttr(key: string): string | true | undefined;
-    escape(): void;
 }
 export {};

package/dist/src/attributes.js

@@ -195,11 +195,10 @@ class AttributesToken extends index_2.Token {
             return errors;
         }
     }
+    /** @private */
     escape() {
-        LSP: {
-            if (this.type !== 'ext-attrs') {
-                super.escape();
-            }
+        LSP: if (this.type !== 'ext-attrs') {
+            super.escape();
         }
     }
 }

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

@@ -16,6 +16,4 @@ export declare abstract class CategorytreeToken extends LinkBaseToken {
     get type(): 'ext-inner';
     /** @param link 链接标题 */
     constructor(link: string, linkText?: undefined, config?: Config, accum?: Token[]);
-    getTitle(): Title;
-    lint(start?: number): LintError[];
 }

package/dist/src/link/categorytree.js

@@ -69,12 +69,14 @@ let CategorytreeToken = (() => {
             super(link, linkText, config, accum);
             this.setAttribute('bracket', false);
         }
+        /** @private */
         getTitle() {
             const target = this.firstChild.toString().trim(), opt = { halfParsed: true }, title = this.normalizeTitle(target, 14, opt);
             return title.valid && title.ns === 14
                 ? title
                 : this.normalizeTitle(`Category:${target}`, 0, opt);
         }
+        /** @private */
         lint(start = this.getAbsoluteIndex()) {
             LINT: {
                 const rule = 'no-ignored', s = index_1.default.lintConfig.getSeverity(rule, 'categorytree');

package/dist/src/nowiki/index.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.NowikiToken = void 0;
 const common_1 = require("@bhsd/common");
 const lint_1 = require("../../util/lint");
+const rect_1 = require("../../lib/rect");
 const index_1 = __importDefault(require("../../index"));
 const base_1 = require("./base");
 /* NOT FOR BROWSER ONLY */
@@ -42,9 +43,9 @@ class NowikiToken extends base_1.NowikiBaseToken {
     /** @private */
     lint(start = this.getAbsoluteIndex()) {
         LINT: {
-            const { name, 
+            const { name, innerText, 
             /* NOT FOR BROWSER ONLY */
-            innerText, previousSibling, } = this, { lintConfig } = index_1.default;
+            previousSibling, } = this, { lintConfig } = index_1.default;
             let rule = 'void-ext', s = lintConfig.getSeverity(rule, name);
             if (s && this.#lint()) {
                 const e = (0, lint_1.generateForSelf)(this, { start }, rule, index_1.default.msg('nothing-in', name), s);
@@ -53,9 +54,42 @@ class NowikiToken extends base_1.NowikiBaseToken {
                 }
                 return [e];
             }
-            const errors = super.lint(start, getLintRegex(name));
-            /* NOT FOR BROWSER ONLY */
             NPM: {
+                rule = 'invalid-json';
+                const sSyntax = lintConfig.getSeverity(rule);
+                /* NOT FOR BROWSER ONLY */
+                const sDuplicate = lintConfig.getSeverity(rule, 'duplicate');
+                /* NOT FOR BROWSER ONLY END */
+                if (name === 'templatedata' && (sSyntax
+                    || sDuplicate)) {
+                    // browser版本使用`lintJSONNative()`
+                    return (0, common_1.lintJSON)(innerText).map(({ message, from, to = from, line, endLine = line, column, endColumn = column, 
+                    /* NOT FOR BROWSER ONLY */
+                    severity, }) => {
+                        s =
+                            /* eslint-disable @stylistic/operator-linebreak */
+                            severity === 'warning' ?
+                                sDuplicate :
+                                /* eslint-enable @stylistic/operator-linebreak */
+                                sSyntax;
+                        if (!s) {
+                            return false;
+                        }
+                        const rect = new rect_1.BoundingRect(this, start);
+                        return {
+                            rule,
+                            message,
+                            severity: s,
+                            startIndex: start + from,
+                            endIndex: start + to,
+                            startLine: rect.top + line - 1,
+                            endLine: rect.top + endLine - 1,
+                            startCol: (line > 1 ? 0 : rect.left) + column - 1,
+                            endCol: (endLine > 1 ? 0 : rect.left) + endColumn - 1,
+                        };
+                    }).filter((e) => e !== false);
+                }
+                /* NOT FOR BROWSER ONLY */
                 rule = 'invalid-math';
                 s = lintConfig.getSeverity(rule);
                 if (s && constants_1.mathTags.has(name)) {
@@ -84,20 +118,21 @@ class NowikiToken extends base_1.NowikiBaseToken {
                         const result = 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 { message, location } = result.error, [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);
+                        if (result.status === '+') {
+                            return [];
+                        }
+                        const e = (0, lint_1.generateForSelf)(this, { start }, rule, 'chem-required', s);
+                        if (result.status !== 'C') {
+                            const { message, location } = result.error, [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 });
                         }
+                        return [e];
                     }
                 }
             }
             /* NOT FOR BROWSER ONLY END */
-            return errors;
+            return super.lint(start, getLintRegex(name));
         }
     }
 }

package/dist/src/nowiki/list.d.ts

@@ -7,5 +7,4 @@ import type { LintError } from '../../base';
  */
 export declare abstract class ListToken extends ListBaseToken {
     get type(): 'list';
-    lint(start?: number): LintError[];
 }

package/dist/src/nowiki/list.js

@@ -17,6 +17,7 @@ class ListToken extends listBase_1.ListBaseToken {
     get type() {
         return 'list';
     }
+    /** @private */
     lint(start = this.getAbsoluteIndex()) {
         LINT: {
             const rule = 'syntax-like', s = index_1.default.lintConfig.getSeverity(rule, 'redirect'), { innerText } = this;

package/dist/src/nowiki/noinclude.d.ts

@@ -7,5 +7,4 @@ import type { LintError } from '../../base';
  */
 export declare abstract class NoincludeToken extends NowikiBaseToken {
     get type(): 'noinclude';
-    lint(start?: number): LintError[];
 }

package/dist/src/nowiki/noinclude.js

@@ -69,11 +69,12 @@ let NoincludeToken = (() => {
         toString(skip) {
             return skip ? '' : super.toString();
         }
+        /** @private */
         lint(start = this.getAbsoluteIndex()) {
             LINT: {
                 const { lintConfig } = index_1.default, rule = 'no-ignored', s = lintConfig.getSeverity(rule, 'include');
                 if (s) {
-                    const { innerText } = this, mt = /^<(noinclude|includeonly|onlyinclude)\s+(?:[^\s>/]|\/(?!>))[^>]*>$/iu.exec(innerText);
+                    const { innerText } = this, mt = /^<(includeonly|(?:no|only)include)\s+(?:[^\s>/]|\/(?!>))[^>]*>$/iu.exec(innerText);
                     if (mt) {
                         const e = (0, lint_1.generateForSelf)(this, { start }, rule, 'useless-attribute', s), { computeEditInfo } = lintConfig, before = mt[1].length + 1, after = innerText.endsWith('/>') ? 2 : 1;
                         e.startIndex += before;

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

@@ -24,6 +24,5 @@ export declare abstract class TableBaseToken extends Token {
      * @param attr 表格属性
      */
     constructor(pattern: RegExp, syntax: string | undefined, type: TableTypes, attr?: string, config?: Config, accum?: Token[], acceptable?: WikiParserAcceptable);
-    escape(): void;
 }
 export {};

package/dist/src/table/base.js

@@ -89,15 +89,14 @@ let TableBaseToken = (() => {
             // @ts-expect-error abstract class
             new attributes_1.AttributesToken(attr, 'table-attrs', type, config, accum));
         }
+        /** @private */
         escape() {
-            LSP: {
-                for (const child of this.childNodes) {
-                    if (child instanceof syntax_1.SyntaxToken) {
-                        escapeTable(child);
-                    }
-                    else {
-                        child.escape();
-                    }
+            LSP: for (const child of this.childNodes) {
+                if (child instanceof syntax_1.SyntaxToken) {
+                    escapeTable(child);
+                }
+                else {
+                    child.escape();
                 }
             }
         }

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

@@ -39,6 +39,5 @@ export declare abstract class TdToken extends TableBaseToken {
      */
     isIndependent(): boolean;
     getAttr<T extends string>(key: T): TdAttrGetter<T>;
-    escape(): void;
 }
 export {};

package/dist/src/table/td.js

@@ -187,6 +187,7 @@ let TdToken = (() => {
                 return (key === 'rowspan' || key === 'colspan' ? parseInt(value) || 1 : value);
             }
         }
+        /** @private */
         escape() {
             LSP: {
                 super.escape();

package/dist/src/tagPair/index.d.ts

@@ -10,13 +10,14 @@ export declare abstract class TagPairToken extends Token {
     #private;
     readonly name: string;
     closed: boolean;
-    selfClosing: boolean;
     abstract get type(): 'ext' | 'include' | 'translate';
     readonly childNodes: readonly [AstNodes, AstNodes];
     abstract get firstChild(): AstNodes;
     abstract get lastChild(): AstNodes;
     /** inner wikitext / 内部wikitext */
     get innerText(): string | undefined;
+    /** whether to be self-closing / 是否自封闭 */
+    get selfClosing(): boolean;
     /**
      * @param name 标签名
      * @param attr 标签属性

package/dist/src/tagPair/index.js

@@ -59,11 +59,15 @@ let TagPairToken = (() => {
             __runInitializers(_classThis, _classExtraInitializers);
         }
         #tags;
+        #selfClosing;
         closed;
-        selfClosing;
         /** inner wikitext / 内部wikitext */
         get innerText() {
-            return this.selfClosing ? undefined : this.lastChild.text();
+            return this.#selfClosing ? undefined : this.lastChild.text();
+        }
+        /** whether to be self-closing / 是否自封闭 */
+        get selfClosing() {
+            return this.#selfClosing;
         }
         /**
          * @param name 标签名
@@ -76,22 +80,22 @@ let TagPairToken = (() => {
             this.setAttribute('name', name.toLowerCase());
             this.#tags = [name, closed || name];
             this.closed = closed !== '';
-            this.selfClosing = closed === undefined;
+            this.#selfClosing = closed === undefined;
             this.append(attr, inner);
             const index = typeof attr === 'string' ? -1 : accum.indexOf(attr);
             accum.splice(index === -1 ? Infinity : index, 0, this);
         }
         /** @private */
         toString(skip) {
-            const { selfClosing, firstChild, lastChild, } = this, [opening, closing] = this.#tags;
-            return selfClosing
+            const { firstChild, lastChild, } = this, [opening, closing] = this.#tags;
+            return this.#selfClosing
                 ? `<${opening}${firstChild.toString(skip)}/>`
                 : `<${opening}${firstChild.toString(skip)}>${lastChild.toString(skip)}${this.closed ? `</${closing}>` : ''}`;
         }
         /** @private */
         text() {
             const [opening, closing] = this.#tags;
-            return this.selfClosing
+            return this.#selfClosing
                 ? `<${opening}${this.firstChild.text()}/>`
                 : `<${opening}${super.text('>')}${this.closed ? `</${closing}>` : ''}`;
         }

package/dist/src/tagPair/translate.d.ts

@@ -9,12 +9,12 @@ import type { Config } from '../../base';
 export declare abstract class TranslateToken extends TagPairToken {
     name: 'translate';
     closed: true;
-    selfClosing: false;
     readonly childNodes: readonly [SyntaxToken, Token];
     abstract get firstChild(): SyntaxToken;
     abstract get lastChild(): Token;
     abstract get innerText(): string;
     get type(): 'translate';
+    get selfClosing(): false;
     /**
      * @param attr 标签属性
      * @param inner 内部wikitext

package/dist/src/tagPair/translate.js

@@ -13,6 +13,9 @@ class TranslateToken extends index_2.TagPairToken {
     get type() {
         return 'translate';
     }
+    get selfClosing() {
+        return false;
+    }
     /**
      * @param attr 标签属性
      * @param inner 内部wikitext

package/dist/util/diff.js

@@ -3,8 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.info = exports.error = exports.loadChalk = exports.diff = exports.cmd = void 0;
+exports.info = exports.error = exports.diff = exports.cmd = void 0;
 const promises_1 = __importDefault(require("fs/promises"));
+const util_1 = __importDefault(require("util"));
 const child_process_1 = require("child_process");
 /* istanbul ignore next */
 process.on('unhandledRejection', e => {
@@ -76,29 +77,17 @@ const diff = async (oldStr, newStr, uid) => {
     await Promise.allSettled([promises_1.default.unlink(oldFile), promises_1.default.unlink(newFile)]);
 };
 exports.diff = diff;
-let chalk;
-/* istanbul ignore next */
-const loadChalk = () => {
-    if (chalk === undefined) {
-        try {
-            chalk = require('chalk');
-        }
-        catch {
-            chalk = null;
-        }
-    }
-    return chalk;
-};
-exports.loadChalk = loadChalk;
 /* istanbul ignore next */
 /** @implements */
 const error = (msg, ...args) => {
-    console.error((0, exports.loadChalk)()?.red(msg) ?? msg, ...args);
+    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+    console.error(util_1.default.styleText?.('red', msg) ?? msg, ...args);
 };
 exports.error = error;
 /* istanbul ignore next */
 /** @implements */
 const info = (msg, ...args) => {
-    console.info((0, exports.loadChalk)()?.green(msg) ?? msg, ...args);
+    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+    console.info(util_1.default.styleText?.('green', msg) ?? msg, ...args);
 };
 exports.info = info;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wikilint",
-	"version": "2.33.0",
+	"version": "2.35.0",
 	"description": "A Node.js linter for MediaWiki markup",
 	"keywords": [
 		"mediawiki",
@@ -72,18 +72,17 @@
 	},
 	"dependencies": {
 		"@bhsd/cm-util": "^0.1.0",
-		"@bhsd/common": "^1.0.1",
-		"@bhsd/stylelint-util": "^0.1.0",
+		"@bhsd/common": "^1.3.0",
+		"@bhsd/stylelint-util": "^1.0.1",
 		"binary-search": "^1.3.6",
 		"vscode-languageserver-types": "^3.17.5"
 	},
 	"optionalDependencies": {
-		"chalk": "^4.1.2",
 		"color-name": "^2.0.0",
 		"entities": "^7.0.0",
 		"mathoid-texvcjs": "^0.6.0",
 		"minimatch": "^10.1.1",
-		"stylelint": "^16.26.1",
+		"stylelint": "^17.0.0",
 		"vscode-css-languageservice": "^6.3.8",
 		"vscode-html-languageservice": "^5.6.0",
 		"vscode-json-languageservice": "^5.6.3"
@@ -91,7 +90,7 @@
 	"devDependencies": {
 		"@bhsd/code-standard": "^1.3.2",
 		"@bhsd/nodejs": "^0.1.0",
-		"@bhsd/test-util": "^0.2.1",
+		"@bhsd/test-util": "^0.3.0",
 		"@stylistic/eslint-plugin": "^5.5.0",
 		"@types/color-name": "^2.0.0",
 		"@types/color-rgba": "^2.1.3",
@@ -118,6 +117,6 @@
 		"vscode-languageserver-textdocument": "^1.0.12"
 	},
 	"engines": {
-		"node": ">=18.17.0"
+		"node": ">=20.19.5"
 	}
 }