Merge pull request #79 from cooperka/relation-frags

Allow fragments within relations

src/selections.js

@@ -8,6 +8,7 @@ import {
   innerType,
   isArrayType,
   isGraphqlScalarType,
+  extractSelections,
   relationDirective
 } from './utils';
 
@@ -105,9 +106,14 @@ export function buildCypherSelection({
   const nestedVariable = variableName + '_' + fieldName;
   const skipLimit = computeSkipLimit(headSelection, resolveInfo.variableValues);
 
+  const subSelections = extractSelections(
+    headSelection.selectionSet.selections,
+    resolveInfo.fragments
+  );
+
   const subSelection = recurse({
     initial: '',
-    selections: headSelection.selectionSet.selections,
+    selections: subSelections,
     variableName: nestedVariable,
     schemaType: innerSchemaType,
     resolveInfo

test/cypherTest.js

@@ -911,3 +911,61 @@ test('nested fragments', t => {
     augmentedSchemaCypherTestRunner(t, graphQLQuery, {}, expectedCypherQuery)
   ]);
 });
+
+test('fragments on relations', t => {
+  const graphQLQuery = `
+    query movieItems {
+      Movie(year:2010) {
+        title
+        actors {
+          ...Foo
+        }
+      }
+    }
+    
+    fragment Foo on Actor {
+      name
+    }`,
+    expectedCypherQuery = `MATCH (movie:Movie {year:$year}) RETURN movie { .title ,actors: [(movie)<-[:ACTED_IN]-(movie_actors:Actor) | movie_actors { .name }] } AS movie SKIP $offset`;
+
+  t.plan(3);
+  return Promise.all([
+    cypherTestRunner(t, graphQLQuery, {}, expectedCypherQuery, {
+      year: 2010,
+      first: -1,
+      offset: 0
+    }),
+    augmentedSchemaCypherTestRunner(t, graphQLQuery, {}, expectedCypherQuery)
+  ]);
+});
+
+test('nested fragments on relations', t => {
+  const graphQLQuery = `
+    query movieItems {
+      Movie(year:2010) {
+        ...Foo
+      }
+    }
+    
+    fragment Foo on Movie {
+      title
+      actors {
+        ...Bar
+      }
+    }
+    
+    fragment Bar on Actor {
+      name
+    }`,
+    expectedCypherQuery = `MATCH (movie:Movie {year:$year}) RETURN movie { .title ,actors: [(movie)<-[:ACTED_IN]-(movie_actors:Actor) | movie_actors { .name }] } AS movie SKIP $offset`;
+
+  t.plan(3);
+  return Promise.all([
+    cypherTestRunner(t, graphQLQuery, {}, expectedCypherQuery, {
+      year: 2010,
+      first: -1,
+      offset: 0
+    }),
+    augmentedSchemaCypherTestRunner(t, graphQLQuery, {}, expectedCypherQuery)
+  ]);
+});