Fixing error when filtering or generating propTypes for fragments wit…

…h variables

packages/graphql-anywhere/src/__tests__/index.ts

@@ -214,7 +214,7 @@ const execute = (graphql, r) => () => {
       }
     `;
 
-    const result = await graphql(resolver, query, null, null, null);
+    const result = await graphql(resolver, query, null, null);
 
     expect(result).toEqual({
       a: {

packages/graphql-anywhere/src/__tests__/utilities.ts

@@ -3,7 +3,7 @@ import gql, { disableFragmentWarnings } from 'graphql-tag';
 // Turn off warnings for repeated fragment names
 disableFragmentWarnings();
 
-import { filter, check } from '../utilities';
+import { filter, check, propType } from '../utilities';
 
 describe('utilities', () => {
   describe('with a single query', () => {
@@ -16,6 +16,24 @@ describe('utilities', () => {
         }
       }
     `;
+    const fragment = gql`
+      fragment foo on Foo {
+        alias: name
+        height(unit: METERS)
+        avatar {
+          square
+        }
+      }
+    `;
+    const fragmentWithAVariable = gql`
+      fragment foo on Foo {
+        alias: name
+        height(unit: METERS)
+        avatar @include(if: $foo) {
+          square
+        }
+      }
+    `;
     const data = {
       alias: 'Bob',
       name: 'Wrong',
@@ -80,6 +98,22 @@ describe('utilities', () => {
       expect(filter(doc, arrayData)).toEqual(filteredArrayData);
     });
 
+    it('can filter data for fragments ', () => {
+      expect(filter(fragment, data)).toEqual(filteredData);
+    });
+
+    it('can filter data for fragments with variables', () => {
+      expect(filter(fragmentWithAVariable, data)).toEqual(filteredData);
+    });
+
+    it('can generate propTypes for fragments', () => {
+      expect(propType(fragment)).toEqual(expect.any(Function));
+    });
+
+    it('can generate propTypes for fragments with variables', () => {
+      expect(propType(fragmentWithAVariable)).toEqual(expect.any(Function));
+    });
+
     it('can check matching data', () => {
       check(doc, filteredData);
     });

packages/graphql-anywhere/src/graphql.ts

@@ -81,7 +81,7 @@ export function graphql(
   document: DocumentNode,
   rootValue?: any,
   contextValue?: any,
-  variableValues?: VariableMap,
+  variableValues: VariableMap = {},
   execOptions: ExecOptions = {},
 ) {
   const mainDefinition = getMainDefinition(document);
@@ -120,8 +120,8 @@ function executeSelectionSet(
   const result = {};
 
   selectionSet.selections.forEach(selection => {
-    if (!shouldInclude(selection, variables)) {
-      // Skip this entirely
+    if (variables && !shouldInclude(selection, variables)) {
+      // Skip selection sets which we're able to determine should not be run
       return;
     }
 

packages/graphql-anywhere/src/utilities.ts

@@ -17,8 +17,8 @@ export function filter<FD = any, D extends FD = any>(
   };
 
   return Array.isArray(data)
-    ? data.map(dataObj => graphql(resolver, doc, dataObj))
-    : graphql(resolver, doc, data);
+    ? data.map(dataObj => graphql(resolver, doc, dataObj, null, null))
+    : graphql(resolver, doc, data, null, null);
 }
 
 // TODO: we should probably make check call propType and then throw,
@@ -44,7 +44,7 @@ export function check(doc: DocumentNode, data: any): void {
     doc,
     data,
     {},
-    {},
+    null,
     {
       fragmentMatcher: () => false,
     },