♻️ Replace schemas with merge and discriminated unions

Closes #374

packages/models/features/blocks/inputs/choice.ts

@@ -5,7 +5,7 @@ import { optionBaseSchema, blockBaseSchema } from '../baseSchemas'
 import { defaultButtonLabel } from './constants'
 import { InputBlockType } from './enums'
 
-export const choiceInputOptionsSchema = optionBaseSchema.and(
+export const choiceInputOptionsSchema = optionBaseSchema.merge(
   z.object({
     isMultipleChoice: z.boolean(),
     buttonLabel: z.string(),
@@ -18,14 +18,14 @@ export const defaultChoiceInputOptions: ChoiceInputOptions = {
   isMultipleChoice: false,
 }
 
-export const buttonItemSchema = itemBaseSchema.and(
+export const buttonItemSchema = itemBaseSchema.merge(
   z.object({
     type: z.literal(ItemType.BUTTON),
     content: z.string().optional(),
   })
 )
 
-export const choiceInputSchema = blockBaseSchema.and(
+export const choiceInputSchema = blockBaseSchema.merge(
   z.object({
     type: z.enum([InputBlockType.CHOICE]),
     items: z.array(buttonItemSchema),

packages/models/features/blocks/inputs/date.ts

@@ -3,7 +3,7 @@ import { optionBaseSchema, blockBaseSchema } from '../baseSchemas'
 import { defaultButtonLabel } from './constants'
 import { InputBlockType } from './enums'
 
-export const dateInputOptionsSchema = optionBaseSchema.and(
+export const dateInputOptionsSchema = optionBaseSchema.merge(
   z.object({
     labels: z.object({
       button: z.string(),
@@ -15,7 +15,7 @@ export const dateInputOptionsSchema = optionBaseSchema.and(
   })
 )
 
-export const dateInputSchema = blockBaseSchema.and(
+export const dateInputSchema = blockBaseSchema.merge(
   z.object({
     type: z.enum([InputBlockType.DATE]),
     options: dateInputOptionsSchema,

packages/models/features/blocks/inputs/email.ts

@@ -5,14 +5,14 @@ import { InputBlockType } from './enums'
 import { textInputOptionsBaseSchema } from './text'
 
 export const emailInputOptionsSchema = optionBaseSchema
-  .and(textInputOptionsBaseSchema)
-  .and(
+  .merge(textInputOptionsBaseSchema)
+  .merge(
     z.object({
       retryMessageContent: z.string(),
     })
   )
 
-export const emailInputSchema = blockBaseSchema.and(
+export const emailInputSchema = blockBaseSchema.merge(
   z.object({
     type: z.enum([InputBlockType.EMAIL]),
     options: emailInputOptionsSchema,

packages/models/features/blocks/inputs/file.ts

@@ -2,7 +2,7 @@ import { z } from 'zod'
 import { optionBaseSchema, blockBaseSchema } from '../baseSchemas'
 import { InputBlockType } from './enums'
 
-export const fileInputOptionsSchema = optionBaseSchema.and(
+export const fileInputOptionsSchema = optionBaseSchema.merge(
   z.object({
     isRequired: z.boolean().optional(),
     isMultipleAllowed: z.boolean(),
@@ -16,7 +16,7 @@ export const fileInputOptionsSchema = optionBaseSchema.and(
   })
 )
 
-export const fileInputStepSchema = blockBaseSchema.and(
+export const fileInputStepSchema = blockBaseSchema.merge(
   z.object({
     type: z.literal(InputBlockType.FILE),
     options: fileInputOptionsSchema,

packages/models/features/blocks/inputs/index.ts

@@ -8,6 +8,5 @@ export * from './number'
 export * from './payment'
 export * from './phone'
 export * from './rating'
-export * from './schemas'
 export * from './text'
 export * from './url'

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,

packages/models/features/blocks/inputs/payment/schemas.ts

@@ -14,7 +14,7 @@ export type CreditCardDetails = {
   cvc: string
 }
 
-export const paymentInputOptionsSchema = optionBaseSchema.and(
+export const paymentInputOptionsSchema = optionBaseSchema.merge(
   z.object({
     provider: z.nativeEnum(PaymentProvider),
     labels: z.object({
@@ -40,7 +40,7 @@ export const paymentInputRuntimeOptionsSchema = z.object({
   publicKey: z.string(),
 })
 
-export const paymentInputSchema = blockBaseSchema.and(
+export const paymentInputSchema = blockBaseSchema.merge(
   z.object({
     type: z.enum([InputBlockType.PAYMENT]),
     options: paymentInputOptionsSchema,

packages/models/features/blocks/inputs/phone.ts

@@ -5,15 +5,15 @@ import { InputBlockType } from './enums'
 import { textInputOptionsBaseSchema } from './text'
 
 export const phoneNumberInputOptionsSchema = optionBaseSchema
-  .and(textInputOptionsBaseSchema)
-  .and(
+  .merge(textInputOptionsBaseSchema)
+  .merge(
     z.object({
       retryMessageContent: z.string(),
       defaultCountryCode: z.string().optional(),
     })
   )
 
-export const phoneNumberInputBlockSchema = blockBaseSchema.and(
+export const phoneNumberInputBlockSchema = blockBaseSchema.merge(
   z.object({
     type: z.enum([InputBlockType.PHONE]),
     options: phoneNumberInputOptionsSchema,

packages/models/features/blocks/inputs/rating.ts

@@ -10,7 +10,7 @@ export const defaultRatingInputOptions: RatingInputOptions = {
   customIcon: { isEnabled: false },
 }
 
-export const ratingInputOptionsSchema = optionBaseSchema.and(
+export const ratingInputOptionsSchema = optionBaseSchema.merge(
   z.object({
     buttonType: z.literal('Icons').or(z.literal('Numbers')),
     length: z.number(),
@@ -27,7 +27,7 @@ export const ratingInputOptionsSchema = optionBaseSchema.and(
   })
 )
 
-export const ratingInputBlockSchema = blockBaseSchema.and(
+export const ratingInputBlockSchema = blockBaseSchema.merge(
   z.object({
     type: z.literal(InputBlockType.RATING),
     options: ratingInputOptionsSchema,

packages/models/features/blocks/inputs/schemas.ts

@@ -1,42 +0,0 @@
-import { z } from 'zod'
-import { choiceInputOptionsSchema, choiceInputSchema } from './choice'
-import { dateInputOptionsSchema, dateInputSchema } from './date'
-import { emailInputOptionsSchema, emailInputSchema } from './email'
-import { numberInputOptionsSchema, numberInputSchema } from './number'
-import { paymentInputOptionsSchema, paymentInputSchema } from './payment'
-import {
-  phoneNumberInputOptionsSchema,
-  phoneNumberInputBlockSchema,
-} from './phone'
-import { ratingInputOptionsSchema, ratingInputBlockSchema } from './rating'
-import { textInputOptionsSchema, textInputSchema } from './text'
-import { fileInputOptionsSchema, fileInputStepSchema } from './file'
-import { urlInputOptionsSchema, urlInputSchema } from './url'
-import { optionBaseSchema } from '../baseSchemas'
-
-export type OptionBase = z.infer<typeof optionBaseSchema>
-
-export const inputBlockOptionsSchema = textInputOptionsSchema
-  .or(choiceInputOptionsSchema)
-  .or(emailInputOptionsSchema)
-  .or(numberInputOptionsSchema)
-  .or(urlInputOptionsSchema)
-  .or(phoneNumberInputOptionsSchema)
-  .or(dateInputOptionsSchema)
-  .or(paymentInputOptionsSchema)
-  .or(ratingInputOptionsSchema)
-  .or(fileInputOptionsSchema)
-
-export const inputBlockSchema = textInputSchema
-  .or(numberInputSchema)
-  .or(emailInputSchema)
-  .or(urlInputSchema)
-  .or(dateInputSchema)
-  .or(phoneNumberInputBlockSchema)
-  .or(choiceInputSchema)
-  .or(paymentInputSchema)
-  .or(ratingInputBlockSchema)
-  .or(fileInputStepSchema)
-
-export type InputBlock = z.infer<typeof inputBlockSchema>
-export type InputBlockOptions = z.infer<typeof inputBlockOptionsSchema>

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,

packages/models/features/blocks/inputs/url.ts

@@ -5,14 +5,14 @@ import { InputBlockType } from './enums'
 import { textInputOptionsBaseSchema } from './text'
 
 export const urlInputOptionsSchema = optionBaseSchema
-  .and(textInputOptionsBaseSchema)
-  .and(
+  .merge(textInputOptionsBaseSchema)
+  .merge(
     z.object({
       retryMessageContent: z.string(),
     })
   )
 
-export const urlInputSchema = blockBaseSchema.and(
+export const urlInputSchema = blockBaseSchema.merge(
   z.object({
     type: z.enum([InputBlockType.URL]),
     options: urlInputOptionsSchema,