wikilint 2.18.4 → 2.19.0

package/dist/base.d.mts

@@ -15,6 +15,7 @@ export interface Config {
     readonly variants: string[];
     readonly articlePath?: string;
 }
+export type ConfigData = Omit<Config, 'excludes'>;
 export type TokenTypes = 'root' | 'plain' | 'redirect' | 'redirect-syntax' | 'redirect-target' | 'onlyinclude' | 'noinclude' | 'include' | 'comment' | 'ext' | 'ext-attrs' | 'ext-attr-dirty' | 'ext-attr' | 'attr-key' | 'attr-value' | 'ext-inner' | 'arg' | 'arg-name' | 'arg-default' | 'hidden' | 'magic-word' | 'magic-word-name' | 'invoke-function' | 'invoke-module' | 'template' | 'template-name' | 'parameter' | 'parameter-key' | 'parameter-value' | 'heading' | 'heading-title' | 'heading-trail' | 'html' | 'html-attrs' | 'html-attr-dirty' | 'html-attr' | 'table' | 'tr' | 'td' | 'table-syntax' | 'table-attrs' | 'table-attr-dirty' | 'table-attr' | 'table-inter' | 'td-inner' | 'hr' | 'double-underscore' | 'link' | 'link-target' | 'link-text' | 'category' | 'file' | 'gallery-image' | 'imagemap-image' | 'image-parameter' | 'quote' | 'ext-link' | 'ext-link-text' | 'ext-link-url' | 'free-ext-link' | 'magic-link' | 'list' | 'dd' | 'list-range' | 'converter' | 'converter-flags' | 'converter-flag' | 'converter-rule' | 'converter-rule-variant' | 'converter-rule-to' | 'converter-rule-from' | 'param-line' | 'imagemap-link';
 export declare const stages: {
     redirect: number;
@@ -250,7 +251,7 @@ export interface LanguageService {
     setTargetWikipedia(wiki: string): Promise<void>;
 }
 export interface Parser {
-    config: Config | string;
+    config: ConfigData | string;
     i18n: Record<string, string> | string | undefined;
     /**
      * Get the current parser configuration
@@ -258,7 +259,7 @@ export interface Parser {
      * 获取当前的解析设置
      * @param config unprocessed parser configuration / 未处理的解析设置
      */
-    getConfig(config?: Config): Config;
+    getConfig(config?: ConfigData): Config;
     /**
      * Parse wikitext
      *

package/dist/base.d.ts

@@ -15,6 +15,7 @@ export interface Config {
     readonly variants: string[];
     readonly articlePath?: string;
 }
+export type ConfigData = Omit<Config, 'excludes'>;
 export type TokenTypes = 'root' | 'plain' | 'redirect' | 'redirect-syntax' | 'redirect-target' | 'onlyinclude' | 'noinclude' | 'include' | 'comment' | 'ext' | 'ext-attrs' | 'ext-attr-dirty' | 'ext-attr' | 'attr-key' | 'attr-value' | 'ext-inner' | 'arg' | 'arg-name' | 'arg-default' | 'hidden' | 'magic-word' | 'magic-word-name' | 'invoke-function' | 'invoke-module' | 'template' | 'template-name' | 'parameter' | 'parameter-key' | 'parameter-value' | 'heading' | 'heading-title' | 'heading-trail' | 'html' | 'html-attrs' | 'html-attr-dirty' | 'html-attr' | 'table' | 'tr' | 'td' | 'table-syntax' | 'table-attrs' | 'table-attr-dirty' | 'table-attr' | 'table-inter' | 'td-inner' | 'hr' | 'double-underscore' | 'link' | 'link-target' | 'link-text' | 'category' | 'file' | 'gallery-image' | 'imagemap-image' | 'image-parameter' | 'quote' | 'ext-link' | 'ext-link-text' | 'ext-link-url' | 'free-ext-link' | 'magic-link' | 'list' | 'dd' | 'list-range' | 'converter' | 'converter-flags' | 'converter-flag' | 'converter-rule' | 'converter-rule-variant' | 'converter-rule-to' | 'converter-rule-from' | 'param-line' | 'imagemap-link';
 export declare const stages: {
     redirect: number;
@@ -250,7 +251,7 @@ export interface LanguageService {
     setTargetWikipedia(wiki: string): Promise<void>;
 }
 export interface Parser {
-    config: Config | string;
+    config: ConfigData | string;
     i18n: Record<string, string> | string | undefined;
     /**
      * Get the current parser configuration
@@ -258,7 +259,7 @@ export interface Parser {
      * 获取当前的解析设置
      * @param config unprocessed parser configuration / 未处理的解析设置
      */
-    getConfig(config?: Config): Config;
+    getConfig(config?: ConfigData): Config;
     /**
      * Parse wikitext
      *

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import type { Config, LintError, TokenTypes, Parser as ParserBase, Stage } from './base';
+import type { Config, ConfigData, LintError, TokenTypes, Parser as ParserBase, Stage } from './base';
 import type { Title, TitleOptions } from './lib/title';
 import type { LanguageService, QuickFixData } from './lib/lsp';
 import type { Token } from './internal';
@@ -37,6 +37,6 @@ declare const Parser: Parser;
 // @ts-expect-error mixed export styles
 export = Parser;
 export default Parser;
-export type { Config, LintError, TokenTypes, LanguageService, QuickFixData, };
+export type { Config, ConfigData, LintError, TokenTypes, LanguageService, QuickFixData, };
 export type * from './internal';
 declare global { type Acceptable = unknown; }

package/dist/lib/document.d.ts

@@ -3,6 +3,10 @@ import type { TextDocument } from 'vscode-languageserver-textdocument';
 import type { JSONDocument } from 'vscode-json-languageservice';
 import type { Stylesheet } from 'vscode-css-languageservice';
 import type { Token } from '../internal';
+declare interface Jax {
+    tex2mml(tex: string): string;
+}
+export declare const MathJax: Promise<Jax | undefined>;
 export declare const jsonTags: string[];
 export declare const jsonLSP: import("vscode-json-languageservice").LanguageService | undefined;
 export declare const cssLSP: import("vscode-css-languageservice").LanguageService | undefined;

package/dist/lib/document.js

@@ -3,9 +3,30 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EmbeddedCSSDocument = exports.EmbeddedJSONDocument = exports.stylelint = exports.cssLSP = exports.jsonLSP = exports.jsonTags = void 0;
+exports.EmbeddedCSSDocument = exports.EmbeddedJSONDocument = exports.stylelint = exports.cssLSP = exports.jsonLSP = exports.jsonTags = exports.MathJax = void 0;
 const path_1 = __importDefault(require("path"));
 const common_1 = require("@bhsd/common");
+exports.MathJax = (async () => {
+    try {
+        const jax = require('mathjax');
+        return await jax.init({
+            loader: {
+                load: ['input/tex', '[tex]/mhchem'],
+            },
+            tex: {
+                packages: { '[+]': ['mhchem'] },
+                /** @ignore */
+                formatError(_, error) {
+                    throw error;
+                },
+            },
+            startup: { typeset: false },
+        });
+    }
+    catch {
+        return undefined;
+    }
+})();
 exports.jsonTags = ['templatedata', 'mapframe', 'maplink'];
 exports.jsonLSP = (() => {
     try {

package/dist/lib/lsp.js

@@ -21,7 +21,7 @@ const document_1 = require("./document");
 const cssRules = {
     'block-no-empty': null,
     'property-no-unknown': null,
-}, jsonSelector = document_1.jsonTags.map(s => `ext-inner#${s}`).join(), scores = new Map();
+}, jsonSelector = document_1.jsonTags.map(s => `ext#${s}`).join(), mathSelector = ['math', 'chem', 'ce'].map(s => `ext#${s}`).join(), scores = new Map();
 let colors;
 /* NOT FOR BROWSER ONLY END */
 exports.tasks = new WeakMap();
@@ -768,8 +768,11 @@ class LanguageService {
                 });
             })() :
             [], jsonDiagnostics = document_1.jsonLSP ?
-            await Promise.all(root.querySelectorAll(jsonSelector).map(async (token) => {
-                const textDoc = new document_1.EmbeddedJSONDocument(root, token), severityLevel = token.name === 'templatedata' ? 'error' : 'ignore', e = (await document_1.jsonLSP.doValidation(textDoc, textDoc.jsonDoc, {
+            await Promise.all(root.querySelectorAll(jsonSelector).map(async ({ name, lastChild, selfClosing }) => {
+                if (selfClosing) {
+                    return [];
+                }
+                const textDoc = new document_1.EmbeddedJSONDocument(root, lastChild), severityLevel = name === 'templatedata' ? 'error' : 'ignore', e = (await document_1.jsonLSP.doValidation(textDoc, textDoc.jsonDoc, {
                     comments: severityLevel,
                     trailingCommas: severityLevel,
                 })).map((error) => ({
@@ -824,6 +827,32 @@ class LanguageService {
                 }));
             }
         }
+        const MathJax = await document_1.MathJax, mathDiagnostics = MathJax
+            ? root.querySelectorAll(mathSelector)
+                .map(({ selfClosing, innerText, lastChild, name }) => {
+                if (selfClosing) {
+                    return [];
+                }
+                try {
+                    MathJax.tex2mml(name === 'math' ? innerText : String.raw `\ce{${innerText}}`);
+                    return [];
+                }
+                catch (e) {
+                    if (e && typeof e === 'object' && 'id' in e && 'message' in e) {
+                        return [
+                            {
+                                range: createNodeRange(lastChild),
+                                severity: 1,
+                                source: 'MathJax',
+                                code: e.id,
+                                message: e.message,
+                            },
+                        ];
+                    }
+                    return [];
+                }
+            })
+            : [];
         /* NOT FOR BROWSER ONLY END */
         return [
             diagnostics,
@@ -831,6 +860,7 @@ class LanguageService {
             jsonDiagnostics,
             /* NOT FOR BROWSER ONLY */
             lilypondDiagnostics,
+            mathDiagnostics,
         ].flat(2);
     }
     /**
@@ -883,8 +913,10 @@ class LanguageService {
         }
         /* NOT FOR BROWSER ONLY */
         if (document_1.jsonLSP) {
-            for (const token of root.querySelectorAll(jsonSelector)) {
-                ranges.push(...document_1.jsonLSP.getFoldingRanges(new document_1.EmbeddedJSONDocument(root, token)));
+            for (const { selfClosing, lastChild } of root.querySelectorAll(jsonSelector)) {
+                if (!selfClosing) {
+                    ranges.push(...document_1.jsonLSP.getFoldingRanges(new document_1.EmbeddedJSONDocument(root, lastChild)));
+                }
             }
         }
         /* NOT FOR BROWSER ONLY END */

package/dist/parser/braces.js

@@ -61,7 +61,7 @@ const getSymbol = (s) => {
  * @throws `TranscludeToken.constructor()`
  */
 const parseBraces = (wikitext, config, accum) => {
-    const source = String.raw `${config.excludes?.includes('heading') ? '' : String.raw `^((?:\0\d+[cno]\x7F)*)={1,6}|`}\[\[|-\{(?!\{)`, { parserFunction: [, , , subst] } = config, stack = [], linkStack = [];
+    const source = String.raw `${config.excludes.includes('heading') ? '' : String.raw `^((?:\0\d+[cno]\x7F)*)={1,6}|`}\[\[|-\{(?!\{)`, { parserFunction: [, , , subst] } = config, stack = [], linkStack = [];
     /**
      * 恢复内链
      * @param s 不含内链的字符串

package/dist/src/imageParameter.js

@@ -14,7 +14,7 @@ const getUrlRegex = (0, common_1.getRegex)(protocol => new RegExp(String.raw `^(
 const getSyntaxRegex = (0, common_1.getRegex)(syntax => new RegExp(String.raw `^(\s*(?!\s))${syntax.replace('$1', '(.*)')}${syntax.endsWith('$1') ? '(?=$|\n)' : ''}(\s*)$`, 'u'));
 exports.galleryParams = new Set(['alt', 'link', 'lang', 'page', 'caption']);
 function validate(key, val, config, halfParsed, ext) {
-    val = val.trim();
+    val = (0, string_1.removeComment)(val).trim();
     let value = val.replace(key === 'link' ? /\0\d+[tq]\x7F/gu : /\0\d+t\x7F/gu, '').trim();
     switch (key) {
         case 'width':
@@ -81,10 +81,12 @@ class ImageParameterToken extends index_2.Token {
             this.setAttribute('name', param[1]);
             return;
         }
-        super(str, {
-            ...config,
-            excludes: [...config.excludes ?? [], 'list'],
-        }, accum);
+        super(str, config.excludes.includes('list')
+            ? config
+            : {
+                ...config,
+                excludes: [...config.excludes, 'list'],
+            }, accum);
         this.setAttribute('name', 'caption');
         this.setAttribute('stage', 7);
     }

package/dist/src/index.js

@@ -224,7 +224,7 @@ class Token extends element_1.AstElement {
     }
     /** 解析HTML标签 */
     #parseHtml() {
-        if (this.#config.excludes?.includes('html')) {
+        if (this.#config.excludes.includes('html')) {
             return;
         }
         const { parseHtml } = require('../parser/html');
@@ -232,7 +232,7 @@ class Token extends element_1.AstElement {
     }
     /** 解析表格 */
     #parseTable() {
-        if (this.#config.excludes?.includes('table')) {
+        if (this.#config.excludes.includes('table')) {
             return;
         }
         const { parseTable } = require('../parser/table');
@@ -240,7 +240,7 @@ class Token extends element_1.AstElement {
     }
     /** 解析`<hr>`和状态开关 */
     #parseHrAndDoubleUnderscore() {
-        if (this.#config.excludes?.includes('hr')) {
+        if (this.#config.excludes.includes('hr')) {
             return;
         }
         const { parseHrAndDoubleUnderscore } = require('../parser/hrAndDoubleUnderscore');
@@ -259,7 +259,7 @@ class Token extends element_1.AstElement {
      * @param tidy 是否整理
      */
     #parseQuotes(tidy) {
-        if (this.#config.excludes?.includes('quote')) {
+        if (this.#config.excludes.includes('quote')) {
             return;
         }
         const { parseQuotes } = require('../parser/quotes');
@@ -271,7 +271,7 @@ class Token extends element_1.AstElement {
     }
     /** 解析外部链接 */
     #parseExternalLinks() {
-        if (this.#config.excludes?.includes('extLink')) {
+        if (this.#config.excludes.includes('extLink')) {
             return;
         }
         const { parseExternalLinks } = require('../parser/externalLinks');
@@ -279,7 +279,7 @@ class Token extends element_1.AstElement {
     }
     /** 解析自由外链 */
     #parseMagicLinks() {
-        if (this.#config.excludes?.includes('magicLink')) {
+        if (this.#config.excludes.includes('magicLink')) {
             return;
         }
         const { parseMagicLinks } = require('../parser/magicLinks');
@@ -287,7 +287,7 @@ class Token extends element_1.AstElement {
     }
     /** 解析列表 */
     #parseList() {
-        if (this.#config.excludes?.includes('list')) {
+        if (this.#config.excludes.includes('list')) {
             return;
         }
         const { parseList } = require('../parser/list');

package/dist/src/paramTag/inputbox.js

@@ -12,12 +12,17 @@ const index_2 = require("./index");
 class InputboxToken extends index_2.ParamTagToken {
     /** @class */
     constructor(include, wikitext, config = index_1.default.getConfig(), accum = []) {
-        const placeholder = Symbol('InputboxToken'), { length } = accum;
+        const placeholder = Symbol('InputboxToken'), newConfig = config.excludes.includes('heading')
+            ? config
+            : {
+                ...config,
+                excludes: [...config.excludes, 'heading'],
+            }, { length } = accum;
         accum.push(placeholder);
-        wikitext &&= (0, commentAndExt_1.parseCommentAndExt)(wikitext, config, accum, include);
-        wikitext &&= (0, braces_1.parseBraces)(wikitext, config, accum);
+        wikitext &&= (0, commentAndExt_1.parseCommentAndExt)(wikitext, newConfig, accum, include);
+        wikitext &&= (0, braces_1.parseBraces)(wikitext, newConfig, accum);
         accum.splice(length, 1);
-        super(include, wikitext, config, accum, {});
+        super(include, wikitext, newConfig, accum, {});
     }
 }
 exports.InputboxToken = InputboxToken;

package/dist/src/tagPair/ext.js

@@ -98,7 +98,7 @@ let ExtToken = (() => {
             attrToken = new attributes_1.AttributesToken(!attr || /^\s/u.test(attr) ? attr : ` ${attr}`, 'ext-attrs', lcName, config, accum), newConfig = {
                 ...config,
                 ext: del(config.ext, lcName),
-                excludes: [...config.excludes ?? []],
+                excludes: [...config.excludes],
             };
             let innerToken;
             switch (lcName) {
@@ -127,11 +127,11 @@ let ExtToken = (() => {
                     innerToken = new index_4.ParamTagToken(include, inner, newConfig, accum);
                     break;
                 case 'inputbox':
-                    newConfig.excludes.push('heading');
                     // @ts-expect-error abstract class
                     innerToken = new inputbox_1.InputboxToken(include, inner, newConfig, accum);
                     break;
                 case 'references': {
+                    // NestedToken 依赖 ExtToken
                     const { NestedToken } = require('../nested');
                     newConfig.excludes.push('heading');
                     // @ts-expect-error abstract class
@@ -139,12 +139,14 @@ let ExtToken = (() => {
                     break;
                 }
                 case 'choose': {
+                    // NestedToken 依赖 ExtToken
                     const { NestedToken } = require('../nested');
                     // @ts-expect-error abstract class
                     innerToken = new NestedToken(inner, /<(option|choicetemplate)(\s[^>]*?)?(?:\/>|>([\s\S]*?)<\/(\1)>)/gu, ['option', 'choicetemplate'], newConfig, accum);
                     break;
                 }
                 case 'combobox': {
+                    // NestedToken 依赖 ExtToken
                     const { NestedToken } = require('../nested');
                     // @ts-expect-error abstract class
                     innerToken = new NestedToken(inner, /<(combooption)(\s[^>]*?)?(?:\/>|>([\s\S]*?)<\/(combooption\s*)>)/giu, ['combooption'], newConfig, accum);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wikilint",
-	"version": "2.18.4",
+	"version": "2.19.0",
 	"description": "A Node.js linter for MediaWiki markup",
 	"keywords": [
 		"mediawiki",
@@ -65,13 +65,14 @@
 		]
 	},
 	"dependencies": {
-		"@bhsd/common": "^0.9.1",
+		"@bhsd/common": "^0.9.2",
 		"vscode-languageserver-types": "^3.17.5"
 	},
 	"optionalDependencies": {
 		"chalk": "^4.1.2",
 		"color-name": "^2.0.0",
 		"entities": "^6.0.0",
+		"mathjax": "^3.2.2",
 		"minimatch": "^10.0.1",
 		"stylelint": "^16.14.1",
 		"vscode-css-languageservice": "^6.3.2",
@@ -85,10 +86,10 @@
 		"@types/color-rgba": "^2.1.3",
 		"@types/mocha": "^10.0.10",
 		"@types/node": "^22.13.1",
-		"@typescript-eslint/eslint-plugin": "^8.23.0",
-		"@typescript-eslint/parser": "^8.23.0",
+		"@typescript-eslint/eslint-plugin": "^8.29.0",
+		"@typescript-eslint/parser": "^8.29.0",
 		"color-rgba": "^3.0.0",
-		"esbuild": "^0.25.0",
+		"esbuild": "^0.25.2",
 		"eslint": "^8.57.1",
 		"eslint-plugin-es-x": "^8.4.1",
 		"eslint-plugin-eslint-comments": "^3.2.0",
@@ -103,7 +104,7 @@
 		"mocha": "^11.1.0",
 		"nyc": "^17.1.0",
 		"stylelint-config-recommended": "^15.0.0",
-		"typescript": "^5.7.3",
+		"typescript": "^5.8.2",
 		"v8r": "^4.2.1",
 		"vscode-languageserver-textdocument": "^1.0.12"
 	},