resolver: handle multiple fragment (#257)

* Add test for issue 188

* resolver: handle multiple fragment

Fix #188
Fix #195

Author: LoicMahieu

src/resolver.js

@@ -40,7 +40,7 @@ function resolverFactory(target, options) {
     var ast = info.fieldASTs
       , type = info.returnType
       , list = options.list || type instanceof GraphQLList
-      , simpleAST = simplifyAST(ast[0], info)
+      , simpleAST = simplifyAST(ast, info)
       , fields = simpleAST.fields
       , findOptions = argsToFindOptions(args, model);
 

src/simplifyAST.js

@@ -31,7 +31,16 @@ module.exports = function simplifyAST(ast, info, parent) {
   info = info || {};
 
   if (ast.selectionSet) selections = ast.selectionSet.selections;
-  if (Array.isArray(ast)) selections = ast;
+  if (Array.isArray(ast)) {
+    let simpleAST = {};
+    ast.forEach(ast => {
+      simpleAST = deepMerge(
+        simpleAST, simplifyAST(ast, info)
+      );
+    });
+
+    return simpleAST;
+  }
 
   if (isFragment(info, ast)) {
     return simplifyAST(info.fragments[ast.name.value], info);

test/integration/relay.test.js

@@ -155,6 +155,10 @@ describe('relay', function () {
         name: {
           type: GraphQLString,
           resolve: () => 'Viewer!'
+        },
+        allProjects: {
+          type: new GraphQLList(projectType),
+          resolve: resolver(Project)
         }
       }),
       interfaces: [nodeInterface]
@@ -346,6 +350,35 @@ describe('relay', function () {
         });
       });
     });
+
+    it('should merge nested queries from multiple fragments', function() {
+      var globalId = toGlobalId('Viewer');
+      return graphql(schema, `
+        {
+          node(id: "${globalId}") {
+            id
+            ... F0
+            ... F1
+          }
+        }
+        fragment F0 on Viewer {
+          allProjects {
+            id
+          }
+        }
+        fragment F1 on Viewer {
+          allProjects {
+            id
+            name
+          }
+        }
+      `).then(result => {
+        if (result.errors) throw result.errors[0]
+
+        expect(result.data.node.allProjects[0].id).to.not.be.null;
+        expect(result.data.node.allProjects[0].name).to.not.be.null;
+      });
+    });
   });
 
   it('should support first queries on connections', function() {