From 6ee9337426b266131348bb8e2c5b02df5bb2a10c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Valverd=C3=A9?= <julien.valverde@mailo.com>
Date: Tue, 6 Feb 2024 05:24:00 +0100
Subject: [PATCH] Trait work

---
 bun.lockb             | Bin 160800 -> 160800 bytes
 package.json          |   2 +-
 src/ZodSchemaClass.ts |  51 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 52 insertions(+), 1 deletion(-)

diff --git a/bun.lockb b/bun.lockb
index 9deffd24124341322b68eff9f5b8e66aa557f043..c13519a2388570810df42e364bd8b2bfd96b2ec2 100755
GIT binary patch
delta 162
zcmV;T0A2r}=n0_c36L%zT0O=jmEX#*4I4zzR`CmS>woH9yceyGVh;mmh|R^1u}(@H
zlUOY<v&bB^gFp}ar%?<G6E}q~S!){9{I83!-x})Edo~U$6&Pft@lj7>x>nJDnf`ib
zDA#fy^a^wX#bM`%D!sx;TrwG6eX)bRptrrC0q7M0F}J3+0WLrjF)ws-VQF+}W_c}i
Qb1g6~F)lH;=k@_PeSWY<djJ3c

delta 162
zcmV;T0A2r}=n0_c36L%zAhHTRLvFI>cWpq`d&{>5I<ej@CWwQ<oFw{_O%t8Uu}(@H
zlb9+nv&bB^gFvkWdEOqY!Ko;~yK6FOQ3gnjpl`ON@qBe!H?l7k8W3RggwJR!PBGJa
zVGppS|F=hVUzue74abaji3tH<OuK`<ptrrC0q7M0Ft?_*0WLrjFfVj+VQF+}W_c}i
Qb1g6~F)lE-=k@_PeV}Sb#{d8T

diff --git a/package.json b/package.json
index 6f2f43d..0cc9792 100644
--- a/package.json
+++ b/package.json
@@ -48,7 +48,7 @@
     "clean:node": "rm -rf node_modules"
   },
   "dependencies": {
-    "@thilawyn/traitify-ts": "^0.1.0",
+    "@thilawyn/traitify-ts": "^0.1.1",
     "decimal.js": "^10.4.3",
     "effect": "^2.2.3",
     "lodash-es": "^4.17.21",
diff --git a/src/ZodSchemaClass.ts b/src/ZodSchemaClass.ts
index 3b79414..8dd08e1 100644
--- a/src/ZodSchemaClass.ts
+++ b/src/ZodSchemaClass.ts
@@ -3,6 +3,57 @@ import { AbstractClass, Class as ConcreteClass, Opaque } from "type-fest"
 import { z } from "zod"
 import { DefinedDefaultValuesTag, NewZodSchemaInstanceArgs, NewZodSchemaInstanceInput, TZodSchemaClass } from "."
 import { Class, ClassesInstances, ClassesStaticMembers, GetClassType, MergeInheritanceTree, MergeInheritanceTreeWithoutOverriding, parseZodTypeEffect } from "./util"
+import { abstract, trait } from "@thilawyn/traitify-ts"
+
+
+export const InstantiableZodSchemaObject = <
+    SchemaT           extends z.ZodRawShape,
+    SchemaUnknownKeys extends z.UnknownKeysParam,
+    SchemaCatchall    extends z.ZodTypeAny,
+
+    Values            extends {},
+    DefaultValues     extends Partial<Values>,
+>() => trait(
+    abstract(),
+
+    Super => class InstantiableZodSchemaObject extends Super {
+        static create(
+            ...[values, params]: NewZodSchemaInstanceArgs<
+                NewZodSchemaInstanceInput<Values, DefaultValues>
+            >
+        ) {
+            return new this(
+                this.schema.parse({ ...this.defaultValues, ...values }, params)
+            )
+        }
+
+        static async createPromise(
+            ...[values, params]: NewZodSchemaInstanceArgs<
+                NewZodSchemaInstanceInput<Values, DefaultValues>
+            >
+        ) {
+            return new this(
+                await this.schema.parseAsync({ ...this.defaultValues, ...values }, params)
+            )
+        }
+
+        static createEffect(
+            ...[values, params]: NewZodSchemaInstanceArgs<
+                NewZodSchemaInstanceInput<Values, DefaultValues>
+            >
+        ) {
+            return pipe(
+                parseZodTypeEffect(
+                    this.schema,
+                    { ...this.defaultValues, ...values },
+                    params,
+                ),
+
+                Effect.map(values => new this(values)),
+            )
+        }
+    },
+)
 
 
 export function ZodSchemaClassOf<