relay-runtime 10.1.3 → 11.0.2

package/lib/store/RelayModernEnvironment.js

@@ -15,12 +15,12 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 
+var OperationExecutor = require('./OperationExecutor');
+
 var RelayDefaultHandlerProvider = require('../handlers/RelayDefaultHandlerProvider');
 
 var RelayFeatureFlags = require('../util/RelayFeatureFlags');
 
-var RelayModernQueryExecutor = require('./RelayModernQueryExecutor');
-
 var RelayObservable = require('../network/RelayObservable');
 
 var RelayOperationTracker = require('../store/RelayOperationTracker');
@@ -35,19 +35,19 @@ var defaultRequiredFieldLogger = require('./defaultRequiredFieldLogger');
 
 var generateID = require('../util/generateID');
 
-var invariant = require("fbjs/lib/invariant");
+var invariant = require('invariant');
 
 var RelayModernEnvironment = /*#__PURE__*/function () {
   function RelayModernEnvironment(config) {
     var _this = this;
 
-    var _config$log, _config$requiredField, _config$UNSTABLE_defa, _config$UNSTABLE_DO_N, _config$scheduler, _config$isServer, _config$operationTrac;
+    var _config$log, _config$requiredField, _config$UNSTABLE_defa, _config$getDataID, _config$handlerProvid, _config$scheduler, _config$isServer, _config$operationTrac;
 
     this.configName = config.configName;
-    var handlerProvider = config.handlerProvider ? config.handlerProvider : RelayDefaultHandlerProvider;
     this._treatMissingFieldsAsNull = config.treatMissingFieldsAsNull === true;
     var operationLoader = config.operationLoader;
     var reactFlightPayloadDeserializer = config.reactFlightPayloadDeserializer;
+    var reactFlightServerErrorHandler = config.reactFlightServerErrorHandler;
 
     if (process.env.NODE_ENV !== "production") {
       if (operationLoader != null) {
@@ -65,8 +65,8 @@ var RelayModernEnvironment = /*#__PURE__*/function () {
     this._operationLoader = operationLoader;
     this._operationExecutions = new Map();
     this._network = this.__wrapNetworkWithLogObserver(config.network);
-    this._getDataID = (_config$UNSTABLE_DO_N = config.UNSTABLE_DO_NOT_USE_getDataID) !== null && _config$UNSTABLE_DO_N !== void 0 ? _config$UNSTABLE_DO_N : defaultGetDataID;
-    this._publishQueue = new RelayPublishQueue(config.store, handlerProvider, this._getDataID);
+    this._getDataID = (_config$getDataID = config.getDataID) !== null && _config$getDataID !== void 0 ? _config$getDataID : defaultGetDataID;
+    this._publishQueue = new RelayPublishQueue(config.store, (_config$handlerProvid = config.handlerProvider) !== null && _config$handlerProvid !== void 0 ? _config$handlerProvid : RelayDefaultHandlerProvider, this._getDataID);
     this._scheduler = (_config$scheduler = config.scheduler) !== null && _config$scheduler !== void 0 ? _config$scheduler : null;
     this._store = config.store;
     this.options = config.options;
@@ -98,6 +98,8 @@ var RelayModernEnvironment = /*#__PURE__*/function () {
     this._missingFieldHandlers = config.missingFieldHandlers;
     this._operationTracker = (_config$operationTrac = config.operationTracker) !== null && _config$operationTrac !== void 0 ? _config$operationTrac : new RelayOperationTracker();
     this._reactFlightPayloadDeserializer = reactFlightPayloadDeserializer;
+    this._reactFlightServerErrorHandler = reactFlightServerErrorHandler;
+    this._shouldProcessClientComponents = config.shouldProcessClientComponents;
   }
 
   var _proto = RelayModernEnvironment.prototype;
@@ -169,30 +171,16 @@ var RelayModernEnvironment = /*#__PURE__*/function () {
   };
 
   _proto.applyMutation = function applyMutation(optimisticConfig) {
-    var _this5 = this;
-
-    var subscription = RelayObservable.create(function (sink) {
-      var source = RelayObservable.create(function (_sink) {});
-      var executor = RelayModernQueryExecutor.execute({
-        operation: optimisticConfig.operation,
-        operationExecutions: _this5._operationExecutions,
-        operationLoader: _this5._operationLoader,
-        optimisticConfig: optimisticConfig,
-        publishQueue: _this5._publishQueue,
-        reactFlightPayloadDeserializer: _this5._reactFlightPayloadDeserializer,
-        scheduler: _this5._scheduler,
-        sink: sink,
-        source: source,
-        store: _this5._store,
-        updater: null,
-        operationTracker: _this5._operationTracker,
-        getDataID: _this5._getDataID,
-        treatMissingFieldsAsNull: _this5._treatMissingFieldsAsNull
-      });
-      return function () {
-        return executor.cancel();
-      };
+    var subscription = this._execute({
+      createSource: function createSource() {
+        return RelayObservable.create(function (_sink) {});
+      },
+      isClientPayload: false,
+      operation: optimisticConfig.operation,
+      optimisticConfig: optimisticConfig,
+      updater: null
     }).subscribe({});
+
     return {
       dispose: function dispose() {
         return subscription.unsubscribe();
@@ -209,41 +197,26 @@ var RelayModernEnvironment = /*#__PURE__*/function () {
   };
 
   _proto.commitPayload = function commitPayload(operation, payload) {
-    var _this6 = this;
-
-    RelayObservable.create(function (sink) {
-      var executor = RelayModernQueryExecutor.execute({
-        operation: operation,
-        operationExecutions: _this6._operationExecutions,
-        operationLoader: _this6._operationLoader,
-        optimisticConfig: null,
-        publishQueue: _this6._publishQueue,
-        reactFlightPayloadDeserializer: _this6._reactFlightPayloadDeserializer,
-        scheduler: _this6._scheduler,
-        sink: sink,
-        source: RelayObservable.from({
+    this._execute({
+      createSource: function createSource() {
+        return RelayObservable.from({
           data: payload
-        }),
-        store: _this6._store,
-        updater: null,
-        operationTracker: _this6._operationTracker,
-        getDataID: _this6._getDataID,
-        isClientPayload: true,
-        treatMissingFieldsAsNull: _this6._treatMissingFieldsAsNull
-      });
-      return function () {
-        return executor.cancel();
-      };
+        });
+      },
+      isClientPayload: true,
+      operation: operation,
+      optimisticConfig: null,
+      updater: null
     }).subscribe({});
   };
 
   _proto.commitUpdate = function commitUpdate(updater) {
-    var _this7 = this;
+    var _this5 = this;
 
     this._scheduleUpdates(function () {
-      _this7._publishQueue.commitUpdate(updater);
+      _this5._publishQueue.commitUpdate(updater);
 
-      _this7._publishQueue.run();
+      _this5._publishQueue.run();
     });
   };
 
@@ -264,7 +237,7 @@ var RelayModernEnvironment = /*#__PURE__*/function () {
   };
 
   _proto._checkSelectorAndHandleMissingFields = function _checkSelectorAndHandleMissingFields(operation, handlers) {
-    var _this8 = this;
+    var _this6 = this;
 
     var target = RelayRecordSource.create();
 
@@ -275,9 +248,9 @@ var RelayModernEnvironment = /*#__PURE__*/function () {
 
     if (target.size() > 0) {
       this._scheduleUpdates(function () {
-        _this8._publishQueue.commitSource(target);
+        _this6._publishQueue.commitSource(target);
 
-        _this8._publishQueue.run();
+        _this6._publishQueue.run();
       });
     }
 
@@ -304,32 +277,18 @@ var RelayModernEnvironment = /*#__PURE__*/function () {
   ;
 
   _proto.execute = function execute(_ref) {
-    var _this9 = this;
+    var _this7 = this;
 
     var operation = _ref.operation,
         updater = _ref.updater;
-    return RelayObservable.create(function (sink) {
-      var source = _this9._network.execute(operation.request.node.params, operation.request.variables, operation.request.cacheConfig || {}, null);
-
-      var executor = RelayModernQueryExecutor.execute({
-        operation: operation,
-        operationExecutions: _this9._operationExecutions,
-        operationLoader: _this9._operationLoader,
-        optimisticConfig: null,
-        publishQueue: _this9._publishQueue,
-        reactFlightPayloadDeserializer: _this9._reactFlightPayloadDeserializer,
-        scheduler: _this9._scheduler,
-        sink: sink,
-        source: source,
-        store: _this9._store,
-        updater: updater,
-        operationTracker: _this9._operationTracker,
-        getDataID: _this9._getDataID,
-        treatMissingFieldsAsNull: _this9._treatMissingFieldsAsNull
-      });
-      return function () {
-        return executor.cancel();
-      };
+    return this._execute({
+      createSource: function createSource() {
+        return _this7._network.execute(operation.request.node.params, operation.request.variables, operation.request.cacheConfig || {}, null);
+      },
+      isClientPayload: false,
+      operation: operation,
+      optimisticConfig: null,
+      updater: updater
     });
   }
   /**
@@ -345,47 +304,33 @@ var RelayModernEnvironment = /*#__PURE__*/function () {
   ;
 
   _proto.executeMutation = function executeMutation(_ref2) {
-    var _this10 = this;
+    var _this8 = this;
 
     var operation = _ref2.operation,
         optimisticResponse = _ref2.optimisticResponse,
         optimisticUpdater = _ref2.optimisticUpdater,
         updater = _ref2.updater,
         uploadables = _ref2.uploadables;
-    return RelayObservable.create(function (sink) {
-      var optimisticConfig;
-
-      if (optimisticResponse || optimisticUpdater) {
-        optimisticConfig = {
-          operation: operation,
-          response: optimisticResponse,
-          updater: optimisticUpdater
-        };
-      }
+    var optimisticConfig;
 
-      var source = _this10._network.execute(operation.request.node.params, operation.request.variables, (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, operation.request.cacheConfig), {}, {
-        force: true
-      }), uploadables);
-
-      var executor = RelayModernQueryExecutor.execute({
+    if (optimisticResponse || optimisticUpdater) {
+      optimisticConfig = {
         operation: operation,
-        operationExecutions: _this10._operationExecutions,
-        operationLoader: _this10._operationLoader,
-        optimisticConfig: optimisticConfig,
-        publishQueue: _this10._publishQueue,
-        reactFlightPayloadDeserializer: _this10._reactFlightPayloadDeserializer,
-        scheduler: _this10._scheduler,
-        sink: sink,
-        source: source,
-        store: _this10._store,
-        updater: updater,
-        operationTracker: _this10._operationTracker,
-        getDataID: _this10._getDataID,
-        treatMissingFieldsAsNull: _this10._treatMissingFieldsAsNull
-      });
-      return function () {
-        return executor.cancel();
+        response: optimisticResponse,
+        updater: optimisticUpdater
       };
+    }
+
+    return this._execute({
+      createSource: function createSource() {
+        return _this8._network.execute(operation.request.node.params, operation.request.variables, (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, operation.request.cacheConfig), {}, {
+          force: true
+        }), uploadables);
+      },
+      isClientPayload: false,
+      operation: operation,
+      optimisticConfig: optimisticConfig,
+      updater: updater
     });
   }
   /**
@@ -400,36 +345,59 @@ var RelayModernEnvironment = /*#__PURE__*/function () {
   ;
 
   _proto.executeWithSource = function executeWithSource(_ref3) {
-    var _this11 = this;
-
     var operation = _ref3.operation,
         source = _ref3.source;
+    return this._execute({
+      createSource: function createSource() {
+        return source;
+      },
+      isClientPayload: false,
+      operation: operation,
+      optimisticConfig: null,
+      updater: null
+    });
+  };
+
+  _proto.toJSON = function toJSON() {
+    var _this$configName;
+
+    return "RelayModernEnvironment(".concat((_this$configName = this.configName) !== null && _this$configName !== void 0 ? _this$configName : '', ")");
+  };
+
+  _proto._execute = function _execute(_ref4) {
+    var _this9 = this;
+
+    var createSource = _ref4.createSource,
+        isClientPayload = _ref4.isClientPayload,
+        operation = _ref4.operation,
+        optimisticConfig = _ref4.optimisticConfig,
+        updater = _ref4.updater;
     return RelayObservable.create(function (sink) {
-      var executor = RelayModernQueryExecutor.execute({
+      var executor = OperationExecutor.execute({
+        getDataID: _this9._getDataID,
+        isClientPayload: isClientPayload,
         operation: operation,
-        operationExecutions: _this11._operationExecutions,
-        operationLoader: _this11._operationLoader,
-        operationTracker: _this11._operationTracker,
-        optimisticConfig: null,
-        publishQueue: _this11._publishQueue,
-        reactFlightPayloadDeserializer: _this11._reactFlightPayloadDeserializer,
-        scheduler: _this11._scheduler,
+        operationExecutions: _this9._operationExecutions,
+        operationLoader: _this9._operationLoader,
+        operationTracker: _this9._operationTracker,
+        optimisticConfig: optimisticConfig,
+        publishQueue: _this9._publishQueue,
+        reactFlightPayloadDeserializer: _this9._reactFlightPayloadDeserializer,
+        reactFlightServerErrorHandler: _this9._reactFlightServerErrorHandler,
+        scheduler: _this9._scheduler,
+        shouldProcessClientComponents: _this9._shouldProcessClientComponents,
         sink: sink,
-        source: source,
-        store: _this11._store,
-        getDataID: _this11._getDataID,
-        treatMissingFieldsAsNull: _this11._treatMissingFieldsAsNull
+        // NOTE: Some product tests expect `Network.execute` to be called only
+        //       when the Observable is executed.
+        source: createSource(),
+        store: _this9._store,
+        treatMissingFieldsAsNull: _this9._treatMissingFieldsAsNull,
+        updater: updater
       });
       return function () {
         return executor.cancel();
       };
     });
-  };
-
-  _proto.toJSON = function toJSON() {
-    var _this$configName;
-
-    return "RelayModernEnvironment(".concat((_this$configName = this.configName) !== null && _this$configName !== void 0 ? _this$configName : '', ")");
   }
   /**
    * Wraps the network with logging to ensure that network requests are
@@ -450,7 +418,8 @@ var RelayModernEnvironment = /*#__PURE__*/function () {
               name: 'network.start',
               transactionID: transactionID,
               params: params,
-              variables: variables
+              variables: variables,
+              cacheConfig: cacheConfig
             });
           },
           next: function next(response) {

package/lib/store/RelayModernFragmentSpecResolver.js

@@ -20,7 +20,7 @@ var RelayFeatureFlags = require('../util/RelayFeatureFlags');
 
 var areEqual = require("fbjs/lib/areEqual");
 
-var invariant = require("fbjs/lib/invariant");
+var invariant = require('invariant');
 
 var isScalarAndEqual = require('../util/isScalarAndEqual');
 
@@ -59,7 +59,7 @@ var _require3 = require('./RelayModernSelector'),
  * recomputed the first time `resolve()` is called.
  */
 var RelayModernFragmentSpecResolver = /*#__PURE__*/function () {
-  function RelayModernFragmentSpecResolver(context, fragments, props, callback) {
+  function RelayModernFragmentSpecResolver(context, fragments, props, callback, rootIsQueryRenderer) {
     var _this = this;
 
     (0, _defineProperty2["default"])(this, "_onChange", function () {
@@ -76,6 +76,7 @@ var RelayModernFragmentSpecResolver = /*#__PURE__*/function () {
     this._props = {};
     this._resolvers = {};
     this._stale = false;
+    this._rootIsQueryRenderer = rootIsQueryRenderer;
     this.setProps(props);
   }
 
@@ -149,14 +150,14 @@ var RelayModernFragmentSpecResolver = /*#__PURE__*/function () {
           resolver = null;
         } else if (ownedSelector.kind === 'PluralReaderSelector') {
           if (resolver == null) {
-            resolver = new SelectorListResolver(this._context.environment, ownedSelector, this._onChange);
+            resolver = new SelectorListResolver(this._context.environment, this._rootIsQueryRenderer, ownedSelector, this._onChange);
           } else {
             !(resolver instanceof SelectorListResolver) ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayModernFragmentSpecResolver: Expected prop `%s` to always be an array.', _key3) : invariant(false) : void 0;
             resolver.setSelector(ownedSelector);
           }
         } else {
           if (resolver == null) {
-            resolver = new SelectorResolver(this._context.environment, ownedSelector, this._onChange);
+            resolver = new SelectorResolver(this._context.environment, this._rootIsQueryRenderer, ownedSelector, this._onChange);
           } else {
             !(resolver instanceof SelectorResolver) ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayModernFragmentSpecResolver: Expected prop `%s` to always be an object.', _key3) : invariant(false) : void 0;
             resolver.setSelector(ownedSelector);
@@ -193,7 +194,7 @@ var RelayModernFragmentSpecResolver = /*#__PURE__*/function () {
 
 
 var SelectorResolver = /*#__PURE__*/function () {
-  function SelectorResolver(environment, selector, callback) {
+  function SelectorResolver(environment, rootIsQueryRenderer, selector, callback) {
     var _this2 = this;
 
     (0, _defineProperty2["default"])(this, "_onChange", function (snapshot) {
@@ -211,6 +212,7 @@ var SelectorResolver = /*#__PURE__*/function () {
     this._isMissingData = _snapshot.isMissingData;
     this._missingRequiredFields = _snapshot.missingRequiredFields;
     this._environment = environment;
+    this._rootIsQueryRenderer = rootIsQueryRenderer;
     this._selector = selector;
     this._subscription = environment.subscribe(_snapshot, this._onChange);
   }
@@ -253,8 +255,12 @@ var SelectorResolver = /*#__PURE__*/function () {
       var promise = (_getPromiseForActiveR = getPromiseForActiveRequest(this._environment, this._selector.owner)) !== null && _getPromiseForActiveR !== void 0 ? _getPromiseForActiveR : this._environment.getOperationTracker().getPromiseForPendingOperationsAffectingOwner(this._selector.owner);
 
       if (promise != null) {
-        process.env.NODE_ENV !== "production" ? warning(false, 'Relay: Relay Container for fragment `%s` suspended. When using ' + 'features such as @defer or @module, use `useFragment` instead ' + 'of a Relay Container.', this._selector.node.name) : void 0;
-        throw promise;
+        if (this._rootIsQueryRenderer) {
+          process.env.NODE_ENV !== "production" ? warning(false, 'Relay: Relay Container for fragment `%s` has missing data and ' + 'would suspend. When using features such as @defer or @module, ' + 'use `useFragment` instead of a Relay Container.', this._selector.node.name) : void 0;
+        } else {
+          process.env.NODE_ENV !== "production" ? warning(false, 'Relay: Relay Container for fragment `%s` suspended. When using ' + 'features such as @defer or @module, use `useFragment` instead ' + 'of a Relay Container.', this._selector.node.name) : void 0;
+          throw promise;
+        }
       }
     }
 
@@ -313,7 +319,7 @@ var SelectorResolver = /*#__PURE__*/function () {
 
 
 var SelectorListResolver = /*#__PURE__*/function () {
-  function SelectorListResolver(environment, selector, callback) {
+  function SelectorListResolver(environment, rootIsQueryRenderer, selector, callback) {
     var _this3 = this;
 
     (0, _defineProperty2["default"])(this, "_onChange", function (data) {
@@ -326,6 +332,7 @@ var SelectorListResolver = /*#__PURE__*/function () {
     this._environment = environment;
     this._resolvers = [];
     this._stale = true;
+    this._rootIsQueryRenderer = rootIsQueryRenderer;
     this.setSelector(selector);
   }
 
@@ -377,7 +384,7 @@ var SelectorListResolver = /*#__PURE__*/function () {
       if (ii < this._resolvers.length) {
         this._resolvers[ii].setSelector(selectors[ii]);
       } else {
-        this._resolvers[ii] = new SelectorResolver(this._environment, selectors[ii], this._onChange);
+        this._resolvers[ii] = new SelectorResolver(this._environment, this._rootIsQueryRenderer, selectors[ii], this._onChange);
       }
     }
 

package/lib/store/RelayModernRecord.js

@@ -18,7 +18,7 @@ var areEqual = require("fbjs/lib/areEqual");
 
 var deepFreeze = require('../util/deepFreeze');
 
-var invariant = require("fbjs/lib/invariant");
+var invariant = require('invariant');
 
 var warning = require("fbjs/lib/warning");
 

package/lib/store/RelayModernSelector.js

@@ -12,7 +12,7 @@
 
 var areEqual = require("fbjs/lib/areEqual");
 
-var invariant = require("fbjs/lib/invariant");
+var invariant = require('invariant');
 
 var warning = require("fbjs/lib/warning");
 

package/lib/store/RelayModernStore.js

@@ -24,8 +24,6 @@ var RelayModernRecord = require('./RelayModernRecord');
 
 var RelayOptimisticRecordSource = require('./RelayOptimisticRecordSource');
 
-var RelayProfiler = require('../util/RelayProfiler');
-
 var RelayReader = require('./RelayReader');
 
 var RelayReferenceMarker = require('./RelayReferenceMarker');
@@ -42,7 +40,7 @@ var deepFreeze = require('../util/deepFreeze');
 
 var defaultGetDataID = require('./defaultGetDataID');
 
-var invariant = require("fbjs/lib/invariant");
+var invariant = require('invariant');
 
 var resolveImmediate = require('../util/resolveImmediate');
 
@@ -50,7 +48,7 @@ var _require = require('./RelayStoreUtils'),
     ROOT_ID = _require.ROOT_ID,
     ROOT_TYPE = _require.ROOT_TYPE;
 
-var DEFAULT_RELEASE_BUFFER_SIZE = 0;
+var DEFAULT_RELEASE_BUFFER_SIZE = 10;
 /**
  * @public
  *
@@ -68,7 +66,7 @@ var RelayModernStore = /*#__PURE__*/function () {
   function RelayModernStore(source, options) {
     var _this = this;
 
-    var _options$gcReleaseBuf, _options$gcScheduler, _options$UNSTABLE_DO_, _options$log, _options$operationLoa;
+    var _options$gcReleaseBuf, _options$gcScheduler, _options$getDataID, _options$log, _options$operationLoa;
 
     (0, _defineProperty2["default"])(this, "_gcStep", function () {
       if (_this._gcRun) {
@@ -98,7 +96,7 @@ var RelayModernStore = /*#__PURE__*/function () {
     this._gcReleaseBufferSize = (_options$gcReleaseBuf = options === null || options === void 0 ? void 0 : options.gcReleaseBufferSize) !== null && _options$gcReleaseBuf !== void 0 ? _options$gcReleaseBuf : DEFAULT_RELEASE_BUFFER_SIZE;
     this._gcRun = null;
     this._gcScheduler = (_options$gcScheduler = options === null || options === void 0 ? void 0 : options.gcScheduler) !== null && _options$gcScheduler !== void 0 ? _options$gcScheduler : resolveImmediate;
-    this._getDataID = (_options$UNSTABLE_DO_ = options === null || options === void 0 ? void 0 : options.UNSTABLE_DO_NOT_USE_getDataID) !== null && _options$UNSTABLE_DO_ !== void 0 ? _options$UNSTABLE_DO_ : defaultGetDataID;
+    this._getDataID = (_options$getDataID = options === null || options === void 0 ? void 0 : options.getDataID) !== null && _options$getDataID !== void 0 ? _options$getDataID : defaultGetDataID;
     this._globalInvalidationEpoch = null;
     this._invalidationSubscriptions = new Set();
     this._invalidatedRecordIDs = new Set();
@@ -110,8 +108,9 @@ var RelayModernStore = /*#__PURE__*/function () {
     this._releaseBuffer = [];
     this._roots = new Map();
     this._shouldScheduleGC = false;
-    this._storeSubscriptions = RelayFeatureFlags.ENABLE_STORE_SUBSCRIPTIONS_REFACTOR === true ? new RelayStoreSubscriptionsUsingMapByID() : new RelayStoreSubscriptions();
-    this._updatedRecordIDs = {};
+    this._storeSubscriptions = RelayFeatureFlags.ENABLE_STORE_SUBSCRIPTIONS_REFACTOR === true ? new RelayStoreSubscriptionsUsingMapByID(options === null || options === void 0 ? void 0 : options.log) : new RelayStoreSubscriptions(options === null || options === void 0 ? void 0 : options.log);
+    this._updatedRecordIDs = new Set();
+    this._shouldProcessClientComponents = options === null || options === void 0 ? void 0 : options.shouldProcessClientComponents;
     initializeRecordSource(this._recordSource);
   }
 
@@ -150,7 +149,7 @@ var RelayModernStore = /*#__PURE__*/function () {
 
     var target = (_options$target = options === null || options === void 0 ? void 0 : options.target) !== null && _options$target !== void 0 ? _options$target : source;
     var handlers = (_options$handlers = options === null || options === void 0 ? void 0 : options.handlers) !== null && _options$handlers !== void 0 ? _options$handlers : [];
-    var operationAvailability = DataChecker.check(source, target, selector, handlers, this._operationLoader, this._getDataID);
+    var operationAvailability = DataChecker.check(source, target, selector, handlers, this._operationLoader, this._getDataID, this._shouldProcessClientComponents);
     return getAvailabilityStatus(operationAvailability, operationLastWrittenAt, rootEntry === null || rootEntry === void 0 ? void 0 : rootEntry.fetchTime, this._queryCacheExpirationTime);
   };
 
@@ -252,7 +251,8 @@ var RelayModernStore = /*#__PURE__*/function () {
 
     if (log != null) {
       log({
-        name: 'store.notify.start'
+        name: 'store.notify.start',
+        sourceOperation: sourceOperation
       });
     } // Increment the current write when notifying after executing
     // a set of changes to the store.
@@ -267,7 +267,7 @@ var RelayModernStore = /*#__PURE__*/function () {
     var source = this.getSource();
     var updatedOwners = [];
 
-    this._storeSubscriptions.updateSubscriptions(source, this._updatedRecordIDs, updatedOwners);
+    this._storeSubscriptions.updateSubscriptions(source, this._updatedRecordIDs, updatedOwners, sourceOperation);
 
     this._invalidationSubscriptions.forEach(function (subscription) {
       _this3._updateInvalidationSubscription(subscription, invalidateStore === true);
@@ -276,12 +276,13 @@ var RelayModernStore = /*#__PURE__*/function () {
     if (log != null) {
       log({
         name: 'store.notify.complete',
+        sourceOperation: sourceOperation,
         updatedRecordIDs: this._updatedRecordIDs,
         invalidatedRecordIDs: this._invalidatedRecordIDs
       });
     }
 
-    this._updatedRecordIDs = {};
+    this._updatedRecordIDs.clear();
 
     this._invalidatedRecordIDs.clear(); // If a source operation was provided (indicating the operation
     // that produced this update to the store), record the current epoch
@@ -547,7 +548,7 @@ var RelayModernStore = /*#__PURE__*/function () {
         for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
           var operation = _step2.value.operation;
           var selector = operation.root;
-          RelayReferenceMarker.mark(this._recordSource, selector, references, this._operationLoader); // Yield for other work after each operation
+          RelayReferenceMarker.mark(this._recordSource, selector, references, this._operationLoader, this._shouldProcessClientComponents); // Yield for other work after each operation
 
           yield; // If the store was updated, restart
 
@@ -645,7 +646,8 @@ function updateTargetFromSource(target, source, currentWriteEpoch, idsMarkedForI
       }
 
       RelayModernRecord.setValue(nextRecord, RelayStoreUtils.INVALIDATED_AT_KEY, currentWriteEpoch);
-      invalidatedRecordIDs.add(dataID);
+      invalidatedRecordIDs.add(dataID); // $FlowFixMe[incompatible-call]
+
       target.set(dataID, nextRecord);
     });
   } // Update the target based on the changes present in source
@@ -677,18 +679,18 @@ function updateTargetFromSource(target, source, currentWriteEpoch, idsMarkedForI
           RelayModernRecord.freeze(nextRecord);
         }
 
-        updatedRecordIDs[dataID] = true;
+        updatedRecordIDs.add(dataID);
         target.set(dataID, nextRecord);
       }
     } else if (sourceRecord === null) {
       target["delete"](dataID);
 
       if (targetRecord !== null) {
-        updatedRecordIDs[dataID] = true;
+        updatedRecordIDs.add(dataID);
       }
     } else if (sourceRecord) {
       target.set(dataID, sourceRecord);
-      updatedRecordIDs[dataID] = true;
+      updatedRecordIDs.add(dataID);
     } // don't add explicit undefined
 
   }
@@ -743,7 +745,4 @@ function getAvailabilityStatus(operationAvailability, operationLastWrittenAt, op
   };
 }
 
-RelayProfiler.instrumentMethods(RelayModernStore.prototype, {
-  lookup: 'RelayModernStore.prototype.lookup'
-});
 module.exports = RelayModernStore;