Rename variables to variableValues for clarity

Author: leebyron

src/execution/execute.js

@@ -81,7 +81,7 @@ type ExecutionContext = {
   fragments: {[key: string]: FragmentDefinition};
   rootValue: any;
   operation: OperationDefinition;
-  variables: {[key: string]: any};
+  variableValues: {[key: string]: any};
   errors: Array<GraphQLError>;
 }
 
@@ -155,7 +155,7 @@ function buildExecutionContext(
   schema: GraphQLSchema,
   documentAST: Document,
   rootValue: any,
-  variableValues: ?{[key: string]: any},
+  rawVariableValues: ?{[key: string]: any},
   operationName: ?string
 ): ExecutionContext {
   var errors: Array<GraphQLError> = [];
@@ -181,13 +181,13 @@ function buildExecutionContext(
   if (!operation) {
     throw new GraphQLError(`Unknown operation named "${opName}".`);
   }
-  var variables = getVariableValues(
+  var variableValues = getVariableValues(
     schema,
     operation.variableDefinitions || [],
-    variableValues || {}
+    rawVariableValues || {}
   );
   var exeContext: ExecutionContext =
-    { schema, fragments, rootValue, operation, variables, errors };
+    { schema, fragments, rootValue, operation, variableValues, errors };
   return exeContext;
 }
 
@@ -383,7 +383,7 @@ function shouldIncludeNode(
     var { if: skipIf } = getArgumentValues(
       GraphQLSkipDirective.args,
       skipAST.arguments,
-      exeContext.variables
+      exeContext.variableValues
     );
     return !skipIf;
   }
@@ -396,7 +396,7 @@ function shouldIncludeNode(
     var { if: includeIf } = getArgumentValues(
       GraphQLIncludeDirective.args,
       includeAST.arguments,
-      exeContext.variables
+      exeContext.variableValues
     );
     return Boolean(includeIf);
   }
@@ -478,7 +478,7 @@ function resolveField(
   var args = getArgumentValues(
     fieldDef.args,
     fieldAST.arguments,
-    exeContext.variables
+    exeContext.variableValues
   );
 
   // The resolve function's optional third argument is a collection of
@@ -492,7 +492,7 @@ function resolveField(
     fragments: exeContext.fragments,
     rootValue: exeContext.rootValue,
     operation: exeContext.operation,
-    variables: exeContext.variables,
+    variableValues: exeContext.variableValues,
   };
 
   // If an error occurs while calling the field `resolve` function, ensure that

src/execution/values.js

@@ -30,9 +30,9 @@ import type { Argument, VariableDefinition } from '../language/ast';
 
 
 /**
- * Prepares an object map of variables of the correct type based on the provided
- * variable definitions and arbitrary input. If the input cannot be parsed
- * to match the variable definitions, a GraphQLError will be thrown.
+ * Prepares an object map of variableValues of the correct type based on the
+ * provided variable definitions and arbitrary input. If the input cannot be
+ * parsed to match the variable definitions, a GraphQLError will be thrown.
  */
 export function getVariableValues(
   schema: GraphQLSchema,
@@ -54,7 +54,7 @@ export function getVariableValues(
 export function getArgumentValues(
   argDefs: ?Array<GraphQLArgument>,
   argASTs: ?Array<Argument>,
-  variables: { [key: string]: any }
+  variableValues: { [key: string]: any }
 ): { [key: string]: any } {
   if (!argDefs || !argASTs) {
     return {};
@@ -63,7 +63,7 @@ export function getArgumentValues(
   return argDefs.reduce((result, argDef) => {
     var name = argDef.name;
     var valueAST = argASTMap[name] ? argASTMap[name].value : null;
-    var value = valueFromAST(valueAST, argDef.type, variables);
+    var value = valueFromAST(valueAST, argDef.type, variableValues);
     if (isNullish(value)) {
       value = argDef.defaultValue;
     }

src/type/definition.js

@@ -365,7 +365,7 @@ export type GraphQLResolveInfo = {
   fragments: { [fragmentName: string]: FragmentDefinition },
   rootValue: any,
   operation: OperationDefinition,
-  variables: { [variableName: string]: any },
+  variableValues: { [variableName: string]: any },
 }
 
 export type GraphQLFieldConfig = {