@seam-rpc/server 5.0.1 → 5.1.0

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { Result, ApiError, ApiErrorInterface } from "@seam-rpc/core";
+import { Result, ApiError } from "@seam-rpc/core";
 import EventEmitter from "events";
 import express, { Express, NextFunction, Request, RequestHandler, Response } from "express";
 import * as z from "zod";
@@ -29,14 +29,14 @@ export interface SeamEvents {
     inputValidationError: [error: unknown, context: SeamErrorContext];
     outputValidationError: [error: unknown, context: SeamErrorContext];
 }
-type ProcedureHandler<Input extends ProcedureInput, Output extends ProcedureOutput> = (options: ProcedureOptions<Input>) => Result<z.infer<Output>, ApiError> | Promise<Result<z.infer<Output>, ApiError>>;
+type ProcedureHandler<Input extends ProcedureInput, Output extends ProcedureOutput> = (options: ProcedureOptions<Input>) => Result<z.infer<Output>, ApiError<any, any>> | Promise<Result<z.infer<Output>, ApiError<any, any>>>;
 interface ProcedureOptions<Input extends ProcedureInput> {
     input: Simplify<ProcedureInputData<Input>>;
     ctx: SeamContext;
 }
 type ProcedureInput = Record<string, z.ZodType>;
 type ProcedureOutput = z.ZodType;
-type ProcedureErrors = Record<string, z.ZodType | undefined>;
+type ProcedureErrors = Record<string, any | undefined>;
 type ProcedureInputData<T extends ProcedureInput> = {
     [K in keyof T]: z.infer<T[K]>;
 };
@@ -46,10 +46,12 @@ interface SeamProcedure<Input extends ProcedureInput = {}, Output extends Proced
     errors?: Errors;
     handler?: ProcedureHandler<Input, Output>;
 }
-type ExtractResultError<T> = Awaited<T> extends Result<any, infer E> ? E : never;
-type ErrorUnionToMap<E> = {
-    [K in E extends ApiErrorInterface<any, infer Code> ? Code : never]: Extract<E, ApiErrorInterface<any, K>> extends ApiErrorInterface<infer Map, K> ? Map[K] : never;
-};
+type ExtractResultError<T> = Awaited<T> extends Result<any, undefined> ? never : Awaited<T> extends Result<any, infer E> ? E : never;
+type ErrorUnionToMap<T> = [
+    T
+] extends [never] ? {} : [T] extends [ApiError<infer ErrorMap, infer Code>] ? {
+    [K in Code]: ErrorMap[K];
+} : never;
 export type ProcedureBuilder<Input extends ProcedureInput = {}, Output extends ProcedureOutput = z.ZodUndefined, Errors extends ProcedureErrors = {}> = {
     _def: SeamProcedure<Input, Output, Errors>;
     input: <T extends ProcedureInput>(schema: T) => ProcedureBuilder<T, Output, Errors>;
@@ -69,24 +71,15 @@ export declare class SeamSpace extends EventEmitter<SeamEvents> {
     get jsonParser(): import("connect").NextHandleFunction;
     get fileHandler(): express.RequestHandler<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>;
 }
-type ErrorMapToUnion<E extends Record<string, any>> = {
-    [K in keyof E]: ApiError<{
-        [P in K]: E[K];
-    }, K>;
-}[keyof E];
-type ResultFromErrors<Data, Errors extends Record<string, any>> = {
-    ok: true;
-    data: Data;
-} | (ErrorMapToUnion<Errors> extends infer E ? E extends ApiError<any, any> ? {
-    ok: false;
-    error: E;
-} : never : never);
 type InferInput<P> = P extends ProcedureBuilder<infer I, any, any> ? {
     [K in keyof I]: I[K] extends z.ZodType ? z.infer<I[K]> : never;
 } : never;
 type InferOutput<P> = P extends ProcedureBuilder<any, infer O, any> ? O extends z.ZodType ? z.infer<O> : never : never;
-type InferErrors<P> = P extends ProcedureBuilder<any, any, infer E> ? E : never;
-type ProcedureToFn<P> = P extends ProcedureBuilder<any, any, any> ? (input: InferInput<P>) => Promise<ResultFromErrors<InferOutput<P>, InferErrors<P>>> : never;
-type RouterToClient<T> = {
-    [K in keyof T]: T[K] extends ProcedureBuilder<any, any, any> ? ProcedureToFn<T[K]> : RouterToClient<T[K]>;
+type InferErrors<P> = P extends ProcedureBuilder<any, any, infer E> ? [keyof E] extends [never] ? undefined : {
+    [K in keyof E]: ApiError<E, K>;
+}[keyof E] : never;
+export type RouterToClient<RouterList extends Record<string, Record<string, ProcedureBuilder<any, any, any>>>> = {
+    [R in keyof RouterList]: {
+        [P in keyof RouterList[R]]: (input: InferInput<RouterList[R][P]>) => Promise<Result<InferOutput<RouterList[R][P]>, InferErrors<RouterList[R][P]>>>;
+    };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seam-rpc/server",
-  "version": "5.0.1",
+  "version": "5.1.0",
   "main": "dist/index.js",
   "type": "module",
   "types": "dist/index.d.ts",