wikilint 2.20.0 → 2.20.2

package/dist/lib/document.d.ts

@@ -6,7 +6,11 @@ import type { Token } from '../internal';
 declare interface Jax {
     tex2mml(tex: string): string;
 }
-export declare const MathJax: Promise<Jax | undefined>;
+/**
+ * Load MathJax
+ * @param id MathJax module ID
+ */
+export declare const loadMathJax: (id?: string) => 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,13 +3,18 @@ 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.htmlData = exports.cssLSP = exports.jsonLSP = exports.jsonTags = exports.MathJax = void 0;
+exports.EmbeddedCSSDocument = exports.EmbeddedJSONDocument = exports.stylelint = exports.htmlData = exports.cssLSP = exports.jsonLSP = exports.jsonTags = exports.loadMathJax = void 0;
 const path_1 = __importDefault(require("path"));
 const common_1 = require("@bhsd/common");
-exports.MathJax = (async () => {
+let MathJax;
+/**
+ * Load MathJax
+ * @param id MathJax module ID
+ */
+const loadMathJax = (id = 'mathjax') => {
     try {
-        const jax = require('mathjax');
-        return await jax.init({
+        const jax = require(id);
+        MathJax ??= jax.init({
             loader: {
                 load: ['input/tex', '[tex]/mhchem'],
             },
@@ -22,11 +27,13 @@ exports.MathJax = (async () => {
             },
             startup: { typeset: false },
         });
+        return MathJax;
     }
     catch {
         return undefined;
     }
-})();
+};
+exports.loadMathJax = loadMathJax;
 exports.jsonTags = ['templatedata', 'mapframe', 'maplink'];
 exports.jsonLSP = (() => {
     try {

package/dist/lib/lsp.js

@@ -280,7 +280,6 @@ class LanguageService {
     config;
     /** @private */
     data;
-    /* NOT FOR BROWSER ONLY */
     lilypond;
     #lilypondData;
     #mathData;
@@ -840,7 +839,7 @@ class LanguageService {
                 }));
             }
         }
-        const MathJax = await document_1.MathJax, data = this.#mathSet, mathDiagnostics = root.querySelectorAll(mathSelector)
+        const MathJax = await (0, document_1.loadMathJax)(this.mathjax), data = this.#mathSet, mathDiagnostics = root.querySelectorAll(mathSelector)
             .map(token => {
             const { selfClosing, innerText, lastChild, name } = token;
             if (selfClosing) {

package/dist/lib/node.d.ts

@@ -13,6 +13,10 @@ export interface CaretPosition {
     readonly offsetNode: AstNodes;
     readonly offset: number;
 }
+export interface Font {
+    bold: boolean;
+    italic: boolean;
+}
 /**
  * Node-like
  *

package/dist/lib/text.js

@@ -25,7 +25,7 @@ const errorSyntaxUrl = new RegExp(source, 'giu'), noLinkTypes = new Set(['attr-v
     r: 'lonely-http',
     p: 'lonely-http',
     i: 'lonely-http',
-}, disallowedTags = [
+}, disallowedTags = new Set([
     'html',
     'head',
     'style',
@@ -51,10 +51,10 @@ const errorSyntaxUrl = new RegExp(source, 'giu'), noLinkTypes = new Set(['attr-v
     'option',
     'select',
     'textarea',
-];
+]);
 let wordRegex;
 try {
-    // eslint-disable-next-line prefer-regex-literals, es-x/no-regexp-unicode-property-escapes
+    // eslint-disable-next-line prefer-regex-literals
     wordRegex = new RegExp(String.raw `[\p{L}\p{N}_]`, 'u');
 }
 catch /* istanbul ignore next */ {
@@ -100,7 +100,8 @@ class AstText extends node_1.AstNode {
             if (grandType !== 'ext-attr') {
                 isHtmlAttrVal = true;
             }
-            else if (tag === 'choose' && (grandName === 'before' || grandName === 'after')) {
+            else if (tag === 'ref' && (grandName === 'name' || grandName === 'extends' || grandName === 'follow')
+                || tag === 'choose' && (grandName === 'before' || grandName === 'after')) {
                 return [];
             }
         }
@@ -145,16 +146,15 @@ class AstText extends node_1.AstNode {
             else if (char === ']' && (index || length > 1)) {
                 errorRegex.lastIndex--;
             }
-            const startIndex = start + index, endIndex = startIndex + length, nextChar = rootStr[endIndex], previousChar = rootStr[startIndex - 1], severity = length > 1 && !(char === '<' && !/[\s/>]/u.test(nextChar ?? '')
+            const startIndex = start + index, endIndex = startIndex + length, nextChar = rootStr[endIndex], previousChar = rootStr[startIndex - 1], severity = length > 1 && !(char === '<' && (/^<\s/u.test(error) || !/[\s/>]/u.test(nextChar ?? '') || disallowedTags.has(tag))
                 || isHtmlAttrVal && (char === '[' || char === ']')
-                || magicLink && type === 'parameter-value')
+                || magicLink && type === 'parameter-value'
+                || /^(?:rfc|pmid|isbn)$/iu.test(error))
                 || char === '{' && (nextChar === char || previousChar === '-')
                 || char === '}' && (previousChar === char || nextChar === '-')
-                || char === '[' && (nextChar === char
-                    || type === 'ext-link-text'
-                    || nextType === 'free-ext-link' && !data.slice(index + 1).trim())
-                || char === ']' && (previousChar === char
-                    || previousType === 'free-ext-link' && !data.slice(0, index).includes(']'))
+                || char === '[' && (type === 'ext-link-text' || nextType === 'free-ext-link' && !data.slice(index + 1).trim())
+                || char === ']' && previousType === 'free-ext-link'
+                    && !data.slice(0, index).includes(']')
                 ? 'error'
                 : 'warning';
             const leftBracket = char === '{' || char === '[', rightBracket = char === ']' || char === '}';

package/dist/parser/quotes.js

@@ -56,9 +56,17 @@ const parseQuotes = (wikitext, config, accum, tidy) => {
             arr[i - 1] += `'`;
         }
     }
+    let bold = true, italic = true;
     for (let i = 1; i < length; i += 2) {
+        const n = arr[i].length, isBold = n !== 2, isItalic = n !== 3;
+        if (isBold) {
+            bold = !bold;
+        }
+        if (isItalic) {
+            italic = !italic;
+        }
         // @ts-expect-error abstract class
-        new quote_1.QuoteToken(arr[i], config, accum);
+        new quote_1.QuoteToken(arr[i], { bold: isBold && bold, italic: isItalic && italic }, config, accum);
         arr[i] = `\0${accum.length - 1}q\x7F`;
     }
     return arr.join('');

package/dist/src/attributes.js

@@ -23,7 +23,7 @@ const toAttributeType = (type) => type.slice(0, -1);
 const toDirty = (type) => `${toAttributeType(type)}-dirty`;
 let wordRegex;
 try {
-    // eslint-disable-next-line prefer-regex-literals, es-x/no-regexp-unicode-property-escapes
+    // eslint-disable-next-line prefer-regex-literals
     wordRegex = new RegExp(String.raw `[\p{L}\p{N}]`, 'u');
 }
 catch /* istanbul ignore next */ {
@@ -81,8 +81,8 @@ class AttributesToken extends index_2.Token {
     /** @private */
     afterBuild() {
         const { parentNode } = this;
-        if (parentNode?.type === 'td' && parentNode.subtype === 'caption') {
-            this.setAttribute('name', 'caption');
+        if (parentNode?.type === 'td') {
+            this.setAttribute('name', parentNode.subtype);
         }
         super.afterBuild();
     }

package/dist/src/gallery.js

@@ -106,7 +106,9 @@ let GalleryToken = (() => {
                     errors.push({
                         rule: 'no-ignored',
                         message: index_1.default.msg('invalid content in <$1>', 'gallery'),
-                        severity: trimmed.startsWith('|') ? 'warning' : 'error',
+                        severity: trimmed.endsWith('-->') || /^(?:\||<!--)/u.test(trimmed)
+                            ? 'warning'
+                            : 'error',
                         startIndex: start,
                         endIndex,
                         startLine,

package/dist/src/link/file.js

@@ -14,7 +14,7 @@ const frame = new Map([
     ['frameless', 'Frameless'],
     ['framed', 'Frame'],
     ['thumbnail', 'Thumb'],
-]), horizAlign = new Set(['left', 'right', 'center', 'none']), vertAlign = new Set(['baseline', 'sub', 'super', 'top', 'text-top', 'middle', 'bottom', 'text-bottom']), extensions = new Set(['tiff', 'tif', 'png', 'gif', 'jpg', 'jpeg', 'webp', 'xcf', 'pdf', 'svg', 'djvu']);
+]), argTypes = new Set(['arg']), transclusion = new Set(['template', 'magic-word']), horizAlign = new Set(['left', 'right', 'center', 'none']), vertAlign = new Set(['baseline', 'sub', 'super', 'top', 'text-top', 'middle', 'bottom', 'text-bottom']), extensions = new Set(['tiff', 'tif', 'png', 'gif', 'jpg', 'jpeg', 'webp', 'xcf', 'pdf', 'svg', 'djvu']);
 /**
  * a more sophisticated string-explode function
  * @param str string to be exploded
@@ -39,6 +39,15 @@ const explode = (str) => {
     exploded.push(str.slice(lastIndex));
     return exploded;
 };
+/**
+ * filter out the image parameters that are not of the specified type
+ * @param args image parameter tokens
+ * @param types token types to be filtered
+ */
+const filterArgs = (args, types) => args.filter(({ childNodes }) => {
+    const visibleNodes = childNodes.filter(node => node.text().trim());
+    return visibleNodes.length !== 1 || !types.has(visibleNodes[0].type);
+});
 /**
  * image
  *
@@ -67,10 +76,7 @@ class FileToken extends base_1.LinkBaseToken {
     }
     /** @private */
     lint(start = this.getAbsoluteIndex(), re) {
-        const errors = super.lint(start, re), args = this.getAllArgs().filter(({ childNodes }) => {
-            const visibleNodes = childNodes.filter(node => node.text().trim());
-            return visibleNodes.length !== 1 || visibleNodes[0].type !== 'arg';
-        }), keys = [...new Set(args.map(({ name }) => name))], frameKeys = keys.filter(key => frame.has(key)), horizAlignKeys = keys.filter(key => horizAlign.has(key)), vertAlignKeys = keys.filter(key => vertAlign.has(key)), [fr] = frameKeys, unscaled = fr === 'framed' || fr === 'manualthumb', rect = new rect_1.BoundingRect(this, start);
+        const errors = super.lint(start, re), args = filterArgs(this.getAllArgs(), argTypes), keys = [...new Set(args.map(({ name }) => name))], frameKeys = keys.filter(key => frame.has(key)), horizAlignKeys = keys.filter(key => horizAlign.has(key)), vertAlignKeys = keys.filter(key => vertAlign.has(key)), [fr] = frameKeys, unscaled = fr === 'framed' || fr === 'manualthumb', rect = new rect_1.BoundingRect(this, start);
         if (this.closest('ext-link-text')
             && this.getValue('link')?.trim() !== '') {
             errors.push((0, lint_1.generateForSelf)(this, rect, 'nested-link', 'internal link in an external link'));
@@ -94,8 +100,8 @@ class FileToken extends base_1.LinkBaseToken {
          * @param p1 替换$1
          * @param severity 错误等级
          */
-        const generate = (msg, p1, severity) => (arg) => {
-            const e = (0, lint_1.generateForChild)(arg, rect, 'no-duplicate', index_1.default.msg(`${msg} image $1 parameter`, p1), severity);
+        const generate = (msg, p1, severity = true) => (arg) => {
+            const isError = typeof severity === 'function' ? severity(arg) : severity, e = (0, lint_1.generateForChild)(arg, rect, 'no-duplicate', index_1.default.msg(`${msg} image $1 parameter`, p1), isError ? 'error' : 'warning');
             e.suggestions = [{ desc: 'remove', range: [e.startIndex - 1, e.endIndex], text: '' }];
             return e;
         };
@@ -104,15 +110,21 @@ class FileToken extends base_1.LinkBaseToken {
             if (key === 'invalid' || key === 'width' && unscaled) {
                 continue;
             }
+            const isCaption = key === 'caption';
             let relevantArgs = args.filter(({ name }) => name === key);
-            if (key === 'caption') {
+            if (isCaption) {
                 relevantArgs = [
                     ...relevantArgs.slice(0, -1).filter(arg => arg.text()),
                     ...relevantArgs.slice(-1),
                 ];
             }
             if (relevantArgs.length > 1) {
-                errors.push(...relevantArgs.map(generate('duplicated', key, key === 'caption' && extension && !extensions.has(extension) ? 'warning' : 'error')));
+                let severity = !isCaption || !extension || extensions.has(extension);
+                if (isCaption && severity) {
+                    const plainArgs = filterArgs(relevantArgs, transclusion);
+                    severity = plainArgs.length > 1 && ((arg) => plainArgs.includes(arg));
+                }
+                errors.push(...relevantArgs.map(generate('duplicated', key, severity)));
             }
         }
         if (frameKeys.length > 1) {

package/dist/src/link/redirectTarget.js

@@ -33,7 +33,7 @@ class RedirectTargetToken extends base_1.LinkBaseToken {
     lint(start = this.getAbsoluteIndex()) {
         const errors = super.lint(start, false);
         if (this.length === 2) {
-            const e = (0, lint_1.generateForChild)(this.lastChild, { start }, 'no-ignored', 'useless link text');
+            const e = (0, lint_1.generateForChild)(this.lastChild, { start }, 'no-ignored', 'useless link text', 'warning');
             e.startIndex--;
             e.startCol--;
             e.fix = { range: [e.startIndex, e.endIndex], text: '', desc: 'remove' };

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

@@ -1,6 +1,6 @@
 import { NowikiBaseToken } from './base';
 import type { LintError, Config } from '../../base';
-import type { Token } from '../index';
+import type { Token } from '../../internal';
 /**
  * invisible HTML comment
  *

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

@@ -1,6 +1,6 @@
 import { NowikiBaseToken } from './base';
 import type { Config } from '../../base';
-import type { Token } from '../index';
+import type { Token } from '../../internal';
 /**
  * behavior switch
  *

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

@@ -1,14 +1,21 @@
 import { NowikiBaseToken } from './base';
-import type { LintError } from '../../base';
+import type { LintError, Config } from '../../base';
+import type { Font } from '../../lib/node';
+import type { Token } from '../../internal';
 /**
  * `''` and `'''`
  *
  * `''`和`'''`
  */
 export declare abstract class QuoteToken extends NowikiBaseToken {
+    #private;
     get type(): 'quote';
     /** 是否粗体 */
     get bold(): boolean;
     /** 是否斜体 */
     get italic(): boolean;
+    /** whether to be closing quotes / 是否闭合 */
+    get closing(): Partial<Font>;
+    /** @param closing 是否闭合 */
+    constructor(wikitext: string, closing: Font, config?: Config, accum?: Token[]);
 }

package/dist/src/nowiki/quote.js

@@ -14,6 +14,7 @@ const base_1 = require("./base");
  * `''`和`'''`
  */
 class QuoteToken extends base_1.NowikiBaseToken {
+    #closing;
     get type() {
         return 'quote';
     }
@@ -25,6 +26,18 @@ class QuoteToken extends base_1.NowikiBaseToken {
     get italic() {
         return this.innerText.length !== 3;
     }
+    /** whether to be closing quotes / 是否闭合 */
+    get closing() {
+        return {
+            ...this.bold ? { bold: this.#closing.bold } : undefined,
+            ...this.italic ? { italic: this.#closing.italic } : undefined,
+        };
+    }
+    /** @param closing 是否闭合 */
+    constructor(wikitext, closing, config, accum) {
+        super(wikitext, config, accum);
+        this.#closing = closing;
+    }
     /** @private */
     text() {
         const { parentNode, innerText } = this;
@@ -32,7 +45,7 @@ class QuoteToken extends base_1.NowikiBaseToken {
     }
     /** @private */
     lint(start = this.getAbsoluteIndex()) {
-        const { previousSibling, nextSibling, bold } = this, message = index_1.default.msg('lonely "$1"', `'`), errors = [], rect = new rect_1.BoundingRect(this, start);
+        const { previousSibling, nextSibling, bold, closing } = this, previousData = previousSibling?.type === 'text' ? previousSibling.data : undefined, nextData = nextSibling?.type === 'text' ? nextSibling.data : undefined, message = index_1.default.msg('lonely "$1"', `'`), errors = [], rect = new rect_1.BoundingRect(this, start);
         /**
          * 获取建议
          * @param startIndex 起点
@@ -43,8 +56,11 @@ class QuoteToken extends base_1.NowikiBaseToken {
             { desc: 'escape', range: [startIndex, endIndex], text: '''.repeat(length) },
             { desc: 'remove', range: [startIndex, endIndex], text: '' },
         ];
-        if (previousSibling?.type === 'text' && previousSibling.data.endsWith(`'`)) {
-            const e = (0, lint_1.generateForSelf)(this, rect, 'lonely-apos', message), { startIndex: endIndex, startLine: endLine, startCol: endCol } = e, [, { length }] = /(?:^|[^'])('+)$/u.exec(previousSibling.data), startIndex = start - length;
+        if (previousData?.endsWith(`'`)) {
+            const e = (0, lint_1.generateForSelf)(this, rect, 'lonely-apos', message, (closing.bold || closing.italic)
+                && (/[a-z\d]'$/iu.test(previousData) || nextData && /^[a-z\d]/iu.test(nextData))
+                ? 'warning'
+                : 'error'), { startIndex: endIndex, startLine: endLine, startCol: endCol } = e, [, { length }] = /(?:^|[^'])('+)$/u.exec(previousData), startIndex = start - length;
             errors.push({
                 ...e,
                 startIndex,
@@ -55,8 +71,8 @@ class QuoteToken extends base_1.NowikiBaseToken {
                 suggestions: getSuggestion(startIndex, endIndex, length),
             });
         }
-        if (nextSibling?.type === 'text' && nextSibling.data.startsWith(`'`)) {
-            const e = (0, lint_1.generateForSelf)(this, rect, 'lonely-apos', message), { endIndex: startIndex, endLine: startLine, endCol: startCol } = e, [{ length }] = /^'+/u.exec(nextSibling.data), endIndex = startIndex + length;
+        if (nextData?.startsWith(`'`)) {
+            const e = (0, lint_1.generateForSelf)(this, rect, 'lonely-apos', message), { endIndex: startIndex, endLine: startLine, endCol: startCol } = e, [{ length }] = /^'+/u.exec(nextData), endIndex = startIndex + length;
             errors.push({
                 ...e,
                 startIndex,

package/dist/src/paramTag/inputbox.d.ts

@@ -1,6 +1,6 @@
 import Parser from '../../index';
 import { ParamTagToken } from './index';
-import type { Token } from '../index';
+import type { Token } from '../../internal';
 /** `<inputbox>` */
 export declare abstract class InputboxToken extends ParamTagToken {
     /** @class */

package/dist/src/transclude.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wikilint",
-	"version": "2.20.0",
+	"version": "2.20.2",
 	"description": "A Node.js linter for MediaWiki markup",
 	"keywords": [
 		"mediawiki",
@@ -66,7 +66,7 @@
 		]
 	},
 	"dependencies": {
-		"@bhsd/common": "^0.9.3",
+		"@bhsd/common": "^0.9.4",
 		"vscode-languageserver-types": "^3.17.5"
 	},
 	"optionalDependencies": {
@@ -75,10 +75,10 @@
 		"entities": "^6.0.0",
 		"mathjax": "^3.2.2",
 		"minimatch": "^10.0.1",
-		"stylelint": "^16.14.1",
-		"vscode-css-languageservice": "^6.3.2",
-		"vscode-html-languageservice": "^5.3.1",
-		"vscode-json-languageservice": "^5.4.3"
+		"stylelint": "^16.19.1",
+		"vscode-css-languageservice": "^6.3.4",
+		"vscode-html-languageservice": "^5.3.3",
+		"vscode-json-languageservice": "^5.4.4"
 	},
 	"devDependencies": {
 		"@stylistic/eslint-plugin": "^3.1.0",
@@ -92,7 +92,6 @@
 		"color-rgba": "^3.0.0",
 		"esbuild": "^0.25.2",
 		"eslint": "^8.57.1",
-		"eslint-plugin-es-x": "^8.4.1",
 		"eslint-plugin-eslint-comments": "^3.2.0",
 		"eslint-plugin-jsdoc": "^50.6.3",
 		"eslint-plugin-json-es": "^1.6.0",
@@ -104,7 +103,6 @@
 		"http-server": "^14.1.1",
 		"mocha": "^11.1.0",
 		"nyc": "^17.1.0",
-		"stylelint-config-recommended": "^15.0.0",
 		"typescript": "^5.8.2",
 		"v8r": "^4.2.1",
 		"vscode-languageserver-textdocument": "^1.0.12"