@vp-tw/eslint-config 0.0.18 → 0.0.20

package/dist/extends/react.d.ts

@@ -1,28 +1,11 @@
-import type { ConfigNames, TypedFlatConfigItem } from "@antfu/eslint-config";
-import type { FlatConfigComposer } from "eslint-flat-config-utils";
-import type { ConfigOverrides, ResolveConfigNamesMap } from "../types";
-declare const configNamesMapSource: {
-    readonly react: "vdustr/react/rules";
-    readonly reactCompilerSetup: "vdustr/react/react-compiler/setup";
-    readonly reactCompilerRules: "vdustr/react/react-compiler/rules";
-};
-declare module "../types" {
-    interface ConfigNamesMap extends ResolveConfigNamesMap<react.ConfigNamesMapSource> {
-    }
-}
+import type { ConfigOverrides, VpComposer } from "../types";
+import { reactCompiler } from "../configs/reactCompiler";
 declare namespace react {
-    type ConfigNamesMapSource = typeof configNamesMapSource;
     interface Options {
         react?: ConfigOverrides;
-        reactCompilerSetup?: ConfigOverrides;
-        reactCompilerRules?: ConfigOverrides;
+        reactCompiler?: reactCompiler.Options["reactCompiler"];
+        reactCompilerSetup?: reactCompiler.Options["setup"];
     }
 }
-declare const react: ((composer: FlatConfigComposer<TypedFlatConfigItem, ConfigNames>, options?: react.Options) => void) & {
-    configNamesMapSource: {
-        readonly react: "vdustr/react/rules";
-        readonly reactCompilerSetup: "vdustr/react/react-compiler/setup";
-        readonly reactCompilerRules: "vdustr/react/react-compiler/rules";
-    };
-};
+declare const react: (composer: VpComposer, options?: react.Options) => void;
 export { react };

package/dist/extends/react.js

@@ -6,40 +6,25 @@ Object.defineProperty(exports, "__esModule", {
 exports.react = void 0;
 var _defu = _interopRequireDefault(require("defu"));
 var _esToolkit = require("es-toolkit");
-var _eslintPluginReactCompiler = require("../lib/eslint-plugin-react-compiler");
+var _reactCompiler = require("../configs/reactCompiler");
 var _extendsConfig = require("../utils/extendsConfig");
 var _utils = require("./_utils");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-const configNamesMapSource = {
-  react: "vdustr/react/rules",
-  reactCompilerSetup: "vdustr/react/react-compiler/setup",
-  reactCompilerRules: "vdustr/react/react-compiler/rules"
-};
-const reactInternal = (composer, options) => {
+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 omittedConfig = (0, _esToolkit.omit)(modifiedConfig, _utils.ignoreKeys);
     const rulesConfig = (0, _defu.default)((0, _esToolkit.omit)(options?.react ?? {}, ["files", "ignores"]), {
-      name: configNamesMapSource.react,
+      name: "vdustr/react/rules",
       rules: {
         "react/prefer-destructuring-assignment": "off"
       }
     }, omittedConfig);
-    const reactCompilerSetupConfig = (0, _defu.default)(options?.reactCompilerSetup, {
-      name: configNamesMapSource.reactCompilerSetup,
-      plugins: {
-        "react-compiler": await (0, _eslintPluginReactCompiler.reactCompiler)()
-      }
+    const reactCompilerConfigs = await (0, _reactCompiler.reactCompiler)({
+      setup: options?.reactCompilerSetup ?? {},
+      reactCompiler: (0, _defu.default)(options?.reactCompiler, (0, _esToolkit.pick)(omittedConfig, ["files", "ignores"]))
     });
-    const reactCompilerRulesConfig = (0, _defu.default)(options?.reactCompilerRules, {
-      name: configNamesMapSource.reactCompilerRules,
-      rules: {
-        "react-compiler/react-compiler": "error"
-      }
-    }, omittedConfig);
-    return [modifiedConfig, rulesConfig, reactCompilerSetupConfig, reactCompilerRulesConfig];
+    return [modifiedConfig, rulesConfig, ...reactCompilerConfigs];
   });
 };
-const react = exports.react = Object.assign(reactInternal, {
-  configNamesMapSource
-});
+exports.react = react;

package/dist/extends/typescript.d.ts

@@ -1,22 +1,8 @@
-import type { ConfigNames, TypedFlatConfigItem } from "@antfu/eslint-config";
-import type { FlatConfigComposer } from "eslint-flat-config-utils";
-import type { ConfigOverrides, ResolveConfigNamesMap } from "../types";
-declare const configNamesMapSource: {
-    readonly typescript: "vdustr/typescript/rules";
-};
-declare module "../types" {
-    interface ConfigNamesMap extends ResolveConfigNamesMap<typescript.ConfigNamesMapSource> {
-    }
-}
+import type { ConfigOverrides, VpComposer } from "../types";
 declare namespace typescript {
-    type ConfigNamesMapSource = typeof configNamesMapSource;
     interface Options {
         typescript?: ConfigOverrides;
     }
 }
-declare const typescript: ((composer: FlatConfigComposer<TypedFlatConfigItem, ConfigNames>, options?: typescript.Options) => void) & {
-    configNamesMapSource: {
-        readonly typescript: "vdustr/typescript/rules";
-    };
-};
+declare const typescript: (composer: VpComposer, options?: typescript.Options) => void;
 export { typescript };

package/dist/extends/typescript.js

@@ -9,15 +9,12 @@ var _esToolkit = require("es-toolkit");
 var _extendsConfig = require("../utils/extendsConfig");
 var _utils = require("./_utils");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-const configNamesMapSource = {
-  typescript: "vdustr/typescript/rules"
-};
-const typescriptInternal = (composer, options) => {
+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 omittedConfig = (0, _esToolkit.omit)(modifiedConfig, _utils.ignoreKeys);
     const rulesConfig = (0, _defu.default)((0, _esToolkit.omit)(options?.typescript ?? {}, ["files", "ignores"]), {
-      name: configNamesMapSource.typescript,
+      name: "vdustr/typescript/rules",
       rules: {
         /**
          * Use `Array<T>` instead of `T[]` for better DX.
@@ -46,6 +43,4 @@ const typescriptInternal = (composer, options) => {
     return [modifiedConfig, rulesConfig];
   });
 };
-const typescript = exports.typescript = Object.assign(typescriptInternal, {
-  configNamesMapSource
-});
+exports.typescript = typescript;

package/dist/extends/yaml.d.ts

@@ -1,25 +1,9 @@
-import type { ConfigNames, TypedFlatConfigItem } from "@antfu/eslint-config";
-import type { FlatConfigComposer } from "eslint-flat-config-utils";
-import type { ConfigOverrides, ResolveConfigNamesMap } from "../types";
-declare const configNamesMapSource: {
-    readonly yaml: "vdustr/yaml/rules";
-    readonly sortKeys: "vdustr/yaml/sort-keys/rules";
-};
-declare module "../types" {
-    interface ConfigNamesMap extends ResolveConfigNamesMap<yaml.ConfigNamesMapSource> {
-    }
-}
+import type { ConfigOverrides, VpComposer } from "../types";
 declare namespace yaml {
-    type ConfigNamesMapSource = typeof configNamesMapSource;
     interface Options {
         yaml?: ConfigOverrides;
         sortKeys?: ConfigOverrides;
     }
 }
-declare const yaml: ((composer: FlatConfigComposer<TypedFlatConfigItem, ConfigNames>, options?: yaml.Options) => void) & {
-    configNamesMapSource: {
-        readonly yaml: "vdustr/yaml/rules";
-        readonly sortKeys: "vdustr/yaml/sort-keys/rules";
-    };
-};
+declare const yaml: (composer: VpComposer, options?: yaml.Options) => void;
 export { yaml };

package/dist/extends/yaml.js

@@ -12,23 +12,19 @@ var _extendsConfig = require("../utils/extendsConfig");
 var _renameRules = require("../utils/renameRules");
 var _utils = require("./_utils");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-const configNamesMapSource = {
-  yaml: "vdustr/yaml/rules",
-  sortKeys: "vdustr/yaml/sort-keys/rules"
-};
-const yamlInternal = (composer, options) => {
+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 omittedConfig = (0, _esToolkit.omit)(modifiedConfig, _utils.ignoreKeys);
     const rulesConfig = (0, _defu.default)((0, _esToolkit.omit)(options?.yaml ?? {}, ["files", "ignores"]), {
-      name: configNamesMapSource.yaml,
+      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, {
       ...(0, _esToolkit.omit)(omittedConfig, ["files", "ignores"]),
-      name: configNamesMapSource.sortKeys,
+      name: "vdustr/yaml/sort-keys/rules",
       files: [_globs.GLOB_PNPM_WORKSPACE_YAML],
       rules: {
         "yaml/sort-keys": ["error", {
@@ -44,6 +40,4 @@ const yamlInternal = (composer, options) => {
     return [modifiedConfig, rulesConfig, sortKeysConfig];
   });
 };
-const yaml = exports.yaml = Object.assign(yamlInternal, {
-  configNamesMapSource
-});
+exports.yaml = yaml;

package/dist/types.d.ts

@@ -1,37 +1,22 @@
-import type { TypedFlatConfigItem } from "@antfu/eslint-config";
 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 { Linter } from "eslint";
+import type { FlatConfigComposer } from "eslint-flat-config-utils";
+import type { RuleOptions, ConfigNames as VpEslintConfigNames } from "./eslint-typegen";
 type Config = NonNullable<Parameters<typeof antfu>[1]>;
+type Rules = RuleOptions & AntfuEslintRules;
+type ConfigNames = VpEslintConfigNames | AntfuEslintConfigNames;
 /**
- * A map of config names.
- *
- * @example
- *
- * ```ts
- *
- * ```
+ * Learned from <https://github.com/antfu/eslint-config/blob/e283983/src/types.ts#L11-L23>
  */
-interface ConfigNamesMap {
-}
-type BaseConfigNamesMapSource = Record<string, string>;
-/**
- * Transfroms a config names map source to a config names map.
- *
- * @example
- *
- * ```ts
- * BaseConfigNamesMapSource<{
- *   setup: "my-config/setup",
- *   rules: "my-config/rules",
- * }> => {
- *   "my-config/setup": true,
- *   "my-config/rules": true,
- * }
- * ```
- */
-type ResolveConfigNamesMap<TSource extends BaseConfigNamesMapSource> = {
-    [K in TSource[keyof TSource]]: true;
+type TypedFlatConfigItem = Omit<Linter.Config<Linter.RulesRecord & Rules>, "plugins"> & {
+    plugins?: Record<string, any>;
 };
 interface ConfigOverrides extends DistributiveOmit<TypedFlatConfigItem, "process"> {
 }
-export type { BaseConfigNamesMapSource, Config, ConfigNamesMap, ConfigOverrides, ResolveConfigNamesMap, };
+/**
+ * Typed composer.
+ */
+type VpComposer = FlatConfigComposer<TypedFlatConfigItem, ConfigNames>;
+export type { Config, ConfigNames, ConfigOverrides, TypedFlatConfigItem, VpComposer, };

package/dist/vdustr.d.ts

@@ -1,6 +1,4 @@
-import type { ConfigNames, TypedFlatConfigItem } from "@antfu/eslint-config";
-import type { FlatConfigComposer } from "eslint-flat-config-utils";
-import type { Config, ConfigNamesMap } from "./types";
+import type { Config, VpComposer } from "./types";
 import antfu from "@antfu/eslint-config";
 import { mdx } from "./configs/mdx";
 import { prettier } from "./configs/prettier";
@@ -11,7 +9,6 @@ import { jsonc } from "./extends/jsonc";
 import { react } from "./extends/react";
 import { typescript } from "./extends/typescript";
 import { yaml } from "./extends/yaml";
-import "./eslint-typegen";
 type Options = NonNullable<Parameters<typeof antfu>[0]> & {
     javascriptExtends?: javascript.Options;
     importsExtends?: imports.Options;
@@ -23,5 +20,5 @@ type Options = NonNullable<Parameters<typeof antfu>[0]> & {
     storybook?: boolean | storybook.Options;
     prettier?: boolean | prettier.Options;
 };
-declare const vdustr: (options?: Options, ...userConfigs: Array<Config>) => FlatConfigComposer<TypedFlatConfigItem, ConfigNames | keyof ConfigNamesMap>;
+declare const vdustr: (options?: Options, ...userConfigs: Array<Config>) => VpComposer;
 export { vdustr };

package/dist/vdustr.js

@@ -14,11 +14,10 @@ var _jsonc = require("./extends/jsonc");
 var _react = require("./extends/react");
 var _typescript = require("./extends/typescript");
 var _yaml = require("./extends/yaml");
-require("./eslint-typegen");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const vdustr = (options, ...userConfigs) => {
   let config = (0, _eslintConfig.default)({
-    // We use `prettier`.
+    // Use `prettier` for formatting by default.
     stylistic: false,
     ...options
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vp-tw/eslint-config",
-  "version": "0.0.18",
+  "version": "0.0.20",
   "description": "ViPro's ESLint configuration",
   "homepage": "https://github.com/vdustr/eslint-config",
   "author": {
@@ -9,23 +9,23 @@
   },
   "exports": {
     ".": {
-      "default": {
-        "default": "./dist/index.js",
-        "types": "./dist/index.d.ts"
-      },
       "import": {
-        "default": "./dist/esm/index.mjs",
-        "types": "./dist/esm/index.d.ts"
+        "types": "./dist/esm/index.d.ts",
+        "default": "./dist/esm/index.mjs"
+      },
+      "default": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
       }
     },
     "./*": {
-      "default": {
-        "default": "./dist/*.js",
-        "types": "./dist/*.d.ts"
-      },
       "import": {
-        "default": "./dist/esm/*.mjs",
-        "types": "./dist/esm/*.d.ts"
+        "types": "./dist/esm/*.d.ts",
+        "default": "./dist/esm/*.mjs"
+      },
+      "default": {
+        "types": "./dist/*.d.ts",
+        "default": "./dist/*.js"
       }
     },
     "./README.md": "./README.md",
@@ -83,10 +83,8 @@
     "access": "public"
   },
   "scripts": {
-    "build": "run-s build:unbuild fixEslintTypegenDts",
-    "build:unbuild": "unbuild",
+    "build": "unbuild",
     "copy": "tsx scripts/copy",
-    "fixEslintTypegenDts": "tsx scripts/fixEslintTypegenDts",
     "typegen": "tsx scripts/typegen"
   }
 }

package/dist/eslint-typegen.js

@@ -1,2 +0,0 @@
-// Placeholder for `eslint-typegen.d.ts`.
-"use strict";

package/dist/esm/eslint-typegen.mjs

@@ -1 +0,0 @@
-// Placeholder for `eslint-typegen.d.ts`.