Revert "Created a helper to build node() queries"

This reverts commit d1367a9.

src/__forks__/interface/RelayNodeInterface.js

@@ -11,11 +11,4 @@
 
 'use strict';
 
-const RelayNodeInterface = require('RelayOSSNodeInterface');
-
-const getQueryBuilderForNodeInterface = require('getQueryBuilderForNodeInterface');
-
-module.exports = {
-  ...RelayNodeInterface,
-  buildQuery: getQueryBuilderForNodeInterface(RelayNodeInterface),
-};
+module.exports = require('RelayOSSNodeInterface');

src/__forks__/traversal/__tests__/printRelayOSSQuery-test.js

@@ -191,14 +191,16 @@ describe('printRelayOSSQuery', () => {
     });
 
     it('throws for ref queries', () => {
-      var query = RelayNodeInterface.buildQuery(
+      var query = RelayQuery.Root.build(
+        RelayNodeInterface.NODE,
         new GraphQL.BatchCallVariable('q0', '$.*.actor.id'),
         [
           RelayQuery.Field.build('id'),
           RelayQuery.Field.build('name'),
         ],
         {
           isDeferred: true,
+          identifyingArgName: RelayNodeInterface.ID,
           type: RelayNodeInterface.NODE_TYPE,
         },
         'RefQueryName'

src/query/RelayQuery.js

@@ -43,7 +43,7 @@ type FragmentMetadata = {
   isTypeConditional: boolean;
 };
 type FragmentNames = {[key: string]: string};
-export type RootCallValue = string | GraphQL.BatchCallVariable;
+type RootCallValue = string | GraphQL.BatchCallVariable;
 // TODO: replace once #6525923 is resolved
 type NextChildren = Array<any>;
 

src/query/RelayQueryPath.js

@@ -108,10 +108,11 @@ class RelayQueryPath {
       var typeField = RelayQuery.Field.build(TYPENAME, null, null, {
         parentType: RelayNodeInterface.NODE_TYPE,
       });
-      var root = RelayNodeInterface.buildQuery(
+      var root = RelayQuery.Root.build(
+        RelayNodeInterface.NODE,
         dataID,
         [idField, typeField],
-        null,
+        {identifyingArgName: RelayNodeInterface.ID},
         this.getName()
       );
       return new RelayQueryPath(root);

src/query/__tests__/RelayQuery-test.js

@@ -18,7 +18,6 @@ var GraphQL = require('GraphQL');
 var Relay = require('Relay');
 var RelayFragmentReference = require('RelayFragmentReference');
 var RelayMetaRoute = require('RelayMetaRoute');
-var RelayNodeInterface = require('RelayNodeInterface');
 var RelayQuery = require('RelayQuery');
 
 describe('RelayQuery', () => {
@@ -34,15 +33,20 @@ describe('RelayQuery', () => {
     describe('build()', () => {
       it('creates roots', () => {
         var field = RelayQuery.Field.build('id');
-        var root = RelayNodeInterface.buildQuery('4', [field]);
+        var root = RelayQuery.Root.build(
+          'node',
+          '4',
+          [field]
+        );
         expect(root instanceof RelayQuery.Root).toBe(true);
         expect(root.getChildren().length).toBe(1);
         expect(root.getChildren()[0]).toBe(field);
       });
 
       it('creates deferred roots', () => {
         var field = RelayQuery.Field.build('id');
-        var root = RelayNodeInterface.buildQuery(
+        var root = RelayQuery.Root.build(
+          'node',
           '4',
           [field],
           {isDeferred: true}
@@ -53,7 +57,8 @@ describe('RelayQuery', () => {
       });
 
       it('creates roots with batch calls', () => {
-        var root = RelayNodeInterface.buildQuery(
+        var root = RelayQuery.Root.build(
+          'node',
           new GraphQL.BatchCallVariable('q0', '$.*.id'),
           []
         );

src/store/RelayStoreData.js

@@ -269,10 +269,11 @@ class RelayStoreData {
     }
     // Fragment fields cannot be spread directly into the root because they
     // may not exist on the `Node` type.
-    return RelayNodeInterface.buildQuery(
+    return RelayQuery.Root.build(
+      RelayNodeInterface.NODE,
       dataID,
       [fragment],
-      null,
+      {identifyingArgName: RelayNodeInterface.ID},
       fragment.getDebugName() || 'UnknownQuery'
     );
   }

src/traversal/__tests__/splitDeferredRelayQueries-test.js

@@ -15,7 +15,6 @@ var RelayTestUtils = require('RelayTestUtils');
 RelayTestUtils.unmockRelay();
 
 var Relay = require('Relay');
-var RelayNodeInterface = require('RelayNodeInterface');
 var RelayQuery = require('RelayQuery');
 var flattenRelayQuery = require('flattenRelayQuery');
 var generateRQLFieldAlias = require('generateRQLFieldAlias');
@@ -948,7 +947,8 @@ describe('splitDeferredRelayQueries()', () => {
     var typename = RelayQuery.Field.build('__typename', null, null, {
       requisite: true
     });
-    var queryNode = RelayNodeInterface.buildQuery(
+    var queryNode = RelayQuery.Root.build(
+      'node',
       '4',
       [
         id,

src/traversal/diffRelayQuery.js

@@ -764,10 +764,11 @@ function buildRoot(
       childTypes[type]
     ));
   });
-  return RelayNodeInterface.buildQuery(
+  return RelayQuery.Root.build(
+    NODE,
     rootID,
     fragments,
-    null,
+    {identifyingArgName: RelayNodeInterface.ID},
     name
   );
 }

src/traversal/writeRelayUpdatePayload.js

@@ -239,7 +239,14 @@ function mergeField(
   var path;
 
   if (recordID) {
-    path = new RelayQueryPath(RelayNodeInterface.buildQuery(recordID));
+    path = new RelayQueryPath(
+      RelayQuery.Root.build(
+        RelayNodeInterface.NODE,
+        recordID,
+        null,
+        {identifyingArgName: RelayNodeInterface.ID}
+      )
+    );
   } else {
     recordID = store.getRootCallID(fieldName, EMPTY);
     // Root fields that do not accept arguments