arri 0.1.0-beta.2 → 0.1.0-beta.4

package/dist/cli.cjs

@@ -11,7 +11,7 @@ const consola = require('consola');
 const esbuild = require('esbuild');
 const path = require('pathe');
 const prettier = require('prettier');
-const config = require('./shared/arri.406d936a.cjs');
+const config = require('./shared/arri.ef78b5e0.cjs');
 const globby = require('globby');
 const scule = require('scule');
 const arriCodegenDart = require('arri-codegen-dart');
@@ -263,6 +263,7 @@ async function bundleFiles(config, allowCodegen = true) {
       js: `import { createRequire as topLevelCreateRequire } from 'module';
             const require = topLevelCreateRequire(import.meta.url);`
     },
+    allowOverwrite: true,
     outdir: path__default.resolve(config.rootDir, ".output")
   });
 }
@@ -309,6 +310,7 @@ async function createBuildCodegenModule(config) {
         app.rpc({
             name: route.id,
             method: route.route.method,
+            path: route.route.path,
             params: route.route.params,
             response: route.route.response,
             handler: route.route.handler,
@@ -549,6 +551,7 @@ for (const route of routes) {
     app.rpc({
         name: route.id,
         method: route.route.method,
+        path: route.route.path,
         params: route.route.params,
         response: route.route.response,
         handler: route.route.handler,

package/dist/cli.mjs

@@ -10,7 +10,7 @@ import * as esbuild from 'esbuild';
 import { build as build$1 } from 'esbuild';
 import path from 'pathe';
 import prettier from 'prettier';
-import { m as defaultConfig, l as isResolvedArriConfig, a as DEV_DEFINITION_ENDPOINT } from './shared/arri.8539c7bd.mjs';
+import { m as defaultConfig, l as isResolvedArriConfig, a as DEV_DEFINITION_ENDPOINT } from './shared/arri.74120afa.mjs';
 import { globby } from 'globby';
 import { camelCase, kebabCase } from 'scule';
 import { dartClientGenerator } from 'arri-codegen-dart';
@@ -242,6 +242,7 @@ async function bundleFiles(config, allowCodegen = true) {
       js: `import { createRequire as topLevelCreateRequire } from 'module';
             const require = topLevelCreateRequire(import.meta.url);`
     },
+    allowOverwrite: true,
     outdir: path.resolve(config.rootDir, ".output")
   });
 }
@@ -288,6 +289,7 @@ async function createBuildCodegenModule(config) {
         app.rpc({
             name: route.id,
             method: route.route.method,
+            path: route.route.path,
             params: route.route.params,
             response: route.route.response,
             handler: route.route.handler,
@@ -528,6 +530,7 @@ for (const route of routes) {
     app.rpc({
         name: route.id,
         method: route.route.method,
+        path: route.route.path,
         params: route.route.params,
         response: route.route.response,
         handler: route.route.handler,

package/dist/index.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-const config = require('./shared/arri.406d936a.cjs');
+const config = require('./shared/arri.ef78b5e0.cjs');
 const h3 = require('h3');
 require('arri-validate');
 require('arri-codegen-utils');

package/dist/index.d.cts

@@ -1,11 +1,17 @@
 import { HttpMethod, RpcDefinition, AppDefinition, ClientGenerator } from 'arri-codegen-utils';
 import * as arri_validate from 'arri-validate';
 import { AObjectSchema, InferType, a, ValidationError } from 'arri-validate';
-import { H3Event, H3EventContext, Router, App, H3Error } from 'h3';
+import { H3EventContext, H3Event, Router, App, H3Error } from 'h3';
 export * from 'h3';
 import { BuildOptions } from 'esbuild';
 
-type Middleware = (event: H3Event) => void | Promise<void>;
+interface MiddlewareEventContext extends H3EventContext {
+    rpcName?: string;
+}
+interface MiddlewareEvent extends H3Event {
+    context: MiddlewareEventContext;
+}
+type Middleware = (event: MiddlewareEvent) => void | Promise<void>;
 declare const defineMiddleware: (middleware: Middleware) => Middleware;
 type ExtractParam$1<Path, NextPart> = Path extends `:${infer Param}` ? Record<Param, string> & NextPart : NextPart;
 type ExtractParams$1<Path> = Path extends `${infer Segment}/${infer Rest}` ? ExtractParam$1<Segment, ExtractParams$1<Rest>> : ExtractParam$1<Path, {}>;
@@ -31,6 +37,7 @@ type RouteOptions = Pick<ArriOptions, "onAfterResponse" | "onBeforeResponse" | "
 interface ArriProcedure<TParams extends AObjectSchema | undefined, TResponse extends AObjectSchema | undefined> {
     description?: string;
     method?: HttpMethod;
+    path?: string;
     params: TParams;
     response: TResponse;
     handler: ArriProcedureHandler<TParams extends AObjectSchema ? InferType<TParams> : undefined, TResponse extends AObjectSchema ? InferType<TResponse> : void>;
@@ -41,20 +48,27 @@ interface ArriNamedProcedure<TParams extends AObjectSchema | undefined, TRespons
 }
 type HandlerContext = Record<string, any>;
 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 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 | undefined;
 declare function getRpcResponseName(rpcName: string, procedure: ArriProcedure<any, any>): string | undefined;
-declare function registerRpc(router: Router, path: string, procedure: ArriProcedure<any, any>, opts: RouteOptions): void;
+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;
@@ -103,10 +117,10 @@ interface ArriOptions {
      * This parameters also takes the rpcRoutePrefix option into account
      */
     rpcDefinitionPath?: string;
-    onRequest?: (event: H3Event) => void | Promise<void>;
-    onAfterResponse?: (event: H3Event) => void | Promise<void>;
-    onBeforeResponse?: (event: H3Event) => void | Promise<void>;
-    onError?: (error: H3Error, 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: arri_validate.AObjectSchema<{
@@ -143,4 +157,4 @@ type ResolvedArriConfig = Required<ArriConfig>;
 declare const defaultConfig: Required<ArriConfig>;
 declare function defineConfig(config: ArriConfig): ResolvedArriConfig;
 
-export { ArriApp, type ArriConfig, type ArriNamedProcedure, type ArriOptions, type ArriProcedure, type ArriProcedureHandler, type ArriProcedurePostHandler, ArriRouter, type ArriRouterBase, DEV_DEFINITION_ENDPOINT, DEV_ENDPOINT_ROOT, ErrorResponse, type ExtractParam$1 as ExtractParam, type ExtractParams$1 as ExtractParams, type HandlerContext, type Middleware, type ResolvedArriConfig, type RpcHandlerContext, type RpcPostHandlerContext, type StatusCode, createRpcDefinition, defaultConfig, defineConfig, defineError, defineMiddleware, defineRpc, errorResponseFromValidationErrors, getRpcParamName, getRpcPath, getRpcResponseName, handleH3Error, isArriConfig, isResolvedArriConfig, isRpc, registerRpc };
+export { ArriApp, type ArriConfig, type ArriNamedProcedure, type ArriOptions, type ArriProcedure, type ArriProcedureHandler, type ArriProcedurePostHandler, ArriRouter, type ArriRouterBase, DEV_DEFINITION_ENDPOINT, DEV_ENDPOINT_ROOT, ErrorResponse, type ExtractParam$1 as ExtractParam, type ExtractParams$1 as ExtractParams, type HandlerContext, type Middleware, type MiddlewareEvent, type MiddlewareEventContext, type ResolvedArriConfig, type RpcEvent, type RpcHandlerContext, type RpcPostEvent, type RpcPostHandlerContext, type StatusCode, createRpcDefinition, defaultConfig, defineConfig, defineError, defineMiddleware, defineRpc, errorResponseFromValidationErrors, getRpcParamName, getRpcPath, getRpcResponseName, handleH3Error, isArriConfig, isResolvedArriConfig, isRpc, registerRpc };

package/dist/index.d.mts

@@ -1,11 +1,17 @@
 import { HttpMethod, RpcDefinition, AppDefinition, ClientGenerator } from 'arri-codegen-utils';
 import * as arri_validate from 'arri-validate';
 import { AObjectSchema, InferType, a, ValidationError } from 'arri-validate';
-import { H3Event, H3EventContext, Router, App, H3Error } from 'h3';
+import { H3EventContext, H3Event, Router, App, H3Error } from 'h3';
 export * from 'h3';
 import { BuildOptions } from 'esbuild';
 
-type Middleware = (event: H3Event) => void | Promise<void>;
+interface MiddlewareEventContext extends H3EventContext {
+    rpcName?: string;
+}
+interface MiddlewareEvent extends H3Event {
+    context: MiddlewareEventContext;
+}
+type Middleware = (event: MiddlewareEvent) => void | Promise<void>;
 declare const defineMiddleware: (middleware: Middleware) => Middleware;
 type ExtractParam$1<Path, NextPart> = Path extends `:${infer Param}` ? Record<Param, string> & NextPart : NextPart;
 type ExtractParams$1<Path> = Path extends `${infer Segment}/${infer Rest}` ? ExtractParam$1<Segment, ExtractParams$1<Rest>> : ExtractParam$1<Path, {}>;
@@ -31,6 +37,7 @@ type RouteOptions = Pick<ArriOptions, "onAfterResponse" | "onBeforeResponse" | "
 interface ArriProcedure<TParams extends AObjectSchema | undefined, TResponse extends AObjectSchema | undefined> {
     description?: string;
     method?: HttpMethod;
+    path?: string;
     params: TParams;
     response: TResponse;
     handler: ArriProcedureHandler<TParams extends AObjectSchema ? InferType<TParams> : undefined, TResponse extends AObjectSchema ? InferType<TResponse> : void>;
@@ -41,20 +48,27 @@ interface ArriNamedProcedure<TParams extends AObjectSchema | undefined, TRespons
 }
 type HandlerContext = Record<string, any>;
 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 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 | undefined;
 declare function getRpcResponseName(rpcName: string, procedure: ArriProcedure<any, any>): string | undefined;
-declare function registerRpc(router: Router, path: string, procedure: ArriProcedure<any, any>, opts: RouteOptions): void;
+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;
@@ -103,10 +117,10 @@ interface ArriOptions {
      * This parameters also takes the rpcRoutePrefix option into account
      */
     rpcDefinitionPath?: string;
-    onRequest?: (event: H3Event) => void | Promise<void>;
-    onAfterResponse?: (event: H3Event) => void | Promise<void>;
-    onBeforeResponse?: (event: H3Event) => void | Promise<void>;
-    onError?: (error: H3Error, 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: arri_validate.AObjectSchema<{
@@ -143,4 +157,4 @@ type ResolvedArriConfig = Required<ArriConfig>;
 declare const defaultConfig: Required<ArriConfig>;
 declare function defineConfig(config: ArriConfig): ResolvedArriConfig;
 
-export { ArriApp, type ArriConfig, type ArriNamedProcedure, type ArriOptions, type ArriProcedure, type ArriProcedureHandler, type ArriProcedurePostHandler, ArriRouter, type ArriRouterBase, DEV_DEFINITION_ENDPOINT, DEV_ENDPOINT_ROOT, ErrorResponse, type ExtractParam$1 as ExtractParam, type ExtractParams$1 as ExtractParams, type HandlerContext, type Middleware, type ResolvedArriConfig, type RpcHandlerContext, type RpcPostHandlerContext, type StatusCode, createRpcDefinition, defaultConfig, defineConfig, defineError, defineMiddleware, defineRpc, errorResponseFromValidationErrors, getRpcParamName, getRpcPath, getRpcResponseName, handleH3Error, isArriConfig, isResolvedArriConfig, isRpc, registerRpc };
+export { ArriApp, type ArriConfig, type ArriNamedProcedure, type ArriOptions, type ArriProcedure, type ArriProcedureHandler, type ArriProcedurePostHandler, ArriRouter, type ArriRouterBase, DEV_DEFINITION_ENDPOINT, DEV_ENDPOINT_ROOT, ErrorResponse, type ExtractParam$1 as ExtractParam, type ExtractParams$1 as ExtractParams, type HandlerContext, type Middleware, type MiddlewareEvent, type MiddlewareEventContext, type ResolvedArriConfig, type RpcEvent, type RpcHandlerContext, type RpcPostEvent, type RpcPostHandlerContext, type StatusCode, createRpcDefinition, defaultConfig, defineConfig, defineError, defineMiddleware, defineRpc, errorResponseFromValidationErrors, getRpcParamName, getRpcPath, getRpcResponseName, handleH3Error, isArriConfig, isResolvedArriConfig, isRpc, registerRpc };

package/dist/index.d.ts

@@ -1,11 +1,17 @@
 import { HttpMethod, RpcDefinition, AppDefinition, ClientGenerator } from 'arri-codegen-utils';
 import * as arri_validate from 'arri-validate';
 import { AObjectSchema, InferType, a, ValidationError } from 'arri-validate';
-import { H3Event, H3EventContext, Router, App, H3Error } from 'h3';
+import { H3EventContext, H3Event, Router, App, H3Error } from 'h3';
 export * from 'h3';
 import { BuildOptions } from 'esbuild';
 
-type Middleware = (event: H3Event) => void | Promise<void>;
+interface MiddlewareEventContext extends H3EventContext {
+    rpcName?: string;
+}
+interface MiddlewareEvent extends H3Event {
+    context: MiddlewareEventContext;
+}
+type Middleware = (event: MiddlewareEvent) => void | Promise<void>;
 declare const defineMiddleware: (middleware: Middleware) => Middleware;
 type ExtractParam$1<Path, NextPart> = Path extends `:${infer Param}` ? Record<Param, string> & NextPart : NextPart;
 type ExtractParams$1<Path> = Path extends `${infer Segment}/${infer Rest}` ? ExtractParam$1<Segment, ExtractParams$1<Rest>> : ExtractParam$1<Path, {}>;
@@ -31,6 +37,7 @@ type RouteOptions = Pick<ArriOptions, "onAfterResponse" | "onBeforeResponse" | "
 interface ArriProcedure<TParams extends AObjectSchema | undefined, TResponse extends AObjectSchema | undefined> {
     description?: string;
     method?: HttpMethod;
+    path?: string;
     params: TParams;
     response: TResponse;
     handler: ArriProcedureHandler<TParams extends AObjectSchema ? InferType<TParams> : undefined, TResponse extends AObjectSchema ? InferType<TResponse> : void>;
@@ -41,20 +48,27 @@ interface ArriNamedProcedure<TParams extends AObjectSchema | undefined, TRespons
 }
 type HandlerContext = Record<string, any>;
 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 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 | undefined;
 declare function getRpcResponseName(rpcName: string, procedure: ArriProcedure<any, any>): string | undefined;
-declare function registerRpc(router: Router, path: string, procedure: ArriProcedure<any, any>, opts: RouteOptions): void;
+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;
@@ -103,10 +117,10 @@ interface ArriOptions {
      * This parameters also takes the rpcRoutePrefix option into account
      */
     rpcDefinitionPath?: string;
-    onRequest?: (event: H3Event) => void | Promise<void>;
-    onAfterResponse?: (event: H3Event) => void | Promise<void>;
-    onBeforeResponse?: (event: H3Event) => void | Promise<void>;
-    onError?: (error: H3Error, 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: arri_validate.AObjectSchema<{
@@ -143,4 +157,4 @@ type ResolvedArriConfig = Required<ArriConfig>;
 declare const defaultConfig: Required<ArriConfig>;
 declare function defineConfig(config: ArriConfig): ResolvedArriConfig;
 
-export { ArriApp, type ArriConfig, type ArriNamedProcedure, type ArriOptions, type ArriProcedure, type ArriProcedureHandler, type ArriProcedurePostHandler, ArriRouter, type ArriRouterBase, DEV_DEFINITION_ENDPOINT, DEV_ENDPOINT_ROOT, ErrorResponse, type ExtractParam$1 as ExtractParam, type ExtractParams$1 as ExtractParams, type HandlerContext, type Middleware, type ResolvedArriConfig, type RpcHandlerContext, type RpcPostHandlerContext, type StatusCode, createRpcDefinition, defaultConfig, defineConfig, defineError, defineMiddleware, defineRpc, errorResponseFromValidationErrors, getRpcParamName, getRpcPath, getRpcResponseName, handleH3Error, isArriConfig, isResolvedArriConfig, isRpc, registerRpc };
+export { ArriApp, type ArriConfig, type ArriNamedProcedure, type ArriOptions, type ArriProcedure, type ArriProcedureHandler, type ArriProcedurePostHandler, ArriRouter, type ArriRouterBase, DEV_DEFINITION_ENDPOINT, DEV_ENDPOINT_ROOT, ErrorResponse, type ExtractParam$1 as ExtractParam, type ExtractParams$1 as ExtractParams, type HandlerContext, type Middleware, type MiddlewareEvent, type MiddlewareEventContext, type ResolvedArriConfig, type RpcEvent, type RpcHandlerContext, type RpcPostEvent, type RpcPostHandlerContext, type StatusCode, createRpcDefinition, defaultConfig, defineConfig, defineError, defineMiddleware, defineRpc, errorResponseFromValidationErrors, getRpcParamName, getRpcPath, getRpcResponseName, handleH3Error, isArriConfig, isResolvedArriConfig, isRpc, registerRpc };

package/dist/index.mjs

@@ -1,4 +1,4 @@
-export { A as ArriApp, o as ArriRouter, a as DEV_DEFINITION_ENDPOINT, D as DEV_ENDPOINT_ROOT, E as ErrorResponse, c as createRpcDefinition, m as defaultConfig, n as defineConfig, f as defineError, d as defineRpc, h as errorResponseFromValidationErrors, b as getRpcParamName, g as getRpcPath, e as getRpcResponseName, j as handleH3Error, k as isArriConfig, l as isResolvedArriConfig, i as isRpc, r as registerRpc } from './shared/arri.8539c7bd.mjs';
+export { A as ArriApp, o as ArriRouter, a as DEV_DEFINITION_ENDPOINT, D as DEV_ENDPOINT_ROOT, E as ErrorResponse, c as createRpcDefinition, m as defaultConfig, n as defineConfig, f as defineError, d as defineRpc, h as errorResponseFromValidationErrors, b as getRpcParamName, g as getRpcPath, e as getRpcResponseName, j as handleH3Error, k as isArriConfig, l as isResolvedArriConfig, i as isRpc, r as registerRpc } from './shared/arri.74120afa.mjs';
 export * from 'h3';
 import 'arri-validate';
 import 'arri-codegen-utils';

package/dist/shared/{arri.8539c7bd.mjs → arri.74120afa.mjs}

@@ -270,10 +270,10 @@ function getRpcResponseDefinition(rpcName, procedure) {
   return name;
 }
 function registerRpc(router, path, procedure, opts) {
-  const paramValidator = procedure.params ? a.compile(procedure.params) : void 0;
   const responseValidator = procedure.response ? a.compile(procedure.response) : void 0;
   const httpMethod = procedure.method ?? "post";
   const handler = eventHandler(async (event) => {
+    event.context.rpcName = procedure.name;
     if (isPreflightRequest(event)) {
       return "ok";
     }
@@ -286,7 +286,7 @@ function registerRpc(router, path, procedure, opts) {
           await m(event);
         }
       }
-      if (isAObjectSchema(procedure.params) && paramValidator) {
+      if (isAObjectSchema(procedure.params)) {
         switch (httpMethod) {
           case "get":
           case "head": {
@@ -326,7 +326,10 @@ function registerRpc(router, path, procedure, opts) {
                 statusMessage: `Invalid request body. Expected object. Got undefined.`
               });
             }
-            const parsedParams = paramValidator.safeParse(body);
+            const parsedParams = a.safeParse(
+              procedure.params,
+              body
+            );
             if (!parsedParams.success) {
               const errorParts = [];
               for (const err of parsedParams.error.errors) {
@@ -365,21 +368,8 @@ function registerRpc(router, path, procedure, opts) {
           responseValidator?.serialize(response) ?? JSON.stringify(response)
         );
       } else {
-        await send(
-          event,
-          response ?? `<!doctype html>
-<html lang="en">
-    <head>
-        <meta charset="UTF-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <title>Empty Response</title>
-    </head>
-    <body>
-        nothing to see here
-    </body>
-</html>
-`
-        );
+        setResponseHeader(event, "Content-Type", "application/json");
+        await send(event, `{}`);
       }
       if (opts.onAfterResponse) {
         await opts.onAfterResponse(event);
@@ -451,6 +441,9 @@ function registerRoute(router, route, opts) {
 }
 function handleRoute(router, method, route, opts) {
   const handler = defineEventHandler(async (event) => {
+    if (isPreflightRequest(event)) {
+      return "ok";
+    }
     try {
       if (opts.onRequest) {
         await opts.onRequest(event);
@@ -482,6 +475,7 @@ function handleRoute(router, method, route, opts) {
     } catch (err) {
       await handleH3Error(err, event, opts.onError);
     }
+    return "";
   });
   switch (method) {
     case "get":
@@ -532,6 +526,7 @@ class ArriApp {
     this.h3App = createApp({
       debug: opts?.debug
     });
+    this.onRequest = opts.onRequest;
     this.onError = opts.onError;
     this.onAfterResponse = opts.onAfterResponse;
     this.onBeforeResponse = opts.onBeforeResponse;
@@ -554,6 +549,9 @@ class ArriApp {
         setResponseStatus(event, 404);
         const error = defineError(404);
         try {
+          if (this.onRequest) {
+            await this.onRequest(event);
+          }
           if (this.middlewares.length) {
             for (const m of this.middlewares) {
               await m(event);
@@ -588,7 +586,7 @@ class ArriApp {
     this.middlewares.push(input);
   }
   rpc(procedure) {
-    const path = getRpcPath(procedure.name, this.rpcRoutePrefix);
+    const path = procedure.path ?? getRpcPath(procedure.name, this.rpcRoutePrefix);
     this.procedures[procedure.name] = createRpcDefinition(
       procedure.name,
       path,
@@ -608,6 +606,7 @@ class ArriApp {
     }
     registerRpc(this.h3Router, path, procedure, {
       middleware: this.middlewares,
+      onRequest: this.onRequest,
       onError: this.onError,
       onAfterResponse: this.onAfterResponse,
       onBeforeResponse: this.onBeforeResponse
@@ -616,6 +615,7 @@ class ArriApp {
   route(route) {
     registerRoute(this.h3Router, route, {
       middleware: this.middlewares,
+      onRequest: this.onRequest,
       onError: this.onError,
       onAfterResponse: this.onAfterResponse,
       onBeforeResponse: this.onBeforeResponse
@@ -626,8 +626,7 @@ class ArriApp {
       arriSchemaVersion: "0.0.2",
       info: this.appInfo,
       procedures: {},
-      models: this.models,
-      errors: ErrorResponse
+      models: this.models
     };
     for (const key of Object.keys(this.procedures)) {
       const rpc = this.procedures[key];

package/dist/shared/{arri.406d936a.cjs → arri.ef78b5e0.cjs}

@@ -272,10 +272,10 @@ function getRpcResponseDefinition(rpcName, procedure) {
   return name;
 }
 function registerRpc(router, path, procedure, opts) {
-  const paramValidator = procedure.params ? arriValidate.a.compile(procedure.params) : void 0;
   const responseValidator = procedure.response ? arriValidate.a.compile(procedure.response) : void 0;
   const httpMethod = procedure.method ?? "post";
   const handler = h3.eventHandler(async (event) => {
+    event.context.rpcName = procedure.name;
     if (h3.isPreflightRequest(event)) {
       return "ok";
     }
@@ -288,7 +288,7 @@ function registerRpc(router, path, procedure, opts) {
           await m(event);
         }
       }
-      if (arriValidate.isAObjectSchema(procedure.params) && paramValidator) {
+      if (arriValidate.isAObjectSchema(procedure.params)) {
         switch (httpMethod) {
           case "get":
           case "head": {
@@ -328,7 +328,10 @@ function registerRpc(router, path, procedure, opts) {
                 statusMessage: `Invalid request body. Expected object. Got undefined.`
               });
             }
-            const parsedParams = paramValidator.safeParse(body);
+            const parsedParams = arriValidate.a.safeParse(
+              procedure.params,
+              body
+            );
             if (!parsedParams.success) {
               const errorParts = [];
               for (const err of parsedParams.error.errors) {
@@ -367,21 +370,8 @@ function registerRpc(router, path, procedure, opts) {
           responseValidator?.serialize(response) ?? JSON.stringify(response)
         );
       } else {
-        await h3.send(
-          event,
-          response ?? `<!doctype html>
-<html lang="en">
-    <head>
-        <meta charset="UTF-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <title>Empty Response</title>
-    </head>
-    <body>
-        nothing to see here
-    </body>
-</html>
-`
-        );
+        h3.setResponseHeader(event, "Content-Type", "application/json");
+        await h3.send(event, `{}`);
       }
       if (opts.onAfterResponse) {
         await opts.onAfterResponse(event);
@@ -453,6 +443,9 @@ function registerRoute(router, route, opts) {
 }
 function handleRoute(router, method, route, opts) {
   const handler = h3.defineEventHandler(async (event) => {
+    if (h3.isPreflightRequest(event)) {
+      return "ok";
+    }
     try {
       if (opts.onRequest) {
         await opts.onRequest(event);
@@ -484,6 +477,7 @@ function handleRoute(router, method, route, opts) {
     } catch (err) {
       await handleH3Error(err, event, opts.onError);
     }
+    return "";
   });
   switch (method) {
     case "get":
@@ -534,6 +528,7 @@ class ArriApp {
     this.h3App = h3.createApp({
       debug: opts?.debug
     });
+    this.onRequest = opts.onRequest;
     this.onError = opts.onError;
     this.onAfterResponse = opts.onAfterResponse;
     this.onBeforeResponse = opts.onBeforeResponse;
@@ -556,6 +551,9 @@ class ArriApp {
         h3.setResponseStatus(event, 404);
         const error = defineError(404);
         try {
+          if (this.onRequest) {
+            await this.onRequest(event);
+          }
           if (this.middlewares.length) {
             for (const m of this.middlewares) {
               await m(event);
@@ -590,7 +588,7 @@ class ArriApp {
     this.middlewares.push(input);
   }
   rpc(procedure) {
-    const path = getRpcPath(procedure.name, this.rpcRoutePrefix);
+    const path = procedure.path ?? getRpcPath(procedure.name, this.rpcRoutePrefix);
     this.procedures[procedure.name] = createRpcDefinition(
       procedure.name,
       path,
@@ -610,6 +608,7 @@ class ArriApp {
     }
     registerRpc(this.h3Router, path, procedure, {
       middleware: this.middlewares,
+      onRequest: this.onRequest,
       onError: this.onError,
       onAfterResponse: this.onAfterResponse,
       onBeforeResponse: this.onBeforeResponse
@@ -618,6 +617,7 @@ class ArriApp {
   route(route) {
     registerRoute(this.h3Router, route, {
       middleware: this.middlewares,
+      onRequest: this.onRequest,
       onError: this.onError,
       onAfterResponse: this.onAfterResponse,
       onBeforeResponse: this.onBeforeResponse
@@ -628,8 +628,7 @@ class ArriApp {
       arriSchemaVersion: "0.0.2",
       info: this.appInfo,
       procedures: {},
-      models: this.models,
-      errors: ErrorResponse
+      models: this.models
     };
     for (const key of Object.keys(this.procedures)) {
       const rpc = this.procedures[key];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "arri",
-  "version": "0.1.0-beta.2",
+  "version": "0.1.0-beta.4",
   "type": "module",
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",
@@ -22,7 +22,7 @@
     "chokidar": "^3.5.3",
     "citty": "^0.1.4",
     "consola": "^3.2.3",
-    "esbuild": "^0.19.3",
+    "esbuild": "^0.19.4",
     "globby": "^13.2.2",
     "h3": "^1.8.2",
     "jiti": "^1.20.0",
@@ -31,12 +31,12 @@
     "pathe": "^1.1.1",
     "prettier": "^3.0.3",
     "scule": "^1.0.0",
-    "arri-codegen-dart": "0.1.0-beta.2",
-    "arri-validate": "0.1.0-beta.2",
-    "arri-codegen-ts": "0.1.0-beta.2",
-    "arri-codegen-utils": "0.1.0-beta.2"
+    "arri-codegen-dart": "0.1.0-beta.4",
+    "arri-codegen-utils": "0.1.0-beta.4",
+    "arri-validate": "0.1.0-beta.4",
+    "arri-codegen-ts": "0.1.0-beta.4"
   },
   "devDependencies": {
-    "bun-types": "^1.0.3"
+    "bun-types": "^1.0.5"
   }
 }