relay-runtime 10.1.3 → 11.0.2

package/lib/store/RelayOperationTracker.js

@@ -14,13 +14,13 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 
 var _createForOfIteratorHelper2 = _interopRequireDefault(require("@babel/runtime/helpers/createForOfIteratorHelper"));
 
-var invariant = require("fbjs/lib/invariant");
+var invariant = require('invariant');
 
 var RelayOperationTracker = /*#__PURE__*/function () {
   function RelayOperationTracker() {
-    this._ownersToPendingOperations = new Map();
-    this._pendingOperationsToOwners = new Map();
-    this._ownersToPromise = new Map();
+    this._ownersToPendingOperationsIdentifier = new Map();
+    this._pendingOperationsToOwnersIdentifier = new Map();
+    this._ownersIdentifierToPromise = new Map();
   }
   /**
    * Update the map of current processing operations with the set of
@@ -35,7 +35,8 @@ var RelayOperationTracker = /*#__PURE__*/function () {
       return;
     }
 
-    var newlyAffectedOwners = new Set();
+    var pendingOperationIdentifier = pendingOperation.identifier;
+    var newlyAffectedOwnersIdentifier = new Set();
 
     var _iterator = (0, _createForOfIteratorHelper2["default"])(affectedOwners),
         _step;
@@ -43,22 +44,23 @@ var RelayOperationTracker = /*#__PURE__*/function () {
     try {
       for (_iterator.s(); !(_step = _iterator.n()).done;) {
         var owner = _step.value;
+        var ownerIdentifier = owner.identifier;
 
-        var pendingOperationsAffectingOwner = this._ownersToPendingOperations.get(owner);
+        var pendingOperationsAffectingOwner = this._ownersToPendingOperationsIdentifier.get(ownerIdentifier);
 
         if (pendingOperationsAffectingOwner != null) {
-          // In this case the `owner` already affected by some operations
+          // In this case the `ownerIdentifier` already affected by some operations
           // We just need to detect, is it the same operation that we already
           // have in the list, or it's a new operation
-          if (!pendingOperationsAffectingOwner.has(pendingOperation)) {
-            pendingOperationsAffectingOwner.add(pendingOperation);
-            newlyAffectedOwners.add(owner);
+          if (!pendingOperationsAffectingOwner.has(pendingOperationIdentifier)) {
+            pendingOperationsAffectingOwner.add(pendingOperationIdentifier);
+            newlyAffectedOwnersIdentifier.add(ownerIdentifier);
           }
         } else {
-          // This is a new `owner` that is affected by the operation
-          this._ownersToPendingOperations.set(owner, new Set([pendingOperation]));
+          // This is a new `ownerIdentifier` that is affected by the operation
+          this._ownersToPendingOperationsIdentifier.set(ownerIdentifier, new Set([pendingOperationIdentifier]));
 
-          newlyAffectedOwners.add(owner);
+          newlyAffectedOwnersIdentifier.add(ownerIdentifier);
         }
       } // No new owners were affected by this operation, we may stop here
 
@@ -68,24 +70,24 @@ var RelayOperationTracker = /*#__PURE__*/function () {
       _iterator.f();
     }
 
-    if (newlyAffectedOwners.size === 0) {
+    if (newlyAffectedOwnersIdentifier.size === 0) {
       return;
     } // But, if some owners were affected we need to add them to
-    // the `_pendingOperationsToOwners` set
+    // the `_pendingOperationsToOwnersIdentifier` set
 
 
-    var ownersAffectedByOperation = this._pendingOperationsToOwners.get(pendingOperation) || new Set();
+    var ownersAffectedByOperationIdentifier = this._pendingOperationsToOwnersIdentifier.get(pendingOperationIdentifier) || new Set();
 
-    var _iterator2 = (0, _createForOfIteratorHelper2["default"])(newlyAffectedOwners),
+    var _iterator2 = (0, _createForOfIteratorHelper2["default"])(newlyAffectedOwnersIdentifier),
         _step2;
 
     try {
       for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-        var _owner = _step2.value;
+        var _ownerIdentifier = _step2.value;
 
-        this._resolveOwnerResolvers(_owner);
+        this._resolveOwnerResolvers(_ownerIdentifier);
 
-        ownersAffectedByOperation.add(_owner);
+        ownersAffectedByOperationIdentifier.add(_ownerIdentifier);
       }
     } catch (err) {
       _iterator2.e(err);
@@ -93,7 +95,7 @@ var RelayOperationTracker = /*#__PURE__*/function () {
       _iterator2.f();
     }
 
-    this._pendingOperationsToOwners.set(pendingOperation, ownersAffectedByOperation);
+    this._pendingOperationsToOwnersIdentifier.set(pendingOperationIdentifier, ownersAffectedByOperationIdentifier);
   }
   /**
    * Once pending operation is completed we need to remove it
@@ -102,39 +104,41 @@ var RelayOperationTracker = /*#__PURE__*/function () {
   ;
 
   _proto.complete = function complete(pendingOperation) {
-    var affectedOwners = this._pendingOperationsToOwners.get(pendingOperation);
+    var pendingOperationIdentifier = pendingOperation.identifier;
 
-    if (affectedOwners == null) {
+    var affectedOwnersIdentifier = this._pendingOperationsToOwnersIdentifier.get(pendingOperationIdentifier);
+
+    if (affectedOwnersIdentifier == null) {
       return;
-    } // These were the owners affected only by `pendingOperation`
+    } // These were the owners affected only by `pendingOperationIdentifier`
 
 
-    var completedOwners = new Set(); // These were the owners affected by `pendingOperation`
+    var completedOwnersIdentifier = new Set(); // These were the owners affected by `pendingOperationIdentifier`
     // and some other operations
 
-    var updatedOwners = new Set();
+    var updatedOwnersIdentifier = new Set();
 
-    var _iterator3 = (0, _createForOfIteratorHelper2["default"])(affectedOwners),
+    var _iterator3 = (0, _createForOfIteratorHelper2["default"])(affectedOwnersIdentifier),
         _step3;
 
     try {
       for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-        var owner = _step3.value;
+        var ownerIdentifier = _step3.value;
 
-        var pendingOperationsAffectingOwner = this._ownersToPendingOperations.get(owner);
+        var pendingOperationsAffectingOwner = this._ownersToPendingOperationsIdentifier.get(ownerIdentifier);
 
         if (!pendingOperationsAffectingOwner) {
           continue;
         }
 
-        pendingOperationsAffectingOwner["delete"](pendingOperation);
+        pendingOperationsAffectingOwner["delete"](pendingOperationIdentifier);
 
         if (pendingOperationsAffectingOwner.size > 0) {
-          updatedOwners.add(owner);
+          updatedOwnersIdentifier.add(ownerIdentifier);
         } else {
-          completedOwners.add(owner);
+          completedOwnersIdentifier.add(ownerIdentifier);
         }
-      } // Complete subscriptions for all owners, affected by `pendingOperation`
+      } // Complete subscriptions for all owners, affected by `pendingOperationIdentifier`
 
     } catch (err) {
       _iterator3.e(err);
@@ -142,17 +146,17 @@ var RelayOperationTracker = /*#__PURE__*/function () {
       _iterator3.f();
     }
 
-    var _iterator4 = (0, _createForOfIteratorHelper2["default"])(completedOwners),
+    var _iterator4 = (0, _createForOfIteratorHelper2["default"])(completedOwnersIdentifier),
         _step4;
 
     try {
       for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-        var _owner2 = _step4.value;
+        var _ownerIdentifier2 = _step4.value;
 
-        this._resolveOwnerResolvers(_owner2);
+        this._resolveOwnerResolvers(_ownerIdentifier2);
 
-        this._ownersToPendingOperations["delete"](_owner2);
-      } // Update all owner that were updated by `pendingOperation` but still
+        this._ownersToPendingOperationsIdentifier["delete"](_ownerIdentifier2);
+      } // Update all ownerIdentifier that were updated by `pendingOperationIdentifier` but still
       // are affected by other operations
 
     } catch (err) {
@@ -161,15 +165,15 @@ var RelayOperationTracker = /*#__PURE__*/function () {
       _iterator4.f();
     }
 
-    var _iterator5 = (0, _createForOfIteratorHelper2["default"])(updatedOwners),
+    var _iterator5 = (0, _createForOfIteratorHelper2["default"])(updatedOwnersIdentifier),
         _step5;
 
     try {
       for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-        var _owner3 = _step5.value;
+        var _ownerIdentifier3 = _step5.value;
 
-        this._resolveOwnerResolvers(_owner3);
-      } // Finally, remove pending operation
+        this._resolveOwnerResolvers(_ownerIdentifier3);
+      } // Finally, remove pending operation identifier
 
     } catch (err) {
       _iterator5.e(err);
@@ -177,25 +181,27 @@ var RelayOperationTracker = /*#__PURE__*/function () {
       _iterator5.f();
     }
 
-    this._pendingOperationsToOwners["delete"](pendingOperation);
+    this._pendingOperationsToOwnersIdentifier["delete"](pendingOperationIdentifier);
   };
 
-  _proto._resolveOwnerResolvers = function _resolveOwnerResolvers(owner) {
-    var promiseEntry = this._ownersToPromise.get(owner);
+  _proto._resolveOwnerResolvers = function _resolveOwnerResolvers(ownerIdentifier) {
+    var promiseEntry = this._ownersIdentifierToPromise.get(ownerIdentifier);
 
     if (promiseEntry != null) {
       promiseEntry.resolve();
     }
 
-    this._ownersToPromise["delete"](owner);
+    this._ownersIdentifierToPromise["delete"](ownerIdentifier);
   };
 
   _proto.getPromiseForPendingOperationsAffectingOwner = function getPromiseForPendingOperationsAffectingOwner(owner) {
-    if (!this._ownersToPendingOperations.has(owner)) {
+    var ownerIdentifier = owner.identifier;
+
+    if (!this._ownersToPendingOperationsIdentifier.has(ownerIdentifier)) {
       return null;
     }
 
-    var cachedPromiseEntry = this._ownersToPromise.get(owner);
+    var cachedPromiseEntry = this._ownersIdentifierToPromise.get(ownerIdentifier);
 
     if (cachedPromiseEntry != null) {
       return cachedPromiseEntry.promise;
@@ -207,7 +213,7 @@ var RelayOperationTracker = /*#__PURE__*/function () {
     });
     !(resolve != null) ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayOperationTracker: Expected resolver to be defined. If you' + 'are seeing this, it is likely a bug in Relay.') : invariant(false) : void 0;
 
-    this._ownersToPromise.set(owner, {
+    this._ownersIdentifierToPromise.set(ownerIdentifier, {
       promise: promise,
       resolve: resolve
     });

package/lib/store/RelayPublishQueue.js

@@ -10,7 +10,7 @@
 // flowlint ambiguous-object-type:error
 'use strict';
 
-var ErrorUtils = require("fbjs/lib/ErrorUtils");
+var _global$ErrorUtils$ap, _global$ErrorUtils;
 
 var RelayReader = require('./RelayReader');
 
@@ -22,10 +22,13 @@ var RelayRecordSourceProxy = require('../mutations/RelayRecordSourceProxy');
 
 var RelayRecordSourceSelectorProxy = require('../mutations/RelayRecordSourceSelectorProxy');
 
-var invariant = require("fbjs/lib/invariant");
+var invariant = require('invariant');
 
 var warning = require("fbjs/lib/warning");
 
+var applyWithGuard = (_global$ErrorUtils$ap = (_global$ErrorUtils = global.ErrorUtils) === null || _global$ErrorUtils === void 0 ? void 0 : _global$ErrorUtils.applyWithGuard) !== null && _global$ErrorUtils$ap !== void 0 ? _global$ErrorUtils$ap : function (callback, context, args, onError, name) {
+  return callback.apply(context, args);
+};
 /**
  * Coordinates the concurrent modification of a `Store` due to optimistic and
  * non-revertable client updates and server payloads:
@@ -37,6 +40,7 @@ var warning = require("fbjs/lib/warning");
  *   - Executes handlers for "handle" fields.
  *   - Reverts and reapplies pending optimistic updates.
  */
+
 var RelayPublishQueue = /*#__PURE__*/function () {
   // True if the next `run()` should apply the backup and rerun all optimistic
   // updates performing a rebase.
@@ -259,7 +263,7 @@ var RelayPublishQueue = /*#__PURE__*/function () {
         var sink = RelayRecordSource.create();
         var mutator = new RelayRecordSourceMutator(_this2._store.getSource(), sink);
         var recordSourceProxy = new RelayRecordSourceProxy(mutator, _this2._getDataID);
-        ErrorUtils.applyWithGuard(updater, null, [recordSourceProxy], null, 'RelayPublishQueue:commitData');
+        applyWithGuard(updater, null, [recordSourceProxy], null, 'RelayPublishQueue:commitData');
         invalidatedStore = invalidatedStore || recordSourceProxy.isStoreMarkedForInvalidation();
         var idsMarkedForInvalidation = recordSourceProxy.getIDsMarkedForInvalidation();
 
@@ -288,7 +292,7 @@ var RelayPublishQueue = /*#__PURE__*/function () {
     var processUpdate = function processUpdate(optimisticUpdate) {
       if (optimisticUpdate.storeUpdater) {
         var storeUpdater = optimisticUpdate.storeUpdater;
-        ErrorUtils.applyWithGuard(storeUpdater, null, [recordSourceProxy], null, 'RelayPublishQueue:applyUpdates');
+        applyWithGuard(storeUpdater, null, [recordSourceProxy], null, 'RelayPublishQueue:applyUpdates');
       } else {
         var operation = optimisticUpdate.operation,
             payload = optimisticUpdate.payload,
@@ -304,7 +308,7 @@ var RelayPublishQueue = /*#__PURE__*/function () {
         }
 
         if (updater) {
-          ErrorUtils.applyWithGuard(updater, null, [recordSourceSelectorProxy, selectorData], null, 'RelayPublishQueue:applyUpdates');
+          applyWithGuard(updater, null, [recordSourceSelectorProxy, selectorData], null, 'RelayPublishQueue:applyUpdates');
         }
       }
     }; // rerun all updaters in case we are running a rebase

package/lib/store/RelayReader.js

@@ -10,11 +10,15 @@
 // flowlint ambiguous-object-type:error
 'use strict';
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
 var RelayFeatureFlags = require('../util/RelayFeatureFlags');
 
 var RelayModernRecord = require('./RelayModernRecord');
 
-var invariant = require("fbjs/lib/invariant");
+var invariant = require('invariant');
 
 var _require = require('../util/RelayConcreteNode'),
     CLIENT_EXTENSION = _require.CLIENT_EXTENSION,
@@ -27,6 +31,7 @@ var _require = require('../util/RelayConcreteNode'),
     LINKED_FIELD = _require.LINKED_FIELD,
     MODULE_IMPORT = _require.MODULE_IMPORT,
     REQUIRED_FIELD = _require.REQUIRED_FIELD,
+    RELAY_RESOLVER = _require.RELAY_RESOLVER,
     SCALAR_FIELD = _require.SCALAR_FIELD,
     STREAM = _require.STREAM;
 
@@ -45,8 +50,11 @@ var _require3 = require('./RelayStoreUtils'),
     getStorageKey = _require3.getStorageKey,
     getModuleComponentKey = _require3.getModuleComponentKey;
 
-var _require4 = require('./TypeID'),
-    generateTypeID = _require4.generateTypeID;
+var _require4 = require('./ResolverFragments'),
+    withResolverContext = _require4.withResolverContext;
+
+var _require5 = require('./TypeID'),
+    generateTypeID = _require5.generateTypeID;
 
 function read(recordSource, selector) {
   var reader = new RelayReader(recordSource, selector);
@@ -64,7 +72,7 @@ var RelayReader = /*#__PURE__*/function () {
     this._missingRequiredFields = null;
     this._owner = selector.owner;
     this._recordSource = recordSource;
-    this._seenRecords = {};
+    this._seenRecords = new Set();
     this._selector = selector;
     this._variables = selector.variables;
   }
@@ -138,7 +146,7 @@ var RelayReader = /*#__PURE__*/function () {
   _proto._traverse = function _traverse(node, dataID, prevData) {
     var record = this._recordSource.get(dataID);
 
-    this._seenRecords[dataID] = record;
+    this._seenRecords.add(dataID);
 
     if (record == null) {
       if (record === undefined) {
@@ -156,7 +164,8 @@ var RelayReader = /*#__PURE__*/function () {
   };
 
   _proto._getVariableValue = function _getVariableValue(name) {
-    !this._variables.hasOwnProperty(name) ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayReader(): Undefined variable `%s`.', name) : invariant(false) : void 0;
+    !this._variables.hasOwnProperty(name) ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayReader(): Undefined variable `%s`.', name) : invariant(false) : void 0; // $FlowFixMe[cannot-write]
+
     return this._variables[name];
   };
 
@@ -309,6 +318,17 @@ var RelayReader = /*#__PURE__*/function () {
             break;
           }
 
+        case RELAY_RESOLVER:
+          {
+            if (!RelayFeatureFlags.ENABLE_RELAY_RESOLVERS) {
+              throw new Error('Relay Resolver fields are not yet supported.');
+            }
+
+            this._readResolverField(selection, record, data);
+
+            break;
+          }
+
         case FRAGMENT_SPREAD:
           this._createFragmentPointer(selection, record, data);
 
@@ -320,7 +340,7 @@ var RelayReader = /*#__PURE__*/function () {
           break;
 
         case INLINE_DATA_FRAGMENT_SPREAD:
-          this._createInlineDataFragmentPointer(selection, record, data);
+          this._createInlineDataOrResolverFragmentPointer(selection, record, data);
 
           break;
 
@@ -387,6 +407,40 @@ var RelayReader = /*#__PURE__*/function () {
     }
   };
 
+  _proto._readResolverField = function _readResolverField(selection, record, data) {
+    var _this = this;
+
+    var name = selection.name,
+        alias = selection.alias,
+        resolverModule = selection.resolverModule,
+        fragment = selection.fragment;
+    var key = {
+      __id: RelayModernRecord.getDataID(record),
+      __fragmentOwner: this._owner,
+      __fragments: (0, _defineProperty2["default"])({}, fragment.name, {})
+    };
+    var resolverContext = {
+      getDataForResolverFragment: function getDataForResolverFragment(singularReaderSelector) {
+        var _resolverFragmentData;
+
+        var resolverFragmentData = {};
+
+        _this._createInlineDataOrResolverFragmentPointer(singularReaderSelector.node, record, resolverFragmentData);
+
+        var answer = (_resolverFragmentData = resolverFragmentData[FRAGMENTS_KEY]) === null || _resolverFragmentData === void 0 ? void 0 : _resolverFragmentData[fragment.name];
+        !(typeof answer === 'object' && answer !== null) ? process.env.NODE_ENV !== "production" ? invariant(false, "Expected reader data to contain a __fragments property with a property for the fragment named ".concat(fragment.name, ", but it is missing.")) : invariant(false) : void 0;
+        return answer;
+      }
+    };
+    var resolverResult = withResolverContext(resolverContext, function () {
+      return (// $FlowFixMe[prop-missing] - resolver module's type signature is a lie
+        resolverModule(key)
+      );
+    });
+    data[alias !== null && alias !== void 0 ? alias : name] = resolverResult;
+    return resolverResult;
+  };
+
   _proto._readFlightField = function _readFlightField(field, record, data) {
     var _field$alias;
 
@@ -406,7 +460,7 @@ var RelayReader = /*#__PURE__*/function () {
 
     var reactFlightClientResponseRecord = this._recordSource.get(reactFlightClientResponseRecordID);
 
-    this._seenRecords[reactFlightClientResponseRecordID] = reactFlightClientResponseRecord;
+    this._seenRecords.add(reactFlightClientResponseRecordID);
 
     if (reactFlightClientResponseRecord == null) {
       data[applicationName] = reactFlightClientResponseRecord;
@@ -465,7 +519,7 @@ var RelayReader = /*#__PURE__*/function () {
   };
 
   _proto._readPluralLink = function _readPluralLink(field, record, data) {
-    var _this = this;
+    var _this2 = this;
 
     var _field$alias4;
 
@@ -489,7 +543,7 @@ var RelayReader = /*#__PURE__*/function () {
     linkedIDs.forEach(function (linkedID, nextIndex) {
       if (linkedID == null) {
         if (linkedID === undefined) {
-          _this._isMissingData = true;
+          _this2._isMissingData = true;
         } // $FlowFixMe[cannot-write]
 
 
@@ -501,7 +555,7 @@ var RelayReader = /*#__PURE__*/function () {
       !(prevItem == null || typeof prevItem === 'object') ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayReader(): Expected data for field `%s` on record `%s` ' + 'to be an object, got `%s`.', applicationName, RelayModernRecord.getDataID(record), prevItem) : invariant(false) : void 0; // $FlowFixMe[cannot-write]
       // $FlowFixMe[incompatible-variance]
 
-      linkedArray[nextIndex] = _this._traverse(field, linkedID, prevItem);
+      linkedArray[nextIndex] = _this2._traverse(field, linkedID, prevItem);
     });
     data[applicationName] = linkedArray;
     return linkedArray;
@@ -563,7 +617,7 @@ var RelayReader = /*#__PURE__*/function () {
     }
   };
 
-  _proto._createInlineDataFragmentPointer = function _createInlineDataFragmentPointer(inlineDataFragmentSpread, record, data) {
+  _proto._createInlineDataOrResolverFragmentPointer = function _createInlineDataOrResolverFragmentPointer(fragmentSpreadOrFragment, record, data) {
     var fragmentPointers = data[FRAGMENTS_KEY];
 
     if (fragmentPointers == null) {
@@ -578,10 +632,10 @@ var RelayReader = /*#__PURE__*/function () {
 
     var inlineData = {};
 
-    this._traverseSelections(inlineDataFragmentSpread.selections, record, inlineData); // $FlowFixMe[cannot-write] - writing into read-only field
+    this._traverseSelections(fragmentSpreadOrFragment.selections, record, inlineData); // $FlowFixMe[cannot-write] - writing into read-only field
 
 
-    fragmentPointers[inlineDataFragmentSpread.name] = inlineData;
+    fragmentPointers[fragmentSpreadOrFragment.name] = inlineData;
   };
 
   return RelayReader;

package/lib/store/RelayReferenceMarker.js

@@ -28,12 +28,13 @@ var cloneRelayHandleSourceField = require('./cloneRelayHandleSourceField');
 
 var getOperation = require('../util/getOperation');
 
-var invariant = require("fbjs/lib/invariant");
+var invariant = require('invariant');
 
 var _require = require('./TypeID'),
     generateTypeID = _require.generateTypeID;
 
 var CONDITION = RelayConcreteNode.CONDITION,
+    CLIENT_COMPONENT = RelayConcreteNode.CLIENT_COMPONENT,
     CLIENT_EXTENSION = RelayConcreteNode.CLIENT_EXTENSION,
     DEFER = RelayConcreteNode.DEFER,
     FLIGHT_FIELD = RelayConcreteNode.FLIGHT_FIELD,
@@ -50,11 +51,11 @@ var ROOT_ID = RelayStoreUtils.ROOT_ID,
     getStorageKey = RelayStoreUtils.getStorageKey,
     getModuleOperationKey = RelayStoreUtils.getModuleOperationKey;
 
-function mark(recordSource, selector, references, operationLoader) {
+function mark(recordSource, selector, references, operationLoader, shouldProcessClientComponents) {
   var dataID = selector.dataID,
       node = selector.node,
       variables = selector.variables;
-  var marker = new RelayReferenceMarker(recordSource, variables, references, operationLoader);
+  var marker = new RelayReferenceMarker(recordSource, variables, references, operationLoader, shouldProcessClientComponents);
   marker.mark(node, dataID);
 }
 /**
@@ -63,12 +64,13 @@ function mark(recordSource, selector, references, operationLoader) {
 
 
 var RelayReferenceMarker = /*#__PURE__*/function () {
-  function RelayReferenceMarker(recordSource, variables, references, operationLoader) {
+  function RelayReferenceMarker(recordSource, variables, references, operationLoader, shouldProcessClientComponents) {
     this._operationLoader = operationLoader !== null && operationLoader !== void 0 ? operationLoader : null;
     this._operationName = null;
     this._recordSource = recordSource;
     this._references = references;
     this._variables = variables;
+    this._shouldProcessClientComponents = shouldProcessClientComponents;
   }
 
   var _proto = RelayReferenceMarker.prototype;
@@ -94,7 +96,8 @@ var RelayReferenceMarker = /*#__PURE__*/function () {
   };
 
   _proto._getVariableValue = function _getVariableValue(name) {
-    !this._variables.hasOwnProperty(name) ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayReferenceMarker(): Undefined variable `%s`.', name) : invariant(false) : void 0;
+    !this._variables.hasOwnProperty(name) ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayReferenceMarker(): Undefined variable `%s`.', name) : invariant(false) : void 0; // $FlowFixMe[cannot-write]
+
     return this._variables[name];
   };
 
@@ -145,7 +148,9 @@ var RelayReferenceMarker = /*#__PURE__*/function () {
         // $FlowFixMe[incompatible-type]
 
         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;
+          _this._traverseSelections(selection.fragment.selections, record);
+
+          break;
 
         case LINKED_HANDLE:
           // The selections for a "handle" field are the same as those of the
@@ -209,6 +214,15 @@ var RelayReferenceMarker = /*#__PURE__*/function () {
 
           break;
 
+        case CLIENT_COMPONENT:
+          if (_this._shouldProcessClientComponents === false) {
+            break;
+          }
+
+          _this._traverseSelections(selection.fragment.selections, record);
+
+          break;
+
         default:
           selection;
           !false ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayReferenceMarker: Unknown AST node `%s`.', selection) : invariant(false) : void 0;
@@ -284,26 +298,26 @@ var RelayReferenceMarker = /*#__PURE__*/function () {
       return;
     }
 
-    var reachableQueries = RelayModernRecord.getValue(reactFlightClientResponseRecord, RelayStoreReactFlightUtils.REACT_FLIGHT_QUERIES_STORAGE_KEY);
+    var reachableExecutableDefinitions = RelayModernRecord.getValue(reactFlightClientResponseRecord, RelayStoreReactFlightUtils.REACT_FLIGHT_EXECUTABLE_DEFINITIONS_STORAGE_KEY);
 
-    if (!Array.isArray(reachableQueries)) {
+    if (!Array.isArray(reachableExecutableDefinitions)) {
       return;
     }
 
     var operationLoader = this._operationLoader;
-    !(operationLoader !== null) ? process.env.NODE_ENV !== "production" ? invariant(false, 'DataChecker: Expected an operationLoader to be configured when using ' + 'React Flight') : invariant(false) : void 0; // In Flight, the variables that are in scope for reachable queries aren't
-    // the same as what's in scope for the outer query.
+    !(operationLoader !== null) ? process.env.NODE_ENV !== "production" ? invariant(false, 'DataChecker: Expected an operationLoader to be configured when using ' + 'React Flight') : invariant(false) : void 0; // In Flight, the variables that are in scope for reachable executable
+    // definitions aren't the same as what's in scope for the outer query.
 
     var prevVariables = this._variables; // $FlowFixMe[incompatible-cast]
 
-    var _iterator = (0, _createForOfIteratorHelper2["default"])(reachableQueries),
+    var _iterator = (0, _createForOfIteratorHelper2["default"])(reachableExecutableDefinitions),
         _step;
 
     try {
       for (_iterator.s(); !(_step = _iterator.n()).done;) {
-        var query = _step.value;
-        this._variables = query.variables;
-        var operationReference = query.module;
+        var definition = _step.value;
+        this._variables = definition.variables;
+        var operationReference = definition.module;
         var normalizationRootNode = operationLoader.get(operationReference);
 
         if (normalizationRootNode != null) {