Merge branch 'main' into feat/signup-refactor

packages/features/bookings/lib/getBookingResponsesSchema.ts

@@ -79,7 +79,7 @@ function preprocess<T extends z.ZodType>({
             isPartialSchema,
             field,
           });
-          return newResponses;
+          return;
         }
         if (field.type === "boolean") {
           // Turn a boolean in string to a real boolean
@@ -103,7 +103,11 @@ function preprocess<T extends z.ZodType>({
           newResponses[field.name] = value;
         }
       });
-      return newResponses;
+
+      return {
+        ...parsedResponses,
+        ...newResponses,
+      };
     },
     schema.superRefine(async (responses, ctx) => {
       if (!eventType.bookingFields) {
@@ -137,8 +141,10 @@ function preprocess<T extends z.ZodType>({
           continue;
         }
 
-        if (isRequired && !isPartialSchema && !value)
+        if (isRequired && !isPartialSchema && !value) {
           ctx.addIssue({ code: z.ZodIssueCode.custom, message: m(`error_required_field`) });
+          return;
+        }
 
         if (bookingField.type === "email") {
           // Email RegExp to validate if the input is a valid email
@@ -224,6 +230,7 @@ function preprocess<T extends z.ZodType>({
               !optionValue
             ) {
               ctx.addIssue({ code: z.ZodIssueCode.custom, message: m("error_required_field") });
+              return;
             }
 
             if (optionValue) {
@@ -248,14 +255,17 @@ function preprocess<T extends z.ZodType>({
           continue;
         }
 
-        throw new Error(`Can't parse unknown booking field type: ${bookingField.type}`);
+        ctx.addIssue({
+          code: z.ZodIssueCode.custom,
+          message: `Can't parse unknown booking field type: ${bookingField.type}`,
+        });
       }
     })
   );
   if (isPartialSchema) {
     // Query Params can be completely invalid, try to preprocess as much of it in correct format but in worst case simply don't prefill instead of crashing
-    return preprocessed.catch(() => {
-      console.error("Failed to preprocess query params, prefilling will be skipped");
+    return preprocessed.catch(function (res?: { error?: unknown[] }) {
+      console.error("Failed to preprocess query params, prefilling will be skipped", res?.error);
       return {};
     });
   }

packages/features/form-builder/schema.ts

@@ -5,6 +5,8 @@ import { getValidRhfFieldName } from "@calcom/lib/getValidRhfFieldName";
 import { fieldTypesConfigMap } from "./fieldTypes";
 import { getVariantsConfig, preprocessNameFieldDataWithVariant } from "./utils";
 
+const nonEmptyString = () => z.string().refine((value: string) => value.trim().length > 0);
+
 const fieldTypeEnum = z.enum([
   "name",
   "text",
@@ -289,7 +291,7 @@ export const fieldTypesSchemaMap: Partial<
       if (fields.length === 1) {
         const field = fields[0];
         if (variantSupportedFields.includes(field.type)) {
-          const schema = stringSchema;
+          const schema = field.required && !isPartialSchema ? nonEmptyString() : stringSchema;
           if (!schema.safeParse(response).success) {
             ctx.addIssue({ code: z.ZodIssueCode.custom, message: m("Invalid string") });
           }
@@ -299,7 +301,7 @@ export const fieldTypesSchemaMap: Partial<
         }
       }
       fields.forEach((subField) => {
-        const schema = stringSchema;
+        const schema = subField.required && !isPartialSchema ? nonEmptyString() : stringSchema;
         if (!variantSupportedFields.includes(subField.type)) {
           throw new Error(`Unsupported field.type with variants: ${subField.type}`);
         }

packages/prisma/zod-utils.ts

@@ -22,8 +22,6 @@ import { isSupportedTimeZone } from "@calcom/lib/date-fns";
 import { slugify } from "@calcom/lib/slugify";
 import { EventTypeCustomInputType } from "@calcom/prisma/enums";
 
-export const nonEmptyString = () => z.string().refine((value: string) => value.trim().length > 0);
-
 // Let's not import 118kb just to get an enum
 export enum Frequency {
   YEARLY = 0,
@@ -115,14 +113,15 @@ export type BookingFieldType = FormBuilderFieldType;
 
 // Validation of user added bookingFields' responses happen using `getBookingResponsesSchema` which requires `eventType`.
 // So it is a dynamic validation and thus entire validation can't exist here
+// Note that this validation runs to validate prefill params as well, so it should consider that partial values can be there. e.g. `name` might be empty string
 export const bookingResponses = z
   .object({
     email: z.string(),
     //TODO: Why don't we move name out of bookingResponses and let it be handled like user fields?
     name: z.union([
-      nonEmptyString(),
+      z.string(),
       z.object({
-        firstName: nonEmptyString(),
+        firstName: z.string(),
         lastName: z.string().optional(),
       }),
     ]),