relay-runtime 8.0.0 → 10.0.1

package/lib/store/RelayModernStore.js

@@ -12,11 +12,15 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
-var DataChecker = require('./DataChecker');
+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); }
 
-var RelayFeatureFlags = require('../util/RelayFeatureFlags');
+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');
 
@@ -42,8 +46,9 @@ var recycleNodesInto = require('../util/recycleNodesInto');
 
 var resolveImmediate = require('../util/resolveImmediate');
 
-var _require = require('./RelayModernSelector'),
-    createReaderSelector = _require.createReaderSelector;
+var _require = require('./RelayStoreUtils'),
+    ROOT_ID = _require.ROOT_ID,
+    ROOT_TYPE = _require.ROOT_TYPE;
 
 var DEFAULT_RELEASE_BUFFER_SIZE = 0;
 /**
@@ -59,11 +64,21 @@ 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 _this = this;
+
+    var _options$gcReleaseBuf, _options$gcScheduler, _options$UNSTABLE_DO_, _options$log, _options$operationLoa;
+
+    (0, _defineProperty2["default"])(this, "_gcStep", function () {
+      if (_this._gcRun) {
+        if (_this._gcRun.next().done) {
+          _this._gcRun = null;
+        } else {
+          _this._gcScheduler(_this._gcStep);
+        }
+      }
+    });
 
     // Prevent mutation of a record from outside the store.
     if (process.env.NODE_ENV !== "production") {
@@ -78,27 +93,26 @@ function () {
       }
     }
 
-    this._connectionEvents = new Map();
-    this._connectionSubscriptions = new Map();
     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._gcRun = null;
+    this._gcScheduler = (_options$gcScheduler = options === null || options === void 0 ? void 0 : options.gcScheduler) !== null && _options$gcScheduler !== void 0 ? _options$gcScheduler : resolveImmediate;
+    this._getDataID = (_options$UNSTABLE_DO_ = options === null || options === void 0 ? void 0 : options.UNSTABLE_DO_NOT_USE_getDataID) !== null && _options$UNSTABLE_DO_ !== void 0 ? _options$UNSTABLE_DO_ : defaultGetDataID;
     this._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.__log = (_options$log = options === null || options === void 0 ? void 0 : options.log) !== null && _options$log !== void 0 ? _options$log : 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 = [];
     this._roots = new Map();
     this._shouldScheduleGC = false;
     this._subscriptions = new Set();
-    this._updatedConnectionIDs = {};
     this._updatedRecordIDs = {};
+    initializeRecordSource(this._recordSource);
   }
 
   var _proto = RelayModernStore.prototype;
@@ -109,20 +123,8 @@ function () {
     return (_this$_optimisticSour = this._optimisticSource) !== null && _this$_optimisticSour !== void 0 ? _this$_optimisticSour : this._recordSource;
   };
 
-  _proto.getConnectionEvents_UNSTABLE = function getConnectionEvents_UNSTABLE(connectionID) {
-    var events = this._connectionEvents.get(connectionID);
-
-    if (events != null) {
-      var _events$optimistic;
-
-      return (_events$optimistic = events.optimistic) !== null && _events$optimistic !== void 0 ? _events$optimistic : events["final"];
-    }
-  };
-
   _proto.check = function check(operation, options) {
-    var _this = this;
-
-    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;
@@ -136,58 +138,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).
-        return 'stale';
+        // (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 operationAvailability = DataChecker.check(source, target, selector, handlers, this._operationLoader, this._getDataID, function (id) {
-      return _this.getConnectionEvents_UNSTABLE(id);
-    });
-    return getAvailablityStatus(operationAvailability, operationLastWrittenAt);
+    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 getAvailabilityStatus(operationAvailability, operationLastWrittenAt, rootEntry === null || rootEntry === void 0 ? void 0 : rootEntry.fetchTime, this._queryCacheExpirationTime);
   };
 
   _proto.retain = function retain(operation) {
     var _this2 = 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.
-      _this2._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 (_this2._releaseBuffer.length > _this2._gcReleaseBufferSize) {
-        var _id = _this2._releaseBuffer.shift();
+      var rootEntry = _this2._roots.get(id);
 
-        var _rootEntry = _this2._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.
-          _this2._roots["delete"](_id);
+      rootEntry.refCount--;
+
+      if (rootEntry.refCount === 0) {
+        var _queryCacheExpirationTime = _this2._queryCacheExpirationTime;
+
+        var rootEntryIsStale = rootEntry.fetchTime != null && _queryCacheExpirationTime != null && rootEntry.fetchTime <= Date.now() - _queryCacheExpirationTime;
+
+        if (rootEntryIsStale) {
+          _this2._roots["delete"](id);
 
           _this2._scheduleGC();
+        } else {
+          _this2._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 (_this2._releaseBuffer.length > _this2._gcReleaseBufferSize) {
+            var _id = _this2._releaseBuffer.shift();
+
+            _this2._roots["delete"](_id);
+
+            _this2._scheduleGC();
+          }
         }
       }
     };
@@ -195,14 +207,24 @@ 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,
-        epoch: null
+        refCount: 1,
+        epoch: null,
+        fetchTime: null
       });
     }
 
@@ -220,14 +242,22 @@ 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) {
     var _this3 = this;
 
-    // Increment the current write when notifying after executing
+    var log = this.__log;
+
+    if (log != null) {
+      log({
+        name: 'store.notify.start'
+      });
+    } // Increment the current write when notifying after executing
     // a set of changes to the store.
+
+
     this._currentWriteEpoch++;
 
     if (invalidateStore === true) {
@@ -249,14 +279,14 @@ function () {
       _this3._updateInvalidationSubscription(subscription, invalidateStore === true);
     });
 
-    this._connectionSubscriptions.forEach(function (subscription, id) {
-      if (subscription.stale) {
-        subscription.stale = false;
-        subscription.callback(subscription.snapshot);
-      }
-    });
+    if (log != null) {
+      log({
+        name: 'store.notify.complete',
+        updatedRecordIDs: this._updatedRecordIDs,
+        invalidatedRecordIDs: this._invalidatedRecordIDs
+      });
+    }
 
-    this._updatedConnectionIDs = {};
     this._updatedRecordIDs = {};
 
     this._invalidatedRecordIDs.clear(); // If a source operation was provided (indicating the operation
@@ -276,6 +306,20 @@ function () {
 
       if (rootEntry != null) {
         rootEntry.epoch = this._currentWriteEpoch;
+        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);
       }
     }
 
@@ -283,34 +327,28 @@ function () {
   };
 
   _proto.publish = function publish(source, idsMarkedForInvalidation) {
-    var _this4 = this;
-
     var _this$_optimisticSour3;
 
     var target = (_this$_optimisticSour3 = this._optimisticSource) !== null && _this$_optimisticSour3 !== void 0 ? _this$_optimisticSour3 : this._recordSource;
     updateTargetFromSource(target, source, // We increment the current epoch at the end of the set of updates,
     // in notify(). Here, we pass what will be the incremented value of
     // the epoch to use to write to invalidated records.
-    this._currentWriteEpoch + 1, idsMarkedForInvalidation, this._updatedRecordIDs, this._invalidatedRecordIDs);
-
-    this._connectionSubscriptions.forEach(function (subscription, id) {
-      var hasStoreUpdates = hasOverlappingIDs(subscription.snapshot.seenRecords, _this4._updatedRecordIDs);
-
-      if (!hasStoreUpdates) {
-        return;
-      }
+    this._currentWriteEpoch + 1, idsMarkedForInvalidation, this._updatedRecordIDs, this._invalidatedRecordIDs); // NOTE: log *after* processing the source so that even if a bad log function
+    // mutates the source, it doesn't affect Relay processing of it.
 
-      var nextSnapshot = _this4._updateConnection_UNSTABLE(subscription.resolver, subscription.snapshot, source, null);
+    var log = this.__log;
 
-      if (nextSnapshot) {
-        subscription.snapshot = nextSnapshot;
-        subscription.stale = true;
-      }
-    });
+    if (log != null) {
+      log({
+        name: 'store.publish',
+        source: source,
+        optimistic: target === this._optimisticSource
+      });
+    }
   };
 
   _proto.subscribe = function subscribe(snapshot, callback) {
-    var _this5 = this;
+    var _this4 = this;
 
     var subscription = {
       backup: null,
@@ -320,7 +358,7 @@ function () {
     };
 
     var dispose = function dispose() {
-      _this5._subscriptions["delete"](subscription);
+      _this4._subscriptions["delete"](subscription);
     };
 
     this._subscriptions.add(subscription);
@@ -331,18 +369,23 @@ function () {
   };
 
   _proto.holdGC = function holdGC() {
-    var _this6 = this;
+    var _this5 = this;
+
+    if (this._gcRun) {
+      this._gcRun = null;
+      this._shouldScheduleGC = true;
+    }
 
     this._gcHoldCounter++;
 
     var dispose = function dispose() {
-      if (_this6._gcHoldCounter > 0) {
-        _this6._gcHoldCounter--;
+      if (_this5._gcHoldCounter > 0) {
+        _this5._gcHoldCounter--;
 
-        if (_this6._gcHoldCounter === 0 && _this6._shouldScheduleGC) {
-          _this6._scheduleGC();
+        if (_this5._gcHoldCounter === 0 && _this5._shouldScheduleGC) {
+          _this5._scheduleGC();
 
-          _this6._shouldScheduleGC = false;
+          _this5._shouldScheduleGC = false;
         }
       }
     };
@@ -397,13 +440,13 @@ function () {
   };
 
   _proto.lookupInvalidationState = function lookupInvalidationState(dataIDs) {
-    var _this7 = this;
+    var _this6 = this;
 
     var invalidations = new Map();
     dataIDs.forEach(function (dataID) {
       var _RelayModernRecord$ge;
 
-      var record = _this7.getSource().get(dataID);
+      var record = _this6.getSource().get(dataID);
 
       invalidations.set(dataID, (_RelayModernRecord$ge = RelayModernRecord.getInvalidationEpoch(record)) !== null && _RelayModernRecord$ge !== void 0 ? _RelayModernRecord$ge : null);
     });
@@ -424,12 +467,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)) {
@@ -437,25 +479,16 @@ 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;
   };
 
   _proto.subscribeToInvalidationState = function subscribeToInvalidationState(invalidationState, callback) {
-    var _this8 = this;
+    var _this7 = this;
 
     var subscription = {
       callback: callback,
@@ -463,7 +496,7 @@ function () {
     };
 
     var dispose = function dispose() {
-      _this8._invalidationSubscriptions["delete"](subscription);
+      _this7._invalidationSubscriptions["delete"](subscription);
     };
 
     this._invalidationSubscriptions.add(subscription);
@@ -474,13 +507,13 @@ function () {
   };
 
   _proto._updateInvalidationSubscription = function _updateInvalidationSubscription(subscription, invalidatedStore) {
-    var _this9 = this;
+    var _this8 = this;
 
     var callback = subscription.callback,
         invalidationState = subscription.invalidationState;
     var dataIDs = invalidationState.dataIDs;
     var isSubscribedToInvalidatedIDs = invalidatedStore || dataIDs.some(function (dataID) {
-      return _this9._invalidatedRecordIDs.has(dataID);
+      return _this8._invalidatedRecordIDs.has(dataID);
     });
 
     if (!isSubscribedToInvalidatedIDs) {
@@ -490,286 +523,67 @@ function () {
     callback();
   };
 
-  _proto.lookupConnection_UNSTABLE = function lookupConnection_UNSTABLE(connectionReference, resolver) {
-    var _connectionEvents$opt;
-
-    !RelayFeatureFlags.ENABLE_CONNECTION_RESOLVERS ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayModernStore: Connection resolvers are not yet supported.') : invariant(false) : void 0;
-    var id = connectionReference.id;
-    var initialState = resolver.initialize();
-
-    var connectionEvents = this._connectionEvents.get(id);
-
-    var events = connectionEvents != null ? (_connectionEvents$opt = connectionEvents.optimistic) !== null && _connectionEvents$opt !== void 0 ? _connectionEvents$opt : connectionEvents["final"] : null;
-    var initialSnapshot = {
-      edgeSnapshots: {},
-      id: id,
-      reference: connectionReference,
-      seenRecords: {},
-      state: initialState
-    };
-
-    if (events == null || events.length === 0) {
-      return initialSnapshot;
-    }
-
-    return this._reduceConnection_UNSTABLE(resolver, connectionReference, initialSnapshot, events);
-  };
-
-  _proto.subscribeConnection_UNSTABLE = function subscribeConnection_UNSTABLE(snapshot, resolver, callback) {
-    var _this10 = this;
-
-    !RelayFeatureFlags.ENABLE_CONNECTION_RESOLVERS ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayModernStore: Connection resolvers are not yet supported.') : invariant(false) : void 0;
-    var id = String(this._index++);
-    var subscription = {
-      backup: null,
-      callback: callback,
-      id: id,
-      resolver: resolver,
-      snapshot: snapshot,
-      stale: false
-    };
-
-    var dispose = function dispose() {
-      _this10._connectionSubscriptions["delete"](id);
-    };
-
-    this._connectionSubscriptions.set(id, subscription);
-
-    return {
-      dispose: dispose
-    };
-  };
+  _proto.snapshot = function snapshot() {
+    var _this9 = this;
 
-  _proto.publishConnectionEvents_UNSTABLE = function publishConnectionEvents_UNSTABLE(events, final) {
-    var _this11 = this;
+    !(this._optimisticSource == null) ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayModernStore: Unexpected call to snapshot() while a previous ' + 'snapshot exists.') : invariant(false) : void 0;
+    var log = this.__log;
 
-    if (events.length === 0) {
-      return;
+    if (log != null) {
+      log({
+        name: 'store.snapshot'
+      });
     }
 
-    !RelayFeatureFlags.ENABLE_CONNECTION_RESOLVERS ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayModernStore: Connection resolvers are not yet supported.') : invariant(false) : void 0;
-    var pendingConnectionEvents = new Map();
-    events.forEach(function (event) {
-      var connectionID = event.connectionID;
-      var pendingEvents = pendingConnectionEvents.get(connectionID);
-
-      if (pendingEvents == null) {
-        pendingEvents = [];
-        pendingConnectionEvents.set(connectionID, pendingEvents);
-      }
-
-      pendingEvents.push(event);
-
-      var connectionEvents = _this11._connectionEvents.get(connectionID);
-
-      if (connectionEvents == null) {
-        connectionEvents = {
-          "final": [],
-          optimistic: null
-        };
-
-        _this11._connectionEvents.set(connectionID, connectionEvents);
-      }
-
-      if (final) {
-        connectionEvents["final"].push(event);
-      } else {
-        var optimisticEvents = connectionEvents.optimistic;
-
-        if (optimisticEvents == null) {
-          optimisticEvents = connectionEvents["final"].slice();
-          connectionEvents.optimistic = optimisticEvents;
-        }
-
-        optimisticEvents.push(event);
-      }
-    });
-
-    this._connectionSubscriptions.forEach(function (subscription, id) {
-      var pendingEvents = pendingConnectionEvents.get(subscription.snapshot.reference.id);
-
-      if (pendingEvents == null) {
+    this._subscriptions.forEach(function (subscription) {
+      // Backup occurs after writing a new "final" payload(s) and before (re)applying
+      // optimistic changes. Each subscription's `snapshot` represents what was *last
+      // published to the subscriber*, which notably may include previous optimistic
+      // updates. Therefore a subscription can be in any of the following states:
+      // - stale=true: This subscription was restored to a different value than
+      //   `snapshot`. That means this subscription has changes relative to its base,
+      //   but its base has changed (we just applied a final payload): recompute
+      //   a backup so that we can later restore to the state the subscription
+      //   should be in.
+      // - stale=false: This subscription was restored to the same value than
+      //   `snapshot`. That means this subscription does *not* have changes relative
+      //   to its base, so the current `snapshot` is valid to use as a backup.
+      if (!subscription.stale) {
+        subscription.backup = subscription.snapshot;
         return;
       }
 
-      var nextSnapshot = _this11._updateConnection_UNSTABLE(subscription.resolver, subscription.snapshot, null, pendingEvents);
+      var snapshot = subscription.snapshot;
+      var backup = RelayReader.read(_this9.getSource(), snapshot.selector);
+      var nextData = recycleNodesInto(snapshot.data, backup.data);
+      backup.data = nextData; // backup owns the snapshot and can safely mutate
 
-      if (nextSnapshot) {
-        subscription.snapshot = nextSnapshot;
-        subscription.stale = true;
-      }
+      subscription.backup = backup;
     });
-  };
-
-  _proto._updateConnection_UNSTABLE = function _updateConnection_UNSTABLE(resolver, snapshot, source, pendingEvents) {
-    var _pendingEvents;
 
-    var nextSnapshot = this._reduceConnection_UNSTABLE(resolver, snapshot.reference, snapshot, (_pendingEvents = pendingEvents) !== null && _pendingEvents !== void 0 ? _pendingEvents : [], source);
-
-    var state = recycleNodesInto(snapshot.state, nextSnapshot.state);
-
-    if (process.env.NODE_ENV !== "production") {
-      deepFreeze(nextSnapshot);
+    if (this._gcRun) {
+      this._gcRun = null;
+      this._shouldScheduleGC = true;
     }
 
-    if (state !== snapshot.state) {
-      return (0, _objectSpread2["default"])({}, nextSnapshot, {
-        state: state
-      });
-    }
+    this._optimisticSource = RelayOptimisticRecordSource.create(this.getSource());
   };
 
-  _proto._reduceConnection_UNSTABLE = function _reduceConnection_UNSTABLE(resolver, connectionReference, snapshot, events) {
-    var _this12 = this;
-
-    var _edgesField$concreteT;
-
-    var source = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : null;
-    var edgesField = connectionReference.edgesField,
-        id = connectionReference.id,
-        variables = connectionReference.variables;
-    var fragment = {
-      kind: 'Fragment',
-      name: edgesField.name,
-      type: (_edgesField$concreteT = edgesField.concreteType) !== null && _edgesField$concreteT !== void 0 ? _edgesField$concreteT : '__Any',
-      metadata: null,
-      argumentDefinitions: [],
-      selections: edgesField.selections
-    };
-    var seenRecords = {};
-    var edgeSnapshots = (0, _objectSpread2["default"])({}, snapshot.edgeSnapshots);
-    var initialState = snapshot.state;
-
-    if (source) {
-      var edgeData = {};
-      Object.keys(edgeSnapshots).forEach(function (edgeID) {
-        var prevSnapshot = edgeSnapshots[edgeID];
-        var nextSnapshot = RelayReader.read(_this12.getSource(), createReaderSelector(fragment, edgeID, variables, prevSnapshot.selector.owner));
-        var data = recycleNodesInto(prevSnapshot.data, nextSnapshot.data);
-        nextSnapshot = {
-          data: data,
-          isMissingData: nextSnapshot.isMissingData,
-          seenRecords: nextSnapshot.seenRecords,
-          selector: nextSnapshot.selector
-        };
-
-        if (data !== prevSnapshot.data) {
-          edgeData[edgeID] = data;
-          /* $FlowFixMe(>=0.111.0) This comment suppresses an error found when
-           * Flow v0.111.0 was deployed. To see the error, delete this comment
-           * and run Flow. */
+  _proto.restore = function restore() {
+    !(this._optimisticSource != null) ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayModernStore: Unexpected call to restore(), expected a snapshot ' + 'to exist (make sure to call snapshot()).') : invariant(false) : void 0;
+    var log = this.__log;
 
-          edgeSnapshots[edgeID] = nextSnapshot;
-        }
+    if (log != null) {
+      log({
+        name: 'store.restore'
       });
-
-      if (Object.keys(edgeData).length !== 0) {
-        initialState = resolver.reduce(initialState, {
-          kind: 'update',
-          edgeData: edgeData
-        });
-      }
     }
 
-    var state = events.reduce(function (prevState, event) {
-      if (event.kind === 'fetch') {
-        var edges = [];
-        event.edgeIDs.forEach(function (edgeID) {
-          if (edgeID == null) {
-            edges.push(edgeID);
-            return;
-          }
-
-          var edgeSnapshot = RelayReader.read(_this12.getSource(), createReaderSelector(fragment, edgeID, variables, event.request));
-          Object.assign(seenRecords, edgeSnapshot.seenRecords);
-          var itemData = edgeSnapshot.data;
-          /* $FlowFixMe(>=0.111.0) This comment suppresses an error found
-           * when Flow v0.111.0 was deployed. To see the error, delete this
-           * comment and run Flow. */
-
-          edgeSnapshots[edgeID] = edgeSnapshot;
-          edges.push(itemData);
-        });
-        return resolver.reduce(prevState, {
-          kind: 'fetch',
-          args: event.args,
-          edges: edges,
-          pageInfo: event.pageInfo,
-          stream: event.stream
-        });
-      } else if (event.kind === 'insert') {
-        var edgeSnapshot = RelayReader.read(_this12.getSource(), createReaderSelector(fragment, event.edgeID, variables, event.request));
-        Object.assign(seenRecords, edgeSnapshot.seenRecords);
-        var itemData = edgeSnapshot.data;
-        /* $FlowFixMe(>=0.111.0) This comment suppresses an error found when
-         * Flow v0.111.0 was deployed. To see the error, delete this comment
-         * and run Flow. */
-
-        edgeSnapshots[event.edgeID] = edgeSnapshot;
-        return resolver.reduce(prevState, {
-          args: event.args,
-          edge: itemData,
-          kind: 'insert'
-        });
-      } else if (event.kind === 'stream.edge') {
-        var _edgeSnapshot = RelayReader.read(_this12.getSource(), createReaderSelector(fragment, event.edgeID, variables, event.request));
-
-        Object.assign(seenRecords, _edgeSnapshot.seenRecords);
-        var _itemData = _edgeSnapshot.data;
-        /* $FlowFixMe(>=0.111.0) This comment suppresses an error found when
-         * Flow v0.111.0 was deployed. To see the error, delete this comment
-         * and run Flow. */
-
-        edgeSnapshots[event.edgeID] = _edgeSnapshot;
-        return resolver.reduce(prevState, {
-          args: event.args,
-          edge: _itemData,
-          index: event.index,
-          kind: 'stream.edge'
-        });
-      } else if (event.kind === 'stream.pageInfo') {
-        return resolver.reduce(prevState, {
-          args: event.args,
-          kind: 'stream.pageInfo',
-          pageInfo: event.pageInfo
-        });
-      } else {
-        event.kind;
-        !false ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayModernStore: Unexpected connection event kind `%s`.', event.kind) : invariant(false) : void 0;
-      }
-    }, initialState);
-    return {
-      edgeSnapshots: edgeSnapshots,
-      id: id,
-      reference: connectionReference,
-      seenRecords: seenRecords,
-      state: state
-    };
-  };
-
-  _proto.snapshot = function snapshot() {
-    !(this._optimisticSource == null) ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayModernStore: Unexpected call to snapshot() while a previous ' + 'snapshot exists.') : invariant(false) : void 0;
-
-    this._connectionSubscriptions.forEach(function (subscription) {
-      subscription.backup = subscription.snapshot;
-    });
-
-    this._subscriptions.forEach(function (subscription) {
-      subscription.backup = subscription.snapshot;
-    });
-
-    this._optimisticSource = RelayOptimisticRecordSource.create(this.getSource());
-  };
-
-  _proto.restore = function restore() {
-    var _this13 = this;
-
-    !(this._optimisticSource != null) ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayModernStore: Unexpected call to restore(), expected a snapshot ' + 'to exist (make sure to call snapshot()).') : invariant(false) : void 0;
     this._optimisticSource = null;
 
-    this._connectionEvents.forEach(function (events) {
-      events.optimistic = null;
-    });
+    if (this._shouldScheduleGC) {
+      this._scheduleGC();
+    }
 
     this._subscriptions.forEach(function (subscription) {
       var backup = subscription.backup;
@@ -790,127 +604,104 @@ function () {
         subscription.stale = true;
       }
     });
-
-    this._connectionSubscriptions.forEach(function (subscription) {
-      var backup = subscription.backup;
-      subscription.backup = null;
-
-      if (backup) {
-        if (backup.state !== subscription.snapshot.state) {
-          subscription.stale = true;
-        }
-
-        subscription.snapshot = backup;
-      } else {
-        // This subscription was established after the creation of the
-        // connection snapshot so there's nothing to restore to. Recreate the
-        // connection from scratch and check ifs value changes.
-        var baseSnapshot = _this13.lookupConnection_UNSTABLE(subscription.snapshot.reference, subscription.resolver);
-
-        var nextState = recycleNodesInto(subscription.snapshot.state, baseSnapshot.state);
-
-        if (nextState !== subscription.snapshot.state) {
-          subscription.stale = true;
-        }
-
-        subscription.snapshot = (0, _objectSpread2["default"])({}, baseSnapshot, {
-          state: nextState
-        });
-      }
-    });
   };
 
   _proto._scheduleGC = function _scheduleGC() {
-    var _this14 = this;
-
     if (this._gcHoldCounter > 0) {
       this._shouldScheduleGC = true;
       return;
     }
 
-    if (this._hasScheduledGC) {
+    if (this._gcRun) {
       return;
     }
 
-    this._hasScheduledGC = true;
-
-    this._gcScheduler(function () {
-      _this14.__gc();
+    this._gcRun = this._collect();
 
-      _this14._hasScheduledGC = false;
-    });
-  };
+    this._gcScheduler(this._gcStep);
+  }
+  /**
+   * Run a full GC synchronously.
+   */
+  ;
 
   _proto.__gc = function __gc() {
-    var _this15 = this;
-
     // Don't run GC while there are optimistic updates applied
     if (this._optimisticSource != null) {
       return;
     }
 
-    var references = new Set();
-    var connectionReferences = new Set(); // Mark all records that are traversable from a root
-
-    this._roots.forEach(function (_ref7) {
-      var operation = _ref7.operation;
-      var selector = operation.root;
-      RelayReferenceMarker.mark(_this15._recordSource, selector, references, connectionReferences, function (id) {
-        return _this15.getConnectionEvents_UNSTABLE(id);
-      }, _this15._operationLoader);
-    });
+    var gcRun = this._collect();
 
-    if (references.size === 0) {
-      // Short-circuit if *nothing* is referenced
-      this._recordSource.clear();
-    } else {
-      // Evict any unreferenced nodes
-      var storeIDs = this._recordSource.getRecordIDs();
-
-      for (var ii = 0; ii < storeIDs.length; ii++) {
-        var dataID = storeIDs[ii];
+    while (!gcRun.next().done) {}
+  };
 
-        if (!references.has(dataID)) {
-          this._recordSource.remove(dataID);
-        }
-      }
-    }
+  _proto._collect = function* _collect() {
+    /* eslint-disable no-labels */
+    top: while (true) {
+      var startEpoch = this._currentWriteEpoch;
+      var references = new Set(); // Mark all records that are traversable from a root
 
-    if (connectionReferences.size === 0) {
-      this._connectionEvents.clear();
-    } else {
-      // Evict any unreferenced connections
-      var _iteratorNormalCompletion2 = true;
-      var _didIteratorError2 = false;
-      var _iteratorError2 = undefined;
+      var _iterator2 = _createForOfIteratorHelper(this._roots.values()),
+          _step2;
 
       try {
-        for (var _iterator2 = this._connectionEvents.keys()[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
-          var connectionID = _step2.value;
+        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+          var operation = _step2.value.operation;
+          var selector = operation.root;
+          RelayReferenceMarker.mark(this._recordSource, selector, references, this._operationLoader); // Yield for other work after each operation
+
+          yield; // If the store was updated, restart
 
-          if (!connectionReferences.has(connectionID)) {
-            this._connectionEvents["delete"](connectionID);
+          if (startEpoch !== this._currentWriteEpoch) {
+            continue top;
           }
         }
       } 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();
+      }
+
+      var log = this.__log;
+
+      if (log != null) {
+        log({
+          name: 'store.gc',
+          references: references
+        });
+      } // Sweep records without references
+
+
+      if (references.size === 0) {
+        // Short-circuit if *nothing* is referenced
+        this._recordSource.clear();
+      } else {
+        // Evict any unreferenced nodes
+        var storeIDs = this._recordSource.getRecordIDs();
+
+        for (var ii = 0; ii < storeIDs.length; ii++) {
+          var dataID = storeIDs[ii];
+
+          if (!references.has(dataID)) {
+            this._recordSource.remove(dataID);
           }
         }
       }
+
+      return;
     }
   };
 
   return RelayModernStore;
 }();
+
+function initializeRecordSource(target) {
+  if (!target.has(ROOT_ID)) {
+    var rootRecord = RelayModernRecord.create(ROOT_ID, ROOT_TYPE);
+    target.set(ROOT_ID, rootRecord);
+  }
+}
 /**
  * Updates the target with information from source, also updating a mapping of
  * which records in the target were changed as a result.
@@ -1003,7 +794,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
@@ -1011,32 +802,46 @@ function updateTargetFromSource(target, source, currentWriteEpoch, idsMarkedForI
  */
 
 
-function getAvailablityStatus(opearionAvailability, operationLastWrittenAt) {
-  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
+    // if either the operation itself was never written *or* the operation was last written
+    // before the most recent invalidation of its reachable records.
+    if (operationLastWrittenAt == null || mostRecentlyInvalidatedAt > operationLastWrittenAt) {
+      return {
+        status: 'stale'
+      };
+    }
+  }
 
-  if (typeof mostRecentlyInvalidatedAt !== 'number') {
-    // If the record has never been invalidated, it isn't stale,
-    // so return the availability status of the operation.
-    return status;
+  if (status === 'missing') {
+    return {
+      status: 'missing'
+    };
   }
 
-  if (operationLastWrittenAt == null) {
-    // If we've never written this operation before and there was an invalidation,
-    // then we don't have enough information to determine staleness,
-    // so by default we will consider it stale.
-    return 'stale';
-  } // If the record was invalidated before the operation we're reading was
-  // last written, we can consider it not stale; otherwise consider it stale.
+  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 mostRecentlyInvalidatedAt > operationLastWrittenAt ? 'stale' : status;
+  return {
+    status: 'available',
+    fetchTime: operationFetchTime !== null && operationFetchTime !== void 0 ? operationFetchTime : null
+  };
 }
 
 RelayProfiler.instrumentMethods(RelayModernStore.prototype, {
-  lookup: 'RelayModernStore.prototype.lookup',
-  notify: 'RelayModernStore.prototype.notify',
-  publish: 'RelayModernStore.prototype.publish',
-  __gc: 'RelayModernStore.prototype.__gc'
+  lookup: 'RelayModernStore.prototype.lookup'
 });
 module.exports = RelayModernStore;