relay-runtime 0.0.0-main-e4919b17 → 0.0.0-main-454de5bb

package/store/RelayConcreteVariables.js.flow

@@ -18,7 +18,7 @@ import type {
   NormalizationOperation,
 } from '../util/NormalizationNode';
 import type {ReaderFragment} from '../util/ReaderNode';
-import type {RequestParameters} from '../util/RelayConcreteNode';
+import type {ProvidedVariablesType} from '../util/RelayConcreteNode';
 import type {Variables} from '../util/RelayRuntimeTypes';
 
 const {getArgumentValues} = require('./RelayStoreUtils');
@@ -85,7 +85,7 @@ function getFragmentVariables(
  */
 function getOperationVariables(
   operation: NormalizationOperation,
-  parameters: RequestParameters,
+  providedVariables: ?ProvidedVariablesType,
   variables: Variables,
 ): Variables {
   const operationVariables = {};
@@ -97,7 +97,6 @@ function getOperationVariables(
     operationVariables[def.name] = value;
   });
 
-  const providedVariables = parameters.providedVariables;
   if (providedVariables != null) {
     Object.keys(providedVariables).forEach((varName: string) => {
       operationVariables[varName] = providedVariables[varName].get();

package/store/RelayModernOperationDescriptor.js.flow

@@ -46,7 +46,7 @@ function createOperationDescriptor<TQuery: OperationType>(
   const operation = request.operation;
   const operationVariables = getOperationVariables(
     operation,
-    request.params,
+    request.params.providedVariables,
     variables,
   );
   const requestDescriptor = createRequestDescriptor(

package/util/RelayConcreteNode.js.flow

@@ -35,6 +35,8 @@ export type NormalizationRootNode =
   | ConcreteRequest
   | NormalizationSplitOperation;
 
+export type ProvidedVariablesType = {[key: string]: {|get(): mixed|}};
+
 /**
  * Contains the parameters required for executing a GraphQL request.
  * The operation can either be provided as a persisted `id` or `text`. If given
@@ -48,7 +50,7 @@ export type RequestParameters =
       // common fields
       +name: string,
       +operationKind: 'mutation' | 'query' | 'subscription',
-      +providedVariables?: {[key: string]: {|get(): mixed|}},
+      +providedVariables?: ProvidedVariablesType,
       +metadata: {[key: string]: mixed, ...},
     |}
   | {|
@@ -58,7 +60,7 @@ export type RequestParameters =
       // common fields
       +name: string,
       +operationKind: 'mutation' | 'query' | 'subscription',
-      +providedVariables?: {[key: string]: {|get(): mixed|}},
+      +providedVariables?: ProvidedVariablesType,
       +metadata: {[key: string]: mixed, ...},
     |};
 

package/util/withProvidedVariables.js.flow

@@ -13,7 +13,7 @@
 
 'use strict';
 
-import type {RequestParameters} from './RelayConcreteNode';
+import type {ProvidedVariablesType} from './RelayConcreteNode';
 import type {Variables} from './RelayRuntimeTypes';
 
 const areEqual = require('areEqual');
@@ -24,9 +24,8 @@ const debugCache = WEAKMAP_SUPPORTED ? new WeakMap() : new Map();
 
 function withProvidedVariables(
   userSuppliedVariables: Variables,
-  parameters: RequestParameters,
+  providedVariables: ?ProvidedVariablesType,
 ): Variables {
-  const providedVariables = parameters.providedVariables;
   if (providedVariables != null) {
     const operationVariables = {};
     Object.assign(operationVariables, userSuppliedVariables);