remove promiseWithResolvers

Author: yaacovCR

src/execution/execute.ts

@@ -13,7 +13,6 @@ import { addPath, pathToArray } from '../jsutils/Path.js';
 import { promiseForObject } from '../jsutils/promiseForObject.js';
 import type { PromiseOrValue } from '../jsutils/PromiseOrValue.js';
 import { promiseReduce } from '../jsutils/promiseReduce.js';
-import { promiseWithResolvers } from '../jsutils/promiseWithResolvers.js';
 
 import { GraphQLError } from '../error/GraphQLError.js';
 import { locatedError } from '../error/locatedError.js';
@@ -868,42 +867,41 @@ function executeField(
     const result = resolveFn(source, args, contextValue, info, abortSignal);
 
     if (isPromise(result)) {
-      const { promise, resolve, reject } =
-        promiseWithResolvers<GraphQLWrappedResult<unknown>>();
-      abortSignal?.addEventListener(
-        'abort',
-        () => {
-          try {
-            resolve({
-              rawResult: null,
-              incrementalDataRecords: undefined,
-              errors: [
-                buildFieldError(
-                  abortSignal.reason,
-                  returnType,
-                  fieldDetailsList,
-                  path,
-                ),
-              ],
-            });
-          } catch (error) {
-            reject(error);
-          }
-        },
-        { once: true },
-      );
-      completePromisedValue(
-        exeContext,
-        returnType,
-        fieldDetailsList,
-        info,
-        path,
-        result,
-        incrementalContext,
-        deferMap,
-        // eslint-disable-next-line @typescript-eslint/use-unknown-in-catch-callback-variable
-      ).then(resolve, reject);
-      return promise;
+      return new Promise((resolve, reject) => {
+        abortSignal?.addEventListener(
+          'abort',
+          () => {
+            try {
+              resolve({
+                rawResult: null,
+                incrementalDataRecords: undefined,
+                errors: [
+                  buildFieldError(
+                    abortSignal.reason,
+                    returnType,
+                    fieldDetailsList,
+                    path,
+                  ),
+                ],
+              });
+            } catch (error) {
+              reject(error as GraphQLError);
+            }
+          },
+          { once: true },
+        );
+        completePromisedValue(
+          exeContext,
+          returnType,
+          fieldDetailsList,
+          info,
+          path,
+          result,
+          incrementalContext,
+          deferMap,
+          // eslint-disable-next-line @typescript-eslint/use-unknown-in-catch-callback-variable
+        ).then(resolve, reject);
+      });
     }
 
     const completed = completeValue(
@@ -2206,19 +2204,18 @@ function executeSubscription(
     const result = resolveFn(rootValue, args, contextValue, info, abortSignal);
 
     if (isPromise(result)) {
-      const { promise, resolve, reject } = promiseWithResolvers<unknown>();
-      abortSignal?.addEventListener(
-        'abort',
-        () =>
-          reject(
-            locatedError(abortSignal.reason, fieldNodes, pathToArray(path)),
-          ),
-        { once: true },
-      );
-      // eslint-disable-next-line @typescript-eslint/use-unknown-in-catch-callback-variable
-      result.then(resolve, reject);
-
-      return promise
+      return new Promise((resolve, reject) => {
+        abortSignal?.addEventListener(
+          'abort',
+          () =>
+            reject(
+              locatedError(abortSignal.reason, fieldNodes, pathToArray(path)),
+            ),
+          { once: true },
+        );
+        // eslint-disable-next-line @typescript-eslint/use-unknown-in-catch-callback-variable
+        result.then(resolve, reject);
+      })
         .then(assertEventStream)
         .then(undefined, (error: unknown) => {
           throw locatedError(error, fieldNodes, pathToArray(path));