@mionjs/client 0.8.4-alpha.0 → 0.8.6

package/.dist/esm/src/subRequest.js.map

@@ -1 +1 @@
-{"version":3,"file":"subRequest.js","sources":["../../../src/subRequest.ts"],"sourcesContent":["/* ########\n * 2025 mion\n * Author: Ma-jerez\n * License: MIT\n * The software is provided \"as is\", without warranty of any kind.\n * ######## */\n\nimport {RpcError} from '@mionjs/core';\nimport type {RunTypeError} from '@mionjs/core';\nimport type {\n    CallWithMiddleFnsResult,\n    HSubRequest,\n    RequestErrors,\n    Result,\n    RSubRequest,\n    SubRequest,\n    WorkflowResult,\n} from './types.ts';\nimport type {MapFromServerFnRef} from '@mionjs/core';\nimport type {MionClient} from './client.ts';\nimport {TypedEvent} from './lib/typedEvent.ts';\nimport {isMapFromRef} from './routesFlow.ts';\n\n/** Implementation of both RouteSubRequest and MiddleFnSubRequest interfaces */\nexport class MionSubRequest<S = any, E extends RpcError<string, any> = any> implements RSubRequest<any>, HSubRequest<any> {\n    pointer: string[];\n    id: string;\n    isResolved: boolean = false;\n    params: any[];\n    resolvedValue?: S;\n    error?: E;\n    serializedParams?: any[];\n    mappings: MapFromServerFnRef[] = [];\n\n    constructor(\n        parentProps: string[],\n        handlerId: string,\n        argArray: any[],\n        readonly client: MionClient\n    ) {\n        this.pointer = [...parentProps];\n        this.id = handlerId;\n        this.params = argArray.map((arg, index) => {\n            if (isMapFromRef(arg)) {\n                arg.toRequestId = this.id;\n                arg.paramIndex = index;\n                this.mappings.push(arg);\n                return null;\n            }\n            return arg;\n        });\n    }\n\n    /** Prefills MiddleFn's parameters and returns TypedEvent for event handler registration */\n    prefill(): TypedEvent<S, E> {\n        const typedEvent = new TypedEvent<S, E>(this.id, this.client.handlersRegistry);\n\n        this.client.prefill(this as HSubRequest<any>).catch((errors: RequestErrors) => {\n            console.error('Prefill error:', findSubRequestError(this, errors));\n        });\n\n        return typedEvent;\n    }\n\n    /** Removes prefilled value and clears any registered error handlers for this middleFn */\n    removePrefill(): Promise<void> {\n        this.client.handlersRegistry.clearHandlers(this.id);\n        return this.client.removePrefill(this as HSubRequest<any>);\n    }\n\n    /** Calls a remote route and returns a Result 4-tuple with full typing preserved */\n    call(): Promise<Result<S, E>> {\n        return this.client.executeCall(this as unknown as RSubRequest<any>);\n    }\n\n    /** Calls a remote route with middleFns and returns a fully-typed 4-tuple result */\n    callWithMiddleFns<H extends Record<string, HSubRequest<any>>>(middleFns: H): Promise<CallWithMiddleFnsResult<S, E, H>> {\n        if (Object.keys(middleFns).length === 0) {\n            throw new Error(\n                'callWithMiddleFns requires at least one middleFn. Use call() instead for requests without middleFns.'\n            );\n        }\n        return this.client.executeCallWithMiddleFns(this as RSubRequest<any>, middleFns) as Promise<\n            CallWithMiddleFnsResult<S, E, H>\n        >;\n    }\n\n    /** Calls this route as part of a routesFlow with other routes in a single HTTP request */\n    async callWithWorkflow<OtherRoutes extends RSubRequest<any>[], H extends Record<string, HSubRequest<any>>>(\n        otherRoutes: [...OtherRoutes],\n        middleFns?: H\n    ): Promise<WorkflowResult<[RSubRequest<any>, ...OtherRoutes], H>> {\n        const allRoutes = [this as unknown as RSubRequest<any>, ...otherRoutes];\n        const [results, errors, middleFnResults, middleFnErrors] = await this.client.executeCallWithWorkflow(\n            allRoutes,\n            middleFns ?? ({} as H)\n        );\n        const emptyResults = allRoutes.map(() => undefined);\n        const emptyErrors = allRoutes.map(() => undefined);\n        return [results ?? emptyResults, errors ?? emptyErrors, middleFnResults, middleFnErrors] as WorkflowResult<\n            [RSubRequest<any>, ...OtherRoutes],\n            H\n        >;\n    }\n\n    /** Validates parameters and returns type errors */\n    typeErrors(): Promise<RunTypeError[]> {\n        return this.client\n            .typeErrors(this as SubRequest<any>)\n            .catch((errors: RequestErrors) => Promise.reject(findSubRequestError(this, errors)));\n    }\n}\n\n/** Finds the most relevant error from the errors map for a given sub-request */\nexport function findSubRequestError(subRequest: SubRequest<any>, errors: RequestErrors): RpcError<string> {\n    const specificError = errors.get(subRequest.id);\n    if (specificError) return specificError;\n\n    const firstError = errors.values().next().value;\n    if (firstError) return firstError;\n\n    return new RpcError({\n        type: 'unknown-error',\n        publicMessage: 'An unknown error occurred',\n    });\n}\n"],"names":[],"mappings":";;;MAwBa,eAAc;AAAA,EAcV;AAAA,EAbb;AAAA,EACA;AAAA,EACA,aAAsB;AAAA,EACtB;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA,WAAiC,CAAA;AAAA,EAEjC,YACI,aACA,WACA,UACS,QAAkB;AAAlB,SAAA,SAAA,QAET,KAAK,UAAU,CAAC,GAAG,WAAW,GAC9B,KAAK,KAAK,WACV,KAAK,SAAS,SAAS,IAAI,CAAC,KAAK,UACzB,aAAa,GAAG,KAChB,IAAI,cAAc,KAAK,IACvB,IAAI,aAAa,OACjB,KAAK,SAAS,KAAK,GAAG,GACf,QAEJ,GACV;AAAA,EACL;AAAA;AAAA,EAGA,UAAO;AACH,UAAM,aAAa,IAAI,WAAiB,KAAK,IAAI,KAAK,OAAO,gBAAgB;AAE7E,gBAAK,OAAO,QAAQ,IAAwB,EAAE,MAAM,CAAC,WAAyB;AAC1E,cAAQ,MAAM,kBAAkB,oBAAoB,MAAM,MAAM,CAAC;AAAA,IACrE,CAAC,GAEM;AAAA,EACX;AAAA;AAAA,EAGA,gBAAa;AACT,gBAAK,OAAO,iBAAiB,cAAc,KAAK,EAAE,GAC3C,KAAK,OAAO,cAAc,IAAwB;AAAA,EAC7D;AAAA;AAAA,EAGA,OAAI;AACA,WAAO,KAAK,OAAO,YAAY,IAAmC;AAAA,EACtE;AAAA;AAAA,EAGA,kBAA8D,WAAY;AACtE,QAAI,OAAO,KAAK,SAAS,EAAE,WAAW;AAClC,YAAM,IAAI,MACN,sGAAsG;AAG9G,WAAO,KAAK,OAAO,yBAAyB,MAA0B,SAAS;AAAA,EAGnF;AAAA;AAAA,EAGA,MAAM,iBACF,aACA,WAAa;AAEb,UAAM,YAAY,CAAC,MAAqC,GAAG,WAAW,GAChE,CAAC,SAAS,QAAQ,iBAAiB,cAAc,IAAI,MAAM,KAAK,OAAO,wBACzE,WACA,aAAc,CAAA,CAAQ,GAEpB,eAAe,UAAU,IAAI,MAAA;AAAA,KAAe,GAC5C,cAAc,UAAU,IAAI,MAAA;AAAA,KAAe;AACjD,WAAO,CAAC,WAAW,cAAc,UAAU,aAAa,iBAAiB,cAAc;AAAA,EAI3F;AAAA;AAAA,EAGA,aAAU;AACN,WAAO,KAAK,OACP,WAAW,IAAuB,EAClC,MAAM,CAAC,WAA0B,QAAQ,OAAO,oBAAoB,MAAM,MAAM,CAAC,CAAC;AAAA,EAC3F;AACH;AAGK,SAAU,oBAAoB,YAA6B,QAAqB;AAClF,QAAM,gBAAgB,OAAO,IAAI,WAAW,EAAE;AAC9C,MAAI;AAAe,WAAO;AAE1B,QAAM,aAAa,OAAO,OAAA,EAAS,OAAO;AAC1C,SAAI,cAEG,IAAI,SAAS;AAAA,IAChB,MAAM;AAAA,IACN,eAAe;AAAA,EAAA,CAClB;AACL;"}
+{"version":3,"file":"subRequest.js","sources":["../../../src/subRequest.ts"],"sourcesContent":["/* ########\n * 2025 mion\n * Author: Ma-jerez\n * License: MIT\n * The software is provided \"as is\", without warranty of any kind.\n * ######## */\n\nimport {RpcError} from '@mionjs/core';\nimport type {RunTypeError} from '@mionjs/core';\nimport type {CallSetup, MiddlewareSubRequest, RequestErrors, RouteSubRequest, SubRequest} from './types.ts';\nimport type {MapFromServerFnRef} from '@mionjs/core';\nimport type {MionClient} from './client.ts';\nimport {TypedEvent} from './lib/typedEvent.ts';\nimport {isMapFromRef} from './routesFlow.ts';\n\n/** Implementation of both RouteSubRequest and MiddleFnSubRequest interfaces */\nexport class MionSubRequest<S = any, E extends RpcError<string, any> = any>\n    implements RouteSubRequest<any>, MiddlewareSubRequest<any>\n{\n    pointer: string[];\n    id: string;\n    isResolved: boolean = false;\n    params: any[];\n    resolvedValue?: S;\n    error?: E;\n    serializedParams?: any[];\n    mappings: MapFromServerFnRef[] = [];\n\n    constructor(\n        parentProps: string[],\n        handlerId: string,\n        argArray: any[],\n        readonly client: MionClient\n    ) {\n        this.pointer = [...parentProps];\n        this.id = handlerId;\n        this.params = argArray.map((arg, index) => {\n            if (isMapFromRef(arg)) {\n                arg.toRequestId = this.id;\n                arg.paramIndex = index;\n                this.mappings.push(arg);\n                return null;\n            }\n            return arg;\n        });\n    }\n\n    /** Prefills MiddleFn's parameters and returns TypedEvent for event handler registration */\n    prefill(): TypedEvent<S, E> {\n        const typedEvent = new TypedEvent<S, E>(this.id, this.client.handlersRegistry);\n\n        this.client.prefill(this as MiddlewareSubRequest<any>).catch((errors: RequestErrors) => {\n            console.error('Prefill error:', findSubRequestError(this, errors));\n        });\n\n        return typedEvent;\n    }\n\n    /** Removes prefilled value and clears any registered error handlers for this middleFn */\n    removePrefill(): Promise<void> {\n        this.client.handlersRegistry.clearHandlers(this.id);\n        return this.client.removePrefill(this as MiddlewareSubRequest<any>);\n    }\n\n    /** Calls a remote route with optional setup (middleFns, otherRoutes, signal, timeout) */\n    call(setup?: CallSetup<any, any>): Promise<any> {\n        const signal = setup?.signal;\n        const timeout = setup?.timeout;\n        if (!setup || (!setup.otherRoutes && !setup.middleFns)) {\n            return this.client.execute(this as unknown as RouteSubRequest<any>, undefined, undefined, signal, timeout);\n        }\n        if (setup.otherRoutes && setup.otherRoutes.length > 0) {\n            return this.executeWithOtherRoutes(setup.otherRoutes, setup.middleFns, signal, timeout);\n        }\n        return this.client.execute(this as unknown as RouteSubRequest<any>, undefined, setup.middleFns, signal, timeout);\n    }\n\n    private async executeWithOtherRoutes(\n        otherRoutes: RouteSubRequest<any>[],\n        middleFns?: Record<string, MiddlewareSubRequest<any>>,\n        signal?: AbortSignal,\n        timeout?: number\n    ): Promise<any> {\n        const allRoutes = [this as unknown as RouteSubRequest<any>, ...otherRoutes];\n        const [results, errors, mfR, mfE] = await this.client.execute(undefined, allRoutes, middleFns ?? {}, signal, timeout);\n        const emptyResults = allRoutes.map(() => undefined);\n        const emptyErrors = allRoutes.map(() => undefined);\n        return [results ?? emptyResults, errors ?? emptyErrors, mfR, mfE];\n    }\n\n    /** Validates parameters and returns type errors */\n    typeErrors(): Promise<RunTypeError[]> {\n        return this.client\n            .typeErrors(this as SubRequest<any>)\n            .catch((errors: RequestErrors) => Promise.reject(findSubRequestError(this, errors)));\n    }\n}\n\n/** Finds the most relevant error from the errors map for a given sub-request */\nexport function findSubRequestError(subRequest: SubRequest<any>, errors: RequestErrors): RpcError<string> {\n    const specificError = errors.get(subRequest.id);\n    if (specificError) return specificError;\n\n    const firstError = errors.values().next().value;\n    if (firstError) return firstError;\n\n    return new RpcError({\n        type: 'unknown-error',\n        publicMessage: 'An unknown error occurred',\n    });\n}\n"],"names":[],"mappings":";;;MAgBa,eAAc;AAAA,EAgBV;AAAA,EAbb;AAAA,EACA;AAAA,EACA,aAAsB;AAAA,EACtB;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA,WAAiC,CAAA;AAAA,EAEjC,YACI,aACA,WACA,UACS,QAAkB;AAAlB,SAAA,SAAA,QAET,KAAK,UAAU,CAAC,GAAG,WAAW,GAC9B,KAAK,KAAK,WACV,KAAK,SAAS,SAAS,IAAI,CAAC,KAAK,UACzB,aAAa,GAAG,KAChB,IAAI,cAAc,KAAK,IACvB,IAAI,aAAa,OACjB,KAAK,SAAS,KAAK,GAAG,GACf,QAEJ,GACV;AAAA,EACL;AAAA;AAAA,EAGA,UAAO;AACH,UAAM,aAAa,IAAI,WAAiB,KAAK,IAAI,KAAK,OAAO,gBAAgB;AAE7E,gBAAK,OAAO,QAAQ,IAAiC,EAAE,MAAM,CAAC,WAAyB;AACnF,cAAQ,MAAM,kBAAkB,oBAAoB,MAAM,MAAM,CAAC;AAAA,IACrE,CAAC,GAEM;AAAA,EACX;AAAA;AAAA,EAGA,gBAAa;AACT,gBAAK,OAAO,iBAAiB,cAAc,KAAK,EAAE,GAC3C,KAAK,OAAO,cAAc,IAAiC;AAAA,EACtE;AAAA;AAAA,EAGA,KAAK,OAA2B;AAC5B,UAAM,SAAS,OAAO,QAChB,UAAU,OAAO;AACvB,WAAI,CAAC,SAAU,CAAC,MAAM,eAAe,CAAC,MAAM,YACjC,KAAK,OAAO,QAAQ,MAAyC,QAAW,QAAW,QAAQ,OAAO,IAEzG,MAAM,eAAe,MAAM,YAAY,SAAS,IACzC,KAAK,uBAAuB,MAAM,aAAa,MAAM,WAAW,QAAQ,OAAO,IAEnF,KAAK,OAAO,QAAQ,MAAyC,QAAW,MAAM,WAAW,QAAQ,OAAO;AAAA,EACnH;AAAA,EAEQ,MAAM,uBACV,aACA,WACA,QACA,SAAgB;AAEhB,UAAM,YAAY,CAAC,MAAyC,GAAG,WAAW,GACpE,CAAC,SAAS,QAAQ,KAAK,GAAG,IAAI,MAAM,KAAK,OAAO,QAAQ,QAAW,WAAW,aAAa,CAAA,GAAI,QAAQ,OAAO,GAC9G,eAAe,UAAU,IAAI,MAAA;AAAA,KAAe,GAC5C,cAAc,UAAU,IAAI,MAAA;AAAA,KAAe;AACjD,WAAO,CAAC,WAAW,cAAc,UAAU,aAAa,KAAK,GAAG;AAAA,EACpE;AAAA;AAAA,EAGA,aAAU;AACN,WAAO,KAAK,OACP,WAAW,IAAuB,EAClC,MAAM,CAAC,WAA0B,QAAQ,OAAO,oBAAoB,MAAM,MAAM,CAAC,CAAC;AAAA,EAC3F;AACH;AAGK,SAAU,oBAAoB,YAA6B,QAAqB;AAClF,QAAM,gBAAgB,OAAO,IAAI,WAAW,EAAE;AAC9C,MAAI;AAAe,WAAO;AAE1B,QAAM,aAAa,OAAO,OAAA,EAAS,OAAO;AAC1C,SAAI,cAEG,IAAI,SAAS;AAAA,IAChB,MAAM;AAAA,IACN,eAAe;AAAA,EAAA,CAClB;AACL;"}

package/.dist/esm/src/types.d.ts

@@ -1,20 +1,10 @@
 import { RpcError, CoreRouterOptions, Prettify, RunTypeError, SerializerMode, ValidationError } from '@mionjs/core';
 import { PublicHeadersFn, PublicMiddleFn, RemoteApi, PublicRoute } from '@mionjs/router';
 import { TypedEvent } from './lib/typedEvent.ts';
-export type Result<RouteSuccess, RouteError, MiddleFnsResults extends Record<string, unknown> = Record<string, unknown>, MiddleFnsErrors extends Record<string, RpcError<string, unknown>> = Record<string, RpcError<string, unknown>>> = [RouteSuccess | undefined, RouteError | undefined, MiddleFnsResults | undefined, MiddleFnsErrors | undefined];
-export type MiddleFnSuccess<H> = H extends HSubRequest<infer PH> ? HandlerSuccessResponse<PH> : never;
-export type MiddleFnError<H> = H extends HSubRequest<infer PH> ? Simplify<HandlerErrors<PH>> : never;
-export type CallWithMiddleFnsResult<RouteSuccess, RouteError, MiddleFns extends Record<string, HSubRequest<any>>> = [
-    RouteSuccess | undefined,
-    RouteError | ValidationError | undefined,
-    {
-        [K in keyof MiddleFns]?: MiddleFnSuccess<MiddleFns[K]>;
-    } | undefined,
-    {
-        [K in keyof MiddleFns]?: MiddleFnError<MiddleFns[K]>;
-    } | undefined
-];
-export type WorkflowResult<Routes extends RSubRequest<any>[], MiddleFns extends Record<string, HSubRequest<any>> = Record<string, HSubRequest<any>>> = [
+export type Result<RouteSuccess, RouteError, MiddleFnsResults extends Record<string, unknown> = Record<string, unknown>, MiddleFnsErrors extends Record<string, unknown> = Record<string, RpcError<string, unknown>>> = [RouteSuccess | undefined, RouteError | undefined, MiddleFnsResults | undefined, MiddleFnsErrors | undefined];
+export type MiddleFnSuccess<H> = H extends MiddlewareSubRequest<infer PH> ? HandlerSuccessResponse<PH> : never;
+export type MiddleFnError<H> = H extends MiddlewareSubRequest<infer PH> ? Simplify<HandlerErrors<PH>> : never;
+export type WorkflowResult<Routes extends RouteSubRequest<any>[], MiddleFns extends Record<string, MiddlewareSubRequest<any>> = Record<string, MiddlewareSubRequest<any>>> = [
     WorkflowRouteResults<Routes>,
     WorkflowRouteErrors<Routes>,
     {
@@ -24,11 +14,11 @@ export type WorkflowResult<Routes extends RSubRequest<any>[], MiddleFns extends
         [K in keyof MiddleFns]?: MiddleFnError<MiddleFns[K]>;
     } | undefined
 ];
-export type WorkflowRouteResults<Routes extends RSubRequest<any>[]> = {
-    [K in keyof Routes]: Routes[K] extends RSubRequest<infer PH> ? HandlerSuccessResponse<PH> | undefined : never;
+export type WorkflowRouteResults<Routes extends RouteSubRequest<any>[]> = {
+    [K in keyof Routes]: Routes[K] extends RouteSubRequest<infer PH> ? HandlerSuccessResponse<PH> | undefined : never;
 };
-export type WorkflowRouteErrors<Routes extends RSubRequest<any>[]> = {
-    [K in keyof Routes]: Routes[K] extends RSubRequest<infer PH> ? Simplify<HandlerErrors<PH>> | undefined : never;
+export type WorkflowRouteErrors<Routes extends RouteSubRequest<any>[]> = {
+    [K in keyof Routes]: Routes[K] extends RouteSubRequest<infer PH> ? Simplify<HandlerErrors<PH>> | undefined : never;
 };
 export interface ClientOptions extends CoreRouterOptions {
     baseURL: string;
@@ -38,6 +28,7 @@ export interface ClientOptions extends CoreRouterOptions {
     fetchOptions: RequestInit;
     validateParams: boolean;
     serializer: SerializerMode;
+    timeout?: number;
 }
 type PublicHandler = (...args: any[]) => Promise<any>;
 type PublicMethod = PublicRoute | PublicMiddleFn | PublicHeadersFn;
@@ -83,31 +74,68 @@ export interface SubRequest<PH extends PublicHandler> {
     error?: HandlerFailResponse<PH>;
     serializedParams?: any[];
 }
-export interface RSubRequest<PH extends PublicHandler> extends SubRequest<PH> {
+export interface CallSetup<H extends Record<string, MiddlewareSubRequest<any>> = Record<string, never>, OtherRoutes extends RouteSubRequest<any>[] = []> {
+    middleFns?: H;
+    otherRoutes?: [...OtherRoutes];
+    signal?: AbortSignal;
+    timeout?: number;
+}
+export interface RoutesFlowBuilder<Routes extends RouteSubRequest<any>[]> {
+    call(setup?: {
+        middleFns?: never;
+        signal?: AbortSignal;
+        timeout?: number;
+    }): Promise<WorkflowResult<Routes>>;
+    call<H extends Record<string, MiddlewareSubRequest<any>>>(setup: {
+        middleFns: H;
+        signal?: AbortSignal;
+        timeout?: number;
+    }): Promise<WorkflowResult<Routes, H>>;
+}
+export interface RouteSubRequest<PH extends PublicHandler> extends SubRequest<PH> {
     typeErrors: () => Promise<RunTypeError[]>;
-    call: () => Promise<Result<HandlerSuccessResponse<PH>, Simplify<HandlerErrors<PH>>, Record<string, unknown>, Record<string, RpcError<string, unknown> | ValidationError>>>;
-    callWithMiddleFns: <H extends Record<string, HSubRequest<any>>>(middleFns: H) => Promise<CallWithMiddleFnsResult<HandlerSuccessResponse<PH>, Simplify<HandlerErrors<PH>>, H>>;
-    callWithWorkflow: <OtherRoutes extends RSubRequest<any>[], H extends Record<string, HSubRequest<any>>>(otherRoutes: [...OtherRoutes], middleFns?: H) => Promise<WorkflowResult<any, H>>;
+    call(setup?: {
+        middleFns?: never;
+        otherRoutes?: never;
+        signal?: AbortSignal;
+        timeout?: number;
+    }): Promise<Result<HandlerSuccessResponse<PH>, Simplify<HandlerErrors<PH>>>>;
+    call<H extends Record<string, MiddlewareSubRequest<any>>>(setup: {
+        middleFns: H;
+        otherRoutes?: never;
+        signal?: AbortSignal;
+        timeout?: number;
+    }): Promise<Result<HandlerSuccessResponse<PH>, Simplify<HandlerErrors<PH>>, {
+        [K in keyof H]?: MiddleFnSuccess<H[K]>;
+    }, {
+        [K in keyof H]?: MiddleFnError<H[K]>;
+    }>>;
+    call<OtherRoutes extends RouteSubRequest<any>[], H extends Record<string, MiddlewareSubRequest<any>> = Record<string, never>>(setup: {
+        otherRoutes: [...OtherRoutes];
+        middleFns?: H;
+        signal?: AbortSignal;
+        timeout?: number;
+    }): Promise<WorkflowResult<any, H>>;
 }
-export interface HSubRequest<PH extends PublicHandler> extends SubRequest<PH> {
+export interface MiddlewareSubRequest<PH extends PublicHandler> extends SubRequest<PH> {
     typeErrors: () => Promise<RunTypeError[]>;
     prefill: () => TypedEvent<HandlerSuccessResponse<PH>, Simplify<HandlerErrors<PH>>>;
     removePrefill: () => Promise<void>;
 }
 export type NonClientRoute = never | PublicMiddleFn | PublicHeadersFn;
 export type ClientRoutes<RA extends RemoteApi> = Prettify<{
-    [Property in keyof RA as RA[Property] extends NonClientRoute ? never : Property]: RA[Property] extends PublicRoute ? (...params: Parameters<RA[Property]['handler']>) => RSubRequest<RA[Property]['handler']> : RA[Property] extends RemoteApi ? ClientRoutes<RA[Property]> : never;
+    [Property in keyof RA as RA[Property] extends NonClientRoute ? never : Property]: RA[Property] extends PublicRoute ? (...params: Parameters<RA[Property]['handler']>) => RouteSubRequest<RA[Property]['handler']> : RA[Property] extends RemoteApi ? ClientRoutes<RA[Property]> : never;
 }>;
 export type NonClientMiddleFn = never | PublicRoute | {
     [key: string]: PublicRoute;
 };
 export type ClientMiddleFns<RA extends RemoteApi> = Prettify<{
-    [Property in keyof RA as RA[Property] extends NonClientMiddleFn ? never : Property]: RA[Property] extends PublicMiddleFn | PublicHeadersFn ? (...params: Parameters<RA[Property]['handler']>) => HSubRequest<RA[Property]['handler']> : RA[Property] extends RemoteApi ? ClientMiddleFns<RA[Property]> : never;
+    [Property in keyof RA as RA[Property] extends NonClientMiddleFn ? never : Property]: RA[Property] extends PublicMiddleFn | PublicHeadersFn ? (...params: Parameters<RA[Property]['handler']>) => MiddlewareSubRequest<RA[Property]['handler']> : RA[Property] extends RemoteApi ? ClientMiddleFns<RA[Property]> : never;
 }>;
 export type Cleaned<RMS extends RemoteApi> = {
     [Property in keyof RMS as RMS[Property] extends never ? never : Property]: RMS[Property];
 };
-export type SuccessClientResponse<RS extends RSubRequest<any>, RHList extends HSubRequest<any>[]> = [
+export type SuccessClientResponse<RS extends RouteSubRequest<any>, RHList extends MiddlewareSubRequest<any>[]> = [
     SuccessResponse<RS>,
     ...SuccessResponses<RHList>
 ];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mionjs/client",
-  "version": "0.8.4-alpha.0",
+  "version": "0.8.6",
   "type": "module",
   "description": "Browser client for mion Apps.",
   "keywords": [
@@ -41,7 +41,7 @@
   },
   "scripts": {
     "test": "vitest run && npm run test:e2e:ssr",
-    "test:e2e:ssr": "node --experimental-strip-types src/aot/aotSSR.e2e.test.ts",
+    "test:e2e:ssr": "node --experimental-strip-types src/aotSSR.e2e.test.ts",
     "dev": "vite build --watch",
     "dev:test": "vitest watch",
     "lint": "npx eslint src",
@@ -54,15 +54,15 @@
   "bugs": {
     "url": "https://github.com/MionKit/mion/issues"
   },
-  "gitHead": "26f07a965e43529d4255e6f2ac8a633513026314",
+  "gitHead": "612302e243365c01fadbf3351b857174bf2f3956",
   "devDependencies": {
-    "@mionjs/platform-node": "^0.8.4-alpha.0",
-    "@mionjs/router": "^0.8.4-alpha.0",
-    "@mionjs/run-types": "^0.8.4-alpha.0",
-    "@mionjs/test-server": "^0.8.4-alpha.0",
+    "@mionjs/platform-node": "0.8.6",
+    "@mionjs/router": "0.8.6",
+    "@mionjs/run-types": "0.8.6",
+    "@mionjs/test-server": "0.8.6",
     "jest-environment-jsdom": "^29.6.2"
   },
   "dependencies": {
-    "@mionjs/core": "^0.8.4-alpha.0"
+    "@mionjs/core": "0.8.6"
   }
 }