Merge branch 'master' of github.com:graphql/graphql-js

Author: leebyron

src/tools/print-schema/src/index.js

@@ -7,8 +7,12 @@
  *  of patent rights can be found in the PATENTS file in the same directory.
  */
 
-import { getIntrospectionResult }
-  from '../../../language/schema/printer';
+import { parseSchemaIntoAST }
+  from '../../../language/schema/';
+import { buildASTSchema, introspectionQuery }
+  from '../../../utilities/';
+import { graphql }
+  from '../../../';
 
 var Promise = require('bluebird');
 var parseArgs = require('minimist');
@@ -38,7 +42,9 @@ export async function executeTool() {
     }
 
     var body = await fs.readFileAsync(argDict.file, 'utf8');
-    var result = await getIntrospectionResult(body, argDict.query);
+    var ast = parseSchemaIntoAST(body);
+    var astSchema = buildASTSchema(ast, argDict.query, argDict.mutation);
+    var result = await graphql(astSchema, introspectionQuery);
     var out = await JSON.stringify(result, null, 2);
     console.log(out);
   } catch (error) {
@@ -54,4 +60,8 @@ introspection query result from querying that schema.
 Required:
 
 --file <path>: The path to the input schema definition file.
---query <queryType>: The query type (root type) of the schema.`;
+--query <queryType>: The query type (root type) of the schema.
+
+Optional:
+
+--mutation <mutationType>: The mutation type (root type) of the schema.`;

src/utilities/__tests__/buildASTSchema.js

@@ -20,9 +20,9 @@ import { buildASTSchema } from '../buildASTSchema';
  * into an in-memory GraphQLSchema, and then finally
  * printing that GraphQL into the DSL
  */
-function cycleOutput(body, queryType) {
+function cycleOutput(body, queryType, mutationType) {
   var ast = parseSchemaIntoAST(body);
-  var schema = buildASTSchema(ast, queryType);
+  var schema = buildASTSchema(ast, queryType, mutationType);
   return '\n' + printSchema(schema);
 }
 
@@ -231,6 +231,22 @@ type Hello {
     var output = cycleOutput(body, 'Hello');
     expect(output).to.equal(body);
   });
+
+  it('Simple type with mutation', () => {
+    var body = `
+type HelloScalars {
+  str: String
+  int: Int
+  bool: Boolean
+}
+
+type Mutation {
+  addHelloScalars(str: String, int: Int, bool: Boolean): HelloScalars
+}
+`;
+    var output = cycleOutput(body, 'HelloScalars', 'Mutation');
+    expect(output).to.equal(body);
+  });
 });
 
 describe('Schema Parser Failures', () => {

src/utilities/buildASTSchema.js

@@ -151,7 +151,7 @@ export function buildASTSchema(
     schema = new GraphQLSchema({query: queryType});
   } else {
     schema = new GraphQLSchema({
-      query: queryTypeName,
+      query: queryType,
       mutation: produceTypeDef(astMap[mutationTypeName]),
     });
   }