relay-runtime 9.0.0 → 10.1.0

package/lib/store/RelayModernQueryExecutor.js

@@ -13,10 +13,20 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
 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, allowArrayLike) { var it; if (typeof Symbol === "undefined" || o[Symbol.iterator] == null) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; 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 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; } } }; }
+
+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(o); 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 RelayError = require('../util/RelayError');
 
 var RelayModernRecord = require('./RelayModernRecord');
@@ -27,6 +37,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');
@@ -54,9 +66,7 @@ function execute(config) {
  */
 
 
-var Executor =
-/*#__PURE__*/
-function () {
+var Executor = /*#__PURE__*/function () {
   function Executor(_ref) {
     var _this = this;
 
@@ -71,9 +81,12 @@ function () {
         store = _ref.store,
         updater = _ref.updater,
         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;
     this._incrementalResults = new Map();
     this._nextSubscriptionId = 0;
@@ -93,6 +106,7 @@ function () {
     this._subscriptions = new Map();
     this._updater = updater;
     this._isClientPayload = isClientPayload === true;
+    this._reactFlightPayloadDeserializer = reactFlightPayloadDeserializer;
     var id = this._nextSubscriptionId++;
     source.subscribe({
       complete: function complete() {
@@ -116,7 +130,7 @@ function () {
     if (optimisticConfig != null) {
       this._processOptimisticResponse(optimisticConfig.response != null ? {
         data: optimisticConfig.response
-      } : null, optimisticConfig.updater);
+      } : null, optimisticConfig.updater, false);
     }
   } // Cancel any pending execution tasks and mark the executor as completed.
 
@@ -156,6 +170,12 @@ function () {
     this._incrementalResults.clear();
 
     this._completeOperationTracker();
+
+    if (this._retainDisposable) {
+      this._retainDisposable.dispose();
+
+      this._retainDisposable = null;
+    }
   };
 
   _proto._updateActiveState = function _updateActiveState() {
@@ -266,26 +286,35 @@ function () {
   _proto._handleErrorResponse = function _handleErrorResponse(responses) {
     var _this5 = this;
 
-    // Once thing to notice here: if one of the responses in array has errors
-    // All batch will be ignored.
-    return responses.map(function (response) {
-      if (response.data == null) {
-        var messages = response.errors ? response.errors.map(function (_ref2) {
+    var results = [];
+    responses.forEach(function (response) {
+      if (response.data === null && response.extensions != null && !response.hasOwnProperty('errors')) {
+        // Skip extensions-only payloads
+        return;
+      } else if (response.data == null) {
+        // Error if any other payload in the batch is missing data, regardless of whether
+        // it had `errors` or not.
+        var errors = response.hasOwnProperty('errors') && response.errors != null ? response.errors : null;
+        var messages = errors ? errors.map(function (_ref2) {
           var message = _ref2.message;
           return message;
         }).join('\n') : '(No errors)';
         var error = RelayError.create('RelayNetwork', 'No data returned for operation `' + _this5._operation.request.node.params.name + '`, got error(s):\n' + messages + '\n\nSee the error `source` property for more information.');
         error.source = {
-          errors: response.errors,
+          errors: errors,
           operation: _this5._operation.request.node,
           variables: _this5._operation.request.variables
-        };
+        }; // In V8, Error objects keep the closure scope chain alive until the
+        // err.stack property is accessed.
+
+        error.stack;
         throw error;
+      } else {
+        var responseWithData = response;
+        results.push(responseWithData);
       }
-
-      var responseWithData = response;
-      return responseWithData;
     });
+    return results;
   }
   /**
    * This method return boolean to indicate if the optimistic
@@ -316,7 +345,7 @@ function () {
     }
 
     if (isOptimistic) {
-      this._processOptimisticResponse(response, null);
+      this._processOptimisticResponse(response, null, this._treatMissingFieldsAsNull);
 
       this._sink.next(response);
 
@@ -331,7 +360,31 @@ function () {
       return;
     }
 
-    var responsesWithData = this._handleErrorResponse(Array.isArray(response) ? response : [response]); // Next, handle optimistic responses
+    var responses = Array.isArray(response) ? response : [response];
+
+    var responsesWithData = this._handleErrorResponse(responses);
+
+    if (responsesWithData.length === 0) {
+      // no results with data, nothing to process
+      // this can occur with extensions-only payloads
+      var isFinal = responses.some(function (x) {
+        var _x$extensions;
+
+        return ((_x$extensions = x.extensions) === null || _x$extensions === void 0 ? void 0 : _x$extensions.is_final) === true;
+      });
+
+      if (isFinal) {
+        this._state = 'loading_final';
+
+        this._updateActiveState();
+
+        this._incrementalPayloadsPending = false;
+      }
+
+      this._sink.next(response);
+
+      return;
+    } // Next, handle optimistic responses
 
 
     var isOptimistic = this._handleOptimisticResponses(responsesWithData);
@@ -344,17 +397,17 @@ 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);
@@ -362,6 +415,10 @@ function () {
       this._updateOperationTracker(updatedOwners);
 
       this._processPayloadFollowups(payloadFollowups);
+
+      if (this._incrementalPayloadsPending && !this._retainDisposable) {
+        this._retainDisposable = this._store.retain(this._operation);
+      }
     }
 
     if (incrementalResponses.length > 0) {
@@ -380,7 +437,7 @@ function () {
     this._sink.next(response);
   };
 
-  _proto._processOptimisticResponse = function _processOptimisticResponse(response, updater) {
+  _proto._processOptimisticResponse = function _processOptimisticResponse(response, updater, treatMissingFieldsAsNull) {
     var _this6 = this;
 
     !(this._optimisticUpdates === null) ? process.env.NODE_ENV !== "production" ? invariant(false, 'environment.execute: only support one optimistic response per ' + 'execute.') : invariant(false) : void 0;
@@ -395,7 +452,8 @@ function () {
       var payload = normalizeResponse(response, this._operation.root, ROOT_TYPE, {
         getDataID: this._getDataID,
         path: [],
-        request: this._operation.request
+        reactFlightPayloadDeserializer: this._reactFlightPayloadDeserializer,
+        treatMissingFieldsAsNull: treatMissingFieldsAsNull
       });
       validateOptimisticResponsePayload(payload);
       optimisticUpdates.push({
@@ -433,36 +491,27 @@ function () {
       var moduleImportPayloads = payload.moduleImportPayloads;
       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 _iteratorNormalCompletion = true;
-      var _didIteratorError = false;
-      var _iteratorError = undefined;
+
+      var _iterator = _createForOfIteratorHelper(moduleImportPayloads),
+          _step;
 
       try {
-        for (var _iterator = moduleImportPayloads[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
           var moduleImportPayload = _step.value;
           var operation = operationLoader.get(moduleImportPayload.operationReference);
 
           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) {
-        _didIteratorError = true;
-        _iteratorError = err;
+        _iterator.e(err);
       } finally {
-        try {
-          if (!_iteratorNormalCompletion && _iterator["return"] != null) {
-            _iterator["return"]();
-          }
-        } finally {
-          if (_didIteratorError) {
-            throw _iteratorError;
-          }
-        }
+        _iterator.f();
       }
     }
   };
@@ -474,11 +523,13 @@ function () {
     }, selector, moduleImportPayload.typeName, {
       getDataID: this._getDataID,
       path: moduleImportPayload.path,
-      request: this._operation.request
+      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);
@@ -503,18 +554,18 @@ 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();
       }
@@ -542,7 +593,8 @@ function () {
       var relayPayload = normalizeResponse(payloadPart, _this8._operation.root, ROOT_TYPE, {
         getDataID: _this8._getDataID,
         path: [],
-        request: _this8._operation.request
+        reactFlightPayloadDeserializer: _this8._reactFlightPayloadDeserializer,
+        treatMissingFieldsAsNull: _this8._treatMissingFieldsAsNull
       });
 
       _this8._publishQueue.commitPayload(_this8._operation, relayPayload, _this8._updater);
@@ -642,16 +694,15 @@ 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._schedule(function () {
-        _this10._handleModuleImportPayload(moduleImportPayload, syncOperation);
 
-        _this10._maybeCompleteSubscriptionOperationTracking();
-      });
+      this._handleModuleImportPayload(moduleImportPayload, operation);
+
+      this._maybeCompleteSubscriptionOperationTracking();
     } else {
       // Otherwise load the operation module and schedule a task to normalize
       // the data when the module is available.
@@ -673,7 +724,7 @@ function () {
       })).map(function (operation) {
         if (operation != null) {
           _this10._schedule(function () {
-            _this10._handleModuleImportPayload(moduleImportPayload, operation);
+            _this10._handleModuleImportPayload(moduleImportPayload, getOperation(operation));
           });
         }
       }).subscribe({
@@ -719,8 +770,6 @@ function () {
   ;
 
   _proto._processIncrementalPlaceholder = function _processIncrementalPlaceholder(relayPayload, placeholder) {
-    var _this11 = this;
-
     var _relayPayload$fieldPa;
 
     // Update the label => path => placeholder map
@@ -800,15 +849,13 @@ function () {
 
 
     if (pendingResponses != null) {
-      this._schedule(function () {
-        var payloadFollowups = _this11._processIncrementalResponses(pendingResponses);
+      var payloadFollowups = this._processIncrementalResponses(pendingResponses);
 
-        var updatedOwners = _this11._publishQueue.run();
+      var updatedOwners = this._publishQueue.run();
 
-        _this11._updateOperationTracker(updatedOwners);
+      this._updateOperationTracker(updatedOwners);
 
-        _this11._processPayloadFollowups(payloadFollowups);
-      });
+      this._processPayloadFollowups(payloadFollowups);
     }
   }
   /**
@@ -819,7 +866,7 @@ function () {
   ;
 
   _proto._processIncrementalResponses = function _processIncrementalResponses(incrementalResponses) {
-    var _this12 = this;
+    var _this11 = this;
 
     var relayPayloads = [];
     incrementalResponses.forEach(function (incrementalResponse) {
@@ -827,12 +874,12 @@ function () {
           path = incrementalResponse.path,
           response = incrementalResponse.response;
 
-      var resultForLabel = _this12._incrementalResults.get(label);
+      var resultForLabel = _this11._incrementalResults.get(label);
 
       if (resultForLabel == null) {
         resultForLabel = new Map();
 
-        _this12._incrementalResults.set(label, resultForLabel);
+        _this11._incrementalResults.set(label, resultForLabel);
       }
 
       if (label.indexOf('$defer$') !== -1) {
@@ -853,7 +900,7 @@ function () {
 
         var placeholder = resultForPath.placeholder;
         !(placeholder.kind === 'defer') ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayModernEnvironment: Expected data for path `%s` for label `%s` ' + 'to be data for @defer, was `@%s`.', pathKey, label, placeholder.kind) : invariant(false) : void 0;
-        relayPayloads.push(_this12._processDeferResponse(label, path, placeholder, response));
+        relayPayloads.push(_this11._processDeferResponse(label, path, placeholder, response));
       } else {
         // @stream payload path values end in the field name and item index,
         // but Relay records paths relative to the parent of the stream node:
@@ -878,7 +925,7 @@ function () {
 
         var _placeholder = _resultForPath.placeholder;
         !(_placeholder.kind === 'stream') ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayModernEnvironment: Expected data for path `%s` for label `%s` ' + 'to be data for @stream, was `@%s`.', _pathKey, label, _placeholder.kind) : invariant(false) : void 0;
-        relayPayloads.push(_this12._processStreamResponse(label, path, _placeholder, response));
+        relayPayloads.push(_this11._processStreamResponse(label, path, _placeholder, response));
       }
     });
     return relayPayloads;
@@ -889,7 +936,8 @@ function () {
     var relayPayload = normalizeResponse(response, placeholder.selector, placeholder.typeName, {
       getDataID: this._getDataID,
       path: placeholder.path,
-      request: this._operation.request
+      reactFlightPayloadDeserializer: this._reactFlightPayloadDeserializer,
+      treatMissingFieldsAsNull: this._treatMissingFieldsAsNull
     });
 
     this._publishQueue.commitPayload(this._operation, relayPayload); // Load the version of the parent record from which this incremental data
@@ -1040,7 +1088,8 @@ function () {
     var relayPayload = normalizeResponse(response, selector, typeName, {
       getDataID: this._getDataID,
       path: [].concat((0, _toConsumableArray2["default"])(normalizationPath), [responseKey, String(itemIndex)]),
-      request: this._operation.request
+      reactFlightPayloadDeserializer: this._reactFlightPayloadDeserializer,
+      treatMissingFieldsAsNull: this._treatMissingFieldsAsNull
     });
     return {
       fieldPayloads: fieldPayloads,
@@ -1100,7 +1149,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 (0, _objectSpread2["default"])({}, relayPayload, {
+  return _objectSpread(_objectSpread({}, 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,7 +12,11 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread"));
+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 areEqual = require("fbjs/lib/areEqual");
 
@@ -30,7 +34,8 @@ var _require2 = require('./RelayStoreUtils'),
     REF_KEY = _require2.REF_KEY,
     REFS_KEY = _require2.REFS_KEY,
     TYPENAME_KEY = _require2.TYPENAME_KEY,
-    INVALIDATED_AT_KEY = _require2.INVALIDATED_AT_KEY;
+    INVALIDATED_AT_KEY = _require2.INVALIDATED_AT_KEY,
+    ROOT_ID = _require2.ROOT_ID;
 
 /**
  * @public
@@ -82,7 +87,7 @@ var _require2 = require('./RelayStoreUtils'),
  * Clone a record.
  */
 function clone(record) {
-  return (0, _objectSpread2["default"])({}, record);
+  return _objectSpread({}, record);
 }
 /**
  * @public
@@ -233,7 +238,7 @@ function update(prevRecord, nextRecord) {
 
     var prevType = (_getType = getType(prevRecord)) !== null && _getType !== void 0 ? _getType : null;
     var nextType = (_getType2 = getType(nextRecord)) !== null && _getType2 !== void 0 ? _getType2 : null;
-    process.env.NODE_ENV !== "production" ? warning(isClientID(nextID) || prevType === nextType, 'RelayModernRecord: Invalid record update, expected both versions of ' + 'record `%s` to have the same `%s` but got conflicting types `%s` ' + 'and `%s`. The GraphQL server likely violated the globally unique ' + 'id requirement by returning the same id for different objects.', prevID, TYPENAME_KEY, prevType, nextType) : void 0;
+    process.env.NODE_ENV !== "production" ? warning(isClientID(nextID) && nextID !== ROOT_ID || prevType === nextType, 'RelayModernRecord: Invalid record update, expected both versions of ' + 'record `%s` to have the same `%s` but got conflicting types `%s` ' + 'and `%s`. The GraphQL server likely violated the globally unique ' + 'id requirement by returning the same id for different objects.', prevID, TYPENAME_KEY, prevType, nextType) : void 0;
   }
 
   var updated = null;
@@ -243,7 +248,7 @@ function update(prevRecord, nextRecord) {
     var key = keys[ii];
 
     if (updated || !areEqual(prevRecord[key], nextRecord[key])) {
-      updated = updated !== null ? updated : (0, _objectSpread2["default"])({}, prevRecord);
+      updated = updated !== null ? updated : _objectSpread({}, prevRecord);
       updated[key] = nextRecord[key];
     }
   }
@@ -268,7 +273,7 @@ function merge(record1, record2) {
 
     var prevType = (_getType3 = getType(record1)) !== null && _getType3 !== void 0 ? _getType3 : null;
     var nextType = (_getType4 = getType(record2)) !== null && _getType4 !== void 0 ? _getType4 : null;
-    process.env.NODE_ENV !== "production" ? warning(isClientID(nextID) || prevType === nextType, 'RelayModernRecord: Invalid record merge, expected both versions of ' + 'record `%s` to have the same `%s` but got conflicting types `%s` ' + 'and `%s`. The GraphQL server likely violated the globally unique ' + 'id requirement by returning the same id for different objects.', prevID, TYPENAME_KEY, prevType, nextType) : void 0;
+    process.env.NODE_ENV !== "production" ? warning(isClientID(nextID) && nextID !== ROOT_ID || prevType === nextType, 'RelayModernRecord: Invalid record merge, expected both versions of ' + 'record `%s` to have the same `%s` but got conflicting types `%s` ' + 'and `%s`. The GraphQL server likely violated the globally unique ' + 'id requirement by returning the same id for different objects.', prevID, TYPENAME_KEY, prevType, nextType) : void 0;
   }
 
   return Object.assign({}, record1, record2);
@@ -298,12 +303,12 @@ function setValue(record, storageKey, value) {
     if (storageKey === ID_KEY) {
       process.env.NODE_ENV !== "production" ? warning(prevID === value, 'RelayModernRecord: Invalid field update, expected both versions of ' + 'the record to have the same id, got `%s` and `%s`.', prevID, value) : void 0;
     } else if (storageKey === TYPENAME_KEY) {
-      var _getType5, _value;
+      var _getType5;
 
       // note: coalesce null/undefined to null
       var prevType = (_getType5 = getType(record)) !== null && _getType5 !== void 0 ? _getType5 : null;
-      var nextType = (_value = value) !== null && _value !== void 0 ? _value : null;
-      process.env.NODE_ENV !== "production" ? warning(isClientID(getDataID(record)) || prevType === nextType, 'RelayModernRecord: Invalid field update, expected both versions of ' + 'record `%s` to have the same `%s` but got conflicting types `%s` ' + 'and `%s`. The GraphQL server likely violated the globally unique ' + 'id requirement by returning the same id for different objects.', prevID, TYPENAME_KEY, prevType, nextType) : void 0;
+      var nextType = value !== null && value !== void 0 ? value : null;
+      process.env.NODE_ENV !== "production" ? warning(isClientID(getDataID(record)) && getDataID(record) !== ROOT_ID || prevType === nextType, 'RelayModernRecord: Invalid field update, expected both versions of ' + 'record `%s` to have the same `%s` but got conflicting types `%s` ' + 'and `%s`. The GraphQL server likely violated the globally unique ' + 'id requirement by returning the same id for different objects.', prevID, TYPENAME_KEY, prevType, nextType) : void 0;
     }
   }
 

package/lib/store/RelayModernSelector.js

@@ -22,7 +22,8 @@ var _require = require('./RelayConcreteVariables'),
 var _require2 = require('./RelayStoreUtils'),
     FRAGMENT_OWNER_KEY = _require2.FRAGMENT_OWNER_KEY,
     FRAGMENTS_KEY = _require2.FRAGMENTS_KEY,
-    ID_KEY = _require2.ID_KEY;
+    ID_KEY = _require2.ID_KEY,
+    IS_WITHIN_UNMATCHED_TYPE_REFINEMENT = _require2.IS_WITHIN_UNMATCHED_TYPE_REFINEMENT;
 
 /**
  * @public
@@ -58,12 +59,13 @@ function getSingularSelector(fragment, item) {
   var dataID = item[ID_KEY];
   var fragments = item[FRAGMENTS_KEY];
   var mixedOwner = item[FRAGMENT_OWNER_KEY];
+  var isWithinUnmatchedTypeRefinement = item[IS_WITHIN_UNMATCHED_TYPE_REFINEMENT] === true;
 
   if (typeof dataID === 'string' && typeof fragments === 'object' && fragments !== null && typeof fragments[fragment.name] === 'object' && fragments[fragment.name] !== null && typeof mixedOwner === 'object' && mixedOwner !== null) {
     var owner = mixedOwner;
     var argumentVariables = fragments[fragment.name];
     var fragmentVariables = getFragmentVariables(fragment, owner.variables, argumentVariables);
-    return createReaderSelector(fragment, dataID, fragmentVariables, owner);
+    return createReaderSelector(fragment, dataID, fragmentVariables, owner, isWithinUnmatchedTypeRefinement);
   }
 
   if (process.env.NODE_ENV !== "production") {
@@ -292,9 +294,11 @@ function areEqualSelectors(thisSelector, thatSelector) {
 }
 
 function createReaderSelector(fragment, dataID, variables, request) {
+  var isWithinUnmatchedTypeRefinement = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
   return {
     kind: 'SingularReaderSelector',
     dataID: dataID,
+    isWithinUnmatchedTypeRefinement: isWithinUnmatchedTypeRefinement,
     node: fragment,
     variables: variables,
     owner: request