From b90e531da5f01ae9836ee961a0fcf896c1a48583 Mon Sep 17 00:00:00 2001
From: Michael Graham <38390185+michaeldgraham@users.noreply.github.com>
Date: Thu, 30 Aug 2018 12:46:33 -0700
Subject: [PATCH 1/2] Initial support for makeAugmentedSchema

---
 src/augmentSchema.js | 46 +++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 43 insertions(+), 3 deletions(-)

diff --git a/src/augmentSchema.js b/src/augmentSchema.js
index d0e74362..d70d4f21 100644
--- a/src/augmentSchema.js
+++ b/src/augmentSchema.js
@@ -1,8 +1,8 @@
 import { makeExecutableSchema } from 'graphql-tools';
 import { neo4jgraphql } from './index';
-import { print } from 'graphql';
+import { print, parse } from 'graphql';
 
-export const makeAugmentedSchema = (typeMap, queryResolvers, mutationResolvers) => {
+export const augmentedSchema = (typeMap, queryResolvers, mutationResolvers) => {
   const augmentedTypeMap = augmentTypeMap(typeMap);
   const augmentedResolvers = augmentResolvers(queryResolvers, mutationResolvers, augmentedTypeMap);
   return makeExecutableSchema({
@@ -14,7 +14,47 @@ export const makeAugmentedSchema = (typeMap, queryResolvers, mutationResolvers)
   });
 }
 
-export const extractAstNodesFromSchema = (schema) => {
+export const makeAugmentedExecutableSchema = ({
+  typeDefs,
+  resolvers,
+  logger,
+  allowUndefinedInResolve,
+  resolverValidationOptions,
+  directiveResolvers,
+  schemaDirectives,
+  parseOptions,
+  inheritResolversFromInterfaces
+}) => {
+  const typeMap = extractTypeMapFromTypeDefs(typeDefs);
+  const augmentedTypeMap = augmentTypeMap(typeMap);
+  const queryResolvers = resolvers && resolvers.Query ? resolvers.Query : {};
+  const mutationResolvers = resolvers && resolvers.Mutation ? resolvers.Mutation : {};
+  const augmentedResolvers = augmentResolvers(queryResolvers, mutationResolvers, augmentedTypeMap);
+  resolverValidationOptions.requireResolversForResolveType = false;
+  return makeExecutableSchema({
+    typeDefs: printTypeMap(augmentedTypeMap),
+    resolvers: augmentedResolvers,
+    logger: logger,
+    allowUndefinedInResolve: allowUndefinedInResolve,
+    resolverValidationOptions: resolverValidationOptions,
+    directiveResolvers: directiveResolvers,
+    schemaDirectives: schemaDirectives,
+    parseOptions: parseOptions,
+    inheritResolversFromInterfaces: inheritResolversFromInterfaces
+  });
+}
+
+const extractTypeMapFromTypeDefs = (typeDefs) => {
+  // TODO: accept alternative typeDefs formats (arr of strings, ast, etc.)
+  // into a single string for parse, add validatation
+  const astNodes = parse(typeDefs).definitions;
+  return astNodes.reduce( (acc, t) => {
+    acc[t.name.value] = t;
+    return acc;
+  }, {});
+}
+
+export const extractTypeMapFromSchema = (schema) => {
   const typeMap = schema.getTypeMap();
   let astNode = {};
   return Object.keys(typeMap).reduce( (acc, t) => {

From 1347c4a168612b50c2649291392664f936ce05fe Mon Sep 17 00:00:00 2001
From: Michael Graham <38390185+michaeldgraham@users.noreply.github.com>
Date: Thu, 30 Aug 2018 12:47:44 -0700
Subject: [PATCH 2/2] Initial support for makeAugmentedSchema

---
 src/index.js | 40 ++++++++++++++++++++++++++++++++++++----
 1 file changed, 36 insertions(+), 4 deletions(-)

diff --git a/src/index.js b/src/index.js
index 23da9e46..ab882c34 100644
--- a/src/index.js
+++ b/src/index.js
@@ -16,9 +16,10 @@ import {
 } from './utils';
 import { buildCypherSelection } from './selections';
 import {
-  extractAstNodesFromSchema,
+  extractTypeMapFromSchema,
   extractResolvers,
-  makeAugmentedSchema
+  augmentedSchema,
+  makeAugmentedExecutableSchema
 } from './augmentSchema';
 import { checkRequestError } from './auth';
 
@@ -440,8 +441,39 @@ RETURN ${fromVar} {${subQuery}} AS ${fromVar};`;
 }
 
 export const augmentSchema = (schema) => {
-  let typeMap = extractAstNodesFromSchema(schema);
+  let typeMap = extractTypeMapFromSchema(schema);
   let queryResolvers = extractResolvers(schema.getQueryType());
   let mutationResolvers = extractResolvers(schema.getMutationType());
-  return makeAugmentedSchema(typeMap, queryResolvers, mutationResolvers);
+  return augmentedSchema(typeMap, queryResolvers, mutationResolvers);
+}
+
+export const makeAugmentedSchema = ({
+   schema,
+   typeDefs,
+   resolvers,
+   logger,
+   allowUndefinedInResolve=false,
+   resolverValidationOptions={},
+   directiveResolvers=null,
+   schemaDirectives=null,
+   parseOptions={},
+   inheritResolversFromInterfaces=false
+  }) => {
+    if(schema) {
+      return augmentSchema(schema);
+    }
+    if(!typeDefs) throw new Error(
+      'Must provide typeDefs'
+    );
+    return makeAugmentedExecutableSchema({
+      typeDefs,
+      resolvers,
+      logger,
+      allowUndefinedInResolve,
+      resolverValidationOptions,
+      directiveResolvers,
+      schemaDirectives,
+      parseOptions,
+      inheritResolversFromInterfaces
+    });
 }