From dd0610264d0418408603c1cb5ec5221a725dfdc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Valverd=C3=A9?= Date: Sat, 9 Mar 2024 00:18:05 +0100 Subject: [PATCH] CreateArgs --- src/tests.ts | 2 +- src/traits/ZodSchemaObject.ts | 14 ++++++-------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/tests.ts b/src/tests.ts index 2c15f27..e272e30 100644 --- a/src/tests.ts +++ b/src/tests.ts @@ -26,7 +26,7 @@ const exp = zodSchemaClass @exp.staticImplements class User extends exp.extends implements Implements {} -const inst = User.create({ id: 1n, name: "User" }) +const inst = User.create({ id: 1n, name: "User" }, ) // console.log(inst.name) const instEffect = User.createEffect({ id: 1n, name: "User" }) diff --git a/src/traits/ZodSchemaObject.ts b/src/traits/ZodSchemaObject.ts index 08b3680..18cc34e 100644 --- a/src/traits/ZodSchemaObject.ts +++ b/src/traits/ZodSchemaObject.ts @@ -4,12 +4,10 @@ import { z } from "zod" import { parseZodSchemaEffect } from "../util" -type ParseParamsArgs = [] | [params: Partial] - -type NewZodSchemaInstanceArgs = ( +type CreateArgs = ( HasRequiredKeys extends true - ? [values: Input, ...args: ParseParamsArgs] - : [] | [values: Input, ...args: ParseParamsArgs] + ? [values: Input, params?: Partial] + : [] | [values: Input, params?: Partial] ) @@ -55,7 +53,7 @@ export const ZodSchemaObject = < Class & ImplStatic ), - ...[values, params]: NewZodSchemaInstanceArgs + ...[values, params]: CreateArgs ) { return this .transform(this.schemaWithDefaultsValues) @@ -69,7 +67,7 @@ export const ZodSchemaObject = < Class & ImplStatic ), - ...[values, params]: NewZodSchemaInstanceArgs + ...[values, params]: CreateArgs ) { return this .transform(this.schemaWithDefaultsValues) @@ -83,7 +81,7 @@ export const ZodSchemaObject = < Class & ImplStatic ), - ...[values, params]: NewZodSchemaInstanceArgs + ...[values, params]: CreateArgs ) { return parseZodSchemaEffect( this.transform(this.schemaWithDefaultsValues),