@vp-tw/eslint-config 0.0.14 → 0.0.16

package/README.md

@@ -8,6 +8,7 @@ ViPro's ESLint configuration.
   - [eslint-mdx](https://github.com/mdx-js/eslint-mdx)
   - [eslint-plugin-storybook](https://github.com/storybookjs/eslint-plugin-storybook)
   - [eslint-plugin-react-compiler](https://www.npmjs.com/package/eslint-plugin-react-compiler)
+  - [eslint-plugin-package-json](https://github.com/JoshuaKGoldberg/eslint-plugin-package-json)
 - Fine-tuned to provide an opinionated, optimal DX. Please copy the VSCode settings from [eslint-config.code-workspace](https://github.com/VdustR/eslint-config/blob/main/eslint-config.code-workspace).
 
 Check [here](https://vdustr.dev/eslint-config) to preview the ESLint inspection.

package/dist/configs/mdx.d.ts

@@ -12,8 +12,9 @@ declare module "../types" {
 }
 declare namespace mdx {
     type ConfigNamesMapSource = typeof configNamesMapSource;
-    interface Options extends ConfigOverrides {
-        processorOptions?: import("eslint-plugin-mdx").ProcessorOptions;
+    interface Options {
+        mdx?: ConfigOverrides;
+        processorOptions?: Omit<import("eslint-plugin-mdx").ProcessorOptions, "lintCodeBlocks">;
         codeBlocks?: boolean | ConfigOverrides;
     }
 }

package/dist/configs/mdx.js

@@ -5,8 +5,10 @@ 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 _renameRules = require("../utils/renameRules");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const configNamesMapSource = {
   setup: "vdustr/mdx/setup",
   processor: "vdustr/mdx/processor",
@@ -21,79 +23,39 @@ const mdxInternal = async ({
   await (0, _eslintConfig.ensurePackages)(["eslint-plugin-mdx"]);
   const mdxPlugin = await (0, _eslintConfig.interopDefault)(await Promise.resolve().then(() => require("eslint-plugin-mdx")));
   const codeBlocksOptions = typeof codeBlocks !== "object" ? {} : codeBlocks;
-  const configs = [{
+  const setupConfig = {
     ...(0, _esToolkit.pick)(mdxPlugin.flat, ["plugins"]),
     name: configNamesMapSource.setup
-  }, {
+  };
+  const processorConfig = {
     processor: mdxPlugin.createRemarkProcessor({
-      lintCodeBlocks: Boolean(codeBlocks),
       ...processorOptions,
-      languageMapper: {
-        ...processorOptions?.languageMapper
-      }
+      lintCodeBlocks: Boolean(codeBlocks)
     }),
     name: configNamesMapSource.processor
-  }, {
-    /**
-     * Inherited.
-     */
+  };
+  const rulesConfig = (0, _defu.default)(options.mdx, {
     ...(0, _esToolkit.omit)(mdxPlugin.flat, ["plugins", "processor"]),
-    /**
-     * Default.
-     */
     name: configNamesMapSource.rules,
-    ignores: [
+    rules: (0, _renameRules.renameRules)(mdxPlugin.flat.rules ?? {}),
     /**
      * Handled by `@eslint/markdown`.
      */
-    _eslintConfig.GLOB_MARKDOWN],
-    /**
-     * Overridable.
-     */
-    ...options,
-    rules: {
-      /**
-       * Inherited.
-       */
-      ...(0, _renameRules.renameRules)({
-        ...mdxPlugin.flat.rules
-      }),
-      /**
-       * Overridable.
-       */
-      ...options.rules
-    }
-  }, ...(!codeBlocks ? [] : [{
-    /**
-     * Inherited.
-     */
-    ...mdxPlugin.flatCodeBlocks,
-    /**
-     * Default.
-     */
-    name: configNamesMapSource.codeBlocks,
-    ignores: [
-    /**
-     * Handled by `@eslint/markdown`.
-     */
-    _eslintConfig.GLOB_MARKDOWN_CODE],
-    /**
-     * Overridable.
-     */
-    ...codeBlocksOptions,
-    rules: {
-      /**
-       * Inherited.
-       */
-      ...(0, _renameRules.renameRules)({
-        ...mdxPlugin.flatCodeBlocks.rules
-      }),
+    ignores: [...(mdxPlugin.flat.ignores ?? []), _eslintConfig.GLOB_MARKDOWN]
+  });
+  const configs = [setupConfig, processorConfig, rulesConfig];
+  if (codeBlocks) {
+    const codeBlocksConfig = (0, _defu.default)(codeBlocksOptions, {
+      ...mdxPlugin.flatCodeBlocks,
+      name: configNamesMapSource.codeBlocks,
+      rules: (0, _renameRules.renameRules)(mdxPlugin.flatCodeBlocks.rules ?? {}),
       /**
-       * Overridable.
+       * Handled by `@eslint/markdown`.
        */
-      ...codeBlocksOptions.rules
-    }
-  }])];
+      ignores: [...(mdxPlugin.flatCodeBlocks.ignores ?? []), _eslintConfig.GLOB_MARKDOWN_CODE]
+    });
+    configs.push(codeBlocksConfig);
+  }
   return configs;
 };
 const mdx = exports.mdx = Object.assign(mdxInternal, {

package/dist/configs/prettier.d.ts

@@ -9,7 +9,8 @@ declare module "../types" {
 }
 declare namespace prettier {
     type ConfigNamesMapSource = typeof configNamesMapSource;
-    interface Options extends ConfigOverrides {
+    interface Options {
+        prettier?: ConfigOverrides;
     }
 }
 declare const prettier: ((options?: prettier.Options) => Promise<TypedFlatConfigItem>) & {

package/dist/configs/prettier.js

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

package/dist/configs/storybook.d.ts

@@ -2,8 +2,8 @@ import type { TypedFlatConfigItem } from "@antfu/eslint-config";
 import type { ConfigOverrides, ResolveConfigNamesMap } from "../types";
 declare const configNamesMapSource: {
     readonly setup: "vdustr/stroybook/setup";
-    readonly storiesRules: "vdustr/storybook/stories-rules";
-    readonly mainRules: "vdustr/storybook/main-rules";
+    readonly storiesRules: "vdustr/storybook/stories/rules";
+    readonly mainRules: "vdustr/storybook/main/rules";
 };
 declare module "../types" {
     interface ConfigNamesMap extends ResolveConfigNamesMap<storybook.ConfigNamesMapSource> {
@@ -12,15 +12,15 @@ declare module "../types" {
 declare namespace storybook {
     type ConfigNamesMapSource = typeof configNamesMapSource;
     interface Options {
-        storiesConfig?: ConfigOverrides;
-        mainConfig?: ConfigOverrides;
+        stories?: ConfigOverrides;
+        main?: ConfigOverrides;
     }
 }
 declare const storybook: ((options?: storybook.Options) => Promise<Array<TypedFlatConfigItem>>) & {
     configNamesMapSource: {
         readonly setup: "vdustr/stroybook/setup";
-        readonly storiesRules: "vdustr/storybook/stories-rules";
-        readonly mainRules: "vdustr/storybook/main-rules";
+        readonly storiesRules: "vdustr/storybook/stories/rules";
+        readonly mainRules: "vdustr/storybook/main/rules";
     };
 };
 export { storybook };

package/dist/configs/storybook.js

@@ -5,11 +5,14 @@ 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 _renameRules = require("../utils/renameRules");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const configNamesMapSource = {
   setup: "vdustr/stroybook/setup",
-  storiesRules: "vdustr/storybook/stories-rules",
-  mainRules: "vdustr/storybook/main-rules"
+  storiesRules: "vdustr/storybook/stories/rules",
+  mainRules: "vdustr/storybook/main/rules"
 };
 const storybookInternal = async options => {
   await (0, _eslintConfig.ensurePackages)(["eslint-plugin-storybook"]);
@@ -27,50 +30,25 @@ const storybookInternal = async options => {
     ...(0, _esToolkit.pick)(originalSetupConfig, ["plugins"]),
     name: configNamesMapSource.setup
   };
-  const storyRulesConfig = {
-    /**
-     * Inherited.
-     */
-    ...originalStoryRulesConfig,
-    ...originalCsfStrictConfig,
-    /**
-     * Default.
-     */
+  const storyRulesConfig = (0, _defu.default)(options?.stories, {
     name: configNamesMapSource.storiesRules,
-    /**
-     * Overridable.
-     */
-    ...options?.storiesConfig,
     rules: {
-      /**
-       * Inherited.
-       */
-      ...originalStoryRulesConfig.rules,
-      ...originalCsfStrictConfig.rules,
-      /**
-       * Default.
-       */
-      "import/no-default-export": "off",
-      /**
-       * Overridable.
-       */
-      ...options?.storiesConfig?.rules
+      "import/no-default-export": "off"
     }
-  };
-  const mainRulesConfig = {
-    /**
-     * Inherited.
-     */
+  }, {
+    ...originalStoryRulesConfig,
+    ...originalCsfStrictConfig,
+    rules: (0, _renameRules.renameRules)({
+      ...originalStoryRulesConfig.rules,
+      ...originalCsfStrictConfig.rules
+    })
+  });
+  const mainRulesConfig = (0, _defu.default)(options?.main, {
+    name: configNamesMapSource.mainRules
+  }, {
     ...originalMainRulesConfig,
-    /**
-     * Default.
-     */
-    name: configNamesMapSource.mainRules,
-    /**
-     * Overridable.
-     */
-    ...options?.mainConfig
-  };
+    rules: (0, _renameRules.renameRules)(originalMainRulesConfig.rules ?? {})
+  });
   return [setupConfig, storyRulesConfig, mainRulesConfig];
 };
 const storybook = exports.storybook = Object.assign(storybookInternal, {

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

@@ -12,8 +12,9 @@ declare module "../types" {
 }
 declare namespace mdx {
     type ConfigNamesMapSource = typeof configNamesMapSource;
-    interface Options extends ConfigOverrides {
-        processorOptions?: import("eslint-plugin-mdx").ProcessorOptions;
+    interface Options {
+        mdx?: ConfigOverrides;
+        processorOptions?: Omit<import("eslint-plugin-mdx").ProcessorOptions, "lintCodeBlocks">;
         codeBlocks?: boolean | ConfigOverrides;
     }
 }

package/dist/esm/configs/mdx.mjs

@@ -4,6 +4,7 @@ import {
   GLOB_MARKDOWN_CODE,
   interopDefault
 } from "@antfu/eslint-config";
+import defu from "defu";
 import { omit, pick } from "es-toolkit";
 import { renameRules } from "../utils/renameRules.mjs";
 const configNamesMapSource = {
@@ -20,88 +21,45 @@ const mdxInternal = async ({
   await ensurePackages(["eslint-plugin-mdx"]);
   const mdxPlugin = await interopDefault(await import("eslint-plugin-mdx"));
   const codeBlocksOptions = typeof codeBlocks !== "object" ? {} : codeBlocks;
-  const configs = [
+  const setupConfig = {
+    ...pick(mdxPlugin.flat, ["plugins"]),
+    name: configNamesMapSource.setup
+  };
+  const processorConfig = {
+    processor: mdxPlugin.createRemarkProcessor({
+      ...processorOptions,
+      lintCodeBlocks: Boolean(codeBlocks)
+    }),
+    name: configNamesMapSource.processor
+  };
+  const rulesConfig = defu(
+    options.mdx,
     {
-      ...pick(mdxPlugin.flat, ["plugins"]),
-      name: configNamesMapSource.setup
-    },
-    {
-      processor: mdxPlugin.createRemarkProcessor({
-        lintCodeBlocks: Boolean(codeBlocks),
-        ...processorOptions,
-        languageMapper: {
-          ...processorOptions?.languageMapper
-        }
-      }),
-      name: configNamesMapSource.processor
-    },
-    {
-      /**
-       * Inherited.
-       */
       ...omit(mdxPlugin.flat, ["plugins", "processor"]),
+      name: configNamesMapSource.rules,
+      rules: renameRules(mdxPlugin.flat.rules ?? {}),
       /**
-       * Default.
+       * Handled by `@eslint/markdown`.
        */
-      name: configNamesMapSource.rules,
-      ignores: [
-        /**
-         * Handled by `@eslint/markdown`.
-         */
-        GLOB_MARKDOWN
-      ],
+      ignores: [...mdxPlugin.flat.ignores ?? [], GLOB_MARKDOWN]
+    }
+  );
+  const configs = [setupConfig, processorConfig, rulesConfig];
+  if (codeBlocks) {
+    const codeBlocksConfig = defu(codeBlocksOptions, {
+      ...mdxPlugin.flatCodeBlocks,
+      name: configNamesMapSource.codeBlocks,
+      rules: renameRules(mdxPlugin.flatCodeBlocks.rules ?? {}),
       /**
-       * Overridable.
+       * Handled by `@eslint/markdown`.
        */
-      ...options,
-      rules: {
-        /**
-         * Inherited.
-         */
-        ...renameRules({
-          ...mdxPlugin.flat.rules
-        }),
-        /**
-         * Overridable.
-         */
-        ...options.rules
-      }
-    },
-    ...!codeBlocks ? [] : [
-      {
-        /**
-         * Inherited.
-         */
-        ...mdxPlugin.flatCodeBlocks,
-        /**
-         * Default.
-         */
-        name: configNamesMapSource.codeBlocks,
-        ignores: [
-          /**
-           * Handled by `@eslint/markdown`.
-           */
-          GLOB_MARKDOWN_CODE
-        ],
-        /**
-         * Overridable.
-         */
-        ...codeBlocksOptions,
-        rules: {
-          /**
-           * Inherited.
-           */
-          ...renameRules({
-            ...mdxPlugin.flatCodeBlocks.rules
-          }),
-          /**
-           * Overridable.
-           */
-          ...codeBlocksOptions.rules
-        }
-      }
-    ]
-  ];
+      ignores: [
+        ...mdxPlugin.flatCodeBlocks.ignores ?? [],
+        GLOB_MARKDOWN_CODE
+      ]
+    });
+    configs.push(codeBlocksConfig);
+  }
   return configs;
 };
 const mdx = Object.assign(mdxInternal, {

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

@@ -9,7 +9,8 @@ declare module "../types" {
 }
 declare namespace prettier {
     type ConfigNamesMapSource = typeof configNamesMapSource;
-    interface Options extends ConfigOverrides {
+    interface Options {
+        prettier?: ConfigOverrides;
     }
 }
 declare const prettier: ((options?: prettier.Options) => Promise<TypedFlatConfigItem>) & {

package/dist/esm/configs/prettier.mjs

@@ -1,34 +1,23 @@
-import { ensurePackages } from "@antfu/eslint-config";
-import eslintConfigPrettier from "eslint-config-prettier";
+import { ensurePackages, interopDefault } from "@antfu/eslint-config";
+import defu from "defu";
 import { renameRules } from "../utils/renameRules.mjs";
 const configNamesMapSource = {
   rules: "vdustr/prettier/rules"
 };
 const prettierInternal = async (options) => {
   await ensurePackages(["eslint-config-prettier"]);
-  return {
-    /**
-     * Inherited.
-     */
-    ...eslintConfigPrettier,
-    /**
-     * Default.
-     */
-    name: configNamesMapSource.rules,
-    /**
-     * Overridable.
-     */
-    rules: {
-      /**
-       * Inherited.
-       */
-      ...renameRules(eslintConfigPrettier.rules),
-      /**
-       * Overridable.
-       */
-      ...options?.rules
+  const eslintConfigPrettier = await interopDefault(
+    import("eslint-config-prettier")
+  );
+  const rulesConfig = defu(
+    options?.prettier,
+    {
+      ...eslintConfigPrettier,
+      rules: renameRules(eslintConfigPrettier.rules),
+      name: configNamesMapSource.rules
     }
-  };
+  );
+  return rulesConfig;
 };
 const prettier = Object.assign(prettierInternal, {
   configNamesMapSource

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

@@ -2,8 +2,8 @@ import type { TypedFlatConfigItem } from "@antfu/eslint-config";
 import type { ConfigOverrides, ResolveConfigNamesMap } from "../types";
 declare const configNamesMapSource: {
     readonly setup: "vdustr/stroybook/setup";
-    readonly storiesRules: "vdustr/storybook/stories-rules";
-    readonly mainRules: "vdustr/storybook/main-rules";
+    readonly storiesRules: "vdustr/storybook/stories/rules";
+    readonly mainRules: "vdustr/storybook/main/rules";
 };
 declare module "../types" {
     interface ConfigNamesMap extends ResolveConfigNamesMap<storybook.ConfigNamesMapSource> {
@@ -12,15 +12,15 @@ declare module "../types" {
 declare namespace storybook {
     type ConfigNamesMapSource = typeof configNamesMapSource;
     interface Options {
-        storiesConfig?: ConfigOverrides;
-        mainConfig?: ConfigOverrides;
+        stories?: ConfigOverrides;
+        main?: ConfigOverrides;
     }
 }
 declare const storybook: ((options?: storybook.Options) => Promise<Array<TypedFlatConfigItem>>) & {
     configNamesMapSource: {
         readonly setup: "vdustr/stroybook/setup";
-        readonly storiesRules: "vdustr/storybook/stories-rules";
-        readonly mainRules: "vdustr/storybook/main-rules";
+        readonly storiesRules: "vdustr/storybook/stories/rules";
+        readonly mainRules: "vdustr/storybook/main/rules";
     };
 };
 export { storybook };

package/dist/esm/configs/storybook.mjs

@@ -1,9 +1,11 @@
 import { ensurePackages, interopDefault } from "@antfu/eslint-config";
+import defu from "defu";
 import { pick } from "es-toolkit";
+import { renameRules } from "../utils/renameRules.mjs";
 const configNamesMapSource = {
   setup: "vdustr/stroybook/setup",
-  storiesRules: "vdustr/storybook/stories-rules",
-  mainRules: "vdustr/storybook/main-rules"
+  storiesRules: "vdustr/storybook/stories/rules",
+  mainRules: "vdustr/storybook/main/rules"
 };
 const storybookInternal = async (options) => {
   await ensurePackages(["eslint-plugin-storybook"]);
@@ -23,50 +25,33 @@ const storybookInternal = async (options) => {
     ...pick(originalSetupConfig, ["plugins"]),
     name: configNamesMapSource.setup
   };
-  const storyRulesConfig = {
-    /**
-     * Inherited.
-     */
-    ...originalStoryRulesConfig,
-    ...originalCsfStrictConfig,
-    /**
-     * Default.
-     */
-    name: configNamesMapSource.storiesRules,
-    /**
-     * Overridable.
-     */
-    ...options?.storiesConfig,
-    rules: {
-      /**
-       * Inherited.
-       */
-      ...originalStoryRulesConfig.rules,
-      ...originalCsfStrictConfig.rules,
-      /**
-       * Default.
-       */
-      "import/no-default-export": "off",
-      /**
-       * Overridable.
-       */
-      ...options?.storiesConfig?.rules
+  const storyRulesConfig = defu(
+    options?.stories,
+    {
+      name: configNamesMapSource.storiesRules,
+      rules: {
+        "import/no-default-export": "off"
+      }
+    },
+    {
+      ...originalStoryRulesConfig,
+      ...originalCsfStrictConfig,
+      rules: renameRules({
+        ...originalStoryRulesConfig.rules,
+        ...originalCsfStrictConfig.rules
+      })
     }
-  };
-  const mainRulesConfig = {
-    /**
-     * Inherited.
-     */
-    ...originalMainRulesConfig,
-    /**
-     * Default.
-     */
-    name: configNamesMapSource.mainRules,
-    /**
-     * Overridable.
-     */
-    ...options?.mainConfig
-  };
+  );
+  const mainRulesConfig = defu(
+    options?.main,
+    {
+      name: configNamesMapSource.mainRules
+    },
+    {
+      ...originalMainRulesConfig,
+      rules: renameRules(originalMainRulesConfig.rules ?? {})
+    }
+  );
   return [
     setupConfig,
     storyRulesConfig,

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

@@ -1,2 +1,2 @@
-declare const ignoreKeys: ("plugins" | "rules")[];
+declare const ignoreKeys: ("plugins" | "name" | "processor" | "rules")[];
 export { ignoreKeys };

package/dist/esm/extends/_utils.mjs

@@ -1,2 +1,2 @@
-const ignoreKeys = ["plugins", "rules"];
+const ignoreKeys = ["name", "plugins", "processor", "rules"];
 export { ignoreKeys };

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

@@ -3,7 +3,7 @@ import type { FlatConfigComposer } from "eslint-flat-config-utils";
 import type { ConfigOverrides, ResolveConfigNamesMap } from "../types";
 declare const configNamesMapSource: {
     readonly imports: "vdustr/imports/rules";
-    readonly noDefaultExport: "vdustr/no-default-export/rules";
+    readonly noDefaultExport: "vdustr/imports/no-default-export/rules";
 };
 declare module "../types" {
     interface ConfigNamesMap extends ResolveConfigNamesMap<imports.ConfigNamesMapSource> {
@@ -13,13 +13,13 @@ declare namespace imports {
     type ConfigNamesMapSource = typeof configNamesMapSource;
     interface Options {
         imports?: ConfigOverrides;
-        noDefaultExport: ConfigOverrides;
+        noDefaultExport?: ConfigOverrides;
     }
 }
 declare const imports: ((composer: FlatConfigComposer<TypedFlatConfigItem, ConfigNames>, options?: imports.Options) => void) & {
     configNamesMapSource: {
         readonly imports: "vdustr/imports/rules";
-        readonly noDefaultExport: "vdustr/no-default-export/rules";
+        readonly noDefaultExport: "vdustr/imports/no-default-export/rules";
     };
 };
 export { imports };