wikilint 2.38.0 → 2.38.1

package/dist/base.d.mts

@@ -124,7 +124,7 @@ export interface LanguageService {
      *
      * 销毁实例
      */
-    destroy(): void;
+    destroy(): Promise<void>;
     /**
      * Provide color decorators
      *
@@ -264,6 +264,7 @@ export interface LanguageService {
      * @param user URI for wiki userpage or email address of the user / 维基用户页面地址或用户的电子邮件地址
      */
     setTargetWikipedia(wiki: string, user: string): Promise<void>;
+    [Symbol.dispose](): void;
 }
 export type SeverityLevel = 0 | 1 | 2 | false | 'off' | 'warning' | 'error';
 export type LintConfigValue = SeverityLevel | [SeverityLevel, Record<string, SeverityLevel>?];

package/dist/base.d.ts

@@ -124,7 +124,7 @@ export interface LanguageService {
      *
      * 销毁实例
      */
-    destroy(): void;
+    destroy(): Promise<void>;
     /**
      * Provide color decorators
      *
@@ -264,6 +264,7 @@ export interface LanguageService {
      * @param user URI for wiki userpage or email address of the user / 维基用户页面地址或用户的电子邮件地址
      */
     setTargetWikipedia(wiki: string, user: string): Promise<void>;
+    [Symbol.dispose](): void;
 }
 export type SeverityLevel = 0 | 1 | 2 | false | 'off' | 'warning' | 'error';
 export type LintConfigValue = SeverityLevel | [SeverityLevel, Record<string, SeverityLevel>?];

package/dist/bin/config.js

@@ -16,7 +16,8 @@ const diff_1 = require("../util/diff");
  * @param config.articlePath article path
  */
 const arrToObj = ({ articlePath, ...obj }) => {
-    for (const [k, v] of Object.entries(obj)) {
+    for (const k in obj) {
+        const v = obj[k];
         if (Array.isArray(v) && v.every(x => typeof x === 'string')) {
             Object.assign(obj, { [k]: Object.fromEntries(v.map(x => [x, true])) });
         }
@@ -39,7 +40,7 @@ const filterGadget = (id) => {
     const n = Number(id);
     return n < 2300 || n > 2303; // Gadget, Gadget talk, Gadget definition, Gadget definition talk
 };
-const pkg = "wikilint", version = "2.38.0";
+const pkg = "wikilint", version = "2.38.1";
 /**
  * Get the parser configuration for a Wikimedia Foundation project.
  * @param site site nickname
@@ -147,9 +148,9 @@ exports.default = async (site, url, user, force, internal) => {
     }
     else {
         const oldConfig = arrToObj(require(file)), newConfig = arrToObj(config);
-        for (const [k, v] of Object.entries(newConfig)) {
+        for (const k in newConfig) {
             try {
-                strict_1.default.deepStrictEqual(oldConfig[k], v);
+                strict_1.default.deepStrictEqual(oldConfig[k], newConfig[k]);
             }
             catch (e) {
                 if (e instanceof strict_1.default.AssertionError) {

package/dist/index.js

@@ -200,7 +200,7 @@ const Parser = {
             catch (e) /* c8 ignore start */ {
                 if (e instanceof Error) {
                     const file = path_1.default.join(__dirname, '..', 'errors', new Date().toISOString()), stage = token.getAttribute('stage');
-                    for (const k of Object.keys(config)) {
+                    for (const k in config) {
                         if (k.startsWith('regex') || config[k] instanceof Set) {
                             delete config[k];
                         }
@@ -263,7 +263,7 @@ const def = {
     /* NOT FOR BROWSER ONLY */
     'fetchConfig',
 ]);
-for (const key of Object.keys(Parser)) {
+for (const key in Parser) {
     if (!enumerable.has(key)) {
         def[key] = { enumerable: false };
     }

package/dist/lib/lintConfig.js

@@ -287,8 +287,8 @@ class LintRuleConfiguration {
         if (!config) {
             return;
         }
-        for (const [key, value] of Object.entries(config)) {
-            set(this, key, value);
+        for (const key in config) {
+            set(this, key, config[key]);
         }
     }
     /** @implements */
@@ -330,7 +330,8 @@ class LintConfiguration {
         else {
             const { rules: ruleConfig, ...other } = (config ?? {});
             this.rules = ruleConfig;
-            for (const [key, value] of Object.entries(other)) {
+            for (const key in other) {
+                const value = other[key];
                 if (value !== undefined && Object.prototype.hasOwnProperty.call(defaultLintConfig, key)) {
                     this[key] = value;
                 }

package/dist/lib/lsp.d.ts

@@ -16,7 +16,7 @@ export declare class LanguageService implements LanguageServiceBase {
     /** @param uri 任务标识 */
     constructor(uri: object);
     /** @implements */
-    destroy(): void;
+    destroy(): Promise<void>;
     /**
      * Provide color decorators
      *
@@ -160,4 +160,6 @@ export declare class LanguageService implements LanguageServiceBase {
      * @since v1.18.1
      */
     setTargetWikipedia(wiki: string, user: string): Promise<void>;
+    /** @implements */
+    [Symbol.dispose](): void;
 }

package/dist/lib/lsp.js

@@ -393,19 +393,12 @@ class LanguageService {
         });
     }
     /** @implements */
-    destroy() {
+    async destroy() {
         Object.setPrototypeOf(this, null);
         /* NOT FOR BROWSER ONLY */
         const dir = path_1.default.join(__dirname, 'lilypond');
         if (fs_1.default.existsSync(dir)) {
-            for (const file of fs_1.default.readdirSync(dir)) {
-                (async () => {
-                    try {
-                        await fs_1.default.promises.unlink(path_1.default.join(dir, file));
-                    }
-                    catch { }
-                })();
-            }
+            await Promise.allSettled(fs_1.default.readdirSync(dir).map(file => fs_1.default.promises.unlink(path_1.default.join(dir, file))));
         }
     }
     /** 检查解析设置有无更新 */
@@ -930,8 +923,9 @@ class LanguageService {
         let lilypondDiagnostics = [];
         if (this.lilypond) {
             const tokens = root.querySelectorAll('ext#score').filter(token => {
-                const lang = token.getAttr('lang');
-                return (lang === undefined || lang === 'lilypond') && token.innerText;
+                const lang = token.getAttr('lang'), { innerText } = token;
+                return (lang === undefined || lang === 'lilypond') && innerText?.trim()
+                    && !/[#$](?!@?\s*(?:'\s*)?(?:[#"]|-?\.?\d|[a-z_][-:\w]*(?![^)\]}\s])))/iu.test(innerText);
             });
             if (tokens.length > 0) {
                 const dir = path_1.default.join(__dirname, 'lilypond');
@@ -949,7 +943,7 @@ class LanguageService {
                     fs_1.default.writeFileSync(file, score);
                     try {
                         // eslint-disable-next-line @typescript-eslint/strict-void-return
-                        await util_1.default.promisify(child_process_1.execFile)(this.lilypond, ['-s', '-o', dir, file]);
+                        await util_1.default.promisify(child_process_1.execFile)(this.lilypond, ['-dno-print-pages', '-s', '-o', dir, file]);
                         scores.set(score, []);
                     }
                     catch (e) {
@@ -1609,5 +1603,9 @@ class LanguageService {
         }
         Object.assign(this.config, { articlePath: `${host}/wiki/` });
     }
+    /** @implements */
+    [Symbol.dispose]() {
+        void this.destroy();
+    }
 }
 exports.LanguageService = LanguageService;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wikilint",
-	"version": "2.38.0",
+	"version": "2.38.1",
 	"description": "A Node.js linter for MediaWiki markup",
 	"keywords": [
 		"mediawiki",
@@ -89,9 +89,10 @@
 		"vscode-json-languageservice": "^5.7.2"
 	},
 	"devDependencies": {
-		"@bhsd/code-standard": "^2.1.1",
+		"@bhsd/code-standard": "^2.2.0",
 		"@bhsd/nodejs": "^1.0.0",
 		"@bhsd/test-util": "^1.0.0",
+		"@eslint-community/eslint-plugin-eslint-comments": "^4.7.1",
 		"@stylistic/eslint-plugin": "^5.10.0",
 		"@types/color-name": "^2.0.0",
 		"@types/color-rgba": "^2.1.3",
@@ -102,15 +103,14 @@
 		"c8": "^11.0.0",
 		"color-rgba": "^3.0.0",
 		"diff2html-cli": "^5.2.15",
-		"esbuild": "^0.27.4",
-		"eslint": "^9.39.4",
-		"eslint-plugin-eslint-comments": "^3.2.0",
+		"esbuild": "^0.27.7",
+		"eslint": "^10.2.0",
 		"eslint-plugin-jsdoc": "^62.7.1",
-		"eslint-plugin-jsonc": "^3.1.1",
+		"eslint-plugin-jsonc": "^3.1.2",
 		"eslint-plugin-n": "^17.24.0",
 		"eslint-plugin-promise": "^7.2.1",
 		"eslint-plugin-regexp": "^3.1.0",
-		"eslint-plugin-unicorn": "^63.0.0",
+		"eslint-plugin-unicorn": "^64.0.0",
 		"markdownlint-cli2": "^0.21.0",
 		"mocha": "^11.7.5",
 		"typescript": "^6.0.2",