♻️ 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/inputs/number.ts
+++ b/packages/models/features/blocks/inputs/number.ts
@ -5,8 +5,8 @@ import { InputBlockType } from './enums'
 import { textInputOptionsBaseSchema } from './text'

 export const numberInputOptionsSchema = optionBaseSchema
-  .and(textInputOptionsBaseSchema)
-  .and(
+  .merge(textInputOptionsBaseSchema)
+  .merge(
    z.object({
      min: z.number().optional(),
      max: z.number().optional(),
@ -14,7 +14,7 @@ export const numberInputOptionsSchema = optionBaseSchema
    })
  )

-export const numberInputSchema = blockBaseSchema.and(
+export const numberInputSchema = blockBaseSchema.merge(
  z.object({
    type: z.enum([InputBlockType.NUMBER]),
    options: numberInputOptionsSchema,