Merge pull request #2500 from sam-super/fix-not-null-default-val

fix: enable non-nullable, defaulted fields in code-first schema
nestjs · Dec 7, 2022 · 2baa066 · 2baa066
2 parents 6864eb2 + e82062c
commit 2baa066
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 22 deletions.
diff --git a/packages/apollo/tests/code-first/recipes/dto/new-recipe.input.ts b/packages/apollo/tests/code-first/recipes/dto/new-recipe.input.ts
@@ -12,6 +12,9 @@ export class NewRecipeInput {
   @Length(30, 255)
   description?: string;
 
+  @Field({ nullable: false, defaultValue: 'published' })
+  status: string;
+
   @Type(() => String)
   @Field((type) => [String])
   ingredients: string[];

diff --git a/packages/apollo/tests/code-first/recipes/dto/recipes.args.ts b/packages/apollo/tests/code-first/recipes/dto/recipes.args.ts
@@ -2,11 +2,14 @@ import { ArgsType, Field, Int } from '@nestjs/graphql';
 import { Max, Min } from 'class-validator';
 @ArgsType()
 export class RecipesArgs {
-  @Field((type) => Int, { description: 'number of items to skip' })
+  @Field((type) => Int, {
+    description: 'number of items to skip',
+    nullable: true,
+  })
   @Min(0)
   skip: number = 0;
 
-  @Field((type) => Int)
+  @Field((type) => Int, { nullable: true })
   @Min(1)
   @Max(50)
   take: number = 25;

diff --git a/packages/apollo/tests/code-first/recipes/recipes.resolver.ts b/packages/apollo/tests/code-first/recipes/recipes.resolver.ts
@@ -31,6 +31,7 @@ export class RecipesResolver {
     @Args('id', {
       defaultValue: '1',
       description: 'recipe id',
+      nullable: true,
     })
     id: string,
   ): Promise<IRecipe> {

diff --git a/packages/apollo/tests/e2e/code-first-schema.spec.ts b/packages/apollo/tests/e2e/code-first-schema.spec.ts
@@ -651,6 +651,20 @@ describe('Code-first - schema factory', () => {
               name: 'description',
               type: { kind: TypeKind.SCALAR, name: 'String', ofType: null },
             },
+            {
+              defaultValue: '"published"',
+              description: null,
+              name: 'status',
+              type: {
+                kind: TypeKind.NON_NULL,
+                name: null,
+                ofType: {
+                  kind: TypeKind.SCALAR,
+                  name: 'String',
+                  ofType: null,
+                },
+              },
+            },
             {
               defaultValue: null,
               description: null,

diff --git a/packages/apollo/tests/utils/printed-schema.snapshot.ts b/packages/apollo/tests/utils/printed-schema.snapshot.ts
@@ -105,6 +105,7 @@ input NewRecipeInput {
   """recipe title"""
   title: String!
   description: String
+  status: String! = "published"
   ingredients: [String!]!
 }
 
@@ -163,6 +164,7 @@ type Mutation {
 input NewRecipeInput {
   description: String
   ingredients: [String!]!
+  status: String! = "published"
 
   """recipe title"""
   title: String!

diff --git a/packages/graphql/lib/schema-builder/factories/input-type.factory.ts b/packages/graphql/lib/schema-builder/factories/input-type.factory.ts
@@ -38,7 +38,6 @@ export class InputTypeFactory {
       hostType,
       inputType,
       typeOptions,
-      true,
     );
   }
 }
diff --git a/packages/graphql/lib/schema-builder/factories/output-type.factory.ts b/packages/graphql/lib/schema-builder/factories/output-type.factory.ts
@@ -32,11 +32,6 @@ export class OutputTypeFactory {
         throw new CannotDetermineOutputTypeError(hostType);
       }
     }
-    return this.typeMapperService.mapToGqlType(
-      hostType,
-      gqlType,
-      typeOptions,
-      false,
-    );
+    return this.typeMapperService.mapToGqlType(hostType, gqlType, typeOptions);
   }
 }
diff --git a/packages/graphql/lib/schema-builder/services/type-mapper.service.ts b/packages/graphql/lib/schema-builder/services/type-mapper.service.ts
@@ -54,7 +54,6 @@ export class TypeMapperSevice {
     hostType: string,
     typeRef: T,
     options: TypeOptions,
-    isInputTypeCtx: boolean,
   ): T {
     this.validateTypeOptions(hostType, options);
     let graphqlType: T | GraphQLList<T> | GraphQLNonNull<T> = typeRef;
@@ -67,18 +66,7 @@ export class TypeMapperSevice {
       );
     }
 
-    let isNotNullable: boolean;
-    if (isInputTypeCtx) {
-      /**
-       * The input values (e.g., args) remain "nullable"
-       * even if the "defaultValue" is specified.
-       */
-      isNotNullable =
-        isUndefined(options.defaultValue) &&
-        (!options.nullable || options.nullable === 'items');
-    } else {
-      isNotNullable = !options.nullable || options.nullable === 'items';
-    }
+    const isNotNullable = !options.nullable || options.nullable === 'items';
     return isNotNullable
       ? (new GraphQLNonNull(graphqlType) as T)
       : (graphqlType as T);