Skip to content

Commit 6098cb9

Browse files
committedFeb 16, 2025
Move config schema
1 parent f63df95 commit 6098cb9

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed
 

‎packages/knip/src/ConfigurationChief.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import picomatch from 'picomatch';
2-
import { ConfigurationValidator } from './ConfigurationValidator.js';
32
import { partitionCompilers } from './compilers/index.js';
43
import { DEFAULT_EXTENSIONS, KNIP_CONFIG_LOCATIONS, ROOT_WORKSPACE_NAME } from './constants.js';
54
import { defaultRules } from './issues/initializers.js';
5+
import { knipConfigurationSchema } from './schema/configuration.js';
66
import { type PluginName, pluginNames } from './types/PluginNames.js';
77
import type {
88
Configuration,
@@ -153,7 +153,7 @@ export class ConfigurationChief {
153153
: manifest.knip;
154154

155155
// Have to partition compiler functions before Zod touches them
156-
const parsedConfig = this.rawConfig ? ConfigurationValidator.parse(partitionCompilers(this.rawConfig)) : {};
156+
const parsedConfig = this.rawConfig ? knipConfigurationSchema.parse(partitionCompilers(this.rawConfig)) : {};
157157
this.config = this.normalize(parsedConfig);
158158

159159
await this.setWorkspaces();

‎packages/knip/src/ConfigurationValidator.ts ‎packages/knip/src/schema/configuration.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { z } from 'zod';
2-
import { globSchema, pluginsSchema } from './schema/plugins.js';
2+
import { globSchema, pluginsSchema } from './plugins.js';
33

44
const pathsSchema = z.record(z.string(), z.array(z.string()));
55

@@ -85,7 +85,7 @@ const workspacesConfigurationSchema = z.object({
8585
workspaces: z.record(z.string(), workspaceConfigurationSchema).optional(),
8686
});
8787

88-
export const ConfigurationValidator = rootConfigurationSchema
88+
export const knipConfigurationSchema = rootConfigurationSchema
8989
.merge(reportConfigSchema)
9090
.merge(workspacesConfigurationSchema)
9191
.merge(pluginsSchema.partial());

‎packages/knip/src/types/config.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { z } from 'zod';
2-
import type { ConfigurationValidator } from '../ConfigurationValidator.js';
32
import type { AsyncCompilers, SyncCompilers } from '../compilers/types.js';
3+
import type { knipConfigurationSchema } from '../schema/configuration.js';
44
import type { pluginSchema } from '../schema/plugins.js';
55
import type { Input } from '../util/input.js';
66
import type { PluginName } from './PluginNames.js';
@@ -32,7 +32,7 @@ export interface BinaryResolverOptions extends GetInputsFromScriptsOptions {
3232

3333
export type BinaryResolver = (binary: string, args: string[], options: BinaryResolverOptions) => Input[];
3434

35-
export type RawConfiguration = z.infer<typeof ConfigurationValidator>;
35+
export type RawConfiguration = z.infer<typeof knipConfigurationSchema>;
3636

3737
export type RawPluginConfiguration = z.infer<typeof pluginSchema>;
3838

0 commit comments

Comments
 (0)
Please sign in to comment.