Cleanup type casting as usages in the code (#803)

Author: ardatan

bench/federation/federation.bench.ts

@@ -109,7 +109,7 @@ describe('Federation', async () => {
         (response) => {
           expect(response).toEqual(result);
         },
-      ) as Promise<void>;
+      );
     },
     {
       async setup() {
@@ -152,7 +152,7 @@ describe('Federation', async () => {
         (response) => {
           expect(response).toEqual(result);
         },
-      ) as Promise<void>,
+      ),
     {
       setup() {
         stitchedSchema = getStitchedSchemaFromSupergraphSdl({

packages/delegate/src/defaultMergedResolver.ts

@@ -479,7 +479,7 @@ function parentSatisfiedSelectionSet(
 
 function flattenPromise<T>(data: T): Promise<T> | T {
   if (isPromise(data)) {
-    return data.then(flattenPromise) as Promise<T>;
+    return data.then(flattenPromise);
   }
   if (Array.isArray(data)) {
     return Promise.all(data.map(flattenPromise)) as Promise<T>;
@@ -509,9 +509,9 @@ function flattenPromise<T>(data: T): Promise<T> | T {
       newData[UNPATHED_ERRORS_SYMBOL] = data[UNPATHED_ERRORS_SYMBOL];
     }
     if (jobs.length) {
-      return Promise.all(jobs).then(() => newData) as Promise<T>;
+      return Promise.all(jobs).then(() => newData);
     }
-    return newData as T;
+    return newData;
   }
   return data;
 }

packages/runtime/src/createGatewayRuntime.ts

@@ -379,7 +379,7 @@ export function createGatewayRuntime<
             document: parse(`query ReadinessCheck { __typename }`),
           }),
         (res) => !isAsyncIterable(res) && !!res.data?.__typename,
-      ) as MaybePromise<boolean>;
+      );
     schemaInvalidator = () => {
       // @ts-expect-error TODO: this is illegal but somehow we want it
       unifiedGraph = undefined;

packages/runtime/src/plugins/useUpstreamRetry.ts

@@ -106,10 +106,7 @@ export function useUpstreamRetry<TContext extends Record<string, any>>(
                 const requestTime = Date.now();
                 attemptsLeft--;
                 return handleMaybePromise(
-                  () =>
-                    executor(
-                      executionRequest,
-                    ) as MaybeAsyncIterable<ExecutionResult>,
+                  () => executor(executionRequest),
                   (currRes) => {
                     executionResult = currRes;
                     let retryAfterSecondsFromHeader: number | undefined;

packages/runtime/src/plugins/useUpstreamTimeout.ts

@@ -7,8 +7,7 @@ import {
   ExecutionRequest,
   ExecutionResult,
   isAsyncIterable,
-  MaybeAsyncIterable,
-  MaybePromise,
+  isPromise,
   registerAbortSignalListener,
 } from '@graphql-tools/utils';
 import { GatewayPlugin } from '../types';
@@ -55,17 +54,24 @@ export function useUpstreamTimeout<TContext extends Record<string, any>>(
               timeoutSignal,
             );
           }
-          const timeoutDeferred = createDeferred<void>();
+          const signals: AbortSignal[] = [];
+          signals.push(timeoutSignal);
+          if (executionRequest.signal) {
+            signals.push(executionRequest.signal);
+          }
+          const timeoutDeferred = createDeferred<ExecutionResult>();
           function rejectDeferred() {
             timeoutDeferred.reject(timeoutSignal?.reason);
           }
           timeoutSignal.addEventListener('abort', rejectDeferred, {
             once: true,
           });
-          const signals: AbortSignal[] = [];
-          signals.push(timeoutSignal);
-          if (executionRequest.signal) {
-            signals.push(executionRequest.signal);
+          const res$ = executor({
+            ...executionRequest,
+            signal: AbortSignal.any(signals),
+          });
+          if (!isPromise(res$)) {
+            return res$;
           }
           return Promise.race([
             timeoutDeferred.promise,
@@ -102,12 +108,12 @@ export function useUpstreamTimeout<TContext extends Record<string, any>>(
               throw e;
             })
             .finally(() => {
-              timeoutDeferred.resolve();
+              timeoutDeferred.resolve(undefined as any);
               timeoutSignal.removeEventListener('abort', rejectDeferred);
               // Remove from the map after used so we don't see it again
               errorExtensionsByExecRequest.delete(executionRequest);
               timeoutSignalsByExecutionRequest.delete(executionRequest);
-            }) as MaybePromise<MaybeAsyncIterable<ExecutionResult>>;
+            });
         });
       }
       return undefined;