@vp-tw/eslint-config 0.0.23 → 0.0.24

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

@@ -12,17 +12,19 @@ import { sortJsonArrayValues, sortJsonKeys, sortPackageJson, sortTsconfigJson }
 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;
+        sortPackageJson?: sortPackageJson.Options;
+        sortTsConfigJson?: sortTsconfigJson.Options;
+        sortJsonKeys?: sortJsonKeys.Options;
+        sortJsonArrayValues?: sortJsonArrayValues.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?.sortPackageJson);
+  (0, _sort.sortTsconfigJson)(config, vpOptions?.extends?.sortTsConfigJson);
+  (0, _sort.sortJsonKeys)(config, vpOptions?.extends?.sortJsonKeys);
+  (0, _sort.sortJsonArrayValues)(config, vpOptions?.extends?.sortJsonArrayValues);
+  (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.24",
   "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"