Merge pull request #1140 from jshearer/fix/multi-level-interfaces

fix(): Fix handling of multi-level interfaces
nestjs · Nov 9, 2020 · e4158d8 · e4158d8
2 parents b3f6517 + 171ce0e
commit e4158d8
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 16 deletions.
diff --git a/lib/schema-builder/factories/object-type-definition.factory.ts b/lib/schema-builder/factories/object-type-definition.factory.ts
@@ -40,9 +40,9 @@ export class ObjectTypeDefinitionFactory {
   ): ObjectTypeDefinition {
     const prototype = Object.getPrototypeOf(metadata.target);
     const getParentType = () => {
-      const parentTypeDefinition = this.typeDefinitionsStorage.getObjectTypeByTarget(
-        prototype,
-      );
+      const parentTypeDefinition =
+        this.typeDefinitionsStorage.getObjectTypeByTarget(prototype) ||
+        this.typeDefinitionsStorage.getInterfaceByTarget(prototype);
       return parentTypeDefinition ? parentTypeDefinition.type : undefined;
     };
     return {
@@ -69,7 +69,7 @@ export class ObjectTypeDefinitionFactory {
 
   private generateInterfaces(
     metadata: ObjectTypeMetadata,
-    getParentType: () => GraphQLObjectType,
+    getParentType: () => GraphQLObjectType | GraphQLInterfaceType,
   ) {
     const prototype = Object.getPrototypeOf(metadata.target);
 
@@ -95,7 +95,7 @@ export class ObjectTypeDefinitionFactory {
   private generateFields(
     metadata: ObjectTypeMetadata,
     options: BuildSchemaOptions,
-    getParentType: () => GraphQLObjectType,
+    getParentType: () => GraphQLObjectType | GraphQLInterfaceType,
   ): () => GraphQLFieldConfigMap<any, any> {
     const prototype = Object.getPrototypeOf(metadata.target);
     metadata.properties.forEach(({ typeFn }) =>

diff --git a/tests/code-first/recipes/models/recipe.ts b/tests/code-first/recipes/models/recipe.ts
@@ -1,28 +1,25 @@
 import { Field, ID, InterfaceType, ObjectType } from '../../../../lib';
 import { METADATA_FACTORY_NAME } from '../../../../lib/plugin/plugin-constants';
 
+@InterfaceType()
+export abstract class Base {
+  @Field((type) => ID)
+  id: string;
+}
+
 @InterfaceType({
   description: 'example interface',
   resolveType: (value) => {
     return Recipe;
   },
 })
-export abstract class IRecipe {
-  @Field((type) => ID)
-  id: string;
-
+export abstract class IRecipe extends Base {
   @Field()
   title: string;
 }
 
 @ObjectType({ implements: IRecipe, description: 'recipe object type' })
-export class Recipe {
-  @Field((type) => ID)
-  id: string;
-
-  @Field()
-  title: string;
-
+export class Recipe extends IRecipe {
   @Field({ nullable: true })
   description?: string;
 
@@ -35,6 +32,7 @@ export class Recipe {
   }
 
   constructor(recipe: Partial<Recipe>) {
+    super();
     Object.assign(this, recipe);
   }