refactor: generate types for everything

Author: n1ru4l

packages/core/src/orchestrator.ts

@@ -11,13 +11,14 @@ import {
   OnParseHook,
   OnResolverCalledHook,
   OnSubscribeHook,
-  OnSubscribeResultResult,
   OnValidateHook,
   Plugin,
   SubscribeResultHook,
   TypedSubscriptionArgs,
   TypedExecutionArgs,
   SubscribeFunction,
+  OnSubscribeResultResultOnNextHook,
+  OnSubscribeResultResultOnEndHook,
 } from '@envelop/types';
 import isAsyncIterable from 'graphql/jsutils/isAsyncIterable';
 import {
@@ -313,8 +314,8 @@ export function createEnvelopOrchestrator<PluginsContext = any>(plugins: Plugin[
       contextValue: context,
     });
 
-    const onNextHandler: Exclude<OnSubscribeResultResult['onNext'], void>[] = [];
-    const onEndHandler: Exclude<OnSubscribeResultResult['onEnd'], void>[] = [];
+    const onNextHandler: OnSubscribeResultResultOnNextHook[] = [];
+    const onEndHandler: OnSubscribeResultResultOnEndHook[] = [];
 
     for (const afterCb of afterCalls) {
       const hookResult = afterCb({
@@ -333,22 +334,20 @@ export function createEnvelopOrchestrator<PluginsContext = any>(plugins: Plugin[
       }
     }
 
-    if (isAsyncIterable(result)) {
-      if (onNextHandler.length) {
-        result = mapAsyncIterator(result, async result => {
-          for (const onNext of onNextHandler) {
-            await onNext({ result, setResult: newResult => (result = newResult) });
-          }
-          return result;
-        });
-      }
-      if (onEndHandler.length) {
-        result = finalAsyncIterator(result, () => {
-          for (const onEnd of onEndHandler) {
-            onEnd();
-          }
-        });
-      }
+    if (onNextHandler.length && isAsyncIterable(result)) {
+      result = mapAsyncIterator(result, async result => {
+        for (const onNext of onNextHandler) {
+          await onNext({ result, setResult: newResult => (result = newResult) });
+        }
+        return result;
+      });
+    }
+    if (onEndHandler.length && isAsyncIterable(result)) {
+      result = finalAsyncIterator(result, () => {
+        for (const onEnd of onEndHandler) {
+          onEnd();
+        }
+      });
     }
     return result;
   });

packages/types/src/hooks.ts

@@ -169,10 +169,15 @@ export type OnSubscribeResultEventPayload = {
   result: AsyncIterableIterator<ExecutionResult> | ExecutionResult;
   setResult: (newResult: AsyncIterableIterator<ExecutionResult> | ExecutionResult) => void;
 };
-export type OnSubscribeResultResultOnNextPayload = { result: ExecutionResult; setResult: (newResult: ExecutionResult) => void };
+export type OnSubscribeResultResultOnNextHookPayload = {
+  result: ExecutionResult;
+  setResult: (newResult: ExecutionResult) => void;
+};
+export type OnSubscribeResultResultOnNextHook = (payload: OnSubscribeResultResultOnNextHookPayload) => void | Promise<void>;
+export type OnSubscribeResultResultOnEndHook = () => void;
 export type OnSubscribeResultResult = {
-  onNext?: (options: OnSubscribeResultResultOnNextPayload) => void | Promise<void>;
-  onEnd?: () => void;
+  onNext?: OnSubscribeResultResultOnNextHook;
+  onEnd?: OnSubscribeResultResultOnEndHook;
 };
 export type SubscribeResultHook = (options: OnSubscribeResultEventPayload) => void | OnSubscribeResultResult;
 export type OnSubscribeHookResult<ContextType> = {

packages/types/src/utils.ts

@@ -28,5 +28,4 @@ export type Unarray<T> = T extends Array<infer U> ? U : T;
 export type ArbitraryObject = Record<string | number | symbol, any>;
 export type PromiseOrValue<T> = T | Promise<T>;
 export type AsyncIterableIteratorOrValue<T> = T | AsyncIterableIterator<T>;
-export type UnwrapPromiseValue<TValue> = TValue extends Promise<infer TWrappedValue> ? TWrappedValue : TValue;
 export type Maybe<T> = T | null | undefined;