relay-runtime 2.0.0-rc.2 → 5.0.0

package/index.js

@@ -1,5 +1,5 @@
 /**
- * Relay v2.0.0-rc.2
+ * Relay v5.0.0
  *
  * Copyright (c) 2013-present, Facebook, Inc.
  *

package/lib/{generateRelayClientID.js → ClientID.js}

@@ -4,14 +4,14 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- *  strict
+ * 
  * @format
  */
 'use strict';
 
 var PREFIX = 'client:';
 
-function generateRelayClientID(id, storageKey, index) {
+function generateClientID(id, storageKey, index) {
   var key = id + ':' + storageKey;
 
   if (index != null) {
@@ -25,4 +25,11 @@ function generateRelayClientID(id, storageKey, index) {
   return key;
 }
 
-module.exports = generateRelayClientID;
+function isClientID(id) {
+  return id.indexOf(PREFIX) === 0;
+}
+
+module.exports = {
+  generateClientID: generateClientID,
+  isClientID: isClientID
+};

package/lib/ConvertToExecuteFunction.js

@@ -4,11 +4,13 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- *  strict-local
+ * 
  * @format
  */
 'use strict';
 
+var RelayObservable = require("./RelayObservable");
+
 /**
  * Converts a FetchFunction into an ExecuteFunction for use by RelayNetwork.
  */
@@ -19,12 +21,12 @@ function convertFetch(fn) {
     // Relay codebase, it is explicitly handled here.
 
     if (result instanceof Error) {
-      return require("./RelayObservable").create(function (sink) {
+      return RelayObservable.create(function (sink) {
         return sink.error(result);
       });
     }
 
-    return require("./RelayObservable").from(result);
+    return RelayObservable.from(result);
   };
 }
 /**
@@ -34,7 +36,7 @@ function convertFetch(fn) {
 
 function convertSubscribe(fn) {
   return function subscribe(operation, variables, cacheConfig) {
-    return require("./RelayObservable").fromLegacy(function (observer) {
+    return RelayObservable.fromLegacy(function (observer) {
       return fn(operation, variables, cacheConfig, observer);
     });
   };

package/lib/DataChecker.js

@@ -4,12 +4,42 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- *  strict-local
+ * 
  * @format
  * @emails oncall+relay
  */
 'use strict';
 
+var RelayConcreteNode = require("./RelayConcreteNode");
+
+var RelayRecordSourceMutator = require("./RelayRecordSourceMutator");
+
+var RelayRecordSourceProxy = require("./RelayRecordSourceProxy");
+
+var RelayStoreUtils = require("./RelayStoreUtils");
+
+var cloneRelayHandleSourceField = require("./cloneRelayHandleSourceField");
+
+var invariant = require("fbjs/lib/invariant");
+
+var _require = require("./RelayRecordState"),
+    EXISTENT = _require.EXISTENT,
+    UNKNOWN = _require.UNKNOWN;
+
+var CONDITION = RelayConcreteNode.CONDITION,
+    CLIENT_EXTENSION = RelayConcreteNode.CLIENT_EXTENSION,
+    DEFER = RelayConcreteNode.DEFER,
+    FRAGMENT_SPREAD = RelayConcreteNode.FRAGMENT_SPREAD,
+    INLINE_FRAGMENT = RelayConcreteNode.INLINE_FRAGMENT,
+    LINKED_FIELD = RelayConcreteNode.LINKED_FIELD,
+    LINKED_HANDLE = RelayConcreteNode.LINKED_HANDLE,
+    MODULE_IMPORT = RelayConcreteNode.MODULE_IMPORT,
+    SCALAR_FIELD = RelayConcreteNode.SCALAR_FIELD,
+    SCALAR_HANDLE = RelayConcreteNode.SCALAR_HANDLE,
+    STREAM = RelayConcreteNode.STREAM;
+var getModuleOperationKey = RelayStoreUtils.getModuleOperationKey,
+    getStorageKey = RelayStoreUtils.getStorageKey,
+    getArgumentValues = RelayStoreUtils.getArgumentValues;
 /**
  * Synchronously check whether the records required to fulfill the given
  * `selector` are present in `source`.
@@ -20,11 +50,12 @@
  *
  * If all records are present, returns `true`, otherwise `false`.
  */
-function check(source, target, selector, handlers, operationLoader) {
+
+function check(source, target, selector, handlers, operationLoader, getDataID) {
   var dataID = selector.dataID,
       node = selector.node,
       variables = selector.variables;
-  var checker = new DataChecker(source, target, variables, handlers, operationLoader);
+  var checker = new DataChecker(source, target, variables, handlers, operationLoader, getDataID);
   return checker.check(node, dataID);
 }
 /**
@@ -35,16 +66,16 @@ function check(source, target, selector, handlers, operationLoader) {
 var DataChecker =
 /*#__PURE__*/
 function () {
-  function DataChecker(source, target, variables, handlers, operationLoader) {
+  function DataChecker(source, target, variables, handlers, operationLoader, getDataID) {
     var _operationLoader;
 
     this._operationLoader = (_operationLoader = operationLoader) !== null && _operationLoader !== void 0 ? _operationLoader : null;
     this._handlers = handlers;
-    this._mutator = new (require("./RelayRecordSourceMutator"))(source, target);
+    this._mutator = new RelayRecordSourceMutator(source, target);
     this._recordWasMissing = false;
     this._source = source;
     this._variables = variables;
-    this._recordSourceProxy = new (require("./RelayRecordSourceProxy"))(this._mutator);
+    this._recordSourceProxy = new RelayRecordSourceProxy(this._mutator, getDataID);
   }
 
   var _proto = DataChecker.prototype;
@@ -56,7 +87,7 @@ function () {
   };
 
   _proto._getVariableValue = function _getVariableValue(name) {
-    !this._variables.hasOwnProperty(name) ? process.env.NODE_ENV !== "production" ? require("fbjs/lib/invariant")(false, 'RelayAsyncLoader(): Undefined variable `%s`.', name) : require("fbjs/lib/invariant")(false) : void 0;
+    !this._variables.hasOwnProperty(name) ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayAsyncLoader(): Undefined variable `%s`.', name) : invariant(false) : void 0;
     return this._variables[name];
   };
 
@@ -66,7 +97,7 @@ function () {
 
   _proto._getDataForHandlers = function _getDataForHandlers(field, dataID) {
     return {
-      args: field.args ? require("./RelayStoreUtils").getArgumentValues(field.args, this._variables) : {},
+      args: field.args ? getArgumentValues(field.args, this._variables) : {},
       // Getting a snapshot of the record state is potentially expensive since
       // we will need to merge the sink and source records. Since we do not create
       // any new records in this process, it is probably reasonable to provide
@@ -132,7 +163,7 @@ function () {
         if (handler.kind === 'linked') {
           var newValue = handler.handle(field, record, args, this._recordSourceProxy);
 
-          if (newValue != null && this._mutator.getStatus(newValue) === require("./RelayRecordState").EXISTENT) {
+          if (newValue != null && this._mutator.getStatus(newValue) === EXISTENT) {
             return newValue;
           }
         }
@@ -175,7 +206,7 @@ function () {
 
           if (newValue != null) {
             return newValue.filter(function (linkedID) {
-              return linkedID != null && _this._mutator.getStatus(linkedID) === require("./RelayRecordState").EXISTENT;
+              return linkedID != null && _this._mutator.getStatus(linkedID) === EXISTENT;
             });
           }
         }
@@ -201,11 +232,11 @@ function () {
   _proto._traverse = function _traverse(node, dataID) {
     var status = this._mutator.getStatus(dataID);
 
-    if (status === require("./RelayRecordState").UNKNOWN) {
+    if (status === UNKNOWN) {
       this._handleMissing();
     }
 
-    if (status === require("./RelayRecordState").EXISTENT) {
+    if (status === EXISTENT) {
       this._traverseSelections(node.selections, dataID);
     }
   };
@@ -215,12 +246,12 @@ function () {
 
     selections.forEach(function (selection) {
       switch (selection.kind) {
-        case require("./RelayConcreteNode").SCALAR_FIELD:
+        case SCALAR_FIELD:
           _this2._checkScalar(selection, dataID);
 
           break;
 
-        case require("./RelayConcreteNode").LINKED_FIELD:
+        case LINKED_FIELD:
           if (selection.plural) {
             _this2._checkPluralLink(selection, dataID);
           } else {
@@ -229,7 +260,7 @@ function () {
 
           break;
 
-        case require("./RelayConcreteNode").CONDITION:
+        case CONDITION:
           var conditionValue = _this2._getVariableValue(selection.condition);
 
           if (conditionValue === selection.passingValue) {
@@ -238,7 +269,7 @@ function () {
 
           break;
 
-        case require("./RelayConcreteNode").INLINE_FRAGMENT:
+        case INLINE_FRAGMENT:
           var typeName = _this2._mutator.getType(dataID);
 
           if (typeName != null && typeName === selection.type) {
@@ -247,10 +278,10 @@ function () {
 
           break;
 
-        case require("./RelayConcreteNode").LINKED_HANDLE:
+        case LINKED_HANDLE:
           // Handles have no selections themselves; traverse the original field
           // where the handle was set-up instead.
-          var handleField = require("./cloneRelayHandleSourceField")(selection, selections, _this2._variables);
+          var handleField = cloneRelayHandleSourceField(selection, selections, _this2._variables);
 
           if (handleField.plural) {
             _this2._checkPluralLink(handleField, dataID);
@@ -260,78 +291,66 @@ function () {
 
           break;
 
-        case require("./RelayConcreteNode").MATCH_FIELD:
-          _this2._checkMatch(selection, dataID);
+        case MODULE_IMPORT:
+          _this2._checkModuleImport(selection, dataID);
 
           break;
 
-        case require("./RelayConcreteNode").SCALAR_HANDLE:
-        case require("./RelayConcreteNode").FRAGMENT_SPREAD:
-          !false ? process.env.NODE_ENV !== "production" ? require("fbjs/lib/invariant")(false, 'RelayAsyncLoader(): Unexpected ast kind `%s`.', selection.kind) : require("fbjs/lib/invariant")(false) : void 0; // $FlowExpectedError - we need the break; for OSS linter
+        case DEFER:
+        case STREAM:
+          _this2._traverseSelections(selection.selections, dataID);
 
           break;
 
+        case SCALAR_HANDLE:
+        case FRAGMENT_SPREAD:
+          !false ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayAsyncLoader(): Unexpected ast kind `%s`.', selection.kind) : invariant(false) : void 0; // $FlowExpectedError - we need the break; for OSS linter
+
+          break;
+
+        case CLIENT_EXTENSION:
+          var recordWasMissing = _this2._recordWasMissing;
+
+          _this2._traverseSelections(selection.selections, dataID);
+
+          _this2._recordWasMissing = recordWasMissing;
+          break;
+
         default:
           selection;
-          !false ? process.env.NODE_ENV !== "production" ? require("fbjs/lib/invariant")(false, 'RelayAsyncLoader(): Unexpected ast kind `%s`.', selection.kind) : require("fbjs/lib/invariant")(false) : void 0;
+          !false ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayAsyncLoader(): Unexpected ast kind `%s`.', selection.kind) : invariant(false) : void 0;
       }
     });
   };
 
-  _proto._checkMatch = function _checkMatch(field, dataID) {
-    var storageKey = require("./RelayStoreUtils").getStorageKey(field, this._variables);
-
-    var linkedID = this._mutator.getLinkedRecordID(dataID, storageKey);
+  _proto._checkModuleImport = function _checkModuleImport(moduleImport, dataID) {
+    var operationLoader = this._operationLoader;
+    !(operationLoader !== null) ? process.env.NODE_ENV !== "production" ? invariant(false, 'DataChecker: Expected an operationLoader to be configured when using `@module`.') : invariant(false) : void 0;
+    var operationKey = getModuleOperationKey(moduleImport.documentName);
 
-    if (linkedID === undefined) {
-      this._handleMissing();
-    } else if (linkedID !== null) {
-      var status = this._mutator.getStatus(linkedID);
+    var operationReference = this._mutator.getValue(dataID, operationKey);
 
-      if (status === require("./RelayRecordState").UNKNOWN) {
+    if (operationReference == null) {
+      if (operationReference === undefined) {
         this._handleMissing();
-
-        return;
       }
 
-      if (status !== require("./RelayRecordState").EXISTENT) {
-        return;
-      }
-
-      var typeName = this._mutator.getType(linkedID);
-
-      var match = typeName != null ? field.matchesByType[typeName] : null;
-
-      if (match != null) {
-        var operationLoader = this._operationLoader;
-        !(operationLoader !== null) ? process.env.NODE_ENV !== "production" ? require("fbjs/lib/invariant")(false, 'DataChecker: Expected an operationLoader to be configured when using `@match`.') : require("fbjs/lib/invariant")(false) : void 0;
-
-        var operationReference = this._mutator.getValue(linkedID, require("./RelayStoreUtils").MATCH_FRAGMENT_KEY);
-
-        if (operationReference === undefined) {
-          this._handleMissing();
-
-          return;
-        } else if (operationReference === null) {
-          return;
-        }
+      return;
+    }
 
-        var operation = operationLoader.get(operationReference);
+    var operation = operationLoader.get(operationReference);
 
-        if (operation != null) {
-          this._traverse(operation, linkedID);
-        } else {
-          // If the fragment is not available, we assume that the data cannot have been
-          // processed yet and must therefore be missing.
-          this._handleMissing();
-        }
-      } else {// TODO: warn: store is corrupt: the field should be null if the typename did not match
-      }
+    if (operation != null) {
+      this._traverse(operation, dataID);
+    } else {
+      // If the fragment is not available, we assume that the data cannot have been
+      // processed yet and must therefore be missing.
+      this._handleMissing();
     }
   };
 
   _proto._checkScalar = function _checkScalar(field, dataID) {
-    var storageKey = require("./RelayStoreUtils").getStorageKey(field, this._variables);
+    var storageKey = getStorageKey(field, this._variables);
 
     var fieldValue = this._mutator.getValue(dataID, storageKey);
 
@@ -345,7 +364,7 @@ function () {
   };
 
   _proto._checkLink = function _checkLink(field, dataID) {
-    var storageKey = require("./RelayStoreUtils").getStorageKey(field, this._variables);
+    var storageKey = getStorageKey(field, this._variables);
 
     var linkedID = this._mutator.getLinkedRecordID(dataID, storageKey);
 
@@ -365,7 +384,7 @@ function () {
   _proto._checkPluralLink = function _checkPluralLink(field, dataID) {
     var _this3 = this;
 
-    var storageKey = require("./RelayStoreUtils").getStorageKey(field, this._variables);
+    var storageKey = getStorageKey(field, this._variables);
 
     var linkedIDs = this._mutator.getLinkedRecordIDs(dataID, storageKey);
 

package/lib/NormalizationNode.js

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- *  strict
+ * 
  * @format
  */
 'use strict';

package/lib/ReaderNode.js

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- *  strict-local
+ * 
  * @format
  */
 'use strict';

package/lib/RelayCombinedEnvironmentTypes.js

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- *  strict-local
+ * 
  * @format
  */
 'use strict';

package/lib/RelayConcreteNode.js

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- *  strict-local
+ * 
  * @format
  */
 'use strict';
@@ -22,6 +22,8 @@
  */
 var RelayConcreteNode = {
   CONDITION: 'Condition',
+  CLIENT_EXTENSION: 'ClientExtension',
+  DEFER: 'Defer',
   FRAGMENT: 'Fragment',
   FRAGMENT_SPREAD: 'FragmentSpread',
   INLINE_FRAGMENT: 'InlineFragment',
@@ -29,13 +31,14 @@ var RelayConcreteNode = {
   LINKED_HANDLE: 'LinkedHandle',
   LITERAL: 'Literal',
   LOCAL_ARGUMENT: 'LocalArgument',
-  MATCH_FIELD: 'MatchField',
+  MODULE_IMPORT: 'ModuleImport',
   OPERATION: 'Operation',
   REQUEST: 'Request',
   ROOT_ARGUMENT: 'RootArgument',
   SCALAR_FIELD: 'ScalarField',
   SCALAR_HANDLE: 'ScalarHandle',
   SPLIT_OPERATION: 'SplitOperation',
+  STREAM: 'Stream',
   VARIABLE: 'Variable'
 };
 module.exports = RelayConcreteNode;

package/lib/RelayConcreteVariables.js

@@ -9,7 +9,11 @@
  */
 'use strict';
 
-var _objectSpread2 = require("@babel/runtime/helpers/interopRequireDefault")(require("@babel/runtime/helpers/objectSpread"));
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread"));
+
+var invariant = require("fbjs/lib/invariant");
 
 /**
  * Determines the variables that are in scope for a fragment given the variables
@@ -35,10 +39,15 @@ function getFragmentVariables(fragment, rootVariables, argumentVariables) {
       case 'RootArgument':
         if (!rootVariables.hasOwnProperty(definition.name)) {
           /*
-           * A temporary fix to mute false alarm in cases where the root argument is stripped
-           * off by the compiler due to a conditional directive, we do not need this argument
-           * when tryiny to read the data from the store.
+           * Global variables passed as values of @arguments are not required to
+           * be declared unless they are used by the callee fragment or a
+           * descendant. In this case, the root variable may not be defined when
+           * resolving the callee's variables. The value is explicitly set to
+           * undefined to conform to the check in
+           * RelayStoreUtils.getStableVariableValue() that variable keys are all
+           * present.
            */
+          variables[definition.name] = undefined;
           break;
         }
 
@@ -46,7 +55,8 @@ function getFragmentVariables(fragment, rootVariables, argumentVariables) {
         break;
 
       default:
-        !false ? process.env.NODE_ENV !== "production" ? require("fbjs/lib/invariant")(false, 'RelayConcreteVariables: Unexpected node kind `%s` in fragment `%s`.', definition.kind, fragment.name) : require("fbjs/lib/invariant")(false) : void 0;
+        definition;
+        !false ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayConcreteVariables: Unexpected node kind `%s` in fragment `%s`.', definition.kind, fragment.name) : invariant(false) : void 0;
     }
   });
   return variables || argumentVariables;
@@ -69,10 +79,6 @@ function getOperationVariables(operation, variables) {
     }
 
     operationVariables[def.name] = value;
-
-    if (process.env.NODE_ENV !== "production") {
-      process.env.NODE_ENV !== "production" ? require("fbjs/lib/warning")(value != null || def.type[def.type.length - 1] !== '!', 'RelayConcreteVariables: Expected a value for non-nullable variable ' + '`$%s: %s` on operation `%s`, got `%s`. Make sure you supply a ' + 'value for all non-nullable arguments.', def.name, def.type, operation.name, JSON.stringify(value)) : void 0;
-    }
   });
   return operationVariables;
 }

package/lib/RelayConnectionHandler.js

@@ -9,6 +9,17 @@
  */
 'use strict';
 
+var RelayConnectionInterface = require("./RelayConnectionInterface");
+
+var getRelayHandleKey = require("./getRelayHandleKey");
+
+var invariant = require("fbjs/lib/invariant");
+
+var warning = require("fbjs/lib/warning");
+
+var _require = require("./ClientID"),
+    generateClientID = _require.generateClientID;
+
 var CONNECTION = 'connection'; // Per-instance incrementing index used to generate unique edge IDs
 
 var NEXT_EDGE_INDEX = '__connection_next_edge_index';
@@ -27,7 +38,7 @@ function update(store, payload) {
     return;
   }
 
-  var _RelayConnectionInter = require("./RelayConnectionInterface").get(),
+  var _RelayConnectionInter = RelayConnectionInterface.get(),
       EDGES = _RelayConnectionInter.EDGES,
       END_CURSOR = _RelayConnectionInter.END_CURSOR,
       HAS_NEXT_PAGE = _RelayConnectionInter.HAS_NEXT_PAGE,
@@ -49,7 +60,7 @@ function update(store, payload) {
 
   if (!clientConnection) {
     // Initial fetch with data: copy fields from the server record
-    var connection = store.create(require("./generateRelayClientID")(record.getDataID(), payload.handleKey), serverConnection.getType());
+    var connection = store.create(generateClientID(record.getDataID(), payload.handleKey), serverConnection.getType());
     connection.setValue(0, NEXT_EDGE_INDEX);
     connection.copyFieldsFrom(serverConnection);
     var serverEdges = serverConnection.getLinkedRecords(EDGES);
@@ -62,7 +73,7 @@ function update(store, payload) {
     }
 
     record.setLinkedRecord(connection, payload.handleKey);
-    clientPageInfo = store.create(require("./generateRelayClientID")(connection.getDataID(), PAGE_INFO), PAGE_INFO_TYPE);
+    clientPageInfo = store.create(generateClientID(connection.getDataID(), PAGE_INFO), PAGE_INFO_TYPE);
     clientPageInfo.setValue(false, HAS_NEXT_PAGE);
     clientPageInfo.setValue(false, HAS_PREV_PAGE);
     clientPageInfo.setValue(null, END_CURSOR);
@@ -113,7 +124,7 @@ function update(store, payload) {
           mergeEdges(prevEdges, nextEdges, nodeIDs);
           mergeEdges(_serverEdges, nextEdges, nodeIDs);
         } else {
-          process.env.NODE_ENV !== "production" ? require("fbjs/lib/warning")(false, 'RelayConnectionHandler: Unexpected after cursor `%s`, edges must ' + 'be fetched from the end of the list (`%s`).', args.after, clientPageInfo && clientPageInfo.getValue(END_CURSOR)) : void 0;
+          process.env.NODE_ENV !== "production" ? warning(false, 'RelayConnectionHandler: Unexpected after cursor `%s`, edges must ' + 'be fetched from the end of the list (`%s`).', args.after, clientPageInfo && clientPageInfo.getValue(END_CURSOR)) : void 0;
           return;
         }
       } else if (args.before != null) {
@@ -124,7 +135,7 @@ function update(store, payload) {
           mergeEdges(_serverEdges, nextEdges, _nodeIDs);
           mergeEdges(prevEdges, nextEdges, _nodeIDs);
         } else {
-          process.env.NODE_ENV !== "production" ? require("fbjs/lib/warning")(false, 'RelayConnectionHandler: Unexpected before cursor `%s`, edges must ' + 'be fetched from the beginning of the list (`%s`).', args.before, clientPageInfo && clientPageInfo.getValue(START_CURSOR)) : void 0;
+          process.env.NODE_ENV !== "production" ? warning(false, 'RelayConnectionHandler: Unexpected before cursor `%s`, edges must ' + 'be fetched from the beginning of the list (`%s`).', args.before, clientPageInfo && clientPageInfo.getValue(START_CURSOR)) : void 0;
           return;
         }
       } else {
@@ -208,8 +219,7 @@ function update(store, payload) {
 
 
 function getConnection(record, key, filters) {
-  var handleKey = require("./getRelayHandleKey")(CONNECTION, key, null);
-
+  var handleKey = getRelayHandleKey(CONNECTION, key, null);
   return record.getLinkedRecord(handleKey, filters);
 }
 /**
@@ -249,7 +259,7 @@ function getConnection(record, key, filters) {
 
 
 function insertEdgeAfter(record, newEdge, cursor) {
-  var _RelayConnectionInter2 = require("./RelayConnectionInterface").get(),
+  var _RelayConnectionInter2 = RelayConnectionInterface.get(),
       CURSOR = _RelayConnectionInter2.CURSOR,
       EDGES = _RelayConnectionInter2.EDGES;
 
@@ -299,7 +309,7 @@ function insertEdgeAfter(record, newEdge, cursor) {
 
 
 function createEdge(store, record, node, edgeType) {
-  var _RelayConnectionInter3 = require("./RelayConnectionInterface").get(),
+  var _RelayConnectionInter3 = RelayConnectionInterface.get(),
       NODE = _RelayConnectionInter3.NODE; // An index-based client ID could easily conflict (unless it was
   // auto-incrementing, but there is nowhere to the store the id)
   // Instead, construct a client ID based on the connection ID and node ID,
@@ -308,8 +318,7 @@ function createEdge(store, record, node, edgeType) {
   // duplicates.
 
 
-  var edgeID = require("./generateRelayClientID")(record.getDataID(), node.getDataID());
-
+  var edgeID = generateClientID(record.getDataID(), node.getDataID());
   var edge = store.get(edgeID);
 
   if (!edge) {
@@ -356,7 +365,7 @@ function createEdge(store, record, node, edgeType) {
 
 
 function insertEdgeBefore(record, newEdge, cursor) {
-  var _RelayConnectionInter4 = require("./RelayConnectionInterface").get(),
+  var _RelayConnectionInter4 = RelayConnectionInterface.get(),
       CURSOR = _RelayConnectionInter4.CURSOR,
       EDGES = _RelayConnectionInter4.EDGES;
 
@@ -405,7 +414,7 @@ function insertEdgeBefore(record, newEdge, cursor) {
 
 
 function deleteNode(record, nodeID) {
-  var _RelayConnectionInter5 = require("./RelayConnectionInterface").get(),
+  var _RelayConnectionInter5 = RelayConnectionInterface.get(),
       EDGES = _RelayConnectionInter5.EDGES,
       NODE = _RelayConnectionInter5.NODE;
 
@@ -454,14 +463,12 @@ function buildConnectionEdge(store, connection, edge) {
     return edge;
   }
 
-  var _RelayConnectionInter6 = require("./RelayConnectionInterface").get(),
+  var _RelayConnectionInter6 = RelayConnectionInterface.get(),
       EDGES = _RelayConnectionInter6.EDGES;
 
   var edgeIndex = connection.getValue(NEXT_EDGE_INDEX);
-  !(typeof edgeIndex === 'number') ? process.env.NODE_ENV !== "production" ? require("fbjs/lib/invariant")(false, 'RelayConnectionHandler: Expected %s to be a number, got `%s`.', NEXT_EDGE_INDEX, edgeIndex) : require("fbjs/lib/invariant")(false) : void 0;
-
-  var edgeID = require("./generateRelayClientID")(connection.getDataID(), EDGES, edgeIndex);
-
+  !(typeof edgeIndex === 'number') ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayConnectionHandler: Expected %s to be a number, got `%s`.', NEXT_EDGE_INDEX, edgeIndex) : invariant(false) : void 0;
+  var edgeID = generateClientID(connection.getDataID(), EDGES, edgeIndex);
   var connectionEdge = store.create(edgeID, edge.getType());
   connectionEdge.copyFieldsFrom(edge);
   connection.setValue(edgeIndex + 1, NEXT_EDGE_INDEX);
@@ -476,7 +483,7 @@ function buildConnectionEdge(store, connection, edge) {
 
 
 function mergeEdges(sourceEdges, targetEdges, nodeIDs) {
-  var _RelayConnectionInter7 = require("./RelayConnectionInterface").get(),
+  var _RelayConnectionInter7 = RelayConnectionInterface.get(),
       NODE = _RelayConnectionInter7.NODE;
 
   for (var ii = 0; ii < sourceEdges.length; ii++) {
@@ -487,7 +494,7 @@ function mergeEdges(sourceEdges, targetEdges, nodeIDs) {
     }
 
     var node = edge.getLinkedRecord(NODE);
-    var nodeID = node && node.getValue('id');
+    var nodeID = node && node.getDataID();
 
     if (nodeID) {
       if (nodeIDs.has(nodeID)) {

package/lib/RelayConnectionInterface.js

@@ -4,12 +4,14 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- *  strict-local
+ * 
  * @format
  */
 'use strict';
 
-var _defineProperty2 = require("@babel/runtime/helpers/interopRequireDefault")(require("@babel/runtime/helpers/defineProperty"));
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
 var CONNECTION_CALLS = {
   after: true,