Merge pull request #958 from timhall/fix-object-extension

fix(federation): Handle ObjectTypeExtension
nestjs · Jun 23, 2020 · 9f7b973 · 9f7b973
2 parents 0466104 + 2b9129b
commit 9f7b973
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 6 deletions.
diff --git a/lib/graphql-ast.explorer.ts b/lib/graphql-ast.explorer.ts
@@ -2,17 +2,24 @@ import { Injectable } from '@nestjs/common';
 import {
   DocumentNode,
   EnumTypeDefinitionNode,
+  EnumTypeExtensionNode,
   FieldDefinitionNode,
   InputObjectTypeDefinitionNode,
+  InputObjectTypeExtensionNode,
   InputValueDefinitionNode,
   InterfaceTypeDefinitionNode,
+  InterfaceTypeExtensionNode,
   NamedTypeNode,
   ObjectTypeDefinitionNode,
+  ObjectTypeExtensionNode,
   OperationTypeDefinitionNode,
   ScalarTypeDefinitionNode,
+  ScalarTypeExtensionNode,
   TypeNode,
   TypeSystemDefinitionNode,
+  TypeSystemExtensionNode,
   UnionTypeDefinitionNode,
+  UnionTypeExtensionNode,
 } from 'graphql';
 import { get, map, sortBy, upperFirst } from 'lodash';
 import {
@@ -84,7 +91,7 @@ export class GraphQLAstExplorer {
   }
 
   lookupDefinition(
-    item: Readonly<TypeSystemDefinitionNode>,
+    item: Readonly<TypeSystemDefinitionNode | TypeSystemExtensionNode>,
     tsFile: SourceFile,
     mode: 'class' | 'interface',
     options: DefinitionsGeneratorOptions,
@@ -97,15 +104,21 @@ export class GraphQLAstExplorer {
           mode,
         );
       case 'ObjectTypeDefinition':
+      case 'ObjectTypeExtension':
       case 'InputObjectTypeDefinition':
+      case 'InputObjectTypeExtension':
         return this.addObjectTypeDefinition(item, tsFile, mode, options);
       case 'InterfaceTypeDefinition':
+      case 'InterfaceTypeExtension':
         return this.addObjectTypeDefinition(item, tsFile, 'interface', options);
       case 'ScalarTypeDefinition':
+      case 'ScalarTypeExtension':
         return this.addScalarDefinition(item, tsFile);
       case 'EnumTypeDefinition':
+      case 'EnumTypeExtension':
         return this.addEnumDefinition(item, tsFile);
       case 'UnionTypeDefinition':
+      case 'UnionTypeExtension':
         return this.addUnionDefinition(item, tsFile);
     }
   }
@@ -146,8 +159,11 @@ export class GraphQLAstExplorer {
   addObjectTypeDefinition(
     item:
       | ObjectTypeDefinitionNode
+      | ObjectTypeExtensionNode
       | InputObjectTypeDefinitionNode
-      | InterfaceTypeDefinitionNode,
+      | InputObjectTypeExtensionNode
+      | InterfaceTypeDefinitionNode
+      | InterfaceTypeExtensionNode,
     tsFile: SourceFile,
     mode: 'class' | 'interface',
     options: DefinitionsGeneratorOptions,
@@ -327,7 +343,10 @@ export class GraphQLAstExplorer {
     });
   }
 
-  addScalarDefinition(item: ScalarTypeDefinitionNode, tsFile: SourceFile) {
+  addScalarDefinition(
+    item: ScalarTypeDefinitionNode | ScalarTypeExtensionNode,
+    tsFile: SourceFile,
+  ) {
     const name = get(item, 'name.value');
     if (!name || name === 'Date') {
       return;
@@ -369,7 +388,10 @@ export class GraphQLAstExplorer {
     });
   }
 
-  addEnumDefinition(item: EnumTypeDefinitionNode, tsFile: SourceFile) {
+  addEnumDefinition(
+    item: EnumTypeDefinitionNode | EnumTypeExtensionNode,
+    tsFile: SourceFile,
+  ) {
     const name = get(item, 'name.value');
     if (!name) {
       return;
@@ -385,7 +407,10 @@ export class GraphQLAstExplorer {
     });
   }
 
-  addUnionDefinition(item: UnionTypeDefinitionNode, tsFile: SourceFile) {
+  addUnionDefinition(
+    item: UnionTypeDefinitionNode | UnionTypeExtensionNode,
+    tsFile: SourceFile,
+  ) {
     const name = get(item, 'name.value');
     if (!name) {
       return;

diff --git a/tests/generated-definitions/federation.fixture.ts b/tests/generated-definitions/federation.fixture.ts
@@ -6,7 +6,22 @@
 
 /* tslint:disable */
 /* eslint-disable */
+export enum Category {
+    POST = "POST"
+}
+
 export class Post {
     id: string;
     title: string;
+    author: User;
+    category: Category;
+}
+
+export abstract class IQuery {
+    abstract getPosts(): Post[] | Promise<Post[]>;
+}
+
+export class User {
+    id: string;
+    posts?: Post[];
 }
diff --git a/tests/generated-definitions/federation.graphql b/tests/generated-definitions/federation.graphql
@@ -1,6 +1,8 @@
 type Post {
   id: ID!
   title: String!
+  author: User!
+  category: Category!
 }
 
 extend type User @key(fields: "id") {
@@ -10,4 +12,8 @@ extend type User @key(fields: "id") {
 
 extend type Query {
   getPosts: [Post]
-}
+}
+
+extend enum Category {
+  POST
+}