Add eslint-plugin-sort-destructure-keys-typescript and eslint-plugin-…

…default-import-name (#3)
nirtamir2 · Feb 24, 2025 · 1f38b71 · 1f38b71
1 parent b9879d8
commit 1f38b71
Show file tree

Hide file tree

Showing 13 changed files with 80 additions and 46 deletions.
diff --git a/package.json b/package.json
@@ -149,6 +149,7 @@
     "eslint-plugin-array-func": "^5.0.2",
     "eslint-plugin-clsx": "^0.0.10",
     "eslint-plugin-command": "^3.1.0",
+    "eslint-plugin-default-import-name": "^0.2.0",
     "eslint-plugin-eslint-comments": "^3.2.0",
     "eslint-plugin-expect-type": "^0.6.2",
     "eslint-plugin-github": "^5.1.8",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/configs/astro.ts b/src/configs/astro.ts
@@ -5,7 +5,7 @@ import type {
   OptionsStylistic,
   TypedFlatConfigItem,
 } from "../types";
-import {ensurePackages, interopDefault} from "../utils";
+import { ensurePackages, interopDefault } from "../utils";
 
 export async function astro(
   options: OptionsOverrides & OptionsStylistic & OptionsFiles = {},
@@ -17,7 +17,7 @@ export async function astro(
     stylistic = false,
   } = options;
 
-  await ensurePackages(["eslint-plugin-astro"])
+  await ensurePackages(["eslint-plugin-astro"]);
 
   const [pluginAstro, parserAstro, parserTs] = await Promise.all([
     interopDefault(import("eslint-plugin-astro")),

diff --git a/src/configs/default-import-name.ts b/src/configs/default-import-name.ts
@@ -0,0 +1,6 @@
+import defaultImportNameConfig from "eslint-plugin-default-import-name/config";
+import type { TypedFlatConfigItem } from "../types";
+
+export async function defaultImportName(): Promise<Array<TypedFlatConfigItem>> {
+  return [defaultImportNameConfig()];
+}
diff --git a/src/configs/formatters.ts b/src/configs/formatters.ts
@@ -251,35 +251,38 @@ export async function formatters(
   }
 
   if (options.astro) {
-    configs.push({
-      files: [GLOB_ASTRO],
-      languageOptions: {
-        parser: parserPlain,
-      },
-      name: "antfu/formatter/astro",
-      rules: {
-        "format/prettier": [
-          "error",
-          {
-            ...prettierOptions,
-            parser: "astro",
-            plugins: ["prettier-plugin-astro"],
-          },
-        ],
+    configs.push(
+      {
+        files: [GLOB_ASTRO],
+        languageOptions: {
+          parser: parserPlain,
+        },
+        name: "antfu/formatter/astro",
+        rules: {
+          "format/prettier": [
+            "error",
+            {
+              ...prettierOptions,
+              parser: "astro",
+              plugins: ["prettier-plugin-astro"],
+            },
+          ],
+        },
       },
-    }, {
-      files: [GLOB_ASTRO, GLOB_ASTRO_TS],
-      name: "antfu/formatter/astro/disables",
-      rules: {
-        "@stylistic/arrow-parens": "off",
-        "@stylistic/block-spacing": "off",
-        "@stylistic/comma-dangle": "off",
-        "@stylistic/indent": "off",
-        "@stylistic/no-multi-spaces": "off",
-        "@stylistic/quotes": "off",
-        "@stylistic/semi": "off",
+      {
+        files: [GLOB_ASTRO, GLOB_ASTRO_TS],
+        name: "antfu/formatter/astro/disables",
+        rules: {
+          "@stylistic/arrow-parens": "off",
+          "@stylistic/block-spacing": "off",
+          "@stylistic/comma-dangle": "off",
+          "@stylistic/indent": "off",
+          "@stylistic/no-multi-spaces": "off",
+          "@stylistic/quotes": "off",
+          "@stylistic/semi": "off",
+        },
       },
-    });
+    );
   }
 
   if (options.graphql) {

diff --git a/src/configs/ignores.ts b/src/configs/ignores.ts
@@ -6,7 +6,7 @@ export async function ignores(): Promise<Array<TypedFlatConfigItem>> {
     {
       ignores: GLOB_EXCLUDE,
       // Awaits https://github.com/humanwhocodes/config-array/pull/131
-      name: 'antfu/ignores',
+      name: "antfu/ignores",
     },
   ];
 }
diff --git a/src/configs/react.ts b/src/configs/react.ts
@@ -112,13 +112,13 @@ export async function react(
             allowExportNames: [
               ...(isUsingNext
                 ? [
-                    'dynamic',
-                    'dynamicParams',
-                    'revalidate',
-                    'fetchCache',
-                    'runtime',
-                    'preferredRegion',
-                    'maxDuration',
+                    "dynamic",
+                    "dynamicParams",
+                    "revalidate",
+                    "fetchCache",
+                    "runtime",
+                    "preferredRegion",
+                    "maxDuration",
                     "config",
                     "generateStaticParams",
                     "metadata",

diff --git a/src/configs/tsdoc.ts b/src/configs/tsdoc.ts
@@ -1,6 +1,10 @@
 import { compat } from "../compat";
-import type { OptionsComponentExts, OptionsFiles, OptionsOverrides, TypedFlatConfigItem } from "../types";
-
+import type {
+  OptionsComponentExts,
+  OptionsFiles,
+  OptionsOverrides,
+  TypedFlatConfigItem,
+} from "../types";
 
 export async function tsdoc(
   options: OptionsFiles & OptionsComponentExts & OptionsOverrides = {},

diff --git a/src/configs/typescript.ts b/src/configs/typescript.ts
@@ -1,7 +1,8 @@
 import expectType from "eslint-plugin-expect-type/configs/recommended";
 import tseslint from "typescript-eslint";
 import { GLOB_ASTRO_TS, GLOB_MARKDOWN, GLOB_TS, GLOB_TSX } from "../globs";
-import { pluginAntfu, pluginSortDestructureKeysTypescript } from "../plugins";
+import sortDestructureKeysTypescriptConfig from "eslint-plugin-sort-destructure-keys-typescript/config";
+import { pluginAntfu } from "../plugins";
 import type {
   OptionsComponentExts,
   OptionsFiles,
@@ -103,7 +104,6 @@ export async function typescript(
       name: "antfu/typescript/setup",
       plugins: {
         antfu: pluginAntfu,
-        "sort-destructure-keys-typescript": pluginSortDestructureKeysTypescript,
         // "@typescript-eslint": pluginTs as any,
       },
     },
@@ -172,6 +172,7 @@ export async function typescript(
     },
     ...(isTypeAware
       ? [
+           sortDestructureKeysTypescriptConfig(),
           {
             files: filesTypeAware,
             ignores: ignoresTypeAware,

diff --git a/src/configs/vue.ts b/src/configs/vue.ts
@@ -24,7 +24,7 @@ export async function vue(
     vueVersion = 3,
   } = options;
 
-  const sfcBlocks = options.sfcBlocks === true ? {} : options.sfcBlocks ?? {};
+  const sfcBlocks = options.sfcBlocks === true ? {} : (options.sfcBlocks ?? {});
 
   const { indent = 2 } = typeof stylistic === "boolean" ? {} : stylistic;
 

diff --git a/src/factory.ts b/src/factory.ts
@@ -31,6 +31,7 @@ import {
   vue,
   yaml,
 } from "./configs";
+import { defaultImportName } from "./configs/default-import-name";
 import { formatters } from "./configs/formatters";
 import { i18n } from "./configs/i18n";
 import { prettier } from "./configs/prettier";
@@ -183,6 +184,7 @@ export function nirtamir2(
       stylistic: stylisticOptions,
     }),
     unicorn(),
+    defaultImportName(),
     command(),
 
     // Optional plugins (installed but not enabled by default)

diff --git a/src/plugins.ts b/src/plugins.ts
@@ -2,7 +2,6 @@
 // @ts-nocheck
 
 export { default as pluginAntfu } from "eslint-plugin-antfu";
-export { default as pluginSortDestructureKeysTypescript } from "eslint-plugin-sort-destructure-keys-typescript";
 export { default as pluginComments } from "eslint-plugin-eslint-comments";
 export * as pluginImport from "eslint-plugin-import-x";
 export { default as pluginNode } from "eslint-plugin-n";

diff --git a/src/types.ts b/src/types.ts
@@ -164,9 +164,9 @@ export interface OptionsStylistic {
 }
 
 export type StylisticConfig = Pick<
-    StylisticCustomizeOptions,
-    "indent" | "quotes" | "jsx" | "semi"
-  >
+  StylisticCustomizeOptions,
+  "indent" | "quotes" | "jsx" | "semi"
+>;
 
 export interface OptionsOverrides {
   overrides?: TypedFlatConfigItem["rules"];