@vp-tw/eslint-config 0.0.24 → 0.0.25

package/dist/eslint-typegen.d.ts

@@ -99,5 +99,5 @@ type StorybookNoUninstalledAddons = []|[{
   [k: string]: unknown | undefined
 }]
   // Names of all the configs
-  export type ConfigNames = 'vdustr/mdx/setup' | 'vdustr/mdx/processor' | 'vdustr/mdx/rules' | 'vdustr/mdx/code-blocks' | 'vdustr/prettier/rules' | 'vdustr/react/react-compiler/setup' | 'vdustr/react/react-compiler/rules' | 'vdustr/stroybook/setup' | 'vdustr/storybook/stories/rules' | 'vdustr/storybook/main/rules' | 'vdustr/javascript/rules' | 'vdustr/imports/rules' | 'vdustr/imports/no-default-export/rules' | 'vdustr/typescript/rules' | 'vdustr/jsonc/rules' | 'vdustr/sort/json-keys' | 'vdustr/sort/json-array-values' | 'vdustr/sort/tsconfig-json' | 'vdustr/yaml/rules' | 'vdustr/yaml/sort-keys/rules'
+  export type ConfigNames = 'vdustr/mdx/setup' | 'vdustr/mdx/processor' | 'vdustr/mdx/rules' | 'vdustr/mdx/code-blocks' | 'vdustr/prettier/rules' | 'vdustr/react/react-compiler/setup' | 'vdustr/react/react-compiler/rules' | 'vdustr/stroybook/setup' | 'vdustr/storybook/stories/rules' | 'vdustr/storybook/main/rules' | 'vdustr/javascript/rules' | 'vdustr/imports/rules' | 'vdustr/imports/no-default-export/rules' | 'vdustr/typescript/rules' | 'vdustr/react/rules' | 'vdustr/react/react-compiler/setup' | 'vdustr/react/react-compiler/rules' | 'vdustr/jsonc/rules' | 'vdustr/sort/json-keys' | 'vdustr/sort/json-array-values' | 'vdustr/sort/tsconfig-json' | 'vdustr/yaml/rules' | 'vdustr/yaml/sort-keys/rules'
   

package/dist/esm/eslint-typegen.d.ts

@@ -99,5 +99,5 @@ type StorybookNoUninstalledAddons = []|[{
   [k: string]: unknown | undefined
 }]
   // Names of all the configs
-  export type ConfigNames = 'vdustr/mdx/setup' | 'vdustr/mdx/processor' | 'vdustr/mdx/rules' | 'vdustr/mdx/code-blocks' | 'vdustr/prettier/rules' | 'vdustr/react/react-compiler/setup' | 'vdustr/react/react-compiler/rules' | 'vdustr/stroybook/setup' | 'vdustr/storybook/stories/rules' | 'vdustr/storybook/main/rules' | 'vdustr/javascript/rules' | 'vdustr/imports/rules' | 'vdustr/imports/no-default-export/rules' | 'vdustr/typescript/rules' | 'vdustr/jsonc/rules' | 'vdustr/sort/json-keys' | 'vdustr/sort/json-array-values' | 'vdustr/sort/tsconfig-json' | 'vdustr/yaml/rules' | 'vdustr/yaml/sort-keys/rules'
+  export type ConfigNames = 'vdustr/mdx/setup' | 'vdustr/mdx/processor' | 'vdustr/mdx/rules' | 'vdustr/mdx/code-blocks' | 'vdustr/prettier/rules' | 'vdustr/react/react-compiler/setup' | 'vdustr/react/react-compiler/rules' | 'vdustr/stroybook/setup' | 'vdustr/storybook/stories/rules' | 'vdustr/storybook/main/rules' | 'vdustr/javascript/rules' | 'vdustr/imports/rules' | 'vdustr/imports/no-default-export/rules' | 'vdustr/typescript/rules' | 'vdustr/react/rules' | 'vdustr/react/react-compiler/setup' | 'vdustr/react/react-compiler/rules' | 'vdustr/jsonc/rules' | 'vdustr/sort/json-keys' | 'vdustr/sort/json-array-values' | 'vdustr/sort/tsconfig-json' | 'vdustr/yaml/rules' | 'vdustr/yaml/sort-keys/rules'
   

package/dist/esm/extends/jsonc.mjs

@@ -7,9 +7,9 @@ const jsonc = async (composer, options) => {
   extendsConfig(composer, "antfu/jsonc/rules", (config) => {
     const modifiedConfig = mergeConfig(
       pick(options?.jsonc ?? {}, ["files", "ignores"]),
-      config,
       {
-        files: [GLOB_CODE_WORKSPACE]
+        ...config,
+        files: [...config.files ?? [], GLOB_CODE_WORKSPACE]
       }
     );
     const omittedConfig = omit(modifiedConfig, ignoreKeys);

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

@@ -1,29 +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;
+        tsconfigJson?: ConfigOverrides;
     }
 }
+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?: 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 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/esm/extends/sort.mjs

@@ -29,7 +29,7 @@ const sortJsonKeys = async (composer, options) => {
   extendsConfig(composer, "vdustr/jsonc/rules", async (config) => {
     const omittedConfig = omit(config, ignoreKeys);
     const rulesConfig = mergeConfig(
-      options?.sortKeys,
+      options,
       {
         name: "vdustr/sort/json-keys",
         rules: {
@@ -44,12 +44,12 @@ const sortJsonKeys = async (composer, options) => {
 const sortPackageJson = async (composer, options) => {
   extendsConfig(composer, "antfu/sort/package-json", (config) => {
     const modifiedConfig = mergeConfig(
-      pick(options?.packageJson ?? {}, ["files", "ignores"]),
+      pick(options ?? {}, ["files", "ignores"]),
       config
     );
     const omittedConfig = omit(modifiedConfig, ignoreKeys);
     const rulesConfig = mergeConfig(
-      options?.packageJson ?? {},
+      options,
       {
         name: "vdustr/sort/package-json",
         rules: {
@@ -65,12 +65,12 @@ const sortPackageJson = async (composer, options) => {
 const sortTsconfigJson = async (composer, options) => {
   extendsConfig(composer, "antfu/sort/tsconfig-json", (config) => {
     const modifiedConfig = mergeConfig(
-      pick(options?.tsconfigJson ?? {}, ["files", "ignores"]),
+      pick(options ?? {}, ["files", "ignores"]),
       config
     );
     const omittedConfig = omit(modifiedConfig, ignoreKeys);
     const rulesConfig = mergeConfig(
-      options?.tsconfigJson,
+      options,
       {
         name: "vdustr/sort/tsconfig-json",
         rules: {
@@ -84,16 +84,13 @@ const sortTsconfigJson = async (composer, options) => {
 };
 const sortJsonArrayValues = async (composer, options) => {
   extendsConfig(composer, "vdustr/sort/json-keys", async (config) => {
-    const sortArrayValuesConfig = mergeConfig(
-      options?.sortJsonArrayValues,
-      {
-        name: "vdustr/sort/json-array-values",
-        files: [GLOB_CSPELL_JSON],
-        rules: {
-          "jsonc/sort-array-values": defaultSortJsonArrayValues
-        }
+    const sortArrayValuesConfig = mergeConfig(options, {
+      name: "vdustr/sort/json-array-values",
+      files: [GLOB_CSPELL_JSON],
+      rules: {
+        "jsonc/sort-array-values": defaultSortJsonArrayValues
       }
-    );
+    });
     return [config, sortArrayValuesConfig];
   });
 };

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,7 +9,6 @@ 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]>> & {
@@ -17,10 +17,7 @@ type Options = ReplaceAntfuEslintRulesWithVpRulesDeeply<NonNullable<Parameters<t
         imports?: imports.Options;
         typescript?: typescript.Options;
         jsonc?: jsonc.Options;
-        sortPackageJson?: sortPackageJson.Options;
-        sortTsConfigJson?: sortTsconfigJson.Options;
-        sortJsonKeys?: sortJsonKeys.Options;
-        sortJsonArrayValues?: sortJsonArrayValues.Options;
+        sort?: sort.Options;
         yaml?: yaml.Options;
         react?: react.Options;
     };

package/dist/esm/vdustr.mjs

@@ -45,10 +45,10 @@ const vdustr = (options, ...userConfigs) => {
   typescript(config, vpOptions?.extends?.typescript);
   jsonc(config, vpOptions?.extends?.jsonc);
   if (packageJsonEnabled)
-    sortPackageJson(config, vpOptions?.extends?.sortPackageJson);
-  sortTsconfigJson(config, vpOptions?.extends?.sortTsConfigJson);
-  sortJsonKeys(config, vpOptions?.extends?.sortJsonKeys);
-  sortJsonArrayValues(config, vpOptions?.extends?.sortJsonArrayValues);
+    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) {

package/dist/extends/jsonc.js

@@ -11,8 +11,9 @@ var _mergeConfig = require("../utils/mergeConfig");
 var _utils = require("./_utils");
 const jsonc = async (composer, options) => {
   (0, _extendsConfig.extendsConfig)(composer, "antfu/jsonc/rules", config => {
-    const modifiedConfig = (0, _mergeConfig.mergeConfig)((0, _esToolkit.pick)(options?.jsonc ?? {}, ["files", "ignores"]), config, {
-      files: [_globs.GLOB_CODE_WORKSPACE]
+    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, _mergeConfig.mergeConfig)((0, _esToolkit.omit)(options?.jsonc ?? {}, ["files", "ignores"]), {

package/dist/extends/sort.d.ts

@@ -1,29 +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;
+        tsconfigJson?: ConfigOverrides;
     }
 }
+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?: 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 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

@@ -28,7 +28,7 @@ const defaultSortJsonArrayValues = ["error", {
 const sortJsonKeys = async (composer, options) => {
   (0, _extendsConfig.extendsConfig)(composer, "vdustr/jsonc/rules", async config => {
     const omittedConfig = (0, _esToolkit.omit)(config, _utils.ignoreKeys);
-    const rulesConfig = (0, _mergeConfig.mergeConfig)(options?.sortKeys, {
+    const rulesConfig = (0, _mergeConfig.mergeConfig)(options, {
       name: "vdustr/sort/json-keys",
       rules: {
         "jsonc/sort-keys": defaultSortJsonKeys
@@ -40,9 +40,9 @@ const sortJsonKeys = async (composer, options) => {
 exports.sortJsonKeys = sortJsonKeys;
 const sortPackageJson = async (composer, options) => {
   (0, _extendsConfig.extendsConfig)(composer, "antfu/sort/package-json", config => {
-    const modifiedConfig = (0, _mergeConfig.mergeConfig)((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, _mergeConfig.mergeConfig)(options?.packageJson ?? {}, {
+    const rulesConfig = (0, _mergeConfig.mergeConfig)(options, {
       name: "vdustr/sort/package-json",
       rules: {
         "jsonc/sort-array-values": "off",
@@ -55,9 +55,9 @@ const sortPackageJson = async (composer, options) => {
 exports.sortPackageJson = sortPackageJson;
 const sortTsconfigJson = async (composer, options) => {
   (0, _extendsConfig.extendsConfig)(composer, "antfu/sort/tsconfig-json", config => {
-    const modifiedConfig = (0, _mergeConfig.mergeConfig)((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, _mergeConfig.mergeConfig)(options?.tsconfigJson, {
+    const rulesConfig = (0, _mergeConfig.mergeConfig)(options, {
       name: "vdustr/sort/tsconfig-json",
       rules: {
         "jsonc/sort-keys": defaultSortJsonKeys
@@ -69,7 +69,7 @@ const sortTsconfigJson = async (composer, options) => {
 exports.sortTsconfigJson = sortTsconfigJson;
 const sortJsonArrayValues = async (composer, options) => {
   (0, _extendsConfig.extendsConfig)(composer, "vdustr/sort/json-keys", async config => {
-    const sortArrayValuesConfig = (0, _mergeConfig.mergeConfig)(options?.sortJsonArrayValues, {
+    const sortArrayValuesConfig = (0, _mergeConfig.mergeConfig)(options, {
       name: "vdustr/sort/json-array-values",
       files: [_globs.GLOB_CSPELL_JSON],
       rules: {

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,7 +9,6 @@ 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]>> & {
@@ -17,10 +17,7 @@ type Options = ReplaceAntfuEslintRulesWithVpRulesDeeply<NonNullable<Parameters<t
         imports?: imports.Options;
         typescript?: typescript.Options;
         jsonc?: jsonc.Options;
-        sortPackageJson?: sortPackageJson.Options;
-        sortTsConfigJson?: sortTsconfigJson.Options;
-        sortJsonKeys?: sortJsonKeys.Options;
-        sortJsonArrayValues?: sortJsonArrayValues.Options;
+        sort?: sort.Options;
         yaml?: yaml.Options;
         react?: react.Options;
     };

package/dist/vdustr.js

@@ -37,10 +37,10 @@ const vdustr = (options, ...userConfigs) => {
   (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);
+  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) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vp-tw/eslint-config",
-  "version": "0.0.24",
+  "version": "0.0.25",
   "description": "ViPro's ESLint configuration",
   "homepage": "https://github.com/vdustr/eslint-config",
   "author": {