Skip to content

Commit a06ce7f

Browse files
Code-Hexgithub-actions[bot]
authored andcommitted
Apply auto lint-fix changes
1 parent 8535755 commit a06ce7f

File tree

4 files changed

+44
-33
lines changed

4 files changed

+44
-33
lines changed

src/myzod/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,11 +243,11 @@ const generateFieldTypeMyZodSchema = (
243243
if (defaultValue?.kind === Kind.INT || defaultValue?.kind === Kind.FLOAT || defaultValue?.kind === Kind.BOOLEAN) {
244244
appliedDirectivesGen = `${appliedDirectivesGen}.default(${defaultValue.value})`;
245245
}
246-
if ((defaultValue?.kind === Kind.STRING) || (defaultValue?.kind === Kind.ENUM)) {
246+
if (defaultValue?.kind === Kind.STRING || defaultValue?.kind === Kind.ENUM) {
247247
appliedDirectivesGen = `${appliedDirectivesGen}.default("${defaultValue.value}")`;
248248
}
249249
}
250-
250+
251251
if (isNonNullType(parentType)) {
252252
if (visitor.shouldEmitAsNotAllowEmptyString(type.name.value)) {
253253
return `${gen}.min(1)`;

src/yup/index.ts

Lines changed: 29 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ export class YupSchemaVisitor extends BaseSchemaVisitor {
6969
const appendArguments = argumentBlocks ? '\n' + argumentBlocks : '';
7070

7171
// Building schema for fields.
72-
const shape = shapeFields(node.fields, this.config, visitor)
72+
const shape = shapeFields(node.fields, this.config, visitor);
7373

7474
switch (this.config.validationSchemaExportType) {
7575
case 'const':
@@ -199,7 +199,7 @@ export class YupSchemaVisitor extends BaseSchemaVisitor {
199199
visitor: Visitor,
200200
name: string
201201
) {
202-
const shape = shapeFields(fields, this.config, visitor)
202+
const shape = shapeFields(fields, this.config, visitor);
203203

204204
switch (this.config.validationSchemaExportType) {
205205
case 'const':
@@ -220,29 +220,38 @@ export class YupSchemaVisitor extends BaseSchemaVisitor {
220220
}
221221
}
222222

223-
const shapeFields = (fields: readonly (FieldDefinitionNode | InputValueDefinitionNode)[] | undefined, config: ValidationSchemaPluginConfig, visitor: Visitor) => {
224-
return fields?.map(field => {
225-
let fieldSchema = generateFieldYupSchema(config, visitor, field, 2);
223+
const shapeFields = (
224+
fields: readonly (FieldDefinitionNode | InputValueDefinitionNode)[] | undefined,
225+
config: ValidationSchemaPluginConfig,
226+
visitor: Visitor
227+
) => {
228+
return fields
229+
?.map(field => {
230+
let fieldSchema = generateFieldYupSchema(config, visitor, field, 2);
226231

227-
if (field.kind === Kind.INPUT_VALUE_DEFINITION) {
228-
const { defaultValue } = field;
232+
if (field.kind === Kind.INPUT_VALUE_DEFINITION) {
233+
const { defaultValue } = field;
229234

230-
if (defaultValue?.kind === Kind.INT || defaultValue?.kind === Kind.FLOAT || defaultValue?.kind === Kind.BOOLEAN) {
231-
fieldSchema = `${fieldSchema}.default(${defaultValue.value})`;
232-
}
233-
if ((defaultValue?.kind === Kind.STRING) || (defaultValue?.kind === Kind.ENUM)) {
234-
fieldSchema = `${fieldSchema}.default("${defaultValue.value}")`;
235+
if (
236+
defaultValue?.kind === Kind.INT ||
237+
defaultValue?.kind === Kind.FLOAT ||
238+
defaultValue?.kind === Kind.BOOLEAN
239+
) {
240+
fieldSchema = `${fieldSchema}.default(${defaultValue.value})`;
241+
}
242+
if (defaultValue?.kind === Kind.STRING || defaultValue?.kind === Kind.ENUM) {
243+
fieldSchema = `${fieldSchema}.default("${defaultValue.value}")`;
244+
}
235245
}
236-
}
237246

238-
if(isNonNullType(field.type)) {
239-
return fieldSchema
240-
}
247+
if (isNonNullType(field.type)) {
248+
return fieldSchema;
249+
}
241250

242-
return `${fieldSchema}.optional()`;
243-
})
244-
.join(',\n');
245-
}
251+
return `${fieldSchema}.optional()`;
252+
})
253+
.join(',\n');
254+
};
246255

247256
const generateFieldYupSchema = (
248257
config: ValidationSchemaPluginConfig,

src/zod/index.ts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -130,16 +130,16 @@ export class ZodSchemaVisitor extends BaseSchemaVisitor {
130130
this.enumDeclarations.push(
131131
this.config.enumsAsTypes
132132
? new DeclarationBlock({})
133-
.export()
134-
.asKind('const')
135-
.withName(`${enumname}Schema`)
136-
.withContent(`z.enum([${node.values?.map(enumOption => `'${enumOption.name.value}'`).join(', ')}])`)
137-
.string
133+
.export()
134+
.asKind('const')
135+
.withName(`${enumname}Schema`)
136+
.withContent(`z.enum([${node.values?.map(enumOption => `'${enumOption.name.value}'`).join(', ')}])`)
137+
.string
138138
: new DeclarationBlock({})
139-
.export()
140-
.asKind('const')
141-
.withName(`${enumname}Schema`)
142-
.withContent(`z.nativeEnum(${enumname})`).string
139+
.export()
140+
.asKind('const')
141+
.withName(`${enumname}Schema`)
142+
.withContent(`z.nativeEnum(${enumname})`).string
143143
);
144144
},
145145
};
@@ -256,7 +256,7 @@ const generateFieldTypeZodSchema = (
256256
if (defaultValue?.kind === Kind.INT || defaultValue?.kind === Kind.FLOAT || defaultValue?.kind === Kind.BOOLEAN) {
257257
appliedDirectivesGen = `${appliedDirectivesGen}.default(${defaultValue.value})`;
258258
}
259-
if ((defaultValue?.kind === Kind.STRING) || (defaultValue?.kind === Kind.ENUM)) {
259+
if (defaultValue?.kind === Kind.STRING || defaultValue?.kind === Kind.ENUM) {
260260
appliedDirectivesGen = `${appliedDirectivesGen}.default("${defaultValue.value}")`;
261261
}
262262
}

tests/yup.spec.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -930,7 +930,9 @@ describe('yup', () => {
930930
{}
931931
);
932932

933-
expect(result.content).toContain('export const PageTypeSchema = yup.string<PageType>().oneOf([PageType.Public, PageType.BasicAuth]).defined()');
933+
expect(result.content).toContain(
934+
'export const PageTypeSchema = yup.string<PageType>().oneOf([PageType.Public, PageType.BasicAuth]).defined()'
935+
);
934936
expect(result.content).toContain('export function PageInputSchema(): yup.ObjectSchema<PageInput>');
935937

936938
expect(result.content).toContain('pageType: PageTypeSchema.nonNullable().default("PUBLIC")');

0 commit comments

Comments
 (0)