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

Fixed InstantiableZodSchemaObject
Some checks failed
continuous-integration/drone/push Build is failing
Details

Browse Source
This commit is contained in:
Julien Valverdé
2024-02-08 02:50:16 +01:00
parent ae4abf6b9c
commit e1c298c08a
2 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/tests.ts
View File

@@ -11,23 +11,32 @@ class Test extends ZodSchemaClass({
defaultValues: { id: -1n }, defaultValues: { id: -1n },
}) {} }) {}
const Test2 = ZodSchemaClass({
schema: z.object({
id: z.bigint(),
name: z.string(),
}),
defaultValues: { id: -1n },
})
Test.defaultValues Test.defaultValues
const inst = await Test.createPromise({ id: 1n, name: "" }) const inst = Test.create({ id: 1n, name: "" })
class SubTest extends Test.extend({ // class SubTest extends Test.extend({
schema: ({ schema }) => schema.extend({ // schema: ({ schema }) => schema.extend({
prout: z.string() // prout: z.string()
}), // }),
defaultValues: defaultValues => defineDefaultValues({ // defaultValues: defaultValues => defineDefaultValues({
...defaultValues // ...defaultValues
}), // }),
}) {} // }) {}
const subInst = await SubTest.createPromise({ name: "", prout: "" }) // const subInst = await SubTest.createPromise({ name: "", prout: "" })
console.log(subInst) // console.log(subInst)
// class ChildTest extends Test {} // class ChildTest extends Test {}

8
src/traits/InstantiableZodSchemaObject.ts
View File

@@ -6,7 +6,7 @@ import { NewZodSchemaInstanceArgs, NewZodSchemaInstanceInput } from ".."
import { parseZodTypeEffect } from "../util" import { parseZodTypeEffect } from "../util"
type ZodSchemaClassStatic< export type ZodSchemaClassStatic<
SchemaT extends z.ZodRawShape, SchemaT extends z.ZodRawShape,
SchemaUnknownKeys extends z.UnknownKeysParam, SchemaUnknownKeys extends z.UnknownKeysParam,
SchemaCatchall extends z.ZodTypeAny, SchemaCatchall extends z.ZodTypeAny,
@@ -33,7 +33,7 @@ export const InstantiableZodSchemaObject = trait(
Values extends {}, Values extends {},
DefaultValues extends Partial<Values>, DefaultValues extends Partial<Values>,
>( >(
this: Self, this: Self | Class<any, any[]> & ZodSchemaClassStatic<SchemaT, SchemaUnknownKeys, SchemaCatchall, Values, DefaultValues>,
...[values, params]: NewZodSchemaInstanceArgs< ...[values, params]: NewZodSchemaInstanceArgs<
NewZodSchemaInstanceInput<Values, DefaultValues> NewZodSchemaInstanceInput<Values, DefaultValues>
@@ -54,7 +54,7 @@ export const InstantiableZodSchemaObject = trait(
Values extends {}, Values extends {},
DefaultValues extends Partial<Values>, DefaultValues extends Partial<Values>,
>( >(
this: Self, this: Self | Class<any, any[]> & ZodSchemaClassStatic<SchemaT, SchemaUnknownKeys, SchemaCatchall, Values, DefaultValues>,
...[values, params]: NewZodSchemaInstanceArgs< ...[values, params]: NewZodSchemaInstanceArgs<
NewZodSchemaInstanceInput<Values, DefaultValues> NewZodSchemaInstanceInput<Values, DefaultValues>
@@ -75,7 +75,7 @@ export const InstantiableZodSchemaObject = trait(
Values extends {}, Values extends {},
DefaultValues extends Partial<Values>, DefaultValues extends Partial<Values>,
>( >(
this: Self, this: Self | Class<any, any[]> & ZodSchemaClassStatic<SchemaT, SchemaUnknownKeys, SchemaCatchall, Values, DefaultValues>,
...[values, params]: NewZodSchemaInstanceArgs< ...[values, params]: NewZodSchemaInstanceArgs<
NewZodSchemaInstanceInput<Values, DefaultValues> NewZodSchemaInstanceInput<Values, DefaultValues>