arri 0.0.27 → 0.0.29

package/dist/shared/{arri.f0cec5fb.d.cts → arri.1f0e8d09.d.mts}

@@ -1,5 +1,5 @@
 import { TObject, TSchema, Static } from '@sinclair/typebox';
-import { Router, H3Event, App, AppOptions } from 'h3';
+import { H3Event, Router, App, H3Error } from 'h3';
 
 interface ApplicationDef {
     arriSchemaVersion: "0.0.1";
@@ -101,12 +101,13 @@ interface ArriRoute<TPath extends string, TMethod extends HttpMethod, TQuery ext
     postHandler?: ArriRoutePostHandler<TPath, TQuery extends TObject ? Static<TQuery> : undefined, TBody extends TObject ? Static<TObject> : undefined, TResponse extends TSchema ? Static<TResponse> : TFallbackResponse>;
 }
 declare function defineRoute<TPath extends string, TMethod extends HttpMethod, TQuery extends TObject | undefined = any, TBody extends TSchema | undefined = any, TResponse extends TSchema | undefined = undefined, TFallbackResponse = any>(config: ArriRoute<TPath, TMethod, TQuery, TBody, TResponse, TFallbackResponse>): ArriRoute<TPath, TMethod, TQuery, TBody, TResponse, TFallbackResponse>;
-type Middleware = (context: HandlerContext) => void | Promise<void>;
+type Middleware = (context: HandlerContext, event: H3Event) => void | Promise<void>;
 declare const defineMiddleware: (middleware: Middleware) => Middleware;
 type ExtractParam<Path, NextPart> = Path extends `:${infer Param}` ? Record<Param, string> & NextPart : NextPart;
 type ExtractParams<Path> = Path extends `${infer Segment}/${infer Rest}` ? ExtractParam<Segment, ExtractParams<Rest>> : ExtractParam<Path, {}>;
-type ArriRouteHandler<TPath extends string, TQuery = undefined, TBody = undefined, TResponse = any> = (context: RouteHandlerContext<ExtractParams<TPath>, TQuery, TBody>) => TResponse extends undefined ? void | Promise<void> : TResponse | Promise<TResponse>;
+type ArriRouteHandler<TPath extends string, TQuery = undefined, TBody = undefined, TResponse = any> = (context: RouteHandlerContext<ExtractParams<TPath>, TQuery, TBody>, event: H3Event) => TResponse extends undefined ? void | Promise<void> : TResponse | Promise<TResponse>;
 interface RouteHandlerContext<TParams extends Record<string, string>, TQuery = undefined, TBody = undefined> extends HandlerContext {
+    type: "route";
     params: TParams;
     query: TQuery;
     body: TBody;
@@ -114,8 +115,8 @@ interface RouteHandlerContext<TParams extends Record<string, string>, TQuery = u
 interface RoutePostHandlerContext<TParams extends Record<string, string>, TQuery = undefined, TBody = undefined, TResponse = undefined> extends RouteHandlerContext<TParams, TQuery, TBody> {
     response: TResponse;
 }
-type ArriRoutePostHandler<TPath extends string, TQuery = undefined, TBody = undefined, TResponse = undefined> = (context: RoutePostHandlerContext<ExtractParams<TPath>, TQuery, TBody, TResponse>) => any;
-declare function registerRoute<TPath extends string>(router: Router, route: ArriRoute<TPath, HttpMethod, any, any, any>, middleware: Middleware[], prefix?: string): void;
+type ArriRoutePostHandler<TPath extends string, TQuery = undefined, TBody = undefined, TResponse = undefined> = (context: RoutePostHandlerContext<ExtractParams<TPath>, TQuery, TBody, TResponse>, event: H3Event) => any;
+declare function registerRoute<TPath extends string>(router: Router, route: ArriRoute<TPath, HttpMethod, any, any, any>, middleware: Middleware[], prefix?: string, opts?: ArriOptions): void;
 
 interface ArriProcedureBase {
     method: HttpMethod;
@@ -132,18 +133,16 @@ interface ArriProcedure<TParams extends TObject | undefined, TResponse extends T
     handler: ArriProcedureHandler<TParams extends TObject ? Static<TParams> : undefined, TResponse extends TObject ? Static<TResponse> : void>;
     postHandler?: ArriProcedurePostHandler<TParams extends TObject ? Static<TParams> : undefined, TResponse extends TObject ? Static<TResponse> : undefined>;
 }
-interface HandlerContext {
-    [key: string]: any;
-    event: H3Event;
-}
+type HandlerContext = Record<string, any>;
 interface RpcHandlerContext<TParams = undefined> extends HandlerContext {
+    type: "procedure";
     params: TParams;
 }
 interface RpcPostHandlerContext<TParams = undefined, TResponse = undefined> extends RpcHandlerContext<TParams> {
     response: TResponse;
 }
-type ArriProcedureHandler<TParams, TResponse> = (context: RpcHandlerContext<TParams>) => TResponse | Promise<TResponse>;
-type ArriProcedurePostHandler<TParams, TResponse> = (event: RpcPostHandlerContext<TParams, TResponse>) => any;
+type ArriProcedureHandler<TParams, TResponse> = (context: RpcHandlerContext<TParams>, event: H3Event) => TResponse | Promise<TResponse>;
+type ArriProcedurePostHandler<TParams, TResponse> = (context: RpcPostHandlerContext<TParams, TResponse>, event: H3Event) => any;
 declare function isRpc(input: any): input is ArriProcedure<any, any>;
 declare function defineRpc<TParams extends TObject | undefined = undefined, TResponse extends TObject | undefined | never = undefined>(config: ArriProcedure<TParams, TResponse>): ArriProcedure<TParams, TResponse>;
 declare function createRpcDefinition(rpcName: string, httpPath: string, procedure: ArriProcedure<any, any>): ProcedureDef;
@@ -151,20 +150,8 @@ declare function getRpcPath(rpcName: string, prefix?: string): string;
 declare function getRpcParamName(rpcName: string, procedure: ArriProcedure<any, any>): string | null;
 declare function getRpcParamDefinition(rpcName: string, procedure: ArriProcedure<any, any>): ProcedureDef["params"];
 declare function getRpcResponseName(rpcName: string, procedure: ArriProcedure<any, any>): string | null;
-declare function registerRpc(router: Router, path: string, procedure: ArriProcedure<any, any>, middleware: Middleware[]): void;
+declare function registerRpc(router: Router, path: string, procedure: ArriProcedure<any, any>, middleware: Middleware[], opts: ArriOptions): void;
 
-interface ArriOptions extends AppOptions {
-    /**
-     * Metadata to display in the __definition.json file
-     */
-    appInfo?: ApplicationDef["info"];
-    rpcRoutePrefix?: string;
-    /**
-     * Defaults to /__definitions
-     * This parameters also takes the rpcRoutePrefix option into account
-     */
-    rpcDefinitionPath?: string;
-}
 declare const DEV_ENDPOINT_ROOT = "/__arri_dev__";
 declare const DEV_DEFINITION_ENDPOINT = "/__arri_dev__/definition";
 declare class Arri {
@@ -177,6 +164,9 @@ declare class Arri {
     private procedures;
     private models;
     private readonly middlewares;
+    private readonly onAfterResponse;
+    private readonly onBeforeResponse;
+    private readonly onError;
     constructor(opts?: ArriOptions);
     registerMiddleware(middleware: Middleware): void;
     registerRpc<TParams extends TObject | undefined, TResponse extends TObject | undefined>(name: string, procedure: ArriProcedure<TParams, TResponse>): void;
@@ -184,6 +174,23 @@ declare class Arri {
     getAppDefinition(): ApplicationDef;
     getH3Instance(): App;
 }
+interface ArriOptions {
+    debug?: boolean;
+    /**
+     * Metadata to display in the __definition.json file
+     */
+    appInfo?: ApplicationDef["info"];
+    rpcRoutePrefix?: string;
+    /**
+     * Defaults to /__definitions
+     * This parameters also takes the rpcRoutePrefix option into account
+     */
+    rpcDefinitionPath?: string;
+    onRequest?: (event: H3Event) => void | Promise<void>;
+    onAfterResponse?: (context: RpcPostHandlerContext | RoutePostHandlerContext<any>, event: H3Event) => void | Promise<void>;
+    onBeforeResponse?: (context: RpcPostHandlerContext | RoutePostHandlerContext<any>, event: H3Event) => void | Promise<void>;
+    onError?: (error: H3Error, context: RpcHandlerContext | RouteHandlerContext<any>, event: H3Event) => void | Promise<void>;
+}
 declare const HttpMethodValues: readonly ["get", "post", "put", "patch", "delete", "head"];
 type HttpMethod = (typeof HttpMethodValues)[number];
 declare const isHttpMethod: (input: any) => input is "get" | "post" | "put" | "patch" | "delete" | "head";
@@ -195,4 +202,4 @@ interface ClientGenerator<TOptions extends Record<string, any> | undefined> {
 type ClientGeneratorPlugin<TOptions extends Record<string, any> | undefined> = (options: TOptions) => ClientGenerator<TOptions>;
 declare function defineClientGeneratorPlugin<TOptions extends Record<string, any> | undefined>(plugin: ClientGeneratorPlugin<TOptions>): ClientGeneratorPlugin<TOptions>;
 
-export { isJsonSchemaScalarType as $, Arri as A, type ClientGeneratorPlugin as B, type ClientGenerator as C, DEV_ENDPOINT_ROOT as D, type ExtractParam as E, type ApplicationDef as F, defineClientGeneratorPlugin as G, HttpMethodValues as H, normalizeWhitespace as I, type JsonSchemaObject as J, isProcedureDef as K, isServiceDef as L, type Middleware as M, isApplicationDef as N, unflattenObject as O, type ProcedureDef as P, unflattenProcedures as Q, type RpcHandlerContext as R, type ServiceDef as S, setNestedObjectProperty as T, removeDisallowedChars as U, JsonSchemaScalarTypeValues as V, JsonSchemaNullTypeValues as W, JsonSchemaComplexTypeValues as X, type JsonSchemaType as Y, type JsonSchemaTypeValue as Z, type JsonSchemaScalarType as _, DEV_DEFINITION_ENDPOINT as a, type JsonSchemaNullType as a0, isJsonSchemaNullType as a1, type JsonSchemaComplexType as a2, isJsonSchemaObject as a3, type JsonSchemaRecord as a4, isJsonSchemaRecord as a5, type JsonSchemaArray as a6, isJsonSchemaArray as a7, type JsonSchemaUint8Array as a8, type JsonSchemaEnum as a9, isJsonSchemaEnum as aa, type HttpMethod as b, type ArriProcedureBase as c, type ArriProcedure as d, type HandlerContext as e, type RpcPostHandlerContext as f, type ArriProcedureHandler as g, type ArriProcedurePostHandler as h, isHttpMethod as i, isRpc as j, defineRpc as k, createRpcDefinition as l, getRpcPath as m, getRpcParamName as n, getRpcParamDefinition as o, getRpcResponseName as p, type ArriRoute as q, registerRpc as r, defineRoute as s, defineMiddleware as t, type ExtractParams as u, type ArriRouteHandler as v, type RouteHandlerContext as w, type RoutePostHandlerContext as x, type ArriRoutePostHandler as y, registerRoute as z };
+export { type JsonSchemaScalarType as $, Arri as A, registerRoute as B, type ClientGenerator as C, DEV_ENDPOINT_ROOT as D, type ExtractParam as E, type ClientGeneratorPlugin as F, type ApplicationDef as G, HttpMethodValues as H, defineClientGeneratorPlugin as I, type JsonSchemaObject as J, normalizeWhitespace as K, isProcedureDef as L, type Middleware as M, isServiceDef as N, isApplicationDef as O, type ProcedureDef as P, unflattenObject as Q, type RpcHandlerContext as R, type ServiceDef as S, unflattenProcedures as T, setNestedObjectProperty as U, removeDisallowedChars as V, JsonSchemaScalarTypeValues as W, JsonSchemaNullTypeValues as X, JsonSchemaComplexTypeValues as Y, type JsonSchemaType as Z, type JsonSchemaTypeValue as _, DEV_DEFINITION_ENDPOINT as a, isJsonSchemaScalarType as a0, type JsonSchemaNullType as a1, isJsonSchemaNullType as a2, type JsonSchemaComplexType as a3, isJsonSchemaObject as a4, type JsonSchemaRecord as a5, isJsonSchemaRecord as a6, type JsonSchemaArray as a7, isJsonSchemaArray as a8, type JsonSchemaUint8Array as a9, type JsonSchemaEnum as aa, isJsonSchemaEnum as ab, type ArriOptions as b, type HttpMethod as c, type ArriProcedureBase as d, type ArriProcedure as e, type HandlerContext as f, type RpcPostHandlerContext as g, type ArriProcedureHandler as h, isHttpMethod as i, type ArriProcedurePostHandler as j, isRpc as k, defineRpc as l, createRpcDefinition as m, getRpcPath as n, getRpcParamName as o, getRpcParamDefinition as p, getRpcResponseName as q, registerRpc as r, type ArriRoute as s, defineRoute as t, defineMiddleware as u, type ExtractParams as v, type ArriRouteHandler as w, type RouteHandlerContext as x, type RoutePostHandlerContext as y, type ArriRoutePostHandler as z };

package/dist/shared/{arri.f0cec5fb.d.mts → arri.1f0e8d09.d.ts}

@@ -1,5 +1,5 @@
 import { TObject, TSchema, Static } from '@sinclair/typebox';
-import { Router, H3Event, App, AppOptions } from 'h3';
+import { H3Event, Router, App, H3Error } from 'h3';
 
 interface ApplicationDef {
     arriSchemaVersion: "0.0.1";
@@ -101,12 +101,13 @@ interface ArriRoute<TPath extends string, TMethod extends HttpMethod, TQuery ext
     postHandler?: ArriRoutePostHandler<TPath, TQuery extends TObject ? Static<TQuery> : undefined, TBody extends TObject ? Static<TObject> : undefined, TResponse extends TSchema ? Static<TResponse> : TFallbackResponse>;
 }
 declare function defineRoute<TPath extends string, TMethod extends HttpMethod, TQuery extends TObject | undefined = any, TBody extends TSchema | undefined = any, TResponse extends TSchema | undefined = undefined, TFallbackResponse = any>(config: ArriRoute<TPath, TMethod, TQuery, TBody, TResponse, TFallbackResponse>): ArriRoute<TPath, TMethod, TQuery, TBody, TResponse, TFallbackResponse>;
-type Middleware = (context: HandlerContext) => void | Promise<void>;
+type Middleware = (context: HandlerContext, event: H3Event) => void | Promise<void>;
 declare const defineMiddleware: (middleware: Middleware) => Middleware;
 type ExtractParam<Path, NextPart> = Path extends `:${infer Param}` ? Record<Param, string> & NextPart : NextPart;
 type ExtractParams<Path> = Path extends `${infer Segment}/${infer Rest}` ? ExtractParam<Segment, ExtractParams<Rest>> : ExtractParam<Path, {}>;
-type ArriRouteHandler<TPath extends string, TQuery = undefined, TBody = undefined, TResponse = any> = (context: RouteHandlerContext<ExtractParams<TPath>, TQuery, TBody>) => TResponse extends undefined ? void | Promise<void> : TResponse | Promise<TResponse>;
+type ArriRouteHandler<TPath extends string, TQuery = undefined, TBody = undefined, TResponse = any> = (context: RouteHandlerContext<ExtractParams<TPath>, TQuery, TBody>, event: H3Event) => TResponse extends undefined ? void | Promise<void> : TResponse | Promise<TResponse>;
 interface RouteHandlerContext<TParams extends Record<string, string>, TQuery = undefined, TBody = undefined> extends HandlerContext {
+    type: "route";
     params: TParams;
     query: TQuery;
     body: TBody;
@@ -114,8 +115,8 @@ interface RouteHandlerContext<TParams extends Record<string, string>, TQuery = u
 interface RoutePostHandlerContext<TParams extends Record<string, string>, TQuery = undefined, TBody = undefined, TResponse = undefined> extends RouteHandlerContext<TParams, TQuery, TBody> {
     response: TResponse;
 }
-type ArriRoutePostHandler<TPath extends string, TQuery = undefined, TBody = undefined, TResponse = undefined> = (context: RoutePostHandlerContext<ExtractParams<TPath>, TQuery, TBody, TResponse>) => any;
-declare function registerRoute<TPath extends string>(router: Router, route: ArriRoute<TPath, HttpMethod, any, any, any>, middleware: Middleware[], prefix?: string): void;
+type ArriRoutePostHandler<TPath extends string, TQuery = undefined, TBody = undefined, TResponse = undefined> = (context: RoutePostHandlerContext<ExtractParams<TPath>, TQuery, TBody, TResponse>, event: H3Event) => any;
+declare function registerRoute<TPath extends string>(router: Router, route: ArriRoute<TPath, HttpMethod, any, any, any>, middleware: Middleware[], prefix?: string, opts?: ArriOptions): void;
 
 interface ArriProcedureBase {
     method: HttpMethod;
@@ -132,18 +133,16 @@ interface ArriProcedure<TParams extends TObject | undefined, TResponse extends T
     handler: ArriProcedureHandler<TParams extends TObject ? Static<TParams> : undefined, TResponse extends TObject ? Static<TResponse> : void>;
     postHandler?: ArriProcedurePostHandler<TParams extends TObject ? Static<TParams> : undefined, TResponse extends TObject ? Static<TResponse> : undefined>;
 }
-interface HandlerContext {
-    [key: string]: any;
-    event: H3Event;
-}
+type HandlerContext = Record<string, any>;
 interface RpcHandlerContext<TParams = undefined> extends HandlerContext {
+    type: "procedure";
     params: TParams;
 }
 interface RpcPostHandlerContext<TParams = undefined, TResponse = undefined> extends RpcHandlerContext<TParams> {
     response: TResponse;
 }
-type ArriProcedureHandler<TParams, TResponse> = (context: RpcHandlerContext<TParams>) => TResponse | Promise<TResponse>;
-type ArriProcedurePostHandler<TParams, TResponse> = (event: RpcPostHandlerContext<TParams, TResponse>) => any;
+type ArriProcedureHandler<TParams, TResponse> = (context: RpcHandlerContext<TParams>, event: H3Event) => TResponse | Promise<TResponse>;
+type ArriProcedurePostHandler<TParams, TResponse> = (context: RpcPostHandlerContext<TParams, TResponse>, event: H3Event) => any;
 declare function isRpc(input: any): input is ArriProcedure<any, any>;
 declare function defineRpc<TParams extends TObject | undefined = undefined, TResponse extends TObject | undefined | never = undefined>(config: ArriProcedure<TParams, TResponse>): ArriProcedure<TParams, TResponse>;
 declare function createRpcDefinition(rpcName: string, httpPath: string, procedure: ArriProcedure<any, any>): ProcedureDef;
@@ -151,20 +150,8 @@ declare function getRpcPath(rpcName: string, prefix?: string): string;
 declare function getRpcParamName(rpcName: string, procedure: ArriProcedure<any, any>): string | null;
 declare function getRpcParamDefinition(rpcName: string, procedure: ArriProcedure<any, any>): ProcedureDef["params"];
 declare function getRpcResponseName(rpcName: string, procedure: ArriProcedure<any, any>): string | null;
-declare function registerRpc(router: Router, path: string, procedure: ArriProcedure<any, any>, middleware: Middleware[]): void;
+declare function registerRpc(router: Router, path: string, procedure: ArriProcedure<any, any>, middleware: Middleware[], opts: ArriOptions): void;
 
-interface ArriOptions extends AppOptions {
-    /**
-     * Metadata to display in the __definition.json file
-     */
-    appInfo?: ApplicationDef["info"];
-    rpcRoutePrefix?: string;
-    /**
-     * Defaults to /__definitions
-     * This parameters also takes the rpcRoutePrefix option into account
-     */
-    rpcDefinitionPath?: string;
-}
 declare const DEV_ENDPOINT_ROOT = "/__arri_dev__";
 declare const DEV_DEFINITION_ENDPOINT = "/__arri_dev__/definition";
 declare class Arri {
@@ -177,6 +164,9 @@ declare class Arri {
     private procedures;
     private models;
     private readonly middlewares;
+    private readonly onAfterResponse;
+    private readonly onBeforeResponse;
+    private readonly onError;
     constructor(opts?: ArriOptions);
     registerMiddleware(middleware: Middleware): void;
     registerRpc<TParams extends TObject | undefined, TResponse extends TObject | undefined>(name: string, procedure: ArriProcedure<TParams, TResponse>): void;
@@ -184,6 +174,23 @@ declare class Arri {
     getAppDefinition(): ApplicationDef;
     getH3Instance(): App;
 }
+interface ArriOptions {
+    debug?: boolean;
+    /**
+     * Metadata to display in the __definition.json file
+     */
+    appInfo?: ApplicationDef["info"];
+    rpcRoutePrefix?: string;
+    /**
+     * Defaults to /__definitions
+     * This parameters also takes the rpcRoutePrefix option into account
+     */
+    rpcDefinitionPath?: string;
+    onRequest?: (event: H3Event) => void | Promise<void>;
+    onAfterResponse?: (context: RpcPostHandlerContext | RoutePostHandlerContext<any>, event: H3Event) => void | Promise<void>;
+    onBeforeResponse?: (context: RpcPostHandlerContext | RoutePostHandlerContext<any>, event: H3Event) => void | Promise<void>;
+    onError?: (error: H3Error, context: RpcHandlerContext | RouteHandlerContext<any>, event: H3Event) => void | Promise<void>;
+}
 declare const HttpMethodValues: readonly ["get", "post", "put", "patch", "delete", "head"];
 type HttpMethod = (typeof HttpMethodValues)[number];
 declare const isHttpMethod: (input: any) => input is "get" | "post" | "put" | "patch" | "delete" | "head";
@@ -195,4 +202,4 @@ interface ClientGenerator<TOptions extends Record<string, any> | undefined> {
 type ClientGeneratorPlugin<TOptions extends Record<string, any> | undefined> = (options: TOptions) => ClientGenerator<TOptions>;
 declare function defineClientGeneratorPlugin<TOptions extends Record<string, any> | undefined>(plugin: ClientGeneratorPlugin<TOptions>): ClientGeneratorPlugin<TOptions>;
 
-export { isJsonSchemaScalarType as $, Arri as A, type ClientGeneratorPlugin as B, type ClientGenerator as C, DEV_ENDPOINT_ROOT as D, type ExtractParam as E, type ApplicationDef as F, defineClientGeneratorPlugin as G, HttpMethodValues as H, normalizeWhitespace as I, type JsonSchemaObject as J, isProcedureDef as K, isServiceDef as L, type Middleware as M, isApplicationDef as N, unflattenObject as O, type ProcedureDef as P, unflattenProcedures as Q, type RpcHandlerContext as R, type ServiceDef as S, setNestedObjectProperty as T, removeDisallowedChars as U, JsonSchemaScalarTypeValues as V, JsonSchemaNullTypeValues as W, JsonSchemaComplexTypeValues as X, type JsonSchemaType as Y, type JsonSchemaTypeValue as Z, type JsonSchemaScalarType as _, DEV_DEFINITION_ENDPOINT as a, type JsonSchemaNullType as a0, isJsonSchemaNullType as a1, type JsonSchemaComplexType as a2, isJsonSchemaObject as a3, type JsonSchemaRecord as a4, isJsonSchemaRecord as a5, type JsonSchemaArray as a6, isJsonSchemaArray as a7, type JsonSchemaUint8Array as a8, type JsonSchemaEnum as a9, isJsonSchemaEnum as aa, type HttpMethod as b, type ArriProcedureBase as c, type ArriProcedure as d, type HandlerContext as e, type RpcPostHandlerContext as f, type ArriProcedureHandler as g, type ArriProcedurePostHandler as h, isHttpMethod as i, isRpc as j, defineRpc as k, createRpcDefinition as l, getRpcPath as m, getRpcParamName as n, getRpcParamDefinition as o, getRpcResponseName as p, type ArriRoute as q, registerRpc as r, defineRoute as s, defineMiddleware as t, type ExtractParams as u, type ArriRouteHandler as v, type RouteHandlerContext as w, type RoutePostHandlerContext as x, type ArriRoutePostHandler as y, registerRoute as z };
+export { type JsonSchemaScalarType as $, Arri as A, registerRoute as B, type ClientGenerator as C, DEV_ENDPOINT_ROOT as D, type ExtractParam as E, type ClientGeneratorPlugin as F, type ApplicationDef as G, HttpMethodValues as H, defineClientGeneratorPlugin as I, type JsonSchemaObject as J, normalizeWhitespace as K, isProcedureDef as L, type Middleware as M, isServiceDef as N, isApplicationDef as O, type ProcedureDef as P, unflattenObject as Q, type RpcHandlerContext as R, type ServiceDef as S, unflattenProcedures as T, setNestedObjectProperty as U, removeDisallowedChars as V, JsonSchemaScalarTypeValues as W, JsonSchemaNullTypeValues as X, JsonSchemaComplexTypeValues as Y, type JsonSchemaType as Z, type JsonSchemaTypeValue as _, DEV_DEFINITION_ENDPOINT as a, isJsonSchemaScalarType as a0, type JsonSchemaNullType as a1, isJsonSchemaNullType as a2, type JsonSchemaComplexType as a3, isJsonSchemaObject as a4, type JsonSchemaRecord as a5, isJsonSchemaRecord as a6, type JsonSchemaArray as a7, isJsonSchemaArray as a8, type JsonSchemaUint8Array as a9, type JsonSchemaEnum as aa, isJsonSchemaEnum as ab, type ArriOptions as b, type HttpMethod as c, type ArriProcedureBase as d, type ArriProcedure as e, type HandlerContext as f, type RpcPostHandlerContext as g, type ArriProcedureHandler as h, isHttpMethod as i, type ArriProcedurePostHandler as j, isRpc as k, defineRpc as l, createRpcDefinition as m, getRpcPath as n, getRpcParamName as o, getRpcParamDefinition as p, getRpcResponseName as q, registerRpc as r, type ArriRoute as s, defineRoute as t, defineMiddleware as u, type ExtractParams as v, type ArriRouteHandler as w, type RouteHandlerContext as x, type RoutePostHandlerContext as y, type ArriRoutePostHandler as z };

package/dist/shared/{arri.198ae3ea.cjs → arri.50fd4bf9.cjs}

@@ -521,95 +521,110 @@ function getRpcResponseDefinition(rpcName, procedure) {
   }
   return name;
 }
-function registerRpc(router, path, procedure, middleware) {
+function registerRpc(router, path, procedure, middleware, opts) {
   const httpMethod = procedure.method ?? "post";
   const handler = h3.eventHandler(async (event) => {
     const context = {
-      event
+      type: "procedure",
+      params: void 0
     };
     if (h3.isPreflightRequest(event)) {
       return "ok";
     }
-    if (middleware.length) {
-      await Promise.all(middleware.map((m) => m(context)));
-    }
-    if (procedure.params) {
-      switch (httpMethod) {
-        case "get":
-        case "head": {
-          const parsedParams = await h3.getValidatedQuery(
-            event,
-            typeboxSafeValidate(procedure.params, true)
-          );
-          if (!parsedParams.success) {
-            const errorParts = [];
-            for (const err of parsedParams.errors) {
-              const propName = err.path.split("/");
-              propName.shift();
-              if (!errorParts.includes(propName.join("."))) {
-                errorParts.push(propName.join("."));
+    try {
+      if (middleware.length) {
+        await Promise.all(middleware.map((m) => m(context, event)));
+      }
+      if (procedure.params) {
+        switch (httpMethod) {
+          case "get":
+          case "head": {
+            const parsedParams = await h3.getValidatedQuery(
+              event,
+              typeboxSafeValidate(procedure.params, true)
+            );
+            if (!parsedParams.success) {
+              const errorParts = [];
+              for (const err of parsedParams.errors) {
+                const propName = err.path.split("/");
+                propName.shift();
+                if (!errorParts.includes(propName.join("."))) {
+                  errorParts.push(propName.join("."));
+                }
               }
+              throw defineError(400, {
+                statusMessage: `Missing or invalid url query parameters: [${errorParts.join(
+                  ","
+                )}]`,
+                data: parsedParams.errors
+              });
             }
-            throw defineError(400, {
-              statusMessage: `Missing or invalid url query parameters: [${errorParts.join(
-                ","
-              )}]`,
-              data: parsedParams.errors
-            });
+            context.params = parsedParams.value;
+            break;
           }
-          context.params = parsedParams.value;
-          break;
-        }
-        case "delete":
-        case "patch":
-        case "post":
-        case "put": {
-          const parsedParams = await h3.readValidatedBody(
-            event,
-            typeboxSafeValidate(procedure.params)
-          );
-          if (!parsedParams.success) {
-            let isObjectError = false;
-            const errorParts = [];
-            for (const err of parsedParams.errors) {
-              if (err.type === errors.ValueErrorType.Object) {
-                isObjectError = true;
+          case "delete":
+          case "patch":
+          case "post":
+          case "put": {
+            const parsedParams = await h3.readValidatedBody(
+              event,
+              typeboxSafeValidate(procedure.params)
+            );
+            if (!parsedParams.success) {
+              let isObjectError = false;
+              const errorParts = [];
+              for (const err of parsedParams.errors) {
+                if (err.type === errors.ValueErrorType.Object) {
+                  isObjectError = true;
+                }
+                const propName = err.path.split("/");
+                propName.shift();
+                if (!errorParts.includes(propName.join("."))) {
+                  errorParts.push(propName.join("."));
+                }
               }
-              const propName = err.path.split("/");
-              propName.shift();
-              if (!errorParts.includes(propName.join("."))) {
-                errorParts.push(propName.join("."));
+              if (isObjectError) {
+                throw defineError(400, {
+                  statusMessage: `Invalid request body. Expected object.`
+                });
               }
-            }
-            if (isObjectError) {
               throw defineError(400, {
-                statusMessage: `Invalid request body. Expected object.`
+                statusMessage: `Invalid request body. Affected properties [${errorParts.join(
+                  ", "
+                )}]`,
+                data: parsedParams.errors
               });
             }
-            throw defineError(400, {
-              statusMessage: `Invalid request body. Affected properties [${errorParts.join(
-                ", "
-              )}]`,
-              data: parsedParams.errors
-            });
+            context.params = parsedParams.value;
+            break;
           }
-          context.params = parsedParams.value;
-          break;
+          default:
+            break;
         }
       }
-    }
-    const response = await procedure.handler(context);
-    if (typeof response === "object") {
-      h3.setResponseHeader(event, "Content-Type", "application/json");
-      await h3.send(event, JSON.stringify(response));
-    } else {
-      await h3.send(event, response);
-    }
-    if (procedure.postHandler) {
+      const response = await procedure.handler(context, event);
       context.response = response;
-      await procedure.postHandler(context);
+      if (opts.onBeforeResponse) {
+        await opts.onBeforeResponse(context, event);
+      }
+      if (typeof response === "object") {
+        h3.setResponseHeader(event, "Content-Type", "application/json");
+        await h3.send(event, JSON.stringify(response));
+      } else {
+        await h3.send(event, response ?? "");
+      }
+      if (opts.onAfterResponse) {
+        await opts.onAfterResponse(context, event);
+      }
+      if (procedure.postHandler) {
+        await procedure.postHandler(context, event);
+      }
+    } catch (err) {
+      if (opts.onError) {
+        await opts.onError(err, context, event);
+      }
     }
-    return null;
+    return "";
   });
   switch (httpMethod) {
     case "get":
@@ -638,55 +653,70 @@ function defineRoute(config) {
   return config;
 }
 const defineMiddleware = (middleware) => middleware;
-function registerRoute(router, route, middleware, prefix) {
-  const handler = async (event) => {
+function registerRoute(router, route, middleware, prefix, opts) {
+  const handler = h3.eventHandler(async (event) => {
     const context = {
-      event
+      type: "route",
+      params: event.context.params,
+      query: void 0,
+      body: void 0
     };
-    if (middleware.length) {
-      for (const m of middleware) {
-        await m(context);
+    try {
+      if (middleware.length) {
+        for (const m of middleware) {
+          await m(context, event);
+        }
       }
-    }
-    if (route.query) {
-      const result = await h3.getValidatedQuery(
-        event,
-        typeboxSafeValidate(route.query)
-      );
-      if (!result.success) {
-        throw errorResponseFromValidationErrors(
-          result.errors,
-          "Missing or invalid query parameters"
+      if (route.query) {
+        const result = await h3.getValidatedQuery(
+          event,
+          typeboxSafeValidate(route.query)
         );
+        if (!result.success) {
+          throw errorResponseFromValidationErrors(
+            result.errors,
+            "Missing or invalid query parameters"
+          );
+        }
+        context.query = result.value;
       }
-      context.query = result.value;
-    }
-    if (route.body && route.method !== "get" && route.method !== "head") {
-      const result = await h3.readValidatedBody(
-        event,
-        typeboxSafeValidate(route.body)
-      );
-      if (!result.success) {
-        throw errorResponseFromValidationErrors(
-          result.errors,
-          "Missing or invalid body parameters"
+      if (route.body && route.method !== "get" && route.method !== "head") {
+        const result = await h3.readValidatedBody(
+          event,
+          typeboxSafeValidate(route.body)
         );
+        if (!result.success) {
+          throw errorResponseFromValidationErrors(
+            result.errors,
+            "Missing or invalid body parameters"
+          );
+        }
+        context.body = result.value;
       }
-      context.body = result.value;
-    }
-    const response = await route.handler(context);
-    if (typeof response === "object") {
-      h3.setResponseHeader(event, "Content-Type", "application/json");
-      await h3.send(event, JSON.stringify(response));
-    } else {
-      await h3.send(event, response);
-    }
-    if (route.postHandler) {
+      const response = await route.handler(context, event);
       context.response = response;
-      await route.postHandler(context);
+      if (opts?.onBeforeResponse) {
+        await opts.onBeforeResponse(context, event);
+      }
+      if (typeof response === "object") {
+        h3.setResponseHeader(event, "Content-Type", "application/json");
+        await h3.send(event, JSON.stringify(response));
+      } else {
+        await h3.send(event, response ?? "");
+      }
+      if (opts?.onAfterResponse) {
+        await opts.onAfterResponse(context, event);
+      }
+      if (route.postHandler) {
+        await route.postHandler(context, event);
+      }
+    } catch (err) {
+      if (opts?.onError) {
+        await opts.onError(err, context, event);
+      }
     }
-    return null;
-  };
+    return "";
+  });
   const finalPath = (prefix ? `/${prefix}${route.path}` : route.path).split("//").join("/");
   switch (route.method) {
     case "get":
@@ -719,7 +749,7 @@ var __publicField = (obj, key, value) => {
 const DEV_ENDPOINT_ROOT = `/__arri_dev__`;
 const DEV_DEFINITION_ENDPOINT = `${DEV_ENDPOINT_ROOT}/definition`;
 class Arri {
-  constructor(opts) {
+  constructor(opts = {}) {
     __publicField(this, "__isArri__", true);
     __publicField(this, "h3App");
     __publicField(this, "h3Router", h3.createRouter());
@@ -729,23 +759,17 @@ class Arri {
     __publicField(this, "procedures", {});
     __publicField(this, "models", {});
     __publicField(this, "middlewares", []);
+    __publicField(this, "onAfterResponse");
+    __publicField(this, "onBeforeResponse");
+    __publicField(this, "onError");
     this.appInfo = opts?.appInfo;
     this.h3App = h3.createApp({
       debug: opts?.debug,
-      onAfterResponse: opts?.onAfterResponse,
-      onBeforeResponse: opts?.onBeforeResponse,
-      onError: async (err, event) => {
-        if (opts?.onError) {
-          await opts.onError(err, event);
-        }
-        h3.sendError(event, err);
-      },
-      onRequest: async (event) => {
-        if (opts?.onRequest) {
-          await opts.onRequest(event);
-        }
-      }
+      onRequest: opts?.onRequest
     });
+    this.onError = opts.onError;
+    this.onAfterResponse = opts.onAfterResponse;
+    this.onBeforeResponse = opts.onBeforeResponse;
     this.rpcRoutePrefix = opts?.rpcRoutePrefix ?? "";
     this.rpcDefinitionPath = opts?.rpcDefinitionPath ?? "__definition";
     this.h3Router.get(
@@ -778,7 +802,11 @@ class Arri {
         this.models[responseName] = procedure.response;
       }
     }
-    registerRpc(this.h3Router, path, procedure, this.middlewares);
+    registerRpc(this.h3Router, path, procedure, this.middlewares, {
+      onError: this.onError,
+      onAfterResponse: this.onAfterResponse,
+      onBeforeResponse: this.onBeforeResponse
+    });
   }
   registerRoute(route) {
     registerRoute(this.h3Router, route, this.middlewares);

package/dist/shared/{arri.7f1296ca.mjs → arri.64252c62.mjs}

@@ -1,6 +1,6 @@
 import { execSync } from 'child_process';
 import { writeFileSync } from 'fs';
-import { h as unflattenProcedures, i as isServiceDef, p as pascalCase, j as camelCase, a as isProcedureDef, d as isJsonSchemaObject, f as isJsonSchemaEnum, c as isJsonSchemaNullType, b as isJsonSchemaScalarType, e as isJsonSchemaRecord, g as isJsonSchemaArray } from './arri.74885d3a.mjs';
+import { h as unflattenProcedures, i as isServiceDef, p as pascalCase, j as camelCase, a as isProcedureDef, d as isJsonSchemaObject, f as isJsonSchemaEnum, c as isJsonSchemaNullType, b as isJsonSchemaScalarType, e as isJsonSchemaRecord, g as isJsonSchemaArray } from './arri.e62071ea.mjs';
 
 function defineClientGeneratorPlugin(plugin) {
   return plugin;