Thilawyn/zod-schema-class
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

0.1.3 #4

Merged
Thilawyn merged 74 commits from next into master 2024-03-24 22:24:25 +01:00
Conversation 0 Commits 74 Files Changed 35 +27 -63
2 changed files with 27 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 89ed8d4f44 - Show all commits

73
src/tests.ts
View File

@@ -2,85 +2,36 @@ import { Implements } from "@thilawyn/traitify-ts"
import { z } from "zod" import { z } from "zod"
import { ZodSchemaClass } from "./ZodSchemaClass" import { ZodSchemaClass } from "./ZodSchemaClass"
import { MobXObservableZodSchemaObject } from "./traits/MobXObservableZodSchemaObject" import { MobXObservableZodSchemaObject } from "./traits/MobXObservableZodSchemaObject"
import { stripZodObjectDefaults } from "./util"
// const exp = zodSchemaClass const userExp = ZodSchemaClass(
// .schema({
// schema: z.object({
// /** User ID */
// id: z.bigint(),
// /** Username */
// name: z.string(),
// }),
// schemaWithDefaultValues: s => s.extend({
// id: s.shape.id.default(-1n),
// }),
// })
// .jsonifiable({
// jsonifySchema: s => s.extend({
// id: jsonify.bigint(s.shape.id)
// }),
// dejsonifySchema: s => s.extend({
// id: dejsonify.bigint(s.shape.id)
// }),
// })
// .toExpression()
// .expresses(MobXObservableZodSchemaObject)
// .build()
const exp = ZodSchemaClass(
z.object({ z.object({
/** User ID */ /** User ID */
id: z.bigint().default(-1n), id: z.bigint().default(-1n),
/** Username */ /** Username */
name: z.string(), name: z.string(),
/** Role */
role: z.enum(["User", "Moderator", "Admin"]).default("User"),
}) })
) )
.expresses(MobXObservableZodSchemaObject) .expresses(MobXObservableZodSchemaObject)
.build() .build()
const test = stripZodObjectDefaults( @userExp.staticImplements
z.object({ class User extends userExp.extends implements Implements<typeof userExp> {}
/** User ID */
id: z.bigint().default(-1n),
/** Username */
name: z.string(),
})
)
@exp.staticImplements
class User extends exp.extends implements Implements<typeof exp> {}
const inst = User.create({ id: 1n, name: "User" }) const inst = User.create({ id: 1n, name: "User" })
// console.log(inst.name) // console.log(inst.name)
const instEffect = User.createEffect({ id: 1n, name: "User" }) const instEffect = User.createEffect({ id: 1n, name: "User" })
// const jsonifiedUser = await inst.jsonifyPromise()
// const dejsonifiedInst = await User.dejsonifyPromise(jsonifiedUser)
const adminUserExp = User.extend(s => s.extend({
role: z.literal("Admin").default("Admin")
})).build()
// const AdminUserProto = User.extend() @adminUserExp.staticImplements
// .schema({ class AdminUser extends adminUserExp.extends implements Implements<typeof adminUserExp> {}
// 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 admin = AdminUser.create({ id: 2n, name: "Admin" })
// class AdminUser extends AdminUserProto.toClass() {}
// const subInst = await AdminUser.createPromise({ id: 2n, prout: "" })
// console.log(subInst)

17
src/traits/ExtendableZodSchemaObject.ts
View File

@@ -1,6 +1,7 @@
import { ImplStatic, expression } from "@thilawyn/traitify-ts" import { ImplStatic, expression } from "@thilawyn/traitify-ts"
import { AbstractClass } from "type-fest" import { AbstractClass } from "type-fest"
import { z } from "zod" import { z } from "zod"
import { Extend, StaticMembers } from "../util"
import { ZodSchemaObject } from "./ZodSchemaObject" import { ZodSchemaObject } from "./ZodSchemaObject"
@@ -17,7 +18,8 @@ export const ExtendableZodSchemaObject = <
.subtrait() .subtrait()
.implement(Super => class ExtendableZodSchemaObjectImpl extends Super { .implement(Super => class ExtendableZodSchemaObjectImpl extends Super {
static extend< static extend<
Self extends AbstractClass<ExtendableZodSchemaObjectImpl> & ImplStatic<typeof ExtendableZodSchemaObjectImpl>, Self extends AbstractClass<ExtendableZodSchemaObjectImpl & Values, [values: Values]>
& ImplStatic<typeof ExtendableZodSchemaObjectImpl>,
ExtendedT extends z.ZodRawShape, ExtendedT extends z.ZodRawShape,
ExtendedCatchall extends z.ZodTypeAny, ExtendedCatchall extends z.ZodTypeAny,
@@ -31,7 +33,18 @@ export const ExtendableZodSchemaObject = <
) => z.ZodObject<ExtendedT, "strip", ExtendedCatchall, ExtendedValues, ExtendedPartialValues>, ) => z.ZodObject<ExtendedT, "strip", ExtendedCatchall, ExtendedValues, ExtendedPartialValues>,
) { ) {
return expression return expression
.extends(this) .extends(
this as unknown as (
AbstractClass<
Omit<
Extend<[InstanceType<Self>, ExtendedValues]>,
keyof ExtendableZodSchemaObjectImpl
>,
[values: ExtendedValues]
> &
Omit<StaticMembers<Self>, keyof ImplStatic<typeof ExtendableZodSchemaObjectImpl>>
)
)
.expresses(ExtendableZodSchemaObject(schemaWithDefaults(this.schemaWithDefaults))) .expresses(ExtendableZodSchemaObject(schemaWithDefaults(this.schemaWithDefaults)))
} }
}) })