♻️ Replace schemas with merge and discriminated unions

Closes #374
2023-03-14 16:42:12 +01:00
parent ff09814ead
commit d154c4e2f2
52 changed files with 3217 additions and 4328 deletions
--- a/packages/models/features/blocks/logic/condition.ts
+++ b/packages/models/features/blocks/logic/condition.ts
@ -30,14 +30,14 @@ const conditionContentSchema = z.object({
  comparisons: z.array(comparisonSchema),
 })

-export const conditionItemSchema = itemBaseSchema.and(
+export const conditionItemSchema = itemBaseSchema.merge(
  z.object({
    type: z.literal(ItemType.CONDITION),
    content: conditionContentSchema,
  })
 )

-export const conditionBlockSchema = blockBaseSchema.and(
+export const conditionBlockSchema = blockBaseSchema.merge(
  z.object({
    type: z.enum([LogicBlockType.CONDITION]),
    items: z.array(conditionItemSchema),