Revert "feat: pass abortSignal to resolvers via GraphQLResolveInfo (graphql#4425)"

This reverts commit fba352d.

Author: yaacovCR

src/execution/__tests__/cancellation-test.ts

@@ -130,19 +130,9 @@ describe('Execute: Cancellation', () => {
       }
     `);
 
-    let aborted = false;
     const cancellableAsyncFn = async (abortSignal: AbortSignal) => {
-      if (abortSignal.aborted) {
-        aborted = true;
-      } else {
-        abortSignal.addEventListener('abort', () => {
-          aborted = true;
-        });
-      }
-      // We are in an async function so it gets cancelled and the field ends up
-      // resolving with the abort signal's error.
       await resolveOnNextTick();
-      throw Error('some random other error that does not show up in response');
+      abortSignal.throwIfAborted();
     };
 
     const resultPromise = execute({
@@ -151,8 +141,8 @@ describe('Execute: Cancellation', () => {
       abortSignal: abortController.signal,
       rootValue: {
         todo: {
-          id: (_args: any, _context: any, info: { abortSignal: AbortSignal }) =>
-            cancellableAsyncFn(info.abortSignal),
+          id: (_args: any, _context: any, _info: any, signal: AbortSignal) =>
+            cancellableAsyncFn(signal),
         },
       },
     });
@@ -175,8 +165,6 @@ describe('Execute: Cancellation', () => {
         },
       ],
     });
-
-    expect(aborted).to.equal(true);
   });
 
   it('should stop the execution when aborted during object field completion with a custom error', async () => {

src/execution/__tests__/executor-test.ts

@@ -223,7 +223,6 @@ describe('Execute: Handles basic execution tasks', () => {
       'rootValue',
       'operation',
       'variableValues',
-      'abortSignal',
     );
 
     const operation = document.definitions[0];

src/execution/execute.ts

@@ -875,7 +875,6 @@ function executeField(
     toNodes(fieldDetailsList),
     parentType,
     path,
-    abortSignal,
   );
 
   // Get the resolve function, regardless of if its result is normal or abrupt (error).
@@ -894,7 +893,7 @@ function executeField(
     // 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 result = resolveFn(source, args, contextValue, info);
+    const result = resolveFn(source, args, contextValue, info, abortSignal);
 
     if (isPromise(result)) {
       return completePromisedValue(
@@ -961,7 +960,6 @@ export function buildResolveInfo(
   fieldNodes: ReadonlyArray<FieldNode>,
   parentType: GraphQLObjectType,
   path: Path,
-  abortSignal: AbortSignal | undefined,
 ): GraphQLResolveInfo {
   const { schema, fragmentDefinitions, rootValue, operation, variableValues } =
     validatedExecutionArgs;
@@ -978,7 +976,6 @@ export function buildResolveInfo(
     rootValue,
     operation,
     variableValues,
-    abortSignal,
   };
 }
 
@@ -2082,12 +2079,12 @@ export const defaultTypeResolver: GraphQLTypeResolver<unknown, unknown> =
  * of calling that function while passing along args and context value.
  */
 export const defaultFieldResolver: GraphQLFieldResolver<unknown, unknown> =
-  function (source: any, args, contextValue, info) {
+  function (source: any, args, contextValue, info, abortSignal) {
     // ensure source is a value for which property access is acceptable.
     if (isObjectLike(source) || typeof source === 'function') {
       const property = source[info.fieldName];
       if (typeof property === 'function') {
-        return source[info.fieldName](args, contextValue, info);
+        return source[info.fieldName](args, contextValue, info, abortSignal);
       }
       return property;
     }
@@ -2296,7 +2293,6 @@ function executeSubscription(
     fieldNodes,
     rootType,
     path,
-    abortSignal,
   );
 
   try {
@@ -2321,7 +2317,7 @@ function executeSubscription(
     // 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 result = resolveFn(rootValue, args, contextValue, info);
+    const result = resolveFn(rootValue, args, contextValue, info, abortSignal);
 
     if (isPromise(result)) {
       const abortSignalListener = abortSignal

src/type/definition.ts

@@ -997,6 +997,7 @@ export type GraphQLFieldResolver<
   args: TArgs,
   context: TContext,
   info: GraphQLResolveInfo,
+  abortSignal: AbortSignal | undefined,
 ) => TResult;
 
 export interface GraphQLResolveInfo {
@@ -1010,7 +1011,6 @@ export interface GraphQLResolveInfo {
   readonly rootValue: unknown;
   readonly operation: OperationDefinitionNode;
   readonly variableValues: VariableValues;
-  readonly abortSignal: AbortSignal | undefined;
 }
 
 /**

website/pages/upgrade-guides/v16-v17.mdx

@@ -178,7 +178,7 @@ Use the `validateInputValue` helper to retrieve the actual errors.
 
 - Added `hideSuggestions` option to `execute`/`validate`/`subscribe`/... to hide schema-suggestions in error messages
 - Added `abortSignal` option to `graphql()`, `execute()`, and `subscribe()` allows cancellation of these methods;
-  `info.abortSignal` can also be used in field resolvers to cancel asynchronous work that they initiate.
+  the `abortSignal` can also be passed to field resolvers to cancel asynchronous work that they initiate.
 - `extensions` support `symbol` keys, in addition to the normal string keys.
 - Added ability for resolver functions to return async iterables.
 - Added `perEventExecutor` execution option to allows specifying a custom executor for subscription source stream events, which can be useful for preparing a per event execution context argument.