Merge branch 'main' into feat/invocation

packages/inngest/package.json

@@ -161,14 +161,14 @@
     "@types/ms": "^0.7.31",
     "@types/node": "^18.16.16",
     "@types/sha.js": "^2.4.0",
-    "@typescript-eslint/eslint-plugin": "^5.47.0",
-    "@typescript-eslint/parser": "^5.47.0",
+    "@typescript-eslint/eslint-plugin": "^6.0.0",
+    "@typescript-eslint/parser": "^6.0.0",
     "@vercel/node": "^2.15.9",
     "concurrently": "^7.4.0",
     "eslint": "^8.30.0",
-    "eslint-config-prettier": "^8.5.0",
+    "eslint-config-prettier": "^9.0.0",
     "eslint-plugin-import": "^2.27.5",
-    "eslint-plugin-prettier": "^4.2.1",
+    "eslint-plugin-prettier": "^5.0.0",
     "express": "^4.18.2",
     "fastify": "^4.21.0",
     "genversion": "^3.1.1",
@@ -180,7 +180,7 @@
     "nock": "^13.2.9",
     "node-mocks-http": "^1.11.0",
     "nodemon": "^2.0.20",
-    "prettier": "^2.7.1",
+    "prettier": "^3.1.0",
     "shx": "^0.3.4",
     "ts-jest": "^29.1.0",
     "tsx": "^3.12.7",

packages/inngest/scripts/integrationTestRunner.ts

@@ -244,10 +244,13 @@ async function runIntegrationTest(
   exampleServerPort: number
 ): Promise<void> {
   // Start a 10 minute timeout. If we don't finish within 10 minutes, something is wrong.
-  setTimeout(() => {
-    console.error("Integration test timed out");
-    process.exit(1);
-  }, 10 * 60 * 1000);
+  setTimeout(
+    () => {
+      console.error("Integration test timed out");
+      process.exit(1);
+    },
+    10 * 60 * 1000
+  );
 
   const rootPath = path.join(__dirname, "..", "..", "..");
   const sdkPath = path.join(rootPath, "packages", "inngest");

packages/inngest/src/components/EventSchemas.ts

@@ -130,8 +130,8 @@ export type LiteralToRecordZodSchemas<T> = PickLiterals<
         [I in keyof T as GetName<T[I]>]: InferZodShape<T[I]>;
       }
     : T extends ZodEventSchemas
-    ? T
-    : never
+      ? T
+      : never
 >;
 
 /**
@@ -177,7 +177,7 @@ export type StandardEventSchemaToPayload<T> = Simplify<{
  */
 export type Combine<
   TCurr extends Record<string, EventPayload>,
-  TInc extends StandardEventSchemas
+  TInc extends StandardEventSchemas,
 > = IsStringLiteral<keyof TCurr & string> extends true
   ? Simplify<
       Omit<TCurr, keyof StandardEventSchemaToPayload<TInc>> &

packages/inngest/src/components/Inngest.test.ts

@@ -762,7 +762,7 @@ describe("helper types", () => {
 
   type GetUnionKeyValue<
     T,
-    K extends string | number | symbol
+    K extends string | number | symbol,
   > = T extends Record<K, infer U> ? U : never;
 
   describe("type GetFunctionInput", () => {

packages/inngest/src/components/Inngest.ts

@@ -347,8 +347,8 @@ export class Inngest<TOpts extends ClientOptions = ClientOptions> {
     let payloads: EventPayload[] = Array.isArray(payload)
       ? (payload as EventPayload[])
       : payload
-      ? ([payload] as [EventPayload])
-      : [];
+        ? ([payload] as [EventPayload])
+        : [];
 
     const inputChanges = await hooks.transformInput?.({
       payloads: [...payloads],
@@ -465,10 +465,10 @@ export class Inngest<TOpts extends ClientOptions = ClientOptions> {
         [
           typeof builtInMiddleware,
           NonNullable<TOpts["middleware"]>,
-          TMiddleware
+          TMiddleware,
         ]
       >
-    >
+    >,
   >(
     options: ExclusiveKeys<
       Omit<
@@ -491,7 +491,7 @@ export class Inngest<TOpts extends ClientOptions = ClientOptions> {
             [
               typeof builtInMiddleware,
               NonNullable<TOpts["middleware"]>,
-              TMiddleware
+              TMiddleware,
             ],
             FailureEventArgs<EventsFromOpts<TOpts>[TTriggerName]>
           >
@@ -683,7 +683,7 @@ export type GetStepTools<
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   TInngest extends Inngest<any>,
   TTrigger extends keyof GetEvents<TInngest> &
-    string = keyof GetEvents<TInngest> & string
+    string = keyof GetEvents<TInngest> & string,
 > = GetFunctionInput<TInngest, TTrigger> extends { step: infer TStep }
   ? TStep
   : never;
@@ -708,7 +708,7 @@ export type GetFunctionInput<
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   TInngest extends Inngest<any>,
   TTrigger extends keyof GetEvents<TInngest> &
-    string = keyof GetEvents<TInngest> & string
+    string = keyof GetEvents<TInngest> & string,
 > = Parameters<
   Handler<
     ClientOptionsFromInngest<TInngest>,
@@ -717,7 +717,7 @@ export type GetFunctionInput<
     ExtendWithMiddleware<
       [
         typeof builtInMiddleware,
-        NonNullable<ClientOptionsFromInngest<TInngest>["middleware"]>
+        NonNullable<ClientOptionsFromInngest<TInngest>["middleware"]>,
       ]
     >
   >

packages/inngest/src/components/InngestCommHandler.ts

@@ -92,7 +92,7 @@ interface InngestCommHandlerOptions<
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   Output = any,
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  StreamOutput = any
+  StreamOutput = any,
 > extends RegisterOptions {
   /**
    * The name of the framework this handler is designed for. Should be
@@ -210,7 +210,7 @@ export class InngestCommHandler<
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   Output = any,
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  StreamOutput = any
+  StreamOutput = any,
 > {
   /**
    * The ID of this serve handler, e.g. `"my-app"`. It's recommended that this
@@ -1234,7 +1234,7 @@ export type Handler<
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   Output = any,
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  StreamOutput = any
+  StreamOutput = any,
 > = (...args: Input) => HandlerResponse<Output, StreamOutput>;
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -1304,7 +1304,7 @@ export type HandlerResponse<Output = any, StreamOutput = any> = {
  * framework-compatible response by an {@link InngestCommHandler} instance.
  */
 export interface ActionResponse<
-  TBody extends string | ReadableStream = string
+  TBody extends string | ReadableStream = string,
 > {
   /**
    * The HTTP status code to return.

packages/inngest/src/components/InngestFunction.test.ts

@@ -280,7 +280,7 @@ describe("runFn", () => {
         event?: EventPayload;
         onFailure?: boolean;
       },
-      U extends Record<keyof T["steps"], string>
+      U extends Record<keyof T["steps"], string>,
     >(
       fnName: string,
       createTools: () => T,
@@ -449,8 +449,8 @@ describe("runFn", () => {
                     ret!.type === "step-ran"
                       ? [ret!.step]
                       : ret!.type === "steps-found"
-                      ? ret!.steps
-                      : [];
+                        ? ret!.steps
+                        : [];
 
                   outgoingOps.forEach((op) => {
                     expect(op.id).toMatch(/^[a-f0-9]{40}$/i);

packages/inngest/src/components/InngestFunction.ts

@@ -41,7 +41,7 @@ export class InngestFunction<
     Events,
     EventNameFromTrigger<Events, Trigger>
   > = FunctionOptions<Events, EventNameFromTrigger<Events, Trigger>>,
-  THandler extends AnyHandler = Handler<TOpts, Events, keyof Events & string>
+  THandler extends AnyHandler = Handler<TOpts, Events, keyof Events & string>,
 > {
   static stepId = "step";
   static failureSuffix = "-failure";

packages/inngest/src/components/InngestMiddleware.ts

@@ -73,20 +73,20 @@ export class InngestMiddleware<TOpts extends MiddlewareOptions> {
 
 type FnsWithSameInputAsOutput<
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  TRecord extends Record<string, (arg: any) => any>
+  TRecord extends Record<string, (arg: any) => any>,
 > = {
   [K in keyof TRecord as Await<TRecord[K]> extends Parameters<TRecord[K]>[0]
     ? K
     : Await<TRecord[K]> extends void | undefined
-    ? Parameters<TRecord[K]>[0] extends void | undefined
-      ? K
-      : never
-    : never]: TRecord[K];
+      ? Parameters<TRecord[K]>[0] extends void | undefined
+        ? K
+        : never
+      : never]: TRecord[K];
 };
 
 type PromisifiedFunctionRecord<
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  TRecord extends Record<string, (arg: any) => any>
+  TRecord extends Record<string, (arg: any) => any>,
 > = Pick<
   Partial<{
     [K in keyof TRecord]: (
@@ -124,7 +124,8 @@ export const getHookStack = async <
   TMiddleware extends Record<string, (arg: any) => any>,
   TKey extends keyof TMiddleware,
   TResult extends Await<TMiddleware[TKey]>,
-  TRet extends PromisifiedFunctionRecord<TResult> = PromisifiedFunctionRecord<TResult>
+  TRet extends
+    PromisifiedFunctionRecord<TResult> = PromisifiedFunctionRecord<TResult>,
 >(
   /**
    * The stack of middleware that will be used to run hooks.
@@ -152,26 +153,29 @@ export const getHookStack = async <
       [K in keyof TResult as Await<TResult[K]> extends Parameters<TResult[K]>[0]
         ? K
         : Await<TResult[K]> extends void | undefined
-        ? Parameters<TResult[K]>[0] extends void | undefined
-          ? K
-          : never
-        : never]: void;
+          ? Parameters<TResult[K]>[0] extends void | undefined
+            ? K
+            : never
+          : never]: void;
     }
   >
 ): Promise<TRet> => {
   // Wait for middleware to initialize
   const mwStack = await middleware;
 
   // Step through each middleware and get the hook for the given key
-  const keyFns = mwStack.reduce((acc, mw) => {
-    const fn = mw[key];
+  const keyFns = mwStack.reduce(
+    (acc, mw) => {
+      const fn = mw[key];
 
-    if (fn) {
-      return [...acc, fn];
-    }
+      if (fn) {
+        return [...acc, fn];
+      }
 
-    return acc;
-  }, [] as NonNullable<TMiddleware[TKey]>[]);
+      return acc;
+    },
+    [] as NonNullable<TMiddleware[TKey]>[]
+  );
 
   // Run each hook found in sequence and collect the results
   const hooksRegistered = await keyFns.reduce<
@@ -473,7 +477,7 @@ type MiddlewareRunOutput = (ctx: {
  * @internal
  */
 type GetMiddlewareRunInputMutation<
-  TMiddleware extends InngestMiddleware<MiddlewareOptions>
+  TMiddleware extends InngestMiddleware<MiddlewareOptions>,
 > = TMiddleware extends InngestMiddleware<infer TOpts>
   ? TOpts["init"] extends MiddlewareRegisterFn
     ? Await<
@@ -495,7 +499,7 @@ type GetMiddlewareRunInputMutation<
  * @internal
  */
 type GetMiddlewareSendEventOutputMutation<
-  TMiddleware extends InngestMiddleware<MiddlewareOptions>
+  TMiddleware extends InngestMiddleware<MiddlewareOptions>,
 > = TMiddleware extends InngestMiddleware<infer TOpts>
   ? TOpts["init"] extends MiddlewareRegisterFn
     ? Await<
@@ -518,7 +522,7 @@ type GetMiddlewareSendEventOutputMutation<
  */
 export type MiddlewareStackSendEventOutputMutation<
   TContext,
-  TMiddleware extends MiddlewareStack
+  TMiddleware extends MiddlewareStack,
 > = ObjectAssign<
   {
     [K in keyof TMiddleware]: GetMiddlewareSendEventOutputMutation<
@@ -531,7 +535,7 @@ export type MiddlewareStackSendEventOutputMutation<
 export type ExtendWithMiddleware<
   TMiddlewareStacks extends MiddlewareStack[],
   // eslint-disable-next-line @typescript-eslint/ban-types
-  TContext = {}
+  TContext = {},
 > = ObjectAssign<
   {
     [K in keyof TMiddlewareStacks]: MiddlewareStackRunInputMutation<
@@ -548,7 +552,7 @@ export type ExtendWithMiddleware<
  */
 export type MiddlewareStackRunInputMutation<
   TContext,
-  TMiddleware extends MiddlewareStack
+  TMiddleware extends MiddlewareStack,
 > = ObjectAssign<
   {
     [K in keyof TMiddleware]: GetMiddlewareRunInputMutation<TMiddleware[K]>;

packages/inngest/src/components/InngestStepTools.test.ts

@@ -477,6 +477,7 @@ describe("sendEvent", () => {
         typeof createStepTools<typeof opts, EventsFromOpts<typeof opts>, "foo">
       >["invoke"];
 
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       type GetTestReturn<T extends () => InvocationResult<any>> = Awaited<
         ReturnType<T>
       >;