fix(Discriminator): type definitions for Flow

Author: nodkz

src/composeWithMongooseDiscriminators.js

@@ -1,13 +1,14 @@
 /* @flow */
 
 import { schemaComposer as globalSchemaComposer } from 'graphql-compose';
-import type { Model } from 'mongoose';
+import type { MongooseModel } from 'mongoose';
 import { type DiscriminatorOptions, DiscriminatorTypeComposer } from './discriminators';
 
-export function composeWithMongooseDiscriminators(
-  baseModel: Class<Model>,
-  opts?: DiscriminatorOptions
-): DiscriminatorTypeComposer<any, any> {
+export function composeWithMongooseDiscriminators<TSource, TContext>(
+  baseModel: Class<TSource>, // === MongooseModel,
+  opts?: DiscriminatorOptions<TContext>
+): DiscriminatorTypeComposer<TSource, TContext> {
+  const m: MongooseModel = (baseModel: any);
   const sc = (opts ? opts.schemaComposer : null) || globalSchemaComposer;
-  return DiscriminatorTypeComposer.createFromModel(baseModel, sc, opts);
+  return DiscriminatorTypeComposer.createFromModel(m, sc, opts);
 }

src/discriminators/DiscriminatorTypeComposer.js

@@ -19,9 +19,9 @@ import { mergeCustomizationOptions } from './utils/mergeCustomizationOptions';
 import { prepareBaseResolvers } from './prepareBaseResolvers';
 import { reorderFields } from './utils/reorderFields';
 
-export type DiscriminatorOptions = {|
+export type DiscriminatorOptions<TContext> = {|
   reorderFields?: boolean | string[], // true order: _id, DKey, DInterfaceFields, DiscriminatorFields
-  ...TypeConverterOpts<any>,
+  ...TypeConverterOpts<TContext>,
 |};
 
 type Discriminators = {
@@ -75,7 +75,7 @@ export class DiscriminatorTypeComposer<TSource, TContext> extends ObjectTypeComp
 
   DKeyETC: EnumTypeComposer<TContext>;
 
-  opts: DiscriminatorOptions;
+  opts: DiscriminatorOptions<TContext>;
 
   DInterface: InterfaceTypeComposer<TSource, TContext>;
 

src/discriminators/composeChildTC.js

@@ -32,7 +32,7 @@ function copyBaseTCFieldsToChildTC(
 export function composeChildTC<TSource, TContext>(
   baseDTC: DiscriminatorTypeComposer<any, TContext>,
   childTC: ObjectTypeComposer<TSource, TContext>,
-  opts: DiscriminatorOptions
+  opts: DiscriminatorOptions<TContext>
 ): ObjectTypeComposer<TSource, TContext> {
   const composedChildTC = copyBaseTCFieldsToChildTC(baseDTC, childTC);
 

src/discriminators/prepareChildResolvers.js

@@ -134,7 +134,7 @@ function reorderFieldsRecordFilter<TSource, TContext>(
 export function prepareChildResolvers<TSource, TContext>(
   baseDTC: DiscriminatorTypeComposer<TSource, TContext>,
   childTC: ObjectTypeComposer<TSource, TContext>,
-  opts: DiscriminatorOptions
+  opts: DiscriminatorOptions<TContext>
 ) {
   for (const resolverName in EMCResolvers) {
     if (EMCResolvers.hasOwnProperty(resolverName) && childTC.hasResolver(resolverName)) {