relay-runtime 0.0.0-main-40e5218d → 0.0.0-main-4ceaefa5

package/experimental.js

@@ -1,5 +1,5 @@
 /**
- * Relay v0.0.0-main-40e5218d
+ * Relay v0.0.0-main-4ceaefa5
  *
  * Copyright (c) Meta Platforms, Inc. and affiliates.
  *

package/index.js

@@ -1,5 +1,5 @@
 /**
- * Relay v0.0.0-main-40e5218d
+ * Relay v0.0.0-main-4ceaefa5
  *
  * Copyright (c) Meta Platforms, Inc. and affiliates.
  *

package/lib/store/RelayModernSelector.js

@@ -3,11 +3,11 @@
 var _require = require('./RelayConcreteVariables'),
   getFragmentVariables = _require.getFragmentVariables;
 var _require2 = require('./RelayStoreUtils'),
-  CLIENT_EDGE_TRAVERSAL_PATH = _require2.CLIENT_EDGE_TRAVERSAL_PATH,
   FRAGMENT_OWNER_KEY = _require2.FRAGMENT_OWNER_KEY,
   FRAGMENT_POINTER_IS_WITHIN_UNMATCHED_TYPE_REFINEMENT = _require2.FRAGMENT_POINTER_IS_WITHIN_UNMATCHED_TYPE_REFINEMENT,
   FRAGMENTS_KEY = _require2.FRAGMENTS_KEY,
-  ID_KEY = _require2.ID_KEY;
+  ID_KEY = _require2.ID_KEY,
+  PARENT_CLIENT_EDGE = _require2.PARENT_CLIENT_EDGE;
 var areEqual = require("fbjs/lib/areEqual");
 var invariant = require('invariant');
 var warning = require("fbjs/lib/warning");
@@ -16,14 +16,14 @@ function getSingularSelector(fragment, item) {
   var dataID = item[ID_KEY];
   var fragments = item[FRAGMENTS_KEY];
   var mixedOwner = item[FRAGMENT_OWNER_KEY];
-  var mixedClientEdgeTraversalPath = item[CLIENT_EDGE_TRAVERSAL_PATH];
-  if (typeof dataID === 'string' && typeof fragments === 'object' && fragments !== null && typeof fragments[fragment.name] === 'object' && fragments[fragment.name] !== null && typeof mixedOwner === 'object' && mixedOwner !== null && (mixedClientEdgeTraversalPath == null || Array.isArray(mixedClientEdgeTraversalPath))) {
+  var mixedParentClientEdge = item[PARENT_CLIENT_EDGE];
+  if (typeof dataID === 'string' && typeof fragments === 'object' && fragments !== null && typeof fragments[fragment.name] === 'object' && fragments[fragment.name] !== null && typeof mixedOwner === 'object' && mixedOwner !== null && (mixedParentClientEdge == null || typeof mixedParentClientEdge === 'object')) {
     var owner = mixedOwner;
-    var clientEdgeTraversalPath = mixedClientEdgeTraversalPath;
+    var parentClientEdge = mixedParentClientEdge;
     var argumentVariables = fragments[fragment.name];
     var fragmentVariables = getFragmentVariables(fragment, owner.variables, argumentVariables);
     var isWithinUnmatchedTypeRefinement = argumentVariables[FRAGMENT_POINTER_IS_WITHIN_UNMATCHED_TYPE_REFINEMENT] === true;
-    return createReaderSelector(fragment, dataID, fragmentVariables, owner, isWithinUnmatchedTypeRefinement, clientEdgeTraversalPath);
+    return createReaderSelector(fragment, dataID, fragmentVariables, owner, isWithinUnmatchedTypeRefinement, parentClientEdge);
   }
   if (process.env.NODE_ENV !== "production") {
     var stringifiedItem = JSON.stringify(item);
@@ -160,7 +160,7 @@ function getVariablesFromPluralFragment(fragment, items) {
   return variables;
 }
 function areEqualSingularSelectors(thisSelector, thatSelector) {
-  return thisSelector.dataID === thatSelector.dataID && thisSelector.node === thatSelector.node && areEqual(thisSelector.variables, thatSelector.variables) && areEqualOwners(thisSelector.owner, thatSelector.owner) && thisSelector.isWithinUnmatchedTypeRefinement === thatSelector.isWithinUnmatchedTypeRefinement && areEqualClientEdgeTraversalPaths(thisSelector.clientEdgeTraversalPath, thatSelector.clientEdgeTraversalPath);
+  return thisSelector.dataID === thatSelector.dataID && thisSelector.node === thatSelector.node && areEqual(thisSelector.variables, thatSelector.variables) && areEqualOwners(thisSelector.owner, thatSelector.owner) && thisSelector.isWithinUnmatchedTypeRefinement === thatSelector.isWithinUnmatchedTypeRefinement && areEqualParentClientEdges(thisSelector.parentClientEdge, thatSelector.parentClientEdge);
 }
 function areEqualOwners(thisOwner, thatOwner) {
   if (thisOwner === thatOwner) {
@@ -169,25 +169,14 @@ function areEqualOwners(thisOwner, thatOwner) {
     return thisOwner.identifier === thatOwner.identifier && areEqual(thisOwner.cacheConfig, thatOwner.cacheConfig);
   }
 }
-function areEqualClientEdgeTraversalPaths(thisPath, thatPath) {
-  if (thisPath === thatPath) {
+function areEqualParentClientEdges(thisEdge, thatEdge) {
+  if (thisEdge === thatEdge) {
     return true;
   }
-  if (thisPath == null || thatPath == null || thisPath.length !== thatPath.length) {
+  if (thisEdge == null || thatEdge == null) {
     return false;
   }
-  var idx = thisPath.length;
-  while (idx--) {
-    var a = thisPath[idx];
-    var b = thatPath[idx];
-    if (a === b) {
-      continue;
-    }
-    if (a == null || b == null || a.clientEdgeDestinationID !== b.clientEdgeDestinationID || a.readerClientEdge !== b.readerClientEdge) {
-      return false;
-    }
-  }
-  return true;
+  return thisEdge.clientEdgeDestinationID === thatEdge.clientEdgeDestinationID && thisEdge.readerClientEdge === thatEdge.readerClientEdge;
 }
 function areEqualSelectors(a, b) {
   if (a === b) {
@@ -208,9 +197,9 @@ function areEqualSelectors(a, b) {
 }
 function createReaderSelector(fragment, dataID, variables, request) {
   var isWithinUnmatchedTypeRefinement = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
-  var clientEdgeTraversalPath = arguments.length > 5 ? arguments[5] : undefined;
+  var parentClientEdge = arguments.length > 5 ? arguments[5] : undefined;
   return {
-    clientEdgeTraversalPath: clientEdgeTraversalPath !== null && clientEdgeTraversalPath !== void 0 ? clientEdgeTraversalPath : null,
+    parentClientEdge: parentClientEdge !== null && parentClientEdge !== void 0 ? parentClientEdge : null,
     dataID: dataID,
     isWithinUnmatchedTypeRefinement: isWithinUnmatchedTypeRefinement,
     kind: 'SingularReaderSelector',

package/lib/store/RelayReader.js

@@ -4,7 +4,6 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _excluded = ["message"];
 var RelayFeatureFlags = require('../util/RelayFeatureFlags');
 var _require = require('./live-resolvers/LiveResolverSuspenseSentinel'),
@@ -12,13 +11,13 @@ var _require = require('./live-resolvers/LiveResolverSuspenseSentinel'),
 var RelayConcreteVariables = require('./RelayConcreteVariables');
 var RelayModernRecord = require('./RelayModernRecord');
 var _require2 = require('./RelayStoreUtils'),
-  CLIENT_EDGE_TRAVERSAL_PATH = _require2.CLIENT_EDGE_TRAVERSAL_PATH,
   FIELD_GRANULAR_NOTIFICATIONS_KEY = _require2.FIELD_GRANULAR_NOTIFICATIONS_KEY,
   FRAGMENT_OWNER_KEY = _require2.FRAGMENT_OWNER_KEY,
   FRAGMENT_PROP_NAME_KEY = _require2.FRAGMENT_PROP_NAME_KEY,
   FRAGMENTS_KEY = _require2.FRAGMENTS_KEY,
   ID_KEY = _require2.ID_KEY,
   MODULE_COMPONENT_KEY = _require2.MODULE_COMPONENT_KEY,
+  PARENT_CLIENT_EDGE = _require2.PARENT_CLIENT_EDGE,
   ROOT_ID = _require2.ROOT_ID,
   getArgumentValues = _require2.getArgumentValues,
   getFieldNotificationKey = _require2.getFieldNotificationKey,
@@ -38,8 +37,8 @@ function read(recordSource, selector, log, resolverCache, resolverContext) {
 }
 var RelayReader = /*#__PURE__*/function () {
   function RelayReader(recordSource, selector, log, resolverCache, resolverContext) {
-    var _selector$clientEdgeT, _ref, _this$_owner$node$ope, _this$_owner$node$ope2;
-    this._clientEdgeTraversalPath = (_selector$clientEdgeT = selector.clientEdgeTraversalPath) !== null && _selector$clientEdgeT !== void 0 && _selector$clientEdgeT.length ? (0, _toConsumableArray2["default"])(selector.clientEdgeTraversalPath) : [];
+    var _ref, _this$_owner$node$ope, _this$_owner$node$ope2;
+    this._parentClientEdge = selector.parentClientEdge;
     this._missingClientEdges = [];
     this._missingLiveResolverFields = [];
     this._isMissingData = false;
@@ -151,14 +150,11 @@ var RelayReader = /*#__PURE__*/function () {
       uiContext: undefined
     });
     this._isMissingData = true;
-    if (this._clientEdgeTraversalPath.length) {
-      var top = this._clientEdgeTraversalPath[this._clientEdgeTraversalPath.length - 1];
-      if (top !== null) {
-        this._missingClientEdges.push({
-          clientEdgeDestinationID: top.clientEdgeDestinationID,
-          request: top.readerClientEdge.operation
-        });
-      }
+    if (this._parentClientEdge !== null) {
+      this._missingClientEdges.push({
+        clientEdgeDestinationID: this._parentClientEdge.clientEdgeDestinationID,
+        request: this._parentClientEdge.readerClientEdge.operation
+      });
     }
   };
   _proto._traverse = function _traverse(node, dataID, prevData) {
@@ -403,10 +399,11 @@ var RelayReader = /*#__PURE__*/function () {
           {
             var isMissingData = this._isMissingData;
             var alreadyMissingClientEdges = this._missingClientEdges.length;
-            this._clientEdgeTraversalPath.push(null);
+            var prevParentClientEdge = this._parentClientEdge;
+            this._parentClientEdge = null;
             var _hasExpectedData2 = this._traverseSelections(selection.selections, record, data);
             this._isMissingData = isMissingData || this._missingClientEdges.length > alreadyMissingClientEdges || this._missingLiveResolverFields.length > 0;
-            this._clientEdgeTraversalPath.pop();
+            this._parentClientEdge = prevParentClientEdge;
             if (!_hasExpectedData2) {
               return false;
             }
@@ -518,8 +515,8 @@ var RelayReader = /*#__PURE__*/function () {
           __fragments: (0, _defineProperty2["default"])({}, fragment.name, fragment.args ? getArgumentValues(fragment.args, _this._variables) : {}),
           __id: parentRecordID
         };
-        if (_this._clientEdgeTraversalPath.length > 0 && _this._clientEdgeTraversalPath[_this._clientEdgeTraversalPath.length - 1] !== null) {
-          key[CLIENT_EDGE_TRAVERSAL_PATH] = (0, _toConsumableArray2["default"])(_this._clientEdgeTraversalPath);
+        if (_this._parentClientEdge !== null) {
+          key[PARENT_CLIENT_EDGE] = _this._parentClientEdge;
         }
         var resolverContext = {
           getDataForResolverFragment: getDataForResolverFragment
@@ -659,9 +656,10 @@ var RelayReader = /*#__PURE__*/function () {
           return extractIdFromResponse(obj, backingField.path, _this3._owner.identifier);
         });
       }
-      this._clientEdgeTraversalPath.push(null);
+      var prevParentClientEdge = this._parentClientEdge;
+      this._parentClientEdge = null;
       var edgeValues = this._readLinkedIds(field.linkedField, storeIDs, record, data);
-      this._clientEdgeTraversalPath.pop();
+      this._parentClientEdge = prevParentClientEdge;
       data[fieldName] = edgeValues;
       return edgeValues;
     } else {
@@ -714,14 +712,15 @@ var RelayReader = /*#__PURE__*/function () {
           readerClientEdge: field
         };
       }
-      this._clientEdgeTraversalPath.push(traversalPathSegment);
+      var _prevParentClientEdge = this._parentClientEdge;
+      this._parentClientEdge = traversalPathSegment;
       var prevData = data[fieldName];
       !(prevData == null || typeof prevData === 'object') ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayReader(): Expected data for field at `%s` in `%s` on record `%s` ' + 'to be an object, got `%s`.', backingField.path, this._owner.identifier, RelayModernRecord.getDataID(record), prevData) : invariant(false) : void 0;
       var prevErrors = this._fieldErrors;
       this._fieldErrors = null;
       var edgeValue = this._traverse(field.linkedField, storeID, prevData);
       this._prependPreviousErrors(prevErrors, fieldName);
-      this._clientEdgeTraversalPath.pop();
+      this._parentClientEdge = _prevParentClientEdge;
       data[fieldName] = edgeValue;
       return edgeValue;
     }
@@ -942,8 +941,8 @@ var RelayReader = /*#__PURE__*/function () {
     var args = getArgumentValues(fragmentSpread.args, this._variables, this._isWithinUnmatchedTypeRefinement);
     fragmentPointers[fragmentSpread.name] = args;
     data[FRAGMENT_OWNER_KEY] = this._owner;
-    if (this._clientEdgeTraversalPath.length > 0 && this._clientEdgeTraversalPath[this._clientEdgeTraversalPath.length - 1] !== null) {
-      data[CLIENT_EDGE_TRAVERSAL_PATH] = (0, _toConsumableArray2["default"])(this._clientEdgeTraversalPath);
+    if (this._parentClientEdge !== null) {
+      data[PARENT_CLIENT_EDGE] = this._parentClientEdge;
     }
     if (RelayFeatureFlags.ENABLE_READER_FRAGMENTS_LOGGING) {
       var _this$_log2;

package/lib/store/RelayStoreUtils.js

@@ -132,7 +132,7 @@ function getFieldNotificationKey(dataID, storageKey) {
 }
 var RelayStoreUtils = {
   ACTOR_IDENTIFIER_KEY: '__actorIdentifier',
-  CLIENT_EDGE_TRAVERSAL_PATH: '__clientEdgeTraversalPath',
+  PARENT_CLIENT_EDGE: '__parentClientEdge',
   FRAGMENTS_KEY: '__fragments',
   FRAGMENT_OWNER_KEY: '__fragmentOwner',
   FRAGMENT_POINTER_IS_WITHIN_UNMATCHED_TYPE_REFINEMENT: '$isWithinUnmatchedTypeRefinement',

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "relay-runtime",
   "description": "A core runtime for building GraphQL-driven applications.",
-  "version": "0.0.0-main-40e5218d",
+  "version": "0.0.0-main-4ceaefa5",
   "keywords": [
     "graphql",
     "relay"

package/store/RelayModernSelector.js.flow

@@ -15,7 +15,7 @@ import type {NormalizationSelectableNode} from '../util/NormalizationNode';
 import type {ReaderFragment} from '../util/ReaderNode';
 import type {DataID, Variables} from '../util/RelayRuntimeTypes';
 import type {
-  ClientEdgeTraversalPath,
+  ClientEdgeTraversalInfo,
   NormalizationSelector,
   PluralReaderSelector,
   ReaderSelector,
@@ -25,11 +25,11 @@ import type {
 
 const {getFragmentVariables} = require('./RelayConcreteVariables');
 const {
-  CLIENT_EDGE_TRAVERSAL_PATH,
   FRAGMENT_OWNER_KEY,
   FRAGMENT_POINTER_IS_WITHIN_UNMATCHED_TYPE_REFINEMENT,
   FRAGMENTS_KEY,
   ID_KEY,
+  PARENT_CLIENT_EDGE,
 } = require('./RelayStoreUtils');
 const areEqual = require('areEqual');
 const invariant = require('invariant');
@@ -78,7 +78,7 @@ function getSingularSelector(
   const dataID = item[ID_KEY];
   const fragments = item[FRAGMENTS_KEY];
   const mixedOwner = item[FRAGMENT_OWNER_KEY];
-  const mixedClientEdgeTraversalPath = item[CLIENT_EDGE_TRAVERSAL_PATH];
+  const mixedParentClientEdge = item[PARENT_CLIENT_EDGE];
   if (
     typeof dataID === 'string' &&
     typeof fragments === 'object' &&
@@ -87,12 +87,11 @@ function getSingularSelector(
     fragments[fragment.name] !== null &&
     typeof mixedOwner === 'object' &&
     mixedOwner !== null &&
-    (mixedClientEdgeTraversalPath == null ||
-      Array.isArray(mixedClientEdgeTraversalPath))
+    (mixedParentClientEdge == null || typeof mixedParentClientEdge === 'object')
   ) {
     const owner: RequestDescriptor = mixedOwner as $FlowFixMe;
-    const clientEdgeTraversalPath: ?ClientEdgeTraversalPath =
-      mixedClientEdgeTraversalPath as $FlowFixMe;
+    const parentClientEdge: ?ClientEdgeTraversalInfo =
+      mixedParentClientEdge as $FlowFixMe;
 
     const argumentVariables = fragments[fragment.name];
     const fragmentVariables = getFragmentVariables(
@@ -112,7 +111,7 @@ function getSingularSelector(
       fragmentVariables,
       owner,
       isWithinUnmatchedTypeRefinement,
-      clientEdgeTraversalPath,
+      parentClientEdge,
     );
   }
 
@@ -417,9 +416,9 @@ function areEqualSingularSelectors(
     areEqualOwners(thisSelector.owner, thatSelector.owner) &&
     thisSelector.isWithinUnmatchedTypeRefinement ===
       thatSelector.isWithinUnmatchedTypeRefinement &&
-    areEqualClientEdgeTraversalPaths(
-      thisSelector.clientEdgeTraversalPath,
-      thatSelector.clientEdgeTraversalPath,
+    areEqualParentClientEdges(
+      thisSelector.parentClientEdge,
+      thatSelector.parentClientEdge,
     )
   );
 }
@@ -442,37 +441,20 @@ function areEqualOwners(
   }
 }
 
-function areEqualClientEdgeTraversalPaths(
-  thisPath: ClientEdgeTraversalPath | null,
-  thatPath: ClientEdgeTraversalPath | null,
+function areEqualParentClientEdges(
+  thisEdge: ClientEdgeTraversalInfo | null,
+  thatEdge: ClientEdgeTraversalInfo | null,
 ): boolean {
-  if (thisPath === thatPath) {
+  if (thisEdge === thatEdge) {
     return true;
   }
-  if (
-    thisPath == null ||
-    thatPath == null ||
-    thisPath.length !== thatPath.length
-  ) {
+  if (thisEdge == null || thatEdge == null) {
     return false;
   }
-  let idx = thisPath.length;
-  while (idx--) {
-    const a = thisPath[idx];
-    const b = thatPath[idx];
-    if (a === b) {
-      continue;
-    }
-    if (
-      a == null ||
-      b == null ||
-      a.clientEdgeDestinationID !== b.clientEdgeDestinationID ||
-      a.readerClientEdge !== b.readerClientEdge
-    ) {
-      return false;
-    }
-  }
-  return true;
+  return (
+    thisEdge.clientEdgeDestinationID === thatEdge.clientEdgeDestinationID &&
+    thisEdge.readerClientEdge === thatEdge.readerClientEdge
+  );
 }
 
 /**
@@ -516,10 +498,10 @@ function createReaderSelector(
   variables: Variables,
   request: RequestDescriptor,
   isWithinUnmatchedTypeRefinement: boolean = false,
-  clientEdgeTraversalPath: ?ClientEdgeTraversalPath,
+  parentClientEdge: ?ClientEdgeTraversalInfo,
 ): SingularReaderSelector {
   return {
-    clientEdgeTraversalPath: clientEdgeTraversalPath ?? null,
+    parentClientEdge: parentClientEdge ?? null,
     dataID,
     isWithinUnmatchedTypeRefinement,
     kind: 'SingularReaderSelector',

package/store/RelayReader.js.flow

@@ -57,13 +57,13 @@ const {
 const RelayConcreteVariables = require('./RelayConcreteVariables');
 const RelayModernRecord = require('./RelayModernRecord');
 const {
-  CLIENT_EDGE_TRAVERSAL_PATH,
   FIELD_GRANULAR_NOTIFICATIONS_KEY,
   FRAGMENT_OWNER_KEY,
   FRAGMENT_PROP_NAME_KEY,
   FRAGMENTS_KEY,
   ID_KEY,
   MODULE_COMPONENT_KEY,
+  PARENT_CLIENT_EDGE,
   ROOT_ID,
   getArgumentValues,
   getFieldNotificationKey,
@@ -99,7 +99,7 @@ function read(
  * @private
  */
 class RelayReader {
-  _clientEdgeTraversalPath: Array<ClientEdgeTraversalInfo | null>;
+  _parentClientEdge: ClientEdgeTraversalInfo | null;
   _isMissingData: boolean;
   _missingClientEdges: Array<MissingClientEdgeRequestInfo>;
   _missingLiveResolverFields: Array<DataID>;
@@ -133,9 +133,7 @@ class RelayReader {
     resolverCache: ResolverCache,
     resolverContext: ?ResolverContext,
   ) {
-    this._clientEdgeTraversalPath = selector.clientEdgeTraversalPath?.length
-      ? [...selector.clientEdgeTraversalPath]
-      : [];
+    this._parentClientEdge = selector.parentClientEdge;
     this._missingClientEdges = [];
     this._missingLiveResolverFields = [];
     this._isMissingData = false;
@@ -295,18 +293,14 @@ class RelayReader {
 
     this._isMissingData = true;
 
-    if (this._clientEdgeTraversalPath.length) {
-      const top =
-        this._clientEdgeTraversalPath[this._clientEdgeTraversalPath.length - 1];
-      // Top can be null if we've traversed past a client edge into an ordinary
-      // client extension field; we never want to fetch in response to missing
-      // data off of a client extension field.
-      if (top !== null) {
-        this._missingClientEdges.push({
-          clientEdgeDestinationID: top.clientEdgeDestinationID,
-          request: top.readerClientEdge.operation,
-        });
-      }
+    // _parentClientEdge is null when not inside a fetchable client edge (e.g.
+    // inside a client extension field); we never want to fetch in response to
+    // missing data off of a client extension field.
+    if (this._parentClientEdge !== null) {
+      this._missingClientEdges.push({
+        clientEdgeDestinationID: this._parentClientEdge.clientEdgeDestinationID,
+        request: this._parentClientEdge.readerClientEdge.operation,
+      });
     }
   }
 
@@ -685,7 +679,8 @@ class RelayReader {
         case 'ClientExtension': {
           const isMissingData = this._isMissingData;
           const alreadyMissingClientEdges = this._missingClientEdges.length;
-          this._clientEdgeTraversalPath.push(null);
+          const prevParentClientEdge = this._parentClientEdge;
+          this._parentClientEdge = null;
           const hasExpectedData = this._traverseSelections(
             selection.selections,
             record,
@@ -698,7 +693,7 @@ class RelayReader {
             isMissingData ||
             this._missingClientEdges.length > alreadyMissingClientEdges ||
             this._missingLiveResolverFields.length > 0;
-          this._clientEdgeTraversalPath.pop();
+          this._parentClientEdge = prevParentClientEdge;
           if (!hasExpectedData) {
             return false;
           }
@@ -882,13 +877,8 @@ class RelayReader {
           },
           __id: parentRecordID,
         };
-        if (
-          this._clientEdgeTraversalPath.length > 0 &&
-          this._clientEdgeTraversalPath[
-            this._clientEdgeTraversalPath.length - 1
-          ] !== null
-        ) {
-          key[CLIENT_EDGE_TRAVERSAL_PATH] = [...this._clientEdgeTraversalPath];
+        if (this._parentClientEdge !== null) {
+          key[PARENT_CLIENT_EDGE] = this._parentClientEdge;
         }
         const resolverContext = {getDataForResolverFragment};
         // $FlowFixMe[incompatible-type]
@@ -1134,14 +1124,15 @@ class RelayReader {
           extractIdFromResponse(obj, backingField.path, this._owner.identifier),
         );
       }
-      this._clientEdgeTraversalPath.push(null);
+      const prevParentClientEdge = this._parentClientEdge;
+      this._parentClientEdge = null;
       const edgeValues = this._readLinkedIds(
         field.linkedField,
         storeIDs,
         record,
         data,
       );
-      this._clientEdgeTraversalPath.pop();
+      this._parentClientEdge = prevParentClientEdge;
       data[fieldName] = edgeValues;
       return edgeValues;
     } else {
@@ -1217,7 +1208,8 @@ class RelayReader {
           readerClientEdge: field,
         };
       }
-      this._clientEdgeTraversalPath.push(traversalPathSegment);
+      const prevParentClientEdge = this._parentClientEdge;
+      this._parentClientEdge = traversalPathSegment;
 
       const prevData = data[fieldName];
       invariant(
@@ -1238,7 +1230,7 @@ class RelayReader {
         prevData,
       );
       this._prependPreviousErrors(prevErrors, fieldName);
-      this._clientEdgeTraversalPath.pop();
+      this._parentClientEdge = prevParentClientEdge;
       data[fieldName] = edgeValue;
       return edgeValue;
     }
@@ -1719,13 +1711,8 @@ class RelayReader {
     fragmentPointers[fragmentSpread.name] = args;
     data[FRAGMENT_OWNER_KEY] = this._owner;
 
-    if (
-      this._clientEdgeTraversalPath.length > 0 &&
-      this._clientEdgeTraversalPath[
-        this._clientEdgeTraversalPath.length - 1
-      ] !== null
-    ) {
-      data[CLIENT_EDGE_TRAVERSAL_PATH] = [...this._clientEdgeTraversalPath];
+    if (this._parentClientEdge !== null) {
+      data[PARENT_CLIENT_EDGE] = this._parentClientEdge;
     }
 
     if (RelayFeatureFlags.ENABLE_READER_FRAGMENTS_LOGGING) {

package/store/RelayStoreTypes.js.flow

@@ -78,7 +78,7 @@ export type SingularReaderSelector = {
   readonly kind: 'SingularReaderSelector',
   readonly dataID: DataID,
   readonly isWithinUnmatchedTypeRefinement: boolean,
-  readonly clientEdgeTraversalPath: ClientEdgeTraversalPath | null,
+  readonly parentClientEdge: ClientEdgeTraversalInfo | null,
   readonly node: ReaderFragment,
   readonly owner: RequestDescriptor,
   readonly variables: Variables,
@@ -128,9 +128,6 @@ export type ClientEdgeTraversalInfo = {
   readonly clientEdgeDestinationID: DataID,
 };
 
-export type ClientEdgeTraversalPath =
-  ReadonlyArray<ClientEdgeTraversalInfo | null>;
-
 export type MissingClientEdgeRequestInfo = {
   readonly request: ConcreteRequest,
   readonly clientEdgeDestinationID: DataID,

package/store/RelayStoreUtils.js.flow

@@ -283,7 +283,7 @@ function getFieldNotificationKey(dataID: string, storageKey: string): string {
  */
 const RelayStoreUtils = {
   ACTOR_IDENTIFIER_KEY: '__actorIdentifier',
-  CLIENT_EDGE_TRAVERSAL_PATH: '__clientEdgeTraversalPath',
+  PARENT_CLIENT_EDGE: '__parentClientEdge',
   FRAGMENTS_KEY: '__fragments',
   FRAGMENT_OWNER_KEY: '__fragmentOwner',
   FRAGMENT_POINTER_IS_WITHIN_UNMATCHED_TYPE_REFINEMENT: