0.1.2 (#3)

Co-authored-by: Julien Valverdé <julien.valverde@mailo.com>
Reviewed-on: https://git.jvalver.de/Thilawyn/zod-schema-class/pulls/3

src/tests.ts

@@ -1,63 +1,64 @@
-import { pipeInto } from "ts-functional-pipe"
+import { Implements } from "@thilawyn/traitify-ts"
 import { z } from "zod"
-import { defineDefaultValues, extendSchemableClass, makeSchemableClass, newSchemable } from "."
-import { dejsonifyBigIntSchema, dejsonifySchemable, jsonifyBigIntSchema, makeJsonifiableSchemableClass } from "./jsonifiable"
-import { makeSchemableClassObservable } from "./observable"
+import { zodSchemaClass } from "./builders/ZodSchemaClassBuilder"
+import { dejsonify, jsonify } from "./schema/jsonifiable"
+import { MobXObservableZodSchemaObject } from "./traits/MobXObservableZodSchemaObject"
 
 
-const UserLevel = z.enum(["User", "Admin"])
-
-
-class User extends pipeInto(
-    makeSchemableClass({
+const exp = zodSchemaClass
+    .schema({
         schema: z.object({
-            id:     z.bigint(),
-            name:   z.string(),
-            level:  UserLevel,
+            /** User ID */
+            id: z.bigint(),
+
+            /** Username */
+            name: z.string(),
         }),
 
-        defaultValues: defineDefaultValues({
-            level: "User" as const
+        schemaWithDefaultValues: s => s.extend({
+            id: s.shape.id.default(-1n),
         }),
-    }),
-
-    v => makeSchemableClassObservable(v),
-
-    v => makeJsonifiableSchemableClass(v, {
-        jsonifySchema: ({ schema, shape }) => schema.extend({
-            id: jsonifyBigIntSchema(shape.id)
+    })
+    .jsonifiable({
+        jsonifySchema: s => s.extend({
+            id: jsonify.bigint(s.shape.id)
         }),
 
-        dejsonifySchema: ({ schema, shape }) => schema.extend({
-            id: dejsonifyBigIntSchema(shape.id)
+        dejsonifySchema: s => s.extend({
+            id: dejsonify.bigint(s.shape.id)
         }),
-    }),
-) {}
-
-User.schema
+    })
+    .toExpression()
+    .expresses(MobXObservableZodSchemaObject)
+    .build()
 
 
-const user1 = newSchemable(User, { id: 1n, name: "User" })
-user1.schema
+@exp.staticImplements
+class User extends exp.extends implements Implements<typeof exp> {}
 
-const jsonifiedUser1 = user1.jsonify()
-console.log(jsonifiedUser1)
-console.log(dejsonifySchemable(User, jsonifiedUser1))
+const inst = User.create({ id: 1n, name: "User" })
+// console.log(inst.name)
+const instEffect = User.createEffect({ id: 1n, name: "User" })
+
+const jsonifiedUser = await inst.jsonifyPromise()
+const dejsonifiedInst = await User.dejsonifyPromise(jsonifiedUser)
 
 
-const UserWithPhone = extendSchemableClass(User, {
-    schema: ({ schema }) => schema.extend({
-        phone: z.string()
-    }),
-
-    defaultValues: defaultValues => defineDefaultValues({
-        ...defaultValues,
-        phone: "+33600000000",
-    }),
-})
-
-UserWithPhone.defaultValues
+// const AdminUserProto = User.extend()
+//     .schema({
+//         schema: s => s.extend({
+//             name: z.literal("Admin"),
+//             prout: z.string(),
+//         }),
+//         defaultValues: v => ({ ...v, name: "Admin" as const }),
+//     })
+//     .jsonifiable({
+//         jsonifySchema: (s, json) => json.extend({
+//             prout: s.shape.prout
+//         })
+//     })
 
 
-// const user2 = newSchemable(UserWithPhone, { id: 1n, name: "User" })
-// console.log(user2.jsonify())
+// class AdminUser extends AdminUserProto.toClass() {}
+// const subInst = await AdminUser.createPromise({ id: 2n, prout: "" })
+// console.log(subInst)