fix Bugs with yup v1 and arrays of non nullable fix Code-Hex#359

erwan-joly · Jun 8, 2023 · 55ae41a · 55ae41a
1 parent 0018d0d
commit 55ae41a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/example/test.graphql b/example/test.graphql
@@ -15,6 +15,16 @@ type Guest {
 
 union UserKind = Admin | Guest
 
+type InnerType {
+  testScalar: MyScalar!
+}
+
+type OuterType {
+  inner: InnerType
+}
+
+scalar MyScalar
+
 type User {
   id: ID
   name: String

diff --git a/src/yup/index.ts b/src/yup/index.ts
@@ -80,13 +80,13 @@ export const YupSchemaVisitor = (schema: GraphQLSchema, config: ValidationSchema
         return new DeclarationBlock({})
           .export()
           .asKind('function')
-          .withName(`${name}Schema(): yup.ObjectSchema<${name}>`)
+          .withName(`${name}Schema()`)
           .withBlock(
             [
               indent(`return yup.object({`),
               indent(`__typename: yup.string<'${node.name.value}'>().optional(),`, 2),
               shape,
-              indent('})'),
+              indent(`}) satisfies yup.ObjectSchema<${name}>`),
             ].join('\n')
           ).string;
       }),
@@ -210,7 +210,7 @@ const generateFieldTypeYupSchema = (
         const tsType = tsVisitor.scalars[type.name.value];
         if (tsType === 'string') return `${gen}.required()`;
       }
-      return `${gen}.nonNullable()`;
+      return `${gen}.defined().nonNullable()`;
     }
     const typ = schema.getType(type.name.value);
     if (typ?.astNode?.kind === 'InputObjectTypeDefinition') {