@luxass/eslint-config 4.2.8 → 4.2.9

package/dist/index.cjs

@@ -93,7 +93,7 @@ module.exports = __toCommonJS(src_exports);
 // src/factory.ts
 var import_node_process3 = __toESM(require("process"), 1);
 var import_node_fs = require("fs");
-var import_local_pkg3 = require("local-pkg");
+var import_local_pkg4 = require("local-pkg");
 
 // src/configs/comments.ts
 var import_eslint_plugin_eslint_comments = __toESM(require("@eslint-community/eslint-plugin-eslint-comments"), 1);
@@ -830,25 +830,21 @@ async function ensure(packages) {
     return;
   }
   ;
-  const nonExistingPackages = packages.filter((i) => !(0, import_local_pkg.isPackageExists)(i));
+  const nonExistingPackages = packages.filter((i) => i && !(0, import_local_pkg.isPackageExists)(i));
   if (nonExistingPackages.length === 0) {
     return;
   }
-  ;
   const { default: prompts } = await import("prompts");
   const { result } = await prompts([
     {
-      name: "result",
       message: `${nonExistingPackages.length === 1 ? "Package is" : "Packages are"} required for this config: ${nonExistingPackages.join(", ")}. Do you want to install them?`,
+      name: "result",
       type: "confirm"
     }
   ]);
   if (result) {
-    await import("@antfu/install-pkg").then((i) => i.installPackage(nonExistingPackages, {
-      dev: true
-    }));
+    await import("@antfu/install-pkg").then((i) => i.installPackage(nonExistingPackages, { dev: true }));
   }
-  ;
 }
 function resolveSubOptions(options, key) {
   return typeof options[key] === "boolean" ? {} : options[key] || {};
@@ -2023,29 +2019,29 @@ async function react(options = {}) {
 // src/configs/frameworks/astro.ts
 async function astro(options) {
   const {
-    a11y = false,
     files = [GLOB_ASTRO],
     overrides = {},
     typescript: typescript2 = true,
     stylistic: stylistic2 = true
   } = options;
+  await ensure([
+    "eslint-plugin-astro",
+    "astro-eslint-parser"
+  ]);
   const [
     pluginAstro,
     parserAstro,
-    parserTs,
-    pluginA11y
+    parserTs
   ] = await Promise.all([
     interop(import("eslint-plugin-astro")),
     interop(import("astro-eslint-parser")),
-    interop(import("@typescript-eslint/parser")),
-    ...a11y ? [interop(import("eslint-plugin-jsx-a11y"))] : []
+    interop(import("@typescript-eslint/parser"))
   ]);
   return [
     {
       name: "luxass:astro:setup",
       plugins: {
-        astro: pluginAstro,
-        ...a11y ? { "jsx-a11y": pluginA11y } : {}
+        astro: pluginAstro
       }
     },
     {
@@ -2167,18 +2163,21 @@ async function tailwindcss(options = {}) {
 
 // src/configs/formatters.ts
 var parserPlain2 = __toESM(require("eslint-parser-plain"), 1);
+var import_local_pkg3 = require("local-pkg");
 async function formatters(options = {}, stylistic2 = {}) {
-  await ensure([
-    "eslint-plugin-format"
-  ]);
   if (options === true) {
     options = {
+      astro: (0, import_local_pkg3.isPackageExists)("astro"),
       css: true,
       graphql: true,
       html: true,
       markdown: true
     };
   }
+  await ensure([
+    "eslint-plugin-format",
+    options.astro ? "prettier-plugin-astro" : void 0
+  ]);
   const {
     indent,
     quotes,
@@ -2309,6 +2308,27 @@ async function formatters(options = {}, stylistic2 = {}) {
       }
     });
   }
+  if (options.astro) {
+    configs.push({
+      name: "luxass:formatter:astro",
+      files: [GLOB_ASTRO],
+      languageOptions: {
+        parser: parserPlain2
+      },
+      rules: {
+        "format/prettier": [
+          "error",
+          {
+            ...prettierOptions,
+            parser: "astro",
+            plugins: [
+              "prettier-plugin-astro"
+            ]
+          }
+        ]
+      }
+    });
+  }
   if (options.graphql) {
     configs.push({
       name: "luxass:formatter:graphql",
@@ -2416,9 +2436,9 @@ async function luxass(options = {}, ...userConfigs) {
     nextjs: enableNextJS = false,
     react: enableReact = false,
     tailwindcss: enableTailwindCSS = false,
-    typescript: enableTypeScript = (0, import_local_pkg3.isPackageExists)("typescript"),
+    typescript: enableTypeScript = (0, import_local_pkg4.isPackageExists)("typescript"),
     unocss: enableUnoCSS = false,
-    vue: enableVue = VuePackages.some((i) => (0, import_local_pkg3.isPackageExists)(i))
+    vue: enableVue = VuePackages.some((i) => (0, import_local_pkg4.isPackageExists)(i))
   } = options;
   const stylisticOptions = options.stylistic === false ? false : typeof options.stylistic === "object" ? options.stylistic : {};
   if (stylisticOptions && !("jsx" in stylisticOptions)) {

package/dist/index.d.cts

@@ -324,12 +324,6 @@ interface AstroOptions {
      * @default true
      */
     typescript?: boolean;
-    /**
-     * Enable React A11y support.
-     *
-     * @default false
-     */
-    a11y?: boolean;
     /**
      * Glob patterns for Astro files.
      *
@@ -481,6 +475,12 @@ interface FormattersOptions {
      * When set to `true`, it will use Prettier.
      */
     markdown?: "prettier" | "dprint" | boolean;
+    /**
+     * Enable formatting support for Astro.
+     *
+     * Currently only support Prettier.
+     */
+    astro?: "prettier" | boolean;
     /**
      * Enable formatting support for GraphQL.
      */
@@ -728,7 +728,7 @@ declare function toArray<T>(value: T | T[]): T[];
 declare function interop<T>(m: Awaitable<T>): Promise<T extends {
     default: infer U;
 } ? U : T>;
-declare function ensure(packages: string[]): Promise<void>;
+declare function ensure(packages: (string | undefined)[]): Promise<void>;
 type ResolvedOptions<T> = T extends boolean ? never : NonNullable<T>;
 declare function resolveSubOptions<K extends keyof ConfigOptions>(options: ConfigOptions, key: K): ResolvedOptions<ConfigOptions[K]>;
 declare function getOverrides<K extends keyof ConfigOptions>(options: ConfigOptions, key: K): any;

package/dist/index.d.ts

@@ -324,12 +324,6 @@ interface AstroOptions {
      * @default true
      */
     typescript?: boolean;
-    /**
-     * Enable React A11y support.
-     *
-     * @default false
-     */
-    a11y?: boolean;
     /**
      * Glob patterns for Astro files.
      *
@@ -481,6 +475,12 @@ interface FormattersOptions {
      * When set to `true`, it will use Prettier.
      */
     markdown?: "prettier" | "dprint" | boolean;
+    /**
+     * Enable formatting support for Astro.
+     *
+     * Currently only support Prettier.
+     */
+    astro?: "prettier" | boolean;
     /**
      * Enable formatting support for GraphQL.
      */
@@ -728,7 +728,7 @@ declare function toArray<T>(value: T | T[]): T[];
 declare function interop<T>(m: Awaitable<T>): Promise<T extends {
     default: infer U;
 } ? U : T>;
-declare function ensure(packages: string[]): Promise<void>;
+declare function ensure(packages: (string | undefined)[]): Promise<void>;
 type ResolvedOptions<T> = T extends boolean ? never : NonNullable<T>;
 declare function resolveSubOptions<K extends keyof ConfigOptions>(options: ConfigOptions, key: K): ResolvedOptions<ConfigOptions[K]>;
 declare function getOverrides<K extends keyof ConfigOptions>(options: ConfigOptions, key: K): any;

package/dist/index.js

@@ -1,7 +1,7 @@
 // src/factory.ts
 import process3 from "node:process";
 import { existsSync } from "node:fs";
-import { isPackageExists as isPackageExists3 } from "local-pkg";
+import { isPackageExists as isPackageExists4 } from "local-pkg";
 
 // src/configs/comments.ts
 import eslintCommentsPlugin from "@eslint-community/eslint-plugin-eslint-comments";
@@ -738,25 +738,21 @@ async function ensure(packages) {
     return;
   }
   ;
-  const nonExistingPackages = packages.filter((i) => !isPackageExists(i));
+  const nonExistingPackages = packages.filter((i) => i && !isPackageExists(i));
   if (nonExistingPackages.length === 0) {
     return;
   }
-  ;
   const { default: prompts } = await import("prompts");
   const { result } = await prompts([
     {
-      name: "result",
       message: `${nonExistingPackages.length === 1 ? "Package is" : "Packages are"} required for this config: ${nonExistingPackages.join(", ")}. Do you want to install them?`,
+      name: "result",
       type: "confirm"
     }
   ]);
   if (result) {
-    await import("@antfu/install-pkg").then((i) => i.installPackage(nonExistingPackages, {
-      dev: true
-    }));
+    await import("@antfu/install-pkg").then((i) => i.installPackage(nonExistingPackages, { dev: true }));
   }
-  ;
 }
 function resolveSubOptions(options, key) {
   return typeof options[key] === "boolean" ? {} : options[key] || {};
@@ -1931,29 +1927,29 @@ async function react(options = {}) {
 // src/configs/frameworks/astro.ts
 async function astro(options) {
   const {
-    a11y = false,
     files = [GLOB_ASTRO],
     overrides = {},
     typescript: typescript2 = true,
     stylistic: stylistic2 = true
   } = options;
+  await ensure([
+    "eslint-plugin-astro",
+    "astro-eslint-parser"
+  ]);
   const [
     pluginAstro,
     parserAstro,
-    parserTs,
-    pluginA11y
+    parserTs
   ] = await Promise.all([
     interop(import("eslint-plugin-astro")),
     interop(import("astro-eslint-parser")),
-    interop(import("@typescript-eslint/parser")),
-    ...a11y ? [interop(import("eslint-plugin-jsx-a11y"))] : []
+    interop(import("@typescript-eslint/parser"))
   ]);
   return [
     {
       name: "luxass:astro:setup",
       plugins: {
-        astro: pluginAstro,
-        ...a11y ? { "jsx-a11y": pluginA11y } : {}
+        astro: pluginAstro
       }
     },
     {
@@ -2075,18 +2071,21 @@ async function tailwindcss(options = {}) {
 
 // src/configs/formatters.ts
 import * as parserPlain2 from "eslint-parser-plain";
+import { isPackageExists as isPackageExists3 } from "local-pkg";
 async function formatters(options = {}, stylistic2 = {}) {
-  await ensure([
-    "eslint-plugin-format"
-  ]);
   if (options === true) {
     options = {
+      astro: isPackageExists3("astro"),
       css: true,
       graphql: true,
       html: true,
       markdown: true
     };
   }
+  await ensure([
+    "eslint-plugin-format",
+    options.astro ? "prettier-plugin-astro" : void 0
+  ]);
   const {
     indent,
     quotes,
@@ -2217,6 +2216,27 @@ async function formatters(options = {}, stylistic2 = {}) {
       }
     });
   }
+  if (options.astro) {
+    configs.push({
+      name: "luxass:formatter:astro",
+      files: [GLOB_ASTRO],
+      languageOptions: {
+        parser: parserPlain2
+      },
+      rules: {
+        "format/prettier": [
+          "error",
+          {
+            ...prettierOptions,
+            parser: "astro",
+            plugins: [
+              "prettier-plugin-astro"
+            ]
+          }
+        ]
+      }
+    });
+  }
   if (options.graphql) {
     configs.push({
       name: "luxass:formatter:graphql",
@@ -2324,9 +2344,9 @@ async function luxass(options = {}, ...userConfigs) {
     nextjs: enableNextJS = false,
     react: enableReact = false,
     tailwindcss: enableTailwindCSS = false,
-    typescript: enableTypeScript = isPackageExists3("typescript"),
+    typescript: enableTypeScript = isPackageExists4("typescript"),
     unocss: enableUnoCSS = false,
-    vue: enableVue = VuePackages.some((i) => isPackageExists3(i))
+    vue: enableVue = VuePackages.some((i) => isPackageExists4(i))
   } = options;
   const stylisticOptions = options.stylistic === false ? false : typeof options.stylistic === "object" ? options.stylistic : {};
   if (stylisticOptions && !("jsx" in stylisticOptions)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@luxass/eslint-config",
-  "version": "4.2.8",
+  "version": "4.2.9",
   "description": "ESLint config for @luxass",
   "type": "module",
   "author": {