arri 0.0.44 → 0.1.0-beta.10

package/dist/index.d.cts

@@ -1,124 +1,152 @@
-import * as _sinclair_typebox from '@sinclair/typebox';
-import { TObject, TSchema, Static } from '@sinclair/typebox';
-import { H3Event, Router, App, H3Error } from 'h3';
-import { H as HttpMethod, P as ProcedureDef, A as ApplicationDef, a as ClientGenerator } from './shared/arri.4536bc49.cjs';
-import { ValueError } from '@sinclair/typebox/errors';
+import { HttpMethod, RpcDefinition, AppDefinition, ClientGenerator } from 'arri-codegen-utils';
+import * as arri_validate from 'arri-validate';
+import { AObjectSchema, ASchema, InferType, a, ValidationError } from 'arri-validate';
+import { H3EventContext, H3Event, Router, App, H3Error } from 'h3';
+export * from 'h3';
 import { BuildOptions } from 'esbuild';
 
-interface ArriRoute<TPath extends string, TMethod extends HttpMethod, TQuery extends TObject | undefined = undefined, TBody extends TSchema | undefined = undefined, TResponse extends TSchema | undefined = undefined, TFallbackResponse = any> {
-    path: TPath;
-    method: TMethod;
-    query?: TQuery;
-    body?: TBody;
-    response?: TResponse;
-    handler: ArriRouteHandler<TPath, TQuery extends TObject ? Static<TQuery> : undefined, TBody extends TSchema ? Static<TBody> : undefined, TResponse extends TSchema ? Static<TResponse> : TFallbackResponse>;
-    postHandler?: ArriRoutePostHandler<TPath, TQuery extends TObject ? Static<TQuery> : undefined, TBody extends TObject ? Static<TObject> : undefined, TResponse extends TSchema ? Static<TResponse> : TFallbackResponse>;
+interface MiddlewareEventContext extends H3EventContext {
+    rpcName?: string;
 }
-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, event: H3Event) => void | Promise<void>;
+interface MiddlewareEvent extends H3Event {
+    context: MiddlewareEventContext;
+}
+type Middleware = (event: MiddlewareEvent) => 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>, 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;
+
+interface RouteEventContext<TPath extends string, TQuery extends Record<any, any> = any, TBody = any> extends H3EventContext {
+    params: ExtractParams<TPath>;
     query: TQuery;
     body: TBody;
 }
-interface RoutePostHandlerContext<TParams extends Record<string, string>, TQuery = undefined, TBody = undefined, TResponse = undefined> extends RouteHandlerContext<TParams, TQuery, TBody> {
+interface RouteEvent<TPath extends string, TQuery extends Record<any, any> = any, TBody = any> extends H3Event {
+    context: RouteEventContext<TPath, TQuery, TBody>;
+}
+interface PostRouteEventContext<TPath extends string, TQuery extends Record<any, any> = any, TBody = any, TResponse = any> extends RouteEventContext<TPath, TQuery, TBody> {
     response: TResponse;
 }
-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 PostRouteEvent<TPath extends string, TQuery extends Record<any, any> = any, TBody = any, TResponse = any> extends H3Event {
+    context: PostRouteEventContext<TPath, TQuery, TBody, TResponse>;
+}
+interface ArriRoute<TPath extends string, TQuery extends AObjectSchema<any, any> = any, TBody extends ASchema<any> = any, TResponse = any> {
+    path: TPath;
+    method: HttpMethod | HttpMethod[];
+    query?: TQuery;
+    body?: TBody;
+    handler: (event: RouteEvent<TPath, InferType<TQuery>, InferType<TBody>>) => TResponse;
+    postHandler?: (event: PostRouteEvent<TPath, InferType<TQuery>, InferType<TBody>, Awaited<TResponse>>) => any;
+}
+declare function defineRoute<TPath extends string, TQuery extends AObjectSchema<any, any> = any, TBody extends AObjectSchema<any, any> = any, TResponse = any>(route: ArriRoute<TPath, TQuery, TBody, TResponse>): ArriRoute<TPath, TQuery, TBody, TResponse>;
+type RouteOptions = Pick<ArriOptions, "onAfterResponse" | "onBeforeResponse" | "onError" | "onRequest"> & {
+    middleware: Middleware[];
+};
+declare function registerRoute(router: Router, route: ArriRoute<any>, opts: RouteOptions): void;
+declare function handleRoute(router: Router, method: HttpMethod, route: ArriRoute<any>, opts: RouteOptions): void;
 
-interface ArriProcedureBase {
-    method: HttpMethod;
-    params?: any;
-    response?: any;
-    handler: (context: any) => any;
-    postHandler?: (context: any) => any;
-}
-interface ArriProcedure<TParams extends TObject | undefined, TResponse extends TObject | undefined> {
+interface ArriProcedure<TParams extends AObjectSchema | undefined, TResponse extends AObjectSchema | undefined> {
     description?: string;
     method?: HttpMethod;
+    path?: string;
     params: TParams;
     response: TResponse;
-    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>;
+    handler: ArriProcedureHandler<TParams extends AObjectSchema ? InferType<TParams> : undefined, TResponse extends AObjectSchema ? InferType<TResponse> : void>;
+    postHandler?: ArriProcedurePostHandler<TParams extends AObjectSchema ? InferType<TParams> : undefined, TResponse extends AObjectSchema ? InferType<TResponse> : undefined>;
+}
+interface ArriNamedProcedure<TParams extends AObjectSchema | undefined, TResponse extends AObjectSchema | undefined> extends ArriProcedure<TParams, TResponse> {
+    name: string;
 }
 type HandlerContext = Record<string, any>;
-interface RpcHandlerContext<TParams = undefined> extends HandlerContext {
-    type: "procedure";
+interface RpcHandlerContext<TParams = undefined> extends HandlerContext, Omit<H3EventContext, "params"> {
+    rpcName: string;
     params: TParams;
 }
 interface RpcPostHandlerContext<TParams = undefined, TResponse = undefined> extends RpcHandlerContext<TParams> {
     response: TResponse;
 }
-type ArriProcedureHandler<TParams, TResponse> = (context: RpcHandlerContext<TParams>, event: H3Event) => TResponse | Promise<TResponse>;
-type ArriProcedurePostHandler<TParams, TResponse> = (context: RpcPostHandlerContext<TParams, TResponse>, event: H3Event) => any;
+interface RpcEvent<TParams = undefined> extends Omit<H3Event, "context"> {
+    context: RpcHandlerContext<TParams>;
+}
+interface RpcPostEvent<TParams = undefined, TResponse = undefined> extends Omit<H3Event, "context"> {
+    context: RpcPostHandlerContext<TParams, TResponse>;
+}
+type ArriProcedureHandler<TParams, TResponse> = (context: RpcHandlerContext<TParams>, event: RpcEvent<TParams>) => TResponse | Promise<TResponse>;
+type ArriProcedurePostHandler<TParams, TResponse> = (context: RpcPostHandlerContext<TParams, TResponse>, event: RpcPostEvent<TParams, TResponse>) => 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;
+declare function defineRpc<TParams extends AObjectSchema | undefined = undefined, TResponse extends AObjectSchema | undefined | never = undefined>(config: ArriProcedure<TParams, TResponse>): ArriProcedure<TParams, TResponse>;
+declare function createRpcDefinition(rpcName: string, httpPath: string, procedure: ArriProcedure<any, any>): RpcDefinition;
 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[], opts: ArriOptions): void;
+declare function getRpcParamName(rpcName: string, procedure: ArriProcedure<any, any>): string | undefined;
+declare function getRpcResponseName(rpcName: string, procedure: ArriProcedure<any, any>): string | undefined;
+declare function registerRpc(router: Router, path: string, procedure: ArriNamedProcedure<any, any>, opts: RouteOptions): void;
+
+interface ArriRouterBase {
+    rpc: <TParams extends AObjectSchema<any, any> | undefined, TResponse extends AObjectSchema<any, any> | undefined>(procedure: ArriNamedProcedure<TParams, TResponse>) => void;
+    route: <TPath extends string, TQuery extends AObjectSchema<any, any> = any, TBody extends ASchema<any> = any, TResponse = any>(route: ArriRoute<TPath, TQuery, TBody, TResponse>) => void;
+}
+declare class ArriRouter implements ArriRouterBase {
+    private readonly procedures;
+    private readonly routes;
+    rpc<TParams extends AObjectSchema<any, any> | undefined, TResponse extends AObjectSchema<any, any> | undefined>(procedure: ArriNamedProcedure<TParams, TResponse>): void;
+    route<TPath extends string, TQuery extends AObjectSchema<any, any> = any, TBody extends ASchema<any> = any, TResponse = any>(route: ArriRoute<TPath, TQuery, TBody, TResponse>): void;
+    getProcedures(): ArriNamedProcedure<any, any>[];
+    getRoutes(): ArriRoute<any, any, any, any>[];
+}
 
 declare const DEV_ENDPOINT_ROOT = "/__arri_dev__";
-declare const DEV_DEFINITION_ENDPOINT = "/__arri_dev__/definition";
-declare class Arri {
+declare const DEV_DEFINITION_ENDPOINT = "/__arri_dev__/__definition";
+declare class ArriApp implements ArriRouterBase {
     __isArri__: boolean;
-    private readonly h3App;
-    private readonly h3Router;
+    readonly h3App: App;
+    readonly h3Router: Router;
     private readonly rpcDefinitionPath;
     private readonly rpcRoutePrefix;
-    appInfo: ApplicationDef["info"];
+    appInfo: AppDefinition["info"];
     private procedures;
     private models;
     private readonly middlewares;
+    private readonly onRequest;
     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;
-    registerRoute<TPath extends string, TMethod extends HttpMethod = HttpMethod, TQuery extends TObject | undefined = undefined, TBody extends TSchema | undefined = undefined, TResponse extends TSchema | undefined = undefined, TFallbackResponse = any>(route: ArriRoute<TPath, TMethod, TQuery, TBody, TResponse, TFallbackResponse>): void;
-    getAppDefinition(): ApplicationDef;
-    getH3Instance(): App;
+    use(input: Middleware | ArriRouter): void;
+    rpc<TParams extends AObjectSchema<any, any> | undefined, TResponse extends AObjectSchema<any, any> | undefined>(procedure: ArriNamedProcedure<TParams, TResponse>): void;
+    route<TPath extends string, TQuery extends AObjectSchema<any, any>, TBody extends ASchema<any>, TResponse = any>(route: ArriRoute<TPath, TQuery, TBody, TResponse>): void;
+    getAppDefinition(): AppDefinition;
 }
 interface ArriOptions {
     debug?: boolean;
     /**
      * Metadata to display in the __definition.json file
      */
-    appInfo?: ApplicationDef["info"];
+    appInfo?: AppDefinition["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>;
+    onRequest?: (event: MiddlewareEvent) => void | Promise<void>;
+    onAfterResponse?: (event: MiddlewareEvent) => void | Promise<void>;
+    onBeforeResponse?: (event: MiddlewareEvent) => void | Promise<void>;
+    onError?: (error: H3Error, event: MiddlewareEvent) => void | Promise<void>;
 }
 
-declare const ErrorResponse: _sinclair_typebox.TObject<{
-    statusCode: _sinclair_typebox.TInteger;
-    statusMessage: _sinclair_typebox.TString;
-    stack: _sinclair_typebox.TArray<_sinclair_typebox.TAny>;
-    data: _sinclair_typebox.TOptional<_sinclair_typebox.TObject<{}>>;
-}>;
-type ErrorResponse = Static<typeof ErrorResponse>;
+declare const ErrorResponse: arri_validate.AObjectSchema<{
+    statusCode: number;
+    statusMessage: string;
+    stack: any[];
+    data: any;
+}, false>;
+type ErrorResponse = a.infer<typeof ErrorResponse>;
 declare function defineError(statusCode: StatusCode, input?: Partial<Omit<ErrorResponse, "statusCode" | "stack">> & {
     stack?: string;
 }): H3Error;
-declare function errorResponseFromValidationErrors(errors: ValueError[], prefixText?: string): H3Error;
+declare function errorResponseFromValidationErrors(errors: ValidationError["errors"], prefixText?: string): H3Error;
 type StatusCode = number | 400 | 401 | 402 | 403 | 404 | 405 | 406 | 407 | 408 | 409 | 410 | 411 | 412 | 413 | 414 | 415 | 416 | 417 | 418 | 419 | 420 | 421 | 422 | 423 | 424 | 428 | 429 | 431 | 451 | 500 | 501 | 502 | 503 | 504 | 505 | 507 | 511;
-declare function handleH3Error(err: unknown, context: RpcHandlerContext | RouteHandlerContext<any>, event: H3Event, onError: ArriOptions["onError"]): Promise<void>;
+declare function handleH3Error(err: unknown, event: H3Event, onError: ArriOptions["onError"]): Promise<void>;
 
 interface ArriConfig {
     port: number;
@@ -134,8 +162,10 @@ interface ArriConfig {
     buildDir?: string;
     esbuild?: Omit<BuildOptions, "outfile" | "outdir" | "entryNames" | "entryPoints">;
 }
+declare function isArriConfig(input: unknown): input is ArriConfig;
+declare function isResolvedArriConfig(input: unknown): input is ResolvedArriConfig;
 type ResolvedArriConfig = Required<ArriConfig>;
 declare const defaultConfig: Required<ArriConfig>;
 declare function defineConfig(config: ArriConfig): ResolvedArriConfig;
 
-export { Arri, type ArriConfig, type ArriOptions, type ArriProcedure, type ArriProcedureBase, type ArriProcedureHandler, type ArriProcedurePostHandler, type ArriRoute, type ArriRouteHandler, type ArriRoutePostHandler, DEV_DEFINITION_ENDPOINT, DEV_ENDPOINT_ROOT, ErrorResponse, type ExtractParam, type ExtractParams, type HandlerContext, type Middleware, type ResolvedArriConfig, type RouteHandlerContext, type RoutePostHandlerContext, type RpcHandlerContext, type RpcPostHandlerContext, type StatusCode, createRpcDefinition, defaultConfig, defineConfig, defineError, defineMiddleware, defineRoute, defineRpc, errorResponseFromValidationErrors, getRpcParamDefinition, getRpcParamName, getRpcPath, getRpcResponseName, handleH3Error, isRpc, registerRoute, registerRpc };
+export { ArriApp, type ArriConfig, type ArriNamedProcedure, type ArriOptions, type ArriProcedure, type ArriProcedureHandler, type ArriProcedurePostHandler, type ArriRoute, ArriRouter, type ArriRouterBase, DEV_DEFINITION_ENDPOINT, DEV_ENDPOINT_ROOT, ErrorResponse, type ExtractParam, type ExtractParams, type HandlerContext, type Middleware, type MiddlewareEvent, type MiddlewareEventContext, type PostRouteEvent, type PostRouteEventContext, type ResolvedArriConfig, type RouteEvent, type RouteEventContext, type RouteOptions, type RpcEvent, type RpcHandlerContext, type RpcPostEvent, type RpcPostHandlerContext, type StatusCode, createRpcDefinition, defaultConfig, defineConfig, defineError, defineMiddleware, defineRoute, defineRpc, errorResponseFromValidationErrors, getRpcParamName, getRpcPath, getRpcResponseName, handleH3Error, handleRoute, isArriConfig, isResolvedArriConfig, isRpc, registerRoute, registerRpc };

package/dist/index.d.mts

@@ -1,124 +1,152 @@
-import * as _sinclair_typebox from '@sinclair/typebox';
-import { TObject, TSchema, Static } from '@sinclair/typebox';
-import { H3Event, Router, App, H3Error } from 'h3';
-import { H as HttpMethod, P as ProcedureDef, A as ApplicationDef, a as ClientGenerator } from './shared/arri.4536bc49.mjs';
-import { ValueError } from '@sinclair/typebox/errors';
+import { HttpMethod, RpcDefinition, AppDefinition, ClientGenerator } from 'arri-codegen-utils';
+import * as arri_validate from 'arri-validate';
+import { AObjectSchema, ASchema, InferType, a, ValidationError } from 'arri-validate';
+import { H3EventContext, H3Event, Router, App, H3Error } from 'h3';
+export * from 'h3';
 import { BuildOptions } from 'esbuild';
 
-interface ArriRoute<TPath extends string, TMethod extends HttpMethod, TQuery extends TObject | undefined = undefined, TBody extends TSchema | undefined = undefined, TResponse extends TSchema | undefined = undefined, TFallbackResponse = any> {
-    path: TPath;
-    method: TMethod;
-    query?: TQuery;
-    body?: TBody;
-    response?: TResponse;
-    handler: ArriRouteHandler<TPath, TQuery extends TObject ? Static<TQuery> : undefined, TBody extends TSchema ? Static<TBody> : undefined, TResponse extends TSchema ? Static<TResponse> : TFallbackResponse>;
-    postHandler?: ArriRoutePostHandler<TPath, TQuery extends TObject ? Static<TQuery> : undefined, TBody extends TObject ? Static<TObject> : undefined, TResponse extends TSchema ? Static<TResponse> : TFallbackResponse>;
+interface MiddlewareEventContext extends H3EventContext {
+    rpcName?: string;
 }
-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, event: H3Event) => void | Promise<void>;
+interface MiddlewareEvent extends H3Event {
+    context: MiddlewareEventContext;
+}
+type Middleware = (event: MiddlewareEvent) => 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>, 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;
+
+interface RouteEventContext<TPath extends string, TQuery extends Record<any, any> = any, TBody = any> extends H3EventContext {
+    params: ExtractParams<TPath>;
     query: TQuery;
     body: TBody;
 }
-interface RoutePostHandlerContext<TParams extends Record<string, string>, TQuery = undefined, TBody = undefined, TResponse = undefined> extends RouteHandlerContext<TParams, TQuery, TBody> {
+interface RouteEvent<TPath extends string, TQuery extends Record<any, any> = any, TBody = any> extends H3Event {
+    context: RouteEventContext<TPath, TQuery, TBody>;
+}
+interface PostRouteEventContext<TPath extends string, TQuery extends Record<any, any> = any, TBody = any, TResponse = any> extends RouteEventContext<TPath, TQuery, TBody> {
     response: TResponse;
 }
-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 PostRouteEvent<TPath extends string, TQuery extends Record<any, any> = any, TBody = any, TResponse = any> extends H3Event {
+    context: PostRouteEventContext<TPath, TQuery, TBody, TResponse>;
+}
+interface ArriRoute<TPath extends string, TQuery extends AObjectSchema<any, any> = any, TBody extends ASchema<any> = any, TResponse = any> {
+    path: TPath;
+    method: HttpMethod | HttpMethod[];
+    query?: TQuery;
+    body?: TBody;
+    handler: (event: RouteEvent<TPath, InferType<TQuery>, InferType<TBody>>) => TResponse;
+    postHandler?: (event: PostRouteEvent<TPath, InferType<TQuery>, InferType<TBody>, Awaited<TResponse>>) => any;
+}
+declare function defineRoute<TPath extends string, TQuery extends AObjectSchema<any, any> = any, TBody extends AObjectSchema<any, any> = any, TResponse = any>(route: ArriRoute<TPath, TQuery, TBody, TResponse>): ArriRoute<TPath, TQuery, TBody, TResponse>;
+type RouteOptions = Pick<ArriOptions, "onAfterResponse" | "onBeforeResponse" | "onError" | "onRequest"> & {
+    middleware: Middleware[];
+};
+declare function registerRoute(router: Router, route: ArriRoute<any>, opts: RouteOptions): void;
+declare function handleRoute(router: Router, method: HttpMethod, route: ArriRoute<any>, opts: RouteOptions): void;
 
-interface ArriProcedureBase {
-    method: HttpMethod;
-    params?: any;
-    response?: any;
-    handler: (context: any) => any;
-    postHandler?: (context: any) => any;
-}
-interface ArriProcedure<TParams extends TObject | undefined, TResponse extends TObject | undefined> {
+interface ArriProcedure<TParams extends AObjectSchema | undefined, TResponse extends AObjectSchema | undefined> {
     description?: string;
     method?: HttpMethod;
+    path?: string;
     params: TParams;
     response: TResponse;
-    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>;
+    handler: ArriProcedureHandler<TParams extends AObjectSchema ? InferType<TParams> : undefined, TResponse extends AObjectSchema ? InferType<TResponse> : void>;
+    postHandler?: ArriProcedurePostHandler<TParams extends AObjectSchema ? InferType<TParams> : undefined, TResponse extends AObjectSchema ? InferType<TResponse> : undefined>;
+}
+interface ArriNamedProcedure<TParams extends AObjectSchema | undefined, TResponse extends AObjectSchema | undefined> extends ArriProcedure<TParams, TResponse> {
+    name: string;
 }
 type HandlerContext = Record<string, any>;
-interface RpcHandlerContext<TParams = undefined> extends HandlerContext {
-    type: "procedure";
+interface RpcHandlerContext<TParams = undefined> extends HandlerContext, Omit<H3EventContext, "params"> {
+    rpcName: string;
     params: TParams;
 }
 interface RpcPostHandlerContext<TParams = undefined, TResponse = undefined> extends RpcHandlerContext<TParams> {
     response: TResponse;
 }
-type ArriProcedureHandler<TParams, TResponse> = (context: RpcHandlerContext<TParams>, event: H3Event) => TResponse | Promise<TResponse>;
-type ArriProcedurePostHandler<TParams, TResponse> = (context: RpcPostHandlerContext<TParams, TResponse>, event: H3Event) => any;
+interface RpcEvent<TParams = undefined> extends Omit<H3Event, "context"> {
+    context: RpcHandlerContext<TParams>;
+}
+interface RpcPostEvent<TParams = undefined, TResponse = undefined> extends Omit<H3Event, "context"> {
+    context: RpcPostHandlerContext<TParams, TResponse>;
+}
+type ArriProcedureHandler<TParams, TResponse> = (context: RpcHandlerContext<TParams>, event: RpcEvent<TParams>) => TResponse | Promise<TResponse>;
+type ArriProcedurePostHandler<TParams, TResponse> = (context: RpcPostHandlerContext<TParams, TResponse>, event: RpcPostEvent<TParams, TResponse>) => 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;
+declare function defineRpc<TParams extends AObjectSchema | undefined = undefined, TResponse extends AObjectSchema | undefined | never = undefined>(config: ArriProcedure<TParams, TResponse>): ArriProcedure<TParams, TResponse>;
+declare function createRpcDefinition(rpcName: string, httpPath: string, procedure: ArriProcedure<any, any>): RpcDefinition;
 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[], opts: ArriOptions): void;
+declare function getRpcParamName(rpcName: string, procedure: ArriProcedure<any, any>): string | undefined;
+declare function getRpcResponseName(rpcName: string, procedure: ArriProcedure<any, any>): string | undefined;
+declare function registerRpc(router: Router, path: string, procedure: ArriNamedProcedure<any, any>, opts: RouteOptions): void;
+
+interface ArriRouterBase {
+    rpc: <TParams extends AObjectSchema<any, any> | undefined, TResponse extends AObjectSchema<any, any> | undefined>(procedure: ArriNamedProcedure<TParams, TResponse>) => void;
+    route: <TPath extends string, TQuery extends AObjectSchema<any, any> = any, TBody extends ASchema<any> = any, TResponse = any>(route: ArriRoute<TPath, TQuery, TBody, TResponse>) => void;
+}
+declare class ArriRouter implements ArriRouterBase {
+    private readonly procedures;
+    private readonly routes;
+    rpc<TParams extends AObjectSchema<any, any> | undefined, TResponse extends AObjectSchema<any, any> | undefined>(procedure: ArriNamedProcedure<TParams, TResponse>): void;
+    route<TPath extends string, TQuery extends AObjectSchema<any, any> = any, TBody extends ASchema<any> = any, TResponse = any>(route: ArriRoute<TPath, TQuery, TBody, TResponse>): void;
+    getProcedures(): ArriNamedProcedure<any, any>[];
+    getRoutes(): ArriRoute<any, any, any, any>[];
+}
 
 declare const DEV_ENDPOINT_ROOT = "/__arri_dev__";
-declare const DEV_DEFINITION_ENDPOINT = "/__arri_dev__/definition";
-declare class Arri {
+declare const DEV_DEFINITION_ENDPOINT = "/__arri_dev__/__definition";
+declare class ArriApp implements ArriRouterBase {
     __isArri__: boolean;
-    private readonly h3App;
-    private readonly h3Router;
+    readonly h3App: App;
+    readonly h3Router: Router;
     private readonly rpcDefinitionPath;
     private readonly rpcRoutePrefix;
-    appInfo: ApplicationDef["info"];
+    appInfo: AppDefinition["info"];
     private procedures;
     private models;
     private readonly middlewares;
+    private readonly onRequest;
     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;
-    registerRoute<TPath extends string, TMethod extends HttpMethod = HttpMethod, TQuery extends TObject | undefined = undefined, TBody extends TSchema | undefined = undefined, TResponse extends TSchema | undefined = undefined, TFallbackResponse = any>(route: ArriRoute<TPath, TMethod, TQuery, TBody, TResponse, TFallbackResponse>): void;
-    getAppDefinition(): ApplicationDef;
-    getH3Instance(): App;
+    use(input: Middleware | ArriRouter): void;
+    rpc<TParams extends AObjectSchema<any, any> | undefined, TResponse extends AObjectSchema<any, any> | undefined>(procedure: ArriNamedProcedure<TParams, TResponse>): void;
+    route<TPath extends string, TQuery extends AObjectSchema<any, any>, TBody extends ASchema<any>, TResponse = any>(route: ArriRoute<TPath, TQuery, TBody, TResponse>): void;
+    getAppDefinition(): AppDefinition;
 }
 interface ArriOptions {
     debug?: boolean;
     /**
      * Metadata to display in the __definition.json file
      */
-    appInfo?: ApplicationDef["info"];
+    appInfo?: AppDefinition["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>;
+    onRequest?: (event: MiddlewareEvent) => void | Promise<void>;
+    onAfterResponse?: (event: MiddlewareEvent) => void | Promise<void>;
+    onBeforeResponse?: (event: MiddlewareEvent) => void | Promise<void>;
+    onError?: (error: H3Error, event: MiddlewareEvent) => void | Promise<void>;
 }
 
-declare const ErrorResponse: _sinclair_typebox.TObject<{
-    statusCode: _sinclair_typebox.TInteger;
-    statusMessage: _sinclair_typebox.TString;
-    stack: _sinclair_typebox.TArray<_sinclair_typebox.TAny>;
-    data: _sinclair_typebox.TOptional<_sinclair_typebox.TObject<{}>>;
-}>;
-type ErrorResponse = Static<typeof ErrorResponse>;
+declare const ErrorResponse: arri_validate.AObjectSchema<{
+    statusCode: number;
+    statusMessage: string;
+    stack: any[];
+    data: any;
+}, false>;
+type ErrorResponse = a.infer<typeof ErrorResponse>;
 declare function defineError(statusCode: StatusCode, input?: Partial<Omit<ErrorResponse, "statusCode" | "stack">> & {
     stack?: string;
 }): H3Error;
-declare function errorResponseFromValidationErrors(errors: ValueError[], prefixText?: string): H3Error;
+declare function errorResponseFromValidationErrors(errors: ValidationError["errors"], prefixText?: string): H3Error;
 type StatusCode = number | 400 | 401 | 402 | 403 | 404 | 405 | 406 | 407 | 408 | 409 | 410 | 411 | 412 | 413 | 414 | 415 | 416 | 417 | 418 | 419 | 420 | 421 | 422 | 423 | 424 | 428 | 429 | 431 | 451 | 500 | 501 | 502 | 503 | 504 | 505 | 507 | 511;
-declare function handleH3Error(err: unknown, context: RpcHandlerContext | RouteHandlerContext<any>, event: H3Event, onError: ArriOptions["onError"]): Promise<void>;
+declare function handleH3Error(err: unknown, event: H3Event, onError: ArriOptions["onError"]): Promise<void>;
 
 interface ArriConfig {
     port: number;
@@ -134,8 +162,10 @@ interface ArriConfig {
     buildDir?: string;
     esbuild?: Omit<BuildOptions, "outfile" | "outdir" | "entryNames" | "entryPoints">;
 }
+declare function isArriConfig(input: unknown): input is ArriConfig;
+declare function isResolvedArriConfig(input: unknown): input is ResolvedArriConfig;
 type ResolvedArriConfig = Required<ArriConfig>;
 declare const defaultConfig: Required<ArriConfig>;
 declare function defineConfig(config: ArriConfig): ResolvedArriConfig;
 
-export { Arri, type ArriConfig, type ArriOptions, type ArriProcedure, type ArriProcedureBase, type ArriProcedureHandler, type ArriProcedurePostHandler, type ArriRoute, type ArriRouteHandler, type ArriRoutePostHandler, DEV_DEFINITION_ENDPOINT, DEV_ENDPOINT_ROOT, ErrorResponse, type ExtractParam, type ExtractParams, type HandlerContext, type Middleware, type ResolvedArriConfig, type RouteHandlerContext, type RoutePostHandlerContext, type RpcHandlerContext, type RpcPostHandlerContext, type StatusCode, createRpcDefinition, defaultConfig, defineConfig, defineError, defineMiddleware, defineRoute, defineRpc, errorResponseFromValidationErrors, getRpcParamDefinition, getRpcParamName, getRpcPath, getRpcResponseName, handleH3Error, isRpc, registerRoute, registerRpc };
+export { ArriApp, type ArriConfig, type ArriNamedProcedure, type ArriOptions, type ArriProcedure, type ArriProcedureHandler, type ArriProcedurePostHandler, type ArriRoute, ArriRouter, type ArriRouterBase, DEV_DEFINITION_ENDPOINT, DEV_ENDPOINT_ROOT, ErrorResponse, type ExtractParam, type ExtractParams, type HandlerContext, type Middleware, type MiddlewareEvent, type MiddlewareEventContext, type PostRouteEvent, type PostRouteEventContext, type ResolvedArriConfig, type RouteEvent, type RouteEventContext, type RouteOptions, type RpcEvent, type RpcHandlerContext, type RpcPostEvent, type RpcPostHandlerContext, type StatusCode, createRpcDefinition, defaultConfig, defineConfig, defineError, defineMiddleware, defineRoute, defineRpc, errorResponseFromValidationErrors, getRpcParamName, getRpcPath, getRpcResponseName, handleH3Error, handleRoute, isArriConfig, isResolvedArriConfig, isRpc, registerRoute, registerRpc };