Skip to content

Prevent setting optional/nullish/nullable when a default value is set #634

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Prevent setting optional/nullish/nullable when a default value is set #634

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/myzod/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,8 @@ function generateFieldTypeMyZodSchema(config: ValidationSchemaPluginConfig, visi

let appliedDirectivesGen = applyDirectives(config, field, gen);

if (field.kind === Kind.INPUT_VALUE_DEFINITION) {
const hasDefaultValue = field.kind === Kind.INPUT_VALUE_DEFINITION && field.defaultValue
if (hasDefaultValue) {
const { defaultValue } = field;

if (defaultValue?.kind === Kind.INT || defaultValue?.kind === Kind.FLOAT || defaultValue?.kind === Kind.BOOLEAN)
Expand All @@ -285,7 +286,7 @@ function generateFieldTypeMyZodSchema(config: ValidationSchemaPluginConfig, visi
appliedDirectivesGen = `${appliedDirectivesGen}.default("${defaultValue.value}")`;
}

if (isNonNullType(parentType)) {
if (isNonNullType(parentType) || hasDefaultValue) {
if (visitor.shouldEmitAsNotAllowEmptyString(type.name.value))
return `${gen}.min(1)`;

Expand Down
7 changes: 5 additions & 2 deletions src/yup/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,8 @@ function shapeFields(fields: readonly (FieldDefinitionNode | InputValueDefinitio
?.map((field) => {
let fieldSchema = generateFieldYupSchema(config, visitor, field, 2);

if (field.kind === Kind.INPUT_VALUE_DEFINITION) {
const hasDefaultValue = field.kind === Kind.INPUT_VALUE_DEFINITION && field.defaultValue
if (hasDefaultValue) {
const { defaultValue } = field;

if (
Expand All @@ -284,9 +285,11 @@ function shapeFields(fields: readonly (FieldDefinitionNode | InputValueDefinitio

if (defaultValue?.kind === Kind.STRING || defaultValue?.kind === Kind.ENUM)
fieldSchema = `${fieldSchema}.default("${defaultValue.value}")`;

fieldSchema = fieldSchema.replace('.nullable()', '')
}

if (isNonNullType(field.type))
if (isNonNullType(field.type) || hasDefaultValue)
return fieldSchema;

return `${fieldSchema}.optional()`;
Expand Down
5 changes: 3 additions & 2 deletions src/zod/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,8 @@ function generateFieldTypeZodSchema(config: ValidationSchemaPluginConfig, visito

let appliedDirectivesGen = applyDirectives(config, field, gen);

if (field.kind === Kind.INPUT_VALUE_DEFINITION) {
const hasDefaultValue = field.kind === Kind.INPUT_VALUE_DEFINITION && field.defaultValue
if (hasDefaultValue) {
const { defaultValue } = field;

if (defaultValue?.kind === Kind.INT || defaultValue?.kind === Kind.FLOAT || defaultValue?.kind === Kind.BOOLEAN)
Expand All @@ -298,7 +299,7 @@ function generateFieldTypeZodSchema(config: ValidationSchemaPluginConfig, visito
appliedDirectivesGen = `${appliedDirectivesGen}.default("${defaultValue.value}")`;
}

if (isNonNullType(parentType)) {
if (isNonNullType(parentType) || hasDefaultValue) {
if (visitor.shouldEmitAsNotAllowEmptyString(type.name.value))
return `${appliedDirectivesGen}.min(1)`;

Expand Down
8 changes: 4 additions & 4 deletions tests/myzod.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1163,9 +1163,9 @@ describe('myzod', () => {
expect(result.content).toContain('export function PageInputSchema(): myzod.Type<PageInput>');

expect(result.content).toContain('pageType: PageTypeSchema.default("PUBLIC")');
expect(result.content).toContain('greeting: myzod.string().default("Hello").optional().nullable()');
expect(result.content).toContain('score: myzod.number().default(100).optional().nullable()');
expect(result.content).toContain('ratio: myzod.number().default(0.5).optional().nullable()');
expect(result.content).toContain('isMember: myzod.boolean().default(true).optional().nullable()');
expect(result.content).toContain('greeting: myzod.string().default("Hello")');
expect(result.content).toContain('score: myzod.number().default(100)');
expect(result.content).toContain('ratio: myzod.number().default(0.5)');
expect(result.content).toContain('isMember: myzod.boolean().default(true)');
});
});
8 changes: 4 additions & 4 deletions tests/yup.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1097,9 +1097,9 @@ describe('yup', () => {
expect(result.content).toContain('export function PageInputSchema(): yup.ObjectSchema<PageInput>');

expect(result.content).toContain('pageType: PageTypeSchema.nonNullable().default("PUBLIC")');
expect(result.content).toContain('greeting: yup.string().defined().nullable().default("Hello").optional()');
expect(result.content).toContain('score: yup.number().defined().nullable().default(100).optional()');
expect(result.content).toContain('ratio: yup.number().defined().nullable().default(0.5).optional()');
expect(result.content).toContain('isMember: yup.boolean().defined().nullable().default(true).optional()');
expect(result.content).toContain('greeting: yup.string().defined().default("Hello")');
expect(result.content).toContain('score: yup.number().defined().default(100)');
expect(result.content).toContain('ratio: yup.number().defined().default(0.5)');
expect(result.content).toContain('isMember: yup.boolean().defined().default(true)');
});
});
8 changes: 4 additions & 4 deletions tests/zod.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,10 +427,10 @@ describe('zod', () => {
expect(result.content).toContain('export function PageInputSchema(): z.ZodObject<Properties<PageInput>>');

expect(result.content).toContain('pageType: PageTypeSchema.default("PUBLIC")');
expect(result.content).toContain('greeting: z.string().default("Hello").nullish()');
expect(result.content).toContain('score: z.number().default(100).nullish()');
expect(result.content).toContain('ratio: z.number().default(0.5).nullish()');
expect(result.content).toContain('isMember: z.boolean().default(true).nullish()');
expect(result.content).toContain('greeting: z.string().default("Hello")');
expect(result.content).toContain('score: z.number().default(100)');
expect(result.content).toContain('ratio: z.number().default(0.5)');
expect(result.content).toContain('isMember: z.boolean().default(true)');
});

describe('issues #19', () => {
Expand Down