ZodSchemaClassBuilder work

src/ZodSchemaClass.ts

@@ -1,7 +1,8 @@
-import { Trait, TraitExpressionBuilder, expression } from "@thilawyn/traitify-ts"
+import { Trait, TraitExpressionBuilder } from "@thilawyn/traitify-ts"
 import { AbstractClass, Simplify } from "type-fest"
 import { JsonifiableObject } from "type-fest/source/jsonifiable"
 import { z } from "zod"
+import { ZodSchemaClass } from "./shapes/ZodSchemaClass"
 import { ExtendableZodSchemaObject } from "./traits/ExtendableZodSchemaObject"
 import { InstantiableZodSchemaObject } from "./traits/InstantiableZodSchemaObject"
 import { Extend, StaticMembers } from "./util"
@@ -81,7 +82,15 @@ extends TraitExpressionBuilder<Superclass, Traits> {
     }
 
     jsonifiable<
-        Superclass                 extends AbstractClass<object>,
+        Superclass                 extends ZodSchemaClass<Instance, SchemaT, SchemaUnknownKeys, SchemaCatchall, Values, DefaultValues>,
+        Instance                   extends Values,
+
+        SchemaT                    extends z.ZodRawShape,
+        SchemaUnknownKeys          extends z.UnknownKeysParam,
+        SchemaCatchall             extends z.ZodTypeAny,
+
+        Values                     extends object,
+        DefaultValues              extends Partial<Values>,
 
         JsonifiedValues            extends JsonifiableObject,
 
@@ -93,78 +102,84 @@ extends TraitExpressionBuilder<Superclass, Traits> {
         DejsonifySchemaUnknownKeys extends z.UnknownKeysParam,
         DejsonifySchemaCatchall    extends z.ZodTypeAny,
     >(
-        this: ZodSchemaClassBuilder<Superclass, Traits>,
-    ) {
+        this: ZodSchemaClassBuilder<
+            Superclass | ZodSchemaClass<Instance, SchemaT, SchemaUnknownKeys, SchemaCatchall, Values, DefaultValues>,
+            Traits
+        >,
 
-    }
-}
+        props: {
+            jsonifySchema: (props: {
+                schema: z.ZodObject<
+                    SchemaT,
+                    SchemaUnknownKeys,
+                    SchemaCatchall,
+                    Values,
+                    Values
+                >
 
-
-export function ZodSchemaClassOf<
-    Superclass        extends AbstractClass<object, []>,
-
-    SchemaT           extends z.ZodRawShape,
-    SchemaUnknownKeys extends z.UnknownKeysParam,
-    SchemaCatchall    extends z.ZodTypeAny,
-
-    Values            extends object,
-    DefaultValues     extends Partial<Values>,
->(
-    of: Superclass,
-
-    { schema, defaultValues }: {
-        schema:         z.ZodObject<SchemaT, SchemaUnknownKeys, SchemaCatchall, Values, Values>
-        defaultValues:  DefaultValues
-    },
-) {
-    class Schemas extends (of as AbstractClass<object, []>) {
-        static readonly schema        = schema
-        static readonly defaultValues = defaultValues
-
-        constructor(values: Values) {
-            super()
-            Object.assign(this, values)
-        }
-    }
-
-    return expression
-        .extends(Schemas as unknown as (
-            AbstractClass<
-                InstanceType<Superclass> &
-                Simplify<
-                    Extend<[Schemas, Values]>
-                >,
-
-                ConstructorParameters<typeof Schemas>
-            > &
-            Simplify<
-                Extend<[
-                    StaticMembers<Superclass>,
-                    StaticMembers<typeof Schemas>,
-                ]>
+                shape: SchemaT
+            }) => z.ZodObject<
+                JsonifySchemaT,
+                JsonifySchemaUnknownKeys,
+                JsonifySchemaCatchall,
+                JsonifiedValues,
+                Values
             >
-        ))
-        .expresses(
-            InstantiableZodSchemaObject,
-            ExtendableZodSchemaObject,
+
+            dejsonifySchema: (props: {
+                schema: z.ZodObject<
+                    SchemaT,
+                    SchemaUnknownKeys,
+                    SchemaCatchall,
+                    Values,
+                    Values
+                >
+
+                shape: SchemaT
+            }) => z.ZodObject<
+                DejsonifySchemaT,
+                DejsonifySchemaUnknownKeys,
+                DejsonifySchemaCatchall,
+                Values,
+                JsonifiedValues
+            >
+        },
+    ) {
+        const jsonifySchema = props.jsonifySchema({
+            schema:  this.expressionSuperclass.schema,
+            shape:   this.expressionSuperclass.schema.shape,
+        })
+        const dejsonifySchema = props.dejsonifySchema({
+            schema:  this.expressionSuperclass.schema,
+            shape:   this.expressionSuperclass.schema.shape,
+        })
+
+        class Schemas extends this.expressionSuperclass {
+            static readonly jsonifySchema   = jsonifySchema
+            static readonly dejsonifySchema = dejsonifySchema
+        }
+
+        return new ZodSchemaClassBuilder(
+            Schemas as unknown as (
+                AbstractClass<
+                    InstanceType<Superclass> &
+                    Simplify<
+                        Extend<[Schemas, Values]>
+                    >,
+
+                    ConstructorParameters<typeof Schemas>
+                > &
+                Simplify<
+                    Extend<[
+                        StaticMembers<Superclass>,
+                        StaticMembers<typeof Schemas>,
+                    ]>
+                >
+            ),
+
+            [
+                ...this.expressionTraits,
+            ],
         )
-}
-
-
-class DefaultRoot {}
-
-export function ZodSchemaClass<
-    SchemaT           extends z.ZodRawShape,
-    SchemaUnknownKeys extends z.UnknownKeysParam,
-    SchemaCatchall    extends z.ZodTypeAny,
-
-    Values            extends object,
-    DefaultValues     extends Partial<Values>,
->(
-    props: {
-        schema:         z.ZodObject<SchemaT, SchemaUnknownKeys, SchemaCatchall, Values, Values>
-        defaultValues:  DefaultValues
-    },
-) {
-    return ZodSchemaClassOf(DefaultRoot, props)
+    }
 }