concat ASTs instead of IDLs

cajames · Mar 29, 2017 · 01b6439 · 01b6439
1 parent cb2a54c
commit 01b6439
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -2,7 +2,9 @@
 
 import {
   Source,
-  buildSchema,
+  parse,
+  concatAST,
+  buildASTSchema,
 } from 'graphql';
 
 import * as fs from 'fs';
@@ -67,7 +69,7 @@ let fileName = fileArg || (argv.extend ?
   './schema_extension.faker.graphql' :
   './schema.faker.graphql');
 
-const fakeDefinitionIDL = readIDL(path.join(__dirname, 'fake_definition.graphql'));
+const fakeDefinitionAST = readAST(path.join(__dirname, 'fake_definition.graphql'));
 
 let userIDL;
 if (existsSync(fileName)) {
@@ -87,6 +89,10 @@ function readIDL(filepath) {
   );
 }
 
+function readAST(filepath) {
+  return parse(readIDL(filepath));
+}
+
 function saveIDL(idl) {
   fs.writeFileSync(fileName, idl);
   log(`${chalk.green('✚')} schema saved to ${chalk.magenta(fileName)} on ${(new Date()).toLocaleString()}`);
@@ -113,10 +119,8 @@ if (argv.e) {
 }
 
 function buildServerSchema(idl) {
-  return buildSchema(new Source(
-    idl.body + '\n' + fakeDefinitionIDL.body,
-    idl.name
-  ).body);
+  var ast = concatAST([parse(idl), fakeDefinitionAST]);
+  return buildASTSchema(ast);
 }
 
 function runServer(schemaIDL: Source, extensionIDL: Source, optionsCB) {