relay-runtime 13.0.0 → 13.0.1

package/store/RelayConcreteVariables.js.flow

@@ -18,6 +18,7 @@ import type {
   NormalizationOperation,
 } from '../util/NormalizationNode';
 import type {ReaderFragment} from '../util/ReaderNode';
+import type {RequestParameters} from '../util/RelayConcreteNode';
 import type {Variables} from '../util/RelayRuntimeTypes';
 
 const {getArgumentValues} = require('./RelayStoreUtils');
@@ -76,12 +77,15 @@ function getFragmentVariables(
 
 /**
  * Determines the variables that are in scope for a given operation given values
- * for some/all of its arguments. Extraneous input variables are filtered from
- * the output, and missing variables are set to default values (if given in the
+ * for some/all of its arguments.
+ * - extraneous input variables are filtered from the output
+ * - missing variables are set to default values (if given in the
  * operation's definition).
+ * - variables with provider modules are added
  */
 function getOperationVariables(
   operation: NormalizationOperation,
+  parameters: RequestParameters,
   variables: Variables,
 ): Variables {
   const operationVariables = {};
@@ -92,6 +96,13 @@ function getOperationVariables(
     }
     operationVariables[def.name] = value;
   });
+
+  const providedVariables = parameters.providedVariables;
+  if (providedVariables != null) {
+    Object.keys(providedVariables).forEach((varName: string) => {
+      operationVariables[varName] = providedVariables[varName].get();
+    });
+  }
   return operationVariables;
 }
 

package/store/RelayModernOperationDescriptor.js.flow

@@ -44,7 +44,11 @@ function createOperationDescriptor<TQuery: OperationType>(
   dataID?: DataID = ROOT_ID,
 ): OperationDescriptor {
   const operation = request.operation;
-  const operationVariables = getOperationVariables(operation, variables);
+  const operationVariables = getOperationVariables(
+    operation,
+    request.params,
+    variables,
+  );
   const requestDescriptor = createRequestDescriptor(
     request,
     operationVariables,

package/util/{getAllRootVariables.js.flow → withProvidedVariables.js.flow}

@@ -16,21 +16,21 @@
 import type {RequestParameters} from './RelayConcreteNode';
 import type {Variables} from './RelayRuntimeTypes';
 
-function getAllRootVariables(
+function withProvidedVariables(
   userSuppliedVariables: Variables,
   parameters: RequestParameters,
 ): Variables {
   const providedVariables = parameters.providedVariables;
   if (providedVariables != null) {
-    const allVariables = {};
-    Object.assign(allVariables, userSuppliedVariables);
+    const operationVariables = {};
+    Object.assign(operationVariables, userSuppliedVariables);
     Object.keys(providedVariables).forEach((varName: string) => {
-      allVariables[varName] = providedVariables[varName].get();
+      operationVariables[varName] = providedVariables[varName].get();
     });
-    return allVariables;
+    return operationVariables;
   } else {
     return userSuppliedVariables;
   }
 }
 
-module.exports = getAllRootVariables;
+module.exports = withProvidedVariables;