@vp-tw/eslint-config 0.0.23 → 0.0.25

package/dist/extends/yaml.js

@@ -4,25 +4,25 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.yaml = void 0;
-var _defu = _interopRequireDefault(require("defu"));
 var _esToolkit = require("es-toolkit");
 var _eslintPluginYml = _interopRequireDefault(require("eslint-plugin-yml"));
 var _globs = require("../globs");
 var _extendsConfig = require("../utils/extendsConfig");
+var _mergeConfig = require("../utils/mergeConfig");
 var _renameRules = require("../utils/renameRules");
 var _utils = require("./_utils");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const yaml = (composer, options) => {
   (0, _extendsConfig.extendsConfig)(composer, "antfu/yaml/rules", config => {
-    const modifiedConfig = (0, _defu.default)((0, _esToolkit.pick)(options?.yaml ?? {}, ["files", "ignores"]), config);
+    const modifiedConfig = (0, _mergeConfig.mergeConfig)((0, _esToolkit.pick)(options?.yaml ?? {}, ["files", "ignores"]), config);
     const omittedConfig = (0, _esToolkit.omit)(modifiedConfig, _utils.ignoreKeys);
-    const rulesConfig = (0, _defu.default)((0, _esToolkit.omit)(options?.yaml ?? {}, ["files", "ignores"]), {
+    const rulesConfig = (0, _mergeConfig.mergeConfig)((0, _esToolkit.omit)(options?.yaml ?? {}, ["files", "ignores"]), {
       name: "vdustr/yaml/rules",
       rules: (0, _renameRules.renameRules)({
         ...Object.fromEntries([..._eslintPluginYml.default.configs["flat/recommended"].flatMap(config2 => Object.entries(config2.rules ?? {})), ..._eslintPluginYml.default.configs["flat/prettier"].flatMap(config2 => Object.entries(config2.rules ?? {}))])
       })
     }, omittedConfig);
-    const sortKeysConfig = (0, _defu.default)(options?.sortKeys, {
+    const sortKeysConfig = (0, _mergeConfig.mergeConfig)(options?.sortKeys, {
       ...(0, _esToolkit.omit)(omittedConfig, ["files", "ignores"]),
       name: "vdustr/yaml/sort-keys/rules",
       files: [_globs.GLOB_PNPM_WORKSPACE_YAML],

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

@@ -3,9 +3,10 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.GLOB_PNPM_WORKSPACE_YAML = exports.GLOB_PACKAGE_JSON = exports.GLOB_CSPELL_JSON = exports.GLOB_CONFIG_JS = exports.GLOB_CODE_WORKSPACE = void 0;
+exports.GLOB_VITEST_WORKSPACE = exports.GLOB_PNPM_WORKSPACE_YAML = exports.GLOB_PACKAGE_JSON = exports.GLOB_CSPELL_JSON = exports.GLOB_CONFIG_JS = exports.GLOB_CODE_WORKSPACE = void 0;
 const GLOB_CODE_WORKSPACE = exports.GLOB_CODE_WORKSPACE = "**/*.code-workspace";
 const GLOB_PACKAGE_JSON = exports.GLOB_PACKAGE_JSON = "**/package.json";
 const GLOB_PNPM_WORKSPACE_YAML = exports.GLOB_PNPM_WORKSPACE_YAML = "**/pnpm-workspace.y?(a)ml";
 const GLOB_CSPELL_JSON = exports.GLOB_CSPELL_JSON = "**/cspell.json";
-const GLOB_CONFIG_JS = exports.GLOB_CONFIG_JS = "**/*.config.?([cm])[jt]s";
+const GLOB_CONFIG_JS = exports.GLOB_CONFIG_JS = "**/*.config.?([cm])[jt]s";
+const GLOB_VITEST_WORKSPACE = exports.GLOB_VITEST_WORKSPACE = "**/vitest.workspace.?([cm])[jt]s";

package/dist/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/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/utils/mergeConfig.js

@@ -0,0 +1,47 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.mergeConfig = mergeConfig;
+var _esToolkit = require("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 = {
+    ...(0, _esToolkit.omit)(mergedDef, [...objectMergeKeys, ...mutableMergeKeys]),
+    ...(0, _esToolkit.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;
+}

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

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.vdustr = void 0;
 var _eslintConfig = _interopRequireDefault(require("@antfu/eslint-config"));
+var _esToolkit = require("es-toolkit");
 var _mdx = require("./configs/mdx");
 var _packageJson = require("./configs/packageJson");
 var _prettier = require("./configs/prettier");
@@ -17,45 +18,42 @@ var _sort = require("./extends/sort");
 var _typescript = require("./extends/typescript");
 var _yaml = require("./extends/yaml");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+const ownedConfigNames = ["extends", "packageJson", "mdx", "storybook", "prettier"];
 const vdustr = (options, ...userConfigs) => {
+  const antfuOptions = (0, _esToolkit.omit)(options ?? {}, ownedConfigNames);
+  const vpOptions = (0, _esToolkit.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 = (0, _eslintConfig.default)({
-    // Use `prettier` for formatting by default.
-    stylistic: false,
-    ...options
+    ...antfuOptions,
+    ...(!prettierEnabled ? null : {
+      // Forcibly disable style rules if prettier is enabled.
+      stylistic: false
+    })
   });
-  (0, _javascript.javascript)(config, options?.javascriptExtends);
-  (0, _imports.imports)(config, options?.importsExtends);
-  (0, _typescript.typescript)(config, options?.typescriptExtends);
-  (0, _jsonc.jsonc)(config, options?.jsoncExtends);
-  (0, _yaml.yaml)(config, options?.yamlExtends);
-  (0, _react.react)(config, options?.reactExtends);
-  const packageJsonEnabled = Boolean(options?.packageJson ?? true);
+  (0, _javascript.javascript)(config, vpOptions?.extends?.javascript);
+  (0, _imports.imports)(config, vpOptions?.extends?.imports);
+  (0, _typescript.typescript)(config, vpOptions?.extends?.typescript);
+  (0, _jsonc.jsonc)(config, vpOptions?.extends?.jsonc);
+  if (packageJsonEnabled) (0, _sort.sortPackageJson)(config, vpOptions?.extends?.sort?.packageJson);
+  (0, _sort.sortTsconfigJson)(config, vpOptions?.extends?.sort?.tsconfigJson);
+  (0, _sort.sortJsonKeys)(config, vpOptions?.extends?.sort?.jsoncSortKeys);
+  (0, _sort.sortJsonArrayValues)(config, vpOptions?.extends?.sort?.jsoncSortArrayValues);
+  (0, _yaml.yaml)(config, vpOptions?.extends?.yaml);
+  (0, _react.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((0, _packageJson.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;
-    (0, _sort.sortPackageJson)(config, ...(!sortPackageJsonOptions ? [] : [sortPackageJsonOptions]));
-  }
-  (0, _sort.sortTsconfigJson)(config, options?.sortTsConfigJsonExtends);
-  (0, _sort.sortJsonKeys)(config, options?.sortJsonKeysExtends);
-  (0, _sort.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((0, _storybook.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);
     const mdxFlatCodeBlocksOptions = {
@@ -66,9 +64,8 @@ const vdustr = (options, ...userConfigs) => {
       codeBlocks: !mdxFlatCodeBlocksEnabled ? false : mdxFlatCodeBlocksOptions
     }));
   }
-  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((0, _prettier.prettier)(...(!prettierOptions ? [] : [prettierOptions])));
   }
   config.append(...userConfigs);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vp-tw/eslint-config",
-  "version": "0.0.23",
+  "version": "0.0.25",
   "description": "ViPro's ESLint configuration",
   "homepage": "https://github.com/vdustr/eslint-config",
   "author": {
@@ -40,7 +40,6 @@
   ],
   "dependencies": {
     "@mui/types": "^7.2.21",
-    "defu": "^6.1.4",
     "es-toolkit": "^1.31.0",
     "eslint-flat-config-utils": "^2.0.0",
     "local-pkg": "^1.0.0"