diff --git a/src/traits/ExtendableZodSchemaObject.ts b/src/traits/ExtendableZodSchemaObject.ts index 8e5347a..10b2746 100644 --- a/src/traits/ExtendableZodSchemaObject.ts +++ b/src/traits/ExtendableZodSchemaObject.ts @@ -1,14 +1,12 @@ -import { abstract, trait } from "@thilawyn/traitify-ts" +import { trait } from "@thilawyn/traitify-ts" import { AbstractClass } from "type-fest" import { z } from "zod" import { ZodSchemaAbstractClass } from "../shapes/ZodSchemaClass" import { Extend, StaticMembers } from "../util" -export const ExtendableZodSchemaObject = trait( - abstract(), - - Super => class ExtendableZodSchemaObject extends Super { +export const ExtendableZodSchemaObject = trait + .implement(Super => class ExtendableZodSchemaObject extends Super { static extend< Super extends ZodSchemaAbstractClass, SuperInstance extends SuperValues, @@ -56,5 +54,5 @@ export const ExtendableZodSchemaObject = trait( static readonly defaultValues = defaultValues } as any } - }, -) + }) + .build() diff --git a/src/traits/InstantiableZodSchemaObject.ts b/src/traits/InstantiableZodSchemaObject.ts index 19952f8..7fd1a0a 100644 --- a/src/traits/InstantiableZodSchemaObject.ts +++ b/src/traits/InstantiableZodSchemaObject.ts @@ -1,4 +1,4 @@ -import { abstract, trait } from "@thilawyn/traitify-ts" +import { trait } from "@thilawyn/traitify-ts" import { Effect, pipe } from "effect" import { HasRequiredKeys } from "type-fest" import { z } from "zod" @@ -26,10 +26,8 @@ type NewZodSchemaInstanceArgs = ( ) -export const InstantiableZodSchemaObject = trait( - abstract(), - - Super => class InstantiableZodSchemaObject extends Super { +export const InstantiableZodSchemaObject = trait + .implement(Super => class InstantiableZodSchemaObject extends Super { static create< Instance extends Values, @@ -102,5 +100,5 @@ export const InstantiableZodSchemaObject = trait( protected static initialize() { } - }, -) + }) + .build() diff --git a/src/traits/ObservableZodSchemaObject.ts b/src/traits/ObservableZodSchemaObject.ts index acdddc9..8b6d624 100644 --- a/src/traits/ObservableZodSchemaObject.ts +++ b/src/traits/ObservableZodSchemaObject.ts @@ -1,12 +1,10 @@ -import { abstract, trait } from "@thilawyn/traitify-ts" +import { trait } from "@thilawyn/traitify-ts" -export const ObservableZodSchemaObject = trait( - abstract(), - - Super => class ObservableZodSchemaObject extends Super { +export const ObservableZodSchemaObject = trait + .implement(Super => class ObservableZodSchemaObject extends Super { constructor(...args: any[]) { super(...args) } - }, -) + }) + .build()