@bfra.me/eslint-config 0.6.0 → 0.7.0

package/lib/index.d.ts

@@ -2687,6 +2687,10 @@ interface Rules {
    * @see https://eslint.org/docs/latest/rules/prefer-template
    */
   'prefer-template'?: Linter.RuleEntry<[]>
+  /**
+   * @see https://github.com/prettier/eslint-plugin-prettier#options
+   */
+  'prettier/prettier'?: Linter.RuleEntry<PrettierPrettier>
   /**
    * Require quotes around object literal property names
    * @see https://eslint.org/docs/latest/rules/quote-props
@@ -6882,6 +6886,18 @@ type PreferReflect = []|[{
 type PreferRegexLiterals = []|[{
   disallowRedundantWrapping?: boolean
 }]
+// ----- prettier/prettier -----
+type PrettierPrettier = []|[{
+  [k: string]: unknown | undefined
+}]|[{
+  [k: string]: unknown | undefined
+}, {
+  usePrettierrc?: boolean
+  fileInfoOptions?: {
+    [k: string]: unknown | undefined
+  }
+  [k: string]: unknown | undefined
+}]
 // ----- quote-props -----
 type QuoteProps = ([]|[("always" | "as-needed" | "consistent" | "consistent-as-needed")] | []|[("always" | "as-needed" | "consistent" | "consistent-as-needed")]|[("always" | "as-needed" | "consistent" | "consistent-as-needed"), {
   keywords?: boolean
@@ -7199,6 +7215,7 @@ type ConfigNames =
   | '@bfra.me/jsdoc'
   | '@bfra.me/imports'
   | '@bfra.me/command'
+  | '@bfra.me/prettier'
   | '@bfra.me/perfectionist'
   | '@bfra.me/typescript/plugins'
   | '@bfra.me/typescript/parser'
@@ -7270,6 +7287,32 @@ interface OptionsOverrides {
      */
     overrides?: Config['rules'];
 }
+/**
+ * Options for configuring the Perfectionist sorting behavior.
+ */
+interface OptionsPerfectionist {
+    /**
+     * Whether to sort named exports.
+     *
+     * @default true
+     */
+    sortNamedExports?: boolean;
+    /**
+     * Whether to sort named imports.
+     * @default true
+     */
+    sortNamedImports?: boolean;
+    /**
+     * Whether to sort exports.
+     * @default true
+     */
+    sortExports?: boolean;
+    /**
+     * Whether to sort imports.
+     * @default true
+     */
+    sortImports?: boolean;
+}
 /**
  * Provides options to configure the TypeScript parser and type-aware linting rules.
  *
@@ -7355,6 +7398,14 @@ type Options = Flatten<{
      * Options to override the behavior of JavaScript-related rules.
      */
     javascript?: OptionsOverrides;
+    /**
+     * Options to override the behavior of Perfectionist sorting rules.
+     */
+    perfectionist?: boolean | OptionsPerfectionist;
+    /**
+     * Options to override the behavior of the Prettier code formatter.
+     */
+    prettier?: boolean | OptionsOverrides;
     /**
      * Enable TypeScript support.
      *
@@ -7388,12 +7439,27 @@ declare function javascript(options?: JavaScriptOptions): Promise<Config[]>;
 
 declare function jsdoc(): Promise<Config[]>;
 
+/**
+ * Represents the combined options for the Perfectionist ESLint plugin, including options for editor integration, overrides, and the Perfectionist plugin itself.
+ */
+type PerfectionistOptions = Flatten<OptionsIsInEditor & OptionsOverrides & OptionsPerfectionist>;
 /**
  * Perfectionist plugin for sorting items and properties.
  *
  * @see https://github.com/azat-io/eslint-plugin-perfectionist
  */
-declare function perfectionist(): Promise<Config[]>;
+declare function perfectionist(options?: PerfectionistOptions): Promise<Config[]>;
+
+/**
+ * Represents the options for the ESLint Prettier configuration.
+ */
+type PrettierOptions = Flatten<OptionsIsInEditor & OptionsOverrides>;
+/**
+ * Generates an ESLint configuration for Prettier.
+ * @param options - The options for the Prettier configuration.
+ * @returns An array of ESLint configurations.
+ */
+declare function prettier(options?: PrettierOptions): Promise<Config[]>;
 
 /**
  * Represents the options for configuring the TypeScript ESLint configuration.
@@ -7477,4 +7543,4 @@ declare const GLOB_TESTS: string[];
 
 declare const config: ConfigComposer;
 
-export { type AwaitableFlatConfig, type Config, type ConfigComposer, type ConfigNames, type Flatten, GLOB_EXCLUDE, GLOB_SRC, GLOB_SRC_EXT, GLOB_TESTS, GLOB_TS, GLOB_TSX, type JavaScriptOptions, type Options, type OptionsFiles, type OptionsIsInEditor, type OptionsOverrides, type OptionsTypeScript, type OptionsTypeScriptParserOptions, type OptionsTypeScriptWithTypes, type Rules, type TypeScriptOptions, type VitestOptions, command, composeConfig, config, config as default, defineConfig, epilogue, eslintComments, ignores, imports, isInEditor, isInGitLifecycle, javascript, jsdoc, perfectionist, typescript, vitest };
+export { type AwaitableFlatConfig, type Config, type ConfigComposer, type ConfigNames, type Flatten, GLOB_EXCLUDE, GLOB_SRC, GLOB_SRC_EXT, GLOB_TESTS, GLOB_TS, GLOB_TSX, type JavaScriptOptions, type Options, type OptionsFiles, type OptionsIsInEditor, type OptionsOverrides, type OptionsPerfectionist, type OptionsTypeScript, type OptionsTypeScriptParserOptions, type OptionsTypeScriptWithTypes, type PerfectionistOptions, type PrettierOptions, type Rules, type TypeScriptOptions, type VitestOptions, command, composeConfig, config, config as default, defineConfig, epilogue, eslintComments, ignores, imports, isInEditor, isInGitLifecycle, javascript, jsdoc, perfectionist, prettier, typescript, vitest };

package/lib/index.js

@@ -139,7 +139,7 @@ import { default as default6 } from "eslint-plugin-unused-imports";
 // @__NO_SIDE_EFFECTS__
 async function interopDefault(m) {
   const resolved = await m;
-  return resolved.default || resolved;
+  return "default" in resolved ? /* @__PURE__ */ interopDefault(resolved.default) : resolved;
 }
 __name(interopDefault, "interopDefault");
 
@@ -289,7 +289,8 @@ async function jsdoc() {
 __name(jsdoc, "jsdoc");
 
 // src/configs/perfectionist.ts
-async function perfectionist() {
+async function perfectionist(options = {}) {
+  const { isInEditor: isInEditor2 = false, overrides = {}, sortExports = true, sortImports = true, sortNamedExports = true, sortNamedImports = true } = options;
   return [
     {
       name: "@bfra.me/perfectionist",
@@ -297,67 +298,99 @@ async function perfectionist() {
         perfectionist: default5
       },
       rules: {
-        "perfectionist/sort-named-exports": [
-          "error",
-          {
-            groupKind: "values-first",
-            order: "asc",
-            type: "natural"
-          }
-        ],
-        "perfectionist/sort-named-imports": [
-          "error",
-          {
-            groupKind: "values-first",
-            order: "asc",
-            type: "natural"
-          }
-        ],
-        "perfectionist/sort-exports": [
-          "error",
-          {
-            type: "natural"
-          }
-        ],
-        "perfectionist/sort-imports": [
-          "error",
-          {
-            groups: [
-              "type",
-              [
-                "parent-type",
-                "sibling-type",
-                "index-type"
-              ],
-              "builtin",
-              "external",
-              [
-                "internal",
-                "internal-type"
+        ...sortNamedExports && {
+          "perfectionist/sort-named-exports": [
+            isInEditor2 ? "warn" : "error",
+            {
+              groupKind: "values-first",
+              type: "natural"
+            }
+          ]
+        },
+        ...sortNamedImports && {
+          "perfectionist/sort-named-imports": [
+            isInEditor2 ? "warn" : "error",
+            {
+              groupKind: "values-first",
+              type: "natural"
+            }
+          ]
+        },
+        ...sortExports && {
+          "perfectionist/sort-exports": [
+            isInEditor2 ? "warn" : "error",
+            {
+              type: "natural"
+            }
+          ]
+        },
+        ...sortImports && {
+          "perfectionist/sort-imports": [
+            isInEditor2 ? "warn" : "error",
+            {
+              groups: [
+                "type",
+                [
+                  "parent-type",
+                  "sibling-type",
+                  "index-type"
+                ],
+                "builtin",
+                "external",
+                [
+                  "internal",
+                  "internal-type"
+                ],
+                [
+                  "parent",
+                  "sibling",
+                  "index"
+                ],
+                "object",
+                "side-effect",
+                "side-effect-style"
               ],
-              [
-                "parent",
-                "sibling",
-                "index"
+              internalPattern: [
+                "^[~#]/.*"
               ],
-              "object",
-              "side-effect",
-              "side-effect-style"
-            ],
-            internalPattern: [
-              "^[~#]/.*"
-            ],
-            newlinesBetween: "ignore",
-            order: "asc",
-            type: "natural"
-          }
-        ]
+              newlinesBetween: "ignore",
+              type: "natural"
+            }
+          ]
+        },
+        ...overrides
       }
     }
   ];
 }
 __name(perfectionist, "perfectionist");
 
+// src/configs/prettier.ts
+async function prettier(options = {}) {
+  const { isInEditor: isInEditor2, overrides } = options;
+  const [configPrettier, pluginPrettier] = await Promise.all([
+    interopDefault(import("eslint-config-prettier")),
+    interopDefault(import("eslint-plugin-prettier"))
+  ]);
+  return [
+    {
+      name: "@bfra.me/prettier",
+      plugins: {
+        prettier: pluginPrettier
+      },
+      rules: {
+        ...configPrettier.rules,
+        ...(pluginPrettier.configs?.recommended).rules,
+        ...isInEditor2 ? {} : {
+          "prettier/prettier": "error"
+        },
+        ...overrides
+      }
+    }
+  ];
+}
+__name(prettier, "prettier");
+
 // src/configs/typescript.ts
 import process from "node:process";
 var TypeAwareRules = {
@@ -558,7 +591,7 @@ var AllowedConfigPropertiesForOptions = [
   "settings"
 ];
 async function defineConfig(options = {}, ...userConfigs) {
-  const { gitignore: enableGitignore = true, typescript: enableTypeScript = isPackageExists("typescript") } = options;
+  const { gitignore: enableGitignore = true, perfectionist: enablePerfectionist = true, prettier: enablePrettier = isPackageExists("prettier"), typescript: enableTypeScript = isPackageExists("typescript") } = options;
   const isInEditor2 = options.isInEditor ?? isInEditor;
   if (isInEditor2) console.log("[@bfra.me/eslint-config] Editor specific config is enabled. Some rules may be disabled.");
   const configs = [];
@@ -576,7 +609,20 @@ async function defineConfig(options = {}, ...userConfigs) {
   configs.push(ignores(options.ignores), javascript({
     isInEditor: isInEditor2,
     overrides: getOverrides(options, "javascript")
-  }), eslintComments(), jsdoc(), imports(), command(), perfectionist());
+  }), eslintComments(), jsdoc(), imports(), command());
+  if (enablePrettier) {
+    configs.push(prettier({
+      isInEditor: isInEditor2,
+      overrides: getOverrides(options, "prettier")
+    }));
+  }
+  if (enablePerfectionist) {
+    configs.push(perfectionist({
+      isInEditor: isInEditor2,
+      overrides: getOverrides(options, "perfectionist"),
+      ...resolveSubOptions(options, "perfectionist")
+    }));
+  }
   const typescriptOptions = resolveSubOptions(options, "typescript");
   if (enableTypeScript) {
     configs.push(typescript({
@@ -638,6 +684,7 @@ export {
   javascript,
   jsdoc,
   perfectionist,
+  prettier,
   typescript,
   vitest
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bfra.me/eslint-config",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "description": "Shared ESLint configuration for bfra.me",
   "keywords": [
     "bfra.me",
@@ -53,12 +53,15 @@
   "devDependencies": {
     "@eslint/config-inspector": "0.5.6",
     "@eslint/js": "9.15.0",
+    "@types/eslint-config-prettier": "6.11.3",
     "@types/fs-extra": "11.0.4",
     "@types/node": "22.10.0",
     "@typescript-eslint/types": "8.16.0",
     "@vitest/eslint-plugin": "1.1.11",
     "eslint": "9.15.0",
+    "eslint-config-prettier": "9.1.0",
     "eslint-plugin-no-only-tests": "3.3.0",
+    "eslint-plugin-prettier": "5.2.1",
     "eslint-typegen": "0.3.2",
     "execa": "9.5.1",
     "fast-glob": "3.3.2",
@@ -68,9 +71,9 @@
     "tsup": "8.3.5",
     "tsx": "4.19.2",
     "vitest": "2.1.6",
-    "@bfra.me/eslint-config": "0.6.0",
-    "@bfra.me/tsconfig": "0.9.3",
-    "@bfra.me/prettier-config": "0.13.2"
+    "@bfra.me/eslint-config": "0.7.0",
+    "@bfra.me/prettier-config": "0.13.2",
+    "@bfra.me/tsconfig": "0.9.3"
   },
   "peerDependencies": {
     "@vitest/eslint-plugin": "^1.1.4",
@@ -81,8 +84,14 @@
     "@vitest/eslint-plugin": {
       "optional": true
     },
+    "eslint-config-prettier": {
+      "optional": true
+    },
     "eslint-plugin-no-only-tests": {
       "optional": true
+    },
+    "eslint-plugin-prettier": {
+      "optional": true
     }
   },
   "publishConfig": {

package/src/config.d.ts

@@ -5,7 +5,7 @@ import type {Linter} from 'eslint'
 import type {FlatConfigComposer, ResolvableFlatConfig} from 'eslint-flat-config-utils'
 import type {Rules} from './rules'
 
-export type {FlatConfigComposer, ResolvableFlatConfig, Rules}
+export type {FlatConfigComposer, ResolvableFlatConfig}
 
 /**
  * Represents a value that resolves to one or more ESLint flat configurations.
@@ -39,6 +39,7 @@ export type ConfigNames =
   | '@bfra.me/jsdoc'
   | '@bfra.me/imports'
   | '@bfra.me/command'
+  | '@bfra.me/prettier'
   | '@bfra.me/perfectionist'
   | '@bfra.me/typescript/plugins'
   | '@bfra.me/typescript/parser'

package/src/configs/index.ts

@@ -6,5 +6,6 @@ export * from './imports'
 export * from './javascript'
 export * from './jsdoc'
 export * from './perfectionist'
+export * from './prettier'
 export * from './typescript'
 export * from './vitest'

package/src/configs/perfectionist.ts

@@ -1,12 +1,28 @@
 import type {Config} from '../config'
+import type {Flatten, OptionsIsInEditor, OptionsOverrides, OptionsPerfectionist} from '../options'
 import {perfectionist as pluginPerfectionist} from '../plugins'
 
+/**
+ * Represents the combined options for the Perfectionist ESLint plugin, including options for editor integration, overrides, and the Perfectionist plugin itself.
+ */
+export type PerfectionistOptions = Flatten<
+  OptionsIsInEditor & OptionsOverrides & OptionsPerfectionist
+>
+
 /**
  * Perfectionist plugin for sorting items and properties.
  *
  * @see https://github.com/azat-io/eslint-plugin-perfectionist
  */
-export async function perfectionist(): Promise<Config[]> {
+export async function perfectionist(options: PerfectionistOptions = {}): Promise<Config[]> {
+  const {
+    isInEditor = false,
+    overrides = {},
+    sortExports = true,
+    sortImports = true,
+    sortNamedExports = true,
+    sortNamedImports = true,
+  } = options
   return [
     {
       name: '@bfra.me/perfectionist',
@@ -14,37 +30,47 @@ export async function perfectionist(): Promise<Config[]> {
         perfectionist: pluginPerfectionist as any,
       },
       rules: {
-        'perfectionist/sort-named-exports': [
-          'error',
-          {groupKind: 'values-first', order: 'asc', type: 'natural'},
-        ],
+        ...(sortNamedExports && {
+          'perfectionist/sort-named-exports': [
+            isInEditor ? 'warn' : 'error',
+            {groupKind: 'values-first', type: 'natural'},
+          ],
+        }),
+
+        ...(sortNamedImports && {
+          'perfectionist/sort-named-imports': [
+            isInEditor ? 'warn' : 'error',
+            {groupKind: 'values-first', type: 'natural'},
+          ],
+        }),
+
+        ...(sortExports && {
+          'perfectionist/sort-exports': [isInEditor ? 'warn' : 'error', {type: 'natural'}],
+        }),
 
-        'perfectionist/sort-named-imports': [
-          'error',
-          {groupKind: 'values-first', order: 'asc', type: 'natural'},
-        ],
-        'perfectionist/sort-exports': ['error', {type: 'natural'}],
+        ...(sortImports && {
+          'perfectionist/sort-imports': [
+            isInEditor ? 'warn' : 'error',
+            {
+              groups: [
+                'type',
+                ['parent-type', 'sibling-type', 'index-type'],
+                'builtin',
+                'external',
+                ['internal', 'internal-type'],
+                ['parent', 'sibling', 'index'],
+                'object',
+                'side-effect',
+                'side-effect-style',
+              ],
+              internalPattern: ['^[~#]/.*'],
+              newlinesBetween: 'ignore',
+              type: 'natural',
+            },
+          ],
+        }),
 
-        'perfectionist/sort-imports': [
-          'error',
-          {
-            groups: [
-              'type',
-              ['parent-type', 'sibling-type', 'index-type'],
-              'builtin',
-              'external',
-              ['internal', 'internal-type'],
-              ['parent', 'sibling', 'index'],
-              'object',
-              'side-effect',
-              'side-effect-style',
-            ],
-            internalPattern: ['^[~#]/.*'],
-            newlinesBetween: 'ignore',
-            order: 'asc',
-            type: 'natural',
-          },
-        ],
+        ...overrides,
       },
     },
   ]

package/src/configs/prettier.ts

@@ -0,0 +1,38 @@
+import type {Config} from '../config'
+import type {Flatten, OptionsIsInEditor, OptionsOverrides} from '../options'
+import {interopDefault} from '../plugins'
+
+/**
+ * Represents the options for the ESLint Prettier configuration.
+ */
+export type PrettierOptions = Flatten<OptionsIsInEditor & OptionsOverrides>
+
+/**
+ * Generates an ESLint configuration for Prettier.
+ * @param options - The options for the Prettier configuration.
+ * @returns An array of ESLint configurations.
+ */
+export async function prettier(options: PrettierOptions = {}): Promise<Config[]> {
+  const {isInEditor, overrides} = options
+  const [configPrettier, pluginPrettier] = await Promise.all([
+    interopDefault(import('eslint-config-prettier')),
+    interopDefault(import('eslint-plugin-prettier')),
+  ])
+
+  return [
+    {
+      name: '@bfra.me/prettier',
+      plugins: {
+        prettier: pluginPrettier,
+      },
+      rules: {
+        ...configPrettier.rules,
+        ...(pluginPrettier.configs?.recommended as Config).rules,
+
+        ...(isInEditor ? {} : {'prettier/prettier': 'error'}),
+
+        ...overrides,
+      },
+    },
+  ]
+}

package/src/define-config.ts

@@ -12,6 +12,7 @@ import {
   javascript,
   jsdoc,
   perfectionist,
+  prettier,
   typescript,
   vitest,
 } from './configs'
@@ -48,6 +49,8 @@ export async function defineConfig(
 ): ConfigComposer {
   const {
     gitignore: enableGitignore = true,
+    perfectionist: enablePerfectionist = true,
+    prettier: enablePrettier = isPackageExists('prettier'),
     typescript: enableTypeScript = isPackageExists('typescript'),
   } = options
 
@@ -80,9 +83,27 @@ export async function defineConfig(
     jsdoc(),
     imports(),
     command(),
-    perfectionist(),
   )
 
+  if (enablePrettier) {
+    configs.push(
+      prettier({
+        isInEditor,
+        overrides: getOverrides(options, 'prettier'),
+      }),
+    )
+  }
+
+  if (enablePerfectionist) {
+    configs.push(
+      perfectionist({
+        isInEditor,
+        overrides: getOverrides(options, 'perfectionist'),
+        ...resolveSubOptions(options, 'perfectionist'),
+      }),
+    )
+  }
+
   const typescriptOptions = resolveSubOptions(options, 'typescript')
   // const tsconfigPath ='tsconfigPath' in typescriptOptions ? typescriptOptions.tsconfigPath : undefined
 

package/src/options.ts

@@ -42,6 +42,33 @@ export interface OptionsOverrides {
   overrides?: Config['rules']
 }
 
+/**
+ * Options for configuring the Perfectionist sorting behavior.
+ */
+export interface OptionsPerfectionist {
+  /**
+   * Whether to sort named exports.
+   *
+   * @default true
+   */
+  sortNamedExports?: boolean
+  /**
+   * Whether to sort named imports.
+   * @default true
+   */
+  sortNamedImports?: boolean
+  /**
+   * Whether to sort exports.
+   * @default true
+   */
+  sortExports?: boolean
+  /**
+   * Whether to sort imports.
+   * @default true
+   */
+  sortImports?: boolean
+}
+
 /**
  * Provides options to configure the TypeScript parser and type-aware linting rules.
  *
@@ -140,6 +167,16 @@ export type Options = Flatten<
      */
     javascript?: OptionsOverrides
 
+    /**
+     * Options to override the behavior of Perfectionist sorting rules.
+     */
+    perfectionist?: boolean | OptionsPerfectionist
+
+    /**
+     * Options to override the behavior of the Prettier code formatter.
+     */
+    prettier?: boolean | OptionsOverrides
+
     /**
      * Enable TypeScript support.
      *

package/src/plugins.ts

@@ -5,7 +5,7 @@ export async function interopDefault<T>(
   m: Awaitable<T>,
 ): Promise<T extends {default: infer U} ? U : T> {
   const resolved = await m
-  return (resolved as any).default || resolved
+  return 'default' in resolved ? interopDefault(resolved.default) : resolved
 }
 
 // @ts-expect-error - No types

package/src/rules.d.ts

@@ -2681,6 +2681,10 @@ export interface Rules {
    * @see https://eslint.org/docs/latest/rules/prefer-template
    */
   'prefer-template'?: Linter.RuleEntry<[]>
+  /**
+   * @see https://github.com/prettier/eslint-plugin-prettier#options
+   */
+  'prettier/prettier'?: Linter.RuleEntry<PrettierPrettier>
   /**
    * Require quotes around object literal property names
    * @see https://eslint.org/docs/latest/rules/quote-props
@@ -6876,6 +6880,18 @@ type PreferReflect = []|[{
 type PreferRegexLiterals = []|[{
   disallowRedundantWrapping?: boolean
 }]
+// ----- prettier/prettier -----
+type PrettierPrettier = []|[{
+  [k: string]: unknown | undefined
+}]|[{
+  [k: string]: unknown | undefined
+}, {
+  usePrettierrc?: boolean
+  fileInfoOptions?: {
+    [k: string]: unknown | undefined
+  }
+  [k: string]: unknown | undefined
+}]
 // ----- quote-props -----
 type QuoteProps = ([]|[("always" | "as-needed" | "consistent" | "consistent-as-needed")] | []|[("always" | "as-needed" | "consistent" | "consistent-as-needed")]|[("always" | "as-needed" | "consistent" | "consistent-as-needed"), {
   keywords?: boolean