arri 0.6.0 → 0.7.0

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.458d7a5c.cjs');
+const config = require('./shared/arri.3b472e3d.cjs');
 const globby = require('globby');
 const scule = require('scule');
 const arriCodegenDart = require('arri-codegen-dart');
@@ -19,8 +19,8 @@ const ofetch = require('ofetch');
 const chokidar = require('chokidar');
 const listhen = require('listhen');
 const Degit = require('degit');
-require('arri-validate');
 require('h3');
+require('arri-validate');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
 
@@ -237,7 +237,6 @@ async function bundleFiles(config, allowCodegen = true) {
       platform: config.esbuild.platform ?? "node",
       target: config.esbuild.target ?? "node18",
       bundle: true,
-      packages: "external",
       format: "esm",
       sourcemap: false,
       minifyWhitespace: true,

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.f6cbbd0d.mjs';
+import { n as defaultConfig, m as isResolvedArriConfig, a as DEV_DEFINITION_ENDPOINT } from './shared/arri.b635ea35.mjs';
 import { globby } from 'globby';
 import { camelCase, kebabCase } from 'scule';
 import { dartClientGenerator } from 'arri-codegen-dart';
@@ -18,8 +18,8 @@ import { ofetch } from 'ofetch';
 import chokidar from 'chokidar';
 import { listenAndWatch } from 'listhen';
 import Degit from 'degit';
-import 'arri-validate';
 import 'h3';
+import 'arri-validate';
 
 async function setupWorkingDir(config) {
   const arriDir = path.resolve(config.rootDir, config.buildDir);
@@ -213,7 +213,6 @@ async function bundleFiles(config, allowCodegen = true) {
       platform: config.esbuild.platform ?? "node",
       target: config.esbuild.target ?? "node18",
       bundle: true,
-      packages: "external",
       format: "esm",
       sourcemap: false,
       minifyWhitespace: true,

package/dist/index.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-const config = require('./shared/arri.458d7a5c.cjs');
+const config = require('./shared/arri.3b472e3d.cjs');
 const h3 = require('h3');
 require('arri-validate');
 require('arri-codegen-utils');
@@ -28,6 +28,7 @@ exports.handleRoute = config.handleRoute;
 exports.isArriConfig = config.isArriConfig;
 exports.isResolvedArriConfig = config.isResolvedArriConfig;
 exports.isRpc = config.isRpc;
+exports.isRpcParamSchema = config.isRpcParamSchema;
 exports.registerRoute = config.registerRoute;
 exports.registerRpc = config.registerRpc;
 exports.defineMiddleware = defineMiddleware;

package/dist/index.d.cts

@@ -1,5 +1,5 @@
 import { HttpMethod, RpcDefinition, AppDefinition, ClientGenerator } from 'arri-codegen-utils';
-import { AObjectSchema, ASchema, InferType, a, ValidationError } from 'arri-validate';
+import { AObjectSchema, ASchema, InferType, ARecordSchema, ADiscriminatorSchema, a, ValidationError } from 'arri-validate';
 import { H3EventContext, H3Event, Router, App, H3Error } from 'h3';
 export * from 'h3';
 import { BuildOptions } from 'esbuild';
@@ -44,16 +44,18 @@ type RouteOptions = Pick<ArriOptions, "onAfterResponse" | "onBeforeResponse" | "
 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> {
+type RpcParamSchema<TObjectInner = any, TRecordInner extends ASchema = any, TDiscriminatorInner = any> = AObjectSchema<TObjectInner> | ARecordSchema<TRecordInner> | ADiscriminatorSchema<TDiscriminatorInner>;
+declare function isRpcParamSchema(input: unknown): input is RpcParamSchema;
+interface ArriProcedure<TParams extends RpcParamSchema | undefined, TResponse extends RpcParamSchema | 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>;
-    postHandler?: ArriProcedurePostHandler<TParams extends AObjectSchema ? InferType<TParams> : undefined, TResponse extends AObjectSchema ? InferType<TResponse> : undefined>;
+    handler: ArriProcedureHandler<TParams extends RpcParamSchema ? InferType<TParams> : undefined, TResponse extends RpcParamSchema ? InferType<TResponse> : void>;
+    postHandler?: ArriProcedurePostHandler<TParams extends RpcParamSchema ? InferType<TParams> : undefined, TResponse extends RpcParamSchema ? InferType<TResponse> : undefined>;
 }
-interface ArriNamedProcedure<TParams extends AObjectSchema | undefined, TResponse extends AObjectSchema | undefined> extends ArriProcedure<TParams, TResponse> {
+interface ArriNamedProcedure<TParams extends RpcParamSchema | undefined, TResponse extends RpcParamSchema | undefined> extends ArriProcedure<TParams, TResponse> {
     name: string;
 }
 type HandlerContext = Record<string, any>;
@@ -73,7 +75,7 @@ interface RpcPostEvent<TParams = undefined, TResponse = undefined> extends Omit<
 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 defineRpc<TParams extends RpcParamSchema | undefined = undefined, TResponse extends RpcParamSchema | 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;
@@ -167,4 +169,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, 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 };
+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 RpcParamSchema, type RpcPostEvent, type RpcPostHandlerContext, type StatusCode, createRpcDefinition, defaultConfig, defineConfig, defineError, defineMiddleware, defineRoute, defineRpc, errorResponseFromValidationErrors, getRpcParamName, getRpcPath, getRpcResponseName, handleH3Error, handleRoute, isArriConfig, isResolvedArriConfig, isRpc, isRpcParamSchema, registerRoute, registerRpc };

package/dist/index.d.mts

@@ -1,5 +1,5 @@
 import { HttpMethod, RpcDefinition, AppDefinition, ClientGenerator } from 'arri-codegen-utils';
-import { AObjectSchema, ASchema, InferType, a, ValidationError } from 'arri-validate';
+import { AObjectSchema, ASchema, InferType, ARecordSchema, ADiscriminatorSchema, a, ValidationError } from 'arri-validate';
 import { H3EventContext, H3Event, Router, App, H3Error } from 'h3';
 export * from 'h3';
 import { BuildOptions } from 'esbuild';
@@ -44,16 +44,18 @@ type RouteOptions = Pick<ArriOptions, "onAfterResponse" | "onBeforeResponse" | "
 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> {
+type RpcParamSchema<TObjectInner = any, TRecordInner extends ASchema = any, TDiscriminatorInner = any> = AObjectSchema<TObjectInner> | ARecordSchema<TRecordInner> | ADiscriminatorSchema<TDiscriminatorInner>;
+declare function isRpcParamSchema(input: unknown): input is RpcParamSchema;
+interface ArriProcedure<TParams extends RpcParamSchema | undefined, TResponse extends RpcParamSchema | 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>;
-    postHandler?: ArriProcedurePostHandler<TParams extends AObjectSchema ? InferType<TParams> : undefined, TResponse extends AObjectSchema ? InferType<TResponse> : undefined>;
+    handler: ArriProcedureHandler<TParams extends RpcParamSchema ? InferType<TParams> : undefined, TResponse extends RpcParamSchema ? InferType<TResponse> : void>;
+    postHandler?: ArriProcedurePostHandler<TParams extends RpcParamSchema ? InferType<TParams> : undefined, TResponse extends RpcParamSchema ? InferType<TResponse> : undefined>;
 }
-interface ArriNamedProcedure<TParams extends AObjectSchema | undefined, TResponse extends AObjectSchema | undefined> extends ArriProcedure<TParams, TResponse> {
+interface ArriNamedProcedure<TParams extends RpcParamSchema | undefined, TResponse extends RpcParamSchema | undefined> extends ArriProcedure<TParams, TResponse> {
     name: string;
 }
 type HandlerContext = Record<string, any>;
@@ -73,7 +75,7 @@ interface RpcPostEvent<TParams = undefined, TResponse = undefined> extends Omit<
 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 defineRpc<TParams extends RpcParamSchema | undefined = undefined, TResponse extends RpcParamSchema | 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;
@@ -167,4 +169,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, 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 };
+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 RpcParamSchema, type RpcPostEvent, type RpcPostHandlerContext, type StatusCode, createRpcDefinition, defaultConfig, defineConfig, defineError, defineMiddleware, defineRoute, defineRpc, errorResponseFromValidationErrors, getRpcParamName, getRpcPath, getRpcResponseName, handleH3Error, handleRoute, isArriConfig, isResolvedArriConfig, isRpc, isRpcParamSchema, registerRoute, registerRpc };

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { HttpMethod, RpcDefinition, AppDefinition, ClientGenerator } from 'arri-codegen-utils';
-import { AObjectSchema, ASchema, InferType, a, ValidationError } from 'arri-validate';
+import { AObjectSchema, ASchema, InferType, ARecordSchema, ADiscriminatorSchema, a, ValidationError } from 'arri-validate';
 import { H3EventContext, H3Event, Router, App, H3Error } from 'h3';
 export * from 'h3';
 import { BuildOptions } from 'esbuild';
@@ -44,16 +44,18 @@ type RouteOptions = Pick<ArriOptions, "onAfterResponse" | "onBeforeResponse" | "
 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> {
+type RpcParamSchema<TObjectInner = any, TRecordInner extends ASchema = any, TDiscriminatorInner = any> = AObjectSchema<TObjectInner> | ARecordSchema<TRecordInner> | ADiscriminatorSchema<TDiscriminatorInner>;
+declare function isRpcParamSchema(input: unknown): input is RpcParamSchema;
+interface ArriProcedure<TParams extends RpcParamSchema | undefined, TResponse extends RpcParamSchema | 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>;
-    postHandler?: ArriProcedurePostHandler<TParams extends AObjectSchema ? InferType<TParams> : undefined, TResponse extends AObjectSchema ? InferType<TResponse> : undefined>;
+    handler: ArriProcedureHandler<TParams extends RpcParamSchema ? InferType<TParams> : undefined, TResponse extends RpcParamSchema ? InferType<TResponse> : void>;
+    postHandler?: ArriProcedurePostHandler<TParams extends RpcParamSchema ? InferType<TParams> : undefined, TResponse extends RpcParamSchema ? InferType<TResponse> : undefined>;
 }
-interface ArriNamedProcedure<TParams extends AObjectSchema | undefined, TResponse extends AObjectSchema | undefined> extends ArriProcedure<TParams, TResponse> {
+interface ArriNamedProcedure<TParams extends RpcParamSchema | undefined, TResponse extends RpcParamSchema | undefined> extends ArriProcedure<TParams, TResponse> {
     name: string;
 }
 type HandlerContext = Record<string, any>;
@@ -73,7 +75,7 @@ interface RpcPostEvent<TParams = undefined, TResponse = undefined> extends Omit<
 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 defineRpc<TParams extends RpcParamSchema | undefined = undefined, TResponse extends RpcParamSchema | 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;
@@ -167,4 +169,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, 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 };
+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 RpcParamSchema, type RpcPostEvent, type RpcPostHandlerContext, type StatusCode, createRpcDefinition, defaultConfig, defineConfig, defineError, defineMiddleware, defineRoute, defineRpc, errorResponseFromValidationErrors, getRpcParamName, getRpcPath, getRpcResponseName, handleH3Error, handleRoute, isArriConfig, isResolvedArriConfig, isRpc, isRpcParamSchema, 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, 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.f6cbbd0d.mjs';
+export { A as ArriApp, p as ArriRouter, a as DEV_DEFINITION_ENDPOINT, D as DEV_ENDPOINT_ROOT, E as ErrorResponse, c as createRpcDefinition, n as defaultConfig, o as defineConfig, h as defineError, q as defineRoute, d as defineRpc, j as errorResponseFromValidationErrors, e as getRpcParamName, g as getRpcPath, f as getRpcResponseName, k as handleH3Error, t as handleRoute, l as isArriConfig, m as isResolvedArriConfig, b as isRpc, i as isRpcParamSchema, s as registerRoute, r as registerRpc } from './shared/arri.b635ea35.mjs';
 export * from 'h3';
 import 'arri-validate';
 import 'arri-codegen-utils';

package/dist/shared/{arri.458d7a5c.cjs → arri.3b472e3d.cjs}

@@ -1,7 +1,7 @@
 'use strict';
 
-const arriValidate = require('arri-validate');
 const h3 = require('h3');
+const arriValidate = require('arri-validate');
 const arriCodegenUtils = require('arri-codegen-utils');
 const scule = require('scule');
 
@@ -206,6 +206,9 @@ async function handleH3Error(err, event, onError) {
   );
 }
 
+function isRpcParamSchema(input) {
+  return arriValidate.isAObjectSchema(input) || arriValidate.isARecordSchema(input) || arriValidate.isADiscriminatorSchema(input);
+}
 function isRpc(input) {
   if (typeof input !== "object") {
     return false;
@@ -242,7 +245,7 @@ function getRpcPath(rpcName, prefix = "") {
   return finalPath;
 }
 function getRpcParamName(rpcName, procedure) {
-  if (!arriValidate.isAObjectSchema(procedure.params)) {
+  if (!isRpcParamSchema(procedure.params)) {
     return void 0;
   }
   const nameParts = rpcName.split(".").map(
@@ -252,7 +255,7 @@ function getRpcParamName(rpcName, procedure) {
   return paramName;
 }
 function getRpcResponseName(rpcName, procedure) {
-  if (!arriValidate.isAObjectSchema(procedure.response)) {
+  if (!isRpcParamSchema(procedure.response)) {
     return void 0;
   }
   const nameParts = rpcName.split(".").map(
@@ -262,7 +265,7 @@ function getRpcResponseName(rpcName, procedure) {
   return responseName;
 }
 function getRpcResponseDefinition(rpcName, procedure) {
-  if (!arriValidate.isAObjectSchema(procedure.response)) {
+  if (!isRpcParamSchema(procedure.response)) {
     return void 0;
   }
   const name = getRpcResponseName(rpcName, procedure);
@@ -293,7 +296,7 @@ function registerRpc(router, path, procedure, opts) {
           await m(event);
         }
       }
-      if (arriValidate.isAObjectSchema(procedure.params)) {
+      if (isRpcParamSchema(procedure.params)) {
         switch (httpMethod) {
           case "get":
           case "head": {
@@ -651,13 +654,13 @@ class ArriApp {
       path,
       procedure
     );
-    if (arriValidate.isAObjectSchema(procedure.params)) {
+    if (isRpcParamSchema(procedure.params)) {
       const paramName = getRpcParamName(procedure.name, procedure);
       if (paramName) {
         this.models[paramName] = procedure.params;
       }
     }
-    if (arriValidate.isAObjectSchema(procedure.response)) {
+    if (isRpcParamSchema(procedure.response)) {
       const responseName = getRpcResponseName(procedure.name, procedure);
       if (responseName) {
         this.models[responseName] = procedure.response;
@@ -752,5 +755,6 @@ exports.handleRoute = handleRoute;
 exports.isArriConfig = isArriConfig;
 exports.isResolvedArriConfig = isResolvedArriConfig;
 exports.isRpc = isRpc;
+exports.isRpcParamSchema = isRpcParamSchema;
 exports.registerRoute = registerRoute;
 exports.registerRpc = registerRpc;

package/dist/shared/{arri.f6cbbd0d.mjs → arri.b635ea35.mjs}

@@ -1,5 +1,5 @@
-import { a, isAObjectSchema } from 'arri-validate';
 import { createError, isError, setResponseStatus, send, eventHandler, isPreflightRequest, readRawBody, getValidatedQuery, setResponseHeader, defineEventHandler, getQuery, setHeader, createRouter, createApp, sendError } from 'h3';
+import { a, isAObjectSchema, isARecordSchema, isADiscriminatorSchema } from 'arri-validate';
 import { isHttpMethod, removeDisallowedChars } from 'arri-codegen-utils';
 import { kebabCase, pascalCase } from 'scule';
 
@@ -204,6 +204,9 @@ async function handleH3Error(err, event, onError) {
   );
 }
 
+function isRpcParamSchema(input) {
+  return isAObjectSchema(input) || isARecordSchema(input) || isADiscriminatorSchema(input);
+}
 function isRpc(input) {
   if (typeof input !== "object") {
     return false;
@@ -240,7 +243,7 @@ function getRpcPath(rpcName, prefix = "") {
   return finalPath;
 }
 function getRpcParamName(rpcName, procedure) {
-  if (!isAObjectSchema(procedure.params)) {
+  if (!isRpcParamSchema(procedure.params)) {
     return void 0;
   }
   const nameParts = rpcName.split(".").map(
@@ -250,7 +253,7 @@ function getRpcParamName(rpcName, procedure) {
   return paramName;
 }
 function getRpcResponseName(rpcName, procedure) {
-  if (!isAObjectSchema(procedure.response)) {
+  if (!isRpcParamSchema(procedure.response)) {
     return void 0;
   }
   const nameParts = rpcName.split(".").map(
@@ -260,7 +263,7 @@ function getRpcResponseName(rpcName, procedure) {
   return responseName;
 }
 function getRpcResponseDefinition(rpcName, procedure) {
-  if (!isAObjectSchema(procedure.response)) {
+  if (!isRpcParamSchema(procedure.response)) {
     return void 0;
   }
   const name = getRpcResponseName(rpcName, procedure);
@@ -291,7 +294,7 @@ function registerRpc(router, path, procedure, opts) {
           await m(event);
         }
       }
-      if (isAObjectSchema(procedure.params)) {
+      if (isRpcParamSchema(procedure.params)) {
         switch (httpMethod) {
           case "get":
           case "head": {
@@ -649,13 +652,13 @@ class ArriApp {
       path,
       procedure
     );
-    if (isAObjectSchema(procedure.params)) {
+    if (isRpcParamSchema(procedure.params)) {
       const paramName = getRpcParamName(procedure.name, procedure);
       if (paramName) {
         this.models[paramName] = procedure.params;
       }
     }
-    if (isAObjectSchema(procedure.response)) {
+    if (isRpcParamSchema(procedure.response)) {
       const responseName = getRpcResponseName(procedure.name, procedure);
       if (responseName) {
         this.models[responseName] = procedure.response;
@@ -730,4 +733,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, defineRoute as p, registerRoute as q, registerRpc as r, handleRoute as s };
+export { ArriApp as A, DEV_ENDPOINT_ROOT as D, ErrorResponse as E, DEV_DEFINITION_ENDPOINT as a, isRpc as b, createRpcDefinition as c, defineRpc as d, getRpcParamName as e, getRpcResponseName as f, getRpcPath as g, defineError as h, isRpcParamSchema as i, errorResponseFromValidationErrors as j, handleH3Error as k, isArriConfig as l, isResolvedArriConfig as m, defaultConfig as n, defineConfig as o, ArriRouter as p, defineRoute as q, registerRpc as r, registerRoute as s, handleRoute as t };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "arri",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "type": "module",
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",
@@ -25,15 +25,15 @@
     "esbuild": "^0.19.5",
     "globby": "^13.2.2",
     "h3": "^1.8.2",
-    "jiti": "^1.20.0",
+    "jiti": "^1.21.0",
     "ofetch": "^1.3.3",
     "pathe": "^1.1.1",
     "prettier": "^3.0.3",
     "scule": "^1.0.0",
-    "arri-codegen-dart": "0.6.0",
-    "arri-codegen-ts": "0.6.0",
-    "arri-codegen-utils": "0.6.0",
-    "arri-validate": "0.6.0"
+    "arri-codegen-dart": "0.7.0",
+    "arri-codegen-ts": "0.7.0",
+    "arri-validate": "0.7.0",
+    "arri-codegen-utils": "0.7.0"
   },
   "peerDependencies": {
     "listhen": "1.x"