@bhsd/codemirror-mediawiki 2.24.3 → 2.25.0

package/dist/linter.d.mts

@@ -22,10 +22,16 @@ declare interface MixedDiagnostic extends Omit<DiagnosticBase, 'range'> {
  * @param obj 对象
  */
 export declare const getWikiLinter: getAsyncLinter<Promise<MixedDiagnostic[]>, Option, object>;
-/** 获取 ESLint */
-export declare const getJsLinter: getAsyncLinter<Linter.LintMessage[]>;
-/** 获取 Stylelint */
-export declare const getCssLinter: getAsyncLinter<Promise<Warning[]>>;
+/**
+ * 获取 ESLint
+ * @param fix 是否修正
+ */
+export declare const getJsLinter: getAsyncLinter<Linter.LintMessage[], boolean>;
+/**
+ * 获取 Stylelint
+ * @param fix 是否修正
+ */
+export declare const getCssLinter: getAsyncLinter<Promise<Warning[]>, boolean>;
 /** 获取 Luacheck */
 export declare const getLuaLinter: getAsyncLinter<Promise<Diagnostic[]>>;
 declare interface JsonError {

package/dist/linter.d.ts

@@ -22,10 +22,16 @@ declare interface MixedDiagnostic extends Omit<DiagnosticBase, 'range'> {
  * @param obj 对象
  */
 export declare const getWikiLinter: getAsyncLinter<Promise<MixedDiagnostic[]>, Option, object>;
-/** 获取 ESLint */
-export declare const getJsLinter: getAsyncLinter<Linter.LintMessage[]>;
-/** 获取 Stylelint */
-export declare const getCssLinter: getAsyncLinter<Promise<Warning[]>>;
+/**
+ * 获取 ESLint
+ * @param fix 是否修正
+ */
+export declare const getJsLinter: getAsyncLinter<Linter.LintMessage[], boolean>;
+/**
+ * 获取 Stylelint
+ * @param fix 是否修正
+ */
+export declare const getCssLinter: getAsyncLinter<Promise<Warning[]>, boolean>;
 /** 获取 Luacheck */
 export declare const getLuaLinter: getAsyncLinter<Promise<Diagnostic[]>>;
 declare interface JsonError {

package/dist/linter.mjs

@@ -49,7 +49,7 @@ ${sanitizeInlineStyle(childNodes[1].childNodes[0].data).replace(/\n/gu, " ")}
     ];
   };
 };
-const getJsLinter = async () => {
+const getJsLinter = async (fix) => {
   var _a;
   await loadScript("npm/eslint-linter-browserify@8.57.0/linter.min.js", "eslint", true);
   const esLinter = new eslint.Linter(), conf = {
@@ -62,16 +62,41 @@ const getJsLinter = async () => {
       conf.rules[name] = 2;
     }
   }
-  return (text, opt) => esLinter.verify(text, { ...conf, ...opt });
+  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
+        });
+      }
+    }
+    return warnings;
+  };
 };
-const getCssLinter = async () => {
-  await loadScript("npm/stylelint-bundle", "stylelint");
-  return (code, opt) => styleLint(
-    stylelint,
-    code,
-    opt == null ? void 0 : opt["rules"],
-    true
-  );
+const getCssLinter = async (fix) => {
+  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
+        });
+      }
+    }
+    return warnings;
+  };
 };
 const getLuaLinter = async () => {
   await loadScript("npm/luacheck-browserify/dist/index.min.js", "luacheck");