relay-runtime 10.0.1 → 10.1.3

package/lib/store/RelayModernEnvironment.js

@@ -13,11 +13,7 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 
 var RelayDefaultHandlerProvider = require('../handlers/RelayDefaultHandlerProvider');
 
@@ -35,6 +31,8 @@ var RelayRecordSource = require('./RelayRecordSource');
 
 var defaultGetDataID = require('./defaultGetDataID');
 
+var defaultRequiredFieldLogger = require('./defaultRequiredFieldLogger');
+
 var generateID = require('../util/generateID');
 
 var invariant = require("fbjs/lib/invariant");
@@ -43,24 +41,30 @@ var RelayModernEnvironment = /*#__PURE__*/function () {
   function RelayModernEnvironment(config) {
     var _this = this;
 
-    var _config$log, _config$UNSTABLE_defa, _config$UNSTABLE_DO_N, _config$scheduler, _config$isServer, _config$operationTrac;
+    var _config$log, _config$requiredField, _config$UNSTABLE_defa, _config$UNSTABLE_DO_N, _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;
 
     if (process.env.NODE_ENV !== "production") {
       if (operationLoader != null) {
         !(typeof operationLoader === 'object' && typeof operationLoader.get === 'function' && typeof operationLoader.load === 'function') ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayModernEnvironment: Expected `operationLoader` to be an object ' + 'with get() and load() functions, got `%s`.', operationLoader) : invariant(false) : void 0;
       }
+
+      if (reactFlightPayloadDeserializer != null) {
+        !(typeof reactFlightPayloadDeserializer === 'function') ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayModernEnvironment: Expected `reactFlightPayloadDeserializer` ' + ' to be a function, got `%s`.', reactFlightPayloadDeserializer) : invariant(false) : void 0;
+      }
     }
 
     this.__log = (_config$log = config.log) !== null && _config$log !== void 0 ? _config$log : emptyFunction;
+    this.requiredFieldLogger = (_config$requiredField = config.requiredFieldLogger) !== null && _config$requiredField !== void 0 ? _config$requiredField : defaultRequiredFieldLogger;
     this._defaultRenderPolicy = ((_config$UNSTABLE_defa = config.UNSTABLE_defaultRenderPolicy) !== null && _config$UNSTABLE_defa !== void 0 ? _config$UNSTABLE_defa : RelayFeatureFlags.ENABLE_PARTIAL_RENDERING_DEFAULT === true) ? 'partial' : 'full';
     this._operationLoader = operationLoader;
     this._operationExecutions = new Map();
-    this._network = config.network;
+    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._scheduler = (_config$scheduler = config.scheduler) !== null && _config$scheduler !== void 0 ? _config$scheduler : null;
@@ -69,7 +73,7 @@ var RelayModernEnvironment = /*#__PURE__*/function () {
     this._isServer = (_config$isServer = config.isServer) !== null && _config$isServer !== void 0 ? _config$isServer : false;
 
     this.__setNet = function (newNet) {
-      return _this._network = newNet;
+      return _this._network = _this.__wrapNetworkWithLogObserver(newNet);
     };
 
     if (process.env.NODE_ENV !== "production") {
@@ -93,6 +97,7 @@ 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;
   }
 
   var _proto = RelayModernEnvironment.prototype;
@@ -174,6 +179,7 @@ var RelayModernEnvironment = /*#__PURE__*/function () {
         operationLoader: _this5._operationLoader,
         optimisticConfig: optimisticConfig,
         publishQueue: _this5._publishQueue,
+        reactFlightPayloadDeserializer: _this5._reactFlightPayloadDeserializer,
         scheduler: _this5._scheduler,
         sink: sink,
         source: source,
@@ -212,6 +218,7 @@ var RelayModernEnvironment = /*#__PURE__*/function () {
         operationLoader: _this6._operationLoader,
         optimisticConfig: null,
         publishQueue: _this6._publishQueue,
+        reactFlightPayloadDeserializer: _this6._reactFlightPayloadDeserializer,
         scheduler: _this6._scheduler,
         sink: sink,
         source: RelayObservable.from({
@@ -300,15 +307,9 @@ var RelayModernEnvironment = /*#__PURE__*/function () {
     var _this9 = this;
 
     var operation = _ref.operation,
-        cacheConfig = _ref.cacheConfig,
         updater = _ref.updater;
-
-    var _this$__createLogObse = this.__createLogObserver(operation.request.node.params, operation.request.variables),
-        logObserver = _this$__createLogObse[0],
-        logRequestInfo = _this$__createLogObse[1];
-
     return RelayObservable.create(function (sink) {
-      var source = _this9._network.execute(operation.request.node.params, operation.request.variables, cacheConfig || {}, null, logRequestInfo)["do"](logObserver);
+      var source = _this9._network.execute(operation.request.node.params, operation.request.variables, operation.request.cacheConfig || {}, null);
 
       var executor = RelayModernQueryExecutor.execute({
         operation: operation,
@@ -316,6 +317,7 @@ var RelayModernEnvironment = /*#__PURE__*/function () {
         operationLoader: _this9._operationLoader,
         optimisticConfig: null,
         publishQueue: _this9._publishQueue,
+        reactFlightPayloadDeserializer: _this9._reactFlightPayloadDeserializer,
         scheduler: _this9._scheduler,
         sink: sink,
         source: source,
@@ -345,17 +347,11 @@ var RelayModernEnvironment = /*#__PURE__*/function () {
   _proto.executeMutation = function executeMutation(_ref2) {
     var _this10 = this;
 
-    var cacheConfig = _ref2.cacheConfig,
-        operation = _ref2.operation,
+    var operation = _ref2.operation,
         optimisticResponse = _ref2.optimisticResponse,
         optimisticUpdater = _ref2.optimisticUpdater,
         updater = _ref2.updater,
         uploadables = _ref2.uploadables;
-
-    var _this$__createLogObse2 = this.__createLogObserver(operation.request.node.params, operation.request.variables),
-        logObserver = _this$__createLogObse2[0],
-        logRequestInfo = _this$__createLogObse2[1];
-
     return RelayObservable.create(function (sink) {
       var optimisticConfig;
 
@@ -367,9 +363,9 @@ var RelayModernEnvironment = /*#__PURE__*/function () {
         };
       }
 
-      var source = _this10._network.execute(operation.request.node.params, operation.request.variables, _objectSpread({}, cacheConfig, {
+      var source = _this10._network.execute(operation.request.node.params, operation.request.variables, (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, operation.request.cacheConfig), {}, {
         force: true
-      }), uploadables, logRequestInfo)["do"](logObserver);
+      }), uploadables);
 
       var executor = RelayModernQueryExecutor.execute({
         operation: operation,
@@ -377,6 +373,7 @@ var RelayModernEnvironment = /*#__PURE__*/function () {
         operationLoader: _this10._operationLoader,
         optimisticConfig: optimisticConfig,
         publishQueue: _this10._publishQueue,
+        reactFlightPayloadDeserializer: _this10._reactFlightPayloadDeserializer,
         scheduler: _this10._scheduler,
         sink: sink,
         source: source,
@@ -415,6 +412,7 @@ var RelayModernEnvironment = /*#__PURE__*/function () {
         operationTracker: _this11._operationTracker,
         optimisticConfig: null,
         publishQueue: _this11._publishQueue,
+        reactFlightPayloadDeserializer: _this11._reactFlightPayloadDeserializer,
         scheduler: _this11._scheduler,
         sink: sink,
         source: source,
@@ -432,57 +430,68 @@ var RelayModernEnvironment = /*#__PURE__*/function () {
     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
+   * always logged. Relying on each network callsite to be wrapped is
+   * untenable and will eventually lead to holes in the logging.
+   */
+  ;
 
-  _proto.__createLogObserver = function __createLogObserver(params, variables) {
-    var transactionID = generateID();
-    var log = this.__log;
-    var logObserver = {
-      start: function start(subscription) {
-        log({
-          name: 'execute.start',
-          transactionID: transactionID,
-          params: params,
-          variables: variables
-        });
-      },
-      next: function next(response) {
-        log({
-          name: 'execute.next',
-          transactionID: transactionID,
-          response: response
-        });
-      },
-      error: function error(_error) {
-        log({
-          name: 'execute.error',
-          transactionID: transactionID,
-          error: _error
-        });
-      },
-      complete: function complete() {
-        log({
-          name: 'execute.complete',
-          transactionID: transactionID
-        });
-      },
-      unsubscribe: function unsubscribe() {
-        log({
-          name: 'execute.unsubscribe',
-          transactionID: transactionID
-        });
-      }
-    };
+  _proto.__wrapNetworkWithLogObserver = function __wrapNetworkWithLogObserver(network) {
+    var that = this;
+    return {
+      execute: function execute(params, variables, cacheConfig, uploadables) {
+        var transactionID = generateID();
+        var log = that.__log;
+        var logObserver = {
+          start: function start(subscription) {
+            log({
+              name: 'network.start',
+              transactionID: transactionID,
+              params: params,
+              variables: variables
+            });
+          },
+          next: function next(response) {
+            log({
+              name: 'network.next',
+              transactionID: transactionID,
+              response: response
+            });
+          },
+          error: function error(_error) {
+            log({
+              name: 'network.error',
+              transactionID: transactionID,
+              error: _error
+            });
+          },
+          complete: function complete() {
+            log({
+              name: 'network.complete',
+              transactionID: transactionID
+            });
+          },
+          unsubscribe: function unsubscribe() {
+            log({
+              name: 'network.unsubscribe',
+              transactionID: transactionID
+            });
+          }
+        };
 
-    var logRequestInfo = function logRequestInfo(info) {
-      log({
-        name: 'execute.info',
-        transactionID: transactionID,
-        info: info
-      });
-    };
+        var logRequestInfo = function logRequestInfo(info) {
+          log({
+            name: 'network.info',
+            transactionID: transactionID,
+            info: info
+          });
+        };
 
-    return [logObserver, logRequestInfo];
+        return network.execute(params, variables, cacheConfig, uploadables, logRequestInfo)["do"](logObserver);
+      }
+    };
   };
 
   return RelayModernEnvironment;

package/lib/store/RelayModernFragmentSpecResolver.js

@@ -12,11 +12,9 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
 var RelayFeatureFlags = require('../util/RelayFeatureFlags');
 
@@ -26,6 +24,8 @@ var invariant = require("fbjs/lib/invariant");
 
 var isScalarAndEqual = require('../util/isScalarAndEqual');
 
+var reportMissingRequiredFields = require('../util/reportMissingRequiredFields');
+
 var warning = require("fbjs/lib/warning");
 
 var _require = require('../query/fetchQueryInternal'),
@@ -105,7 +105,7 @@ var RelayModernFragmentSpecResolver = /*#__PURE__*/function () {
             var nextItem = resolver.resolve();
 
             if (nextData || nextItem !== prevItem) {
-              nextData = nextData || _objectSpread({}, prevData);
+              nextData = nextData || (0, _objectSpread2["default"])({}, prevData);
               nextData[_key2] = nextItem;
             }
           } else {
@@ -114,7 +114,7 @@ var RelayModernFragmentSpecResolver = /*#__PURE__*/function () {
             var _nextItem = prop !== undefined ? prop : null;
 
             if (nextData || !isScalarAndEqual(_nextItem, prevItem)) {
-              nextData = nextData || _objectSpread({}, prevData);
+              nextData = nextData || (0, _objectSpread2["default"])({}, prevData);
               nextData[_key2] = _nextItem;
             }
           }
@@ -199,6 +199,7 @@ var SelectorResolver = /*#__PURE__*/function () {
     (0, _defineProperty2["default"])(this, "_onChange", function (snapshot) {
       _this2._data = snapshot.data;
       _this2._isMissingData = snapshot.isMissingData;
+      _this2._missingRequiredFields = snapshot.missingRequiredFields;
 
       _this2._callback();
     });
@@ -208,6 +209,7 @@ var SelectorResolver = /*#__PURE__*/function () {
     this._callback = callback;
     this._data = _snapshot.data;
     this._isMissingData = _snapshot.isMissingData;
+    this._missingRequiredFields = _snapshot.missingRequiredFields;
     this._environment = environment;
     this._selector = selector;
     this._subscription = environment.subscribe(_snapshot, this._onChange);
@@ -256,6 +258,10 @@ var SelectorResolver = /*#__PURE__*/function () {
       }
     }
 
+    if (this._missingRequiredFields != null) {
+      reportMissingRequiredFields(this._environment, this._missingRequiredFields);
+    }
+
     return this._data;
   };
 
@@ -270,6 +276,7 @@ var SelectorResolver = /*#__PURE__*/function () {
 
     this._data = snapshot.data;
     this._isMissingData = snapshot.isMissingData;
+    this._missingRequiredFields = snapshot.missingRequiredFields;
     this._selector = selector;
     this._subscription = this._environment.subscribe(snapshot, this._onChange);
   };
@@ -287,7 +294,7 @@ var SelectorResolver = /*#__PURE__*/function () {
     } // NOTE: We manually create the request descriptor here instead of
     // calling createOperationDescriptor() because we want to set a
     // descriptor with *unaltered* variables as the fragment owner.
-    // This is a hack that allows us to preserve exisiting (broken)
+    // This is a hack that allows us to preserve existing (broken)
     // behavior of RelayModern containers while using fragment ownership
     // to propagate variables instead of Context.
     // For more details, see the summary of D13999308

package/lib/store/RelayModernOperationDescriptor.js

@@ -30,11 +30,11 @@ var _require3 = require('./RelayStoreUtils'),
  * are filtered to exclude variables that do not match defined arguments on the
  * operation, and default values are populated for null values.
  */
-function createOperationDescriptor(request, variables) {
-  var dataID = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : ROOT_ID;
+function createOperationDescriptor(request, variables, cacheConfig) {
+  var dataID = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : ROOT_ID;
   var operation = request.operation;
   var operationVariables = getOperationVariables(operation, variables);
-  var requestDescriptor = createRequestDescriptor(request, operationVariables);
+  var requestDescriptor = createRequestDescriptor(request, operationVariables, cacheConfig);
   var operationDescriptor = {
     fragment: createReaderSelector(request.fragment, dataID, operationVariables, requestDescriptor),
     request: requestDescriptor,
@@ -53,11 +53,12 @@ function createOperationDescriptor(request, variables) {
   return operationDescriptor;
 }
 
-function createRequestDescriptor(request, variables) {
+function createRequestDescriptor(request, variables, cacheConfig) {
   var requestDescriptor = {
     identifier: getRequestIdentifier(request.params, variables),
     node: request,
-    variables: variables
+    variables: variables,
+    cacheConfig: cacheConfig
   };
 
   if (process.env.NODE_ENV !== "production") {

package/lib/store/RelayModernQueryExecutor.js

@@ -13,19 +13,11 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
-
-function _createForOfIteratorHelper(o) { if (typeof Symbol === "undefined" || o[Symbol.iterator] == null) { if (Array.isArray(o) || (o = _unsupportedIterableToArray(o))) { var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var it, normalCompletion = true, didErr = false, err; return { s: function s() { it = o[Symbol.iterator](); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
+var _createForOfIteratorHelper2 = _interopRequireDefault(require("@babel/runtime/helpers/createForOfIteratorHelper"));
 
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(n); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
 var RelayError = require('../util/RelayError');
 
@@ -37,6 +29,8 @@ var RelayRecordSource = require('./RelayRecordSource');
 
 var RelayResponseNormalizer = require('./RelayResponseNormalizer');
 
+var getOperation = require('../util/getOperation');
+
 var invariant = require("fbjs/lib/invariant");
 
 var stableCopy = require('../util/stableCopy');
@@ -81,7 +75,8 @@ var Executor = /*#__PURE__*/function () {
         operationTracker = _ref.operationTracker,
         treatMissingFieldsAsNull = _ref.treatMissingFieldsAsNull,
         getDataID = _ref.getDataID,
-        isClientPayload = _ref.isClientPayload;
+        isClientPayload = _ref.isClientPayload,
+        reactFlightPayloadDeserializer = _ref.reactFlightPayloadDeserializer;
     this._getDataID = getDataID;
     this._treatMissingFieldsAsNull = treatMissingFieldsAsNull;
     this._incrementalPayloadsPending = false;
@@ -103,6 +98,7 @@ var Executor = /*#__PURE__*/function () {
     this._subscriptions = new Map();
     this._updater = updater;
     this._isClientPayload = isClientPayload === true;
+    this._reactFlightPayloadDeserializer = reactFlightPayloadDeserializer;
     var id = this._nextSubscriptionId++;
     source.subscribe({
       complete: function complete() {
@@ -166,6 +162,12 @@ var Executor = /*#__PURE__*/function () {
     this._incrementalResults.clear();
 
     this._completeOperationTracker();
+
+    if (this._retainDisposable) {
+      this._retainDisposable.dispose();
+
+      this._retainDisposable = null;
+    }
   };
 
   _proto._updateActiveState = function _updateActiveState() {
@@ -387,17 +389,17 @@ var Executor = /*#__PURE__*/function () {
         nonIncrementalResponses = _partitionGraphQLResp[0],
         incrementalResponses = _partitionGraphQLResp[1]; // In theory this doesn't preserve the ordering of the batch.
     // The idea is that a batch is always:
-    //  * at-most one non-incremental payload
-    //  * followed zero or more incremental payloads
+    //  * at most one non-incremental payload
+    //  * followed by zero or more incremental payloads
     // The non-incremental payload can appear if the server sends a batch
-    // w the initial payload followed by some early-to-resolve incremental
+    // with the initial payload followed by some early-to-resolve incremental
     // payloads (although, can that even happen?)
 
 
     if (nonIncrementalResponses.length > 0) {
-      var payloadFollowups = this._processResponses(nonIncrementalResponses); // Please note, that we're passing `this._operation` to the publish
+      var payloadFollowups = this._processResponses(nonIncrementalResponses); // Please note that we're passing `this._operation` to the publish
       // queue here, which will later passed to the store (via notify)
-      // to indicate that this is an operation that cause the store to update
+      // to indicate that this is an operation that caused the store to update
 
 
       var updatedOwners = this._publishQueue.run(this._operation);
@@ -405,6 +407,10 @@ var Executor = /*#__PURE__*/function () {
       this._updateOperationTracker(updatedOwners);
 
       this._processPayloadFollowups(payloadFollowups);
+
+      if (this._incrementalPayloadsPending && !this._retainDisposable) {
+        this._retainDisposable = this._store.retain(this._operation);
+      }
     }
 
     if (incrementalResponses.length > 0) {
@@ -438,6 +444,7 @@ var Executor = /*#__PURE__*/function () {
       var payload = normalizeResponse(response, this._operation.root, ROOT_TYPE, {
         getDataID: this._getDataID,
         path: [],
+        reactFlightPayloadDeserializer: this._reactFlightPayloadDeserializer,
         treatMissingFieldsAsNull: treatMissingFieldsAsNull
       });
       validateOptimisticResponsePayload(payload);
@@ -477,7 +484,7 @@ var Executor = /*#__PURE__*/function () {
       var operationLoader = this._operationLoader;
       !operationLoader ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayModernEnvironment: Expected an operationLoader to be ' + 'configured when using `@match`.') : invariant(false) : void 0;
 
-      var _iterator = _createForOfIteratorHelper(moduleImportPayloads),
+      var _iterator = (0, _createForOfIteratorHelper2["default"])(moduleImportPayloads),
           _step;
 
       try {
@@ -488,9 +495,9 @@ var Executor = /*#__PURE__*/function () {
           if (operation == null) {
             this._processAsyncOptimisticModuleImport(operationLoader, moduleImportPayload);
           } else {
-            var moduleImportOptimisitcUpdates = this._processOptimisticModuleImport(operation, moduleImportPayload);
+            var moduleImportOptimisticUpdates = this._processOptimisticModuleImport(operation, moduleImportPayload);
 
-            optimisticUpdates.push.apply(optimisticUpdates, (0, _toConsumableArray2["default"])(moduleImportOptimisitcUpdates));
+            optimisticUpdates.push.apply(optimisticUpdates, (0, _toConsumableArray2["default"])(moduleImportOptimisticUpdates));
           }
         }
       } catch (err) {
@@ -508,11 +515,13 @@ var Executor = /*#__PURE__*/function () {
     }, selector, moduleImportPayload.typeName, {
       getDataID: this._getDataID,
       path: moduleImportPayload.path,
+      reactFlightPayloadDeserializer: this._reactFlightPayloadDeserializer,
       treatMissingFieldsAsNull: this._treatMissingFieldsAsNull
     });
   };
 
-  _proto._processOptimisticModuleImport = function _processOptimisticModuleImport(operation, moduleImportPayload) {
+  _proto._processOptimisticModuleImport = function _processOptimisticModuleImport(normalizationRootNode, moduleImportPayload) {
+    var operation = getOperation(normalizationRootNode);
     var optimisticUpdates = [];
 
     var modulePayload = this._normalizeModuleImport(moduleImportPayload, operation);
@@ -537,18 +546,18 @@ var Executor = /*#__PURE__*/function () {
         return;
       }
 
-      var moduleImportOptimisitcUpdates = _this7._processOptimisticModuleImport(operation, moduleImportPayload);
+      var moduleImportOptimisticUpdates = _this7._processOptimisticModuleImport(operation, moduleImportPayload);
 
-      moduleImportOptimisitcUpdates.forEach(function (update) {
+      moduleImportOptimisticUpdates.forEach(function (update) {
         return _this7._publishQueue.applyUpdate(update);
       });
 
       if (_this7._optimisticUpdates == null) {
-        process.env.NODE_ENV !== "production" ? warning(false, 'RelayModernQueryExecutor: Unexpected ModuleImport optimisitc ' + 'update in operation %s.' + _this7._operation.request.node.params.name) : void 0;
+        process.env.NODE_ENV !== "production" ? warning(false, 'RelayModernQueryExecutor: Unexpected ModuleImport optimistic ' + 'update in operation %s.' + _this7._operation.request.node.params.name) : void 0;
       } else {
         var _this$_optimisticUpda;
 
-        (_this$_optimisticUpda = _this7._optimisticUpdates).push.apply(_this$_optimisticUpda, (0, _toConsumableArray2["default"])(moduleImportOptimisitcUpdates));
+        (_this$_optimisticUpda = _this7._optimisticUpdates).push.apply(_this$_optimisticUpda, (0, _toConsumableArray2["default"])(moduleImportOptimisticUpdates));
 
         _this7._publishQueue.run();
       }
@@ -575,8 +584,9 @@ var Executor = /*#__PURE__*/function () {
     return responses.map(function (payloadPart) {
       var relayPayload = normalizeResponse(payloadPart, _this8._operation.root, ROOT_TYPE, {
         getDataID: _this8._getDataID,
-        treatMissingFieldsAsNull: _this8._treatMissingFieldsAsNull,
-        path: []
+        path: [],
+        reactFlightPayloadDeserializer: _this8._reactFlightPayloadDeserializer,
+        treatMissingFieldsAsNull: _this8._treatMissingFieldsAsNull
       });
 
       _this8._publishQueue.commitPayload(_this8._operation, relayPayload, _this8._updater);
@@ -676,12 +686,13 @@ var Executor = /*#__PURE__*/function () {
   _proto._processModuleImportPayload = function _processModuleImportPayload(moduleImportPayload, operationLoader) {
     var _this10 = this;
 
-    var syncOperation = operationLoader.get(moduleImportPayload.operationReference);
+    var node = operationLoader.get(moduleImportPayload.operationReference);
 
-    if (syncOperation != null) {
-      // If the operation module is available synchronously, normalize the
+    if (node != null) {
+      var operation = getOperation(node); // If the operation module is available synchronously, normalize the
       // data synchronously.
-      this._handleModuleImportPayload(moduleImportPayload, syncOperation);
+
+      this._handleModuleImportPayload(moduleImportPayload, operation);
 
       this._maybeCompleteSubscriptionOperationTracking();
     } else {
@@ -705,7 +716,7 @@ var Executor = /*#__PURE__*/function () {
       })).map(function (operation) {
         if (operation != null) {
           _this10._schedule(function () {
-            _this10._handleModuleImportPayload(moduleImportPayload, operation);
+            _this10._handleModuleImportPayload(moduleImportPayload, getOperation(operation));
           });
         }
       }).subscribe({
@@ -917,6 +928,7 @@ var Executor = /*#__PURE__*/function () {
     var relayPayload = normalizeResponse(response, placeholder.selector, placeholder.typeName, {
       getDataID: this._getDataID,
       path: placeholder.path,
+      reactFlightPayloadDeserializer: this._reactFlightPayloadDeserializer,
       treatMissingFieldsAsNull: this._treatMissingFieldsAsNull
     });
 
@@ -1068,6 +1080,7 @@ var Executor = /*#__PURE__*/function () {
     var relayPayload = normalizeResponse(response, selector, typeName, {
       getDataID: this._getDataID,
       path: [].concat((0, _toConsumableArray2["default"])(normalizationPath), [responseKey, String(itemIndex)]),
+      reactFlightPayloadDeserializer: this._reactFlightPayloadDeserializer,
       treatMissingFieldsAsNull: this._treatMissingFieldsAsNull
     });
     return {
@@ -1128,7 +1141,7 @@ function normalizeResponse(response, selector, typeName, options) {
   var record = RelayModernRecord.create(selector.dataID, typeName);
   source.set(selector.dataID, record);
   var relayPayload = RelayResponseNormalizer.normalize(source, selector, data, options);
-  return _objectSpread({}, relayPayload, {
+  return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, relayPayload), {}, {
     errors: errors,
     isFinal: ((_response$extensions3 = response.extensions) === null || _response$extensions3 === void 0 ? void 0 : _response$extensions3.is_final) === true
   });

package/lib/store/RelayModernRecord.js

@@ -12,11 +12,7 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 
 var areEqual = require("fbjs/lib/areEqual");
 
@@ -87,7 +83,7 @@ var _require2 = require('./RelayStoreUtils'),
  * Clone a record.
  */
 function clone(record) {
-  return _objectSpread({}, record);
+  return (0, _objectSpread2["default"])({}, record);
 }
 /**
  * @public
@@ -248,7 +244,7 @@ function update(prevRecord, nextRecord) {
     var key = keys[ii];
 
     if (updated || !areEqual(prevRecord[key], nextRecord[key])) {
-      updated = updated !== null ? updated : _objectSpread({}, prevRecord);
+      updated = updated !== null ? updated : (0, _objectSpread2["default"])({}, prevRecord);
       updated[key] = nextRecord[key];
     }
   }