diff --git a/src/ZodSchemaClass.ts b/src/ZodSchemaClass.ts index bb1e85d..6fab497 100644 --- a/src/ZodSchemaClass.ts +++ b/src/ZodSchemaClass.ts @@ -2,7 +2,7 @@ import { Effect, pipe } from "effect" import { AbstractClass, Class as ConcreteClass, Opaque } from "type-fest" import { z } from "zod" import { DefinedDefaultValuesTag, NewZodSchemaInstanceArgs, NewZodSchemaInstanceInput, TZodSchemaClass } from "." -import { Class, GetClassType, MergeInheritanceTree, MergeInheritanceTreeWithoutOverriding, StaticMembers, parseZodTypeEffect } from "./util" +import { Class, ClassesInstances, ClassesStaticMembers, GetClassType, MergeInheritanceTree, MergeInheritanceTreeWithoutOverriding, parseZodTypeEffect } from "./util" export function ZodSchemaClassOf< @@ -109,18 +109,22 @@ export function ZodSchemaClassOf< Class< GetClassType, - MergeInheritanceTreeWithoutOverriding<[ - InstanceType, - InstanceType, - ]> & + MergeInheritanceTreeWithoutOverriding< + ClassesInstances<[ + Super, + TZodSchemaClassImpl, + ]> + > & ConstructorParameters > & - MergeInheritanceTree<[ - StaticMembers, - StaticMembers, - ]> + MergeInheritanceTree< + ClassesStaticMembers<[ + Super, + TZodSchemaClassImpl, + ]> + > ) }