Interface and union resolvers

packages/graphqlgen/src/generators/common.ts

@@ -2,9 +2,9 @@ import * as os from 'os'
 
 import {
   GraphQLTypeObject,
-  GraphQLType,
   GraphQLTypeField,
   getGraphQLEnumValues,
+  GraphQLTypeDefinition,
 } from '../source-helper'
 import { ModelMap, ContextDefinition, GenerateArgs, Model } from '../types'
 import { flatten, uniq } from '../utils'
@@ -30,6 +30,14 @@ export interface TypeToInputTypeAssociation {
   [objectTypeName: string]: string[]
 }
 
+export interface InterfacesMap {
+  [interfaceName: string]: GraphQLTypeDefinition[]
+}
+
+export interface UnionsMap {
+  [unionName: string]: GraphQLTypeDefinition[]
+}
+
 export function fieldsFromModelDefinition(
   modelDef: TypeDefinition,
 ): FieldDefinition[] {
@@ -116,7 +124,7 @@ export function getContextName(context?: ContextDefinition) {
 }
 
 export function getModelName(
-  type: GraphQLType,
+  type: GraphQLTypeDefinition,
   modelMap: ModelMap,
   emptyType: string = '{}',
 ): string {
@@ -192,6 +200,8 @@ export function shouldScaffoldFieldResolver(
 export function printFieldLikeType(
   field: GraphQLTypeField,
   modelMap: ModelMap,
+  interfacesMap: InterfacesMap,
+  unionsMap: UnionsMap,
 ) {
   if (field.type.isScalar) {
     return `${getTypeFromGraphQLType(field.type.name)}${
@@ -205,6 +215,28 @@ export function printFieldLikeType(
     }`
   }
 
+  if (field.type.isInterface) {
+    let types = interfacesMap[field.type.name]
+      .map(type => getModelName(type, modelMap))
+      .filter(uniq)
+      .join(' | ')
+    if (field.type.isArray) {
+      types = `Array<${types}>`
+    }
+    return `${types}${!field.type.isRequired ? '| null' : ''}`
+  }
+
+  if (field.type.isUnion) {
+    let types = unionsMap[field.type.name]
+      .map(type => getModelName(type, modelMap))
+      .filter(uniq)
+      .join(' | ')
+    if (field.type.isArray) {
+      types = `Array<${types}>`
+    }
+    return `${types}${!field.type.isRequired ? '| null' : ''}`
+  }
+
   return `${getModelName(field.type, modelMap)}${
     field.type.isArray ? '[]' : ''
   }${!field.type.isRequired ? '| null' : ''}`
@@ -274,11 +306,13 @@ export function isParentType(name: string) {
 
 export function groupModelsNameByImportPath(models: Model[]) {
   return models.reduce<{ [importPath: string]: string[] }>((acc, model) => {
-    if (acc[model.importPathRelativeToOutput] === undefined) {
-      acc[model.importPathRelativeToOutput] = []
+    const fileModels = acc[model.importPathRelativeToOutput] || []
+
+    if (fileModels.indexOf(model.definition.name) === -1) {
+      fileModels.push(model.definition.name)
     }
 
-    acc[model.importPathRelativeToOutput].push(model.definition.name)
+    acc[model.importPathRelativeToOutput] = fileModels
 
     return acc
   }, {})

packages/graphqlgen/src/generators/flow-generator.ts

@@ -14,6 +14,8 @@ import {
   renderDefaultResolvers,
   renderEnums,
   TypeToInputTypeAssociation,
+  InterfacesMap,
+  UnionsMap,
 } from './common'
 
 export function format(code: string, options: prettier.Options = {}) {
@@ -65,12 +67,35 @@ export function generate(args: GenerateArgs): string {
       }
     }, {})
 
+  const interfacesMap: InterfacesMap = args.interfaces.reduce(
+    (interfaces, int) => {
+      return {
+        ...interfaces,
+        [int.name]: int.types,
+      }
+    },
+    {},
+  )
+
+  const unionsMap: InterfacesMap = args.unions.reduce((interfaces, int) => {
+    return {
+      ...interfaces,
+      [int.name]: int.types,
+    }
+  }, {})
+
   return `\
   ${renderHeader(args)}
 
   ${renderEnums(args)}
 
-  ${renderNamespaces(args, typeToInputTypeAssociation, inputTypesMap)}
+  ${renderNamespaces(
+    args,
+    interfacesMap,
+    unionsMap,
+    typeToInputTypeAssociation,
+    inputTypesMap,
+  )}
 
   ${renderResolvers(args)}
 
@@ -111,19 +136,30 @@ function renderContext(context?: ContextDefinition) {
 
 function renderNamespaces(
   args: GenerateArgs,
+  interfacesMap: InterfacesMap,
+  unionsMap: UnionsMap,
   typeToInputTypeAssociation: TypeToInputTypeAssociation,
   inputTypesMap: InputTypesMap,
 ): string {
   return args.types
     .filter(type => type.type.isObject)
     .map(type =>
-      renderNamespace(type, typeToInputTypeAssociation, inputTypesMap, args),
+      renderNamespace(
+        type,
+        interfacesMap,
+        unionsMap,
+        typeToInputTypeAssociation,
+        inputTypesMap,
+        args,
+      ),
     )
     .join(os.EOL)
 }
 
 function renderNamespace(
   type: GraphQLTypeObject,
+  interfacesMap: InterfacesMap,
+  unionsMap: UnionsMap,
   typeToInputTypeAssociation: TypeToInputTypeAssociation,
   inputTypesMap: InputTypesMap,
   args: GenerateArgs,
@@ -137,15 +173,29 @@ function renderNamespace(
     ${renderInputTypeInterfaces(
       type,
       args.modelMap,
+      interfacesMap,
+      unionsMap,
       typeToInputTypeAssociation,
       inputTypesMap,
     )}
 
-    ${renderInputArgInterfaces(type, args.modelMap)}
+    ${renderInputArgInterfaces(type, args.modelMap, interfacesMap, unionsMap)}
 
-    ${renderResolverFunctionInterfaces(type, args.modelMap, args.context)}
+    ${renderResolverFunctionInterfaces(
+      type,
+      args.modelMap,
+      interfacesMap,
+      unionsMap,
+      args.context,
+    )}
 
-    ${renderResolverTypeInterface(type, args.modelMap, args.context)}
+    ${renderResolverTypeInterface(
+      type,
+      args.modelMap,
+      interfacesMap,
+      unionsMap,
+      args.context,
+    )}
 
     ${/* TODO renderResolverClass(type, modelMap) */ ''}
   `
@@ -154,6 +204,8 @@ function renderNamespace(
 function renderInputTypeInterfaces(
   type: GraphQLTypeObject,
   modelMap: ModelMap,
+  interfacesMap: InterfacesMap,
+  unionsMap: UnionsMap,
   typeToInputTypeAssociation: TypeToInputTypeAssociation,
   inputTypesMap: InputTypesMap,
 ) {
@@ -167,7 +219,13 @@ function renderInputTypeInterfaces(
         inputTypesMap[typeAssociation].name,
       )} {
       ${inputTypesMap[typeAssociation].fields.map(
-        field => `${field.name}: ${printFieldLikeType(field, modelMap)}`,
+        field =>
+          `${field.name}: ${printFieldLikeType(
+            field,
+            modelMap,
+            interfacesMap,
+            unionsMap,
+          )}`,
       )}
     }`
     })
@@ -177,16 +235,22 @@ function renderInputTypeInterfaces(
 function renderInputArgInterfaces(
   type: GraphQLTypeObject,
   modelMap: ModelMap,
+  interfacesMap: InterfacesMap,
+  unionsMap: UnionsMap,
 ): string {
   return type.fields
-    .map(field => renderInputArgInterface(type, field, modelMap))
+    .map(field =>
+      renderInputArgInterface(type, field, modelMap, interfacesMap, unionsMap),
+    )
     .join(os.EOL)
 }
 
 function renderInputArgInterface(
   type: GraphQLTypeObject,
   field: GraphQLTypeField,
   modelMap: ModelMap,
+  interfacesMap: InterfacesMap,
+  unionsMap: UnionsMap,
 ): string {
   if (field.arguments.length === 0) {
     return ''
@@ -200,6 +264,8 @@ function renderInputArgInterface(
           `${arg.name}: ${printFieldLikeType(
             arg as GraphQLTypeField,
             modelMap,
+            interfacesMap,
+            unionsMap,
           )}`,
       )
       .join(',' + os.EOL)}
@@ -210,11 +276,20 @@ function renderInputArgInterface(
 function renderResolverFunctionInterfaces(
   type: GraphQLTypeObject,
   modelMap: ModelMap,
+  interfacesMap: InterfacesMap,
+  unionsMap: UnionsMap,
   context?: ContextDefinition,
 ): string {
   return type.fields
     .map(field =>
-      renderResolverFunctionInterface(field, type, modelMap, context),
+      renderResolverFunctionInterface(
+        field,
+        type,
+        modelMap,
+        interfacesMap,
+        unionsMap,
+        context,
+      ),
     )
     .join(os.EOL)
 }
@@ -223,6 +298,8 @@ function renderResolverFunctionInterface(
   field: GraphQLTypeField,
   type: GraphQLTypeObject,
   modelMap: ModelMap,
+  interfacesMap: InterfacesMap,
+  unionsMap: UnionsMap,
   context?: ContextDefinition,
 ): string {
   const resolverName = `${upperFirst(type.name)}_${upperFirst(
@@ -236,7 +313,12 @@ function renderResolverFunctionInterface(
     info: GraphQLResolveInfo,
   )
   `
-  const returnType = printFieldLikeType(field, modelMap)
+  const returnType = printFieldLikeType(
+    field,
+    modelMap,
+    interfacesMap,
+    unionsMap,
+  )
 
   if (type.name === 'Subscription') {
     return `
@@ -255,13 +337,22 @@ function renderResolverFunctionInterface(
 function renderResolverTypeInterface(
   type: GraphQLTypeObject,
   modelMap: ModelMap,
+  interfacesMap: InterfacesMap,
+  unionsMap: UnionsMap,
   context?: ContextDefinition,
 ): string {
   return `
   export interface ${upperFirst(type.name)}_Resolvers {
     ${type.fields
       .map(field =>
-        renderResolverTypeInterfaceFunction(field, type, modelMap, context),
+        renderResolverTypeInterfaceFunction(
+          field,
+          type,
+          modelMap,
+          interfacesMap,
+          unionsMap,
+          context,
+        ),
       )
       .join(os.EOL)}
   }
@@ -272,6 +363,8 @@ function renderResolverTypeInterfaceFunction(
   field: GraphQLTypeField,
   type: GraphQLTypeObject,
   modelMap: ModelMap,
+  interfacesMap: InterfacesMap,
+  unionsMap: UnionsMap,
   context?: ContextDefinition,
 ): string {
   const resolverDefinition = `
@@ -281,7 +374,12 @@ function renderResolverTypeInterfaceFunction(
     ctx: ${getContextName(context)},
     info: GraphQLResolveInfo,
   )`
-  const returnType = printFieldLikeType(field, modelMap)
+  const returnType = printFieldLikeType(
+    field,
+    modelMap,
+    interfacesMap,
+    unionsMap,
+  )
 
   if (type.name === 'Subscription') {
     return `
@@ -301,10 +399,17 @@ function renderResolverTypeInterfaceFunction(
 function renderResolvers(args: GenerateArgs): string {
   return `
 export interface Resolvers {
-  ${args.types
-    .filter(type => type.type.isObject)
-    .map(type => `${type.name}: ${upperFirst(type.name)}_Resolvers`)
-    .join(',' + os.EOL)}
+  ${[
+    ...args.types
+      .filter(type => type.type.isObject)
+      .map(type => `${type.name}: ${upperFirst(type.name)}_Resolvers`),
+    ...args.interfaces.map(
+      type => `${type.name}?: ${upperFirst(type.name)}_Resolvers`,
+    ),
+    ...args.unions.map(
+      type => `${type.name}?: ${upperFirst(type.name)}_Resolvers`,
+    ),
+  ].join(`,${os.EOL}`)}
 }
   `
 }