From d867a3b83a52fb526b1bbfd32335f16a4723db4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Valverd=C3=A9?= <julien.valverde@mailo.com>
Date: Sun, 28 Jan 2024 16:31:44 +0100
Subject: [PATCH] Refactoring

---
 src/ZodSchemaClass.ts | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

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<Super>,
 
-            MergeInheritanceTreeWithoutOverriding<[
-                InstanceType<Super>,
-                InstanceType<TZodSchemaClassImpl>,
-            ]> &
+            MergeInheritanceTreeWithoutOverriding<
+                ClassesInstances<[
+                    Super,
+                    TZodSchemaClassImpl,
+                ]>
+            > &
 
             ConstructorParameters<TZodSchemaClassImpl>
         > &
 
-        MergeInheritanceTree<[
-            StaticMembers<Super>,
-            StaticMembers<TZodSchemaClassImpl>,
-        ]>
+        MergeInheritanceTree<
+            ClassesStaticMembers<[
+                Super,
+                TZodSchemaClassImpl,
+            ]>
+        >
     )
 }