arri 0.34.0 → 0.36.1

package/README.md

@@ -18,6 +18,7 @@ Typescript implementation of Arri RPC. It's built on top of [H3](https://github.
 -   [Key Concepts](#key-concepts)
     -   [Arri Definition File](#arri-definition-file)
     -   [How Procedures Map To Endpoints](#how-procedures-map-to-endpoints)
+    -   [H3 Support](#h3-support)
 -   [Arri CLI](#arri-cli)
 
 ## Quickstart
@@ -480,6 +481,37 @@ The supported HTTP methods are as follows:
 
 When using a get method the RPC params will be mapped as query parameters which will be coerced into their type using the `a.coerce` method from `arri-validate`. Get methods support all basic scalar types however arrays and nested objects are not supported.
 
+### H3 Support
+Arri is built on top of [H3](https://h3.unjs.io/utils/request#getrequestipevent) so many of the concepts that apply to H3 also apply to Arri.
+
+#### Accessing Utilities
+Arri re-eports all of the H3 utilities.
+
+```ts
+import { getRequestIP, setResponseHeader } from 'arri';
+```
+
+#### Accessing H3 Events
+You can access H3 events from inside procedures handlers.
+
+```ts
+defineRpc({
+  params: undefined,
+  response: undefined,
+  handler(_, event) {
+    getRequestIP(event);
+  }
+)
+
+defineEventStreamRpc({
+  params: undefined,
+  response: undefined,
+  handler(_, event) {
+    getRequestIP(event);
+  }
+)
+```
+
 ## Arri CLI
 
 ```bash

package/dist/cli.cjs

@@ -11,7 +11,7 @@ const esbuild = require('esbuild');
 const esbuildPluginReplace = require('esbuild-plugin-replace');
 const path = require('pathe');
 const prettier = require('prettier');
-const config = require('./shared/arri.0dce1db1.cjs');
+const config = require('./shared/arri.8e96548e.cjs');
 const consola = require('consola');
 const globby = require('globby');
 const scule = require('scule');
@@ -526,13 +526,19 @@ async function startDevServer(config) {
       if (fileWatcher) {
         await fileWatcher.close();
       }
-      const dirToWatch = path__default.resolve(
-        config.rootDir ?? "",
-        config.srcDir
-      );
+      const srcDir = path__default.resolve(config.rootDir ?? "", config.srcDir);
+      const dirsToWatch = [srcDir];
+      if (config.esbuild.alias) {
+        for (const key of Object.keys(config.esbuild.alias)) {
+          const alias = config.esbuild.alias[key];
+          if (alias) {
+            dirsToWatch.push(alias);
+          }
+        }
+      }
       const buildDir = path__default.resolve(config.rootDir, config.buildDir);
       const outDir = path__default.resolve(config.rootDir, ".output");
-      fileWatcher = chokidar__default.watch([path__default.resolve(dirToWatch)], {
+      fileWatcher = chokidar__default.watch(dirsToWatch, {
         ignored: [buildDir, outDir],
         ignoreInitial: true
       });

package/dist/cli.mjs

@@ -10,7 +10,7 @@ import { build as build$1 } from 'esbuild';
 import { replace } from 'esbuild-plugin-replace';
 import path from 'pathe';
 import prettier from 'prettier';
-import { o as defaultConfig, m as isArriConfig, n as isResolvedArriConfig, a as DEV_DEFINITION_ENDPOINT } from './shared/arri.1b62504f.mjs';
+import { q as defaultConfig, o as isArriConfig, p as isResolvedArriConfig, a as DEV_DEFINITION_ENDPOINT } from './shared/arri.b1ff441a.mjs';
 import { createConsola } from 'consola';
 import { globby } from 'globby';
 import { camelCase, kebabCase } from 'scule';
@@ -502,13 +502,19 @@ async function startDevServer(config) {
       if (fileWatcher) {
         await fileWatcher.close();
       }
-      const dirToWatch = path.resolve(
-        config.rootDir ?? "",
-        config.srcDir
-      );
+      const srcDir = path.resolve(config.rootDir ?? "", config.srcDir);
+      const dirsToWatch = [srcDir];
+      if (config.esbuild.alias) {
+        for (const key of Object.keys(config.esbuild.alias)) {
+          const alias = config.esbuild.alias[key];
+          if (alias) {
+            dirsToWatch.push(alias);
+          }
+        }
+      }
       const buildDir = path.resolve(config.rootDir, config.buildDir);
       const outDir = path.resolve(config.rootDir, ".output");
-      fileWatcher = chokidar.watch([path.resolve(dirToWatch)], {
+      fileWatcher = chokidar.watch(dirsToWatch, {
         ignored: [buildDir, outDir],
         ignoreInitial: true
       });

package/dist/index.cjs

@@ -1,8 +1,9 @@
 'use strict';
 
-const config = require('./shared/arri.0dce1db1.cjs');
+const config = require('./shared/arri.8e96548e.cjs');
 const h3 = require('h3');
 require('arri-codegen-utils');
+require('consola');
 require('arri-validate');
 require('h3-sse');
 require('scule');
@@ -11,9 +12,10 @@ const defineMiddleware = (middleware) => middleware;
 
 exports.ArriApp = config.ArriApp;
 exports.ArriRouter = config.ArriRouter;
+exports.ArriServerError = config.ArriServerError;
+exports.ArriServerErrorResponse = config.ArriServerErrorResponse;
 exports.DEV_DEFINITION_ENDPOINT = config.DEV_DEFINITION_ENDPOINT;
 exports.DEV_ENDPOINT_ROOT = config.DEV_ENDPOINT_ROOT;
-exports.ErrorResponse = config.ErrorResponse;
 exports.EventStreamConnection = config.EventStreamConnection;
 exports.createAppDefinition = config.createAppDefinition;
 exports.createHttpRpcDefinition = config.createHttpRpcDefinition;

package/dist/index.d.cts

@@ -1,10 +1,32 @@
 import { HttpMethod, RpcHttpMethod, HttpRpcDefinition, SchemaFormProperties, SchemaFormDiscriminator, SchemaFormValues, AppDefinition, ClientGenerator } from 'arri-codegen-utils';
-import { AObjectSchema, ASchema, InferType, a, ValidationError, ValueError, ADiscriminatorSchema } from 'arri-validate';
-import { H3EventContext, H3Event, Router, H3Error, App } from 'h3';
+import { AObjectSchema, a, ValidationError, ASchema, InferType, ValueError, ADiscriminatorSchema } from 'arri-validate';
+import { H3Error, H3Event, H3EventContext, Router, App } from 'h3';
 export * from 'h3';
 import { EventStream } from 'h3-sse';
 import { BuildOptions } from 'esbuild';
 
+declare class ArriServerError extends Error {
+    code: number;
+    data?: any;
+    constructor(err: {
+        code: number;
+        message: string;
+        data?: any;
+        stack?: string;
+    });
+}
+declare const ArriServerErrorResponse: AObjectSchema<{
+    code: number;
+    message: string;
+    stack?: string[] | undefined;
+    data?: any;
+}, false>;
+type ArriServerErrorResponse = a.infer<typeof ArriServerErrorResponse>;
+declare function defineError(statusCode: StatusCode, input?: Partial<Omit<ArriServerErrorResponse, "code" | "stack">>): ArriServerError;
+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, event: H3Event, onError: ArriOptions["onError"], debug: boolean): Promise<void>;
+
 interface MiddlewareEventContext extends H3EventContext {
     rpcName?: string;
 }
@@ -39,26 +61,12 @@ interface ArriRoute<TPath extends string, TQuery extends AObjectSchema<any, any>
     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"> & {
+type RouteOptions = Pick<ArriOptions, "onAfterResponse" | "onBeforeResponse" | "onError" | "onRequest" | "debug"> & {
     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;
 
-declare const ErrorResponse: AObjectSchema<{
-    statusCode: number;
-    statusMessage: string;
-    stack?: string | undefined;
-    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: 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, event: H3Event, onError: ArriOptions["onError"]): Promise<void>;
-
 declare function defineEventStreamRpc<TParams extends RpcParamSchema | undefined = undefined, TResponse extends RpcParamSchema | undefined | never = undefined>(config: Omit<EventStreamRpc<TParams, TResponse>, "isEventStream">): EventStreamRpc<TParams, TResponse>;
 declare function isEventStreamRpc(input: unknown): input is EventStreamRpc<any, any>;
 interface EventStreamRpc<TParams extends RpcParamSchema | undefined = undefined, TResponse extends RpcParamSchema | undefined = undefined> extends Omit<Rpc<true, TParams, TResponse>, "handler" | "postHandler"> {
@@ -96,7 +104,7 @@ declare class EventStreamConnection<TData> {
     /**
      * Publish an error event. This will trigger the `onError` hooks of any connected clients.
      */
-    pushError(error: ErrorResponse, eventId?: string): Promise<void>;
+    pushError(error: ArriServerErrorResponse, eventId?: string): Promise<void>;
     private cleanup;
     /**
      * Tell clients that the stream has ended and close the connection.
@@ -176,16 +184,18 @@ declare class ArriApp implements ArriRouterBase {
     __isArri__: boolean;
     readonly h3App: App;
     readonly h3Router: Router;
-    private readonly rpcDefinitionPath;
-    private readonly rpcRoutePrefix;
+    private readonly _rpcDefinitionPath;
+    private readonly _rpcRoutePrefix;
     appInfo: AppDefinition["info"];
-    private procedures;
-    private models;
-    private readonly middlewares;
-    private readonly onRequest;
-    private readonly onAfterResponse;
-    private readonly onBeforeResponse;
-    private readonly onError;
+    private _procedures;
+    private _models;
+    private readonly _middlewares;
+    private readonly _onRequest;
+    private readonly _onAfterResponse;
+    private readonly _onBeforeResponse;
+    private readonly _onError;
+    private readonly _debug;
+    readonly definitionPath: string;
     constructor(opts?: ArriOptions);
     use(input: Middleware | ArriRouter): void;
     rpc<TIsEventStream extends boolean = false, TParams extends AObjectSchema<any, any> | undefined = undefined, TResponse extends AObjectSchema<any, any> | undefined = undefined>(procedure: NamedRpc<TIsEventStream, TParams, TResponse>): void;
@@ -208,7 +218,7 @@ interface ArriOptions {
     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>;
+    onError?: (error: ArriServerError, event: MiddlewareEvent) => void | Promise<void>;
 }
 
 interface ArriConfig {
@@ -238,4 +248,4 @@ type ResolvedArriConfig = Required<ArriConfig>;
 declare const defaultConfig: Required<ArriConfig>;
 declare function defineConfig(config: ArriConfig): ResolvedArriConfig;
 
-export { ArriApp, type ArriConfig, type ArriOptions, type ArriRoute, ArriRouter, type ArriRouterBase, DEV_DEFINITION_ENDPOINT, DEV_ENDPOINT_ROOT, ErrorResponse, EventStreamConnection, type EventStreamConnectionOptions, type EventStreamRpc, type EventStreamRpcHandler, type EventStreamRpcHandlerContext, type ExtractParam, type ExtractParams, type HandlerContext, type HttpRpc, type Middleware, type MiddlewareEvent, type MiddlewareEventContext, type ModelMap, type NamedRpc, type PostRouteEvent, type PostRouteEventContext, type ResolvedArriConfig, type RouteEvent, type RouteEventContext, type RouteOptions, type Rpc, type RpcEvent, type RpcHandler, type RpcHandlerContext, type RpcParamSchema, type RpcPostEvent, type RpcPostHandler, type RpcPostHandlerContext, type StatusCode, createAppDefinition, createHttpRpcDefinition, defaultConfig, defineConfig, defineError, defineEventStreamRpc, defineMiddleware, defineRoute, defineRpc, errorResponseFromValidationErrors, getRpcParamName, getRpcPath, getRpcResponseName, handleH3Error, handleRoute, isArriConfig, isEventStreamRpc, isResolvedArriConfig, isRpc, isRpcParamSchema, registerEventStreamRpc, registerRoute, registerRpc, validateRpcRequestInput };
+export { ArriApp, type ArriConfig, type ArriOptions, type ArriRoute, ArriRouter, type ArriRouterBase, ArriServerError, ArriServerErrorResponse, DEV_DEFINITION_ENDPOINT, DEV_ENDPOINT_ROOT, EventStreamConnection, type EventStreamConnectionOptions, type EventStreamRpc, type EventStreamRpcHandler, type EventStreamRpcHandlerContext, type ExtractParam, type ExtractParams, type HandlerContext, type HttpRpc, type Middleware, type MiddlewareEvent, type MiddlewareEventContext, type ModelMap, type NamedRpc, type PostRouteEvent, type PostRouteEventContext, type ResolvedArriConfig, type RouteEvent, type RouteEventContext, type RouteOptions, type Rpc, type RpcEvent, type RpcHandler, type RpcHandlerContext, type RpcParamSchema, type RpcPostEvent, type RpcPostHandler, type RpcPostHandlerContext, type StatusCode, createAppDefinition, createHttpRpcDefinition, defaultConfig, defineConfig, defineError, defineEventStreamRpc, defineMiddleware, defineRoute, defineRpc, errorResponseFromValidationErrors, getRpcParamName, getRpcPath, getRpcResponseName, handleH3Error, handleRoute, isArriConfig, isEventStreamRpc, isResolvedArriConfig, isRpc, isRpcParamSchema, registerEventStreamRpc, registerRoute, registerRpc, validateRpcRequestInput };

package/dist/index.d.mts

@@ -1,10 +1,32 @@
 import { HttpMethod, RpcHttpMethod, HttpRpcDefinition, SchemaFormProperties, SchemaFormDiscriminator, SchemaFormValues, AppDefinition, ClientGenerator } from 'arri-codegen-utils';
-import { AObjectSchema, ASchema, InferType, a, ValidationError, ValueError, ADiscriminatorSchema } from 'arri-validate';
-import { H3EventContext, H3Event, Router, H3Error, App } from 'h3';
+import { AObjectSchema, a, ValidationError, ASchema, InferType, ValueError, ADiscriminatorSchema } from 'arri-validate';
+import { H3Error, H3Event, H3EventContext, Router, App } from 'h3';
 export * from 'h3';
 import { EventStream } from 'h3-sse';
 import { BuildOptions } from 'esbuild';
 
+declare class ArriServerError extends Error {
+    code: number;
+    data?: any;
+    constructor(err: {
+        code: number;
+        message: string;
+        data?: any;
+        stack?: string;
+    });
+}
+declare const ArriServerErrorResponse: AObjectSchema<{
+    code: number;
+    message: string;
+    stack?: string[] | undefined;
+    data?: any;
+}, false>;
+type ArriServerErrorResponse = a.infer<typeof ArriServerErrorResponse>;
+declare function defineError(statusCode: StatusCode, input?: Partial<Omit<ArriServerErrorResponse, "code" | "stack">>): ArriServerError;
+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, event: H3Event, onError: ArriOptions["onError"], debug: boolean): Promise<void>;
+
 interface MiddlewareEventContext extends H3EventContext {
     rpcName?: string;
 }
@@ -39,26 +61,12 @@ interface ArriRoute<TPath extends string, TQuery extends AObjectSchema<any, any>
     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"> & {
+type RouteOptions = Pick<ArriOptions, "onAfterResponse" | "onBeforeResponse" | "onError" | "onRequest" | "debug"> & {
     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;
 
-declare const ErrorResponse: AObjectSchema<{
-    statusCode: number;
-    statusMessage: string;
-    stack?: string | undefined;
-    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: 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, event: H3Event, onError: ArriOptions["onError"]): Promise<void>;
-
 declare function defineEventStreamRpc<TParams extends RpcParamSchema | undefined = undefined, TResponse extends RpcParamSchema | undefined | never = undefined>(config: Omit<EventStreamRpc<TParams, TResponse>, "isEventStream">): EventStreamRpc<TParams, TResponse>;
 declare function isEventStreamRpc(input: unknown): input is EventStreamRpc<any, any>;
 interface EventStreamRpc<TParams extends RpcParamSchema | undefined = undefined, TResponse extends RpcParamSchema | undefined = undefined> extends Omit<Rpc<true, TParams, TResponse>, "handler" | "postHandler"> {
@@ -96,7 +104,7 @@ declare class EventStreamConnection<TData> {
     /**
      * Publish an error event. This will trigger the `onError` hooks of any connected clients.
      */
-    pushError(error: ErrorResponse, eventId?: string): Promise<void>;
+    pushError(error: ArriServerErrorResponse, eventId?: string): Promise<void>;
     private cleanup;
     /**
      * Tell clients that the stream has ended and close the connection.
@@ -176,16 +184,18 @@ declare class ArriApp implements ArriRouterBase {
     __isArri__: boolean;
     readonly h3App: App;
     readonly h3Router: Router;
-    private readonly rpcDefinitionPath;
-    private readonly rpcRoutePrefix;
+    private readonly _rpcDefinitionPath;
+    private readonly _rpcRoutePrefix;
     appInfo: AppDefinition["info"];
-    private procedures;
-    private models;
-    private readonly middlewares;
-    private readonly onRequest;
-    private readonly onAfterResponse;
-    private readonly onBeforeResponse;
-    private readonly onError;
+    private _procedures;
+    private _models;
+    private readonly _middlewares;
+    private readonly _onRequest;
+    private readonly _onAfterResponse;
+    private readonly _onBeforeResponse;
+    private readonly _onError;
+    private readonly _debug;
+    readonly definitionPath: string;
     constructor(opts?: ArriOptions);
     use(input: Middleware | ArriRouter): void;
     rpc<TIsEventStream extends boolean = false, TParams extends AObjectSchema<any, any> | undefined = undefined, TResponse extends AObjectSchema<any, any> | undefined = undefined>(procedure: NamedRpc<TIsEventStream, TParams, TResponse>): void;
@@ -208,7 +218,7 @@ interface ArriOptions {
     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>;
+    onError?: (error: ArriServerError, event: MiddlewareEvent) => void | Promise<void>;
 }
 
 interface ArriConfig {
@@ -238,4 +248,4 @@ type ResolvedArriConfig = Required<ArriConfig>;
 declare const defaultConfig: Required<ArriConfig>;
 declare function defineConfig(config: ArriConfig): ResolvedArriConfig;
 
-export { ArriApp, type ArriConfig, type ArriOptions, type ArriRoute, ArriRouter, type ArriRouterBase, DEV_DEFINITION_ENDPOINT, DEV_ENDPOINT_ROOT, ErrorResponse, EventStreamConnection, type EventStreamConnectionOptions, type EventStreamRpc, type EventStreamRpcHandler, type EventStreamRpcHandlerContext, type ExtractParam, type ExtractParams, type HandlerContext, type HttpRpc, type Middleware, type MiddlewareEvent, type MiddlewareEventContext, type ModelMap, type NamedRpc, type PostRouteEvent, type PostRouteEventContext, type ResolvedArriConfig, type RouteEvent, type RouteEventContext, type RouteOptions, type Rpc, type RpcEvent, type RpcHandler, type RpcHandlerContext, type RpcParamSchema, type RpcPostEvent, type RpcPostHandler, type RpcPostHandlerContext, type StatusCode, createAppDefinition, createHttpRpcDefinition, defaultConfig, defineConfig, defineError, defineEventStreamRpc, defineMiddleware, defineRoute, defineRpc, errorResponseFromValidationErrors, getRpcParamName, getRpcPath, getRpcResponseName, handleH3Error, handleRoute, isArriConfig, isEventStreamRpc, isResolvedArriConfig, isRpc, isRpcParamSchema, registerEventStreamRpc, registerRoute, registerRpc, validateRpcRequestInput };
+export { ArriApp, type ArriConfig, type ArriOptions, type ArriRoute, ArriRouter, type ArriRouterBase, ArriServerError, ArriServerErrorResponse, DEV_DEFINITION_ENDPOINT, DEV_ENDPOINT_ROOT, EventStreamConnection, type EventStreamConnectionOptions, type EventStreamRpc, type EventStreamRpcHandler, type EventStreamRpcHandlerContext, type ExtractParam, type ExtractParams, type HandlerContext, type HttpRpc, type Middleware, type MiddlewareEvent, type MiddlewareEventContext, type ModelMap, type NamedRpc, type PostRouteEvent, type PostRouteEventContext, type ResolvedArriConfig, type RouteEvent, type RouteEventContext, type RouteOptions, type Rpc, type RpcEvent, type RpcHandler, type RpcHandlerContext, type RpcParamSchema, type RpcPostEvent, type RpcPostHandler, type RpcPostHandlerContext, type StatusCode, createAppDefinition, createHttpRpcDefinition, defaultConfig, defineConfig, defineError, defineEventStreamRpc, defineMiddleware, defineRoute, defineRpc, errorResponseFromValidationErrors, getRpcParamName, getRpcPath, getRpcResponseName, handleH3Error, handleRoute, isArriConfig, isEventStreamRpc, isResolvedArriConfig, isRpc, isRpcParamSchema, registerEventStreamRpc, registerRoute, registerRpc, validateRpcRequestInput };

package/dist/index.d.ts

@@ -1,10 +1,32 @@
 import { HttpMethod, RpcHttpMethod, HttpRpcDefinition, SchemaFormProperties, SchemaFormDiscriminator, SchemaFormValues, AppDefinition, ClientGenerator } from 'arri-codegen-utils';
-import { AObjectSchema, ASchema, InferType, a, ValidationError, ValueError, ADiscriminatorSchema } from 'arri-validate';
-import { H3EventContext, H3Event, Router, H3Error, App } from 'h3';
+import { AObjectSchema, a, ValidationError, ASchema, InferType, ValueError, ADiscriminatorSchema } from 'arri-validate';
+import { H3Error, H3Event, H3EventContext, Router, App } from 'h3';
 export * from 'h3';
 import { EventStream } from 'h3-sse';
 import { BuildOptions } from 'esbuild';
 
+declare class ArriServerError extends Error {
+    code: number;
+    data?: any;
+    constructor(err: {
+        code: number;
+        message: string;
+        data?: any;
+        stack?: string;
+    });
+}
+declare const ArriServerErrorResponse: AObjectSchema<{
+    code: number;
+    message: string;
+    stack?: string[] | undefined;
+    data?: any;
+}, false>;
+type ArriServerErrorResponse = a.infer<typeof ArriServerErrorResponse>;
+declare function defineError(statusCode: StatusCode, input?: Partial<Omit<ArriServerErrorResponse, "code" | "stack">>): ArriServerError;
+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, event: H3Event, onError: ArriOptions["onError"], debug: boolean): Promise<void>;
+
 interface MiddlewareEventContext extends H3EventContext {
     rpcName?: string;
 }
@@ -39,26 +61,12 @@ interface ArriRoute<TPath extends string, TQuery extends AObjectSchema<any, any>
     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"> & {
+type RouteOptions = Pick<ArriOptions, "onAfterResponse" | "onBeforeResponse" | "onError" | "onRequest" | "debug"> & {
     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;
 
-declare const ErrorResponse: AObjectSchema<{
-    statusCode: number;
-    statusMessage: string;
-    stack?: string | undefined;
-    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: 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, event: H3Event, onError: ArriOptions["onError"]): Promise<void>;
-
 declare function defineEventStreamRpc<TParams extends RpcParamSchema | undefined = undefined, TResponse extends RpcParamSchema | undefined | never = undefined>(config: Omit<EventStreamRpc<TParams, TResponse>, "isEventStream">): EventStreamRpc<TParams, TResponse>;
 declare function isEventStreamRpc(input: unknown): input is EventStreamRpc<any, any>;
 interface EventStreamRpc<TParams extends RpcParamSchema | undefined = undefined, TResponse extends RpcParamSchema | undefined = undefined> extends Omit<Rpc<true, TParams, TResponse>, "handler" | "postHandler"> {
@@ -96,7 +104,7 @@ declare class EventStreamConnection<TData> {
     /**
      * Publish an error event. This will trigger the `onError` hooks of any connected clients.
      */
-    pushError(error: ErrorResponse, eventId?: string): Promise<void>;
+    pushError(error: ArriServerErrorResponse, eventId?: string): Promise<void>;
     private cleanup;
     /**
      * Tell clients that the stream has ended and close the connection.
@@ -176,16 +184,18 @@ declare class ArriApp implements ArriRouterBase {
     __isArri__: boolean;
     readonly h3App: App;
     readonly h3Router: Router;
-    private readonly rpcDefinitionPath;
-    private readonly rpcRoutePrefix;
+    private readonly _rpcDefinitionPath;
+    private readonly _rpcRoutePrefix;
     appInfo: AppDefinition["info"];
-    private procedures;
-    private models;
-    private readonly middlewares;
-    private readonly onRequest;
-    private readonly onAfterResponse;
-    private readonly onBeforeResponse;
-    private readonly onError;
+    private _procedures;
+    private _models;
+    private readonly _middlewares;
+    private readonly _onRequest;
+    private readonly _onAfterResponse;
+    private readonly _onBeforeResponse;
+    private readonly _onError;
+    private readonly _debug;
+    readonly definitionPath: string;
     constructor(opts?: ArriOptions);
     use(input: Middleware | ArriRouter): void;
     rpc<TIsEventStream extends boolean = false, TParams extends AObjectSchema<any, any> | undefined = undefined, TResponse extends AObjectSchema<any, any> | undefined = undefined>(procedure: NamedRpc<TIsEventStream, TParams, TResponse>): void;
@@ -208,7 +218,7 @@ interface ArriOptions {
     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>;
+    onError?: (error: ArriServerError, event: MiddlewareEvent) => void | Promise<void>;
 }
 
 interface ArriConfig {
@@ -238,4 +248,4 @@ type ResolvedArriConfig = Required<ArriConfig>;
 declare const defaultConfig: Required<ArriConfig>;
 declare function defineConfig(config: ArriConfig): ResolvedArriConfig;
 
-export { ArriApp, type ArriConfig, type ArriOptions, type ArriRoute, ArriRouter, type ArriRouterBase, DEV_DEFINITION_ENDPOINT, DEV_ENDPOINT_ROOT, ErrorResponse, EventStreamConnection, type EventStreamConnectionOptions, type EventStreamRpc, type EventStreamRpcHandler, type EventStreamRpcHandlerContext, type ExtractParam, type ExtractParams, type HandlerContext, type HttpRpc, type Middleware, type MiddlewareEvent, type MiddlewareEventContext, type ModelMap, type NamedRpc, type PostRouteEvent, type PostRouteEventContext, type ResolvedArriConfig, type RouteEvent, type RouteEventContext, type RouteOptions, type Rpc, type RpcEvent, type RpcHandler, type RpcHandlerContext, type RpcParamSchema, type RpcPostEvent, type RpcPostHandler, type RpcPostHandlerContext, type StatusCode, createAppDefinition, createHttpRpcDefinition, defaultConfig, defineConfig, defineError, defineEventStreamRpc, defineMiddleware, defineRoute, defineRpc, errorResponseFromValidationErrors, getRpcParamName, getRpcPath, getRpcResponseName, handleH3Error, handleRoute, isArriConfig, isEventStreamRpc, isResolvedArriConfig, isRpc, isRpcParamSchema, registerEventStreamRpc, registerRoute, registerRpc, validateRpcRequestInput };
+export { ArriApp, type ArriConfig, type ArriOptions, type ArriRoute, ArriRouter, type ArriRouterBase, ArriServerError, ArriServerErrorResponse, DEV_DEFINITION_ENDPOINT, DEV_ENDPOINT_ROOT, EventStreamConnection, type EventStreamConnectionOptions, type EventStreamRpc, type EventStreamRpcHandler, type EventStreamRpcHandlerContext, type ExtractParam, type ExtractParams, type HandlerContext, type HttpRpc, type Middleware, type MiddlewareEvent, type MiddlewareEventContext, type ModelMap, type NamedRpc, type PostRouteEvent, type PostRouteEventContext, type ResolvedArriConfig, type RouteEvent, type RouteEventContext, type RouteOptions, type Rpc, type RpcEvent, type RpcHandler, type RpcHandlerContext, type RpcParamSchema, type RpcPostEvent, type RpcPostHandler, type RpcPostHandlerContext, type StatusCode, createAppDefinition, createHttpRpcDefinition, defaultConfig, defineConfig, defineError, defineEventStreamRpc, defineMiddleware, defineRoute, defineRpc, errorResponseFromValidationErrors, getRpcParamName, getRpcPath, getRpcResponseName, handleH3Error, handleRoute, isArriConfig, isEventStreamRpc, isResolvedArriConfig, isRpc, isRpcParamSchema, registerEventStreamRpc, registerRoute, registerRpc, validateRpcRequestInput };

package/dist/index.mjs

@@ -1,6 +1,7 @@
-export { A as ArriApp, q as ArriRouter, a as DEV_DEFINITION_ENDPOINT, D as DEV_ENDPOINT_ROOT, E as ErrorResponse, y as EventStreamConnection, c as createAppDefinition, e as createHttpRpcDefinition, o as defaultConfig, p as defineConfig, j as defineError, w as defineEventStreamRpc, s as defineRoute, d as defineRpc, k as errorResponseFromValidationErrors, f as getRpcParamName, g as getRpcPath, h as getRpcResponseName, l as handleH3Error, u as handleRoute, m as isArriConfig, x as isEventStreamRpc, n as isResolvedArriConfig, b as isRpc, i as isRpcParamSchema, z as registerEventStreamRpc, t as registerRoute, r as registerRpc, v as validateRpcRequestInput } from './shared/arri.1b62504f.mjs';
+export { A as ArriApp, t as ArriRouter, j as ArriServerError, k as ArriServerErrorResponse, a as DEV_DEFINITION_ENDPOINT, D as DEV_ENDPOINT_ROOT, E as EventStreamConnection, c as createAppDefinition, e as createHttpRpcDefinition, q as defaultConfig, s as defineConfig, l as defineError, y as defineEventStreamRpc, u as defineRoute, d as defineRpc, m as errorResponseFromValidationErrors, f as getRpcParamName, g as getRpcPath, h as getRpcResponseName, n as handleH3Error, x as handleRoute, o as isArriConfig, z as isEventStreamRpc, p as isResolvedArriConfig, b as isRpc, i as isRpcParamSchema, B as registerEventStreamRpc, w as registerRoute, r as registerRpc, v as validateRpcRequestInput } from './shared/arri.b1ff441a.mjs';
 export * from 'h3';
 import 'arri-codegen-utils';
+import 'consola';
 import 'arri-validate';
 import 'h3-sse';
 import 'scule';