relay-runtime 12.0.0 → 13.0.0-rc.0

package/lib/store/RelayModernStore.js

@@ -16,10 +16,20 @@ var _createForOfIteratorHelper2 = _interopRequireDefault(require("@babel/runtime
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
-var DataChecker = require('./DataChecker');
+var _require = require('../multi-actor-environment/ActorIdentifier'),
+    INTERNAL_ACTOR_IDENTIFIER_DO_NOT_USE = _require.INTERNAL_ACTOR_IDENTIFIER_DO_NOT_USE,
+    assertInternalActorIndentifier = _require.assertInternalActorIndentifier;
+
+var deepFreeze = require('../util/deepFreeze');
 
 var RelayFeatureFlags = require('../util/RelayFeatureFlags');
 
+var resolveImmediate = require('../util/resolveImmediate');
+
+var DataChecker = require('./DataChecker');
+
+var defaultGetDataID = require('./defaultGetDataID');
+
 var RelayModernRecord = require('./RelayModernRecord');
 
 var RelayOptimisticRecordSource = require('./RelayOptimisticRecordSource');
@@ -34,18 +44,6 @@ var RelayStoreSubscriptions = require('./RelayStoreSubscriptions');
 
 var RelayStoreUtils = require('./RelayStoreUtils');
 
-var deepFreeze = require('../util/deepFreeze');
-
-var defaultGetDataID = require('./defaultGetDataID');
-
-var invariant = require('invariant');
-
-var resolveImmediate = require('../util/resolveImmediate');
-
-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;
@@ -53,6 +51,8 @@ var _require2 = require('./RelayStoreUtils'),
 var _require3 = require('./ResolverCache'),
     RecordResolverCache = _require3.RecordResolverCache;
 
+var invariant = require('invariant');
+
 var DEFAULT_RELEASE_BUFFER_SIZE = 10;
 /**
  * @public
@@ -680,8 +680,7 @@ function updateTargetFromSource(target, source, currentWriteEpoch, idsMarkedForI
       }
 
       RelayModernRecord.setValue(nextRecord, RelayStoreUtils.INVALIDATED_AT_KEY, currentWriteEpoch);
-      invalidatedRecordIDs.add(dataID); // $FlowFixMe[incompatible-call]
-
+      invalidatedRecordIDs.add(dataID);
       target.set(dataID, nextRecord);
     });
   } // Update the target based on the changes present in source

package/lib/store/RelayPublishQueue.js

@@ -12,16 +12,16 @@
 
 var _global$ErrorUtils$ap, _global, _global$ErrorUtils;
 
-var RelayReader = require('./RelayReader');
-
-var RelayRecordSource = require('./RelayRecordSource');
-
 var RelayRecordSourceMutator = require('../mutations/RelayRecordSourceMutator');
 
 var RelayRecordSourceProxy = require('../mutations/RelayRecordSourceProxy');
 
 var RelayRecordSourceSelectorProxy = require('../mutations/RelayRecordSourceSelectorProxy');
 
+var RelayReader = require('./RelayReader');
+
+var RelayRecordSource = require('./RelayRecordSource');
+
 var invariant = require('invariant');
 
 var warning = require("fbjs/lib/warning");
@@ -45,9 +45,15 @@ var RelayPublishQueue = /*#__PURE__*/function () {
   // True if the next `run()` should apply the backup and rerun all optimistic
   // updates performing a rebase.
   // Payloads to apply or Sources to publish to the store with the next `run()`.
+  // $FlowFixMe[unclear-type] See explanation below.
   // Optimistic updaters to add with the next `run()`.
+  // $FlowFixMe[unclear-type] See explanation below.
   // Optimistic updaters that are already added and might be rerun in order to
   // rebase them.
+  // $FlowFixMe[unclear-type] See explanation below.
+  // For _pendingOptimisticUpdates, _appliedOptimisticUpdates, and _pendingData,
+  // we want to parametrize by "any" since the type is effectively
+  // "the union of all T's that PublishQueue's methods were called with".
   // Garbage collection hold, should rerun gc on dispose
   function RelayPublishQueue(store, handlerProvider, getDataID) {
     this._hasStoreSnapshot = false;
@@ -301,7 +307,7 @@ var RelayPublishQueue = /*#__PURE__*/function () {
 
     var sink = RelayRecordSource.create();
     var mutator = new RelayRecordSourceMutator(this._store.getSource(), sink);
-    var recordSourceProxy = new RelayRecordSourceProxy(mutator, this._getDataID, this._handlerProvider);
+    var recordSourceProxy = new RelayRecordSourceProxy(mutator, this._getDataID, this._handlerProvider); // $FlowFixMe[unclear-type] see explanation above.
 
     var processUpdate = function processUpdate(optimisticUpdate) {
       if (optimisticUpdate.storeUpdater) {

package/lib/store/RelayReader.js

@@ -14,16 +14,11 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
-var ClientID = require('./ClientID');
-
-var RelayFeatureFlags = require('../util/RelayFeatureFlags');
-
-var RelayModernRecord = require('./RelayModernRecord');
-
-var invariant = require('invariant');
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
 var _require = require('../util/RelayConcreteNode'),
     ACTOR_CHANGE = _require.ACTOR_CHANGE,
+    CLIENT_EDGE = _require.CLIENT_EDGE,
     CLIENT_EXTENSION = _require.CLIENT_EXTENSION,
     CONDITION = _require.CONDITION,
     DEFER = _require.DEFER,
@@ -33,25 +28,32 @@ var _require = require('../util/RelayConcreteNode'),
     INLINE_FRAGMENT = _require.INLINE_FRAGMENT,
     LINKED_FIELD = _require.LINKED_FIELD,
     MODULE_IMPORT = _require.MODULE_IMPORT,
-    REQUIRED_FIELD = _require.REQUIRED_FIELD,
     RELAY_RESOLVER = _require.RELAY_RESOLVER,
+    REQUIRED_FIELD = _require.REQUIRED_FIELD,
     SCALAR_FIELD = _require.SCALAR_FIELD,
     STREAM = _require.STREAM;
 
+var RelayFeatureFlags = require('../util/RelayFeatureFlags');
+
+var ClientID = require('./ClientID');
+
+var RelayModernRecord = require('./RelayModernRecord');
+
 var _require2 = require('./RelayStoreReactFlightUtils'),
     getReactFlightClientResponse = _require2.getReactFlightClientResponse;
 
 var _require3 = require('./RelayStoreUtils'),
-    FRAGMENTS_KEY = _require3.FRAGMENTS_KEY,
+    CLIENT_EDGE_TRAVERSAL_PATH = _require3.CLIENT_EDGE_TRAVERSAL_PATH,
     FRAGMENT_OWNER_KEY = _require3.FRAGMENT_OWNER_KEY,
     FRAGMENT_PROP_NAME_KEY = _require3.FRAGMENT_PROP_NAME_KEY,
+    FRAGMENTS_KEY = _require3.FRAGMENTS_KEY,
     ID_KEY = _require3.ID_KEY,
     IS_WITHIN_UNMATCHED_TYPE_REFINEMENT = _require3.IS_WITHIN_UNMATCHED_TYPE_REFINEMENT,
     MODULE_COMPONENT_KEY = _require3.MODULE_COMPONENT_KEY,
     ROOT_ID = _require3.ROOT_ID,
     getArgumentValues = _require3.getArgumentValues,
-    getStorageKey = _require3.getStorageKey,
-    getModuleComponentKey = _require3.getModuleComponentKey;
+    getModuleComponentKey = _require3.getModuleComponentKey,
+    getStorageKey = _require3.getStorageKey;
 
 var _require4 = require('./ResolverCache'),
     NoopResolverCache = _require4.NoopResolverCache;
@@ -62,6 +64,8 @@ var _require5 = require('./ResolverFragments'),
 var _require6 = require('./TypeID'),
     generateTypeID = _require6.generateTypeID;
 
+var invariant = require('invariant');
+
 function read(recordSource, selector, resolverCache) {
   var reader = new RelayReader(recordSource, selector, resolverCache !== null && resolverCache !== void 0 ? resolverCache : new NoopResolverCache());
   return reader.read();
@@ -73,6 +77,10 @@ function read(recordSource, selector, resolverCache) {
 
 var RelayReader = /*#__PURE__*/function () {
   function RelayReader(recordSource, selector, resolverCache) {
+    var _selector$clientEdgeT;
+
+    this._clientEdgeTraversalPath = RelayFeatureFlags.ENABLE_CLIENT_EDGES && ((_selector$clientEdgeT = selector.clientEdgeTraversalPath) === null || _selector$clientEdgeT === void 0 ? void 0 : _selector$clientEdgeT.length) ? (0, _toConsumableArray2["default"])(selector.clientEdgeTraversalPath) : [];
+    this._missingClientEdges = [];
     this._isMissingData = false;
     this._isWithinUnmatchedTypeRefinement = false;
     this._missingRequiredFields = null;
@@ -152,12 +160,30 @@ var RelayReader = /*#__PURE__*/function () {
     return {
       data: data,
       isMissingData: this._isMissingData && isDataExpectedToBePresent,
+      missingClientEdges: RelayFeatureFlags.ENABLE_CLIENT_EDGES && this._missingClientEdges.length ? this._missingClientEdges : null,
       seenRecords: this._seenRecords,
       selector: this._selector,
       missingRequiredFields: this._missingRequiredFields
     };
   };
 
+  _proto._markDataAsMissing = function _markDataAsMissing() {
+    this._isMissingData = true;
+
+    if (RelayFeatureFlags.ENABLE_CLIENT_EDGES && this._clientEdgeTraversalPath.length) {
+      var 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({
+          request: top.readerClientEdge.operation,
+          clientEdgeDestinationID: top.clientEdgeDestinationID
+        });
+      }
+    }
+  };
+
   _proto._traverse = function _traverse(node, dataID, prevData) {
     var record = this._recordSource.get(dataID);
 
@@ -165,7 +191,7 @@ var RelayReader = /*#__PURE__*/function () {
 
     if (record == null) {
       if (record === undefined) {
-        this._isMissingData = true;
+        this._markDataAsMissing();
       }
 
       return record;
@@ -179,8 +205,7 @@ var RelayReader = /*#__PURE__*/function () {
   };
 
   _proto._getVariableValue = function _getVariableValue(name) {
-    !this._variables.hasOwnProperty(name) ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayReader(): Undefined variable `%s`.', name) : invariant(false) : void 0; // $FlowFixMe[cannot-write]
-
+    !this._variables.hasOwnProperty(name) ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayReader(): Undefined variable `%s`.', name) : invariant(false) : void 0;
     return this._variables[name];
   };
 
@@ -322,7 +347,7 @@ var RelayReader = /*#__PURE__*/function () {
                 this._isMissingData = parentIsMissingData;
               } else if (implementsInterface == null) {
                 // Don't know if the type implements the interface or not
-                this._isMissingData = true;
+                this._markDataAsMissing();
               }
             }
 
@@ -359,10 +384,22 @@ var RelayReader = /*#__PURE__*/function () {
         case CLIENT_EXTENSION:
           {
             var isMissingData = this._isMissingData;
+            var alreadyMissingClientEdges = this._missingClientEdges.length;
+
+            if (RelayFeatureFlags.ENABLE_CLIENT_EDGES) {
+              this._clientEdgeTraversalPath.push(null);
+            }
+
+            var _hasExpectedData2 = this._traverseSelections(selection.selections, record, data); // The only case where we want to suspend due to missing data off of
+            // a client extension is if we reached a client edge that we might be
+            // able to fetch:
+
 
-            var _hasExpectedData2 = this._traverseSelections(selection.selections, record, data);
+            this._isMissingData = isMissingData || this._missingClientEdges.length > alreadyMissingClientEdges;
 
-            this._isMissingData = isMissingData;
+            if (RelayFeatureFlags.ENABLE_CLIENT_EDGES) {
+              this._clientEdgeTraversalPath.pop();
+            }
 
             if (!_hasExpectedData2) {
               return false;
@@ -396,6 +433,15 @@ var RelayReader = /*#__PURE__*/function () {
 
           break;
 
+        case CLIENT_EDGE:
+          if (RelayFeatureFlags.ENABLE_CLIENT_EDGES) {
+            this._readClientEdge(selection, record, data);
+          } else {
+            throw new Error('Client edges are not yet supported.');
+          }
+
+          break;
+
         default:
           selection;
           !false ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayReader(): Unexpected ast kind `%s`.', selection.kind) : invariant(false) : void 0;
@@ -435,6 +481,8 @@ var RelayReader = /*#__PURE__*/function () {
   _proto._readResolverField = function _readResolverField(field, record, data) {
     var _this = this;
 
+    var _field$alias;
+
     var resolverModule = field.resolverModule,
         fragment = field.fragment;
     var storageKey = getStorageKey(field, this._variables);
@@ -502,14 +550,53 @@ var RelayReader = /*#__PURE__*/function () {
       this._seenRecords.add(seenRecord);
     }
 
-    data[storageKey] = result;
-    return result;
+    var applicationName = (_field$alias = field.alias) !== null && _field$alias !== void 0 ? _field$alias : field.name;
+    data[applicationName] = result;
+  };
+
+  _proto._readClientEdge = function _readClientEdge(field, record, data) {
+    var _backingField$alias;
+
+    var backingField = field.backingField; // Because ReaderClientExtension doesn't have `alias` or `name` and so I don't know
+    // how to get its applicationName or storageKey yet:
+
+    !(backingField.kind !== 'ClientExtension') ? process.env.NODE_ENV !== "production" ? invariant(false, 'Client extension client edges are not yet implemented.') : invariant(false) : void 0;
+    var applicationName = (_backingField$alias = backingField.alias) !== null && _backingField$alias !== void 0 ? _backingField$alias : backingField.name;
+    var backingFieldData = {};
+
+    this._traverseSelections([backingField], record, backingFieldData);
+
+    var destinationDataID = backingFieldData[applicationName];
+
+    if (destinationDataID == null) {
+      data[applicationName] = destinationDataID;
+      return;
+    }
+
+    !(typeof destinationDataID === 'string') ? process.env.NODE_ENV !== "production" ? invariant(false, 'Plural client edges not are yet implemented') : invariant(false) : void 0; // FIXME support plural
+    // Not wrapping the push/pop in a try/finally because if we throw, the
+    // Reader object is not usable after that anyway.
+
+    this._clientEdgeTraversalPath.push({
+      readerClientEdge: field,
+      clientEdgeDestinationID: destinationDataID
+    });
+
+    var prevData = data[applicationName];
+    !(prevData == null || typeof prevData === 'object') ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayReader(): Expected data for field `%s` on record `%s` ' + 'to be an object, got `%s`.', applicationName, RelayModernRecord.getDataID(record), prevData) : invariant(false) : void 0;
+
+    var value = this._traverse(field.linkedField, destinationDataID, // $FlowFixMe[incompatible-variance]
+    prevData);
+
+    data[applicationName] = value;
+
+    this._clientEdgeTraversalPath.pop();
   };
 
   _proto._readFlightField = function _readFlightField(field, record, data) {
-    var _field$alias;
+    var _field$alias2;
 
-    var applicationName = (_field$alias = field.alias) !== null && _field$alias !== void 0 ? _field$alias : field.name;
+    var applicationName = (_field$alias2 = field.alias) !== null && _field$alias2 !== void 0 ? _field$alias2 : field.name;
     var storageKey = getStorageKey(field, this._variables);
     var reactFlightClientResponseRecordID = RelayModernRecord.getLinkedRecordID(record, storageKey);
 
@@ -517,7 +604,7 @@ var RelayReader = /*#__PURE__*/function () {
       data[applicationName] = reactFlightClientResponseRecordID;
 
       if (reactFlightClientResponseRecordID === undefined) {
-        this._isMissingData = true;
+        this._markDataAsMissing();
       }
 
       return reactFlightClientResponseRecordID;
@@ -531,7 +618,7 @@ var RelayReader = /*#__PURE__*/function () {
       data[applicationName] = reactFlightClientResponseRecord;
 
       if (reactFlightClientResponseRecord === undefined) {
-        this._isMissingData = true;
+        this._markDataAsMissing();
       }
 
       return reactFlightClientResponseRecord;
@@ -543,14 +630,14 @@ var RelayReader = /*#__PURE__*/function () {
   };
 
   _proto._readScalar = function _readScalar(field, record, data) {
-    var _field$alias2;
+    var _field$alias3;
 
-    var applicationName = (_field$alias2 = field.alias) !== null && _field$alias2 !== void 0 ? _field$alias2 : field.name;
+    var applicationName = (_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 === undefined) {
-      this._isMissingData = true;
+      this._markDataAsMissing();
     }
 
     data[applicationName] = value;
@@ -558,9 +645,9 @@ var RelayReader = /*#__PURE__*/function () {
   };
 
   _proto._readLink = function _readLink(field, record, data) {
-    var _field$alias3;
+    var _field$alias4;
 
-    var applicationName = (_field$alias3 = field.alias) !== null && _field$alias3 !== void 0 ? _field$alias3 : field.name;
+    var applicationName = (_field$alias4 = field.alias) !== null && _field$alias4 !== void 0 ? _field$alias4 : field.name;
     var storageKey = getStorageKey(field, this._variables);
     var linkedID = RelayModernRecord.getLinkedRecordID(record, storageKey);
 
@@ -568,7 +655,7 @@ var RelayReader = /*#__PURE__*/function () {
       data[applicationName] = linkedID;
 
       if (linkedID === undefined) {
-        this._isMissingData = true;
+        this._markDataAsMissing();
       }
 
       return linkedID;
@@ -584,9 +671,9 @@ var RelayReader = /*#__PURE__*/function () {
   };
 
   _proto._readActorChange = function _readActorChange(field, record, data) {
-    var _field$alias4;
+    var _field$alias5;
 
-    var applicationName = (_field$alias4 = field.alias) !== null && _field$alias4 !== void 0 ? _field$alias4 : field.name;
+    var applicationName = (_field$alias5 = field.alias) !== null && _field$alias5 !== void 0 ? _field$alias5 : field.name;
     var storageKey = getStorageKey(field, this._variables);
     var externalRef = RelayModernRecord.getActorLinkedRecordID(record, storageKey);
 
@@ -594,7 +681,7 @@ var RelayReader = /*#__PURE__*/function () {
       data[applicationName] = externalRef;
 
       if (externalRef === undefined) {
-        this._isMissingData = true;
+        this._markDataAsMissing();
       }
 
       return data[applicationName];
@@ -618,9 +705,9 @@ var RelayReader = /*#__PURE__*/function () {
   _proto._readPluralLink = function _readPluralLink(field, record, data) {
     var _this2 = this;
 
-    var _field$alias5;
+    var _field$alias6;
 
-    var applicationName = (_field$alias5 = field.alias) !== null && _field$alias5 !== void 0 ? _field$alias5 : field.name;
+    var applicationName = (_field$alias6 = field.alias) !== null && _field$alias6 !== void 0 ? _field$alias6 : field.name;
     var storageKey = getStorageKey(field, this._variables);
     var linkedIDs = RelayModernRecord.getLinkedRecordIDs(record, storageKey);
 
@@ -628,7 +715,7 @@ var RelayReader = /*#__PURE__*/function () {
       data[applicationName] = linkedIDs;
 
       if (linkedIDs === undefined) {
-        this._isMissingData = true;
+        this._markDataAsMissing();
       }
 
       return linkedIDs;
@@ -640,7 +727,7 @@ var RelayReader = /*#__PURE__*/function () {
     linkedIDs.forEach(function (linkedID, nextIndex) {
       if (linkedID == null) {
         if (linkedID === undefined) {
-          _this2._isMissingData = true;
+          _this2._markDataAsMissing();
         } // $FlowFixMe[cannot-write]
 
 
@@ -671,7 +758,7 @@ var RelayReader = /*#__PURE__*/function () {
 
     if (component == null) {
       if (component === undefined) {
-        this._isMissingData = true;
+        this._markDataAsMissing();
       }
 
       return;
@@ -709,6 +796,12 @@ var RelayReader = /*#__PURE__*/function () {
     fragmentPointers[fragmentSpread.name] = fragmentSpread.args ? getArgumentValues(fragmentSpread.args, this._variables) : {};
     data[FRAGMENT_OWNER_KEY] = this._owner;
     data[IS_WITHIN_UNMATCHED_TYPE_REFINEMENT] = this._isWithinUnmatchedTypeRefinement;
+
+    if (RelayFeatureFlags.ENABLE_CLIENT_EDGES) {
+      if (this._clientEdgeTraversalPath.length > 0 && this._clientEdgeTraversalPath[this._clientEdgeTraversalPath.length - 1] !== null) {
+        data[CLIENT_EDGE_TRAVERSAL_PATH] = (0, _toConsumableArray2["default"])(this._clientEdgeTraversalPath);
+      }
+    }
   };
 
   _proto._createInlineDataOrResolverFragmentPointer = function _createInlineDataOrResolverFragmentPointer(fragmentSpreadOrFragment, record, data) {

package/lib/store/RelayReferenceMarker.js

@@ -14,28 +14,28 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 
 var _createForOfIteratorHelper2 = _interopRequireDefault(require("@babel/runtime/helpers/createForOfIteratorHelper"));
 
+var getOperation = require('../util/getOperation');
+
 var RelayConcreteNode = require('../util/RelayConcreteNode');
 
 var RelayFeatureFlags = require('../util/RelayFeatureFlags');
 
+var cloneRelayHandleSourceField = require('./cloneRelayHandleSourceField');
+
+var _require = require('./RelayConcreteVariables'),
+    getLocalVariables = _require.getLocalVariables;
+
 var RelayModernRecord = require('./RelayModernRecord');
 
 var RelayStoreReactFlightUtils = require('./RelayStoreReactFlightUtils');
 
 var RelayStoreUtils = require('./RelayStoreUtils');
 
-var cloneRelayHandleSourceField = require('./cloneRelayHandleSourceField');
-
-var getOperation = require('../util/getOperation');
-
-var invariant = require('invariant');
-
-var _require = require('./RelayConcreteVariables'),
-    getLocalVariables = _require.getLocalVariables;
-
 var _require2 = require('./TypeID'),
     generateTypeID = _require2.generateTypeID;
 
+var invariant = require('invariant');
+
 var ACTOR_CHANGE = RelayConcreteNode.ACTOR_CHANGE,
     CONDITION = RelayConcreteNode.CONDITION,
     CLIENT_COMPONENT = RelayConcreteNode.CLIENT_COMPONENT,
@@ -100,8 +100,7 @@ var RelayReferenceMarker = /*#__PURE__*/function () {
   };
 
   _proto._getVariableValue = function _getVariableValue(name) {
-    !this._variables.hasOwnProperty(name) ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayReferenceMarker(): Undefined variable `%s`.', name) : invariant(false) : void 0; // $FlowFixMe[cannot-write]
-
+    !this._variables.hasOwnProperty(name) ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayReferenceMarker(): Undefined variable `%s`.', name) : invariant(false) : void 0;
     return this._variables[name];
   };
 

package/lib/store/RelayResponseNormalizer.js

@@ -16,25 +16,15 @@ var _createForOfIteratorHelper2 = _interopRequireDefault(require("@babel/runtime
 
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
-var RelayFeatureFlags = require('../util/RelayFeatureFlags');
-
-var RelayModernRecord = require('./RelayModernRecord');
-
-var areEqual = require("fbjs/lib/areEqual");
-
-var invariant = require('invariant');
-
-var warning = require("fbjs/lib/warning");
-
 var _require = require('../multi-actor-environment/ActorUtils'),
     ACTOR_IDENTIFIER_FIELD_NAME = _require.ACTOR_IDENTIFIER_FIELD_NAME,
     getActorIdentifierFromPayload = _require.getActorIdentifierFromPayload;
 
 var _require2 = require('../util/RelayConcreteNode'),
     ACTOR_CHANGE = _require2.ACTOR_CHANGE,
-    CONDITION = _require2.CONDITION,
     CLIENT_COMPONENT = _require2.CLIENT_COMPONENT,
     CLIENT_EXTENSION = _require2.CLIENT_EXTENSION,
+    CONDITION = _require2.CONDITION,
     DEFER = _require2.DEFER,
     FLIGHT_FIELD = _require2.FLIGHT_FIELD,
     FRAGMENT_SPREAD = _require2.FRAGMENT_SPREAD,
@@ -47,6 +37,8 @@ var _require2 = require('../util/RelayConcreteNode'),
     STREAM = _require2.STREAM,
     TYPE_DISCRIMINATOR = _require2.TYPE_DISCRIMINATOR;
 
+var RelayFeatureFlags = require('../util/RelayFeatureFlags');
+
 var _require3 = require('./ClientID'),
     generateClientID = _require3.generateClientID,
     isClientID = _require3.isClientID;
@@ -54,28 +46,36 @@ var _require3 = require('./ClientID'),
 var _require4 = require('./RelayConcreteVariables'),
     getLocalVariables = _require4.getLocalVariables;
 
+var RelayModernRecord = require('./RelayModernRecord');
+
 var _require5 = require('./RelayModernSelector'),
     createNormalizationSelector = _require5.createNormalizationSelector;
 
 var _require6 = require('./RelayStoreReactFlightUtils'),
-    refineToReactFlightPayloadData = _require6.refineToReactFlightPayloadData,
     REACT_FLIGHT_EXECUTABLE_DEFINITIONS_STORAGE_KEY = _require6.REACT_FLIGHT_EXECUTABLE_DEFINITIONS_STORAGE_KEY,
     REACT_FLIGHT_TREE_STORAGE_KEY = _require6.REACT_FLIGHT_TREE_STORAGE_KEY,
-    REACT_FLIGHT_TYPE_NAME = _require6.REACT_FLIGHT_TYPE_NAME;
+    REACT_FLIGHT_TYPE_NAME = _require6.REACT_FLIGHT_TYPE_NAME,
+    refineToReactFlightPayloadData = _require6.refineToReactFlightPayloadData;
 
 var _require7 = require('./RelayStoreUtils'),
+    ROOT_ID = _require7.ROOT_ID,
+    ROOT_TYPE = _require7.ROOT_TYPE,
+    TYPENAME_KEY = _require7.TYPENAME_KEY,
     getArgumentValues = _require7.getArgumentValues,
     getHandleStorageKey = _require7.getHandleStorageKey,
     getModuleComponentKey = _require7.getModuleComponentKey,
     getModuleOperationKey = _require7.getModuleOperationKey,
-    getStorageKey = _require7.getStorageKey,
-    TYPENAME_KEY = _require7.TYPENAME_KEY,
-    ROOT_ID = _require7.ROOT_ID,
-    ROOT_TYPE = _require7.ROOT_TYPE;
+    getStorageKey = _require7.getStorageKey;
 
 var _require8 = require('./TypeID'),
-    generateTypeID = _require8.generateTypeID,
-    TYPE_SCHEMA_TYPE = _require8.TYPE_SCHEMA_TYPE;
+    TYPE_SCHEMA_TYPE = _require8.TYPE_SCHEMA_TYPE,
+    generateTypeID = _require8.generateTypeID;
+
+var areEqual = require("fbjs/lib/areEqual");
+
+var invariant = require('invariant');
+
+var warning = require("fbjs/lib/warning");
 
 /**
  * Normalizes the results of a query and standard GraphQL response, writing the
@@ -133,8 +133,7 @@ var RelayResponseNormalizer = /*#__PURE__*/function () {
   };
 
   _proto._getVariableValue = function _getVariableValue(name) {
-    !this._variables.hasOwnProperty(name) ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayResponseNormalizer(): Undefined variable `%s`.', name) : invariant(false) : void 0; // $FlowFixMe[cannot-write]
-
+    !this._variables.hasOwnProperty(name) ? process.env.NODE_ENV !== "production" ? invariant(false, 'RelayResponseNormalizer(): Undefined variable `%s`.', name) : invariant(false) : void 0;
     return this._variables[name];
   };
 
@@ -422,7 +421,11 @@ var RelayResponseNormalizer = /*#__PURE__*/function () {
 
       if (process.env.NODE_ENV !== "production") {
         if (selection.kind === SCALAR_FIELD) {
-          this._validateConflictingFieldsWithIdenticalId(record, storageKey, fieldValue);
+          this._validateConflictingFieldsWithIdenticalId(record, storageKey, // When using `treatMissingFieldsAsNull` the conflicting validation raises a false positive
+          // because the value is set using `null` but validated using `fieldValue` which at this point
+          // will be `undefined`.
+          // Setting this to `null` matches the value that we actually set to the `fieldValue`.
+          null);
         }
       }
 

package/lib/store/RelayStoreReactFlightUtils.js

@@ -10,13 +10,13 @@
 // flowlint ambiguous-object-type:error
 'use strict';
 
-var invariant = require('invariant');
-
 var _require = require('./RelayModernRecord'),
     getType = _require.getType;
 
-// Reachable (client) executable definitions encountered while server component
+var invariant = require('invariant'); // Reachable (client) executable definitions encountered while server component
 // rendering
+
+
 var REACT_FLIGHT_EXECUTABLE_DEFINITIONS_STORAGE_KEY = 'executableDefinitions';
 var REACT_FLIGHT_TREE_STORAGE_KEY = 'tree';
 var REACT_FLIGHT_TYPE_NAME = 'ReactFlightComponent';

package/lib/store/RelayStoreSubscriptions.js

@@ -10,15 +10,15 @@
 // flowlint ambiguous-object-type:error
 'use strict';
 
-var RelayFeatureFlags = require('../util/RelayFeatureFlags');
+var deepFreeze = require('../util/deepFreeze');
 
-var RelayReader = require('./RelayReader');
+var recycleNodesInto = require('../util/recycleNodesInto');
 
-var deepFreeze = require('../util/deepFreeze');
+var RelayFeatureFlags = require('../util/RelayFeatureFlags');
 
 var hasOverlappingIDs = require('./hasOverlappingIDs');
 
-var recycleNodesInto = require('../util/recycleNodesInto');
+var RelayReader = require('./RelayReader');
 
 var RelayStoreSubscriptions = /*#__PURE__*/function () {
   function RelayStoreSubscriptions(log, resolverCache) {
@@ -93,6 +93,7 @@ var RelayStoreSubscriptions = /*#__PURE__*/function () {
         subscription.snapshot = {
           data: subscription.snapshot.data,
           isMissingData: backup.isMissingData,
+          missingClientEdges: backup.missingClientEdges,
           seenRecords: backup.seenRecords,
           selector: backup.selector,
           missingRequiredFields: backup.missingRequiredFields
@@ -142,6 +143,7 @@ var RelayStoreSubscriptions = /*#__PURE__*/function () {
     nextSnapshot = {
       data: nextData,
       isMissingData: nextSnapshot.isMissingData,
+      missingClientEdges: nextSnapshot.missingClientEdges,
       seenRecords: nextSnapshot.seenRecords,
       selector: nextSnapshot.selector,
       missingRequiredFields: nextSnapshot.missingRequiredFields