Make callsToGraphQL and callsFromGraphQL preserve type (fixes #1256)

Summary: As papigers currently doesn't have time to finish #1257 I decided to take over. Closes #1336 Differential Revision: D3714846 Pulled By: josephsavona fbshipit-source-id: 0e4fd7648bc47c0eca9865ed31cec42ff6c3e55a
facebook · Aug 17, 2016 · 2618a77 · 2618a77
1 parent 8724986
commit 2618a77
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 10 deletions.
diff --git a/src/query/__tests__/RelayQueryRoot-test.js b/src/query/__tests__/RelayQueryRoot-test.js
@@ -159,7 +159,7 @@ describe('RelayQueryRoot', () => {
     expect(me.getIdentifyingArg()).toEqual(undefined);
 
     expect(usernames.getIdentifyingArg()).toEqual(
-      {name: 'names', value: 'mroch'}
+      {name: 'names', type: '[String!]!', value: 'mroch'}
     );
 
     expect(getNode(Relay.QL`

diff --git a/src/query/__tests__/callsToGraphQL-test.js b/src/query/__tests__/callsToGraphQL-test.js
@@ -22,39 +22,43 @@ describe('callsToGraphQL', function() {
   it('converts array calls with null values', () => {
     const relayCalls = [{
       name: 'size',
+      type: 'Int',
       value: null,
     }];
-    const graphqlCalls = [RelayTestUtils.createCall('size', null)];
+    const graphqlCalls = [RelayTestUtils.createCall('size', null, 'Int')];
     expect(callsFromGraphQL(graphqlCalls)).toEqual(relayCalls);
     expect(callsToGraphQL(relayCalls)).toEqual(graphqlCalls);
   });
 
   it('converts array calls without values', () => {
     const relayCalls = [{
       name: 'size',
+      type: '[Int]',
       value: [],
     }];
-    const graphqlCalls = [RelayTestUtils.createCall('size', [])];
+    const graphqlCalls = [RelayTestUtils.createCall('size', [], '[Int]')];
     expect(callsFromGraphQL(graphqlCalls)).toEqual(relayCalls);
     expect(callsToGraphQL(relayCalls)).toEqual(graphqlCalls);
   });
 
   it('converts calls with array values', () => {
     const relayCalls = [{
       name: 'size',
+      type: '[Int]',
       value: [32, 64],
     }];
-    const graphqlCalls = [RelayTestUtils.createCall('size', [32, 64])];
+    const graphqlCalls = [RelayTestUtils.createCall('size', [32, 64], '[Int]')];
     expect(callsFromGraphQL(graphqlCalls)).toEqual(relayCalls);
     expect(callsToGraphQL(relayCalls)).toEqual(graphqlCalls);
   });
 
   it('converts singular calls with null values', () => {
     const relayCalls = [{
       name: 'size',
+      type: 'Int',
       value: 32,
     }];
-    const graphqlCalls = [RelayTestUtils.createCall('size', 32)];
+    const graphqlCalls = [RelayTestUtils.createCall('size', 32, 'Int')];
     expect(callsFromGraphQL(graphqlCalls)).toEqual(relayCalls);
     expect(callsToGraphQL(relayCalls)).toEqual(graphqlCalls);
   });

diff --git a/src/query/callsFromGraphQL.js b/src/query/callsFromGraphQL.js
@@ -25,6 +25,9 @@ const invariant = require('invariant');
 
 type CallOrDirective = {
   name: string,
+  metadata?: {
+    type?: ?string,
+  },
   value: ?ConcreteValue,
 };
 
@@ -53,7 +56,12 @@ function callsFromGraphQL(
         value = getCallValue(value, variables);
       }
     }
-    orderedCalls.push({name: callOrDirective.name, value});
+    const {metadata, name} = callOrDirective;
+    const orderedCall: Call = {name, value};
+    if (metadata && metadata.type) {
+      orderedCall.type = metadata.type;
+    }
+    orderedCalls.push(orderedCall);
   }
   return orderedCalls;
 }

diff --git a/src/query/callsToGraphQL.js b/src/query/callsToGraphQL.js
@@ -22,14 +22,14 @@ const QueryBuilder = require('QueryBuilder');
  * Convert from plain object `{name, value}` calls to GraphQL call nodes.
  */
 function callsToGraphQL(calls: Array<Call>): Array<ConcreteCall> {
-  return calls.map(({name, value}) => {
+  return calls.map(({name, type, value}) => {
     let concreteValue = null;
     if (Array.isArray(value)) {
       concreteValue = value.map(QueryBuilder.createCallValue);
     } else if (value != null)  {
       concreteValue = QueryBuilder.createCallValue(value);
     }
-    return QueryBuilder.createCall(name, concreteValue);
+    return QueryBuilder.createCall(name, concreteValue, type);
   });
 }
 

diff --git a/src/tools/__mocks__/RelayTestUtils.js b/src/tools/__mocks__/RelayTestUtils.js
@@ -121,15 +121,15 @@ const RelayTestUtils = {
     return reference;
   },
 
-  createCall(name, value) {
+  createCall(name, value, type) {
     const QueryBuilder = require('QueryBuilder');
 
     if (Array.isArray(value)) {
       value = value.map(QueryBuilder.createCallValue);
     } else if (value != null) {
       value = QueryBuilder.createCallValue(value);
     }
-    return QueryBuilder.createCall(name, value);
+    return QueryBuilder.createCall(name, value, type);
   },
 
   createContainerFragment(fragment) {