arri 0.1.0-beta.4 → 0.1.0-beta.5

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.ef78b5e0.cjs');
+const config = require('./shared/arri.ab9313ca.cjs');
 const globby = require('globby');
 const scule = require('scule');
 const arriCodegenDart = require('arri-codegen-dart');

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.74120afa.mjs';
+import { m as defaultConfig, l as isResolvedArriConfig, a as DEV_DEFINITION_ENDPOINT } from './shared/arri.b5addda0.mjs';
 import { globby } from 'globby';
 import { camelCase, kebabCase } from 'scule';
 import { dartClientGenerator } from 'arri-codegen-dart';

package/dist/index.cjs

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

package/dist/index.d.cts

@@ -1,6 +1,6 @@
 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 { AObjectSchema, ASchema, InferType, a, ValidationError } from 'arri-validate';
 import { H3EventContext, H3Event, Router, App, H3Error } from 'h3';
 export * from 'h3';
 import { BuildOptions } from 'esbuild';
@@ -18,17 +18,27 @@ type ExtractParams$1<Path> = Path extends `${infer Segment}/${infer Rest}` ? Ext
 
 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;
 }
 type RouteOptions = Pick<ArriOptions, "onAfterResponse" | "onBeforeResponse" | "onError" | "onRequest"> & {
     middleware: Middleware[];
@@ -72,15 +82,15 @@ declare function registerRpc(router: Router, path: string, procedure: ArriNamedP
 
 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__";
@@ -102,7 +112,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 {

package/dist/index.d.mts

@@ -1,6 +1,6 @@
 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 { AObjectSchema, ASchema, InferType, a, ValidationError } from 'arri-validate';
 import { H3EventContext, H3Event, Router, App, H3Error } from 'h3';
 export * from 'h3';
 import { BuildOptions } from 'esbuild';
@@ -18,17 +18,27 @@ type ExtractParams$1<Path> = Path extends `${infer Segment}/${infer Rest}` ? Ext
 
 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;
 }
 type RouteOptions = Pick<ArriOptions, "onAfterResponse" | "onBeforeResponse" | "onError" | "onRequest"> & {
     middleware: Middleware[];
@@ -72,15 +82,15 @@ declare function registerRpc(router: Router, path: string, procedure: ArriNamedP
 
 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__";
@@ -102,7 +112,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 {

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 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 { AObjectSchema, ASchema, InferType, a, ValidationError } from 'arri-validate';
 import { H3EventContext, H3Event, Router, App, H3Error } from 'h3';
 export * from 'h3';
 import { BuildOptions } from 'esbuild';
@@ -18,17 +18,27 @@ type ExtractParams$1<Path> = Path extends `${infer Segment}/${infer Rest}` ? Ext
 
 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;
 }
 type RouteOptions = Pick<ArriOptions, "onAfterResponse" | "onBeforeResponse" | "onError" | "onRequest"> & {
     middleware: Middleware[];
@@ -72,15 +82,15 @@ declare function registerRpc(router: Router, path: string, procedure: ArriNamedP
 
 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__";
@@ -102,7 +112,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 {

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.74120afa.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.b5addda0.mjs';
 export * from 'h3';
 import 'arri-validate';
 import 'arri-codegen-utils';

package/dist/shared/{arri.ef78b5e0.cjs → arri.ab9313ca.cjs}

@@ -455,6 +455,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) {

package/dist/shared/{arri.74120afa.mjs → arri.b5addda0.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';
 
@@ -453,6 +453,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) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "arri",
-  "version": "0.1.0-beta.4",
+  "version": "0.1.0-beta.5",
   "type": "module",
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",
@@ -31,10 +31,10 @@
     "pathe": "^1.1.1",
     "prettier": "^3.0.3",
     "scule": "^1.0.0",
-    "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"
+    "arri-codegen-dart": "0.1.0-beta.5",
+    "arri-codegen-utils": "0.1.0-beta.5",
+    "arri-validate": "0.1.0-beta.5",
+    "arri-codegen-ts": "0.1.0-beta.5"
   },
   "devDependencies": {
     "bun-types": "^1.0.5"