relay-runtime 9.0.0 → 9.1.0

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/RelayModernStore.js

@@ -10,6 +10,12 @@
 // flowlint ambiguous-object-type:error
 'use strict';
 
+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; } } }; }
+
+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 DataChecker = require('./DataChecker');
 
 var RelayModernRecord = require('./RelayModernRecord');
@@ -54,11 +60,9 @@ var DEFAULT_RELEASE_BUFFER_SIZE = 0;
  * is also enforced in development mode by freezing all records passed to a store.
  */
 
-var RelayModernStore =
-/*#__PURE__*/
-function () {
+var RelayModernStore = /*#__PURE__*/function () {
   function RelayModernStore(source, options) {
-    var _ref, _ref2, _ref3, _ref4;
+    var _options$gcReleaseBuf, _options$gcScheduler, _options$UNSTABLE_DO_, _options$operationLoa;
 
     // Prevent mutation of a record from outside the store.
     if (process.env.NODE_ENV !== "production") {
@@ -75,15 +79,16 @@ function () {
 
     this._currentWriteEpoch = 0;
     this._gcHoldCounter = 0;
-    this._gcReleaseBufferSize = (_ref = options === null || options === void 0 ? void 0 : options.gcReleaseBufferSize) !== null && _ref !== void 0 ? _ref : DEFAULT_RELEASE_BUFFER_SIZE;
-    this._gcScheduler = (_ref2 = options === null || options === void 0 ? void 0 : options.gcScheduler) !== null && _ref2 !== void 0 ? _ref2 : resolveImmediate;
-    this._getDataID = (_ref3 = options === null || options === void 0 ? void 0 : options.UNSTABLE_DO_NOT_USE_getDataID) !== null && _ref3 !== void 0 ? _ref3 : defaultGetDataID;
+    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._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._globalInvalidationEpoch = null;
     this._hasScheduledGC = false;
     this._index = 0;
     this._invalidationSubscriptions = new Set();
     this._invalidatedRecordIDs = new Set();
-    this._operationLoader = (_ref4 = options === null || options === void 0 ? void 0 : options.operationLoader) !== null && _ref4 !== void 0 ? _ref4 : null;
+    this._queryCacheExpirationTime = options === null || options === void 0 ? void 0 : options.queryCacheExpirationTime;
+    this._operationLoader = (_options$operationLoa = options === null || options === void 0 ? void 0 : options.operationLoader) !== null && _options$operationLoa !== void 0 ? _options$operationLoa : null;
     this._optimisticSource = null;
     this._recordSource = source;
     this._releaseBuffer = [];
@@ -103,7 +108,7 @@ function () {
   };
 
   _proto.check = function check(operation, options) {
-    var _this$_optimisticSour2, _ref5, _ref6;
+    var _this$_optimisticSour2, _options$target, _options$handlers;
 
     var selector = operation.root;
     var source = (_this$_optimisticSour2 = this._optimisticSource) !== null && _this$_optimisticSour2 !== void 0 ? _this$_optimisticSour2 : this._recordSource;
@@ -117,58 +122,68 @@ function () {
       // If so, check if the operation we're checking was last written
       // before or after invalidation occured.
       if (operationLastWrittenAt == null || operationLastWrittenAt <= globalInvalidationEpoch) {
-        // If the operation was written /before/ global invalidation ocurred,
+        // If the operation was written /before/ global invalidation occurred,
         // or if this operation has never been written to the store before,
         // we will consider the data for this operation to be stale
-        //  (i.e. not resolvable from the store).
+        // (i.e. not resolvable from the store).
         return {
           status: 'stale'
         };
       }
     }
 
-    var target = (_ref5 = options === null || options === void 0 ? void 0 : options.target) !== null && _ref5 !== void 0 ? _ref5 : source;
-    var handlers = (_ref6 = options === null || options === void 0 ? void 0 : options.handlers) !== null && _ref6 !== void 0 ? _ref6 : [];
+    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);
-    return getAvailablityStatus(operationAvailability, operationLastWrittenAt, rootEntry === null || rootEntry === void 0 ? void 0 : rootEntry.fetchTime);
+    return getAvailabilityStatus(operationAvailability, operationLastWrittenAt, rootEntry === null || rootEntry === void 0 ? void 0 : rootEntry.fetchTime, this._queryCacheExpirationTime);
   };
 
   _proto.retain = function retain(operation) {
     var _this = this;
 
     var id = operation.request.identifier;
+    var disposed = false;
 
     var dispose = function dispose() {
-      // When disposing, instead of immediately decrementing the refCount and
-      // potentially deleting/collecting the root, move the operation onto
-      // the release buffer. When the operation is extracted from the release
-      // buffer, we will determine if it needs to be collected.
-      _this._releaseBuffer.push(id); // Only when the release buffer is full do we actually:
-      // - extract the least recent operation in the release buffer
-      // - attempt to release it and run GC if it's no longer referenced
-      //   (refCount reached 0).
+      // Ensure each retain can only dispose once
+      if (disposed) {
+        return;
+      }
 
+      disposed = true; // For Flow: guard against the entry somehow not existing
 
-      if (_this._releaseBuffer.length > _this._gcReleaseBufferSize) {
-        var _id = _this._releaseBuffer.shift();
+      var rootEntry = _this._roots.get(id);
 
-        var _rootEntry = _this._roots.get(_id);
+      if (rootEntry == null) {
+        return;
+      } // Decrement the ref count: if it becomes zero it is eligible
+      // for release.
 
-        if (_rootEntry == null) {
-          // If operation has already been fully released, we don't need
-          // to do anything.
-          return;
-        }
 
-        if (_rootEntry.refCount > 0) {
-          // If the operation is still retained by other callers
-          // decrement the refCount
-          _rootEntry.refCount -= 1;
-        } else {
-          // Otherwise fully release the query and run GC.
-          _this._roots["delete"](_id);
+      rootEntry.refCount--;
+
+      if (rootEntry.refCount === 0) {
+        var _queryCacheExpirationTime = _this._queryCacheExpirationTime;
+
+        var rootEntryIsStale = rootEntry.fetchTime != null && _queryCacheExpirationTime != null && rootEntry.fetchTime <= Date.now() - _queryCacheExpirationTime;
+
+        if (rootEntryIsStale) {
+          _this._roots["delete"](id);
 
           _this._scheduleGC();
+        } else {
+          _this._releaseBuffer.push(id); // If the release buffer is now over-full, remove the least-recently
+          // added entry and schedule a GC. Note that all items in the release
+          // buffer have a refCount of 0.
+
+
+          if (_this._releaseBuffer.length > _this._gcReleaseBufferSize) {
+            var _id = _this._releaseBuffer.shift();
+
+            _this._roots["delete"](_id);
+
+            _this._scheduleGC();
+          }
         }
       }
     };
@@ -176,13 +191,22 @@ function () {
     var rootEntry = this._roots.get(id);
 
     if (rootEntry != null) {
-      // If we've previously retained this operation, inrement the refCount
+      if (rootEntry.refCount === 0) {
+        // This entry should be in the release buffer, but it no longer belongs
+        // there since it's retained. Remove it to maintain the invariant that
+        // all release buffer entries have a refCount of 0.
+        this._releaseBuffer = this._releaseBuffer.filter(function (_id) {
+          return _id !== id;
+        });
+      } // If we've previously retained this operation, increment the refCount
+
+
       rootEntry.refCount += 1;
     } else {
       // Otherwise create a new entry for the operation
       this._roots.set(id, {
         operation: operation,
-        refCount: 0,
+        refCount: 1,
         epoch: null,
         fetchTime: null
       });
@@ -202,7 +226,7 @@ function () {
     }
 
     return snapshot;
-  } // This method will return a list of updated owners form the subscriptions
+  } // This method will return a list of updated owners from the subscriptions
   ;
 
   _proto.notify = function notify(sourceOperation, invalidateStore) {
@@ -249,10 +273,21 @@ function () {
       var rootEntry = this._roots.get(id);
 
       if (rootEntry != null) {
-        var _rootEntry$fetchTime;
-
         rootEntry.epoch = this._currentWriteEpoch;
-        rootEntry.fetchTime = (_rootEntry$fetchTime = rootEntry.fetchTime) !== null && _rootEntry$fetchTime !== void 0 ? _rootEntry$fetchTime : Date.now();
+        rootEntry.fetchTime = Date.now();
+      } else if (sourceOperation.request.node.params.operationKind === 'query' && this._gcReleaseBufferSize > 0 && this._releaseBuffer.length < this._gcReleaseBufferSize) {
+        // The operation isn't retained but there is space in the release buffer:
+        // temporarily track this operation in case the data can be reused soon.
+        var temporaryRootEntry = {
+          operation: sourceOperation,
+          refCount: 0,
+          epoch: this._currentWriteEpoch,
+          fetchTime: Date.now()
+        };
+
+        this._releaseBuffer.push(id);
+
+        this._roots.set(id, temporaryRootEntry);
       }
     }
 
@@ -384,12 +419,11 @@ function () {
     } // Check if the invalidation state for any of the ids has changed.
 
 
-    var _iteratorNormalCompletion = true;
-    var _didIteratorError = false;
-    var _iteratorError = undefined;
+    var _iterator = _createForOfIteratorHelper(prevInvalidationState.dataIDs),
+        _step;
 
     try {
-      for (var _iterator = prevInvalidationState.dataIDs[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+      for (_iterator.s(); !(_step = _iterator.n()).done;) {
         var dataID = _step.value;
 
         if (currentInvalidations.get(dataID) !== prevInvalidations.get(dataID)) {
@@ -397,18 +431,9 @@ function () {
         }
       }
     } 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();
     }
 
     return false;
@@ -540,8 +565,8 @@ function () {
 
     var references = new Set(); // Mark all records that are traversable from a root
 
-    this._roots.forEach(function (_ref7) {
-      var operation = _ref7.operation;
+    this._roots.forEach(function (_ref) {
+      var operation = _ref.operation;
       var selector = operation.root;
       RelayReferenceMarker.mark(_this10._recordSource, selector, references, _this10._operationLoader);
     });
@@ -664,7 +689,7 @@ function updateTargetFromSource(target, source, currentWriteEpoch, idsMarkedForI
 /**
  * Returns an OperationAvailability given the Availability returned
  * by checking an operation, and when that operation was last written to the store.
- * Specifically, the provided Availablity of a an operation will contain the
+ * Specifically, the provided Availability of an operation will contain the
  * value of when a record referenced by the operation was most recently
  * invalidated; given that value, and given when this operation was last
  * written to the store, this function will return the overall
@@ -672,11 +697,9 @@ function updateTargetFromSource(target, source, currentWriteEpoch, idsMarkedForI
  */
 
 
-function getAvailablityStatus(opearionAvailability, operationLastWrittenAt, operationFetchTime) {
-  var _operationFetchTime;
-
-  var mostRecentlyInvalidatedAt = opearionAvailability.mostRecentlyInvalidatedAt,
-      status = opearionAvailability.status;
+function getAvailabilityStatus(operationAvailability, operationLastWrittenAt, operationFetchTime, queryCacheExpirationTime) {
+  var mostRecentlyInvalidatedAt = operationAvailability.mostRecentlyInvalidatedAt,
+      status = operationAvailability.status;
 
   if (typeof mostRecentlyInvalidatedAt === 'number') {
     // If some record referenced by this operation is stale, then the operation itself is stale
@@ -687,15 +710,29 @@ function getAvailablityStatus(opearionAvailability, operationLastWrittenAt, oper
         status: 'stale'
       };
     }
+  }
+
+  if (status === 'missing') {
+    return {
+      status: 'missing'
+    };
+  }
+
+  if (operationFetchTime != null && queryCacheExpirationTime != null) {
+    var isStale = operationFetchTime <= Date.now() - queryCacheExpirationTime;
+
+    if (isStale) {
+      return {
+        status: 'stale'
+      };
+    }
   } // There were no invalidations of any reachable records *or* the operation is known to have
   // been fetched after the most recent record invalidation.
 
 
-  return status === 'missing' ? {
-    status: 'missing'
-  } : {
+  return {
     status: 'available',
-    fetchTime: (_operationFetchTime = operationFetchTime) !== null && _operationFetchTime !== void 0 ? _operationFetchTime : null
+    fetchTime: operationFetchTime !== null && operationFetchTime !== void 0 ? operationFetchTime : null
   };
 }
 

package/lib/store/RelayOperationTracker.js

@@ -10,11 +10,15 @@
 // flowlint ambiguous-object-type:error
 'use strict';
 
+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; } } }; }
+
+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 invariant = require("fbjs/lib/invariant");
 
-var RelayOperationTracker =
-/*#__PURE__*/
-function () {
+var RelayOperationTracker = /*#__PURE__*/function () {
   function RelayOperationTracker() {
     this._ownersToPendingOperations = new Map();
     this._pendingOperationsToOwners = new Map();
@@ -34,12 +38,12 @@ function () {
     }
 
     var newlyAffectedOwners = new Set();
-    var _iteratorNormalCompletion = true;
-    var _didIteratorError = false;
-    var _iteratorError = undefined;
+
+    var _iterator = _createForOfIteratorHelper(affectedOwners),
+        _step;
 
     try {
-      for (var _iterator = affectedOwners[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+      for (_iterator.s(); !(_step = _iterator.n()).done;) {
         var owner = _step.value;
 
         var pendingOperationsAffectingOwner = this._ownersToPendingOperations.get(owner);
@@ -61,18 +65,9 @@ function () {
       } // No new owners were affected by this operation, we may stop here
 
     } 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();
     }
 
     if (newlyAffectedOwners.size === 0) {
@@ -82,12 +77,12 @@ function () {
 
 
     var ownersAffectedByOperation = this._pendingOperationsToOwners.get(pendingOperation) || new Set();
-    var _iteratorNormalCompletion2 = true;
-    var _didIteratorError2 = false;
-    var _iteratorError2 = undefined;
+
+    var _iterator2 = _createForOfIteratorHelper(newlyAffectedOwners),
+        _step2;
 
     try {
-      for (var _iterator2 = newlyAffectedOwners[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
+      for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
         var _owner = _step2.value;
 
         this._resolveOwnerResolvers(_owner);
@@ -95,18 +90,9 @@ function () {
         ownersAffectedByOperation.add(_owner);
       }
     } catch (err) {
-      _didIteratorError2 = true;
-      _iteratorError2 = err;
+      _iterator2.e(err);
     } finally {
-      try {
-        if (!_iteratorNormalCompletion2 && _iterator2["return"] != null) {
-          _iterator2["return"]();
-        }
-      } finally {
-        if (_didIteratorError2) {
-          throw _iteratorError2;
-        }
-      }
+      _iterator2.f();
     }
 
     this._pendingOperationsToOwners.set(pendingOperation, ownersAffectedByOperation);
@@ -129,12 +115,12 @@ function () {
     // and some other operations
 
     var updatedOwners = new Set();
-    var _iteratorNormalCompletion3 = true;
-    var _didIteratorError3 = false;
-    var _iteratorError3 = undefined;
+
+    var _iterator3 = _createForOfIteratorHelper(affectedOwners),
+        _step3;
 
     try {
-      for (var _iterator3 = affectedOwners[Symbol.iterator](), _step3; !(_iteratorNormalCompletion3 = (_step3 = _iterator3.next()).done); _iteratorNormalCompletion3 = true) {
+      for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
         var owner = _step3.value;
 
         var pendingOperationsAffectingOwner = this._ownersToPendingOperations.get(owner);
@@ -153,26 +139,16 @@ function () {
       } // Complete subscriptions for all owners, affected by `pendingOperation`
 
     } catch (err) {
-      _didIteratorError3 = true;
-      _iteratorError3 = err;
+      _iterator3.e(err);
     } finally {
-      try {
-        if (!_iteratorNormalCompletion3 && _iterator3["return"] != null) {
-          _iterator3["return"]();
-        }
-      } finally {
-        if (_didIteratorError3) {
-          throw _iteratorError3;
-        }
-      }
+      _iterator3.f();
     }
 
-    var _iteratorNormalCompletion4 = true;
-    var _didIteratorError4 = false;
-    var _iteratorError4 = undefined;
+    var _iterator4 = _createForOfIteratorHelper(completedOwners),
+        _step4;
 
     try {
-      for (var _iterator4 = completedOwners[Symbol.iterator](), _step4; !(_iteratorNormalCompletion4 = (_step4 = _iterator4.next()).done); _iteratorNormalCompletion4 = true) {
+      for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
         var _owner2 = _step4.value;
 
         this._resolveOwnerResolvers(_owner2);
@@ -182,44 +158,25 @@ function () {
       // are affected by other operations
 
     } catch (err) {
-      _didIteratorError4 = true;
-      _iteratorError4 = err;
+      _iterator4.e(err);
     } finally {
-      try {
-        if (!_iteratorNormalCompletion4 && _iterator4["return"] != null) {
-          _iterator4["return"]();
-        }
-      } finally {
-        if (_didIteratorError4) {
-          throw _iteratorError4;
-        }
-      }
+      _iterator4.f();
     }
 
-    var _iteratorNormalCompletion5 = true;
-    var _didIteratorError5 = false;
-    var _iteratorError5 = undefined;
+    var _iterator5 = _createForOfIteratorHelper(updatedOwners),
+        _step5;
 
     try {
-      for (var _iterator5 = updatedOwners[Symbol.iterator](), _step5; !(_iteratorNormalCompletion5 = (_step5 = _iterator5.next()).done); _iteratorNormalCompletion5 = true) {
+      for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
         var _owner3 = _step5.value;
 
         this._resolveOwnerResolvers(_owner3);
       } // Finally, remove pending operation
 
     } catch (err) {
-      _didIteratorError5 = true;
-      _iteratorError5 = err;
+      _iterator5.e(err);
     } finally {
-      try {
-        if (!_iteratorNormalCompletion5 && _iterator5["return"] != null) {
-          _iterator5["return"]();
-        }
-      } finally {
-        if (_didIteratorError5) {
-          throw _iteratorError5;
-        }
-      }
+      _iterator5.f();
     }
 
     this._pendingOperationsToOwners["delete"](pendingOperation);

package/lib/store/RelayOptimisticRecordSource.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 RelayRecordSource = require('./RelayRecordSource');
 
@@ -25,9 +29,7 @@ var UNPUBLISH_RECORD_SENTINEL = Object.freeze({
  * shadow the base version of the record rather than updating/replacing them.
  */
 
-var RelayOptimisticRecordSource =
-/*#__PURE__*/
-function () {
+var RelayOptimisticRecordSource = /*#__PURE__*/function () {
   function RelayOptimisticRecordSource(base) {
     this._base = base;
     this._sink = RelayRecordSource.create();
@@ -100,7 +102,7 @@ function () {
   _proto.toJSON = function toJSON() {
     var _this = this;
 
-    var merged = (0, _objectSpread2["default"])({}, this._base.toJSON());
+    var merged = _objectSpread({}, this._base.toJSON());
 
     this._sink.getRecordIDs().forEach(function (dataID) {
       var record = _this.get(dataID);

package/lib/store/RelayPublishQueue.js

@@ -37,9 +37,7 @@ var warning = require("fbjs/lib/warning");
  *   - Executes handlers for "handle" fields.
  *   - Reverts and reapplies pending optimistic updates.
  */
-var RelayPublishQueue =
-/*#__PURE__*/
-function () {
+var RelayPublishQueue = /*#__PURE__*/function () {
   // True if the next `run()` should apply the backup and rerun all optimistic
   // updates performing a rebase.
   // Payloads to apply or Sources to publish to the store with the next `run()`.

package/lib/store/RelayReader.js

@@ -45,9 +45,7 @@ function read(recordSource, selector) {
  */
 
 
-var RelayReader =
-/*#__PURE__*/
-function () {
+var RelayReader = /*#__PURE__*/function () {
   function RelayReader(recordSource, selector) {
     this._isMissingData = false;
     this._owner = selector.owner;

package/lib/store/RelayRecordSource.js

@@ -12,9 +12,7 @@
 
 var RelayRecordSourceMapImpl = require('./RelayRecordSourceMapImpl');
 
-var RelayRecordSource =
-/*#__PURE__*/
-function () {
+var RelayRecordSource = /*#__PURE__*/function () {
   function RelayRecordSource(records) {
     return RelayRecordSource.create(records);
   }