arri 0.1.0-beta.0 → 0.1.0-beta.10

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.ed4bd5e1.cjs');
 const globby = require('globby');
 const scule = require('scule');
 const arriCodegenDart = require('arri-codegen-dart');
@@ -142,12 +142,12 @@ const getRpcMetaFromPath = (config, filePath) => {
     httpPath: `/${httpParts.join("/")}`
   };
 };
-async function transpileFilesContext(config) {
+async function transpileFiles(config) {
   const outDir = path__default.resolve(config.rootDir, config.buildDir);
   const files = await globby.globby(["**/*.ts"], {
     cwd: path__default.resolve(config.rootDir, config.srcDir)
   });
-  const ctx = await esbuild__namespace.context({
+  await esbuild__namespace.build({
     entryPoints: [
       ...files.map(
         (file) => path__default.resolve(config.rootDir, config.srcDir, file)
@@ -159,7 +159,6 @@ async function transpileFilesContext(config) {
     target: "node18",
     platform: "node"
   });
-  return ctx;
 }
 
 const build = citty.defineCommand({
@@ -195,8 +194,7 @@ async function startBuild(config, skipCodeGen = false) {
     createBuildEntryModule(config),
     createBuildCodegenModule(config)
   ]);
-  const transpile = await transpileFilesContext(config);
-  await transpile.rebuild();
+  await transpileFiles(config);
   await bundleFiles(config);
   logger$1.log("Finished bundling");
   const clientCount = config.clientGenerators.length;
@@ -224,7 +222,6 @@ async function startBuild(config, skipCodeGen = false) {
   logger$1.log(
     `Build finished! You can start your server by running "node .output/server.js"`
   );
-  await transpile.dispose();
 }
 async function bundleFiles(config, allowCodegen = true) {
   if (allowCodegen) {
@@ -263,6 +260,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 +307,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,
@@ -427,7 +426,7 @@ const dev = citty.defineCommand({
     await startDevServer(config$1);
   }
 });
-const startListener = (config, showQr = false) => listhen.listenAndWatch(path__default.resolve(config.rootDir, ".output", "bundle.js"), {
+const startListener = (config, showQr = false) => listhen.listenAndWatch(path__default.resolve(config.rootDir, ".output", "server.js"), {
   public: true,
   port: config.port,
   logger,
@@ -439,7 +438,7 @@ async function bundleFilesContext(config) {
     entryPoints: [
       path__default.resolve(config.rootDir, config.buildDir, "entry.js")
     ],
-    outfile: path__default.resolve(config.rootDir, ".output", "bundle.js"),
+    outfile: path__default.resolve(config.rootDir, ".output", "server.js"),
     format: "esm",
     bundle: true,
     sourcemap: true,
@@ -452,9 +451,8 @@ async function startDevServer(config) {
   await setupWorkingDir(config);
   let fileWatcher;
   await Promise.all([createRoutesModule(config), createEntryModule(config)]);
-  const transpileFiles = await transpileFilesContext(config);
+  await transpileFiles(config);
   const bundleFiles = await bundleFilesContext(config);
-  await transpileFiles.rebuild();
   await bundleFiles.rebuild();
   const listener = await startListener(config, true);
   setTimeout(async () => {
@@ -467,7 +465,6 @@ async function startDevServer(config) {
     await Promise.allSettled([
       listener.close(),
       fileWatcher?.close(),
-      transpileFiles.dispose(),
       bundleFiles.dispose()
     ]);
   });
@@ -488,14 +485,17 @@ async function startDevServer(config) {
         ignored: [buildDir, outDir],
         ignoreInitial: true
       });
-      fileWatcher.on("all", async (_event, file) => {
+      fileWatcher.on("all", async (event, file) => {
+        if (event === "add" || event === "addDir") {
+          return;
+        }
         await createRoutesModule(config);
         let bundleCreated = false;
         try {
           logger.log(
             "Change detected. Bundling files and restarting server...."
           );
-          await transpileFiles.rebuild();
+          await transpileFiles(config);
           await bundleFiles.rebuild();
           bundleCreated = true;
         } catch (err) {
@@ -549,6 +549,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.121d68e9.mjs';
 import { globby } from 'globby';
 import { camelCase, kebabCase } from 'scule';
 import { dartClientGenerator } from 'arri-codegen-dart';
@@ -121,12 +121,12 @@ const getRpcMetaFromPath = (config, filePath) => {
     httpPath: `/${httpParts.join("/")}`
   };
 };
-async function transpileFilesContext(config) {
+async function transpileFiles(config) {
   const outDir = path.resolve(config.rootDir, config.buildDir);
   const files = await globby(["**/*.ts"], {
     cwd: path.resolve(config.rootDir, config.srcDir)
   });
-  const ctx = await esbuild.context({
+  await esbuild.build({
     entryPoints: [
       ...files.map(
         (file) => path.resolve(config.rootDir, config.srcDir, file)
@@ -138,7 +138,6 @@ async function transpileFilesContext(config) {
     target: "node18",
     platform: "node"
   });
-  return ctx;
 }
 
 const build = defineCommand({
@@ -174,8 +173,7 @@ async function startBuild(config, skipCodeGen = false) {
     createBuildEntryModule(config),
     createBuildCodegenModule(config)
   ]);
-  const transpile = await transpileFilesContext(config);
-  await transpile.rebuild();
+  await transpileFiles(config);
   await bundleFiles(config);
   logger$1.log("Finished bundling");
   const clientCount = config.clientGenerators.length;
@@ -203,7 +201,6 @@ async function startBuild(config, skipCodeGen = false) {
   logger$1.log(
     `Build finished! You can start your server by running "node .output/server.js"`
   );
-  await transpile.dispose();
 }
 async function bundleFiles(config, allowCodegen = true) {
   if (allowCodegen) {
@@ -242,6 +239,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 +286,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,
@@ -406,7 +405,7 @@ const dev = defineCommand({
     await startDevServer(config);
   }
 });
-const startListener = (config, showQr = false) => listenAndWatch(path.resolve(config.rootDir, ".output", "bundle.js"), {
+const startListener = (config, showQr = false) => listenAndWatch(path.resolve(config.rootDir, ".output", "server.js"), {
   public: true,
   port: config.port,
   logger,
@@ -418,7 +417,7 @@ async function bundleFilesContext(config) {
     entryPoints: [
       path.resolve(config.rootDir, config.buildDir, "entry.js")
     ],
-    outfile: path.resolve(config.rootDir, ".output", "bundle.js"),
+    outfile: path.resolve(config.rootDir, ".output", "server.js"),
     format: "esm",
     bundle: true,
     sourcemap: true,
@@ -431,9 +430,8 @@ async function startDevServer(config) {
   await setupWorkingDir(config);
   let fileWatcher;
   await Promise.all([createRoutesModule(config), createEntryModule(config)]);
-  const transpileFiles = await transpileFilesContext(config);
+  await transpileFiles(config);
   const bundleFiles = await bundleFilesContext(config);
-  await transpileFiles.rebuild();
   await bundleFiles.rebuild();
   const listener = await startListener(config, true);
   setTimeout(async () => {
@@ -446,7 +444,6 @@ async function startDevServer(config) {
     await Promise.allSettled([
       listener.close(),
       fileWatcher?.close(),
-      transpileFiles.dispose(),
       bundleFiles.dispose()
     ]);
   });
@@ -467,14 +464,17 @@ async function startDevServer(config) {
         ignored: [buildDir, outDir],
         ignoreInitial: true
       });
-      fileWatcher.on("all", async (_event, file) => {
+      fileWatcher.on("all", async (event, file) => {
+        if (event === "add" || event === "addDir") {
+          return;
+        }
         await createRoutesModule(config);
         let bundleCreated = false;
         try {
           logger.log(
             "Change detected. Bundling files and restarting server...."
           );
-          await transpileFiles.rebuild();
+          await transpileFiles(config);
           await bundleFiles.rebuild();
           bundleCreated = true;
         } catch (err) {
@@ -528,6 +528,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.ed4bd5e1.cjs');
 const h3 = require('h3');
 require('arri-validate');
 require('arri-codegen-utils');
@@ -17,15 +17,18 @@ exports.createRpcDefinition = config.createRpcDefinition;
 exports.defaultConfig = config.defaultConfig;
 exports.defineConfig = config.defineConfig;
 exports.defineError = config.defineError;
+exports.defineRoute = config.defineRoute;
 exports.defineRpc = config.defineRpc;
 exports.errorResponseFromValidationErrors = config.errorResponseFromValidationErrors;
 exports.getRpcParamName = config.getRpcParamName;
 exports.getRpcPath = config.getRpcPath;
 exports.getRpcResponseName = config.getRpcResponseName;
 exports.handleH3Error = config.handleH3Error;
+exports.handleRoute = config.handleRoute;
 exports.isArriConfig = config.isArriConfig;
 exports.isResolvedArriConfig = config.isResolvedArriConfig;
 exports.isRpc = config.isRpc;
+exports.registerRoute = config.registerRoute;
 exports.registerRpc = config.registerRpc;
 exports.defineMiddleware = defineMiddleware;
 Object.keys(h3).forEach(function (k) {

package/dist/index.d.cts

@@ -1,36 +1,54 @@
 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 { AObjectSchema, ASchema, InferType, a, ValidationError } from 'arri-validate';
+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, {}>;
-
 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, {}>;
-interface RouteEventContext<TPath extends string> extends H3EventContext {
+
+interface RouteEventContext<TPath extends string, TQuery extends Record<any, any> = any, TBody = any> extends H3EventContext {
     params: ExtractParams<TPath>;
+    query: TQuery;
+    body: TBody;
 }
-interface RouteEvent<TPath extends string> extends H3Event {
-    context: RouteEventContext<TPath>;
+interface RouteEvent<TPath extends string, TQuery extends Record<any, any> = any, TBody = any> extends H3Event {
+    context: RouteEventContext<TPath, TQuery, TBody>;
 }
-interface ArriRoute<TPath extends string> {
+interface PostRouteEventContext<TPath extends string, TQuery extends Record<any, any> = any, TBody = any, TResponse = any> extends RouteEventContext<TPath, TQuery, TBody> {
+    response: TResponse;
+}
+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[];
-    handler: (event: RouteEvent<TPath>) => any;
-    postHandler?: (event: RouteEvent<TPath>) => any;
+    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 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,32 +59,39 @@ 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;
-    route: <TPath extends string>(route: ArriRoute<TPath>) => 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>(route: ArriRoute<TPath>): 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>[];
+    getRoutes(): ArriRoute<any, any, any, any>[];
 }
 
 declare const DEV_ENDPOINT_ROOT = "/__arri_dev__";
@@ -88,7 +113,7 @@ declare class ArriApp implements ArriRouterBase {
     constructor(opts?: ArriOptions);
     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>(route: ArriRoute<TPath>): 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 {
@@ -103,10 +128,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 +168,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, 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,36 +1,54 @@
 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 { AObjectSchema, ASchema, InferType, a, ValidationError } from 'arri-validate';
+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, {}>;
-
 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, {}>;
-interface RouteEventContext<TPath extends string> extends H3EventContext {
+
+interface RouteEventContext<TPath extends string, TQuery extends Record<any, any> = any, TBody = any> extends H3EventContext {
     params: ExtractParams<TPath>;
+    query: TQuery;
+    body: TBody;
 }
-interface RouteEvent<TPath extends string> extends H3Event {
-    context: RouteEventContext<TPath>;
+interface RouteEvent<TPath extends string, TQuery extends Record<any, any> = any, TBody = any> extends H3Event {
+    context: RouteEventContext<TPath, TQuery, TBody>;
 }
-interface ArriRoute<TPath extends string> {
+interface PostRouteEventContext<TPath extends string, TQuery extends Record<any, any> = any, TBody = any, TResponse = any> extends RouteEventContext<TPath, TQuery, TBody> {
+    response: TResponse;
+}
+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[];
-    handler: (event: RouteEvent<TPath>) => any;
-    postHandler?: (event: RouteEvent<TPath>) => any;
+    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 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,32 +59,39 @@ 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;
-    route: <TPath extends string>(route: ArriRoute<TPath>) => 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>(route: ArriRoute<TPath>): 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>[];
+    getRoutes(): ArriRoute<any, any, any, any>[];
 }
 
 declare const DEV_ENDPOINT_ROOT = "/__arri_dev__";
@@ -88,7 +113,7 @@ declare class ArriApp implements ArriRouterBase {
     constructor(opts?: ArriOptions);
     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>(route: ArriRoute<TPath>): 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 {
@@ -103,10 +128,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 +168,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, 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.ts

@@ -1,36 +1,54 @@
 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 { AObjectSchema, ASchema, InferType, a, ValidationError } from 'arri-validate';
+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, {}>;
-
 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, {}>;
-interface RouteEventContext<TPath extends string> extends H3EventContext {
+
+interface RouteEventContext<TPath extends string, TQuery extends Record<any, any> = any, TBody = any> extends H3EventContext {
     params: ExtractParams<TPath>;
+    query: TQuery;
+    body: TBody;
 }
-interface RouteEvent<TPath extends string> extends H3Event {
-    context: RouteEventContext<TPath>;
+interface RouteEvent<TPath extends string, TQuery extends Record<any, any> = any, TBody = any> extends H3Event {
+    context: RouteEventContext<TPath, TQuery, TBody>;
 }
-interface ArriRoute<TPath extends string> {
+interface PostRouteEventContext<TPath extends string, TQuery extends Record<any, any> = any, TBody = any, TResponse = any> extends RouteEventContext<TPath, TQuery, TBody> {
+    response: TResponse;
+}
+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[];
-    handler: (event: RouteEvent<TPath>) => any;
-    postHandler?: (event: RouteEvent<TPath>) => any;
+    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 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,32 +59,39 @@ 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;
-    route: <TPath extends string>(route: ArriRoute<TPath>) => 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>(route: ArriRoute<TPath>): 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>[];
+    getRoutes(): ArriRoute<any, any, any, any>[];
 }
 
 declare const DEV_ENDPOINT_ROOT = "/__arri_dev__";
@@ -88,7 +113,7 @@ declare class ArriApp implements ArriRouterBase {
     constructor(opts?: ArriOptions);
     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>(route: ArriRoute<TPath>): 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 {
@@ -103,10 +128,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 +168,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, 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.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, p as defineRoute, d as defineRpc, h as errorResponseFromValidationErrors, b as getRpcParamName, g as getRpcPath, e as getRpcResponseName, j as handleH3Error, s as handleRoute, k as isArriConfig, l as isResolvedArriConfig, i as isRpc, q as registerRoute, r as registerRpc } from './shared/arri.121d68e9.mjs';
 export * from 'h3';
 import 'arri-validate';
 import 'arri-codegen-utils';

package/dist/shared/{arri.8539c7bd.mjs → arri.121d68e9.mjs}

@@ -1,5 +1,5 @@
 import { a, isAObjectSchema } from 'arri-validate';
-import { createError, isError, setResponseStatus, send, eventHandler, isPreflightRequest, readRawBody, getValidatedQuery, setResponseHeader, defineEventHandler, setHeader, createRouter, createApp, sendError } from 'h3';
+import { createError, isError, setResponseStatus, send, eventHandler, isPreflightRequest, readRawBody, getValidatedQuery, setResponseHeader, defineEventHandler, getQuery, setHeader, createRouter, createApp, sendError } from 'h3';
 import { isHttpMethod, removeDisallowedChars } from 'arri-codegen-utils';
 import { kebabCase, pascalCase } from 'scule';
 
@@ -270,10 +270,15 @@ 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;
+  let responseValidator;
+  try {
+    responseValidator = procedure.response ? a.compile(procedure.response) : void 0;
+  } catch (err) {
+    console.error("ERROR COMPILING VALIDATOR", err);
+  }
   const httpMethod = procedure.method ?? "post";
   const handler = eventHandler(async (event) => {
+    event.context.rpcName = procedure.name;
     if (isPreflightRequest(event)) {
       return "ok";
     }
@@ -286,7 +291,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 +331,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 +373,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);
@@ -440,6 +435,9 @@ class ArriRouter {
   }
 }
 
+function defineRoute(route) {
+  return route;
+}
 function registerRoute(router, route, opts) {
   if (typeof route.method === "string") {
     handleRoute(router, route.method, route, opts);
@@ -451,6 +449,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);
@@ -460,6 +461,55 @@ function handleRoute(router, method, route, opts) {
           await m(event);
         }
       }
+      if (route.query) {
+        const query = getQuery(event);
+        const parsedQuery = a.safeCoerce(route.query, query);
+        if (!parsedQuery.success) {
+          const errParts = [];
+          for (const err of parsedQuery.error.errors) {
+            const errPath = err.instancePath.split("/");
+            errPath.shift();
+            const propName = errPath.join(".");
+            if (!errParts.includes(propName)) {
+              errParts.push(propName);
+            }
+          }
+          const message = `Missing or invalid url query parameters: [${errParts.join(
+            ", "
+          )}]`;
+          throw defineError(400, {
+            statusMessage: message
+          });
+        }
+        event.context.query = parsedQuery.value;
+      }
+      const notAllowedBodyMethods = [
+        "GET",
+        "HEAD",
+        "CONNECT",
+        "OPTIONS"
+      ];
+      if (route.body && !notAllowedBodyMethods.includes(event.method)) {
+        const body = await readRawBody(event);
+        const parsedBody = a.safeParse(route.body, body);
+        if (!parsedBody.success) {
+          const errorParts = [];
+          for (const err of parsedBody.error.errors) {
+            const errPath = err.instancePath.split("/");
+            errPath.shift();
+            if (!errorParts.includes(errPath.join("."))) {
+              errorParts.push(errPath.join("."));
+            }
+          }
+          throw defineError(400, {
+            statusMessage: `Invalid request body. Affected properties [${errorParts.join(
+              ", "
+            )}]`,
+            data: parsedBody.error
+          });
+        }
+        event.context.body = parsedBody.value;
+      }
       const response = await route.handler(event);
       event.context.response = response;
       if (!event.handled) {
@@ -482,6 +532,7 @@ function handleRoute(router, method, route, opts) {
     } catch (err) {
       await handleH3Error(err, event, opts.onError);
     }
+    return "";
   });
   switch (method) {
     case "get":
@@ -532,6 +583,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 +606,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 +643,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 +663,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 +672,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 +683,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];
@@ -674,4 +730,4 @@ function defineConfig(config) {
   };
 }
 
-export { ArriApp as A, DEV_ENDPOINT_ROOT as D, ErrorResponse as E, DEV_DEFINITION_ENDPOINT as a, getRpcParamName as b, createRpcDefinition as c, defineRpc as d, getRpcResponseName as e, defineError as f, getRpcPath as g, errorResponseFromValidationErrors as h, isRpc as i, handleH3Error as j, isArriConfig as k, isResolvedArriConfig as l, defaultConfig as m, defineConfig as n, ArriRouter as o, registerRpc as r };
+export { ArriApp as A, DEV_ENDPOINT_ROOT as D, ErrorResponse as E, DEV_DEFINITION_ENDPOINT as a, getRpcParamName as b, createRpcDefinition as c, defineRpc as d, getRpcResponseName as e, defineError as f, getRpcPath as g, errorResponseFromValidationErrors as h, isRpc as i, handleH3Error as j, isArriConfig as k, isResolvedArriConfig as l, defaultConfig as m, defineConfig as n, ArriRouter as o, defineRoute as p, registerRoute as q, registerRpc as r, handleRoute as s };

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

@@ -272,10 +272,15 @@ 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;
+  let responseValidator;
+  try {
+    responseValidator = procedure.response ? arriValidate.a.compile(procedure.response) : void 0;
+  } catch (err) {
+    console.error("ERROR COMPILING VALIDATOR", err);
+  }
   const httpMethod = procedure.method ?? "post";
   const handler = h3.eventHandler(async (event) => {
+    event.context.rpcName = procedure.name;
     if (h3.isPreflightRequest(event)) {
       return "ok";
     }
@@ -288,7 +293,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 +333,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 +375,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);
@@ -442,6 +437,9 @@ class ArriRouter {
   }
 }
 
+function defineRoute(route) {
+  return route;
+}
 function registerRoute(router, route, opts) {
   if (typeof route.method === "string") {
     handleRoute(router, route.method, route, opts);
@@ -453,6 +451,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);
@@ -462,6 +463,55 @@ function handleRoute(router, method, route, opts) {
           await m(event);
         }
       }
+      if (route.query) {
+        const query = h3.getQuery(event);
+        const parsedQuery = arriValidate.a.safeCoerce(route.query, query);
+        if (!parsedQuery.success) {
+          const errParts = [];
+          for (const err of parsedQuery.error.errors) {
+            const errPath = err.instancePath.split("/");
+            errPath.shift();
+            const propName = errPath.join(".");
+            if (!errParts.includes(propName)) {
+              errParts.push(propName);
+            }
+          }
+          const message = `Missing or invalid url query parameters: [${errParts.join(
+            ", "
+          )}]`;
+          throw defineError(400, {
+            statusMessage: message
+          });
+        }
+        event.context.query = parsedQuery.value;
+      }
+      const notAllowedBodyMethods = [
+        "GET",
+        "HEAD",
+        "CONNECT",
+        "OPTIONS"
+      ];
+      if (route.body && !notAllowedBodyMethods.includes(event.method)) {
+        const body = await h3.readRawBody(event);
+        const parsedBody = arriValidate.a.safeParse(route.body, body);
+        if (!parsedBody.success) {
+          const errorParts = [];
+          for (const err of parsedBody.error.errors) {
+            const errPath = err.instancePath.split("/");
+            errPath.shift();
+            if (!errorParts.includes(errPath.join("."))) {
+              errorParts.push(errPath.join("."));
+            }
+          }
+          throw defineError(400, {
+            statusMessage: `Invalid request body. Affected properties [${errorParts.join(
+              ", "
+            )}]`,
+            data: parsedBody.error
+          });
+        }
+        event.context.body = parsedBody.value;
+      }
       const response = await route.handler(event);
       event.context.response = response;
       if (!event.handled) {
@@ -484,6 +534,7 @@ function handleRoute(router, method, route, opts) {
     } catch (err) {
       await handleH3Error(err, event, opts.onError);
     }
+    return "";
   });
   switch (method) {
     case "get":
@@ -534,6 +585,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 +608,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 +645,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 +665,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 +674,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 +685,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];
@@ -685,13 +741,16 @@ exports.createRpcDefinition = createRpcDefinition;
 exports.defaultConfig = defaultConfig;
 exports.defineConfig = defineConfig;
 exports.defineError = defineError;
+exports.defineRoute = defineRoute;
 exports.defineRpc = defineRpc;
 exports.errorResponseFromValidationErrors = errorResponseFromValidationErrors;
 exports.getRpcParamName = getRpcParamName;
 exports.getRpcPath = getRpcPath;
 exports.getRpcResponseName = getRpcResponseName;
 exports.handleH3Error = handleH3Error;
+exports.handleRoute = handleRoute;
 exports.isArriConfig = isArriConfig;
 exports.isResolvedArriConfig = isResolvedArriConfig;
 exports.isRpc = isRpc;
+exports.registerRoute = registerRoute;
 exports.registerRpc = registerRpc;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "arri",
-  "version": "0.1.0-beta.0",
+  "version": "0.1.0-beta.10",
   "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.0",
-    "arri-codegen-ts": "0.1.0-beta.0",
-    "arri-validate": "0.1.0-beta.0",
-    "arri-codegen-utils": "0.1.0-beta.0"
+    "arri-validate": "0.1.0-beta.10",
+    "arri-codegen-ts": "0.1.0-beta.10",
+    "arri-codegen-dart": "0.1.0-beta.10",
+    "arri-codegen-utils": "0.1.0-beta.10"
   },
   "devDependencies": {
-    "bun-types": "^1.0.3"
+    "bun-types": "^1.0.5"
   }
 }