@vp-tw/eslint-config 0.0.23 → 0.0.25

package/dist/esm/extends/typescript.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 typescript = (composer, options) => {
   extendsConfig(composer, "antfu/typescript/rules", (config) => {
-    const modifiedConfig = defu(pick(options?.typescript ?? {}, ["files", "ignores"]), config);
+    const modifiedConfig = mergeConfig(
+      pick(options?.typescript ?? {}, ["files", "ignores"]),
+      config
+    );
     const omittedConfig = omit(modifiedConfig, ignoreKeys);
-    const rulesConfig = defu(
+    const rulesConfig = mergeConfig(
       omit(options?.typescript ?? {}, ["files", "ignores"]),
       {
         name: "vdustr/typescript/rules",

package/dist/esm/extends/yaml.mjs

@@ -1,15 +1,18 @@
-import defu from "defu";
 import { omit, pick } from "es-toolkit";
 import eslintPluginYml from "eslint-plugin-yml";
 import { GLOB_PNPM_WORKSPACE_YAML } from "../globs.mjs";
 import { extendsConfig } from "../utils/extendsConfig.mjs";
+import { mergeConfig } from "../utils/mergeConfig.mjs";
 import { renameRules } from "../utils/renameRules.mjs";
 import { ignoreKeys } from "./_utils.mjs";
 const yaml = (composer, options) => {
   extendsConfig(composer, "antfu/yaml/rules", (config) => {
-    const modifiedConfig = defu(pick(options?.yaml ?? {}, ["files", "ignores"]), config);
+    const modifiedConfig = mergeConfig(
+      pick(options?.yaml ?? {}, ["files", "ignores"]),
+      config
+    );
     const omittedConfig = omit(modifiedConfig, ignoreKeys);
-    const rulesConfig = defu(
+    const rulesConfig = mergeConfig(
       omit(options?.yaml ?? {}, ["files", "ignores"]),
       {
         name: "vdustr/yaml/rules",
@@ -26,7 +29,7 @@ const yaml = (composer, options) => {
       },
       omittedConfig
     );
-    const sortKeysConfig = defu(options?.sortKeys, {
+    const sortKeysConfig = mergeConfig(options?.sortKeys, {
       ...omit(omittedConfig, ["files", "ignores"]),
       name: "vdustr/yaml/sort-keys/rules",
       files: [GLOB_PNPM_WORKSPACE_YAML],

package/dist/esm/globs.d.ts

@@ -3,4 +3,5 @@ declare const GLOB_PACKAGE_JSON: string;
 declare const GLOB_PNPM_WORKSPACE_YAML: string;
 declare const GLOB_CSPELL_JSON: string;
 declare const GLOB_CONFIG_JS: string;
-export { GLOB_CODE_WORKSPACE, GLOB_CONFIG_JS, GLOB_CSPELL_JSON, GLOB_PACKAGE_JSON, GLOB_PNPM_WORKSPACE_YAML, };
+declare const GLOB_VITEST_WORKSPACE: string;
+export { GLOB_CODE_WORKSPACE, GLOB_CONFIG_JS, GLOB_CSPELL_JSON, GLOB_PACKAGE_JSON, GLOB_PNPM_WORKSPACE_YAML, GLOB_VITEST_WORKSPACE, };

package/dist/esm/globs.mjs

@@ -3,10 +3,12 @@ const GLOB_PACKAGE_JSON = "**/package.json";
 const GLOB_PNPM_WORKSPACE_YAML = "**/pnpm-workspace.y?(a)ml";
 const GLOB_CSPELL_JSON = "**/cspell.json";
 const GLOB_CONFIG_JS = "**/*.config.?([cm])[jt]s";
+const GLOB_VITEST_WORKSPACE = "**/vitest.workspace.?([cm])[jt]s";
 export {
   GLOB_CODE_WORKSPACE,
   GLOB_CONFIG_JS,
   GLOB_CSPELL_JSON,
   GLOB_PACKAGE_JSON,
-  GLOB_PNPM_WORKSPACE_YAML
+  GLOB_PNPM_WORKSPACE_YAML,
+  GLOB_VITEST_WORKSPACE
 };

package/dist/esm/types.d.ts

@@ -1,6 +1,6 @@
 import type antfu from "@antfu/eslint-config";
 import type { ConfigNames as AntfuEslintConfigNames, Rules as AntfuEslintRules } from "@antfu/eslint-config";
-import type { DistributiveOmit } from "@mui/types";
+import type { DistributiveOmit, Overwrite } from "@mui/types";
 import type { Linter } from "eslint";
 import type { FlatConfigComposer } from "eslint-flat-config-utils";
 import type { RuleOptions, ConfigNames as VpEslintConfigNames } from "./eslint-typegen";
@@ -18,7 +18,13 @@ type ConfigNames = VpEslintConfigNames | AntfuEslintConfigNames;
 type TypedFlatConfigItem = Omit<Linter.Config<Linter.RulesRecord & Rules>, "plugins"> & {
     plugins?: Record<string, any>;
 };
-interface ConfigOverrides extends DistributiveOmit<TypedFlatConfigItem, "process"> {
+type Files = TypedFlatConfigItem["files"];
+type Ignores = TypedFlatConfigItem["ignores"];
+type Mutables<T> = T | ((config: T) => T);
+interface ConfigOverrides extends Overwrite<DistributiveOmit<TypedFlatConfigItem, "process">, {
+    files?: Mutables<Files>;
+    ignores?: Mutables<Ignores>;
+}> {
 }
 /**
  * Typed composer.

package/dist/esm/utils/mergeConfig.d.ts

@@ -0,0 +1,3 @@
+import type { ConfigOverrides, TypedFlatConfigItem } from "../types";
+declare function mergeConfig(source?: ConfigOverrides, ...[def, ...defs]: [TypedFlatConfigItem, ...Array<TypedFlatConfigItem>]): TypedFlatConfigItem;
+export { mergeConfig };

package/dist/esm/utils/mergeConfig.mjs

@@ -0,0 +1,56 @@
+import { omit } from "es-toolkit";
+const objectMergeKeys = ["rules", "plugins"];
+const mutableMergeKeys = ["files", "ignores"];
+function mergeConfig(source, ...[def, ...defs]) {
+  const reversedDefs = [def, ...defs].toReversed();
+  const mergedDef = {
+    ...Object.fromEntries(reversedDefs.flatMap((def2) => Object.entries(def2))),
+    ...Object.fromEntries(
+      objectMergeKeys.flatMap((key) => {
+        if (reversedDefs.every((def2) => !(key in def2))) return [];
+        const values = Object.fromEntries(
+          reversedDefs.flatMap((def2) => Object.entries(def2[key] ?? {}))
+        );
+        return [[key, values]];
+      })
+    )
+  };
+  if (!source) return mergedDef;
+  const merged = {
+    ...omit(mergedDef, [...objectMergeKeys, ...mutableMergeKeys]),
+    ...omit(source, [...objectMergeKeys, ...mutableMergeKeys]),
+    ...Object.fromEntries(
+      objectMergeKeys.flatMap((key) => {
+        if (!(key in source) && !(key in mergedDef)) return [];
+        return [
+          [
+            key,
+            {
+              ...mergedDef[key],
+              ...source[key]
+            }
+          ]
+        ];
+      })
+    ),
+    ...Object.fromEntries(
+      mutableMergeKeys.flatMap((key) => {
+        if (!(key in source) && !(key in mergedDef)) return [];
+        if (!(key in source)) return [[key, mergedDef[key]]];
+        const sourceValue = source[key];
+        if (sourceValue === void 0) return [];
+        if (typeof sourceValue === "function") {
+          const value = sourceValue(
+            // @ts-expect-error -- typeof files and ignores are different.
+            mergedDef[key]
+          );
+          if (value === void 0) return [];
+          return [[key, value]];
+        }
+        return [[key, sourceValue]];
+      })
+    )
+  };
+  return merged;
+}
+export { mergeConfig };

package/dist/esm/vdustr.d.ts

@@ -1,3 +1,4 @@
+import type { sort } from "./extends/sort";
 import type { Config, ReplaceAntfuEslintRulesWithVpRulesDeeply, VpComposer } from "./types";
 import antfu from "@antfu/eslint-config";
 import { mdx } from "./configs/mdx";
@@ -8,21 +9,19 @@ import { imports } from "./extends/imports";
 import { javascript } from "./extends/javascript";
 import { jsonc } from "./extends/jsonc";
 import { react } from "./extends/react";
-import { sortJsonArrayValues, sortJsonKeys, sortPackageJson, sortTsconfigJson } from "./extends/sort";
 import { typescript } from "./extends/typescript";
 import { yaml } from "./extends/yaml";
 type Options = ReplaceAntfuEslintRulesWithVpRulesDeeply<NonNullable<Parameters<typeof antfu>[0]>> & {
-    javascriptExtends?: javascript.Options;
-    importsExtends?: imports.Options;
-    typescriptExtends?: typescript.Options;
-    jsoncExtends?: jsonc.Options;
-    sortPackageJsonExtends?: sortPackageJson.Options;
-    sortTsConfigJsonExtends?: sortTsconfigJson.Options;
-    sortJsonKeysExtends?: sortJsonKeys.Options;
-    sortJsonArrayValuesExtends?: sortJsonArrayValues.Options;
-    yamlExtends?: yaml.Options;
+    extends?: {
+        javascript?: javascript.Options;
+        imports?: imports.Options;
+        typescript?: typescript.Options;
+        jsonc?: jsonc.Options;
+        sort?: sort.Options;
+        yaml?: yaml.Options;
+        react?: react.Options;
+    };
     packageJson?: boolean | packageJson.Options;
-    reactExtends?: react.Options;
     mdx?: boolean | mdx.Options;
     storybook?: boolean | storybook.Options;
     prettier?: boolean | prettier.Options;

package/dist/esm/vdustr.mjs

@@ -1,4 +1,5 @@
 import antfu from "@antfu/eslint-config";
+import { omit, pick } from "es-toolkit";
 import { mdx } from "./configs/mdx.mjs";
 import { packageJson } from "./configs/packageJson.mjs";
 import { prettier } from "./configs/prettier.mjs";
@@ -15,53 +16,56 @@ import {
 } from "./extends/sort.mjs";
 import { typescript } from "./extends/typescript.mjs";
 import { yaml } from "./extends/yaml.mjs";
+const ownedConfigNames = [
+  "extends",
+  "packageJson",
+  "mdx",
+  "storybook",
+  "prettier"
+];
 const vdustr = (options, ...userConfigs) => {
+  const antfuOptions = omit(
+    options ?? {},
+    ownedConfigNames
+  );
+  const vpOptions = pick(options ?? {}, ownedConfigNames);
+  const packageJsonEnabled = Boolean(vpOptions?.packageJson ?? true);
+  const storybookEnabled = Boolean(vpOptions?.storybook ?? false);
+  const mdxEnabled = Boolean(vpOptions?.mdx ?? false);
+  const prettierEnabled = Boolean(vpOptions?.prettier ?? true);
   let config = antfu({
-    // Use `prettier` for formatting by default.
-    stylistic: false,
-    ...options
+    ...antfuOptions,
+    ...!prettierEnabled ? null : {
+      // Forcibly disable style rules if prettier is enabled.
+      stylistic: false
+    }
   });
-  javascript(config, options?.javascriptExtends);
-  imports(config, options?.importsExtends);
-  typescript(config, options?.typescriptExtends);
-  jsonc(config, options?.jsoncExtends);
-  yaml(config, options?.yamlExtends);
-  react(config, options?.reactExtends);
-  const packageJsonEnabled = Boolean(options?.packageJson ?? true);
+  javascript(config, vpOptions?.extends?.javascript);
+  imports(config, vpOptions?.extends?.imports);
+  typescript(config, vpOptions?.extends?.typescript);
+  jsonc(config, vpOptions?.extends?.jsonc);
+  if (packageJsonEnabled)
+    sortPackageJson(config, vpOptions?.extends?.sort?.packageJson);
+  sortTsconfigJson(config, vpOptions?.extends?.sort?.tsconfigJson);
+  sortJsonKeys(config, vpOptions?.extends?.sort?.jsoncSortKeys);
+  sortJsonArrayValues(config, vpOptions?.extends?.sort?.jsoncSortArrayValues);
+  yaml(config, vpOptions?.extends?.yaml);
+  react(config, vpOptions?.extends?.react);
   if (packageJsonEnabled) {
-    const packageJsonOptions = typeof options?.packageJson !== "object" ? void 0 : options.packageJson;
+    const packageJsonOptions = typeof vpOptions?.packageJson !== "object" ? void 0 : vpOptions.packageJson;
     config = config.append(
       packageJson(...!packageJsonOptions ? [] : [packageJsonOptions])
     );
   }
-  const jsoncEnabled = Boolean(options?.jsonc ?? true);
-  const sortPackageJsonExtendsEnabled = (
-    /**
-     * jsonc is required for the rules to work.
-     */
-    jsoncEnabled && packageJsonEnabled
-  );
-  if (sortPackageJsonExtendsEnabled) {
-    const sortPackageJsonOptions = typeof options?.sortPackageJsonExtends !== "object" ? void 0 : options.sortPackageJsonExtends;
-    sortPackageJson(
-      config,
-      ...!sortPackageJsonOptions ? [] : [sortPackageJsonOptions]
-    );
-  }
-  sortTsconfigJson(config, options?.sortTsConfigJsonExtends);
-  sortJsonKeys(config, options?.sortJsonKeysExtends);
-  sortJsonArrayValues(config, options?.sortJsonArrayValuesExtends);
-  const storybookEnabled = Boolean(options?.storybook ?? false);
   if (storybookEnabled) {
-    const storybookOptions = typeof options?.storybook !== "object" ? void 0 : options.storybook;
+    const storybookOptions = typeof vpOptions?.storybook !== "object" ? void 0 : vpOptions.storybook;
     config = config.append(
       storybook(...!storybookOptions ? [] : [storybookOptions])
     );
   }
-  const mdxEnabled = Boolean(options?.mdx ?? false);
   if (mdxEnabled) {
     const mdxOptions = {
-      ...typeof options?.mdx !== "object" ? null : options.mdx
+      ...typeof vpOptions?.mdx !== "object" ? null : vpOptions.mdx
     };
     const mdxFlatCodeBlocksEnabled = Boolean(
       mdxOptions?.codeBlocks ?? true
@@ -76,9 +80,8 @@ const vdustr = (options, ...userConfigs) => {
       })
     );
   }
-  const prettierEnabled = Boolean(options?.prettier ?? true);
   if (prettierEnabled) {
-    const prettierOptions = typeof options?.prettier !== "object" ? void 0 : options.prettier;
+    const prettierOptions = typeof vpOptions?.prettier !== "object" ? void 0 : vpOptions.prettier;
     config = config.append(
       prettier(...!prettierOptions ? [] : [prettierOptions])
     );

package/dist/extends/imports.js

@@ -5,17 +5,16 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.imports = void 0;
 var _eslintConfig = require("@antfu/eslint-config");
-var _defu = _interopRequireDefault(require("defu"));
 var _esToolkit = require("es-toolkit");
 var _globs = require("../globs");
 var _extendsConfig = require("../utils/extendsConfig");
+var _mergeConfig = require("../utils/mergeConfig");
 var _utils = require("./_utils");
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const imports = (composer, options) => {
   (0, _extendsConfig.extendsConfig)(composer, "antfu/imports/rules", config => {
-    const modifiedConfig = (0, _defu.default)((0, _esToolkit.pick)(options?.imports ?? {}, ["files", "ignores"]), config);
+    const modifiedConfig = (0, _mergeConfig.mergeConfig)((0, _esToolkit.pick)(options?.imports ?? {}, ["files", "ignores"]), config);
     const omittedConfig = (0, _esToolkit.omit)(modifiedConfig, _utils.ignoreKeys);
-    const rulesConfig = (0, _defu.default)((0, _esToolkit.omit)(options?.imports ?? {}, ["files", "ignores"]), {
+    const rulesConfig = (0, _mergeConfig.mergeConfig)((0, _esToolkit.omit)(options?.imports ?? {}, ["files", "ignores"]), {
       name: "vdustr/imports/rules",
       rules: {
         /**
@@ -29,7 +28,7 @@ const imports = (composer, options) => {
         "import/no-namespace": "error"
       }
     }, omittedConfig);
-    const noDefaultExportConfig = (0, _defu.default)(options?.noDefaultExport, {
+    const noDefaultExportConfig = (0, _mergeConfig.mergeConfig)(options?.noDefaultExport, {
       name: "vdustr/imports/no-default-export/rules",
       rules: {
         /**
@@ -40,10 +39,10 @@ const imports = (composer, options) => {
          */
         "import/no-default-export": "error"
       },
-      files: [_eslintConfig.GLOB_JS, _eslintConfig.GLOB_JSX, _eslintConfig.GLOB_TS, _eslintConfig.GLOB_TSX, ...(options?.noDefaultExport?.files || [])],
+      files: [_eslintConfig.GLOB_JS, _eslintConfig.GLOB_JSX, _eslintConfig.GLOB_TS, _eslintConfig.GLOB_TSX],
       ignores: [
       // Configuration files
-      _globs.GLOB_CONFIG_JS, _eslintConfig.GLOB_MARKDOWN_CODE, _eslintConfig.GLOB_ASTRO_TS, ...(options?.noDefaultExport?.ignores || [])]
+      _globs.GLOB_CONFIG_JS, _eslintConfig.GLOB_MARKDOWN_CODE, _eslintConfig.GLOB_ASTRO_TS, _globs.GLOB_VITEST_WORKSPACE]
     }, (0, _esToolkit.omit)(omittedConfig, ["files", "ignores"]));
     return [modifiedConfig, rulesConfig, noDefaultExportConfig];
   });

package/dist/extends/javascript.js

@@ -4,16 +4,15 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.javascript = void 0;
-var _defu = _interopRequireDefault(require("defu"));
 var _esToolkit = require("es-toolkit");
 var _extendsConfig = require("../utils/extendsConfig");
+var _mergeConfig = require("../utils/mergeConfig");
 var _utils = require("./_utils");
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const javascript = (composer, options) => {
   (0, _extendsConfig.extendsConfig)(composer, "antfu/javascript/rules", config => {
-    const modifiedConfig = (0, _defu.default)((0, _esToolkit.pick)(options?.javascript ?? {}, ["files", "ignores"]), config);
+    const modifiedConfig = (0, _mergeConfig.mergeConfig)((0, _esToolkit.pick)(options?.javascript ?? {}, ["files", "ignores"]), config);
     const omittedConfig = (0, _esToolkit.omit)(modifiedConfig, _utils.ignoreKeys);
-    const rulesConfig = (0, _defu.default)((0, _esToolkit.omit)(options?.javascript ?? {}, ["files", "ignores"]), {
+    const rulesConfig = (0, _mergeConfig.mergeConfig)((0, _esToolkit.omit)(options?.javascript ?? {}, ["files", "ignores"]), {
       name: "vdustr/javascript/rules",
       rules: {
         /**

package/dist/extends/jsonc.js

@@ -4,20 +4,19 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.jsonc = void 0;
-var _defu = _interopRequireDefault(require("defu"));
 var _esToolkit = require("es-toolkit");
 var _globs = require("../globs");
 var _extendsConfig = require("../utils/extendsConfig");
+var _mergeConfig = require("../utils/mergeConfig");
 var _utils = require("./_utils");
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const jsonc = async (composer, options) => {
   (0, _extendsConfig.extendsConfig)(composer, "antfu/jsonc/rules", config => {
-    const modifiedConfig = (0, _defu.default)((0, _esToolkit.pick)(options?.jsonc ?? {}, ["files", "ignores"]), config, {
-      files: [_globs.GLOB_CODE_WORKSPACE],
-      ignores: [_globs.GLOB_PACKAGE_JSON]
+    const modifiedConfig = (0, _mergeConfig.mergeConfig)((0, _esToolkit.pick)(options?.jsonc ?? {}, ["files", "ignores"]), {
+      ...config,
+      files: [...(config.files ?? []), _globs.GLOB_CODE_WORKSPACE]
     });
     const omittedConfig = (0, _esToolkit.omit)(modifiedConfig, _utils.ignoreKeys);
-    const rulesConfig = (0, _defu.default)((0, _esToolkit.omit)(options?.jsonc ?? {}, ["files", "ignores"]), {
+    const rulesConfig = (0, _mergeConfig.mergeConfig)((0, _esToolkit.omit)(options?.jsonc ?? {}, ["files", "ignores"]), {
       name: "vdustr/jsonc/rules",
       rules: {
         /**

package/dist/extends/react.js

@@ -4,17 +4,16 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.react = void 0;
-var _defu = _interopRequireDefault(require("defu"));
 var _esToolkit = require("es-toolkit");
 var _reactCompiler = require("../configs/reactCompiler");
 var _extendsConfig = require("../utils/extendsConfig");
+var _mergeConfig = require("../utils/mergeConfig");
 var _utils = require("./_utils");
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const react = (composer, options) => {
   (0, _extendsConfig.extendsConfig)(composer, "antfu/react/rules", async config => {
-    const modifiedConfig = (0, _defu.default)((0, _esToolkit.pick)(options?.react ?? {}, ["files", "ignores"]), config);
+    const modifiedConfig = (0, _mergeConfig.mergeConfig)((0, _esToolkit.pick)(options?.react ?? {}, ["files", "ignores"]), config);
     const omittedConfig = (0, _esToolkit.omit)(modifiedConfig, _utils.ignoreKeys);
-    const rulesConfig = (0, _defu.default)((0, _esToolkit.omit)(options?.react ?? {}, ["files", "ignores"]), {
+    const rulesConfig = (0, _mergeConfig.mergeConfig)((0, _esToolkit.omit)(options?.react ?? {}, ["files", "ignores"]), {
       name: "vdustr/react/rules",
       rules: {
         "react/prefer-destructuring-assignment": "off"
@@ -22,7 +21,7 @@ const react = (composer, options) => {
     }, omittedConfig);
     const reactCompilerConfigs = await (0, _reactCompiler.reactCompiler)({
       setup: options?.reactCompilerSetup ?? {},
-      reactCompiler: (0, _defu.default)(options?.reactCompiler, (0, _esToolkit.pick)(omittedConfig, ["files", "ignores"]))
+      reactCompiler: (0, _mergeConfig.mergeConfig)(options?.reactCompiler, (0, _esToolkit.pick)(omittedConfig, ["files", "ignores"]))
     });
     return [modifiedConfig, rulesConfig, ...reactCompilerConfigs];
   });

package/dist/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/extends/sort.js

@@ -4,52 +4,50 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.sortTsconfigJson = exports.sortPackageJson = exports.sortJsonKeys = exports.sortJsonArrayValues = void 0;
-var _defu = _interopRequireDefault(require("defu"));
 var _esToolkit = require("es-toolkit");
 var _globs = require("../globs");
 var _extendsConfig = require("../utils/extendsConfig");
+var _mergeConfig = require("../utils/mergeConfig");
 var _utils = require("./_utils");
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+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.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;
-    }
+  (0, _extendsConfig.extendsConfig)(composer, "vdustr/jsonc/rules", async config => {
     const omittedConfig = (0, _esToolkit.omit)(config, _utils.ignoreKeys);
-    const rulesConfig = (0, _defu.default)(options?.sortKeys, {
+    const rulesConfig = (0, _mergeConfig.mergeConfig)(options, {
       name: "vdustr/sort/json-keys",
       rules: {
-        "jsonc/sort-keys": ["error", {
-          pathPattern: ".*",
-          order: {
-            type: "asc",
-            caseSensitive: false,
-            natural: true
-          }
-        }]
+        "jsonc/sort-keys": defaultSortJsonKeys
       }
     }, omittedConfig);
-    return [...items, rulesConfig];
-  }]);
+    return [config, rulesConfig];
+  });
 };
 exports.sortJsonKeys = sortJsonKeys;
 const sortPackageJson = async (composer, options) => {
   (0, _extendsConfig.extendsConfig)(composer, "antfu/sort/package-json", config => {
-    const rules = config.rules;
-    const ruleKeys = Object.keys(rules ?? {});
-    const modifiedConfig = (0, _defu.default)((0, _esToolkit.pick)(options?.packageJson ?? {}, ["files", "ignores"]), config);
+    const modifiedConfig = (0, _mergeConfig.mergeConfig)((0, _esToolkit.pick)(options ?? {}, ["files", "ignores"]), config);
     const omittedConfig = (0, _esToolkit.omit)(modifiedConfig, _utils.ignoreKeys);
-    const rulesConfig = (0, _defu.default)(options?.packageJson, {
+    const rulesConfig = (0, _mergeConfig.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);
     return [modifiedConfig, rulesConfig];
   });
@@ -57,38 +55,28 @@ const sortPackageJson = async (composer, options) => {
 exports.sortPackageJson = sortPackageJson;
 const sortTsconfigJson = async (composer, options) => {
   (0, _extendsConfig.extendsConfig)(composer, "antfu/sort/tsconfig-json", config => {
-    const rules = config.rules;
-    const ruleKeys = Object.keys(rules ?? {});
-    const modifiedConfig = (0, _defu.default)((0, _esToolkit.pick)(options?.tsconfigJson ?? {}, ["files", "ignores"]), config);
+    const modifiedConfig = (0, _mergeConfig.mergeConfig)((0, _esToolkit.pick)(options ?? {}, ["files", "ignores"]), config);
     const omittedConfig = (0, _esToolkit.omit)(modifiedConfig, _utils.ignoreKeys);
-    const rulesConfig = (0, _defu.default)(options?.tsconfigJson, {
+    const rulesConfig = (0, _mergeConfig.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);
     return [modifiedConfig, rulesConfig];
   });
 };
 exports.sortTsconfigJson = sortTsconfigJson;
 const sortJsonArrayValues = async (composer, options) => {
-  const sortArrayValuesConfig = (0, _defu.default)(options?.sortJsonArrayValues, {
-    name: "vdustr/jsonc/sort-array-values/rules",
-    files: [_globs.GLOB_CSPELL_JSON],
-    rules: {
-      "jsonc/sort-array-values": ["error", {
-        pathPattern: ".*",
-        order: {
-          type: "asc",
-          caseSensitive: false,
-          natural: true
-        }
-      }]
-    }
+  (0, _extendsConfig.extendsConfig)(composer, "vdustr/sort/json-keys", async config => {
+    const sortArrayValuesConfig = (0, _mergeConfig.mergeConfig)(options, {
+      name: "vdustr/sort/json-array-values",
+      files: [_globs.GLOB_CSPELL_JSON],
+      rules: {
+        "jsonc/sort-array-values": defaultSortJsonArrayValues
+      }
+    });
+    return [config, sortArrayValuesConfig];
   });
-  composer.append(sortArrayValuesConfig);
 };
 exports.sortJsonArrayValues = sortJsonArrayValues;

package/dist/extends/typescript.js

@@ -4,16 +4,15 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.typescript = void 0;
-var _defu = _interopRequireDefault(require("defu"));
 var _esToolkit = require("es-toolkit");
 var _extendsConfig = require("../utils/extendsConfig");
+var _mergeConfig = require("../utils/mergeConfig");
 var _utils = require("./_utils");
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const typescript = (composer, options) => {
   (0, _extendsConfig.extendsConfig)(composer, "antfu/typescript/rules", config => {
-    const modifiedConfig = (0, _defu.default)((0, _esToolkit.pick)(options?.typescript ?? {}, ["files", "ignores"]), config);
+    const modifiedConfig = (0, _mergeConfig.mergeConfig)((0, _esToolkit.pick)(options?.typescript ?? {}, ["files", "ignores"]), config);
     const omittedConfig = (0, _esToolkit.omit)(modifiedConfig, _utils.ignoreKeys);
-    const rulesConfig = (0, _defu.default)((0, _esToolkit.omit)(options?.typescript ?? {}, ["files", "ignores"]), {
+    const rulesConfig = (0, _mergeConfig.mergeConfig)((0, _esToolkit.omit)(options?.typescript ?? {}, ["files", "ignores"]), {
       name: "vdustr/typescript/rules",
       rules: {
         /**