Added yup test and initial implementation for default input values

Author: bramvanderholst

src/yup/index.ts

@@ -5,6 +5,7 @@ import {
   GraphQLSchema,
   InputObjectTypeDefinitionNode,
   InputValueDefinitionNode,
+  Kind,
   NameNode,
   ObjectTypeDefinitionNode,
   TypeNode,
@@ -68,12 +69,7 @@ export class YupSchemaVisitor extends BaseSchemaVisitor {
         const appendArguments = argumentBlocks ? '\n' + argumentBlocks : '';
 
         // Building schema for fields.
-        const shape = node.fields
-          ?.map(field => {
-            const fieldSchema = generateFieldYupSchema(this.config, visitor, field, 2);
-            return isNonNullType(field.type) ? fieldSchema : `${fieldSchema}.optional()`;
-          })
-          .join(',\n');
+    const shape = shapeFields(node.fields, this.config, visitor)
 
         switch (this.config.validationSchemaExportType) {
           case 'const':
@@ -203,12 +199,7 @@ export class YupSchemaVisitor extends BaseSchemaVisitor {
     visitor: Visitor,
     name: string
   ) {
-    const shape = fields
-      ?.map(field => {
-        const fieldSchema = generateFieldYupSchema(this.config, visitor, field, 2);
-        return isNonNullType(field.type) ? fieldSchema : `${fieldSchema}.optional()`;
-      })
-      .join(',\n');
+    const shape = shapeFields(fields, this.config, visitor)
 
     switch (this.config.validationSchemaExportType) {
       case 'const':
@@ -229,6 +220,30 @@ export class YupSchemaVisitor extends BaseSchemaVisitor {
   }
 }
 
+const shapeFields = (fields: readonly (FieldDefinitionNode | InputValueDefinitionNode)[] | undefined, config: ValidationSchemaPluginConfig, visitor: Visitor) => {
+  return fields?.map(field => {
+    let fieldSchema = generateFieldYupSchema(config, visitor, field, 2);
+
+    if (field.kind === Kind.INPUT_VALUE_DEFINITION) {
+      const { defaultValue } = field;
+
+      if (defaultValue?.kind === Kind.INT || defaultValue?.kind === Kind.FLOAT || defaultValue?.kind === Kind.BOOLEAN) {
+        fieldSchema = `${fieldSchema}.default(${defaultValue.value})`;
+      }
+      if ((defaultValue?.kind === Kind.STRING) || (defaultValue?.kind === Kind.ENUM)) {
+        fieldSchema = `${fieldSchema}.default("${defaultValue.value}")`;
+      }
+    }
+
+    if(isNonNullType(field.type)) {
+      return fieldSchema
+    }
+
+    return `${fieldSchema}.optional()`;
+  })
+  .join(',\n');
+}
+
 const generateFieldYupSchema = (
   config: ValidationSchemaPluginConfig,
   visitor: Visitor,

tests/yup.spec.ts

@@ -905,4 +905,38 @@ describe('yup', () => {
     }`;
     expect(result.content).toContain(wantContain);
   });
+
+  it('with default input values', async () => {
+    const schema = buildSchema(/* GraphQL */ `
+      enum PageType {
+        PUBLIC
+        BASIC_AUTH
+      }
+      input PageInput {
+        pageType: PageType! = PUBLIC
+        greeting: String = "Hello"
+        score: Int = 100
+        ratio: Float = 0.5
+        isMember: Boolean = true
+      }
+    `);
+    const result = await plugin(
+      schema,
+      [],
+      {
+        schema: 'yup',
+        importFrom: './types',
+      },
+      {}
+    );
+
+    expect(result.content).toContain('export const PageTypeSchema = yup.string<PageType>().oneOf([PageType.Public, PageType.BasicAuth]).defined()');
+    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()');
+  });
 });