♻️ 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/integrations/googleAnalytics.ts
+++ b/packages/models/features/blocks/integrations/googleAnalytics.ts
@ -10,7 +10,7 @@ export const googleAnalyticsOptionsSchema = z.object({
  value: z.number().optional(),
 })

-export const googleAnalyticsBlockSchema = blockBaseSchema.and(
+export const googleAnalyticsBlockSchema = blockBaseSchema.merge(
  z.object({
    type: z.enum([IntegrationBlockType.GOOGLE_ANALYTICS]),
    options: googleAnalyticsOptionsSchema,