♻️ 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/bubbles/embed.ts
+++ b/packages/models/features/blocks/bubbles/embed.ts
@ -8,7 +8,7 @@ export const embedBubbleContentSchema = z.object({
  height: z.number().or(variableStringSchema),
 })

-export const embedBubbleBlockSchema = blockBaseSchema.and(
+export const embedBubbleBlockSchema = blockBaseSchema.merge(
  z.object({
    type: z.enum([BubbleBlockType.EMBED]),
    content: embedBubbleContentSchema,