form-builder-pro 1.3.2 → 1.3.3

package/dist/index.js

@@ -4367,11 +4367,13 @@ function validationsToValidationObject(v) {
 function validationObjectToValidations(v) {
   if (!v)
     return void 0;
+  const vAny = v;
   const validations = {};
   if (v.required !== void 0)
     validations.required = v.required;
-  if (v.regex)
-    validations.pattern = v.regex;
+  const patternVal = v.regex || vAny.pattern;
+  if (patternVal)
+    validations.pattern = patternVal;
   if (v.minLength !== void 0)
     validations.minLength = v.minLength;
   if (v.maxLength !== void 0)
@@ -4380,8 +4382,9 @@ function validationObjectToValidations(v) {
     validations.min = v.min;
   if (v.max !== void 0)
     validations.max = v.max;
-  if (v.regexMessage) {
-    validations.customErrorMessages = { pattern: v.regexMessage };
+  const patternMsg = v.regexMessage || vAny.customErrorMessages?.pattern;
+  if (patternMsg) {
+    validations.customErrorMessages = { ...validations.customErrorMessages, pattern: patternMsg };
   }
   if (v.minSelected !== void 0)
     validations.minSelected = v.minSelected;
@@ -4555,6 +4558,22 @@ function transformField(field) {
     transformed.validation = { required: field.required };
     transformed.validations = { required: field.required };
   }
+  if (normalizedType === "email" && transformed.validations && !transformed.validations.pattern) {
+    const emailDefault = DEFAULT_FIELD_CONFIG.email?.validation;
+    if (Array.isArray(emailDefault)) {
+      const patternRule = emailDefault.find((r) => r.type === "pattern" && r.regex);
+      if (patternRule) {
+        transformed.validations = {
+          ...transformed.validations,
+          pattern: patternRule.regex,
+          customErrorMessages: { ...transformed.validations.customErrorMessages, pattern: patternRule.message || "Invalid email format" }
+        };
+        transformed.validation = transformed.validation || {};
+        transformed.validation.regex = patternRule.regex;
+        transformed.validation.regexMessage = patternRule.message || "Invalid email format";
+      }
+    }
+  }
   if (normalizedType === "select") {
     if (field.multiSelect !== void 0) {
       transformed.multiSelect = field.multiSelect;
@@ -4801,7 +4820,17 @@ function fieldToPayload(field) {
       payload.required = true;
     }
   }
-  payload.validation = field.validations ? validationsToValidationObject(field.validations) : convertValidationArrayToObject(field.validation);
+  const baseValidation = field.validations ? validationsToValidationObject(field.validations) : convertValidationArrayToObject(field.validation);
+  payload.validation = baseValidation;
+  const pattern = baseValidation?.regex ?? field.validations?.pattern;
+  const patternMsg = baseValidation?.regexMessage ?? field.validations?.customErrorMessages?.pattern;
+  if (baseValidation && pattern) {
+    payload.validation = {
+      ...baseValidation,
+      pattern,
+      ...patternMsg && { customErrorMessages: { pattern: patternMsg } }
+    };
+  }
   if (payload.validation?.required || payload.validations?.required) {
     payload.required = true;
   }