Refactoring

src/traits/InstantiableZodSchemaObject.ts

@@ -1,30 +1,17 @@
 import { abstract, trait } from "@thilawyn/traitify-ts"
 import { Effect, pipe } from "effect"
-import { Class } from "type-fest"
 import { z } from "zod"
 import { NewZodSchemaInstanceArgs, NewZodSchemaInstanceInput } from ".."
+import { ZodSchemaClass } from "../types/ZodSchemaClass"
 import { parseZodTypeEffect } from "../util"
 
 
-export type ZodSchemaClassStatic<
-    SchemaT           extends z.ZodRawShape,
-    SchemaUnknownKeys extends z.UnknownKeysParam,
-    SchemaCatchall    extends z.ZodTypeAny,
-
-    Values            extends {},
-    DefaultValues     extends Partial<Values>,
-> = {
-    readonly schema:         z.ZodObject<SchemaT, SchemaUnknownKeys, SchemaCatchall, Values, Values>
-    readonly defaultValues:  DefaultValues
-}
-
-
 export const InstantiableZodSchemaObject = trait(
     abstract(),
 
     Super => class InstantiableZodSchemaObject extends Super {
         static create<
-            Self              extends Class<any, any[]> & ZodSchemaClassStatic<SchemaT, SchemaUnknownKeys, SchemaCatchall, Values, DefaultValues>,
+            Self              extends ZodSchemaClass<SchemaT, SchemaUnknownKeys, SchemaCatchall, Values, DefaultValues>,
 
             SchemaT           extends z.ZodRawShape,
             SchemaUnknownKeys extends z.UnknownKeysParam,
@@ -33,7 +20,7 @@ export const InstantiableZodSchemaObject = trait(
             Values            extends {},
             DefaultValues     extends Partial<Values>,
         >(
-            this: Self | Class<any, any[]> & ZodSchemaClassStatic<SchemaT, SchemaUnknownKeys, SchemaCatchall, Values, DefaultValues>,
+            this: Self | ZodSchemaClass<SchemaT, SchemaUnknownKeys, SchemaCatchall, Values, DefaultValues>,
 
             ...[values, params]: NewZodSchemaInstanceArgs<
                 NewZodSchemaInstanceInput<Values, DefaultValues>
@@ -45,7 +32,7 @@ export const InstantiableZodSchemaObject = trait(
         }
 
         static async createPromise<
-            Self              extends Class<any, any[]> & ZodSchemaClassStatic<SchemaT, SchemaUnknownKeys, SchemaCatchall, Values, DefaultValues>,
+            Self              extends ZodSchemaClass<SchemaT, SchemaUnknownKeys, SchemaCatchall, Values, DefaultValues>,
 
             SchemaT           extends z.ZodRawShape,
             SchemaUnknownKeys extends z.UnknownKeysParam,
@@ -54,7 +41,7 @@ export const InstantiableZodSchemaObject = trait(
             Values            extends {},
             DefaultValues     extends Partial<Values>,
         >(
-            this: Self | Class<any, any[]> & ZodSchemaClassStatic<SchemaT, SchemaUnknownKeys, SchemaCatchall, Values, DefaultValues>,
+            this: Self | ZodSchemaClass<SchemaT, SchemaUnknownKeys, SchemaCatchall, Values, DefaultValues>,
 
             ...[values, params]: NewZodSchemaInstanceArgs<
                 NewZodSchemaInstanceInput<Values, DefaultValues>
@@ -62,11 +49,11 @@ export const InstantiableZodSchemaObject = trait(
         ) {
             return new this(
                 await this.schema.parseAsync({ ...this.defaultValues, ...values }, params)
-            ) as Promise<InstanceType<Self>>
+            ) as InstanceType<Self>
         }
 
         static createEffect<
-            Self              extends Class<any, any[]> & ZodSchemaClassStatic<SchemaT, SchemaUnknownKeys, SchemaCatchall, Values, DefaultValues>,
+            Self              extends ZodSchemaClass<SchemaT, SchemaUnknownKeys, SchemaCatchall, Values, DefaultValues>,
 
             SchemaT           extends z.ZodRawShape,
             SchemaUnknownKeys extends z.UnknownKeysParam,
@@ -75,7 +62,7 @@ export const InstantiableZodSchemaObject = trait(
             Values            extends {},
             DefaultValues     extends Partial<Values>,
         >(
-            this: Self | Class<any, any[]> & ZodSchemaClassStatic<SchemaT, SchemaUnknownKeys, SchemaCatchall, Values, DefaultValues>,
+            this: Self | ZodSchemaClass<SchemaT, SchemaUnknownKeys, SchemaCatchall, Values, DefaultValues>,
 
             ...[values, params]: NewZodSchemaInstanceArgs<
                 NewZodSchemaInstanceInput<Values, DefaultValues>

src/types/ZodSchemaClass.ts

@@ -0,0 +1,39 @@
+import { AbstractClass, Class } from "type-fest"
+import { z } from "zod"
+
+
+export type ZodSchemaClass<
+    SchemaT           extends z.ZodRawShape,
+    SchemaUnknownKeys extends z.UnknownKeysParam,
+    SchemaCatchall    extends z.ZodTypeAny,
+
+    Values            extends {},
+    DefaultValues     extends Partial<Values>,
+> = (
+    Class<Values, [values: Values]> &
+    ZodSchemaClassStatic<SchemaT, SchemaUnknownKeys, SchemaCatchall, Values, DefaultValues>
+)
+
+export type ZodSchemaAbstractClass<
+    SchemaT           extends z.ZodRawShape,
+    SchemaUnknownKeys extends z.UnknownKeysParam,
+    SchemaCatchall    extends z.ZodTypeAny,
+
+    Values            extends {},
+    DefaultValues     extends Partial<Values>,
+> = (
+    AbstractClass<Values, [values: Values]> &
+    ZodSchemaClassStatic<SchemaT, SchemaUnknownKeys, SchemaCatchall, Values, DefaultValues>
+)
+
+export type ZodSchemaClassStatic<
+    SchemaT           extends z.ZodRawShape,
+    SchemaUnknownKeys extends z.UnknownKeysParam,
+    SchemaCatchall    extends z.ZodTypeAny,
+
+    Values            extends {},
+    DefaultValues     extends Partial<Values>,
+> = {
+    readonly schema:         z.ZodObject<SchemaT, SchemaUnknownKeys, SchemaCatchall, Values, Values>
+    readonly defaultValues:  DefaultValues
+}