Refactoring

2024-01-16 11:47:48 +01:00
parent e83c3a77be
commit 892ee29060
5 changed files with 74 additions and 43 deletions
--- a/src/makeSchemableClass.ts
+++ b/src/makeSchemableClass.ts
@@ -21,15 +21,17 @@ export function makeSchemableClassFrom<
 >(
    extend: C,

-    schema: z.ZodObject<
-        SchemaT,
-        SchemaUnknownKeys,
-        SchemaCatchall,
-        Values,
-        Values
-    >,
+    { schema, defaultValues }: {
+        schema: z.ZodObject<
+            SchemaT,
+            SchemaUnknownKeys,
+            SchemaCatchall,
+            Values,
+            Values
+        >

-    defaultValues: DefaultValues,
+        defaultValues: DefaultValues
+    },
 ) {
    type Class<T, Arguments extends unknown[]> = (
        C extends ConcreteClass<any>
@@ -77,15 +79,17 @@ export function makeSchemableClass<
    Values            extends {},
    DefaultValues     extends Partial<Values>,
 >(
-    schema: z.ZodObject<
-        SchemaT,
-        SchemaUnknownKeys,
-        SchemaCatchall,
-        Values,
-        Values
-    >,
+    props: {
+        schema: z.ZodObject<
+            SchemaT,
+            SchemaUnknownKeys,
+            SchemaCatchall,
+            Values,
+            Values
+        >

-    defaultValues: DefaultValues,
+        defaultValues: DefaultValues
+    }
 ) {
-    return makeSchemableClassFrom(Object, schema, defaultValues)
+    return makeSchemableClassFrom(Object, props)
 }