simplifyValue (#259)

* simplifyValue

* add unit-tests

* fix unit-tests

Author: ivnivnch

src/simplifyAST.js

@@ -26,6 +26,18 @@ function isFragment(info, ast) {
   return hasFragments(info) && info.fragments[ast.name.value] && ast.kind !== 'FragmentDefinition';
 }
 
+function simplifyValue(value, info) {
+  if (value.values) {
+    return value.values.map(value => simplifyValue(value, info));
+  }
+  if ('value' in value) {
+    return value.value;
+  }
+  if (value.name) {
+    return info.variableValues[value.name.value];
+  }
+}
+
 module.exports = function simplifyAST(ast, info, parent) {
   var selections;
   info = info || {};
@@ -73,11 +85,7 @@ module.exports = function simplifyAST(ast, info, parent) {
     }
 
     simpleAST.fields[key].args = selection.arguments.reduce(function (args, arg) {
-      if (arg.value.values) {
-        args[arg.name.value] = arg.value.values.map(value => value.value);
-      } else {
-        args[arg.name.value] = arg.value.value;
-      }
+      args[arg.name.value] = simplifyValue(arg.value, info);
       return args;
     }, {});
 

test/unit/simplifyAST.test.js

@@ -96,6 +96,60 @@ describe('simplifyAST', function () {
     })
   });
 
+  it('should simplify a basic structure with nested array args', function () {
+    expect(simplifyAST(parse(`
+      {
+        user(units: ["1", "2", ["3", ["4"], [["5"], "6"], "7"]]) {
+          name
+        }
+      }
+    `))).to.deep.equal({
+      args: {},
+      fields: {
+        user: {
+          args: {
+            units: ["1", "2", ["3", ["4"], [["5"], "6"], "7"]]
+          },
+          fields: {
+            name: {
+              args: {},
+              fields: {}
+            }
+          }
+        }
+      }
+    })
+  });
+
+  it('should simplify a basic structure with variable args', function () {
+    expect(simplifyAST(parse(`
+      {
+        user(id: $id) {
+          name
+        }
+      }
+    `), {
+      variableValues: {
+        id: "1"
+      }
+    })).to.deep.equal({
+      args: {},
+      fields: {
+        user: {
+          args: {
+            id: "1"
+          },
+          fields: {
+            name: {
+              args: {},
+              fields: {}
+            }
+          }
+        }
+      }
+    })
+  });
+
   it('should simplify a basic structure with an inline fragment', function () {
     expect(simplifyAST(parse(`
       {