From aefca6657b54ccca9badf05d6d347b4a674e0433 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Valverd=C3=A9?= <julien.valverde@mailo.com>
Date: Wed, 28 Feb 2024 04:53:33 +0100
Subject: [PATCH] ZodSchemaObject fix

---
 src/builders/ZodSchemaClassBuilder.ts | 2 +-
 src/traits/ZodSchemaObject.ts         | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/builders/ZodSchemaClassBuilder.ts b/src/builders/ZodSchemaClassBuilder.ts
index 0445816..ddadfde 100644
--- a/src/builders/ZodSchemaClassBuilder.ts
+++ b/src/builders/ZodSchemaClassBuilder.ts
@@ -56,7 +56,7 @@ extends TraitExpressionBuilder<Superclass, Traits> {
                 StaticMembers<Super>
             ),
 
-            [...this.expressionTraits, ZodSchemaObject(schema, schemaWithDefaultValues)],
+            [...this.expressionTraits, ZodSchemaObject(schema, schemaWithDefaultValues(schema))],
         )
     }
 
diff --git a/src/traits/ZodSchemaObject.ts b/src/traits/ZodSchemaObject.ts
index 48b2f44..860c68a 100644
--- a/src/traits/ZodSchemaObject.ts
+++ b/src/traits/ZodSchemaObject.ts
@@ -25,15 +25,12 @@ export const ZodSchemaObject = <
     Values                             extends object,
     PartialValues                      extends Partial<Values>,
 >(
-    schema: z.ZodObject<SchemaT, SchemaUnknownKeys, SchemaCatchall, Values, Values>,
-
-    schemaWithDefaultValues: (
-        schema: z.ZodObject<SchemaT, SchemaUnknownKeys, SchemaCatchall, Values, Values>
-    ) => z.ZodObject<SchemaWithDefaultValuesT, SchemaWithDefaultValuesUnknownKeys, SchemaWithDefaultValuesCatchall, Values, PartialValues>,
+    schema:                   z.ZodObject<SchemaT, SchemaUnknownKeys, SchemaCatchall, Values, Values>,
+    schemaWithDefaultValues:  z.ZodObject<SchemaWithDefaultValuesT, SchemaWithDefaultValuesUnknownKeys, SchemaWithDefaultValuesCatchall, Values, PartialValues>,
 ) => trait
     .implement(Super => class ZodSchemaObject extends Super {
         static readonly schema                   = schema
-        static readonly schemaWithDefaultsValues = schemaWithDefaultValues(schema)
+        static readonly schemaWithDefaultsValues = schemaWithDefaultValues
 
         static instantiationTransform<
             Instance    extends Values,