src/ZodSchemaClass.ts

@@ -1,5 +1,5 @@
 import { expression } from "@thilawyn/traitify-ts"
-import { AbstractClass } from "type-fest"
+import { AbstractClass, Simplify } from "type-fest"
 import { z } from "zod"
 import { ExtendableZodSchemaObject } from "./traits/ExtendableZodSchemaObject"
 import { InstantiableZodSchemaObject } from "./traits/InstantiableZodSchemaObject"
@@ -36,18 +36,19 @@ export function ZodSchemaClassOf<
     return expression
         .extends(Schemas as unknown as (
             AbstractClass<
-                InstanceType<typeof of> &
+                InstanceType<Superclass> &
-                Extend<[
+                Simplify<
-                    InstanceType<typeof Schemas>,
+                    Extend<[Schemas, Values]>
-                    Values,
+                >,
-                ]>,
 
                 ConstructorParameters<typeof Schemas>
             > &
+            Simplify<
                 Extend<[
-                StaticMembers<typeof of>,
+                    StaticMembers<Superclass>,
                     StaticMembers<typeof Schemas>,
                 ]>
+            >
         ))
         .expresses(
             InstantiableZodSchemaObject,

src/tests.ts

@@ -5,6 +5,7 @@ import { ZodSchemaClass } from "./ZodSchemaClass"
 
 const TestExp = ZodSchemaClass({
     schema: z.object({
+        /** Object ID */
         id: z.bigint(),
         name: z.string(),
     }),