Rollback storing generated type in model. Add convertSchemaToGraphQL with storing generated type.

Author: nodkz

src/definition.js

@@ -15,15 +15,21 @@ export type MongooseModelSchemaT = {
     [optName: string]: MongooseFieldT,
   },
   _indexes?: MonooseModelIndex[],
+  _gqcTypeComposer?: TypeComposer,
 }
 
 export type MonooseModelIndex = [
   { [fieldName: string]: number | string },
   { [optionName: string]: mixed },
 ];
 
+export type MongoosePseudoModelT = {
+  _gqcTypeComposer?: TypeComposer,
+  schema: MongooseModelSchemaT,
+}
+
 export type MongooseModelT = {
-  _gqcTypeComposer: TypeComposer,
+  _gqcTypeComposer?: TypeComposer,
   modelName: string,
   schema: MongooseModelSchemaT,
   create(doc: Object | Object[]): Promise<Object>,

src/fieldsConverter.js

@@ -23,6 +23,8 @@ import GraphQLMongoID from './types/mongoid';
 
 import type {
   MongooseModelT,
+  MongooseModelSchemaT,
+  MongoosePseudoModelT,
   MongooseFieldT,
   MongooseFieldMapT,
   ComplexTypesT,
@@ -98,7 +100,9 @@ export function dotPathsToEmbedded(fields: MongooseFieldMapT): MongooseFieldMapT
   return result;
 }
 
-export function getFieldsFromModel(model: MongooseModelT): MongooseFieldMapT {
+export function getFieldsFromModel(
+  model: MongooseModelT | MongoosePseudoModelT
+): MongooseFieldMapT {
   if (!model || !model.schema || !model.schema.paths) {
     throw new Error('You provide incorrect mongoose model to `getFieldsFromModel()`. '
     + 'Correct model should contain `schema.paths` properties.');
@@ -118,18 +122,14 @@ export function getFieldsFromModel(model: MongooseModelT): MongooseFieldMapT {
 }
 
 export function convertModelToGraphQL(
-  model: MongooseModelT,
+  model: MongooseModelT | MongoosePseudoModelT,
   typeName: string
 ): TypeComposer {
   if (!typeName) {
     throw new Error('You provide empty name for type. '
     + '`name` argument should be non-empty string.');
   }
 
-  if (model._gqcTypeComposer) {
-    return model._gqcTypeComposer;
-  }
-
   const typeComposer = new TypeComposer(
     new GraphQLObjectType({
       name: typeName,
@@ -139,8 +139,6 @@ export function convertModelToGraphQL(
     })
   );
 
-  model._gqcTypeComposer = typeComposer; // eslint-disable-line
-
   const mongooseFields = getFieldsFromModel(model, typeName);
   const graphqlFields = {};
 
@@ -156,6 +154,27 @@ export function convertModelToGraphQL(
   return typeComposer;
 }
 
+export function convertSchemaToGraphQL(
+  schema: MongooseModelSchemaT,
+  typeName: string
+) {
+  if (!typeName) {
+    throw new Error('You provide empty name for type. '
+    + '`name` argument should be non-empty string.');
+  }
+
+  if (schema._gqcTypeComposer) {
+    return schema._gqcTypeComposer;
+  }
+
+  const tc = convertModelToGraphQL({ schema }, typeName);
+  // also generate InputType
+  tc.getInputTypeComposer();
+
+  schema._gqcTypeComposer = tc; // eslint-disable-line
+  return tc;
+}
+
 export function convertFieldToGraphQL(
   field: MongooseFieldT,
   prefix: string = ''
@@ -255,9 +274,7 @@ export function embeddedToGraphQL(
   }
 
   const typeName = `${prefix}${capitalize(fieldName)}`;
-  // $FlowFixMe
-  const fieldAsModel: MongooseModelT = field;
-  const typeComposer = convertModelToGraphQL(fieldAsModel, typeName);
+  const typeComposer = convertSchemaToGraphQL(field.schema, typeName);
   removePseudoIdField(typeComposer);
 
   return typeComposer.getType();