♻️ 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/text.ts
+++ b/packages/models/features/blocks/inputs/text.ts
@ -11,8 +11,8 @@ export const textInputOptionsBaseSchema = z.object({
 })

 export const textInputOptionsSchema = textInputOptionsBaseSchema
-  .and(optionBaseSchema)
-  .and(
+  .merge(optionBaseSchema)
+  .merge(
    z.object({
      isLong: z.boolean(),
    })
@ -23,7 +23,7 @@ export const defaultTextInputOptions: TextInputOptions = {
  labels: { button: defaultButtonLabel, placeholder: 'Type your answer...' },
 }

-export const textInputSchema = blockBaseSchema.and(
+export const textInputSchema = blockBaseSchema.merge(
  z.object({
    type: z.enum([InputBlockType.TEXT]),
    options: textInputOptionsSchema,