relay-runtime 11.0.0-rc.0 → 12.0.0

package/lib/store/RelayModernFragmentSpecResolver.js

@@ -20,24 +20,25 @@ var RelayFeatureFlags = require('../util/RelayFeatureFlags');
 
 var areEqual = require("fbjs/lib/areEqual");
 
-var invariant = require("fbjs/lib/invariant");
+var getPendingOperationsForFragment = require('../util/getPendingOperationsForFragment');
+
+var invariant = require('invariant');
 
 var isScalarAndEqual = require('../util/isScalarAndEqual');
 
+var recycleNodesInto = require('../util/recycleNodesInto');
+
 var reportMissingRequiredFields = require('../util/reportMissingRequiredFields');
 
 var warning = require("fbjs/lib/warning");
 
-var _require = require('../query/fetchQueryInternal'),
-    getPromiseForActiveRequest = _require.getPromiseForActiveRequest;
+var _require = require('./RelayModernOperationDescriptor'),
+    createRequestDescriptor = _require.createRequestDescriptor;
 
-var _require2 = require('./RelayModernOperationDescriptor'),
-    createRequestDescriptor = _require2.createRequestDescriptor;
-
-var _require3 = require('./RelayModernSelector'),
-    areEqualSelectors = _require3.areEqualSelectors,
-    createReaderSelector = _require3.createReaderSelector,
-    getSelectorsFromObject = _require3.getSelectorsFromObject;
+var _require2 = require('./RelayModernSelector'),
+    areEqualSelectors = _require2.areEqualSelectors,
+    createReaderSelector = _require2.createReaderSelector,
+    getSelectorsFromObject = _require2.getSelectorsFromObject;
 
 /**
  * A utility for resolving and subscribing to the results of a fragment spec
@@ -129,13 +130,17 @@ var RelayModernFragmentSpecResolver = /*#__PURE__*/function () {
     return this._data;
   };
 
-  _proto.setCallback = function setCallback(callback) {
+  _proto.setCallback = function setCallback(props, callback) {
     this._callback = callback;
+
+    if (RelayFeatureFlags.ENABLE_CONTAINERS_SUBSCRIBE_ON_COMMIT === true) {
+      this.setProps(props);
+    }
   };
 
   _proto.setProps = function setProps(props) {
-    var ownedSelectors = getSelectorsFromObject(this._fragments, props);
     this._props = {};
+    var ownedSelectors = getSelectorsFromObject(this._fragments, props);
 
     for (var _key3 in ownedSelectors) {
       if (ownedSelectors.hasOwnProperty(_key3)) {
@@ -150,14 +155,14 @@ var RelayModernFragmentSpecResolver = /*#__PURE__*/function () {
           resolver = null;
         } else if (ownedSelector.kind === 'PluralReaderSelector') {
           if (resolver == null) {
-            resolver = new SelectorListResolver(this._context.environment, this._rootIsQueryRenderer, ownedSelector, this._onChange);
+            resolver = new SelectorListResolver(this._context.environment, this._rootIsQueryRenderer, ownedSelector, this._callback != null, this._onChange);
           } else {
             !(resolver instanceof SelectorListResolver) ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayModernFragmentSpecResolver: Expected prop `%s` to always be an array.', _key3) : invariant(false) : void 0;
             resolver.setSelector(ownedSelector);
           }
         } else {
           if (resolver == null) {
-            resolver = new SelectorResolver(this._context.environment, this._rootIsQueryRenderer, ownedSelector, this._onChange);
+            resolver = new SelectorResolver(this._context.environment, this._rootIsQueryRenderer, ownedSelector, this._callback != null, this._onChange);
           } else {
             !(resolver instanceof SelectorResolver) ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayModernFragmentSpecResolver: Expected prop `%s` to always be an object.', _key3) : invariant(false) : void 0;
             resolver.setSelector(ownedSelector);
@@ -194,7 +199,7 @@ var RelayModernFragmentSpecResolver = /*#__PURE__*/function () {
 
 
 var SelectorResolver = /*#__PURE__*/function () {
-  function SelectorResolver(environment, rootIsQueryRenderer, selector, callback) {
+  function SelectorResolver(environment, rootIsQueryRenderer, selector, subscribeOnConstruction, callback) {
     var _this2 = this;
 
     (0, _defineProperty2["default"])(this, "_onChange", function (snapshot) {
@@ -214,7 +219,14 @@ var SelectorResolver = /*#__PURE__*/function () {
     this._environment = environment;
     this._rootIsQueryRenderer = rootIsQueryRenderer;
     this._selector = selector;
-    this._subscription = environment.subscribe(_snapshot, this._onChange);
+
+    if (RelayFeatureFlags.ENABLE_CONTAINERS_SUBSCRIBE_ON_COMMIT === true) {
+      if (subscribeOnConstruction) {
+        this._subscription = environment.subscribe(_snapshot, this._onChange);
+      }
+    } else {
+      this._subscription = environment.subscribe(_snapshot, this._onChange);
+    }
   }
 
   var _proto2 = SelectorResolver.prototype;
@@ -228,9 +240,7 @@ var SelectorResolver = /*#__PURE__*/function () {
   };
 
   _proto2.resolve = function resolve() {
-    if (RelayFeatureFlags.ENABLE_RELAY_CONTAINERS_SUSPENSE === true && this._isMissingData === true) {
-      var _getPromiseForActiveR;
-
+    if (this._isMissingData === true) {
       // NOTE: This branch exists to handle the case in which:
       // - A RelayModern container is rendered as a descendant of a Relay Hook
       //   root using a "partial" renderPolicy (this means that eargerly
@@ -252,13 +262,28 @@ var SelectorResolver = /*#__PURE__*/function () {
       // This should eventually go away with something like @optional, where we only
       // suspend at specific boundaries depending on whether the boundary
       // can be fulfilled or not.
-      var promise = (_getPromiseForActiveR = getPromiseForActiveRequest(this._environment, this._selector.owner)) !== null && _getPromiseForActiveR !== void 0 ? _getPromiseForActiveR : this._environment.getOperationTracker().getPromiseForPendingOperationsAffectingOwner(this._selector.owner);
+      var pendingOperationsResult = getPendingOperationsForFragment(this._environment, this._selector.node, this._selector.owner);
+      var promise = pendingOperationsResult === null || pendingOperationsResult === void 0 ? void 0 : pendingOperationsResult.promise;
 
       if (promise != null) {
         if (this._rootIsQueryRenderer) {
           process.env.NODE_ENV !== "production" ? warning(false, 'Relay: Relay Container for fragment `%s` has missing data and ' + 'would suspend. When using features such as @defer or @module, ' + 'use `useFragment` instead of a Relay Container.', this._selector.node.name) : void 0;
         } else {
+          var _pendingOperationsRes;
+
+          var pendingOperations = (_pendingOperationsRes = pendingOperationsResult === null || pendingOperationsResult === void 0 ? void 0 : pendingOperationsResult.pendingOperations) !== null && _pendingOperationsRes !== void 0 ? _pendingOperationsRes : [];
           process.env.NODE_ENV !== "production" ? warning(false, 'Relay: Relay Container for fragment `%s` suspended. When using ' + 'features such as @defer or @module, use `useFragment` instead ' + 'of a Relay Container.', this._selector.node.name) : void 0;
+
+          this._environment.__log({
+            name: 'suspense.fragment',
+            data: this._data,
+            fragment: this._selector.node,
+            isRelayHooks: false,
+            isMissingData: this._isMissingData,
+            isPromiseCached: false,
+            pendingOperations: pendingOperations
+          });
+
           throw promise;
         }
       }
@@ -280,7 +305,7 @@ var SelectorResolver = /*#__PURE__*/function () {
 
     var snapshot = this._environment.lookup(selector);
 
-    this._data = snapshot.data;
+    this._data = recycleNodesInto(this._data, snapshot.data);
     this._isMissingData = snapshot.isMissingData;
     this._missingRequiredFields = snapshot.missingRequiredFields;
     this._selector = selector;
@@ -319,7 +344,7 @@ var SelectorResolver = /*#__PURE__*/function () {
 
 
 var SelectorListResolver = /*#__PURE__*/function () {
-  function SelectorListResolver(environment, rootIsQueryRenderer, selector, callback) {
+  function SelectorListResolver(environment, rootIsQueryRenderer, selector, subscribeOnConstruction, callback) {
     var _this3 = this;
 
     (0, _defineProperty2["default"])(this, "_onChange", function (data) {
@@ -333,6 +358,7 @@ var SelectorListResolver = /*#__PURE__*/function () {
     this._resolvers = [];
     this._stale = true;
     this._rootIsQueryRenderer = rootIsQueryRenderer;
+    this._subscribeOnConstruction = subscribeOnConstruction;
     this.setSelector(selector);
   }
 
@@ -384,7 +410,7 @@ var SelectorListResolver = /*#__PURE__*/function () {
       if (ii < this._resolvers.length) {
         this._resolvers[ii].setSelector(selectors[ii]);
       } else {
-        this._resolvers[ii] = new SelectorResolver(this._environment, this._rootIsQueryRenderer, selectors[ii], this._onChange);
+        this._resolvers[ii] = new SelectorResolver(this._environment, this._rootIsQueryRenderer, selectors[ii], this._subscribeOnConstruction, this._onChange);
       }
     }
 

package/lib/store/RelayModernRecord.js

@@ -18,7 +18,7 @@ var areEqual = require("fbjs/lib/areEqual");
 
 var deepFreeze = require('../util/deepFreeze');
 
-var invariant = require("fbjs/lib/invariant");
+var invariant = require('invariant');
 
 var warning = require("fbjs/lib/warning");
 
@@ -26,6 +26,7 @@ var _require = require('./ClientID'),
     isClientID = _require.isClientID;
 
 var _require2 = require('./RelayStoreUtils'),
+    ACTOR_IDENTIFIER_KEY = _require2.ACTOR_IDENTIFIER_KEY,
     ID_KEY = _require2.ID_KEY,
     REF_KEY = _require2.REF_KEY,
     REFS_KEY = _require2.REFS_KEY,
@@ -336,6 +337,37 @@ function setLinkedRecordIDs(record, storageKey, linkedIDs) {
   links[REFS_KEY] = linkedIDs;
   record[storageKey] = links;
 }
+/**
+ * @public
+ *
+ * Set the value of a field to a reference to another record in the actor specific store.
+ */
+
+
+function setActorLinkedRecordID(record, storageKey, actorIdentifier, linkedID) {
+  // See perf note above for why we aren't using computed property access.
+  var link = {};
+  link[REF_KEY] = linkedID;
+  link[ACTOR_IDENTIFIER_KEY] = actorIdentifier;
+  record[storageKey] = link;
+}
+/**
+ * @public
+ *
+ * Get link to a record and the actor identifier for the store.
+ */
+
+
+function getActorLinkedRecordID(record, storageKey) {
+  var link = record[storageKey];
+
+  if (link == null) {
+    return link;
+  }
+
+  !(typeof link === 'object' && typeof link[REF_KEY] === 'string' && link[ACTOR_IDENTIFIER_KEY] != null) ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayModernRecord.getActorLinkedRecordID(): Expected `%s.%s` to be an actor specific linked ID, ' + 'was `%s`.', record[ID_KEY], storageKey, JSON.stringify(link)) : invariant(false) : void 0;
+  return [link[ACTOR_IDENTIFIER_KEY], link[REF_KEY]];
+}
 
 module.exports = {
   clone: clone,
@@ -352,5 +384,7 @@ module.exports = {
   setValue: setValue,
   setLinkedRecordID: setLinkedRecordID,
   setLinkedRecordIDs: setLinkedRecordIDs,
-  update: update
+  update: update,
+  getActorLinkedRecordID: getActorLinkedRecordID,
+  setActorLinkedRecordID: setActorLinkedRecordID
 };

package/lib/store/RelayModernSelector.js

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

package/lib/store/RelayModernStore.js

@@ -24,8 +24,6 @@ var RelayModernRecord = require('./RelayModernRecord');
 
 var RelayOptimisticRecordSource = require('./RelayOptimisticRecordSource');
 
-var RelayProfiler = require('../util/RelayProfiler');
-
 var RelayReader = require('./RelayReader');
 
 var RelayReferenceMarker = require('./RelayReferenceMarker');
@@ -34,21 +32,26 @@ var RelayStoreReactFlightUtils = require('./RelayStoreReactFlightUtils');
 
 var RelayStoreSubscriptions = require('./RelayStoreSubscriptions');
 
-var RelayStoreSubscriptionsUsingMapByID = require('./RelayStoreSubscriptionsUsingMapByID');
-
 var RelayStoreUtils = require('./RelayStoreUtils');
 
 var deepFreeze = require('../util/deepFreeze');
 
 var defaultGetDataID = require('./defaultGetDataID');
 
-var invariant = require("fbjs/lib/invariant");
+var invariant = require('invariant');
 
 var resolveImmediate = require('../util/resolveImmediate');
 
-var _require = require('./RelayStoreUtils'),
-    ROOT_ID = _require.ROOT_ID,
-    ROOT_TYPE = _require.ROOT_TYPE;
+var _require = require('../multi-actor-environment/ActorIdentifier'),
+    INTERNAL_ACTOR_IDENTIFIER_DO_NOT_USE = _require.INTERNAL_ACTOR_IDENTIFIER_DO_NOT_USE,
+    assertInternalActorIndentifier = _require.assertInternalActorIndentifier;
+
+var _require2 = require('./RelayStoreUtils'),
+    ROOT_ID = _require2.ROOT_ID,
+    ROOT_TYPE = _require2.ROOT_TYPE;
+
+var _require3 = require('./ResolverCache'),
+    RecordResolverCache = _require3.RecordResolverCache;
 
 var DEFAULT_RELEASE_BUFFER_SIZE = 10;
 /**
@@ -110,8 +113,12 @@ var RelayModernStore = /*#__PURE__*/function () {
     this._releaseBuffer = [];
     this._roots = new Map();
     this._shouldScheduleGC = false;
-    this._storeSubscriptions = RelayFeatureFlags.ENABLE_STORE_SUBSCRIPTIONS_REFACTOR === true ? new RelayStoreSubscriptionsUsingMapByID(options === null || options === void 0 ? void 0 : options.log) : new RelayStoreSubscriptions(options === null || options === void 0 ? void 0 : options.log);
+    this._resolverCache = new RecordResolverCache(function () {
+      return _this._getMutableRecordSource();
+    });
+    this._storeSubscriptions = new RelayStoreSubscriptions(options === null || options === void 0 ? void 0 : options.log, this._resolverCache);
     this._updatedRecordIDs = new Set();
+    this._shouldProcessClientComponents = options === null || options === void 0 ? void 0 : options.shouldProcessClientComponents;
     initializeRecordSource(this._recordSource);
   }
 
@@ -123,11 +130,19 @@ var RelayModernStore = /*#__PURE__*/function () {
     return (_this$_optimisticSour = this._optimisticSource) !== null && _this$_optimisticSour !== void 0 ? _this$_optimisticSour : this._recordSource;
   };
 
+  _proto._getMutableRecordSource = function _getMutableRecordSource() {
+    var _this$_optimisticSour2;
+
+    return (_this$_optimisticSour2 = this._optimisticSource) !== null && _this$_optimisticSour2 !== void 0 ? _this$_optimisticSour2 : this._recordSource;
+  };
+
   _proto.check = function check(operation, options) {
-    var _this$_optimisticSour2, _options$target, _options$handlers;
+    var _options$handlers, _options$getSourceFor, _options$getTargetFor, _options$defaultActor;
 
     var selector = operation.root;
-    var source = (_this$_optimisticSour2 = this._optimisticSource) !== null && _this$_optimisticSour2 !== void 0 ? _this$_optimisticSour2 : this._recordSource;
+
+    var source = this._getMutableRecordSource();
+
     var globalInvalidationEpoch = this._globalInvalidationEpoch;
 
     var rootEntry = this._roots.get(operation.request.identifier);
@@ -136,7 +151,7 @@ var RelayModernStore = /*#__PURE__*/function () {
 
     if (globalInvalidationEpoch != null) {
       // If so, check if the operation we're checking was last written
-      // before or after invalidation occured.
+      // before or after invalidation occurred.
       if (operationLastWrittenAt == null || operationLastWrittenAt <= globalInvalidationEpoch) {
         // If the operation was written /before/ global invalidation occurred,
         // or if this operation has never been written to the store before,
@@ -148,9 +163,16 @@ var RelayModernStore = /*#__PURE__*/function () {
       }
     }
 
-    var target = (_options$target = options === null || options === void 0 ? void 0 : options.target) !== null && _options$target !== void 0 ? _options$target : source;
     var handlers = (_options$handlers = options === null || options === void 0 ? void 0 : options.handlers) !== null && _options$handlers !== void 0 ? _options$handlers : [];
-    var operationAvailability = DataChecker.check(source, target, selector, handlers, this._operationLoader, this._getDataID);
+    var getSourceForActor = (_options$getSourceFor = options === null || options === void 0 ? void 0 : options.getSourceForActor) !== null && _options$getSourceFor !== void 0 ? _options$getSourceFor : function (actorIdentifier) {
+      assertInternalActorIndentifier(actorIdentifier);
+      return source;
+    };
+    var getTargetForActor = (_options$getTargetFor = options === null || options === void 0 ? void 0 : options.getTargetForActor) !== null && _options$getTargetFor !== void 0 ? _options$getTargetFor : function (actorIdentifier) {
+      assertInternalActorIndentifier(actorIdentifier);
+      return source;
+    };
+    var operationAvailability = DataChecker.check(getSourceForActor, getTargetForActor, (_options$defaultActor = options === null || options === void 0 ? void 0 : options.defaultActorIdentifier) !== null && _options$defaultActor !== void 0 ? _options$defaultActor : INTERNAL_ACTOR_IDENTIFIER_DO_NOT_USE, selector, handlers, this._operationLoader, this._getDataID, this._shouldProcessClientComponents);
     return getAvailabilityStatus(operationAvailability, operationLastWrittenAt, rootEntry === null || rootEntry === void 0 ? void 0 : rootEntry.fetchTime, this._queryCacheExpirationTime);
   };
 
@@ -235,7 +257,7 @@ var RelayModernStore = /*#__PURE__*/function () {
 
   _proto.lookup = function lookup(selector) {
     var source = this.getSource();
-    var snapshot = RelayReader.read(source, selector);
+    var snapshot = RelayReader.read(source, selector, this._resolverCache);
 
     if (process.env.NODE_ENV !== "production") {
       deepFreeze(snapshot);
@@ -265,6 +287,14 @@ var RelayModernStore = /*#__PURE__*/function () {
       this._globalInvalidationEpoch = this._currentWriteEpoch;
     }
 
+    if (RelayFeatureFlags.ENABLE_RELAY_RESOLVERS) {
+      // When a record is updated, we need to also handle records that depend on it,
+      // specifically Relay Resolver result records containing results based on the
+      // updated records. This both adds to updatedRecordIDs and invalidates any
+      // cached data as needed.
+      this._resolverCache.invalidateDataIDs(this._updatedRecordIDs);
+    }
+
     var source = this.getSource();
     var updatedOwners = [];
 
@@ -323,9 +353,8 @@ var RelayModernStore = /*#__PURE__*/function () {
   };
 
   _proto.publish = function publish(source, idsMarkedForInvalidation) {
-    var _this$_optimisticSour3;
+    var target = this._getMutableRecordSource();
 
-    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.
@@ -376,6 +405,10 @@ var RelayModernStore = /*#__PURE__*/function () {
 
   _proto.toJSON = function toJSON() {
     return 'RelayModernStore()';
+  };
+
+  _proto.getEpoch = function getEpoch() {
+    return this._currentWriteEpoch;
   } // Internal API
   ;
 
@@ -549,7 +582,7 @@ var RelayModernStore = /*#__PURE__*/function () {
         for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
           var operation = _step2.value.operation;
           var selector = operation.root;
-          RelayReferenceMarker.mark(this._recordSource, selector, references, this._operationLoader); // Yield for other work after each operation
+          RelayReferenceMarker.mark(this._recordSource, selector, references, this._operationLoader, this._shouldProcessClientComponents); // Yield for other work after each operation
 
           yield; // If the store was updated, restart
 
@@ -647,7 +680,8 @@ function updateTargetFromSource(target, source, currentWriteEpoch, idsMarkedForI
       }
 
       RelayModernRecord.setValue(nextRecord, RelayStoreUtils.INVALIDATED_AT_KEY, currentWriteEpoch);
-      invalidatedRecordIDs.add(dataID);
+      invalidatedRecordIDs.add(dataID); // $FlowFixMe[incompatible-call]
+
       target.set(dataID, nextRecord);
     });
   } // Update the target based on the changes present in source
@@ -745,7 +779,4 @@ function getAvailabilityStatus(operationAvailability, operationLastWrittenAt, op
   };
 }
 
-RelayProfiler.instrumentMethods(RelayModernStore.prototype, {
-  lookup: 'RelayModernStore.prototype.lookup'
-});
 module.exports = RelayModernStore;

package/lib/store/RelayOperationTracker.js

@@ -14,13 +14,13 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 
 var _createForOfIteratorHelper2 = _interopRequireDefault(require("@babel/runtime/helpers/createForOfIteratorHelper"));
 
-var invariant = require("fbjs/lib/invariant");
+var invariant = require('invariant');
 
 var RelayOperationTracker = /*#__PURE__*/function () {
   function RelayOperationTracker() {
-    this._ownersToPendingOperationsIdentifier = new Map();
-    this._pendingOperationsToOwnersIdentifier = new Map();
-    this._ownersIdentifierToPromise = new Map();
+    this._ownersToPendingOperations = new Map();
+    this._pendingOperationsToOwners = new Map();
+    this._ownersToPendingPromise = new Map();
   }
   /**
    * Update the map of current processing operations with the set of
@@ -46,19 +46,19 @@ var RelayOperationTracker = /*#__PURE__*/function () {
         var owner = _step.value;
         var ownerIdentifier = owner.identifier;
 
-        var pendingOperationsAffectingOwner = this._ownersToPendingOperationsIdentifier.get(ownerIdentifier);
+        var pendingOperationsAffectingOwner = this._ownersToPendingOperations.get(ownerIdentifier);
 
         if (pendingOperationsAffectingOwner != null) {
           // In this case the `ownerIdentifier` already affected by some operations
           // We just need to detect, is it the same operation that we already
           // have in the list, or it's a new operation
           if (!pendingOperationsAffectingOwner.has(pendingOperationIdentifier)) {
-            pendingOperationsAffectingOwner.add(pendingOperationIdentifier);
+            pendingOperationsAffectingOwner.set(pendingOperationIdentifier, pendingOperation);
             newlyAffectedOwnersIdentifier.add(ownerIdentifier);
           }
         } else {
           // This is a new `ownerIdentifier` that is affected by the operation
-          this._ownersToPendingOperationsIdentifier.set(ownerIdentifier, new Set([pendingOperationIdentifier]));
+          this._ownersToPendingOperations.set(ownerIdentifier, new Map([[pendingOperationIdentifier, pendingOperation]]));
 
           newlyAffectedOwnersIdentifier.add(ownerIdentifier);
         }
@@ -73,10 +73,10 @@ var RelayOperationTracker = /*#__PURE__*/function () {
     if (newlyAffectedOwnersIdentifier.size === 0) {
       return;
     } // But, if some owners were affected we need to add them to
-    // the `_pendingOperationsToOwnersIdentifier` set
+    // the `_pendingOperationsToOwners` set
 
 
-    var ownersAffectedByOperationIdentifier = this._pendingOperationsToOwnersIdentifier.get(pendingOperationIdentifier) || new Set();
+    var ownersAffectedByPendingOperation = this._pendingOperationsToOwners.get(pendingOperationIdentifier) || new Set();
 
     var _iterator2 = (0, _createForOfIteratorHelper2["default"])(newlyAffectedOwnersIdentifier),
         _step2;
@@ -87,7 +87,7 @@ var RelayOperationTracker = /*#__PURE__*/function () {
 
         this._resolveOwnerResolvers(_ownerIdentifier);
 
-        ownersAffectedByOperationIdentifier.add(_ownerIdentifier);
+        ownersAffectedByPendingOperation.add(_ownerIdentifier);
       }
     } catch (err) {
       _iterator2.e(err);
@@ -95,7 +95,7 @@ var RelayOperationTracker = /*#__PURE__*/function () {
       _iterator2.f();
     }
 
-    this._pendingOperationsToOwnersIdentifier.set(pendingOperationIdentifier, ownersAffectedByOperationIdentifier);
+    this._pendingOperationsToOwners.set(pendingOperationIdentifier, ownersAffectedByPendingOperation);
   }
   /**
    * Once pending operation is completed we need to remove it
@@ -106,7 +106,7 @@ var RelayOperationTracker = /*#__PURE__*/function () {
   _proto.complete = function complete(pendingOperation) {
     var pendingOperationIdentifier = pendingOperation.identifier;
 
-    var affectedOwnersIdentifier = this._pendingOperationsToOwnersIdentifier.get(pendingOperationIdentifier);
+    var affectedOwnersIdentifier = this._pendingOperationsToOwners.get(pendingOperationIdentifier);
 
     if (affectedOwnersIdentifier == null) {
       return;
@@ -125,7 +125,7 @@ var RelayOperationTracker = /*#__PURE__*/function () {
       for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
         var ownerIdentifier = _step3.value;
 
-        var pendingOperationsAffectingOwner = this._ownersToPendingOperationsIdentifier.get(ownerIdentifier);
+        var pendingOperationsAffectingOwner = this._ownersToPendingOperations.get(ownerIdentifier);
 
         if (!pendingOperationsAffectingOwner) {
           continue;
@@ -155,7 +155,7 @@ var RelayOperationTracker = /*#__PURE__*/function () {
 
         this._resolveOwnerResolvers(_ownerIdentifier2);
 
-        this._ownersToPendingOperationsIdentifier["delete"](_ownerIdentifier2);
+        this._ownersToPendingOperations["delete"](_ownerIdentifier2);
       } // Update all ownerIdentifier that were updated by `pendingOperationIdentifier` but still
       // are affected by other operations
 
@@ -181,30 +181,35 @@ var RelayOperationTracker = /*#__PURE__*/function () {
       _iterator5.f();
     }
 
-    this._pendingOperationsToOwnersIdentifier["delete"](pendingOperationIdentifier);
+    this._pendingOperationsToOwners["delete"](pendingOperationIdentifier);
   };
 
   _proto._resolveOwnerResolvers = function _resolveOwnerResolvers(ownerIdentifier) {
-    var promiseEntry = this._ownersIdentifierToPromise.get(ownerIdentifier);
+    var promiseEntry = this._ownersToPendingPromise.get(ownerIdentifier);
 
     if (promiseEntry != null) {
       promiseEntry.resolve();
     }
 
-    this._ownersIdentifierToPromise["delete"](ownerIdentifier);
+    this._ownersToPendingPromise["delete"](ownerIdentifier);
   };
 
-  _proto.getPromiseForPendingOperationsAffectingOwner = function getPromiseForPendingOperationsAffectingOwner(owner) {
+  _proto.getPendingOperationsAffectingOwner = function getPendingOperationsAffectingOwner(owner) {
     var ownerIdentifier = owner.identifier;
 
-    if (!this._ownersToPendingOperationsIdentifier.has(ownerIdentifier)) {
+    var pendingOperationsForOwner = this._ownersToPendingOperations.get(ownerIdentifier);
+
+    if (pendingOperationsForOwner == null || pendingOperationsForOwner.size === 0) {
       return null;
     }
 
-    var cachedPromiseEntry = this._ownersIdentifierToPromise.get(ownerIdentifier);
+    var cachedPromiseEntry = this._ownersToPendingPromise.get(ownerIdentifier);
 
     if (cachedPromiseEntry != null) {
-      return cachedPromiseEntry.promise;
+      return {
+        promise: cachedPromiseEntry.promise,
+        pendingOperations: cachedPromiseEntry.pendingOperations
+      };
     }
 
     var resolve;
@@ -212,13 +217,18 @@ var RelayOperationTracker = /*#__PURE__*/function () {
       resolve = r;
     });
     !(resolve != null) ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayOperationTracker: Expected resolver to be defined. If you' + 'are seeing this, it is likely a bug in Relay.') : invariant(false) : void 0;
+    var pendingOperations = Array.from(pendingOperationsForOwner.values());
 
-    this._ownersIdentifierToPromise.set(ownerIdentifier, {
+    this._ownersToPendingPromise.set(ownerIdentifier, {
       promise: promise,
-      resolve: resolve
+      resolve: resolve,
+      pendingOperations: pendingOperations
     });
 
-    return promise;
+    return {
+      promise: promise,
+      pendingOperations: pendingOperations
+    };
   };
 
   return RelayOperationTracker;