@bhsd/codemirror-mediawiki 2.25.0 → 2.25.2

package/dist/codemirror.d.ts

@@ -8,7 +8,9 @@ import type { MwConfig } from './token';
 import type { DocRange } from './fold';
 import type { Option, LiveOption } from './linter';
 export type { MwConfig };
-export type LintSource = (doc: Text) => Diagnostic[] | Promise<Diagnostic[]>;
+export type LintSource = ((doc: Text) => Diagnostic[] | Promise<Diagnostic[]>) & {
+    fixer?: (doc: Text, rule?: string) => string | Promise<string>;
+};
 export type Addon<T> = [(config?: T, cm?: CodeMirror6) => Extension, Record<string, T>];
 /** CodeMirror 6 编辑器 */
 export declare class CodeMirror6 {

package/dist/linter.d.mts

@@ -5,12 +5,15 @@ import type { Diagnostic } from 'luacheck-browserify';
 export type Option = Record<string, unknown> | null | undefined;
 export type LiveOption = (runtime?: true) => Option;
 declare type getLinter<T> = () => (text: string) => T;
+declare type asyncLinter<T, S = Record<string, unknown>> = ((text: string, config?: Option) => T) & {
+    config?: S;
+    fixer?: (code: string, rule?: string) => string | Promise<string>;
+};
 /**
  * @param opt 初始化选项
  * @param obj 仅用于wikiparse.LanguageService
- * @param config runtime设置
  */
-declare type getAsyncLinter<T, S = never, R = never> = (opt?: S, obj?: R) => Promise<(text: string, config?: Option) => T>;
+declare type getAsyncLinter<T, S = never, R = never> = (opt?: S, obj?: R) => Promise<asyncLinter<T>>;
 declare interface MixedDiagnostic extends Omit<DiagnosticBase, 'range'> {
     range?: Range;
     from?: number;
@@ -22,16 +25,10 @@ declare interface MixedDiagnostic extends Omit<DiagnosticBase, 'range'> {
  * @param obj 对象
  */
 export declare const getWikiLinter: getAsyncLinter<Promise<MixedDiagnostic[]>, Option, object>;
-/**
- * 获取 ESLint
- * @param fix 是否修正
- */
-export declare const getJsLinter: getAsyncLinter<Linter.LintMessage[], boolean>;
-/**
- * 获取 Stylelint
- * @param fix 是否修正
- */
-export declare const getCssLinter: getAsyncLinter<Promise<Warning[]>, boolean>;
+/** 获取 ESLint */
+export declare const getJsLinter: getAsyncLinter<Linter.LintMessage[]>;
+/** 获取 Stylelint */
+export declare const getCssLinter: getAsyncLinter<Promise<Warning[]>>;
 /** 获取 Luacheck */
 export declare const getLuaLinter: getAsyncLinter<Promise<Diagnostic[]>>;
 declare interface JsonError {

package/dist/linter.d.ts

@@ -5,12 +5,15 @@ import type { Diagnostic } from 'luacheck-browserify';
 export type Option = Record<string, unknown> | null | undefined;
 export type LiveOption = (runtime?: true) => Option;
 declare type getLinter<T> = () => (text: string) => T;
+declare type asyncLinter<T, S = Record<string, unknown>> = ((text: string, config?: Option) => T) & {
+    config?: S;
+    fixer?: (code: string, rule?: string) => string | Promise<string>;
+};
 /**
  * @param opt 初始化选项
  * @param obj 仅用于wikiparse.LanguageService
- * @param config runtime设置
  */
-declare type getAsyncLinter<T, S = never, R = never> = (opt?: S, obj?: R) => Promise<(text: string, config?: Option) => T>;
+declare type getAsyncLinter<T, S = never, R = never> = (opt?: S, obj?: R) => Promise<asyncLinter<T>>;
 declare interface MixedDiagnostic extends Omit<DiagnosticBase, 'range'> {
     range?: Range;
     from?: number;
@@ -22,16 +25,10 @@ declare interface MixedDiagnostic extends Omit<DiagnosticBase, 'range'> {
  * @param obj 对象
  */
 export declare const getWikiLinter: getAsyncLinter<Promise<MixedDiagnostic[]>, Option, object>;
-/**
- * 获取 ESLint
- * @param fix 是否修正
- */
-export declare const getJsLinter: getAsyncLinter<Linter.LintMessage[], boolean>;
-/**
- * 获取 Stylelint
- * @param fix 是否修正
- */
-export declare const getCssLinter: getAsyncLinter<Promise<Warning[]>, boolean>;
+/** 获取 ESLint */
+export declare const getJsLinter: getAsyncLinter<Linter.LintMessage[]>;
+/** 获取 Stylelint */
+export declare const getCssLinter: getAsyncLinter<Promise<Warning[]>>;
 /** 获取 Luacheck */
 export declare const getLuaLinter: getAsyncLinter<Promise<Diagnostic[]>>;
 declare interface JsonError {

package/dist/linter.mjs

@@ -49,54 +49,58 @@ ${sanitizeInlineStyle(childNodes[1].childNodes[0].data).replace(/\n/gu, " ")}
     ];
   };
 };
-const getJsLinter = async (fix) => {
+const getJsLinter = async () => {
   var _a;
   await loadScript("npm/eslint-linter-browserify@8.57.0/linter.min.js", "eslint", true);
   const esLinter = new eslint.Linter(), conf = {
     env: { browser: true, es2024: true },
-    parserOptions: { ecmaVersion: 15, sourceType: "module" },
-    rules: {}
-  };
+    parserOptions: { ecmaVersion: 15, sourceType: "module" }
+  }, recommended = {};
   for (const [name, { meta }] of esLinter.getRules()) {
     if ((_a = meta == null ? void 0 : meta.docs) == null ? void 0 : _a.recommended) {
-      conf.rules[name] = 2;
+      recommended[name] = 2;
     }
   }
-  return (text, opt) => {
-    const config = { ...conf, ...opt }, warnings = esLinter.verify(text, config);
-    if (fix) {
-      const { fixed, output } = esLinter.verifyAndFix(text, config);
-      if (fixed) {
-        warnings.push({
-          line: 1,
-          column: 1,
-          ruleId: null,
-          severity: 0,
-          message: output
-        });
-      }
+  const linter = (text, opt) => {
+    const config = { ...conf, ...opt };
+    if (!("rules" in config) || config.extends === "eslint:recommended" || Array.isArray(config.extends) && config.extends.includes("eslint:recommended")) {
+      config.rules = { ...recommended, ...config.rules };
     }
-    return warnings;
+    delete config.extends;
+    linter.config = config;
+    return esLinter.verify(text, config);
+  };
+  linter.fixer = (code, rule) => {
+    var _a2, _b;
+    return esLinter.verifyAndFix(
+      code,
+      rule ? { ...linter.config, rules: { [rule]: (_b = (_a2 = linter.config.rules) == null ? void 0 : _a2[rule]) != null ? _b : 2 } } : linter.config
+    ).output;
   };
+  return linter;
 };
-const getCssLinter = async (fix) => {
+const getCssLinter = async () => {
   await loadScript("npm/@bhsd/stylelint-browserify", "stylelint");
-  return async (code, opt) => {
-    const rules = opt == null ? void 0 : opt["rules"], warnings = await styleLint(stylelint, code, rules);
-    if (fix) {
-      const text = await styleLint(stylelint, code, rules, true);
-      if (text !== code) {
-        warnings.push({
-          line: 1,
-          column: 1,
-          rule: "fix",
-          severity: "custom",
-          text
-        });
-      }
+  const linter = async (code, opt) => {
+    const warnings = await styleLint(stylelint, code, opt);
+    if (opt && "rules" in opt) {
+      linter.config = opt;
     }
     return warnings;
   };
+  linter.fixer = (code, rule) => {
+    var _a, _b;
+    if (!linter.config) {
+      throw new Error("Fixer unavailable!");
+    }
+    return styleLint(
+      stylelint,
+      code,
+      rule ? { extends: [], rules: { [rule]: (_b = (_a = linter.config.rules) == null ? void 0 : _a[rule]) != null ? _b : true } } : linter.config,
+      true
+    );
+  };
+  return linter;
 };
 const getLuaLinter = async () => {
   await loadScript("npm/luacheck-browserify/dist/index.min.js", "luacheck");