@vp-tw/eslint-config 0.0.22 → 0.0.24
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/configs/mdx.js +3 -4
- package/dist/configs/packageJson.d.ts +9 -0
- package/dist/configs/packageJson.js +25 -0
- package/dist/configs/prettier.js +2 -3
- package/dist/configs/reactCompiler.d.ts +2 -2
- package/dist/configs/reactCompiler.js +3 -4
- package/dist/configs/storybook.js +3 -4
- package/dist/eslint-typegen.d.ts +1 -1
- package/dist/esm/configs/mdx.mjs +3 -3
- package/dist/esm/configs/packageJson.d.ts +9 -0
- package/dist/esm/configs/packageJson.mjs +21 -0
- package/dist/esm/configs/prettier.mjs +6 -9
- package/dist/esm/configs/reactCompiler.d.ts +2 -2
- package/dist/esm/configs/reactCompiler.mjs +3 -3
- package/dist/esm/configs/storybook.mjs +3 -3
- package/dist/esm/eslint-typegen.d.ts +1 -1
- package/dist/esm/extends/imports.mjs +10 -13
- package/dist/esm/extends/javascript.mjs +6 -3
- package/dist/esm/extends/jsonc.d.ts +0 -2
- package/dist/esm/extends/jsonc.mjs +23 -76
- package/dist/esm/extends/react.mjs +7 -4
- package/dist/esm/extends/sort.d.ts +29 -0
- package/dist/esm/extends/sort.mjs +100 -0
- package/dist/esm/extends/typescript.mjs +6 -3
- package/dist/esm/extends/yaml.mjs +7 -4
- package/dist/esm/globs.d.ts +2 -1
- package/dist/esm/globs.mjs +3 -1
- package/dist/esm/types.d.ts +9 -3
- package/dist/esm/utils/extendsConfig.d.ts +14 -1
- package/dist/esm/utils/extendsConfig.mjs +21 -24
- package/dist/esm/utils/mergeConfig.d.ts +3 -0
- package/dist/esm/utils/mergeConfig.mjs +56 -0
- package/dist/esm/vdustr.d.ts +15 -6
- package/dist/esm/vdustr.mjs +49 -15
- package/dist/extends/imports.js +6 -7
- package/dist/extends/javascript.js +3 -4
- package/dist/extends/jsonc.d.ts +0 -2
- package/dist/extends/jsonc.js +7 -42
- package/dist/extends/react.js +4 -5
- package/dist/extends/sort.d.ts +29 -0
- package/dist/extends/sort.js +82 -0
- package/dist/extends/typescript.js +3 -4
- package/dist/extends/yaml.js +4 -4
- package/dist/globs.d.ts +2 -1
- package/dist/globs.js +3 -2
- package/dist/types.d.ts +9 -3
- package/dist/utils/extendsConfig.d.ts +14 -1
- package/dist/utils/extendsConfig.js +14 -18
- package/dist/utils/mergeConfig.d.ts +3 -0
- package/dist/utils/mergeConfig.js +47 -0
- package/dist/vdustr.d.ts +15 -6
- package/dist/vdustr.js +32 -15
- package/package.json +1 -2
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
import type { ConfigOverrides, VpComposer } from "../types";
|
|
2
|
+
declare namespace sortJsonKeys {
|
|
3
|
+
interface Options {
|
|
4
|
+
sortKeys?: ConfigOverrides;
|
|
5
|
+
}
|
|
6
|
+
}
|
|
7
|
+
declare const sortJsonKeys: (composer: VpComposer, options?: sortJsonKeys.Options) => Promise<void>;
|
|
8
|
+
declare namespace sortPackageJson {
|
|
9
|
+
interface Options {
|
|
10
|
+
packageJson?: ConfigOverrides;
|
|
11
|
+
}
|
|
12
|
+
}
|
|
13
|
+
/**
|
|
14
|
+
* Disable rules conflicting with `eslint-config-package-json`.
|
|
15
|
+
*/
|
|
16
|
+
declare const sortPackageJson: (composer: VpComposer, options?: sortPackageJson.Options) => Promise<void>;
|
|
17
|
+
declare namespace sortTsconfigJson {
|
|
18
|
+
interface Options {
|
|
19
|
+
tsconfigJson?: ConfigOverrides;
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
declare const sortTsconfigJson: (composer: VpComposer, options?: sortTsconfigJson.Options) => Promise<void>;
|
|
23
|
+
declare namespace sortJsonArrayValues {
|
|
24
|
+
interface Options {
|
|
25
|
+
sortJsonArrayValues?: ConfigOverrides;
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
declare const sortJsonArrayValues: (composer: VpComposer, options?: sortJsonArrayValues.Options) => Promise<void>;
|
|
29
|
+
export { sortJsonArrayValues, sortJsonKeys, sortPackageJson, sortTsconfigJson };
|
|
@@ -0,0 +1,82 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
Object.defineProperty(exports, "__esModule", {
|
|
4
|
+
value: true
|
|
5
|
+
});
|
|
6
|
+
exports.sortTsconfigJson = exports.sortPackageJson = exports.sortJsonKeys = exports.sortJsonArrayValues = void 0;
|
|
7
|
+
var _esToolkit = require("es-toolkit");
|
|
8
|
+
var _globs = require("../globs");
|
|
9
|
+
var _extendsConfig = require("../utils/extendsConfig");
|
|
10
|
+
var _mergeConfig = require("../utils/mergeConfig");
|
|
11
|
+
var _utils = require("./_utils");
|
|
12
|
+
const defaultSortJsonKeys = ["error", {
|
|
13
|
+
pathPattern: ".*",
|
|
14
|
+
order: {
|
|
15
|
+
type: "asc",
|
|
16
|
+
caseSensitive: false,
|
|
17
|
+
natural: true
|
|
18
|
+
}
|
|
19
|
+
}];
|
|
20
|
+
const defaultSortJsonArrayValues = ["error", {
|
|
21
|
+
pathPattern: ".*",
|
|
22
|
+
order: {
|
|
23
|
+
type: "asc",
|
|
24
|
+
caseSensitive: false,
|
|
25
|
+
natural: true
|
|
26
|
+
}
|
|
27
|
+
}];
|
|
28
|
+
const sortJsonKeys = async (composer, options) => {
|
|
29
|
+
(0, _extendsConfig.extendsConfig)(composer, "vdustr/jsonc/rules", async config => {
|
|
30
|
+
const omittedConfig = (0, _esToolkit.omit)(config, _utils.ignoreKeys);
|
|
31
|
+
const rulesConfig = (0, _mergeConfig.mergeConfig)(options?.sortKeys, {
|
|
32
|
+
name: "vdustr/sort/json-keys",
|
|
33
|
+
rules: {
|
|
34
|
+
"jsonc/sort-keys": defaultSortJsonKeys
|
|
35
|
+
}
|
|
36
|
+
}, omittedConfig);
|
|
37
|
+
return [config, rulesConfig];
|
|
38
|
+
});
|
|
39
|
+
};
|
|
40
|
+
exports.sortJsonKeys = sortJsonKeys;
|
|
41
|
+
const sortPackageJson = async (composer, options) => {
|
|
42
|
+
(0, _extendsConfig.extendsConfig)(composer, "antfu/sort/package-json", config => {
|
|
43
|
+
const modifiedConfig = (0, _mergeConfig.mergeConfig)((0, _esToolkit.pick)(options?.packageJson ?? {}, ["files", "ignores"]), config);
|
|
44
|
+
const omittedConfig = (0, _esToolkit.omit)(modifiedConfig, _utils.ignoreKeys);
|
|
45
|
+
const rulesConfig = (0, _mergeConfig.mergeConfig)(options?.packageJson ?? {}, {
|
|
46
|
+
name: "vdustr/sort/package-json",
|
|
47
|
+
rules: {
|
|
48
|
+
"jsonc/sort-array-values": "off",
|
|
49
|
+
"jsonc/sort-keys": "off"
|
|
50
|
+
}
|
|
51
|
+
}, omittedConfig);
|
|
52
|
+
return [modifiedConfig, rulesConfig];
|
|
53
|
+
});
|
|
54
|
+
};
|
|
55
|
+
exports.sortPackageJson = sortPackageJson;
|
|
56
|
+
const sortTsconfigJson = async (composer, options) => {
|
|
57
|
+
(0, _extendsConfig.extendsConfig)(composer, "antfu/sort/tsconfig-json", config => {
|
|
58
|
+
const modifiedConfig = (0, _mergeConfig.mergeConfig)((0, _esToolkit.pick)(options?.tsconfigJson ?? {}, ["files", "ignores"]), config);
|
|
59
|
+
const omittedConfig = (0, _esToolkit.omit)(modifiedConfig, _utils.ignoreKeys);
|
|
60
|
+
const rulesConfig = (0, _mergeConfig.mergeConfig)(options?.tsconfigJson, {
|
|
61
|
+
name: "vdustr/sort/tsconfig-json",
|
|
62
|
+
rules: {
|
|
63
|
+
"jsonc/sort-keys": defaultSortJsonKeys
|
|
64
|
+
}
|
|
65
|
+
}, omittedConfig);
|
|
66
|
+
return [modifiedConfig, rulesConfig];
|
|
67
|
+
});
|
|
68
|
+
};
|
|
69
|
+
exports.sortTsconfigJson = sortTsconfigJson;
|
|
70
|
+
const sortJsonArrayValues = async (composer, options) => {
|
|
71
|
+
(0, _extendsConfig.extendsConfig)(composer, "vdustr/sort/json-keys", async config => {
|
|
72
|
+
const sortArrayValuesConfig = (0, _mergeConfig.mergeConfig)(options?.sortJsonArrayValues, {
|
|
73
|
+
name: "vdustr/sort/json-array-values",
|
|
74
|
+
files: [_globs.GLOB_CSPELL_JSON],
|
|
75
|
+
rules: {
|
|
76
|
+
"jsonc/sort-array-values": defaultSortJsonArrayValues
|
|
77
|
+
}
|
|
78
|
+
});
|
|
79
|
+
return [config, sortArrayValuesConfig];
|
|
80
|
+
});
|
|
81
|
+
};
|
|
82
|
+
exports.sortJsonArrayValues = sortJsonArrayValues;
|
|
@@ -4,16 +4,15 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.typescript = void 0;
|
|
7
|
-
var _defu = _interopRequireDefault(require("defu"));
|
|
8
7
|
var _esToolkit = require("es-toolkit");
|
|
9
8
|
var _extendsConfig = require("../utils/extendsConfig");
|
|
9
|
+
var _mergeConfig = require("../utils/mergeConfig");
|
|
10
10
|
var _utils = require("./_utils");
|
|
11
|
-
function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
|
|
12
11
|
const typescript = (composer, options) => {
|
|
13
12
|
(0, _extendsConfig.extendsConfig)(composer, "antfu/typescript/rules", config => {
|
|
14
|
-
const modifiedConfig = (0,
|
|
13
|
+
const modifiedConfig = (0, _mergeConfig.mergeConfig)((0, _esToolkit.pick)(options?.typescript ?? {}, ["files", "ignores"]), config);
|
|
15
14
|
const omittedConfig = (0, _esToolkit.omit)(modifiedConfig, _utils.ignoreKeys);
|
|
16
|
-
const rulesConfig = (0,
|
|
15
|
+
const rulesConfig = (0, _mergeConfig.mergeConfig)((0, _esToolkit.omit)(options?.typescript ?? {}, ["files", "ignores"]), {
|
|
17
16
|
name: "vdustr/typescript/rules",
|
|
18
17
|
rules: {
|
|
19
18
|
/**
|
package/dist/extends/yaml.js
CHANGED
|
@@ -4,25 +4,25 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.yaml = void 0;
|
|
7
|
-
var _defu = _interopRequireDefault(require("defu"));
|
|
8
7
|
var _esToolkit = require("es-toolkit");
|
|
9
8
|
var _eslintPluginYml = _interopRequireDefault(require("eslint-plugin-yml"));
|
|
10
9
|
var _globs = require("../globs");
|
|
11
10
|
var _extendsConfig = require("../utils/extendsConfig");
|
|
11
|
+
var _mergeConfig = require("../utils/mergeConfig");
|
|
12
12
|
var _renameRules = require("../utils/renameRules");
|
|
13
13
|
var _utils = require("./_utils");
|
|
14
14
|
function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
|
|
15
15
|
const yaml = (composer, options) => {
|
|
16
16
|
(0, _extendsConfig.extendsConfig)(composer, "antfu/yaml/rules", config => {
|
|
17
|
-
const modifiedConfig = (0,
|
|
17
|
+
const modifiedConfig = (0, _mergeConfig.mergeConfig)((0, _esToolkit.pick)(options?.yaml ?? {}, ["files", "ignores"]), config);
|
|
18
18
|
const omittedConfig = (0, _esToolkit.omit)(modifiedConfig, _utils.ignoreKeys);
|
|
19
|
-
const rulesConfig = (0,
|
|
19
|
+
const rulesConfig = (0, _mergeConfig.mergeConfig)((0, _esToolkit.omit)(options?.yaml ?? {}, ["files", "ignores"]), {
|
|
20
20
|
name: "vdustr/yaml/rules",
|
|
21
21
|
rules: (0, _renameRules.renameRules)({
|
|
22
22
|
...Object.fromEntries([..._eslintPluginYml.default.configs["flat/recommended"].flatMap(config2 => Object.entries(config2.rules ?? {})), ..._eslintPluginYml.default.configs["flat/prettier"].flatMap(config2 => Object.entries(config2.rules ?? {}))])
|
|
23
23
|
})
|
|
24
24
|
}, omittedConfig);
|
|
25
|
-
const sortKeysConfig = (0,
|
|
25
|
+
const sortKeysConfig = (0, _mergeConfig.mergeConfig)(options?.sortKeys, {
|
|
26
26
|
...(0, _esToolkit.omit)(omittedConfig, ["files", "ignores"]),
|
|
27
27
|
name: "vdustr/yaml/sort-keys/rules",
|
|
28
28
|
files: [_globs.GLOB_PNPM_WORKSPACE_YAML],
|
package/dist/globs.d.ts
CHANGED
|
@@ -3,4 +3,5 @@ declare const GLOB_PACKAGE_JSON: string;
|
|
|
3
3
|
declare const GLOB_PNPM_WORKSPACE_YAML: string;
|
|
4
4
|
declare const GLOB_CSPELL_JSON: string;
|
|
5
5
|
declare const GLOB_CONFIG_JS: string;
|
|
6
|
-
|
|
6
|
+
declare const GLOB_VITEST_WORKSPACE: string;
|
|
7
|
+
export { GLOB_CODE_WORKSPACE, GLOB_CONFIG_JS, GLOB_CSPELL_JSON, GLOB_PACKAGE_JSON, GLOB_PNPM_WORKSPACE_YAML, GLOB_VITEST_WORKSPACE, };
|
package/dist/globs.js
CHANGED
|
@@ -3,9 +3,10 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
-
exports.GLOB_PNPM_WORKSPACE_YAML = exports.GLOB_PACKAGE_JSON = exports.GLOB_CSPELL_JSON = exports.GLOB_CONFIG_JS = exports.GLOB_CODE_WORKSPACE = void 0;
|
|
6
|
+
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;
|
|
7
7
|
const GLOB_CODE_WORKSPACE = exports.GLOB_CODE_WORKSPACE = "**/*.code-workspace";
|
|
8
8
|
const GLOB_PACKAGE_JSON = exports.GLOB_PACKAGE_JSON = "**/package.json";
|
|
9
9
|
const GLOB_PNPM_WORKSPACE_YAML = exports.GLOB_PNPM_WORKSPACE_YAML = "**/pnpm-workspace.y?(a)ml";
|
|
10
10
|
const GLOB_CSPELL_JSON = exports.GLOB_CSPELL_JSON = "**/cspell.json";
|
|
11
|
-
const GLOB_CONFIG_JS = exports.GLOB_CONFIG_JS = "**/*.config.?([cm])[jt]s";
|
|
11
|
+
const GLOB_CONFIG_JS = exports.GLOB_CONFIG_JS = "**/*.config.?([cm])[jt]s";
|
|
12
|
+
const GLOB_VITEST_WORKSPACE = exports.GLOB_VITEST_WORKSPACE = "**/vitest.workspace.?([cm])[jt]s";
|
package/dist/types.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type antfu from "@antfu/eslint-config";
|
|
2
2
|
import type { ConfigNames as AntfuEslintConfigNames, Rules as AntfuEslintRules } from "@antfu/eslint-config";
|
|
3
|
-
import type { DistributiveOmit } from "@mui/types";
|
|
3
|
+
import type { DistributiveOmit, Overwrite } from "@mui/types";
|
|
4
4
|
import type { Linter } from "eslint";
|
|
5
5
|
import type { FlatConfigComposer } from "eslint-flat-config-utils";
|
|
6
6
|
import type { RuleOptions, ConfigNames as VpEslintConfigNames } from "./eslint-typegen";
|
|
@@ -18,10 +18,16 @@ type ConfigNames = VpEslintConfigNames | AntfuEslintConfigNames;
|
|
|
18
18
|
type TypedFlatConfigItem = Omit<Linter.Config<Linter.RulesRecord & Rules>, "plugins"> & {
|
|
19
19
|
plugins?: Record<string, any>;
|
|
20
20
|
};
|
|
21
|
-
|
|
21
|
+
type Files = TypedFlatConfigItem["files"];
|
|
22
|
+
type Ignores = TypedFlatConfigItem["ignores"];
|
|
23
|
+
type Mutables<T> = T | ((config: T) => T);
|
|
24
|
+
interface ConfigOverrides extends Overwrite<DistributiveOmit<TypedFlatConfigItem, "process">, {
|
|
25
|
+
files?: Mutables<Files>;
|
|
26
|
+
ignores?: Mutables<Ignores>;
|
|
27
|
+
}> {
|
|
22
28
|
}
|
|
23
29
|
/**
|
|
24
30
|
* Typed composer.
|
|
25
31
|
*/
|
|
26
32
|
type VpComposer = FlatConfigComposer<TypedFlatConfigItem, ConfigNames>;
|
|
27
|
-
export type { AnyObject, Config, ConfigNames, ConfigOverrides, ReplaceAntfuEslintRulesWithVpRulesDeeply, TypedFlatConfigItem, VpComposer, };
|
|
33
|
+
export type { AnyObject, Config, ConfigNames, ConfigOverrides, ReplaceAntfuEslintRulesWithVpRulesDeeply, Rules, TypedFlatConfigItem, VpComposer, };
|
|
@@ -1,4 +1,17 @@
|
|
|
1
1
|
import type { Linter } from "eslint";
|
|
2
2
|
import type { Arrayable, Awaitable, DefaultConfigNamesMap, FlatConfigComposer, StringLiteralUnion } from "eslint-flat-config-utils";
|
|
3
|
-
|
|
3
|
+
/**
|
|
4
|
+
* <https://github.com/antfu/eslint-flat-config-utils/blob/ac3a9b4/src/composer.ts#L492-L512>
|
|
5
|
+
*/
|
|
6
|
+
declare function getConfigIndex(configs: Array<Linter.Config>, nameOrIndex: string | number): number;
|
|
7
|
+
/**
|
|
8
|
+
* <https://github.com/antfu/eslint-flat-config-utils/blob/ac3a9b4/src/composer.ts#L91>
|
|
9
|
+
*/
|
|
10
|
+
type Operation<T extends object = Linter.Config> = (items: Array<T>) => Promise<Array<T>>;
|
|
11
|
+
declare function extendsConfigInternal<T extends object = Linter.Config, ConfigNames extends string = keyof DefaultConfigNamesMap>(composer: FlatConfigComposer<T, ConfigNames>, sourceOrIndex: StringLiteralUnion<ConfigNames, string | number>, config: Awaitable<Arrayable<T>> | ((config: T) => Awaitable<Arrayable<T>>)): void;
|
|
12
|
+
declare const extendsConfig: typeof extendsConfigInternal & {
|
|
13
|
+
getConfigIndex: typeof getConfigIndex;
|
|
14
|
+
tryGetConfigIndex: typeof getConfigIndex;
|
|
15
|
+
pushOverations: <T extends object = Linter.Config<Linter.RulesRecord>, ConfigNames extends string = never>(composer: FlatConfigComposer<T, ConfigNames>, operations: Array<Operation<T>>) => void;
|
|
16
|
+
};
|
|
4
17
|
export { extendsConfig };
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
-
exports.extendsConfig =
|
|
6
|
+
exports.extendsConfig = void 0;
|
|
7
7
|
function getConfigIndex(configs, nameOrIndex) {
|
|
8
8
|
if (typeof nameOrIndex === "number") {
|
|
9
9
|
if (nameOrIndex < 0 || nameOrIndex >= configs.length) throw new Error(`ESLintFlatConfigUtils: Failed to locate config at index ${nameOrIndex}
|
|
@@ -27,20 +27,11 @@ const tryGetConfigIndex = (configs, nameOrIndex) => {
|
|
|
27
27
|
return -1;
|
|
28
28
|
}
|
|
29
29
|
};
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
const removingTargets = (() => {
|
|
36
|
-
if (!remove) return [];
|
|
37
|
-
const removeSources = Array.isArray(remove) ? remove : [remove];
|
|
38
|
-
return removeSources.flatMap(removeSource => {
|
|
39
|
-
const index2 = tryGetConfigIndex(items, removeSource);
|
|
40
|
-
return index2 === -1 ? [] : [index2];
|
|
41
|
-
});
|
|
42
|
-
})();
|
|
43
|
-
items = removingTargets.length === 0 ? items : items.filter((_, index2) => !removingTargets.includes(index2));
|
|
30
|
+
const pushOverations = (composer, operations) => {
|
|
31
|
+
composer._operations.push(...operations);
|
|
32
|
+
};
|
|
33
|
+
function extendsConfigInternal(composer, sourceOrIndex, config) {
|
|
34
|
+
pushOverations(composer, [async items => {
|
|
44
35
|
const index = tryGetConfigIndex(items, sourceOrIndex);
|
|
45
36
|
const source = items[index];
|
|
46
37
|
if (!source) return items;
|
|
@@ -48,6 +39,11 @@ function extendsConfig(composer, sourceOrIndex, config, remove) {
|
|
|
48
39
|
const awaited = typeof config === "function" ? await config(source) : await config;
|
|
49
40
|
return Array.isArray(awaited) ? awaited : [awaited];
|
|
50
41
|
})();
|
|
51
|
-
return
|
|
52
|
-
});
|
|
53
|
-
}
|
|
42
|
+
return items.toSpliced(index, 1, ...newConfigs);
|
|
43
|
+
}]);
|
|
44
|
+
}
|
|
45
|
+
const extendsConfig = exports.extendsConfig = Object.assign(extendsConfigInternal, {
|
|
46
|
+
getConfigIndex,
|
|
47
|
+
tryGetConfigIndex,
|
|
48
|
+
pushOverations
|
|
49
|
+
});
|
|
@@ -0,0 +1,47 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
Object.defineProperty(exports, "__esModule", {
|
|
4
|
+
value: true
|
|
5
|
+
});
|
|
6
|
+
exports.mergeConfig = mergeConfig;
|
|
7
|
+
var _esToolkit = require("es-toolkit");
|
|
8
|
+
const objectMergeKeys = ["rules", "plugins"];
|
|
9
|
+
const mutableMergeKeys = ["files", "ignores"];
|
|
10
|
+
function mergeConfig(source, ...[def, ...defs]) {
|
|
11
|
+
const reversedDefs = [def, ...defs].toReversed();
|
|
12
|
+
const mergedDef = {
|
|
13
|
+
...Object.fromEntries(reversedDefs.flatMap(def2 => Object.entries(def2))),
|
|
14
|
+
...Object.fromEntries(objectMergeKeys.flatMap(key => {
|
|
15
|
+
if (reversedDefs.every(def2 => !(key in def2))) return [];
|
|
16
|
+
const values = Object.fromEntries(reversedDefs.flatMap(def2 => Object.entries(def2[key] ?? {})));
|
|
17
|
+
return [[key, values]];
|
|
18
|
+
}))
|
|
19
|
+
};
|
|
20
|
+
if (!source) return mergedDef;
|
|
21
|
+
const merged = {
|
|
22
|
+
...(0, _esToolkit.omit)(mergedDef, [...objectMergeKeys, ...mutableMergeKeys]),
|
|
23
|
+
...(0, _esToolkit.omit)(source, [...objectMergeKeys, ...mutableMergeKeys]),
|
|
24
|
+
...Object.fromEntries(objectMergeKeys.flatMap(key => {
|
|
25
|
+
if (!(key in source) && !(key in mergedDef)) return [];
|
|
26
|
+
return [[key, {
|
|
27
|
+
...mergedDef[key],
|
|
28
|
+
...source[key]
|
|
29
|
+
}]];
|
|
30
|
+
})),
|
|
31
|
+
...Object.fromEntries(mutableMergeKeys.flatMap(key => {
|
|
32
|
+
if (!(key in source) && !(key in mergedDef)) return [];
|
|
33
|
+
if (!(key in source)) return [[key, mergedDef[key]]];
|
|
34
|
+
const sourceValue = source[key];
|
|
35
|
+
if (sourceValue === void 0) return [];
|
|
36
|
+
if (typeof sourceValue === "function") {
|
|
37
|
+
const value = sourceValue(
|
|
38
|
+
// @ts-expect-error -- typeof files and ignores are different.
|
|
39
|
+
mergedDef[key]);
|
|
40
|
+
if (value === void 0) return [];
|
|
41
|
+
return [[key, value]];
|
|
42
|
+
}
|
|
43
|
+
return [[key, sourceValue]];
|
|
44
|
+
}))
|
|
45
|
+
};
|
|
46
|
+
return merged;
|
|
47
|
+
}
|
package/dist/vdustr.d.ts
CHANGED
|
@@ -1,21 +1,30 @@
|
|
|
1
1
|
import type { Config, ReplaceAntfuEslintRulesWithVpRulesDeeply, VpComposer } from "./types";
|
|
2
2
|
import antfu from "@antfu/eslint-config";
|
|
3
3
|
import { mdx } from "./configs/mdx";
|
|
4
|
+
import { packageJson } from "./configs/packageJson";
|
|
4
5
|
import { prettier } from "./configs/prettier";
|
|
5
6
|
import { storybook } from "./configs/storybook";
|
|
6
7
|
import { imports } from "./extends/imports";
|
|
7
8
|
import { javascript } from "./extends/javascript";
|
|
8
9
|
import { jsonc } from "./extends/jsonc";
|
|
9
10
|
import { react } from "./extends/react";
|
|
11
|
+
import { sortJsonArrayValues, sortJsonKeys, sortPackageJson, sortTsconfigJson } from "./extends/sort";
|
|
10
12
|
import { typescript } from "./extends/typescript";
|
|
11
13
|
import { yaml } from "./extends/yaml";
|
|
12
14
|
type Options = ReplaceAntfuEslintRulesWithVpRulesDeeply<NonNullable<Parameters<typeof antfu>[0]>> & {
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
15
|
+
extends?: {
|
|
16
|
+
javascript?: javascript.Options;
|
|
17
|
+
imports?: imports.Options;
|
|
18
|
+
typescript?: typescript.Options;
|
|
19
|
+
jsonc?: jsonc.Options;
|
|
20
|
+
sortPackageJson?: sortPackageJson.Options;
|
|
21
|
+
sortTsConfigJson?: sortTsconfigJson.Options;
|
|
22
|
+
sortJsonKeys?: sortJsonKeys.Options;
|
|
23
|
+
sortJsonArrayValues?: sortJsonArrayValues.Options;
|
|
24
|
+
yaml?: yaml.Options;
|
|
25
|
+
react?: react.Options;
|
|
26
|
+
};
|
|
27
|
+
packageJson?: boolean | packageJson.Options;
|
|
19
28
|
mdx?: boolean | mdx.Options;
|
|
20
29
|
storybook?: boolean | storybook.Options;
|
|
21
30
|
prettier?: boolean | prettier.Options;
|
package/dist/vdustr.js
CHANGED
|
@@ -5,37 +5,55 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
});
|
|
6
6
|
exports.vdustr = void 0;
|
|
7
7
|
var _eslintConfig = _interopRequireDefault(require("@antfu/eslint-config"));
|
|
8
|
+
var _esToolkit = require("es-toolkit");
|
|
8
9
|
var _mdx = require("./configs/mdx");
|
|
10
|
+
var _packageJson = require("./configs/packageJson");
|
|
9
11
|
var _prettier = require("./configs/prettier");
|
|
10
12
|
var _storybook = require("./configs/storybook");
|
|
11
13
|
var _imports = require("./extends/imports");
|
|
12
14
|
var _javascript = require("./extends/javascript");
|
|
13
15
|
var _jsonc = require("./extends/jsonc");
|
|
14
16
|
var _react = require("./extends/react");
|
|
17
|
+
var _sort = require("./extends/sort");
|
|
15
18
|
var _typescript = require("./extends/typescript");
|
|
16
19
|
var _yaml = require("./extends/yaml");
|
|
17
20
|
function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
|
|
21
|
+
const ownedConfigNames = ["extends", "packageJson", "mdx", "storybook", "prettier"];
|
|
18
22
|
const vdustr = (options, ...userConfigs) => {
|
|
23
|
+
const antfuOptions = (0, _esToolkit.omit)(options ?? {}, ownedConfigNames);
|
|
24
|
+
const vpOptions = (0, _esToolkit.pick)(options ?? {}, ownedConfigNames);
|
|
25
|
+
const packageJsonEnabled = Boolean(vpOptions?.packageJson ?? true);
|
|
26
|
+
const storybookEnabled = Boolean(vpOptions?.storybook ?? false);
|
|
27
|
+
const mdxEnabled = Boolean(vpOptions?.mdx ?? false);
|
|
28
|
+
const prettierEnabled = Boolean(vpOptions?.prettier ?? true);
|
|
19
29
|
let config = (0, _eslintConfig.default)({
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
30
|
+
...antfuOptions,
|
|
31
|
+
...(!prettierEnabled ? null : {
|
|
32
|
+
// Forcibly disable style rules if prettier is enabled.
|
|
33
|
+
stylistic: false
|
|
34
|
+
})
|
|
23
35
|
});
|
|
24
|
-
(0, _javascript.javascript)(config,
|
|
25
|
-
(0, _imports.imports)(config,
|
|
26
|
-
(0, _typescript.typescript)(config,
|
|
27
|
-
(0, _jsonc.jsonc)(config,
|
|
28
|
-
(0,
|
|
29
|
-
(0,
|
|
30
|
-
|
|
36
|
+
(0, _javascript.javascript)(config, vpOptions?.extends?.javascript);
|
|
37
|
+
(0, _imports.imports)(config, vpOptions?.extends?.imports);
|
|
38
|
+
(0, _typescript.typescript)(config, vpOptions?.extends?.typescript);
|
|
39
|
+
(0, _jsonc.jsonc)(config, vpOptions?.extends?.jsonc);
|
|
40
|
+
if (packageJsonEnabled) (0, _sort.sortPackageJson)(config, vpOptions?.extends?.sortPackageJson);
|
|
41
|
+
(0, _sort.sortTsconfigJson)(config, vpOptions?.extends?.sortTsConfigJson);
|
|
42
|
+
(0, _sort.sortJsonKeys)(config, vpOptions?.extends?.sortJsonKeys);
|
|
43
|
+
(0, _sort.sortJsonArrayValues)(config, vpOptions?.extends?.sortJsonArrayValues);
|
|
44
|
+
(0, _yaml.yaml)(config, vpOptions?.extends?.yaml);
|
|
45
|
+
(0, _react.react)(config, vpOptions?.extends?.react);
|
|
46
|
+
if (packageJsonEnabled) {
|
|
47
|
+
const packageJsonOptions = typeof vpOptions?.packageJson !== "object" ? void 0 : vpOptions.packageJson;
|
|
48
|
+
config = config.append((0, _packageJson.packageJson)(...(!packageJsonOptions ? [] : [packageJsonOptions])));
|
|
49
|
+
}
|
|
31
50
|
if (storybookEnabled) {
|
|
32
|
-
const storybookOptions = typeof
|
|
51
|
+
const storybookOptions = typeof vpOptions?.storybook !== "object" ? void 0 : vpOptions.storybook;
|
|
33
52
|
config = config.append((0, _storybook.storybook)(...(!storybookOptions ? [] : [storybookOptions])));
|
|
34
53
|
}
|
|
35
|
-
const mdxEnabled = Boolean(options?.mdx ?? false);
|
|
36
54
|
if (mdxEnabled) {
|
|
37
55
|
const mdxOptions = {
|
|
38
|
-
...(typeof
|
|
56
|
+
...(typeof vpOptions?.mdx !== "object" ? null : vpOptions.mdx)
|
|
39
57
|
};
|
|
40
58
|
const mdxFlatCodeBlocksEnabled = Boolean(mdxOptions?.codeBlocks ?? true);
|
|
41
59
|
const mdxFlatCodeBlocksOptions = {
|
|
@@ -46,9 +64,8 @@ const vdustr = (options, ...userConfigs) => {
|
|
|
46
64
|
codeBlocks: !mdxFlatCodeBlocksEnabled ? false : mdxFlatCodeBlocksOptions
|
|
47
65
|
}));
|
|
48
66
|
}
|
|
49
|
-
const prettierEnabled = Boolean(options?.prettier ?? true);
|
|
50
67
|
if (prettierEnabled) {
|
|
51
|
-
const prettierOptions = typeof
|
|
68
|
+
const prettierOptions = typeof vpOptions?.prettier !== "object" ? void 0 : vpOptions.prettier;
|
|
52
69
|
config = config.append((0, _prettier.prettier)(...(!prettierOptions ? [] : [prettierOptions])));
|
|
53
70
|
}
|
|
54
71
|
config.append(...userConfigs);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@vp-tw/eslint-config",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.24",
|
|
4
4
|
"description": "ViPro's ESLint configuration",
|
|
5
5
|
"homepage": "https://github.com/vdustr/eslint-config",
|
|
6
6
|
"author": {
|
|
@@ -40,7 +40,6 @@
|
|
|
40
40
|
],
|
|
41
41
|
"dependencies": {
|
|
42
42
|
"@mui/types": "^7.2.21",
|
|
43
|
-
"defu": "^6.1.4",
|
|
44
43
|
"es-toolkit": "^1.31.0",
|
|
45
44
|
"eslint-flat-config-utils": "^2.0.0",
|
|
46
45
|
"local-pkg": "^1.0.0"
|