@vp-tw/eslint-config 0.0.23 → 0.0.25

package/dist/configs/mdx.js

@@ -5,10 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.mdx = void 0;
 var _eslintConfig = require("@antfu/eslint-config");
-var _defu = _interopRequireDefault(require("defu"));
 var _esToolkit = require("es-toolkit");
+var _mergeConfig = require("../utils/mergeConfig");
 var _renameRules = require("../utils/renameRules");
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const mdx = async ({
   codeBlocks = true,
   processorOptions,
@@ -28,7 +27,7 @@ const mdx = async ({
     }),
     name: "vdustr/mdx/processor"
   };
-  const rulesConfig = (0, _defu.default)(options.mdx, {
+  const rulesConfig = (0, _mergeConfig.mergeConfig)(options.mdx, {
     ignores: [
     /**
      * Handled by `@eslint/markdown`.
@@ -42,7 +41,7 @@ const mdx = async ({
   });
   const configs = [setupConfig, processorConfig, rulesConfig];
   if (codeBlocks) {
-    const codeBlocksConfig = (0, _defu.default)(codeBlocksOptions, {
+    const codeBlocksConfig = (0, _mergeConfig.mergeConfig)(codeBlocksOptions, {
       rules: {
         "import/no-default-export": "off"
       },

package/dist/configs/packageJson.js

@@ -5,9 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.packageJson = void 0;
 var _eslintConfig = require("@antfu/eslint-config");
-var _defu = _interopRequireDefault(require("defu"));
 var _esToolkit = require("es-toolkit");
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+var _mergeConfig = require("../utils/mergeConfig");
+var _renameRules = require("../utils/renameRules");
 const packageJson = async options => {
   await (0, _eslintConfig.ensurePackages)(["eslint-plugin-package-json"]);
   const packageJson2 = await (0, _eslintConfig.interopDefault)(Promise.resolve().then(() => require("eslint-plugin-package-json/configs/recommended")));
@@ -15,8 +15,9 @@ const packageJson = async options => {
     plugins: packageJson2.plugins,
     name: "vdustr/package-json/setup"
   };
-  const packageJsonRulesConfig = (0, _defu.default)(options?.packageJson, {
+  const packageJsonRulesConfig = (0, _mergeConfig.mergeConfig)(options?.packageJson, {
     ...(0, _esToolkit.omit)(packageJson2, ["name", "plugins"]),
+    rules: (0, _renameRules.renameRules)(packageJson2.rules),
     name: "vdustr/package-json/rules"
   });
   return [packageJsonSetupConfig, packageJsonRulesConfig];

package/dist/configs/prettier.js

@@ -5,13 +5,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.prettier = void 0;
 var _eslintConfig = require("@antfu/eslint-config");
-var _defu = _interopRequireDefault(require("defu"));
+var _mergeConfig = require("../utils/mergeConfig");
 var _renameRules = require("../utils/renameRules");
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const prettier = async options => {
   await (0, _eslintConfig.ensurePackages)(["eslint-config-prettier"]);
   const eslintConfigPrettier = await (0, _eslintConfig.interopDefault)(Promise.resolve().then(() => require("eslint-config-prettier")));
-  const rulesConfig = (0, _defu.default)(options?.prettier, {
+  const rulesConfig = (0, _mergeConfig.mergeConfig)(options?.prettier, {
     ...eslintConfigPrettier,
     rules: (0, _renameRules.renameRules)(eslintConfigPrettier.rules),
     name: "vdustr/prettier/rules"

package/dist/configs/reactCompiler.d.ts

@@ -1,9 +1,9 @@
-import type { ConfigOverrides, TypedFlatConfigItem } from "../types";
+import type { ConfigOverrides } from "../types";
 declare namespace reactCompiler {
     interface Options {
         setup?: ConfigOverrides;
         reactCompiler?: ConfigOverrides;
     }
 }
-declare const reactCompiler: (options?: reactCompiler.Options) => Promise<TypedFlatConfigItem[]>;
+declare const reactCompiler: (options?: reactCompiler.Options) => Promise<import("../types").TypedFlatConfigItem[]>;
 export { reactCompiler };

package/dist/configs/reactCompiler.js

@@ -4,17 +4,16 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.reactCompiler = void 0;
-var _defu = _interopRequireDefault(require("defu"));
 var _eslintPluginReactCompiler = require("../lib/eslint-plugin-react-compiler");
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+var _mergeConfig = require("../utils/mergeConfig");
 const reactCompiler = async options => {
-  const reactCompilerSetupConfig = (0, _defu.default)(options?.setup, {
+  const reactCompilerSetupConfig = (0, _mergeConfig.mergeConfig)(options?.setup, {
     name: "vdustr/react/react-compiler/setup",
     plugins: {
       "react-compiler": await (0, _eslintPluginReactCompiler.reactCompiler)()
     }
   });
-  const reactCompilerRulesConfig = (0, _defu.default)(options?.reactCompiler, {
+  const reactCompilerRulesConfig = (0, _mergeConfig.mergeConfig)(options?.reactCompiler, {
     name: "vdustr/react/react-compiler/rules",
     rules: {
       "react-compiler/react-compiler": "error"

package/dist/configs/storybook.js

@@ -5,10 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.storybook = void 0;
 var _eslintConfig = require("@antfu/eslint-config");
-var _defu = _interopRequireDefault(require("defu"));
 var _esToolkit = require("es-toolkit");
+var _mergeConfig = require("../utils/mergeConfig");
 var _renameRules = require("../utils/renameRules");
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const storybook = async options => {
   await (0, _eslintConfig.ensurePackages)(["eslint-plugin-storybook"]);
   const storybookPlugin = await (0, _eslintConfig.interopDefault)(Promise.resolve().then(() => require("eslint-plugin-storybook")));
@@ -25,7 +24,7 @@ const storybook = async options => {
     ...(0, _esToolkit.pick)(originalSetupConfig, ["plugins"]),
     name: "vdustr/stroybook/setup"
   };
-  const storyRulesConfig = (0, _defu.default)(options?.stories, {
+  const storyRulesConfig = (0, _mergeConfig.mergeConfig)(options?.stories, {
     name: "vdustr/storybook/stories/rules",
     rules: {
       "import/no-default-export": "off"
@@ -38,7 +37,7 @@ const storybook = async options => {
       ...originalCsfStrictConfig.rules
     })
   });
-  const mainRulesConfig = (0, _defu.default)(options?.main, {
+  const mainRulesConfig = (0, _mergeConfig.mergeConfig)(options?.main, {
     name: "vdustr/storybook/main/rules"
   }, {
     ...originalMainRulesConfig,

package/dist/eslint-typegen.d.ts

@@ -99,5 +99,5 @@ type StorybookNoUninstalledAddons = []|[{
   [k: string]: unknown | undefined
 }]
   // Names of all the configs
-  export type ConfigNames = 'vdustr/mdx/setup' | 'vdustr/mdx/processor' | 'vdustr/mdx/rules' | 'vdustr/mdx/code-blocks' | 'vdustr/prettier/rules' | 'vdustr/react/react-compiler/setup' | 'vdustr/react/react-compiler/rules' | 'vdustr/stroybook/setup' | 'vdustr/storybook/stories/rules' | 'vdustr/storybook/main/rules' | 'vdustr/javascript/rules' | 'vdustr/imports/rules' | 'vdustr/imports/no-default-export/rules' | 'vdustr/typescript/rules' | 'vdustr/jsonc/rules' | 'vdustr/sort/tsconfig-json' | 'vdustr/yaml/rules' | 'vdustr/yaml/sort-keys/rules' | 'vdustr/sort/json-keys' | 'vdustr/jsonc/sort-array-values/rules'
+  export type ConfigNames = 'vdustr/mdx/setup' | 'vdustr/mdx/processor' | 'vdustr/mdx/rules' | 'vdustr/mdx/code-blocks' | 'vdustr/prettier/rules' | 'vdustr/react/react-compiler/setup' | 'vdustr/react/react-compiler/rules' | 'vdustr/stroybook/setup' | 'vdustr/storybook/stories/rules' | 'vdustr/storybook/main/rules' | 'vdustr/javascript/rules' | 'vdustr/imports/rules' | 'vdustr/imports/no-default-export/rules' | 'vdustr/typescript/rules' | 'vdustr/react/rules' | 'vdustr/react/react-compiler/setup' | 'vdustr/react/react-compiler/rules' | 'vdustr/jsonc/rules' | 'vdustr/sort/json-keys' | 'vdustr/sort/json-array-values' | 'vdustr/sort/tsconfig-json' | 'vdustr/yaml/rules' | 'vdustr/yaml/sort-keys/rules'
   

package/dist/esm/configs/mdx.mjs

@@ -4,8 +4,8 @@ import {
   GLOB_MARKDOWN_CODE,
   interopDefault
 } from "@antfu/eslint-config";
-import defu from "defu";
 import { omit, pick } from "es-toolkit";
+import { mergeConfig } from "../utils/mergeConfig.mjs";
 import { renameRules } from "../utils/renameRules.mjs";
 const mdx = async ({
   codeBlocks = true,
@@ -26,7 +26,7 @@ const mdx = async ({
     }),
     name: "vdustr/mdx/processor"
   };
-  const rulesConfig = defu(
+  const rulesConfig = mergeConfig(
     options.mdx,
     {
       ignores: [
@@ -45,7 +45,7 @@ const mdx = async ({
   );
   const configs = [setupConfig, processorConfig, rulesConfig];
   if (codeBlocks) {
-    const codeBlocksConfig = defu(
+    const codeBlocksConfig = mergeConfig(
       codeBlocksOptions,
       {
         rules: {

package/dist/esm/configs/packageJson.mjs

@@ -1,6 +1,7 @@
 import { ensurePackages, interopDefault } from "@antfu/eslint-config";
-import defu from "defu";
 import { omit } from "es-toolkit";
+import { mergeConfig } from "../utils/mergeConfig.mjs";
+import { renameRules } from "../utils/renameRules.mjs";
 const packageJson = async (options) => {
   await ensurePackages(["eslint-plugin-package-json"]);
   const packageJson2 = await interopDefault(
@@ -10,8 +11,9 @@ const packageJson = async (options) => {
     plugins: packageJson2.plugins,
     name: "vdustr/package-json/setup"
   };
-  const packageJsonRulesConfig = defu(options?.packageJson, {
+  const packageJsonRulesConfig = mergeConfig(options?.packageJson, {
     ...omit(packageJson2, ["name", "plugins"]),
+    rules: renameRules(packageJson2.rules),
     name: "vdustr/package-json/rules"
   });
   return [packageJsonSetupConfig, packageJsonRulesConfig];

package/dist/esm/configs/prettier.mjs

@@ -1,19 +1,16 @@
 import { ensurePackages, interopDefault } from "@antfu/eslint-config";
-import defu from "defu";
+import { mergeConfig } from "../utils/mergeConfig.mjs";
 import { renameRules } from "../utils/renameRules.mjs";
 const prettier = async (options) => {
   await ensurePackages(["eslint-config-prettier"]);
   const eslintConfigPrettier = await interopDefault(
     import("eslint-config-prettier")
   );
-  const rulesConfig = defu(
-    options?.prettier,
-    {
-      ...eslintConfigPrettier,
-      rules: renameRules(eslintConfigPrettier.rules),
-      name: "vdustr/prettier/rules"
-    }
-  );
+  const rulesConfig = mergeConfig(options?.prettier, {
+    ...eslintConfigPrettier,
+    rules: renameRules(eslintConfigPrettier.rules),
+    name: "vdustr/prettier/rules"
+  });
   return rulesConfig;
 };
 export { prettier };

package/dist/esm/configs/reactCompiler.d.ts

@@ -1,9 +1,9 @@
-import type { ConfigOverrides, TypedFlatConfigItem } from "../types";
+import type { ConfigOverrides } from "../types";
 declare namespace reactCompiler {
     interface Options {
         setup?: ConfigOverrides;
         reactCompiler?: ConfigOverrides;
     }
 }
-declare const reactCompiler: (options?: reactCompiler.Options) => Promise<TypedFlatConfigItem[]>;
+declare const reactCompiler: (options?: reactCompiler.Options) => Promise<import("../types").TypedFlatConfigItem[]>;
 export { reactCompiler };

package/dist/esm/configs/reactCompiler.mjs

@@ -1,13 +1,13 @@
-import defu from "defu";
 import { reactCompiler as importLib } from "../lib/eslint-plugin-react-compiler.mjs";
+import { mergeConfig } from "../utils/mergeConfig.mjs";
 const reactCompiler = async (options) => {
-  const reactCompilerSetupConfig = defu(options?.setup, {
+  const reactCompilerSetupConfig = mergeConfig(options?.setup, {
     name: "vdustr/react/react-compiler/setup",
     plugins: {
       "react-compiler": await importLib()
     }
   });
-  const reactCompilerRulesConfig = defu(options?.reactCompiler, {
+  const reactCompilerRulesConfig = mergeConfig(options?.reactCompiler, {
     name: "vdustr/react/react-compiler/rules",
     rules: {
       "react-compiler/react-compiler": "error"

package/dist/esm/configs/storybook.mjs

@@ -1,6 +1,6 @@
 import { ensurePackages, interopDefault } from "@antfu/eslint-config";
-import defu from "defu";
 import { pick } from "es-toolkit";
+import { mergeConfig } from "../utils/mergeConfig.mjs";
 import { renameRules } from "../utils/renameRules.mjs";
 const storybook = async (options) => {
   await ensurePackages(["eslint-plugin-storybook"]);
@@ -20,7 +20,7 @@ const storybook = async (options) => {
     ...pick(originalSetupConfig, ["plugins"]),
     name: "vdustr/stroybook/setup"
   };
-  const storyRulesConfig = defu(
+  const storyRulesConfig = mergeConfig(
     options?.stories,
     {
       name: "vdustr/storybook/stories/rules",
@@ -37,7 +37,7 @@ const storybook = async (options) => {
       })
     }
   );
-  const mainRulesConfig = defu(
+  const mainRulesConfig = mergeConfig(
     options?.main,
     {
       name: "vdustr/storybook/main/rules"

package/dist/esm/eslint-typegen.d.ts

@@ -99,5 +99,5 @@ type StorybookNoUninstalledAddons = []|[{
   [k: string]: unknown | undefined
 }]
   // Names of all the configs
-  export type ConfigNames = 'vdustr/mdx/setup' | 'vdustr/mdx/processor' | 'vdustr/mdx/rules' | 'vdustr/mdx/code-blocks' | 'vdustr/prettier/rules' | 'vdustr/react/react-compiler/setup' | 'vdustr/react/react-compiler/rules' | 'vdustr/stroybook/setup' | 'vdustr/storybook/stories/rules' | 'vdustr/storybook/main/rules' | 'vdustr/javascript/rules' | 'vdustr/imports/rules' | 'vdustr/imports/no-default-export/rules' | 'vdustr/typescript/rules' | 'vdustr/jsonc/rules' | 'vdustr/sort/tsconfig-json' | 'vdustr/yaml/rules' | 'vdustr/yaml/sort-keys/rules' | 'vdustr/sort/json-keys' | 'vdustr/jsonc/sort-array-values/rules'
+  export type ConfigNames = 'vdustr/mdx/setup' | 'vdustr/mdx/processor' | 'vdustr/mdx/rules' | 'vdustr/mdx/code-blocks' | 'vdustr/prettier/rules' | 'vdustr/react/react-compiler/setup' | 'vdustr/react/react-compiler/rules' | 'vdustr/stroybook/setup' | 'vdustr/storybook/stories/rules' | 'vdustr/storybook/main/rules' | 'vdustr/javascript/rules' | 'vdustr/imports/rules' | 'vdustr/imports/no-default-export/rules' | 'vdustr/typescript/rules' | 'vdustr/react/rules' | 'vdustr/react/react-compiler/setup' | 'vdustr/react/react-compiler/rules' | 'vdustr/jsonc/rules' | 'vdustr/sort/json-keys' | 'vdustr/sort/json-array-values' | 'vdustr/sort/tsconfig-json' | 'vdustr/yaml/rules' | 'vdustr/yaml/sort-keys/rules'
   

package/dist/esm/extends/imports.mjs

@@ -6,16 +6,19 @@ import {
   GLOB_TS,
   GLOB_TSX
 } from "@antfu/eslint-config";
-import defu from "defu";
 import { omit, pick } from "es-toolkit";
-import { GLOB_CONFIG_JS } from "../globs.mjs";
+import { GLOB_CONFIG_JS, GLOB_VITEST_WORKSPACE } from "../globs.mjs";
 import { extendsConfig } from "../utils/extendsConfig.mjs";
+import { mergeConfig } from "../utils/mergeConfig.mjs";
 import { ignoreKeys } from "./_utils.mjs";
 const imports = (composer, options) => {
   extendsConfig(composer, "antfu/imports/rules", (config) => {
-    const modifiedConfig = defu(pick(options?.imports ?? {}, ["files", "ignores"]), config);
+    const modifiedConfig = mergeConfig(
+      pick(options?.imports ?? {}, ["files", "ignores"]),
+      config
+    );
     const omittedConfig = omit(modifiedConfig, ignoreKeys);
-    const rulesConfig = defu(
+    const rulesConfig = mergeConfig(
       omit(options?.imports ?? {}, ["files", "ignores"]),
       {
         name: "vdustr/imports/rules",
@@ -33,7 +36,7 @@ const imports = (composer, options) => {
       },
       omittedConfig
     );
-    const noDefaultExportConfig = defu(
+    const noDefaultExportConfig = mergeConfig(
       options?.noDefaultExport,
       {
         name: "vdustr/imports/no-default-export/rules",
@@ -46,19 +49,13 @@ const imports = (composer, options) => {
            */
           "import/no-default-export": "error"
         },
-        files: [
-          GLOB_JS,
-          GLOB_JSX,
-          GLOB_TS,
-          GLOB_TSX,
-          ...options?.noDefaultExport?.files || []
-        ],
+        files: [GLOB_JS, GLOB_JSX, GLOB_TS, GLOB_TSX],
         ignores: [
           // Configuration files
           GLOB_CONFIG_JS,
           GLOB_MARKDOWN_CODE,
           GLOB_ASTRO_TS,
-          ...options?.noDefaultExport?.ignores || []
+          GLOB_VITEST_WORKSPACE
         ]
       },
       omit(omittedConfig, ["files", "ignores"])

package/dist/esm/extends/javascript.mjs

@@ -1,12 +1,15 @@
-import defu from "defu";
 import { omit, pick } from "es-toolkit";
 import { extendsConfig } from "../utils/extendsConfig.mjs";
+import { mergeConfig } from "../utils/mergeConfig.mjs";
 import { ignoreKeys } from "./_utils.mjs";
 const javascript = (composer, options) => {
   extendsConfig(composer, "antfu/javascript/rules", (config) => {
-    const modifiedConfig = defu(pick(options?.javascript ?? {}, ["files", "ignores"]), config);
+    const modifiedConfig = mergeConfig(
+      pick(options?.javascript ?? {}, ["files", "ignores"]),
+      config
+    );
     const omittedConfig = omit(modifiedConfig, ignoreKeys);
-    const rulesConfig = defu(
+    const rulesConfig = mergeConfig(
       omit(options?.javascript ?? {}, ["files", "ignores"]),
       {
         name: "vdustr/javascript/rules",

package/dist/esm/extends/jsonc.mjs

@@ -1,16 +1,19 @@
-import defu from "defu";
 import { omit, pick } from "es-toolkit";
-import { GLOB_CODE_WORKSPACE, GLOB_PACKAGE_JSON } from "../globs.mjs";
+import { GLOB_CODE_WORKSPACE } from "../globs.mjs";
 import { extendsConfig } from "../utils/extendsConfig.mjs";
+import { mergeConfig } from "../utils/mergeConfig.mjs";
 import { ignoreKeys } from "./_utils.mjs";
 const jsonc = async (composer, options) => {
   extendsConfig(composer, "antfu/jsonc/rules", (config) => {
-    const modifiedConfig = defu(pick(options?.jsonc ?? {}, ["files", "ignores"]), config, {
-      files: [GLOB_CODE_WORKSPACE],
-      ignores: [GLOB_PACKAGE_JSON]
-    });
+    const modifiedConfig = mergeConfig(
+      pick(options?.jsonc ?? {}, ["files", "ignores"]),
+      {
+        ...config,
+        files: [...config.files ?? [], GLOB_CODE_WORKSPACE]
+      }
+    );
     const omittedConfig = omit(modifiedConfig, ignoreKeys);
-    const rulesConfig = defu(
+    const rulesConfig = mergeConfig(
       omit(options?.jsonc ?? {}, ["files", "ignores"]),
       {
         name: "vdustr/jsonc/rules",

package/dist/esm/extends/react.mjs

@@ -1,13 +1,16 @@
-import defu from "defu";
 import { omit, pick } from "es-toolkit";
 import { reactCompiler } from "../configs/reactCompiler.mjs";
 import { extendsConfig } from "../utils/extendsConfig.mjs";
+import { mergeConfig } from "../utils/mergeConfig.mjs";
 import { ignoreKeys } from "./_utils.mjs";
 const react = (composer, options) => {
   extendsConfig(composer, "antfu/react/rules", async (config) => {
-    const modifiedConfig = defu(pick(options?.react ?? {}, ["files", "ignores"]), config);
+    const modifiedConfig = mergeConfig(
+      pick(options?.react ?? {}, ["files", "ignores"]),
+      config
+    );
     const omittedConfig = omit(modifiedConfig, ignoreKeys);
-    const rulesConfig = defu(
+    const rulesConfig = mergeConfig(
       omit(options?.react ?? {}, ["files", "ignores"]),
       {
         name: "vdustr/react/rules",
@@ -19,7 +22,7 @@ const react = (composer, options) => {
     );
     const reactCompilerConfigs = await reactCompiler({
       setup: options?.reactCompilerSetup ?? {},
-      reactCompiler: defu(
+      reactCompiler: mergeConfig(
         options?.reactCompiler,
         pick(omittedConfig, ["files", "ignores"])
       )

package/dist/esm/extends/sort.d.ts

@@ -1,26 +1,18 @@
 import type { ConfigOverrides, VpComposer } from "../types";
-declare namespace sortJsonKeys {
-    interface Options {
-        sortKeys?: ConfigOverrides;
-    }
-}
-declare const sortJsonKeys: (composer: VpComposer, options?: sortJsonKeys.Options) => Promise<void>;
-declare namespace sortPackageJson {
+declare namespace sort {
     interface Options {
+        jsoncSortKeys?: ConfigOverrides;
+        jsoncSortArrayValues?: ConfigOverrides;
         packageJson?: ConfigOverrides;
-    }
-}
-declare const sortPackageJson: (composer: VpComposer, options?: sortPackageJson.Options) => Promise<void>;
-declare namespace sortTsconfigJson {
-    interface Options {
         tsconfigJson?: ConfigOverrides;
     }
 }
-declare const sortTsconfigJson: (composer: VpComposer, options?: sortTsconfigJson.Options) => Promise<void>;
-declare namespace sortJsonArrayValues {
-    interface Options {
-        sortJsonArrayValues?: ConfigOverrides;
-    }
-}
-declare const sortJsonArrayValues: (composer: VpComposer, options?: sortJsonArrayValues.Options) => Promise<void>;
+declare const sortJsonKeys: (composer: VpComposer, options?: sort.Options["jsoncSortKeys"]) => Promise<void>;
+/**
+ * Disable rules conflicting with `eslint-config-package-json`.
+ */
+declare const sortPackageJson: (composer: VpComposer, options?: sort.Options["packageJson"]) => Promise<void>;
+declare const sortTsconfigJson: (composer: VpComposer, options?: sort.Options["tsconfigJson"]) => Promise<void>;
+declare const sortJsonArrayValues: (composer: VpComposer, options?: sort.Options["jsoncSortArrayValues"]) => Promise<void>;
+export type { sort };
 export { sortJsonArrayValues, sortJsonKeys, sortPackageJson, sortTsconfigJson };

package/dist/esm/extends/sort.mjs

@@ -1,60 +1,61 @@
-import defu from "defu";
 import { omit, pick } from "es-toolkit";
 import { GLOB_CSPELL_JSON } from "../globs.mjs";
 import { extendsConfig } from "../utils/extendsConfig.mjs";
+import { mergeConfig } from "../utils/mergeConfig.mjs";
 import { ignoreKeys } from "./_utils.mjs";
-const sortJsonKeys = async (composer, options) => {
-  extendsConfig.pushOverations(composer, [
-    async (items) => {
-      const source = "vdustr/jsonc/rules";
-      const configIndex = items.findIndex((item) => item.name === source);
-      const config = items[configIndex];
-      if (!config) {
-        return items;
-      }
-      const omittedConfig = omit(config, ignoreKeys);
-      const rulesConfig = defu(
-        options?.sortKeys,
-        {
-          name: "vdustr/sort/json-keys",
-          rules: {
-            "jsonc/sort-keys": [
-              "error",
-              {
-                pathPattern: ".*",
-                order: {
-                  type: "asc",
-                  caseSensitive: false,
-                  natural: true
-                }
-              }
-            ]
-          }
-        },
-        omittedConfig
-      );
-      return [...items, rulesConfig];
+const defaultSortJsonKeys = [
+  "error",
+  {
+    pathPattern: ".*",
+    order: {
+      type: "asc",
+      caseSensitive: false,
+      natural: true
+    }
+  }
+];
+const defaultSortJsonArrayValues = [
+  "error",
+  {
+    pathPattern: ".*",
+    order: {
+      type: "asc",
+      caseSensitive: false,
+      natural: true
     }
-  ]);
+  }
+];
+const sortJsonKeys = async (composer, options) => {
+  extendsConfig(composer, "vdustr/jsonc/rules", async (config) => {
+    const omittedConfig = omit(config, ignoreKeys);
+    const rulesConfig = mergeConfig(
+      options,
+      {
+        name: "vdustr/sort/json-keys",
+        rules: {
+          "jsonc/sort-keys": defaultSortJsonKeys
+        }
+      },
+      omittedConfig
+    );
+    return [config, rulesConfig];
+  });
 };
 const sortPackageJson = async (composer, options) => {
   extendsConfig(composer, "antfu/sort/package-json", (config) => {
-    const rules = config.rules;
-    const ruleKeys = Object.keys(rules ?? {});
-    const modifiedConfig = defu(pick(options?.packageJson ?? {}, ["files", "ignores"]), config);
+    const modifiedConfig = mergeConfig(
+      pick(options ?? {}, ["files", "ignores"]),
+      config
+    );
     const omittedConfig = omit(modifiedConfig, ignoreKeys);
-    const rulesConfig = defu(
-      options?.packageJson,
+    const rulesConfig = mergeConfig(
+      options,
       {
         name: "vdustr/sort/package-json",
-        /**
-         * Disable all rules. Handled by `eslint-config-package-json`.
-         */
-        rules: Object.fromEntries(
-          ruleKeys.map((key) => {
-            return [key, "off"];
-          })
-        )
+        rules: {
+          "jsonc/sort-array-values": "off",
+          "jsonc/sort-keys": "off"
+        }
       },
       omittedConfig
     );
@@ -63,22 +64,18 @@ const sortPackageJson = async (composer, options) => {
 };
 const sortTsconfigJson = async (composer, options) => {
   extendsConfig(composer, "antfu/sort/tsconfig-json", (config) => {
-    const rules = config.rules;
-    const ruleKeys = Object.keys(rules ?? {});
-    const modifiedConfig = defu(pick(options?.tsconfigJson ?? {}, ["files", "ignores"]), config);
+    const modifiedConfig = mergeConfig(
+      pick(options ?? {}, ["files", "ignores"]),
+      config
+    );
     const omittedConfig = omit(modifiedConfig, ignoreKeys);
-    const rulesConfig = defu(
-      options?.tsconfigJson,
+    const rulesConfig = mergeConfig(
+      options,
       {
         name: "vdustr/sort/tsconfig-json",
-        /**
-         * Disable all rules.
-         */
-        rules: Object.fromEntries(
-          ruleKeys.map((key) => {
-            return [key, "off"];
-          })
-        )
+        rules: {
+          "jsonc/sort-keys": defaultSortJsonKeys
+        }
       },
       omittedConfig
     );
@@ -86,23 +83,15 @@ const sortTsconfigJson = async (composer, options) => {
   });
 };
 const sortJsonArrayValues = async (composer, options) => {
-  const sortArrayValuesConfig = defu(options?.sortJsonArrayValues, {
-    name: "vdustr/jsonc/sort-array-values/rules",
-    files: [GLOB_CSPELL_JSON],
-    rules: {
-      "jsonc/sort-array-values": [
-        "error",
-        {
-          pathPattern: ".*",
-          order: {
-            type: "asc",
-            caseSensitive: false,
-            natural: true
-          }
-        }
-      ]
-    }
+  extendsConfig(composer, "vdustr/sort/json-keys", async (config) => {
+    const sortArrayValuesConfig = mergeConfig(options, {
+      name: "vdustr/sort/json-array-values",
+      files: [GLOB_CSPELL_JSON],
+      rules: {
+        "jsonc/sort-array-values": defaultSortJsonArrayValues
+      }
+    });
+    return [config, sortArrayValuesConfig];
   });
-  composer.append(sortArrayValuesConfig);
 };
 export { sortJsonArrayValues, sortJsonKeys, sortPackageJson, sortTsconfigJson };