relay-runtime 2.0.0-rc.2 → 5.0.0

package/lib/RelayRecordSourceMutator.js

@@ -4,12 +4,25 @@
  * 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 _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 RelayModernRecord = require("./RelayModernRecord");
+
+var invariant = require("fbjs/lib/invariant");
+
+var _require = require("./RelayRecordState"),
+    EXISTENT = _require.EXISTENT;
+
+var _require2 = require("./RelayStoreUtils"),
+    UNPUBLISH_FIELD_SENTINEL = _require2.UNPUBLISH_FIELD_SENTINEL,
+    UNPUBLISH_RECORD_SENTINEL = _require2.UNPUBLISH_RECORD_SENTINEL;
 
 /**
  * @internal
@@ -40,9 +53,61 @@ function () {
     this._sink = sink;
     this.__sources = [sink, base];
   }
+  /**
+   * **UNSTABLE**
+   * This method is likely to be removed in an upcoming release
+   * and should not be relied upon.
+   * TODO T41593196: Remove unstable_getRawRecordWithChanges
+   */
+
 
   var _proto = RelayRecordSourceMutator.prototype;
 
+  _proto.unstable_getRawRecordWithChanges = function unstable_getRawRecordWithChanges(dataID) {
+    var baseRecord = this._base.get(dataID);
+
+    var sinkRecord = this._sink.get(dataID);
+
+    if (sinkRecord === undefined) {
+      if (baseRecord == null) {
+        return baseRecord;
+      }
+
+      var nextRecord = RelayModernRecord.clone(baseRecord);
+
+      if (process.env.NODE_ENV !== "production") {
+        // Prevent mutation of a record from outside the store.
+        RelayModernRecord.freeze(nextRecord);
+      }
+
+      return nextRecord;
+    } else if (sinkRecord === null) {
+      return null;
+    } else if (sinkRecord === UNPUBLISH_RECORD_SENTINEL) {
+      return undefined;
+    } else if (baseRecord != null) {
+      var _nextRecord = RelayModernRecord.update(baseRecord, sinkRecord);
+
+      if (process.env.NODE_ENV !== "production") {
+        if (_nextRecord !== baseRecord) {
+          // Prevent mutation of a record from outside the store.
+          RelayModernRecord.freeze(_nextRecord);
+        }
+      }
+
+      return _nextRecord;
+    } else {
+      var _nextRecord2 = RelayModernRecord.clone(sinkRecord);
+
+      if (process.env.NODE_ENV !== "production") {
+        // Prevent mutation of a record from outside the store.
+        RelayModernRecord.freeze(_nextRecord2);
+      }
+
+      return _nextRecord2;
+    }
+  };
+
   _proto._createBackupRecord = function _createBackupRecord(dataID) {
     var backup = this._backup;
 
@@ -63,14 +128,14 @@ function () {
     if (backup) {
       var backupRecord = backup.get(dataID);
 
-      if (backupRecord && backupRecord !== require("./RelayStoreUtils").UNPUBLISH_RECORD_SENTINEL) {
+      if (backupRecord && backupRecord !== UNPUBLISH_RECORD_SENTINEL) {
         var copy = null;
 
         for (var key in record) {
           if (record.hasOwnProperty(key)) {
             if (!(key in backupRecord)) {
               copy = copy || (0, _objectSpread2["default"])({}, backupRecord);
-              copy[key] = require("./RelayStoreUtils").UNPUBLISH_FIELD_SENTINEL;
+              copy[key] = UNPUBLISH_FIELD_SENTINEL;
             }
           }
         }
@@ -86,11 +151,9 @@ function () {
     if (backup) {
       var backupRecord = backup.get(dataID);
 
-      if (backupRecord && backupRecord !== require("./RelayStoreUtils").UNPUBLISH_RECORD_SENTINEL && !(storageKey in backupRecord)) {
+      if (backupRecord && backupRecord !== UNPUBLISH_RECORD_SENTINEL && !(storageKey in backupRecord)) {
         var copy = (0, _objectSpread2["default"])({}, backupRecord);
-
-        require("./RelayModernRecord").setValue(copy, storageKey, require("./RelayStoreUtils").UNPUBLISH_FIELD_SENTINEL);
-
+        RelayModernRecord.setValue(copy, storageKey, UNPUBLISH_FIELD_SENTINEL);
         backup.set(dataID, copy);
       }
     }
@@ -102,8 +165,8 @@ function () {
     if (!sinkRecord) {
       var baseRecord = this._base.get(dataID);
 
-      !baseRecord ? process.env.NODE_ENV !== "production" ? require("fbjs/lib/invariant")(false, 'RelayRecordSourceMutator: Cannot modify non-existent record `%s`.', dataID) : require("fbjs/lib/invariant")(false) : void 0;
-      sinkRecord = require("./RelayModernRecord").create(dataID, require("./RelayModernRecord").getType(baseRecord));
+      !baseRecord ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayRecordSourceMutator: Cannot modify non-existent record `%s`.', dataID) : invariant(false) : void 0;
+      sinkRecord = RelayModernRecord.create(dataID, RelayModernRecord.getType(baseRecord));
 
       this._sink.set(dataID, sinkRecord);
     }
@@ -116,41 +179,41 @@ function () {
 
     var baseSource = this._base.get(sourceID);
 
-    !(sinkSource || baseSource) ? process.env.NODE_ENV !== "production" ? require("fbjs/lib/invariant")(false, 'RelayRecordSourceMutator#copyFields(): Cannot copy fields from ' + 'non-existent record `%s`.', sourceID) : require("fbjs/lib/invariant")(false) : void 0;
+    !(sinkSource || baseSource) ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayRecordSourceMutator#copyFields(): Cannot copy fields from ' + 'non-existent record `%s`.', sourceID) : invariant(false) : void 0;
 
     this._createBackupRecord(sinkID);
 
     var sink = this._getSinkRecord(sinkID);
 
     if (baseSource) {
-      require("./RelayModernRecord").copyFields(baseSource, sink);
+      RelayModernRecord.copyFields(baseSource, sink);
     }
 
     if (sinkSource) {
-      require("./RelayModernRecord").copyFields(sinkSource, sink);
+      RelayModernRecord.copyFields(sinkSource, sink);
     }
 
     this._setSentinelFieldsInBackupRecord(sinkID, sink);
   };
 
   _proto.copyFieldsFromRecord = function copyFieldsFromRecord(record, sinkID) {
-    this.copyFields(require("./RelayModernRecord").getDataID(record), sinkID);
+    this._createBackupRecord(sinkID);
 
     var sink = this._getSinkRecord(sinkID);
 
-    require("./RelayModernRecord").copyFields(record, sink);
+    RelayModernRecord.copyFields(record, sink);
 
     this._setSentinelFieldsInBackupRecord(sinkID, sink);
   };
 
   _proto.create = function create(dataID, typeName) {
-    !(this._base.getStatus(dataID) !== require("./RelayRecordState").EXISTENT && this._sink.getStatus(dataID) !== require("./RelayRecordState").EXISTENT) ? process.env.NODE_ENV !== "production" ? require("fbjs/lib/invariant")(false, 'RelayRecordSourceMutator#create(): Cannot create a record with id ' + '`%s`, this record already exists.', dataID) : require("fbjs/lib/invariant")(false) : void 0;
+    !(this._base.getStatus(dataID) !== EXISTENT && this._sink.getStatus(dataID) !== EXISTENT) ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayRecordSourceMutator#create(): Cannot create a record with id ' + '`%s`, this record already exists.', dataID) : invariant(false) : void 0;
 
     if (this._backup) {
-      this._backup.set(dataID, require("./RelayStoreUtils").UNPUBLISH_RECORD_SENTINEL);
+      this._backup.set(dataID, UNPUBLISH_RECORD_SENTINEL);
     }
 
-    var record = require("./RelayModernRecord").create(dataID, typeName);
+    var record = RelayModernRecord.create(dataID, typeName);
 
     this._sink.set(dataID, record);
   };
@@ -170,7 +233,7 @@ function () {
       var record = this.__sources[ii].get(dataID);
 
       if (record) {
-        return require("./RelayModernRecord").getType(record);
+        return RelayModernRecord.getType(record);
       } else if (record === null) {
         return null;
       }
@@ -182,7 +245,7 @@ function () {
       var record = this.__sources[ii].get(dataID);
 
       if (record) {
-        var value = require("./RelayModernRecord").getValue(record, storageKey);
+        var value = RelayModernRecord.getValue(record, storageKey);
 
         if (value !== undefined) {
           return value;
@@ -198,7 +261,7 @@ function () {
 
     var sinkRecord = this._getSinkRecord(dataID);
 
-    require("./RelayModernRecord").setValue(sinkRecord, storageKey, value);
+    RelayModernRecord.setValue(sinkRecord, storageKey, value);
 
     this._setSentinelFieldInBackupRecord(dataID, storageKey);
   };
@@ -208,7 +271,7 @@ function () {
       var record = this.__sources[ii].get(dataID);
 
       if (record) {
-        var linkedID = require("./RelayModernRecord").getLinkedRecordID(record, storageKey);
+        var linkedID = RelayModernRecord.getLinkedRecordID(record, storageKey);
 
         if (linkedID !== undefined) {
           return linkedID;
@@ -224,7 +287,7 @@ function () {
 
     var sinkRecord = this._getSinkRecord(dataID);
 
-    require("./RelayModernRecord").setLinkedRecordID(sinkRecord, storageKey, linkedID);
+    RelayModernRecord.setLinkedRecordID(sinkRecord, storageKey, linkedID);
 
     this._setSentinelFieldInBackupRecord(dataID, storageKey);
   };
@@ -234,7 +297,7 @@ function () {
       var record = this.__sources[ii].get(dataID);
 
       if (record) {
-        var linkedIDs = require("./RelayModernRecord").getLinkedRecordIDs(record, storageKey);
+        var linkedIDs = RelayModernRecord.getLinkedRecordIDs(record, storageKey);
 
         if (linkedIDs !== undefined) {
           return linkedIDs;
@@ -250,7 +313,7 @@ function () {
 
     var sinkRecord = this._getSinkRecord(dataID);
 
-    require("./RelayModernRecord").setLinkedRecordIDs(sinkRecord, storageKey, linkedIDs);
+    RelayModernRecord.setLinkedRecordIDs(sinkRecord, storageKey, linkedIDs);
 
     this._setSentinelFieldInBackupRecord(dataID, storageKey);
   };

package/lib/RelayRecordSourceProxy.js

@@ -9,6 +9,24 @@
  */
 'use strict';
 
+var RelayModernRecord = require("./RelayModernRecord");
+
+var RelayRecordProxy = require("./RelayRecordProxy");
+
+var RelayRecordSourceSelectorProxy = require("./RelayRecordSourceSelectorProxy");
+
+var invariant = require("fbjs/lib/invariant");
+
+var normalizeRelayPayload = require("./normalizeRelayPayload");
+
+var _require = require("./RelayRecordState"),
+    EXISTENT = _require.EXISTENT,
+    NONEXISTENT = _require.NONEXISTENT;
+
+var _require2 = require("./RelayStoreUtils"),
+    ROOT_ID = _require2.ROOT_ID,
+    ROOT_TYPE = _require2.ROOT_TYPE;
+
 /**
  * @internal
  *
@@ -17,10 +35,11 @@
 var RelayRecordSourceProxy =
 /*#__PURE__*/
 function () {
-  function RelayRecordSourceProxy(mutator, handlerProvider) {
+  function RelayRecordSourceProxy(mutator, getDataID, handlerProvider) {
     this.__mutator = mutator;
     this._handlerProvider = handlerProvider || null;
     this._proxies = {};
+    this._getDataID = getDataID;
   }
 
   var _proto = RelayRecordSourceProxy.prototype;
@@ -32,19 +51,17 @@ function () {
     dataIDs.forEach(function (dataID) {
       var status = source.getStatus(dataID);
 
-      if (status === require("./RelayRecordState").EXISTENT) {
+      if (status === EXISTENT) {
         var sourceRecord = source.get(dataID);
 
         if (sourceRecord) {
-          if (_this.__mutator.getStatus(dataID) !== require("./RelayRecordState").EXISTENT) {
-            _this.create(dataID, require("./RelayModernRecord").getType(sourceRecord));
+          if (_this.__mutator.getStatus(dataID) !== EXISTENT) {
+            _this.create(dataID, RelayModernRecord.getType(sourceRecord));
           }
 
           _this.__mutator.copyFieldsFromRecord(sourceRecord, dataID);
-
-          delete _this._proxies[dataID];
         }
-      } else if (status === require("./RelayRecordState").NONEXISTENT) {
+      } else if (status === NONEXISTENT) {
         _this["delete"](dataID);
       }
     });
@@ -53,7 +70,7 @@ function () {
       fieldPayloads.forEach(function (fieldPayload) {
         var handler = _this._handlerProvider && _this._handlerProvider(fieldPayload.handle);
 
-        !handler ? process.env.NODE_ENV !== "production" ? require("fbjs/lib/invariant")(false, 'RelayModernEnvironment: Expected a handler to be provided for handle `%s`.', fieldPayload.handle) : require("fbjs/lib/invariant")(false) : void 0;
+        !handler ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayModernEnvironment: Expected a handler to be provided for handle `%s`.', fieldPayload.handle) : invariant(false) : void 0;
         handler.update(_this, fieldPayload);
       });
     }
@@ -61,15 +78,17 @@ function () {
 
   _proto.commitPayload = function commitPayload(operation, response) {
     if (!response) {
-      return new (require("./RelayRecordSourceSelectorProxy"))(this, operation.fragment);
+      return new RelayRecordSourceSelectorProxy(this, operation.fragment);
     }
 
-    var _normalizeRelayPayloa = require("./normalizeRelayPayload")(operation.root, response),
+    var _normalizeRelayPayloa = normalizeRelayPayload(operation.root, response, null, {
+      getDataID: this._getDataID
+    }),
         source = _normalizeRelayPayloa.source,
         fieldPayloads = _normalizeRelayPayloa.fieldPayloads;
 
     this.publishSource(source, fieldPayloads);
-    return new (require("./RelayRecordSourceSelectorProxy"))(this, operation.fragment);
+    return new RelayRecordSourceSelectorProxy(this, operation.fragment);
   };
 
   _proto.create = function create(dataID, typeName) {
@@ -78,12 +97,12 @@ function () {
     delete this._proxies[dataID];
     var record = this.get(dataID); // For flow
 
-    !record ? process.env.NODE_ENV !== "production" ? require("fbjs/lib/invariant")(false, 'RelayRecordSourceProxy#create(): Expected the created record to exist.') : require("fbjs/lib/invariant")(false) : void 0;
+    !record ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayRecordSourceProxy#create(): Expected the created record to exist.') : invariant(false) : void 0;
     return record;
   };
 
   _proto["delete"] = function _delete(dataID) {
-    !(dataID !== require("./RelayStoreUtils").ROOT_ID) ? process.env.NODE_ENV !== "production" ? require("fbjs/lib/invariant")(false, 'RelayRecordSourceProxy#delete(): Cannot delete the root record.') : require("fbjs/lib/invariant")(false) : void 0;
+    !(dataID !== ROOT_ID) ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayRecordSourceProxy#delete(): Cannot delete the root record.') : invariant(false) : void 0;
     delete this._proxies[dataID];
 
     this.__mutator["delete"](dataID);
@@ -93,10 +112,10 @@ function () {
     if (!this._proxies.hasOwnProperty(dataID)) {
       var status = this.__mutator.getStatus(dataID);
 
-      if (status === require("./RelayRecordState").EXISTENT) {
-        this._proxies[dataID] = new (require("./RelayRecordProxy"))(this, this.__mutator, dataID);
+      if (status === EXISTENT) {
+        this._proxies[dataID] = new RelayRecordProxy(this, this.__mutator, dataID);
       } else {
-        this._proxies[dataID] = status === require("./RelayRecordState").NONEXISTENT ? null : undefined;
+        this._proxies[dataID] = status === NONEXISTENT ? null : undefined;
       }
     }
 
@@ -104,13 +123,13 @@ function () {
   };
 
   _proto.getRoot = function getRoot() {
-    var root = this.get(require("./RelayStoreUtils").ROOT_ID);
+    var root = this.get(ROOT_ID);
 
     if (!root) {
-      root = this.create(require("./RelayStoreUtils").ROOT_ID, require("./RelayStoreUtils").ROOT_TYPE);
+      root = this.create(ROOT_ID, ROOT_TYPE);
     }
 
-    !(root && root.getType() === require("./RelayStoreUtils").ROOT_TYPE) ? process.env.NODE_ENV !== "production" ? require("fbjs/lib/invariant")(false, 'RelayRecordSourceProxy#getRoot(): Expected the source to contain a ' + 'root record.') : require("fbjs/lib/invariant")(false) : void 0;
+    !(root && root.getType() === ROOT_TYPE) ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayRecordSourceProxy#getRoot(): Expected the source to contain a ' + 'root record.') : invariant(false) : void 0;
     return root;
   };
 

package/lib/RelayRecordSourceSelectorProxy.js

@@ -4,11 +4,16 @@
  * 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 invariant = require("fbjs/lib/invariant");
+
+var _require = require("./RelayStoreUtils"),
+    getStorageKey = _require.getStorageKey;
+
 /**
  * @internal
  *
@@ -47,24 +52,22 @@ function () {
     var field = selector.node.selections.find(function (selection) {
       return selection.kind === 'LinkedField' && selection.name === fieldName;
     });
-    !(field && field.kind === 'LinkedField') ? process.env.NODE_ENV !== "production" ? require("fbjs/lib/invariant")(false, 'RelayRecordSourceSelectorProxy#getRootField(): Cannot find root ' + 'field `%s`, no such field is defined on GraphQL document `%s`.', fieldName, selector.node.name) : require("fbjs/lib/invariant")(false) : void 0;
-    !(field.plural === plural) ? process.env.NODE_ENV !== "production" ? require("fbjs/lib/invariant")(false, 'RelayRecordSourceSelectorProxy#getRootField(): Expected root field ' + '`%s` to be %s.', fieldName, plural ? 'plural' : 'singular') : require("fbjs/lib/invariant")(false) : void 0;
+    !(field && field.kind === 'LinkedField') ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayRecordSourceSelectorProxy#getRootField(): Cannot find root ' + 'field `%s`, no such field is defined on GraphQL document `%s`.', fieldName, selector.node.name) : invariant(false) : void 0;
+    !(field.plural === plural) ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayRecordSourceSelectorProxy#getRootField(): Expected root field ' + '`%s` to be %s.', fieldName, plural ? 'plural' : 'singular') : invariant(false) : void 0;
     return field;
   };
 
   _proto.getRootField = function getRootField(fieldName) {
     var field = this._getRootField(this._readSelector, fieldName, false);
 
-    var storageKey = require("./RelayStoreUtils").getStorageKey(field, this._readSelector.variables);
-
+    var storageKey = getStorageKey(field, this._readSelector.variables);
     return this.getRoot().getLinkedRecord(storageKey);
   };
 
   _proto.getPluralRootField = function getPluralRootField(fieldName) {
     var field = this._getRootField(this._readSelector, fieldName, true);
 
-    var storageKey = require("./RelayStoreUtils").getStorageKey(field, this._readSelector.variables);
-
+    var storageKey = getStorageKey(field, this._readSelector.variables);
     return this.getRoot().getLinkedRecords(storageKey);
   };
 

package/lib/RelayRecordState.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/RelayReferenceMarker.js

@@ -4,11 +4,35 @@
  * 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 RelayConcreteNode = require("./RelayConcreteNode");
+
+var RelayModernRecord = require("./RelayModernRecord");
+
+var RelayStoreUtils = require("./RelayStoreUtils");
+
+var cloneRelayHandleSourceField = require("./cloneRelayHandleSourceField");
+
+var invariant = require("fbjs/lib/invariant");
+
+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,
+    MODULE_IMPORT = RelayConcreteNode.MODULE_IMPORT,
+    LINKED_HANDLE = RelayConcreteNode.LINKED_HANDLE,
+    SCALAR_FIELD = RelayConcreteNode.SCALAR_FIELD,
+    SCALAR_HANDLE = RelayConcreteNode.SCALAR_HANDLE,
+    STREAM = RelayConcreteNode.STREAM;
+var getStorageKey = RelayStoreUtils.getStorageKey,
+    getModuleOperationKey = RelayStoreUtils.getModuleOperationKey;
+
 function mark(recordSource, selector, references, operationLoader) {
   var dataID = selector.dataID,
       node = selector.node,
@@ -52,7 +76,7 @@ function () {
   };
 
   _proto._getVariableValue = function _getVariableValue(name) {
-    !this._variables.hasOwnProperty(name) ? process.env.NODE_ENV !== "production" ? require("fbjs/lib/invariant")(false, 'RelayReferenceMarker(): Undefined variable `%s`.', name) : require("fbjs/lib/invariant")(false) : void 0;
+    !this._variables.hasOwnProperty(name) ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayReferenceMarker(): Undefined variable `%s`.', name) : invariant(false) : void 0;
     return this._variables[name];
   };
 
@@ -62,7 +86,7 @@ function () {
     selections.forEach(function (selection) {
       /* eslint-disable no-fallthrough */
       switch (selection.kind) {
-        case require("./RelayConcreteNode").LINKED_FIELD:
+        case LINKED_FIELD:
           if (selection.plural) {
             _this._traversePluralLink(selection, record);
           } else {
@@ -71,7 +95,7 @@ function () {
 
           break;
 
-        case require("./RelayConcreteNode").CONDITION:
+        case CONDITION:
           var conditionValue = _this._getVariableValue(selection.condition);
 
           if (conditionValue === selection.passingValue) {
@@ -80,8 +104,8 @@ function () {
 
           break;
 
-        case require("./RelayConcreteNode").INLINE_FRAGMENT:
-          var typeName = require("./RelayModernRecord").getType(record);
+        case INLINE_FRAGMENT:
+          var typeName = RelayModernRecord.getType(record);
 
           if (typeName != null && typeName === selection.type) {
             _this._traverseSelections(selection.selections, record);
@@ -89,10 +113,10 @@ function () {
 
           break;
 
-        case require("./RelayConcreteNode").FRAGMENT_SPREAD:
-          !false ? process.env.NODE_ENV !== "production" ? require("fbjs/lib/invariant")(false, 'RelayReferenceMarker(): Unexpected fragment spread `...%s`, ' + 'expected all fragments to be inlined.', selection.name) : require("fbjs/lib/invariant")(false) : void 0;
+        case FRAGMENT_SPREAD:
+          !false ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayReferenceMarker(): Unexpected fragment spread `...%s`, ' + 'expected all fragments to be inlined.', selection.name) : invariant(false) : void 0;
 
-        case require("./RelayConcreteNode").LINKED_HANDLE:
+        case LINKED_HANDLE:
           // The selections for a "handle" field are the same as those of the
           // original linked field where the handle was applied. Reference marking
           // therefore requires traversing the original field selections against
@@ -102,7 +126,7 @@ function () {
           // the concrete structure to allow shared subtrees, and have the linked
           // handle directly refer to the same selections as the LinkedField that
           // it was split from.
-          var handleField = require("./cloneRelayHandleSourceField")(selection, selections, _this._variables);
+          var handleField = cloneRelayHandleSourceField(selection, selections, _this._variables);
 
           if (handleField.plural) {
             _this._traversePluralLink(handleField, record);
@@ -112,68 +136,56 @@ function () {
 
           break;
 
-        case require("./RelayConcreteNode").SCALAR_FIELD:
-        case require("./RelayConcreteNode").SCALAR_HANDLE:
+        case DEFER:
+        case STREAM:
+          _this._traverseSelections(selection.selections, record);
+
+          break;
+
+        case SCALAR_FIELD:
+        case SCALAR_HANDLE:
           break;
 
-        case require("./RelayConcreteNode").MATCH_FIELD:
-          _this._traverseMatch(selection, record);
+        case MODULE_IMPORT:
+          _this._traverseModuleImport(selection, record);
+
+          break;
+
+        case CLIENT_EXTENSION:
+          _this._traverseSelections(selection.selections, record);
 
           break;
 
         default:
           selection;
-          !false ? process.env.NODE_ENV !== "production" ? require("fbjs/lib/invariant")(false, 'RelayReferenceMarker: Unknown AST node `%s`.', selection) : require("fbjs/lib/invariant")(false) : void 0;
+          !false ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayReferenceMarker: Unknown AST node `%s`.', selection) : invariant(false) : void 0;
       }
     });
   };
 
-  _proto._traverseMatch = function _traverseMatch(field, record) {
-    var storageKey = require("./RelayStoreUtils").getStorageKey(field, this._variables);
-
-    var linkedID = require("./RelayModernRecord").getLinkedRecordID(record, storageKey);
-
-    if (linkedID == null) {
-      return;
-    }
-
-    this._references.add(linkedID);
+  _proto._traverseModuleImport = function _traverseModuleImport(moduleImport, record) {
+    var operationLoader = this._operationLoader;
+    !(operationLoader !== null) ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayReferenceMarker: Expected an operationLoader to be configured when using `@module`.') : invariant(false) : void 0;
+    var operationKey = getModuleOperationKey(moduleImport.documentName);
+    var operationReference = RelayModernRecord.getValue(record, operationKey);
 
-    var linkedRecord = this._recordSource.get(linkedID);
-
-    if (linkedRecord == null) {
+    if (operationReference == null) {
       return;
     }
 
-    var typeName = require("./RelayModernRecord").getType(linkedRecord);
-
-    var match = field.matchesByType[typeName];
-
-    if (match != null) {
-      var operationLoader = this._operationLoader;
-      !(operationLoader !== null) ? process.env.NODE_ENV !== "production" ? require("fbjs/lib/invariant")(false, 'RelayReferenceMarker: Expected an operationLoader to be configured when using `@match`.') : require("fbjs/lib/invariant")(false) : void 0;
+    var operation = operationLoader.get(operationReference);
 
-      var operationReference = require("./RelayModernRecord").getValue(linkedRecord, require("./RelayStoreUtils").MATCH_FRAGMENT_KEY);
+    if (operation != null) {
+      this._traverseSelections(operation.selections, record);
+    } // Otherwise, if the operation is not available, we assume that the data
+    // cannot have been processed yet and therefore isn't in the store to
+    // begin with.
 
-      if (operationReference == null) {
-        return;
-      }
-
-      var operation = operationLoader.get(operationReference);
-
-      if (operation != null) {
-        this._traverseSelections(operation.selections, linkedRecord);
-      } // If the operation is not available, we assume that the data cannot have been
-      // processed yet and therefore isn't in the store to begin with.
-
-    } else {// TODO: warn: store is corrupt: the field should be null if the typename did not match
-      }
   };
 
   _proto._traverseLink = function _traverseLink(field, record) {
-    var storageKey = require("./RelayStoreUtils").getStorageKey(field, this._variables);
-
-    var linkedID = require("./RelayModernRecord").getLinkedRecordID(record, storageKey);
+    var storageKey = getStorageKey(field, this._variables);
+    var linkedID = RelayModernRecord.getLinkedRecordID(record, storageKey);
 
     if (linkedID == null) {
       return;
@@ -185,9 +197,8 @@ function () {
   _proto._traversePluralLink = function _traversePluralLink(field, record) {
     var _this2 = this;
 
-    var storageKey = require("./RelayStoreUtils").getStorageKey(field, this._variables);
-
-    var linkedIDs = require("./RelayModernRecord").getLinkedRecordIDs(record, storageKey);
+    var storageKey = getStorageKey(field, this._variables);
+    var linkedIDs = RelayModernRecord.getLinkedRecordIDs(record, storageKey);
 
     if (linkedIDs == null) {
       return;