relay-runtime 0.0.0-main-da757ca9 → 0.0.0-main-ee99ea4b

package/store/RelayConcreteVariables.js.flow

@@ -15,7 +15,10 @@ import type {
   NormalizationLocalArgumentDefinition,
   NormalizationOperation,
 } from '../util/NormalizationNode';
-import type {ReaderFragment} from '../util/ReaderNode';
+import type {
+  ReaderFragment,
+  ReaderInlineDataFragmentSpread,
+} from '../util/ReaderNode';
 import type {ProvidedVariablesType} from '../util/RelayConcreteNode';
 import type {Variables} from '../util/RelayRuntimeTypes';
 
@@ -30,10 +33,16 @@ const invariant = require('invariant');
  * Note that this is analagous to determining function arguments given a function call.
  */
 function getFragmentVariables(
-  fragment: ReaderFragment,
+  fragment: ReaderFragment | ReaderInlineDataFragmentSpread,
   rootVariables: Variables,
   argumentVariables: Variables,
 ): Variables {
+  // TODO: Support for legacy ReaderInlineDataFragmentSpread nodes.
+  // Remove this once all we've updated the ReaderInlineDataFragmentSpread
+  // type to indicate that all compiled artifacts have been updated.
+  if (fragment.argumentDefinitions == null) {
+    return argumentVariables;
+  }
   let variables;
   fragment.argumentDefinitions.forEach(definition => {
     if (argumentVariables.hasOwnProperty(definition.name)) {

package/store/RelayReader.js.flow

@@ -70,6 +70,7 @@ const {
 } = require('../util/RelayConcreteNode');
 const RelayFeatureFlags = require('../util/RelayFeatureFlags');
 const ClientID = require('./ClientID');
+const RelayConcreteVariables = require('./RelayConcreteVariables');
 const RelayModernRecord = require('./RelayModernRecord');
 const {getReactFlightClientResponse} = require('./RelayStoreReactFlightUtils');
 const {
@@ -789,6 +790,7 @@ class RelayReader {
     data: SelectorData,
   ): ?mixed {
     const applicationName = field.alias ?? field.name;
+    getStorageKey(field, this._variables);
     const storageKey = getStorageKey(field, this._variables);
     const linkedID = RelayModernRecord.getLinkedRecordID(record, storageKey);
     if (linkedID == null) {
@@ -1109,11 +1111,35 @@ class RelayReader {
     const inlineData = {};
     const parentFragmentName = this._fragmentName;
     this._fragmentName = fragmentSpreadOrFragment.name;
+
+    const parentVariables = this._variables;
+
+    // We only want to update `this._variables` if we have compiler artifacts that support it.
+    // Until we've rolled out the compiler portion of this change, we need to check at runtime.
+    if (fragmentSpreadOrFragment.argumentDefinitions != null) {
+      // If the inline fragment spread has arguments, we need to temporarily
+      // switch this._variables to include the fragment spread's arguments
+      // for the duration of its traversal.
+      const argumentVariables = fragmentSpreadOrFragment.args
+        ? getArgumentValues(fragmentSpreadOrFragment.args, this._variables)
+        : {};
+
+      this._variables = RelayConcreteVariables.getFragmentVariables(
+        fragmentSpreadOrFragment,
+        this._owner.variables,
+        argumentVariables,
+      );
+    }
+
     this._traverseSelections(
       fragmentSpreadOrFragment.selections,
       record,
       inlineData,
     );
+
+    // Put the parent variables back
+    this._variables = parentVariables;
+
     this._fragmentName = parentFragmentName;
     // $FlowFixMe[cannot-write] - writing into read-only field
     fragmentPointers[fragmentSpreadOrFragment.name] = inlineData;

package/util/ReaderNode.js.flow

@@ -31,6 +31,10 @@ export type ReaderInlineDataFragmentSpread = {
   +kind: 'InlineDataFragmentSpread',
   +name: string,
   +selections: $ReadOnlyArray<ReaderSelection>,
+  // TODO: T123948544 Mark both of these as non-optional once the compiler
+  // changes have rolled out.
+  +args?: ?$ReadOnlyArray<ReaderArgument>,
+  +argumentDefinitions?: $ReadOnlyArray<ReaderArgumentDefinition>,
 };
 
 export type ReaderFragment = {