Fix GraphQLResolveInfo for graphql@v17

Author: eddeee888

packages/executor/src/execution/AsyncWorkTracker.ts

@@ -0,0 +1,34 @@
+import { isPromise } from '@graphql-tools/utils';
+
+export class AsyncWorkTracker {
+  private pendingAsyncWork = new Set<Promise<void>>();
+
+  add(promiseLike: PromiseLike<unknown>): void {
+    const pendingAsyncWork = this.pendingAsyncWork;
+    const promiseToSettle = Promise.resolve(promiseLike).then(
+      () => {
+        pendingAsyncWork.delete(promiseToSettle);
+      },
+      () => {
+        pendingAsyncWork.delete(promiseToSettle);
+      },
+    );
+    pendingAsyncWork.add(promiseToSettle);
+  }
+
+  addValues(values: ReadonlyArray<unknown>): void {
+    for (const value of values) {
+      if (isPromise(value)) {
+        this.add(value);
+      }
+    }
+  }
+
+  promiseAllTrackOnReject<T>(values: ReadonlyArray<PromiseLike<T> | T>): Promise<Array<T>> {
+    const promise = Promise.all(values);
+    promise.then(undefined, () => {
+      this.addValues(values);
+    });
+    return promise;
+  }
+}

packages/executor/src/execution/execute.ts

@@ -55,6 +55,7 @@ import {
 import { TypedDocumentNode } from '@graphql-typed-document-node/core';
 import { DisposableSymbols } from '@whatwg-node/disposablestack';
 import { createDeferredPromise, handleMaybePromise } from '@whatwg-node/promise-helpers';
+import { AsyncWorkTracker } from './AsyncWorkTracker.js';
 import { coerceError } from './coerceError.js';
 import { flattenAsyncIterable } from './flattenAsyncIterable.js';
 import { invariant } from './invariant.js';
@@ -124,6 +125,7 @@ export interface ExecutionContext<TVariables = any, TContext = any> {
   subscribeFieldResolver: GraphQLFieldResolver<any, TContext>;
   errors: Array<GraphQLError>;
   subsequentPayloads: Set<AsyncPayloadRecord>;
+  asyncWorkTracker: AsyncWorkTracker;
   signal?: AbortSignal;
   onSignalAbort?(handler: () => void): void;
   signalPromise?: Promise<never>;
@@ -530,6 +532,7 @@ export function buildExecutionContext<TData = any, TVariables = any, TContext =
     typeResolver: typeResolver ?? defaultTypeResolver,
     subscribeFieldResolver: subscribeFieldResolver ?? defaultFieldResolver,
     subsequentPayloads: new Set(),
+    asyncWorkTracker: new AsyncWorkTracker(),
     errors: [],
     signal,
     onSignalAbort,
@@ -546,6 +549,7 @@ function buildPerEventExecutionContext(
     ...exeContext,
     rootValue: payload,
     subsequentPayloads: new Set(),
+    asyncWorkTracker: new AsyncWorkTracker(),
     errors: [],
   };
 }
@@ -805,10 +809,6 @@ function executeField(
 
 /**
  * TODO: consider no longer exporting this function
- *
- * FIXME: `any` is used as ReturnType to silence graphql@17
- * but it's missing `getAbortSignal` and `getAsyncHelpers`
- *
  * @internal
  */
 export function buildResolveInfo(
@@ -817,7 +817,7 @@ export function buildResolveInfo(
   fieldNodes: Array<FieldNode>,
   parentType: GraphQLObjectType,
   path: Path,
-): any {
+): GraphQLResolveInfo {
   // The resolve function's optional fourth argument is a collection of
   // information about the current execution state.
   return {
@@ -832,6 +832,11 @@ export function buildResolveInfo(
     operation: exeContext.operation,
     variableValues: exeContext.variableValues,
     signal: exeContext.signal,
+    getAbortSignal: () => exeContext.signal,
+    getAsyncHelpers: () => ({
+      promiseAll: values => exeContext.asyncWorkTracker.promiseAllTrackOnReject(values),
+      track: maybePromises => exeContext.asyncWorkTracker.addValues(maybePromises),
+    }),
   };
 }