fix: start tests, update errors

Signed-off-by: tunnckoCore <5038030+tunnckoCore@users.noreply.github.com>

Author: tunnckoCore

new-src/errors.ts

@@ -16,10 +16,7 @@ export type ValidationError<ErrorKindNames = never> = Prettify<
 >;
 export type InternalError = Prettify<ReturnType<typeof createInternalError>>;
 export type DefinedError<T> = Prettify<{ readonly kind: string } & T>;
-export type ZagoraError<T> =
-  | ValidationError
-  | InternalError
-  | DefinedError<any>;
+export type ZagoraError<T> = ValidationError | InternalError | DefinedError<T>;
 
 export function isValidationError(val: any): val is ValidationError {
   return Boolean(
@@ -31,22 +28,29 @@ export function isValidationError(val: any): val is ValidationError {
       typeof val.message === "string",
   );
 }
+
 export function isInternalError(val: any): val is InternalError {
   return Boolean(
     val &&
       val.kind === "UNKNOWN_ERROR" &&
       val.message &&
       typeof val.message === "string" &&
-      val.cause,
+      "cause" in val &&
+      "stack" in val,
   );
 }
+
 export function isDefinedError<T>(val: any): val is DefinedError<T> {
-  return Boolean(
-    val &&
-      val.kind &&
-      typeof val.kind === "string" &&
-      val.kind.length > 0 &&
-      val.kind === val.kind.toUpperCase(),
+  return (
+    Boolean(
+      val &&
+        val.kind &&
+        typeof val.kind === "string" &&
+        val.kind.length > 0 &&
+        val.kind === val.kind.toUpperCase(),
+    ) &&
+    !isValidationError(val) &&
+    !isInternalError(val)
   );
 }
 
@@ -112,12 +116,22 @@ export type ErrorHelpers<
     }
   : never;
 
+export type ErrorsMapPlain<TErrorsMap extends Record<string, AnySchema>> = {
+  [K in keyof TErrorsMap]: { kind: K } & InferSchemaOutput<TErrorsMap[K]>;
+};
+
 export type ErrorsMapResolved<
   TErrorsMap extends Record<string, AnySchema> | undefined,
 > = TErrorsMap extends Record<string, AnySchema>
-  ? Readonly<{ [K in keyof TErrorsMap]: InferSchemaOutput<TErrorsMap[K]> }>
+  ? ErrorsMapPlain<TErrorsMap>
   : undefined;
 
+// export type ErrorsMapResolved<
+//   TErrorsMap extends Record<string, AnySchema> | undefined,
+// > = TErrorsMap extends Record<string, AnySchema>
+//   ? { [K in keyof TErrorsMap]: { kind: K } & InferSchemaOutput<TErrorsMap[K]> }
+//   : undefined;
+
 export type ResolveErrorKindNames<TErrorsMap> = TErrorsMap extends Record<
   string,
   AnySchema

new-src/index.ts

@@ -31,8 +31,8 @@ export class Zagora<
   TIsHandlerAsync,
   THandlerFn,
   TContext extends any | undefined = undefined,
-  TInputSchema extends AnySchema = never,
-  TOutputSchema extends AnySchema = never,
+  TInputSchema extends AnySchema = AnySchema,
+  TOutputSchema extends AnySchema = AnySchema,
   TErrorsMap extends Record<string, AnySchema> | undefined = undefined,
 > {
   constructor(

new-src/types.ts

@@ -1,5 +1,11 @@
 import type { StandardSchemaV1 } from "@standard-schema/spec";
-import type { ErrorHelpers, InternalError, ValidationError } from "./errors";
+import type {
+  ErrorHelpers,
+  ErrorsMapPlain,
+  ErrorsMapResolved,
+  InternalError,
+  ValidationError,
+} from "./errors";
 
 export type Schema<I, O = I> = StandardSchemaV1<I, O>;
 
@@ -32,6 +38,13 @@ export type Prettify<T> = {
 export type IsOptional<T> = undefined extends T ? true : false;
 export type IsPromise<T> = T extends Promise<any> ? true : false;
 
+// export type DefinedErrorsUnion<TErrorsMap> = TErrorsMap extends Record<
+//   string,
+//   AnySchema
+// >
+//   ? Prettify<Readonly<ErrorsMapPlain<TErrorsMap>[keyof TErrorsMap]>>
+//   : never;
+
 export type ZagoraResult<
   TOutput,
   TErrorsMap extends Record<string, AnySchema> | undefined,
@@ -43,20 +56,22 @@ export type ZagoraResult<
       data: TOutput;
       readonly error: undefined;
     }
-  : {
-      readonly ok: false;
-      readonly isTypedError: IsTypedError;
-      readonly error: TErrorsMap extends Record<string, any>
-        ?
-            | Prettify<Readonly<TErrorsMap[keyof TErrorsMap]>>
-            | InternalError
-            | ValidationError<keyof TErrorsMap>
-        : InternalError | ValidationError<never>;
-    };
+  : TErrorsMap extends Record<string, any>
+    ? {
+        readonly ok: false;
+        readonly isTypedError: IsTypedError;
+        readonly error:
+          | Prettify<Readonly<TErrorsMap[keyof TErrorsMap]>>
+          | ValidationError<keyof TErrorsMap>
+          | InternalError;
+      }
+    : {
+        readonly ok: false;
+        readonly isTypedError: IsTypedError;
+        readonly error: InternalError | ValidationError<never>;
+      };
 
 export interface ZagoraDef<
-  // TIsHandlerAsync,
-  // THandlerFn,
   TContext,
   TInputSchema extends AnySchema | undefined,
   TOutputSchema extends AnySchema | undefined,

new-src/utils.ts

@@ -135,7 +135,7 @@ export function validateError<TKindNames>(
 const EXECUTION_CACHE = new Map();
 
 export function executeHandler(fn: any, args: any[]) {
-  const key = fn.toString();
+  const key = JSON.stringify({ key: fn.toString(), args });
   if (EXECUTION_CACHE.has(key)) {
     return EXECUTION_CACHE.get(key);
   }