relay-runtime 20.1.1 → 21.0.1

package/lib/store/RelayReader.js

@@ -13,6 +13,7 @@ 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,
@@ -20,6 +21,7 @@ var _require2 = require('./RelayStoreUtils'),
   MODULE_COMPONENT_KEY = _require2.MODULE_COMPONENT_KEY,
   ROOT_ID = _require2.ROOT_ID,
   getArgumentValues = _require2.getArgumentValues,
+  getFieldNotificationKey = _require2.getFieldNotificationKey,
   getModuleComponentKey = _require2.getModuleComponentKey,
   getStorageKey = _require2.getStorageKey;
 var _require3 = require('./ResolverCache'),
@@ -30,12 +32,12 @@ var _require4 = require('./ResolverFragments'),
 var _require5 = require('./TypeID'),
   generateTypeID = _require5.generateTypeID;
 var invariant = require('invariant');
-function read(recordSource, selector, resolverCache, resolverContext) {
-  var reader = new RelayReader(recordSource, selector, resolverCache !== null && resolverCache !== void 0 ? resolverCache : new NoopResolverCache(), resolverContext);
+function read(recordSource, selector, log, resolverCache, resolverContext) {
+  var reader = new RelayReader(recordSource, selector, log, resolverCache !== null && resolverCache !== void 0 ? resolverCache : new NoopResolverCache(), resolverContext);
   return reader.read();
 }
 var RelayReader = /*#__PURE__*/function () {
-  function RelayReader(recordSource, selector, resolverCache, resolverContext) {
+  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) : [];
     this._missingClientEdges = [];
@@ -43,6 +45,7 @@ var RelayReader = /*#__PURE__*/function () {
     this._isMissingData = false;
     this._isWithinUnmatchedTypeRefinement = false;
     this._fieldErrors = null;
+    this._fieldGranularNotificationDataID = null;
     this._owner = selector.owner;
     this._useExecTimeResolvers = (_ref = (_this$_owner$node$ope = this._owner.node.operation.use_exec_time_resolvers) !== null && _this$_owner$node$ope !== void 0 ? _this$_owner$node$ope : ((_this$_owner$node$ope2 = this._owner.node.operation.exec_time_resolvers_enabled_provider) === null || _this$_owner$node$ope2 === void 0 ? void 0 : _this$_owner$node$ope2.get()) === true) !== null && _ref !== void 0 ? _ref : false;
     this._recordSource = recordSource;
@@ -53,6 +56,7 @@ var RelayReader = /*#__PURE__*/function () {
     this._fragmentName = selector.node.name;
     this._updatedDataIDs = new Set();
     this._resolverContext = resolverContext;
+    this._log = log;
   }
   var _proto = RelayReader.prototype;
   _proto.read = function read() {
@@ -85,14 +89,21 @@ var RelayReader = /*#__PURE__*/function () {
       this._resolverCache.notifyUpdatedSubscribers(this._updatedDataIDs);
       this._updatedDataIDs.clear();
     }
+    if (RelayFeatureFlags.ENABLE_READER_FRAGMENTS_LOGGING) {
+      var _this$_log;
+      (_this$_log = this._log) === null || _this$_log === void 0 ? void 0 : _this$_log.call(this, {
+        name: 'reader.read',
+        selector: this._selector
+      });
+    }
     return {
       data: data,
+      fieldErrors: this._fieldErrors,
       isMissingData: this._isMissingData && isDataExpectedToBePresent,
       missingClientEdges: this._missingClientEdges.length ? this._missingClientEdges : null,
       missingLiveResolverFields: this._missingLiveResolverFields,
       seenRecords: this._seenRecords,
-      selector: this._selector,
-      fieldErrors: this._fieldErrors
+      selector: this._selector
     };
   };
   _proto._maybeAddFieldErrors = function _maybeAddFieldErrors(record, storageKey) {
@@ -108,12 +119,12 @@ var RelayReader = /*#__PURE__*/function () {
       var _error$path, _this$_selector$node$2, _this$_selector$node$3;
       var error = errors[i];
       this._fieldErrors.push({
+        error: error,
+        fieldPath: ((_error$path = error.path) !== null && _error$path !== void 0 ? _error$path : []).join('.'),
+        handled: false,
         kind: 'relay_field_payload.error',
         owner: owner,
-        fieldPath: ((_error$path = error.path) !== null && _error$path !== void 0 ? _error$path : []).join('.'),
-        error: error,
         shouldThrow: (_this$_selector$node$2 = (_this$_selector$node$3 = this._selector.node.metadata) === null || _this$_selector$node$3 === void 0 ? void 0 : _this$_selector$node$3.throwOnFieldError) !== null && _this$_selector$node$2 !== void 0 ? _this$_selector$node$2 : false,
-        handled: false,
         uiContext: undefined
       });
     }
@@ -128,15 +139,15 @@ var RelayReader = /*#__PURE__*/function () {
     }
     var owner = this._fragmentName;
     this._fieldErrors.push(((_this$_selector$node$4 = (_this$_selector$node$5 = this._selector.node.metadata) === null || _this$_selector$node$5 === void 0 ? void 0 : _this$_selector$node$5.throwOnFieldError) !== null && _this$_selector$node$4 !== void 0 ? _this$_selector$node$4 : false) ? {
-      kind: 'missing_expected_data.throw',
-      owner: owner,
       fieldPath: fieldName,
       handled: false,
+      kind: 'missing_expected_data.throw',
+      owner: owner,
       uiContext: undefined
     } : {
+      fieldPath: fieldName,
       kind: 'missing_expected_data.log',
       owner: owner,
-      fieldPath: fieldName,
       uiContext: undefined
     });
     this._isMissingData = true;
@@ -144,23 +155,31 @@ var RelayReader = /*#__PURE__*/function () {
       var top = this._clientEdgeTraversalPath[this._clientEdgeTraversalPath.length - 1];
       if (top !== null) {
         this._missingClientEdges.push({
-          request: top.readerClientEdge.operation,
-          clientEdgeDestinationID: top.clientEdgeDestinationID
+          clientEdgeDestinationID: top.clientEdgeDestinationID,
+          request: top.readerClientEdge.operation
         });
       }
     }
   };
   _proto._traverse = function _traverse(node, dataID, prevData) {
     var record = this._recordSource.get(dataID);
-    this._seenRecords.add(dataID);
+    var prevFieldGranularDataID = this._fieldGranularNotificationDataID;
+    if (record != null && RelayModernRecord.getValue(record, FIELD_GRANULAR_NOTIFICATIONS_KEY)) {
+      this._fieldGranularNotificationDataID = dataID;
+    } else {
+      this._seenRecords.add(dataID);
+      this._fieldGranularNotificationDataID = null;
+    }
     if (record == null) {
       if (record === undefined) {
         this._markDataAsMissing('<record>');
       }
+      this._fieldGranularNotificationDataID = prevFieldGranularDataID;
       return record;
     }
     var data = prevData || {};
     var hadRequiredData = this._traverseSelections(node.selections, record, data);
+    this._fieldGranularNotificationDataID = prevFieldGranularDataID;
     return hadRequiredData ? data : null;
   };
   _proto._getVariableValue = function _getVariableValue(name) {
@@ -186,17 +205,17 @@ var RelayReader = /*#__PURE__*/function () {
     switch (selection.action) {
       case 'THROW':
         this._fieldErrors.push({
-          kind: 'missing_required_field.throw',
           fieldPath: fieldName,
-          owner: owner,
           handled: false,
+          kind: 'missing_required_field.throw',
+          owner: owner,
           uiContext: undefined
         });
         return;
       case 'LOG':
         this._fieldErrors.push({
-          kind: 'missing_required_field.log',
           fieldPath: fieldName,
+          kind: 'missing_required_field.log',
           owner: owner,
           uiContext: undefined
         });
@@ -273,8 +292,8 @@ var RelayReader = /*#__PURE__*/function () {
       }
     }).filter(Boolean);
     return {
-      ok: false,
-      errors: errors
+      errors: errors,
+      ok: false
     };
   };
   _proto._traverseSelections = function _traverseSelections(selections, record, data) {
@@ -452,23 +471,23 @@ var RelayReader = /*#__PURE__*/function () {
       if (snapshot != null) {
         return {
           data: snapshot.data,
-          isMissingData: snapshot.isMissingData,
-          fieldErrors: snapshot.fieldErrors
+          fieldErrors: snapshot.fieldErrors,
+          isMissingData: snapshot.isMissingData
         };
       }
-      snapshot = read(_this._recordSource, singularReaderSelector, _this._resolverCache);
+      snapshot = read(_this._recordSource, singularReaderSelector, null, _this._resolverCache, undefined);
       return {
         data: snapshot.data,
-        isMissingData: snapshot.isMissingData,
-        fieldErrors: snapshot.fieldErrors
+        fieldErrors: snapshot.fieldErrors,
+        isMissingData: snapshot.isMissingData
       };
     };
     var evaluate = function evaluate() {
       if (fragment != null) {
         var key = {
-          __id: parentRecordID,
           __fragmentOwner: _this._owner,
-          __fragments: (0, _defineProperty2["default"])({}, fragment.name, fragment.args ? getArgumentValues(fragment.args, _this._variables) : {})
+          __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);
@@ -481,9 +500,9 @@ var RelayReader = /*#__PURE__*/function () {
             resolverResult = _getResolverValue[0],
             resolverError = _getResolverValue[1];
           return {
+            error: resolverError,
             resolverResult: resolverResult,
-            snapshot: snapshot,
-            error: resolverError
+            snapshot: snapshot
           };
         });
       } else {
@@ -491,9 +510,9 @@ var RelayReader = /*#__PURE__*/function () {
           resolverResult = _getResolverValue2[0],
           _resolverError = _getResolverValue2[1];
         return {
+          error: _resolverError,
           resolverResult: resolverResult,
-          snapshot: undefined,
-          error: _resolverError
+          snapshot: undefined
         };
       }
     };
@@ -542,12 +561,12 @@ var RelayReader = /*#__PURE__*/function () {
     if (resolverError) {
       var _this$_selector$node$7, _this$_selector$node$8;
       var errorEvent = {
-        kind: 'relay_resolver.error',
+        error: resolverError,
         fieldPath: fieldPath,
+        handled: false,
+        kind: 'relay_resolver.error',
         owner: this._fragmentName,
-        error: resolverError,
         shouldThrow: (_this$_selector$node$7 = (_this$_selector$node$8 = this._selector.node.metadata) === null || _this$_selector$node$8 === void 0 ? void 0 : _this$_selector$node$8.throwOnFieldError) !== null && _this$_selector$node$7 !== void 0 ? _this$_selector$node$7 : false,
-        handled: false,
         uiContext: undefined
       };
       if (this._fieldErrors == null) {
@@ -630,8 +649,8 @@ var RelayReader = /*#__PURE__*/function () {
       } else {
         storeID = id;
         traversalPathSegment = {
-          readerClientEdge: field,
-          clientEdgeDestinationID: id
+          clientEdgeDestinationID: id,
+          readerClientEdge: field
         };
       }
       var modelResolvers = field.modelResolvers;
@@ -661,6 +680,9 @@ var RelayReader = /*#__PURE__*/function () {
     var _field$alias3;
     var fieldName = (_field$alias3 = field.alias) !== null && _field$alias3 !== void 0 ? _field$alias3 : field.name;
     var storageKey = getStorageKey(field, this._variables);
+    if (this._fieldGranularNotificationDataID != null) {
+      this._seenRecords.add(getFieldNotificationKey(this._fieldGranularNotificationDataID, storageKey));
+    }
     var value = RelayModernRecord.getValue(record, storageKey);
     if (value === null || RelayFeatureFlags.ENABLE_NONCOMPLIANT_ERROR_HANDLING_ON_LISTS && Array.isArray(value) && value.length === 0) {
       this._maybeAddFieldErrors(record, storageKey);
@@ -674,6 +696,9 @@ var RelayReader = /*#__PURE__*/function () {
     var _field$alias4;
     var fieldName = (_field$alias4 = field.alias) !== null && _field$alias4 !== void 0 ? _field$alias4 : field.name;
     var storageKey = getStorageKey(field, this._variables);
+    if (this._fieldGranularNotificationDataID != null) {
+      this._seenRecords.add(getFieldNotificationKey(this._fieldGranularNotificationDataID, storageKey));
+    }
     var linkedID = RelayModernRecord.getLinkedRecordID(record, storageKey);
     if (linkedID == null) {
       data[fieldName] = linkedID;
@@ -739,6 +764,9 @@ var RelayReader = /*#__PURE__*/function () {
   };
   _proto._readPluralLink = function _readPluralLink(field, record, data) {
     var storageKey = getStorageKey(field, this._variables);
+    if (this._fieldGranularNotificationDataID != null) {
+      this._seenRecords.add(getFieldNotificationKey(this._fieldGranularNotificationDataID, storageKey));
+    }
     var linkedIDs = RelayModernRecord.getLinkedRecordIDs(record, storageKey);
     if (linkedIDs === null || RelayFeatureFlags.ENABLE_NONCOMPLIANT_ERROR_HANDLING_ON_LISTS && Array.isArray(linkedIDs) && linkedIDs.length === 0) {
       this._maybeAddFieldErrors(record, storageKey);
@@ -791,9 +819,9 @@ var RelayReader = /*#__PURE__*/function () {
       return;
     }
     this._createFragmentPointer({
+      args: moduleImport.args,
       kind: 'FragmentSpread',
-      name: moduleImport.fragmentName,
-      args: moduleImport.args
+      name: moduleImport.fragmentName
     }, record, data);
     data[FRAGMENT_PROP_NAME_KEY] = moduleImport.fragmentPropName;
     data[MODULE_COMPONENT_KEY] = component;
@@ -807,6 +835,7 @@ var RelayReader = /*#__PURE__*/function () {
       fieldValue = null;
     }
     data[aliasedInlineFragment.name] = fieldValue;
+    return fieldValue;
   };
   _proto._readInlineFragment = function _readInlineFragment(inlineFragment, record, data, skipUnmatchedAbstractTypes) {
     if (inlineFragment.type == null) {
@@ -860,11 +889,20 @@ var RelayReader = /*#__PURE__*/function () {
     if (data[ID_KEY] == null) {
       data[ID_KEY] = RelayModernRecord.getDataID(record);
     }
-    fragmentPointers[fragmentSpread.name] = getArgumentValues(fragmentSpread.args, this._variables, this._isWithinUnmatchedTypeRefinement);
+    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 (RelayFeatureFlags.ENABLE_READER_FRAGMENTS_LOGGING) {
+      var _this$_log2;
+      (_this$_log2 = this._log) === null || _this$_log2 === void 0 ? void 0 : _this$_log2.call(this, {
+        name: 'reader.fragmentSpread',
+        fragmentName: fragmentSpread.name,
+        data: data
+      });
+    }
   };
   _proto._createInlineDataOrResolverFragmentPointer = function _createInlineDataOrResolverFragmentPointer(fragmentSpreadOrFragment, record, data) {
     var fragmentPointers = data[FRAGMENTS_KEY];

package/lib/store/RelayRecordSource.js

@@ -2,8 +2,11 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault")["default"];
 var _createForOfIteratorHelper2 = _interopRequireDefault(require("@babel/runtime/helpers/createForOfIteratorHelper"));
+var RelayFeatureFlags = require('../util/RelayFeatureFlags');
 var RelayModernRecord = require('./RelayModernRecord');
 var RelayRecordState = require('./RelayRecordState');
+var _require = require('./RelayStoreUtils'),
+  RELAY_RESOLVER_RECORD_TYPENAME = _require.RELAY_RESOLVER_RECORD_TYPENAME;
 var EXISTENT = RelayRecordState.EXISTENT,
   NONEXISTENT = RelayRecordState.NONEXISTENT,
   UNKNOWN = RelayRecordState.UNKNOWN;
@@ -62,6 +65,9 @@ var RelayRecordSource = /*#__PURE__*/function () {
         var _step$value = _step.value,
           key = _step$value[0],
           record = _step$value[1];
+        if (RelayFeatureFlags.FILTER_OUT_RELAY_RESOLVER_RECORDS && record != null && RelayModernRecord.getType(record) === RELAY_RESOLVER_RECORD_TYPENAME) {
+          continue;
+        }
         obj[key] = RelayModernRecord.toJSON(record);
       }
     } catch (err) {

package/lib/store/RelayReferenceMarker.js

@@ -150,6 +150,7 @@ var RelayReferenceMarker = /*#__PURE__*/function () {
     if (resolverRecord == null) {
       return;
     }
+    var linkedField = field.linkedField;
     if (field.backingField.isOutputType) {
       var outputTypeRecordIDs = getOutputTypeRecordIDs(resolverRecord);
       if (outputTypeRecordIDs != null) {
@@ -159,6 +160,7 @@ var RelayReferenceMarker = /*#__PURE__*/function () {
           for (_iterator.s(); !(_step = _iterator.n()).done;) {
             var _dataID = _step.value;
             this._references.add(_dataID);
+            this._traverse(linkedField, _dataID);
           }
         } catch (err) {
           _iterator.e(err);
@@ -167,7 +169,6 @@ var RelayReferenceMarker = /*#__PURE__*/function () {
         }
       }
     } else {
-      var linkedField = field.linkedField;
       var concreteType = linkedField.concreteType;
       if (concreteType == null) {
         return;

package/lib/store/RelayResponseNormalizer.js

@@ -21,6 +21,7 @@ var _require5 = require('./RelayModernSelector'),
   createNormalizationSelector = _require5.createNormalizationSelector;
 var _require6 = require('./RelayStoreUtils'),
   ROOT_ID = _require6.ROOT_ID,
+  ROOT_TYPE = _require6.ROOT_TYPE,
   TYPENAME_KEY = _require6.TYPENAME_KEY,
   getArgumentValues = _require6.getArgumentValues,
   getHandleStorageKey = _require6.getHandleStorageKey,
@@ -46,6 +47,7 @@ var RelayResponseNormalizer = /*#__PURE__*/function () {
     this._getDataId = options.getDataID;
     this._handleFieldPayloads = [];
     this._treatMissingFieldsAsNull = options.treatMissingFieldsAsNull;
+    this._deferDeduplicatedFields = options.deferDeduplicatedFields;
     this._incrementalPlaceholders = [];
     this._isClientExtension = false;
     this._isUnmatchedAbstractType = false;
@@ -56,6 +58,7 @@ var RelayResponseNormalizer = /*#__PURE__*/function () {
     this._variables = variables;
     this._shouldProcessClientComponents = options.shouldProcessClientComponents;
     this._log = options.log;
+    this._s2cExecutions = new Map();
   }
   var _proto = RelayResponseNormalizer.prototype;
   _proto.normalizeResponse = function normalizeResponse(node, dataID, data, errors) {
@@ -67,10 +70,19 @@ var RelayResponseNormalizer = /*#__PURE__*/function () {
     return {
       errors: errors,
       fieldPayloads: this._handleFieldPayloads,
-      incrementalPlaceholders: this._incrementalPlaceholders,
       followupPayloads: this._followupPayloads,
-      source: this._recordSource,
-      isFinal: false
+      incrementalPlaceholders: this._incrementalPlaceholders,
+      isFinal: false,
+      s2cExecutions: this._s2cExecutions.size > 0 ? Array.from(this._s2cExecutions.entries()).map(function (_ref) {
+        var recordID = _ref[0],
+          entry = _ref[1];
+        return {
+          recordID: recordID,
+          selections: entry.selections,
+          typeName: entry.typeName
+        };
+      }) : undefined,
+      source: this._recordSource
     };
   };
   _proto._assignClientAbstractTypes = function _assignClientAbstractTypes(node) {
@@ -109,6 +121,7 @@ var RelayResponseNormalizer = /*#__PURE__*/function () {
     return typeName;
   };
   _proto._traverseSelections = function _traverseSelections(node, record, data) {
+    var _selection$resolverIn, _selection$backingFie;
     for (var i = 0; i < node.selections.length; i++) {
       var selection = node.selections[i];
       switch (selection.kind) {
@@ -132,40 +145,21 @@ var RelayResponseNormalizer = /*#__PURE__*/function () {
           }
         case 'InlineFragment':
           {
-            var abstractKey = selection.abstractKey;
-            if (abstractKey == null) {
-              var typeName = RelayModernRecord.getType(record);
-              if (typeName === selection.type) {
-                this._traverseSelections(selection, record, data);
-              }
-            } else {
-              var implementsInterface = Object.prototype.hasOwnProperty.call(data, abstractKey);
-              var _typeName = RelayModernRecord.getType(record);
-              var typeID = generateTypeID(_typeName);
-              var typeRecord = this._recordSource.get(typeID);
-              if (typeRecord == null) {
-                typeRecord = RelayModernRecord.create(typeID, TYPE_SCHEMA_TYPE);
-                this._recordSource.set(typeID, typeRecord);
-              }
-              RelayModernRecord.setValue(typeRecord, abstractKey, implementsInterface);
-              if (implementsInterface) {
-                this._traverseSelections(selection, record, data);
-              }
-            }
+            this._normalizeInlineFragment(selection, record, data);
             break;
           }
         case 'TypeDiscriminator':
           {
-            var _abstractKey = selection.abstractKey;
-            var _implementsInterface = Object.prototype.hasOwnProperty.call(data, _abstractKey);
-            var _typeName2 = RelayModernRecord.getType(record);
-            var _typeID = generateTypeID(_typeName2);
-            var _typeRecord = this._recordSource.get(_typeID);
-            if (_typeRecord == null) {
-              _typeRecord = RelayModernRecord.create(_typeID, TYPE_SCHEMA_TYPE);
-              this._recordSource.set(_typeID, _typeRecord);
+            var abstractKey = selection.abstractKey;
+            var implementsInterface = Object.prototype.hasOwnProperty.call(data, abstractKey);
+            var typeName = RelayModernRecord.getType(record);
+            var typeID = generateTypeID(typeName);
+            var typeRecord = this._recordSource.get(typeID);
+            if (typeRecord == null) {
+              typeRecord = RelayModernRecord.create(typeID, TYPE_SCHEMA_TYPE);
+              this._recordSource.set(typeID, typeRecord);
             }
-            RelayModernRecord.setValue(_typeRecord, _abstractKey, _implementsInterface);
+            RelayModernRecord.setValue(typeRecord, abstractKey, implementsInterface);
             break;
           }
         case 'LinkedHandle':
@@ -178,8 +172,8 @@ var RelayResponseNormalizer = /*#__PURE__*/function () {
             dataID: RelayModernRecord.getDataID(record),
             fieldKey: fieldKey,
             handle: selection.handle,
-            handleKey: handleKey,
-            handleArgs: selection.handleArgs ? getArgumentValues(selection.handleArgs, this._variables) : {}
+            handleArgs: selection.handleArgs ? getArgumentValues(selection.handleArgs, this._variables) : {},
+            handleKey: handleKey
           });
           break;
         case 'ModuleImport':
@@ -210,11 +204,15 @@ var RelayResponseNormalizer = /*#__PURE__*/function () {
         case 'RelayLiveResolver':
           if (!this._useExecTimeResolvers) {
             this._normalizeResolver(selection, record, data);
+          } else if (((_selection$resolverIn = selection.resolverInfo) === null || _selection$resolverIn === void 0 ? void 0 : _selection$resolverIn.rootFragment) != null) {
+            this._collectS2CExecution(selection, record);
           }
           break;
         case 'ClientEdgeToClientObject':
           if (!this._useExecTimeResolvers) {
             this._normalizeResolver(selection.backingField, record, data);
+          } else if (((_selection$backingFie = selection.backingField.resolverInfo) === null || _selection$backingFie === void 0 ? void 0 : _selection$backingFie.rootFragment) != null) {
+            this._collectS2CExecution(selection, record);
           }
           break;
         default:
@@ -223,11 +221,46 @@ var RelayResponseNormalizer = /*#__PURE__*/function () {
       }
     }
   };
+  _proto._normalizeInlineFragment = function _normalizeInlineFragment(selection, record, data) {
+    var abstractKey = selection.abstractKey;
+    if (abstractKey == null) {
+      var typeName = RelayModernRecord.getType(record);
+      if (typeName === selection.type || typeName === ROOT_TYPE) {
+        this._traverseSelections(selection, record, data);
+      }
+    } else {
+      var implementsInterface = Object.prototype.hasOwnProperty.call(data, abstractKey);
+      var _typeName = RelayModernRecord.getType(record);
+      var typeID = generateTypeID(_typeName);
+      var typeRecord = this._recordSource.get(typeID);
+      if (typeRecord == null) {
+        typeRecord = RelayModernRecord.create(typeID, TYPE_SCHEMA_TYPE);
+        this._recordSource.set(typeID, typeRecord);
+      }
+      RelayModernRecord.setValue(typeRecord, abstractKey, implementsInterface);
+      if (implementsInterface) {
+        this._traverseSelections(selection, record, data);
+      }
+    }
+  };
   _proto._normalizeResolver = function _normalizeResolver(resolver, record, data) {
     if (resolver.fragment != null) {
-      this._traverseSelections(resolver.fragment, record, data);
+      this._normalizeInlineFragment(resolver.fragment, record, data);
     }
   };
+  _proto._collectS2CExecution = function _collectS2CExecution(selection, record) {
+    var recordID = RelayModernRecord.getDataID(record);
+    var typeName = RelayModernRecord.getType(record);
+    var entry = this._s2cExecutions.get(recordID);
+    if (entry == null) {
+      entry = {
+        selections: [],
+        typeName: typeName
+      };
+      this._s2cExecutions.set(recordID, entry);
+    }
+    entry.selections.push(selection);
+  };
   _proto._normalizeDefer = function _normalizeDefer(defer, record, data) {
     var isDeferred = defer["if"] === null || this._getVariableValue(defer["if"]);
     if (process.env.NODE_ENV !== "production") {
@@ -237,13 +270,13 @@ var RelayResponseNormalizer = /*#__PURE__*/function () {
       this._traverseSelections(defer, record, data);
     } else {
       this._incrementalPlaceholders.push({
-        kind: 'defer',
+        actorIdentifier: this._actorIdentifier,
         data: data,
+        kind: 'defer',
         label: defer.label,
         path: (0, _toConsumableArray2["default"])(this._path),
         selector: createNormalizationSelector(defer, RelayModernRecord.getDataID(record), this._variables),
-        typeName: RelayModernRecord.getType(record),
-        actorIdentifier: this._actorIdentifier
+        typeName: RelayModernRecord.getType(record)
       });
     }
   };
@@ -255,13 +288,13 @@ var RelayResponseNormalizer = /*#__PURE__*/function () {
     }
     if (isStreamed === true) {
       this._incrementalPlaceholders.push({
+        actorIdentifier: this._actorIdentifier,
         kind: 'stream',
         label: stream.label,
-        path: (0, _toConsumableArray2["default"])(this._path),
-        parentID: RelayModernRecord.getDataID(record),
         node: stream,
-        variables: this._variables,
-        actorIdentifier: this._actorIdentifier
+        parentID: RelayModernRecord.getDataID(record),
+        path: (0, _toConsumableArray2["default"])(this._path),
+        variables: this._variables
       });
     }
   };
@@ -276,15 +309,15 @@ var RelayResponseNormalizer = /*#__PURE__*/function () {
     RelayModernRecord.setValue(record, operationKey, operationReference !== null && operationReference !== void 0 ? operationReference : null);
     if (operationReference != null) {
       this._followupPayloads.push({
-        kind: 'ModuleImportPayload',
+        actorIdentifier: this._actorIdentifier,
         args: moduleImport.args,
         data: data,
         dataID: RelayModernRecord.getDataID(record),
+        kind: 'ModuleImportPayload',
         operationReference: operationReference,
         path: (0, _toConsumableArray2["default"])(this._path),
         typeName: typeName,
-        variables: this._variables,
-        actorIdentifier: this._actorIdentifier
+        variables: this._variables
       });
     }
   };
@@ -296,7 +329,7 @@ var RelayResponseNormalizer = /*#__PURE__*/function () {
     var isNoncompliantlyNullish = RelayFeatureFlags.ENABLE_NONCOMPLIANT_ERROR_HANDLING_ON_LISTS && Array.isArray(fieldValue) && fieldValue.length === 0;
     if (fieldValue == null || isNoncompliantlyNullish) {
       if (fieldValue === undefined) {
-        var isOptionalField = this._isClientExtension || this._isUnmatchedAbstractType;
+        var isOptionalField = this._isClientExtension || this._isUnmatchedAbstractType || this._deferDeduplicatedFields;
         if (isOptionalField) {
           return;
         } else if (!this._treatMissingFieldsAsNull) {
@@ -381,14 +414,14 @@ var RelayResponseNormalizer = /*#__PURE__*/function () {
     !(typeof nextID === 'string') ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayResponseNormalizer: Expected id on field `%s` to be a string.', storageKey) : invariant(false) : void 0;
     RelayModernRecord.setActorLinkedRecordID(record, storageKey, actorIdentifier, nextID);
     this._followupPayloads.push({
-      kind: 'ActorPayload',
+      actorIdentifier: actorIdentifier,
       data: fieldValue,
       dataID: nextID,
+      kind: 'ActorPayload',
+      node: field,
       path: [].concat((0, _toConsumableArray2["default"])(this._path), [responseKey]),
       typeName: typeName,
-      variables: this._variables,
-      node: field,
-      actorIdentifier: actorIdentifier
+      variables: this._variables
     });
   };
   _proto._normalizeLink = function _normalizeLink(field, record, storageKey, fieldValue) {
@@ -452,8 +485,8 @@ var RelayResponseNormalizer = /*#__PURE__*/function () {
       if (!expected) {
         var logEvent = {
           name: 'idCollision.typename',
-          previous_typename: RelayModernRecord.getType(record),
-          new_typename: typeName
+          new_typename: typeName,
+          previous_typename: RelayModernRecord.getType(record)
         };
         if (this._log != null) {
           this._log(logEvent);
@@ -462,10 +495,10 @@ var RelayResponseNormalizer = /*#__PURE__*/function () {
     }
     if (process.env.NODE_ENV !== "production") {
       var _field$concreteType5;
-      var _typeName3 = (_field$concreteType5 = field.concreteType) !== null && _field$concreteType5 !== void 0 ? _field$concreteType5 : this._getRecordType(payload);
+      var _typeName2 = (_field$concreteType5 = field.concreteType) !== null && _field$concreteType5 !== void 0 ? _field$concreteType5 : this._getRecordType(payload);
       var _dataID = RelayModernRecord.getDataID(record);
-      var _expected = isClientID(_dataID) && _dataID !== ROOT_ID || RelayModernRecord.getType(record) === _typeName3;
-      process.env.NODE_ENV !== "production" ? warning(_expected, 'RelayResponseNormalizer: Invalid record `%s`. Expected %s to be ' + 'consistent, but the record was assigned conflicting types `%s` ' + 'and `%s`. The GraphQL server likely violated the globally unique ' + 'id requirement by returning the same id for different objects.', _dataID, TYPENAME_KEY, RelayModernRecord.getType(record), _typeName3) : void 0;
+      var _expected = isClientID(_dataID) && _dataID !== ROOT_ID || RelayModernRecord.getType(record) === _typeName2;
+      process.env.NODE_ENV !== "production" ? warning(_expected, 'RelayResponseNormalizer: Invalid record `%s`. Expected %s to be ' + 'consistent, but the record was assigned conflicting types `%s` ' + 'and `%s`. The GraphQL server likely violated the globally unique ' + 'id requirement by returning the same id for different objects.', _dataID, TYPENAME_KEY, RelayModernRecord.getType(record), _typeName2) : void 0;
     }
   };
   _proto._validateConflictingFieldsWithIdenticalId = function _validateConflictingFieldsWithIdenticalId(record, storageKey, fieldValue) {