relay-runtime 18.2.0 → 20.0.0

package/lib/store/RelayReader.js

@@ -4,9 +4,9 @@ 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 _createForOfIteratorHelper2 = _interopRequireDefault(require("@babel/runtime/helpers/createForOfIteratorHelper"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _excluded = ["message"];
+var RelayFeatureFlags = require('../util/RelayFeatureFlags');
 var _require = require('./live-resolvers/LiveResolverSuspenseSentinel'),
   isSuspenseSentinel = _require.isSuspenseSentinel;
 var RelayConcreteVariables = require('./RelayConcreteVariables');
@@ -36,15 +36,15 @@ function read(recordSource, selector, resolverCache, resolverContext) {
 }
 var RelayReader = /*#__PURE__*/function () {
   function RelayReader(recordSource, selector, resolverCache, resolverContext) {
-    var _selector$clientEdgeT, _this$_owner$node$ope;
+    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 = [];
     this._missingLiveResolverFields = [];
     this._isMissingData = false;
     this._isWithinUnmatchedTypeRefinement = false;
-    this._errorResponseFields = null;
+    this._fieldErrors = null;
     this._owner = selector.owner;
-    this._useExecTimeResolvers = (_this$_owner$node$ope = this._owner.node.operation.use_exec_time_resolvers) !== null && _this$_owner$node$ope !== void 0 ? _this$_owner$node$ope : false;
+    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;
     this._seenRecords = new Set();
     this._selector = selector;
@@ -92,37 +92,30 @@ var RelayReader = /*#__PURE__*/function () {
       missingLiveResolverFields: this._missingLiveResolverFields,
       seenRecords: this._seenRecords,
       selector: this._selector,
-      errorResponseFields: this._errorResponseFields
+      fieldErrors: this._fieldErrors
     };
   };
-  _proto._maybeAddErrorResponseFields = function _maybeAddErrorResponseFields(record, storageKey) {
+  _proto._maybeAddFieldErrors = function _maybeAddFieldErrors(record, storageKey) {
     var errors = RelayModernRecord.getErrors(record, storageKey);
     if (errors == null) {
       return;
     }
     var owner = this._fragmentName;
-    if (this._errorResponseFields == null) {
-      this._errorResponseFields = [];
-    }
-    var _iterator = (0, _createForOfIteratorHelper2["default"])(errors),
-      _step;
-    try {
-      for (_iterator.s(); !(_step = _iterator.n()).done;) {
-        var _error$path, _this$_selector$node$2, _this$_selector$node$3;
-        var error = _step.value;
-        this._errorResponseFields.push({
-          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
-        });
-      }
-    } catch (err) {
-      _iterator.e(err);
-    } finally {
-      _iterator.f();
+    if (this._fieldErrors == null) {
+      this._fieldErrors = [];
+    }
+    for (var i = 0; i < errors.length; i++) {
+      var _error$path, _this$_selector$node$2, _this$_selector$node$3;
+      var error = errors[i];
+      this._fieldErrors.push({
+        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
+      });
     }
   };
   _proto._markDataAsMissing = function _markDataAsMissing(fieldName) {
@@ -130,19 +123,21 @@ var RelayReader = /*#__PURE__*/function () {
     if (this._isWithinUnmatchedTypeRefinement) {
       return;
     }
-    if (this._errorResponseFields == null) {
-      this._errorResponseFields = [];
+    if (this._fieldErrors == null) {
+      this._fieldErrors = [];
     }
     var owner = this._fragmentName;
-    this._errorResponseFields.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) ? {
+    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
+      handled: false,
+      uiContext: undefined
     } : {
       kind: 'missing_expected_data.log',
       owner: owner,
-      fieldPath: fieldName
+      fieldPath: fieldName,
+      uiContext: undefined
     });
     this._isMissingData = true;
     if (this._clientEdgeTraversalPath.length) {
@@ -177,8 +172,8 @@ var RelayReader = /*#__PURE__*/function () {
       return;
     }
     var owner = this._fragmentName;
-    if (this._errorResponseFields == null) {
-      this._errorResponseFields = [];
+    if (this._fieldErrors == null) {
+      this._fieldErrors = [];
     }
     var fieldName;
     if (selection.field.linkedField != null) {
@@ -190,18 +185,20 @@ var RelayReader = /*#__PURE__*/function () {
     }
     switch (selection.action) {
       case 'THROW':
-        this._errorResponseFields.push({
+        this._fieldErrors.push({
           kind: 'missing_required_field.throw',
           fieldPath: fieldName,
           owner: owner,
-          handled: false
+          handled: false,
+          uiContext: undefined
         });
         return;
       case 'LOG':
-        this._errorResponseFields.push({
+        this._fieldErrors.push({
           kind: 'missing_required_field.log',
           fieldPath: fieldName,
-          owner: owner
+          owner: owner,
+          uiContext: undefined
         });
         return;
       default:
@@ -222,33 +219,33 @@ var RelayReader = /*#__PURE__*/function () {
         value = this._asResult(_value);
         break;
       case 'NULL':
-        if (this._errorResponseFields != null && this._errorResponseFields.length > 0) {
+        if (this._fieldErrors != null && this._fieldErrors.length > 0) {
           value = null;
         }
         break;
       default:
         to;
     }
-    var childrenErrorResponseFields = this._errorResponseFields;
-    this._errorResponseFields = previousResponseFields;
-    if (childrenErrorResponseFields != null) {
-      if (this._errorResponseFields == null) {
-        this._errorResponseFields = [];
+    var childrenFieldErrors = this._fieldErrors;
+    this._fieldErrors = previousResponseFields;
+    if (childrenFieldErrors != null) {
+      if (this._fieldErrors == null) {
+        this._fieldErrors = [];
       }
-      for (var i = 0; i < childrenErrorResponseFields.length; i++) {
-        this._errorResponseFields.push(markFieldErrorHasHandled(childrenErrorResponseFields[i]));
+      for (var i = 0; i < childrenFieldErrors.length; i++) {
+        this._fieldErrors.push(markFieldErrorHasHandled(childrenFieldErrors[i]));
       }
     }
     return value;
   };
   _proto._asResult = function _asResult(value) {
-    if (this._errorResponseFields == null || this._errorResponseFields.length === 0) {
+    if (this._fieldErrors == null || this._fieldErrors.length === 0) {
       return {
         ok: true,
         value: value
       };
     }
-    var errors = this._errorResponseFields.map(function (error) {
+    var errors = this._fieldErrors.map(function (error) {
       switch (error.kind) {
         case 'relay_field_payload.error':
           var _error$error = error.error,
@@ -272,7 +269,7 @@ var RelayReader = /*#__PURE__*/function () {
           return null;
         default:
           error.kind;
-          !false ? process.env.NODE_ENV !== "production" ? invariant(false, 'Unexpected error errorResponseField kind: %s', error.kind) : invariant(false) : void 0;
+          !false ? process.env.NODE_ENV !== "production" ? invariant(false, 'Unexpected error fieldError kind: %s', error.kind) : invariant(false) : void 0;
       }
     }).filter(Boolean);
     return {
@@ -293,8 +290,8 @@ var RelayReader = /*#__PURE__*/function () {
         case 'CatchField':
           {
             var _selection$field$back, _selection$field, _field$alias;
-            var previousResponseFields = this._errorResponseFields;
-            this._errorResponseFields = null;
+            var previousResponseFields = this._fieldErrors;
+            this._fieldErrors = null;
             var catchFieldValue = this._readClientSideDirectiveField(selection, record, data);
             var field = (_selection$field$back = (_selection$field = selection.field) === null || _selection$field === void 0 ? void 0 : _selection$field.backingField) !== null && _selection$field$back !== void 0 ? _selection$field$back : selection.field;
             var fieldName = (_field$alias = field === null || field === void 0 ? void 0 : field.alias) !== null && _field$alias !== void 0 ? _field$alias : field === null || field === void 0 ? void 0 : field.name;
@@ -409,12 +406,26 @@ var RelayReader = /*#__PURE__*/function () {
           return this._readLink(selection.field, record, data);
         }
       case 'RelayResolver':
-        return this._readResolverField(selection.field, record, data);
       case 'RelayLiveResolver':
-        return this._readResolverField(selection.field, record, data);
+        {
+          if (this._useExecTimeResolvers) {
+            return this._readScalar(selection.field, record, data);
+          } else {
+            return this._readResolverField(selection.field, record, data);
+          }
+        }
       case 'ClientEdgeToClientObject':
       case 'ClientEdgeToServerObject':
-        return this._readClientEdge(selection.field, record, data);
+        if (this._useExecTimeResolvers && (selection.field.backingField.kind === 'RelayResolver' || selection.field.backingField.kind === 'RelayLiveResolver')) {
+          var field = selection.field;
+          if (field.linkedField.plural) {
+            return this._readPluralLink(field.linkedField, record, data);
+          } else {
+            return this._readLink(field.linkedField, record, data);
+          }
+        } else {
+          return this._readClientEdge(selection.field, record, data);
+        }
       case 'AliasedInlineFragmentSpread':
         return this._readAliasedInlineFragment(selection.field, record, data);
       default:
@@ -425,8 +436,8 @@ var RelayReader = /*#__PURE__*/function () {
   _proto._readResolverField = function _readResolverField(field, record, data) {
     var _field$alias2;
     var parentRecordID = RelayModernRecord.getDataID(record);
-    var prevErrors = this._errorResponseFields;
-    this._errorResponseFields = null;
+    var prevErrors = this._fieldErrors;
+    this._fieldErrors = null;
     var result = this._readResolverFieldImpl(field, parentRecordID);
     var fieldName = (_field$alias2 = field.alias) !== null && _field$alias2 !== void 0 ? _field$alias2 : field.name;
     this._prependPreviousErrors(prevErrors, fieldName);
@@ -442,14 +453,14 @@ var RelayReader = /*#__PURE__*/function () {
         return {
           data: snapshot.data,
           isMissingData: snapshot.isMissingData,
-          errorResponseFields: snapshot.errorResponseFields
+          fieldErrors: snapshot.fieldErrors
         };
       }
       snapshot = read(_this._recordSource, singularReaderSelector, _this._resolverCache);
       return {
         data: snapshot.data,
         isMissingData: snapshot.isMissingData,
-        errorResponseFields: snapshot.errorResponseFields
+        fieldErrors: snapshot.fieldErrors
       };
     };
     var evaluate = function evaluate() {
@@ -459,6 +470,9 @@ var RelayReader = /*#__PURE__*/function () {
           __fragmentOwner: _this._owner,
           __fragments: (0, _defineProperty2["default"])({}, fragment.name, fragment.args ? getArgumentValues(fragment.args, _this._variables) : {})
         };
+        if (_this._clientEdgeTraversalPath.length > 0 && _this._clientEdgeTraversalPath[_this._clientEdgeTraversalPath.length - 1] !== null) {
+          key[CLIENT_EDGE_TRAVERSAL_PATH] = (0, _toConsumableArray2["default"])(_this._clientEdgeTraversalPath);
+        }
         var resolverContext = {
           getDataForResolverFragment: getDataForResolverFragment
         };
@@ -494,56 +508,33 @@ var RelayReader = /*#__PURE__*/function () {
     return result;
   };
   _proto._propagateResolverMetadata = function _propagateResolverMetadata(fieldPath, cachedSnapshot, resolverError, seenRecord, suspenseID, updatedDataIDs) {
+    var _this2 = this;
     if (cachedSnapshot != null) {
       if (cachedSnapshot.missingClientEdges != null) {
-        var _iterator2 = (0, _createForOfIteratorHelper2["default"])(cachedSnapshot.missingClientEdges),
-          _step2;
-        try {
-          for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-            var missing = _step2.value;
-            this._missingClientEdges.push(missing);
-          }
-        } catch (err) {
-          _iterator2.e(err);
-        } finally {
-          _iterator2.f();
+        for (var i = 0; i < cachedSnapshot.missingClientEdges.length; i++) {
+          var missing = cachedSnapshot.missingClientEdges[i];
+          this._missingClientEdges.push(missing);
         }
       }
       if (cachedSnapshot.missingLiveResolverFields != null) {
         this._isMissingData = this._isMissingData || cachedSnapshot.missingLiveResolverFields.length > 0;
-        var _iterator3 = (0, _createForOfIteratorHelper2["default"])(cachedSnapshot.missingLiveResolverFields),
-          _step3;
-        try {
-          for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-            var missingResolverField = _step3.value;
-            this._missingLiveResolverFields.push(missingResolverField);
-          }
-        } catch (err) {
-          _iterator3.e(err);
-        } finally {
-          _iterator3.f();
+        for (var _i = 0; _i < cachedSnapshot.missingLiveResolverFields.length; _i++) {
+          var missingResolverField = cachedSnapshot.missingLiveResolverFields[_i];
+          this._missingLiveResolverFields.push(missingResolverField);
         }
       }
-      if (cachedSnapshot.errorResponseFields != null) {
-        if (this._errorResponseFields == null) {
-          this._errorResponseFields = [];
+      if (cachedSnapshot.fieldErrors != null) {
+        if (this._fieldErrors == null) {
+          this._fieldErrors = [];
         }
-        var _iterator4 = (0, _createForOfIteratorHelper2["default"])(cachedSnapshot.errorResponseFields),
-          _step4;
-        try {
-          for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-            var _this$_selector$node$6;
-            var error = _step4.value;
-            if (((_this$_selector$node$6 = this._selector.node.metadata) === null || _this$_selector$node$6 === void 0 ? void 0 : _this$_selector$node$6.throwOnFieldError) === true) {
-              this._errorResponseFields.push(error);
-            } else {
-              this._errorResponseFields.push(markFieldErrorHasHandled(error));
-            }
+        for (var _i2 = 0; _i2 < cachedSnapshot.fieldErrors.length; _i2++) {
+          var _this$_selector$node$6;
+          var error = cachedSnapshot.fieldErrors[_i2];
+          if (((_this$_selector$node$6 = this._selector.node.metadata) === null || _this$_selector$node$6 === void 0 ? void 0 : _this$_selector$node$6.throwOnFieldError) === true) {
+            this._fieldErrors.push(error);
+          } else {
+            this._fieldErrors.push(markFieldErrorHasHandled(error));
           }
-        } catch (err) {
-          _iterator4.e(err);
-        } finally {
-          _iterator4.f();
         }
       }
       this._isMissingData = this._isMissingData || cachedSnapshot.isMissingData;
@@ -556,12 +547,13 @@ var RelayReader = /*#__PURE__*/function () {
         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
+        handled: false,
+        uiContext: undefined
       };
-      if (this._errorResponseFields == null) {
-        this._errorResponseFields = [errorEvent];
+      if (this._fieldErrors == null) {
+        this._fieldErrors = [errorEvent];
       } else {
-        this._errorResponseFields.push(errorEvent);
+        this._fieldErrors.push(errorEvent);
       }
     }
     if (seenRecord != null) {
@@ -572,22 +564,13 @@ var RelayReader = /*#__PURE__*/function () {
       this._missingLiveResolverFields.push(suspenseID);
     }
     if (updatedDataIDs != null) {
-      var _iterator5 = (0, _createForOfIteratorHelper2["default"])(updatedDataIDs),
-        _step5;
-      try {
-        for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-          var recordID = _step5.value;
-          this._updatedDataIDs.add(recordID);
-        }
-      } catch (err) {
-        _iterator5.e(err);
-      } finally {
-        _iterator5.f();
-      }
+      updatedDataIDs.forEach(function (recordID) {
+        _this2._updatedDataIDs.add(recordID);
+      });
     }
   };
   _proto._readClientEdge = function _readClientEdge(field, record, data) {
-    var _this2 = this;
+    var _this3 = this;
     var _backingField$alias;
     var backingField = field.backingField;
     !(backingField.kind !== 'ClientExtension') ? process.env.NODE_ENV !== "production" ? invariant(false, 'Client extension client edges are not yet implemented.') : invariant(false) : void 0;
@@ -607,21 +590,21 @@ var RelayReader = /*#__PURE__*/function () {
         storeIDs = clientEdgeResolverResponse.map(function (itemResponse) {
           var _field$concreteType;
           var concreteType = (_field$concreteType = field.concreteType) !== null && _field$concreteType !== void 0 ? _field$concreteType : itemResponse.__typename;
-          !(typeof concreteType === 'string') ? process.env.NODE_ENV !== "production" ? invariant(false, 'Expected resolver for field at `%s` in `%s` modeling an edge to an abstract type to return an object with a `__typename` property.', backingField.path, _this2._owner.identifier) : invariant(false) : void 0;
-          var localId = extractIdFromResponse(itemResponse, backingField.path, _this2._owner.identifier);
-          var id = _this2._resolverCache.ensureClientRecord(localId, concreteType);
+          !(typeof concreteType === 'string') ? process.env.NODE_ENV !== "production" ? invariant(false, 'Expected resolver for field at `%s` in `%s` modeling an edge to an abstract type to return an object with a `__typename` property.', backingField.path, _this3._owner.identifier) : invariant(false) : void 0;
+          var localId = extractIdFromResponse(itemResponse, backingField.path, _this3._owner.identifier);
+          var id = _this3._resolverCache.ensureClientRecord(localId, concreteType);
           var modelResolvers = field.modelResolvers;
           if (modelResolvers != null) {
             var modelResolver = modelResolvers[concreteType];
-            !(modelResolver !== undefined) ? process.env.NODE_ENV !== "production" ? invariant(false, 'Invalid `__typename` returned by resolver at `%s` in `%s`. Expected one of %s but got `%s`.', backingField.path, _this2._owner.identifier, Object.keys(modelResolvers).join(', '), concreteType) : invariant(false) : void 0;
-            var model = _this2._readResolverFieldImpl(modelResolver, id);
+            !(modelResolver !== undefined) ? process.env.NODE_ENV !== "production" ? invariant(false, 'Invalid `__typename` returned by resolver at `%s` in `%s`. Expected one of %s but got `%s`.', backingField.path, _this3._owner.identifier, Object.keys(modelResolvers).join(', '), concreteType) : invariant(false) : void 0;
+            var model = _this3._readResolverFieldImpl(modelResolver, id);
             return model != null ? id : null;
           }
           return id;
         });
       } else {
         storeIDs = clientEdgeResolverResponse.map(function (obj) {
-          return extractIdFromResponse(obj, backingField.path, _this2._owner.identifier);
+          return extractIdFromResponse(obj, backingField.path, _this3._owner.identifier);
         });
       }
       this._clientEdgeTraversalPath.push(null);
@@ -665,8 +648,8 @@ var RelayReader = /*#__PURE__*/function () {
       this._clientEdgeTraversalPath.push(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._errorResponseFields;
-      this._errorResponseFields = null;
+      var prevErrors = this._fieldErrors;
+      this._fieldErrors = null;
       var edgeValue = this._traverse(field.linkedField, storeID, prevData);
       this._prependPreviousErrors(prevErrors, fieldName);
       this._clientEdgeTraversalPath.pop();
@@ -679,8 +662,8 @@ var RelayReader = /*#__PURE__*/function () {
     var fieldName = (_field$alias3 = field.alias) !== null && _field$alias3 !== void 0 ? _field$alias3 : field.name;
     var storageKey = getStorageKey(field, this._variables);
     var value = RelayModernRecord.getValue(record, storageKey);
-    if (value === null) {
-      this._maybeAddErrorResponseFields(record, storageKey);
+    if (value === null || RelayFeatureFlags.ENABLE_NONCOMPLIANT_ERROR_HANDLING_ON_LISTS && Array.isArray(value) && value.length === 0) {
+      this._maybeAddFieldErrors(record, storageKey);
     } else if (value === undefined) {
       this._markDataAsMissing(fieldName);
     }
@@ -695,7 +678,7 @@ var RelayReader = /*#__PURE__*/function () {
     if (linkedID == null) {
       data[fieldName] = linkedID;
       if (linkedID === null) {
-        this._maybeAddErrorResponseFields(record, storageKey);
+        this._maybeAddFieldErrors(record, storageKey);
       } else if (linkedID === undefined) {
         this._markDataAsMissing(fieldName);
       }
@@ -703,29 +686,29 @@ var RelayReader = /*#__PURE__*/function () {
     }
     var prevData = data[fieldName];
     !(prevData == null || typeof prevData === 'object') ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayReader(): Expected data for field `%s` at `%s` on record `%s` ' + 'to be an object, got `%s`.', fieldName, this._owner.identifier, RelayModernRecord.getDataID(record), prevData) : invariant(false) : void 0;
-    var prevErrors = this._errorResponseFields;
-    this._errorResponseFields = null;
+    var prevErrors = this._fieldErrors;
+    this._fieldErrors = null;
     var value = this._traverse(field, linkedID, prevData);
     this._prependPreviousErrors(prevErrors, fieldName);
     data[fieldName] = value;
     return value;
   };
   _proto._prependPreviousErrors = function _prependPreviousErrors(prevErrors, fieldNameOrIndex) {
-    if (this._errorResponseFields != null) {
-      for (var i = 0; i < this._errorResponseFields.length; i++) {
-        var event = this._errorResponseFields[i];
+    if (this._fieldErrors != null) {
+      for (var i = 0; i < this._fieldErrors.length; i++) {
+        var event = this._fieldErrors[i];
         if (event.owner === this._fragmentName && (event.kind === 'missing_expected_data.throw' || event.kind === 'missing_expected_data.log' || event.kind === 'missing_required_field.throw' || event.kind === 'missing_required_field.log')) {
           event.fieldPath = "".concat(fieldNameOrIndex, ".").concat(event.fieldPath);
         }
       }
       if (prevErrors != null) {
-        for (var _i = this._errorResponseFields.length - 1; _i >= 0; _i--) {
-          prevErrors.push(this._errorResponseFields[_i]);
+        for (var _i3 = this._fieldErrors.length - 1; _i3 >= 0; _i3--) {
+          prevErrors.push(this._fieldErrors[_i3]);
         }
-        this._errorResponseFields = prevErrors;
+        this._fieldErrors = prevErrors;
       }
     } else {
-      this._errorResponseFields = prevErrors;
+      this._fieldErrors = prevErrors;
     }
   };
   _proto._readActorChange = function _readActorChange(field, record, data) {
@@ -738,7 +721,7 @@ var RelayReader = /*#__PURE__*/function () {
       if (externalRef === undefined) {
         this._markDataAsMissing(fieldName);
       } else if (externalRef === null) {
-        this._maybeAddErrorResponseFields(record, storageKey);
+        this._maybeAddFieldErrors(record, storageKey);
       }
       return data[fieldName];
     }
@@ -757,13 +740,13 @@ var RelayReader = /*#__PURE__*/function () {
   _proto._readPluralLink = function _readPluralLink(field, record, data) {
     var storageKey = getStorageKey(field, this._variables);
     var linkedIDs = RelayModernRecord.getLinkedRecordIDs(record, storageKey);
-    if (linkedIDs === null) {
-      this._maybeAddErrorResponseFields(record, storageKey);
+    if (linkedIDs === null || RelayFeatureFlags.ENABLE_NONCOMPLIANT_ERROR_HANDLING_ON_LISTS && Array.isArray(linkedIDs) && linkedIDs.length === 0) {
+      this._maybeAddFieldErrors(record, storageKey);
     }
     return this._readLinkedIds(field, linkedIDs, record, data);
   };
   _proto._readLinkedIds = function _readLinkedIds(field, linkedIDs, record, data) {
-    var _this3 = this;
+    var _this4 = this;
     var _field$alias6;
     var fieldName = (_field$alias6 = field.alias) !== null && _field$alias6 !== void 0 ? _field$alias6 : field.name;
     if (linkedIDs == null) {
@@ -775,32 +758,32 @@ var RelayReader = /*#__PURE__*/function () {
     }
     var prevData = data[fieldName];
     !(prevData == null || Array.isArray(prevData)) ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayReader(): Expected data for field `%s` on record `%s` ' + 'to be an array, got `%s`.', fieldName, RelayModernRecord.getDataID(record), prevData) : invariant(false) : void 0;
-    var prevErrors = this._errorResponseFields;
-    this._errorResponseFields = null;
+    var prevErrors = this._fieldErrors;
+    this._fieldErrors = null;
     var linkedArray = prevData || [];
     linkedIDs.forEach(function (linkedID, nextIndex) {
       if (linkedID == null) {
         if (linkedID === undefined) {
-          _this3._markDataAsMissing(String(nextIndex));
+          _this4._markDataAsMissing(String(nextIndex));
         }
         linkedArray[nextIndex] = linkedID;
         return;
       }
       var prevItem = linkedArray[nextIndex];
       !(prevItem == null || typeof prevItem === 'object') ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayReader(): Expected data for field `%s` on record `%s` ' + 'to be an object, got `%s`.', fieldName, RelayModernRecord.getDataID(record), prevItem) : invariant(false) : void 0;
-      var prevErrors = _this3._errorResponseFields;
-      _this3._errorResponseFields = null;
-      linkedArray[nextIndex] = _this3._traverse(field, linkedID, prevItem);
-      _this3._prependPreviousErrors(prevErrors, nextIndex);
+      var prevErrors = _this4._fieldErrors;
+      _this4._fieldErrors = null;
+      linkedArray[nextIndex] = _this4._traverse(field, linkedID, prevItem);
+      _this4._prependPreviousErrors(prevErrors, nextIndex);
     });
     this._prependPreviousErrors(prevErrors, fieldName);
     data[fieldName] = linkedArray;
     return linkedArray;
   };
   _proto._readModuleImport = function _readModuleImport(moduleImport, record, data) {
-    var _moduleImport$compone;
     var componentKey = getModuleComponentKey(moduleImport.documentName);
-    var component = (_moduleImport$compone = moduleImport.componentModuleProvider) !== null && _moduleImport$compone !== void 0 ? _moduleImport$compone : RelayModernRecord.getValue(record, componentKey);
+    var relayStoreComponent = RelayModernRecord.getValue(record, componentKey);
+    var component = relayStoreComponent !== undefined ? relayStoreComponent : moduleImport.componentModuleProvider;
     if (component == null) {
       if (component === undefined) {
         this._markDataAsMissing('<module-import>');
@@ -816,8 +799,8 @@ var RelayReader = /*#__PURE__*/function () {
     data[MODULE_COMPONENT_KEY] = component;
   };
   _proto._readAliasedInlineFragment = function _readAliasedInlineFragment(aliasedInlineFragment, record, data) {
-    var prevErrors = this._errorResponseFields;
-    this._errorResponseFields = null;
+    var prevErrors = this._fieldErrors;
+    this._fieldErrors = null;
     var fieldValue = this._readInlineFragment(aliasedInlineFragment.fragment, record, {}, true);
     this._prependPreviousErrors(prevErrors, aliasedInlineFragment.name);
     if (fieldValue === false) {

package/lib/store/RelayReferenceMarker.js

@@ -12,19 +12,21 @@ var RelayStoreUtils = require('./RelayStoreUtils');
 var _require2 = require('./TypeID'),
   generateTypeID = _require2.generateTypeID;
 var invariant = require('invariant');
-var getStorageKey = RelayStoreUtils.getStorageKey,
+var getReadTimeResolverStorageKey = RelayStoreUtils.getReadTimeResolverStorageKey,
+  getStorageKey = RelayStoreUtils.getStorageKey,
   getModuleOperationKey = RelayStoreUtils.getModuleOperationKey;
-function mark(recordSource, selector, references, operationLoader, shouldProcessClientComponents) {
+function mark(recordSource, selector, references, operationLoader, shouldProcessClientComponents, useExecTimeResolvers) {
   var dataID = selector.dataID,
     node = selector.node,
     variables = selector.variables;
-  var marker = new RelayReferenceMarker(recordSource, variables, references, operationLoader, shouldProcessClientComponents);
+  var marker = new RelayReferenceMarker(recordSource, variables, references, operationLoader, shouldProcessClientComponents, useExecTimeResolvers);
   marker.mark(node, dataID);
 }
 var RelayReferenceMarker = /*#__PURE__*/function () {
-  function RelayReferenceMarker(recordSource, variables, references, operationLoader, shouldProcessClientComponents) {
+  function RelayReferenceMarker(recordSource, variables, references, operationLoader, shouldProcessClientComponents, useExecTimeResolvers) {
     this._operationLoader = operationLoader !== null && operationLoader !== void 0 ? operationLoader : null;
     this._operationName = null;
+    this._useExecTimeResolvers = useExecTimeResolvers !== null && useExecTimeResolvers !== void 0 ? useExecTimeResolvers : false;
     this._recordSource = recordSource;
     this._references = references;
     this._variables = variables;
@@ -123,8 +125,6 @@ var RelayReferenceMarker = /*#__PURE__*/function () {
           _this._traverseSelections(selection.fragment.selections, record);
           break;
         case 'RelayResolver':
-          _this._traverseResolverField(selection, record);
-          break;
         case 'RelayLiveResolver':
           _this._traverseResolverField(selection, record);
           break;
@@ -138,6 +138,10 @@ var RelayReferenceMarker = /*#__PURE__*/function () {
     });
   };
   _proto._traverseClientEdgeToClientObject = function _traverseClientEdgeToClientObject(field, record) {
+    if (this._useExecTimeResolvers) {
+      this._traverseLink(field.linkedField, record);
+      return;
+    }
     var dataID = this._traverseResolverField(field.backingField, record);
     if (dataID == null) {
       return;
@@ -195,7 +199,10 @@ var RelayReferenceMarker = /*#__PURE__*/function () {
     }
   };
   _proto._traverseResolverField = function _traverseResolverField(field, record) {
-    var storageKey = getStorageKey(field, this._variables);
+    if (this._useExecTimeResolvers) {
+      return;
+    }
+    var storageKey = getReadTimeResolverStorageKey(field, this._variables);
     var dataID = RelayModernRecord.getLinkedRecordID(record, storageKey);
     if (dataID != null) {
       this._references.add(dataID);