Merge pull request #31 from benjie/patch-1

Add support for variables in JSON subfields
taion · Apr 13, 2018 · 6f45099 · 6f45099
2 parents 6e45ae4 + 96f706a
commit 6f45099
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/src/index.js b/src/index.js
@@ -5,7 +5,7 @@ function identity(value) {
   return value;
 }
 
-function parseLiteral(ast) {
+function parseLiteral(ast, variables) {
   switch (ast.kind) {
     case Kind.STRING:
     case Kind.BOOLEAN:
@@ -15,16 +15,20 @@ function parseLiteral(ast) {
       return parseFloat(ast.value);
     case Kind.OBJECT: {
       const value = Object.create(null);
-      ast.fields.forEach((field) => {
-        value[field.name.value] = parseLiteral(field.value);
+      ast.fields.forEach(field => {
+        value[field.name.value] = parseLiteral(field.value, variables);
       });
 
       return value;
     }
     case Kind.LIST:
-      return ast.values.map(parseLiteral);
+      return ast.values.map(n => parseLiteral(n, variables));
     case Kind.NULL:
       return null;
+    case Kind.VARIABLE: {
+      const name = ast.name.value;
+      return variables ? variables[name] : undefined;
+    }
     default:
       return undefined;
   }

diff --git a/test/index.test.js b/test/index.test.js
@@ -1,4 +1,4 @@
-import { graphql, GraphQLObjectType, GraphQLSchema } from 'graphql';
+import { graphql, GraphQLInt, GraphQLObjectType, GraphQLSchema } from 'graphql';
 
 import GraphQLJSON from '../src';
 
@@ -46,6 +46,7 @@ describe('GraphQLJSON', () => {
           },
         },
       }),
+      types: [GraphQLInt],
     });
   });
 
@@ -59,7 +60,7 @@ describe('GraphQLJSON', () => {
     it('should support parsing values', () =>
       graphql(
         schema,
-        'query ($arg: JSON) { value(arg: $arg) }',
+        'query ($arg: JSON!) { value(arg: $arg) }',
         null,
         null,
         { arg: FIXTURE },
@@ -72,25 +73,25 @@ describe('GraphQLJSON', () => {
   describe('parseLiteral', () => {
     it('should support parsing literals', () =>
       graphql(schema, `
-        {
+        query ($intValue: Int = 3) {
           value(arg: {
             string: "string",
-            int: 3,
+            int: $intValue,
             float: 3.14,
             true: true,
             false: false,
             null: null,
             object: {
               string: "string",
-              int: 3,
+              int: $intValue,
               float: 3.14,
               true: true,
               false: false,
               null: null,
             },
             array: [
               "string",
-              3,
+              $intValue,
               3.14,
               true,
               false,