@punks/backend-entity-manager 0.0.411 → 0.0.413

package/dist/cjs/types/utils/validators.d.ts

@@ -5,6 +5,7 @@ export declare const fieldTextValidator: <TSheetItem>(item: TSheetItem, selector
     minLength?: number;
     maxLength?: number;
     regex?: RegExp;
+    regexErrorCode?: string;
 }) => EntryValidationResult;
 export declare const fieldEmailValidator: <TSheetItem>(item: TSheetItem, selector: (item: TSheetItem) => any, params: {
     required?: boolean;

package/dist/esm/index.js

@@ -40975,9 +40975,11 @@ const fieldTextValidator = (item, selector, params) => {
     const length = typeof value === "string" ? value.length : 0;
     const isMinLengthValid = length >= (params.minLength ?? 0);
     const isMaxLengthValid = length <= (params.maxLength ?? Infinity);
-    const isRegexValid = (typeof value === "string" && params.regex?.test(value)) ?? true;
+    const isRegexValid = ((!params.required && !value) ||
+        (typeof value === "string" && params.regex?.test(value))) ??
+        true;
     return {
-        isValid: isMinLengthValid && isMaxLengthValid && isRegexValid,
+        isValid: isMinLengthValid && isMaxLengthValid && isRegexValid && isRequiredValid,
         validationErrors: [
             ...(isRequiredValid ? [] : [{ errorCode: "required" }]),
             ...(isMinLengthValid
@@ -40996,7 +40998,9 @@ const fieldTextValidator = (item, selector, params) => {
                         payload: { current: length, expected: params.maxLength },
                     },
                 ]),
-            ...(isRegexValid ? [] : [{ errorCode: "regex" }]),
+            ...(isRegexValid
+                ? []
+                : [{ errorCode: params.regexErrorCode ?? "regex" }]),
         ],
     };
 };
@@ -41004,6 +41008,7 @@ const fieldEmailValidator = (item, selector, params) => {
     return fieldTextValidator(item, selector, {
         ...params,
         regex: /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/,
+        regexErrorCode: "email",
     });
 };
 const fieldOptionValidator = (item, selector, { availableOptions, required, }) => {