Execute: Remove excessive arguments

Author: IvanGoncharov

src/execution/execute.js

@@ -703,9 +703,8 @@ function resolveField(
   // Get the resolve function, regardless of if its result is normal
   // or abrupt (error).
   const result = resolveFieldValueOrError(
-    exeContext,
+    exeContext.contextValue,
     fieldDef,
-    fieldNodes,
     resolveFn,
     source,
     info,
@@ -714,7 +713,6 @@ function resolveField(
   return completeValueCatchingError(
     exeContext,
     fieldDef.type,
-    fieldNodes,
     info,
     path,
     result,
@@ -731,7 +729,7 @@ export function buildResolveInfo(
   // The resolve function's optional fourth argument is a collection of
   // information about the current execution state.
   return {
-    fieldName: fieldNodes[0].name.value,
+    fieldName: fieldDef.name,
     fieldNodes,
     returnType: fieldDef.type,
     parentType,
@@ -747,9 +745,8 @@ export function buildResolveInfo(
 // Isolates the "ReturnOrAbrupt" behavior to not de-opt the `resolveField`
 // function. Returns the result of resolveFn or the abrupt-return Error object.
 export function resolveFieldValueOrError<TSource>(
-  exeContext: ExecutionContext,
+  contextValue: mixed,
   fieldDef: GraphQLField<TSource, *>,
-  fieldNodes: $ReadOnlyArray<FieldNode>,
   resolveFn: GraphQLFieldResolver<TSource, *>,
   source: TSource,
   info: GraphQLResolveInfo,
@@ -760,16 +757,14 @@ export function resolveFieldValueOrError<TSource>(
     // TODO: find a way to memoize, in case this field is within a List type.
     const args = getArgumentValues(
       fieldDef,
-      fieldNodes[0],
-      exeContext.variableValues,
+      info.fieldNodes[0],
+      info.variableValues,
     );
 
     // The resolve function's optional third argument is a context value that
     // is provided to every resolve function within an execution. It is commonly
     // used to represent an authenticated user, or request-specific caches.
-    const context = exeContext.contextValue;
-
-    const result = resolveFn(source, args, context, info);
+    const result = resolveFn(source, args, contextValue, info);
     return isPromise(result) ? result.then(undefined, asErrorInstance) : result;
   } catch (error) {
     return asErrorInstance(error);
@@ -787,7 +782,6 @@ function asErrorInstance(error: mixed): Error {
 function completeValueCatchingError(
   exeContext: ExecutionContext,
   returnType: GraphQLOutputType,
-  fieldNodes: $ReadOnlyArray<FieldNode>,
   info: GraphQLResolveInfo,
   path: ResponsePath,
   result: mixed,
@@ -798,7 +792,6 @@ function completeValueCatchingError(
     return completeValueWithLocatedError(
       exeContext,
       returnType,
-      fieldNodes,
       info,
       path,
       result,
@@ -811,7 +804,6 @@ function completeValueCatchingError(
     const completed = completeValueWithLocatedError(
       exeContext,
       returnType,
-      fieldNodes,
       info,
       path,
       result,
@@ -840,26 +832,18 @@ function completeValueCatchingError(
 function completeValueWithLocatedError(
   exeContext: ExecutionContext,
   returnType: GraphQLOutputType,
-  fieldNodes: $ReadOnlyArray<FieldNode>,
   info: GraphQLResolveInfo,
   path: ResponsePath,
   result: mixed,
 ): MaybePromise<mixed> {
   try {
-    const completed = completeValue(
-      exeContext,
-      returnType,
-      fieldNodes,
-      info,
-      path,
-      result,
-    );
+    const completed = completeValue(exeContext, returnType, info, path, result);
     if (isPromise(completed)) {
       return completed.then(undefined, error =>
         Promise.reject(
           locatedError(
             asErrorInstance(error),
-            fieldNodes,
+            info.fieldNodes,
             responsePathAsArray(path),
           ),
         ),
@@ -869,7 +853,7 @@ function completeValueWithLocatedError(
   } catch (error) {
     throw locatedError(
       asErrorInstance(error),
-      fieldNodes,
+      info.fieldNodes,
       responsePathAsArray(path),
     );
   }
@@ -899,15 +883,14 @@ function completeValueWithLocatedError(
 function completeValue(
   exeContext: ExecutionContext,
   returnType: GraphQLOutputType,
-  fieldNodes: $ReadOnlyArray<FieldNode>,
   info: GraphQLResolveInfo,
   path: ResponsePath,
   result: mixed,
 ): MaybePromise<mixed> {
   // If result is a Promise, apply-lift over completeValue.
   if (isPromise(result)) {
     return result.then(resolved =>
-      completeValue(exeContext, returnType, fieldNodes, info, path, resolved),
+      completeValue(exeContext, returnType, info, path, resolved),
     );
   }
 
@@ -922,7 +905,6 @@ function completeValue(
     const completed = completeValue(
       exeContext,
       returnType.ofType,
-      fieldNodes,
       info,
       path,
       result,
@@ -944,14 +926,7 @@ function completeValue(
 
   // If field type is List, complete each item in the list with the inner type
   if (isListType(returnType)) {
-    return completeListValue(
-      exeContext,
-      returnType,
-      fieldNodes,
-      info,
-      path,
-      result,
-    );
+    return completeListValue(exeContext, returnType, info, path, result);
   }
 
   // If field type is a leaf type, Scalar or Enum, serialize to a valid value,
@@ -963,26 +938,12 @@ function completeValue(
   // If field type is an abstract type, Interface or Union, determine the
   // runtime Object type and complete for that type.
   if (isAbstractType(returnType)) {
-    return completeAbstractValue(
-      exeContext,
-      returnType,
-      fieldNodes,
-      info,
-      path,
-      result,
-    );
+    return completeAbstractValue(exeContext, returnType, info, path, result);
   }
 
   // If field type is Object, execute and complete all sub-selections.
   if (isObjectType(returnType)) {
-    return completeObjectValue(
-      exeContext,
-      returnType,
-      fieldNodes,
-      info,
-      path,
-      result,
-    );
+    return completeObjectValue(exeContext, returnType, info, path, result);
   }
 
   // Not reachable. All possible output types have been considered.
@@ -1001,7 +962,6 @@ function completeValue(
 function completeListValue(
   exeContext: ExecutionContext,
   returnType: GraphQLList<GraphQLOutputType>,
-  fieldNodes: $ReadOnlyArray<FieldNode>,
   info: GraphQLResolveInfo,
   path: ResponsePath,
   result: mixed,
@@ -1025,7 +985,6 @@ function completeListValue(
     const completedItem = completeValueCatchingError(
       exeContext,
       itemType,
-      fieldNodes,
       info,
       fieldPath,
       item,
@@ -1063,7 +1022,6 @@ function completeLeafValue(returnType: GraphQLLeafType, result: mixed): mixed {
 function completeAbstractValue(
   exeContext: ExecutionContext,
   returnType: GraphQLAbstractType,
-  fieldNodes: $ReadOnlyArray<FieldNode>,
   info: GraphQLResolveInfo,
   path: ResponsePath,
   result: mixed,
@@ -1080,11 +1038,9 @@ function completeAbstractValue(
           resolvedRuntimeType,
           exeContext,
           returnType,
-          fieldNodes,
           info,
           result,
         ),
-        fieldNodes,
         info,
         path,
         result,
@@ -1094,15 +1050,7 @@ function completeAbstractValue(
 
   return completeObjectValue(
     exeContext,
-    ensureValidRuntimeType(
-      runtimeType,
-      exeContext,
-      returnType,
-      fieldNodes,
-      info,
-      result,
-    ),
-    fieldNodes,
+    ensureValidRuntimeType(runtimeType, exeContext, returnType, info, result),
     info,
     path,
     result,
@@ -1113,7 +1061,6 @@ function ensureValidRuntimeType(
   runtimeTypeOrName: ?GraphQLObjectType | string,
   exeContext: ExecutionContext,
   returnType: GraphQLAbstractType,
-  fieldNodes: $ReadOnlyArray<FieldNode>,
   info: GraphQLResolveInfo,
   result: mixed,
 ): GraphQLObjectType {
@@ -1130,15 +1077,15 @@ function ensureValidRuntimeType(
         `Either the ${returnType.name} type should provide a "resolveType" ` +
         'function or each possible types should provide an ' +
         '"isTypeOf" function.',
-      fieldNodes,
+      info.fieldNodes,
     );
   }
 
   if (!exeContext.schema.isPossibleType(returnType, runtimeType)) {
     throw new GraphQLError(
       `Runtime Object type "${runtimeType.name}" is not a possible type ` +
         `for "${returnType.name}".`,
-      fieldNodes,
+      info.fieldNodes,
     );
   }
 
@@ -1151,7 +1098,6 @@ function ensureValidRuntimeType(
 function completeObjectValue(
   exeContext: ExecutionContext,
   returnType: GraphQLObjectType,
-  fieldNodes: $ReadOnlyArray<FieldNode>,
   info: GraphQLResolveInfo,
   path: ResponsePath,
   result: mixed,
@@ -1165,29 +1111,27 @@ function completeObjectValue(
     if (isPromise(isTypeOf)) {
       return isTypeOf.then(resolvedIsTypeOf => {
         if (!resolvedIsTypeOf) {
-          throw invalidReturnTypeError(returnType, result, fieldNodes);
+          throw invalidReturnTypeError(returnType, result, info.fieldNodes);
         }
         return collectAndExecuteSubfields(
           exeContext,
           returnType,
-          fieldNodes,
-          info,
+          info.fieldNodes,
           path,
           result,
         );
       });
     }
 
     if (!isTypeOf) {
-      throw invalidReturnTypeError(returnType, result, fieldNodes);
+      throw invalidReturnTypeError(returnType, result, info.fieldNodes);
     }
   }
 
   return collectAndExecuteSubfields(
     exeContext,
     returnType,
-    fieldNodes,
-    info,
+    info.fieldNodes,
     path,
     result,
   );
@@ -1208,7 +1152,6 @@ function collectAndExecuteSubfields(
   exeContext: ExecutionContext,
   returnType: GraphQLObjectType,
   fieldNodes: $ReadOnlyArray<FieldNode>,
-  info: GraphQLResolveInfo,
   path: ResponsePath,
   result: mixed,
 ): MaybePromise<ObjMap<mixed>> {
@@ -1260,7 +1203,7 @@ function defaultResolveTypeFn(
   context: mixed,
   info: GraphQLResolveInfo,
   abstractType: GraphQLAbstractType,
-): ?GraphQLObjectType | string | Promise<?GraphQLObjectType | string> {
+): MaybePromise<?GraphQLObjectType | string> {
   // First, look for `__typename`.
   if (
     value !== null &&

src/subscription/subscribe.js

@@ -257,9 +257,8 @@ export function createSourceEventStream(
     // algorithm from GraphQL specification. It differs from
     // "ResolveFieldValue" due to providing a different `resolveFn`.
     const result = resolveFieldValueOrError(
-      exeContext,
+      exeContext.contextValue,
       fieldDef,
-      fieldNodes,
       resolveFn,
       rootValue,
       info,