quantique-field-validator 1.0.0 → 1.0.1

package/index.js

@@ -1,3 +1,5 @@
+const { parsePhoneNumberFromString } = require("libphonenumber-js/max");
+
 /**
  * Enhanced dynamic validator with custom function support
  * @param {string} value - The value to validate
@@ -13,6 +15,7 @@ const dynamicValidator = (value, type, rules = {}, customValidator = null) => {
     minLength: `Minimum length should be ${rules.minLength}`,
     maxLength: `Maximum length should be ${rules.maxLength}`,
     invalid: `Invalid ${type}`,
+    noValidation: `No validation exist for ${type}`,
     custom: "Validation failed",
     customValidation:
       rules.errorMessages?.customValidation || "Custom validation failed",
@@ -87,8 +90,10 @@ const dynamicValidator = (value, type, rules = {}, customValidator = null) => {
       return validateAddress(trimmedValue, rules, defaultErrorMessages);
     case "password":
       return validatePassword(trimmedValue, rules, defaultErrorMessages);
-    default:
+    case "custom":
       return validateCustom(trimmedValue, rules, defaultErrorMessages);
+    default:
+      return { isValid: false, error: defaultErrorMessages?.noValidation };
   }
 };
 
@@ -171,37 +176,92 @@ const validateEmail = (value, rules, defaultErrorMessages) => {
 };
 
 // Mobile validation
-const validateMobile = (value, rules, defaultErrorMessages) => {
+
+// const validateMobile = (value, rules, defaultErrorMessages) => {
+//   // Check length constraints
+//   if (rules?.minLength && value.length < rules?.minLength) {
+//     return {
+//       isValid: false,
+//       error: rules?.errorMessages?.minLength || defaultErrorMessages.minLength,
+//     };
+//   }
+
+//   if (rules?.maxLength && value.length > rules?.maxLength) {
+//     return {
+//       isValid: false,
+//       error: rules?.errorMessages?.maxLength || defaultErrorMessages.maxLength,
+//     };
+//   }
+
+//   // Check against custom regex if provided
+//   if (rules?.regex && !new RegExp(rules?.regex).test(value)) {
+//     return {
+//       isValid: false,
+//       error: rules?.errorMessages?.invalid || defaultErrorMessages.invalid,
+//     };
+//   }
+
+//   // Default mobile regex (accepts numbers, +, -, and spaces)
+//   const mobileRegex = /^[\d\s+\-()]*$/;
+//   if (!mobileRegex.test(value)) {
+//     return {
+//       isValid: false,
+//       error:
+//         rules?.errorMessages?.invalid || "Please enter a valid mobile number",
+//     };
+//   }
+
+//   return { isValid: true, error: "" };
+// };
+
+const validateMobile = (value, rules = {}, defaultErrorMessages = {}) => {
   // Check length constraints
-  if (rules?.minLength && value.length < rules?.minLength) {
+  if (rules.minLength && value.length < rules.minLength) {
     return {
       isValid: false,
-      error: rules?.errorMessages?.minLength || defaultErrorMessages.minLength,
+      error: rules.errorMessages?.minLength || defaultErrorMessages.minLength,
     };
   }
 
-  if (rules?.maxLength && value.length > rules?.maxLength) {
+  if (rules.maxLength && value.length > rules.maxLength) {
     return {
       isValid: false,
-      error: rules?.errorMessages?.maxLength || defaultErrorMessages.maxLength,
+      error: rules.errorMessages?.maxLength || defaultErrorMessages.maxLength,
     };
   }
 
-  // Check against custom regex if provided
-  if (rules?.regex && !new RegExp(rules?.regex).test(value)) {
+  // Custom regex check
+  if (rules.regex && !new RegExp(rules.regex).test(value)) {
     return {
       isValid: false,
-      error: rules?.errorMessages?.invalid || defaultErrorMessages.invalid,
+      error: rules.errorMessages?.invalid || defaultErrorMessages.invalid,
     };
   }
 
-  // Default mobile regex (accepts numbers, +, -, and spaces)
-  const mobileRegex = /^[\d\s+\-()]*$/;
-  if (!mobileRegex.test(value)) {
+  // Validate using libphonenumber-js
+  const phoneNumber = parsePhoneNumberFromString(
+    value,
+    rules?.countryCode || "IN"
+  );
+
+  //   console.log('phoneNumber', phoneNumber)
+  console.log(
+    "phoneNumber.isValid()",
+    phoneNumber.isValid(),
+    phoneNumber.getType()
+  );
+
+  if (
+    !phoneNumber?.isValid() &&
+    (phoneNumber?.getType() !== "MOBILE" ||
+      phoneNumber?.getType() !== "FIXED_LINE_OR_MOBILE")
+  ) {
     return {
       isValid: false,
       error:
-        rules?.errorMessages?.invalid || "Please enter a valid mobile number",
+        rules.errorMessages?.invalid ||
+        defaultErrorMessages.invalid ||
+        "Please enter a valid mobile number",
     };
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quantique-field-validator",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Validator to verify all form fields.",
   "main": "index.js",
   "scripts": {
@@ -18,5 +18,8 @@
   "bugs": {
     "url": "https://github.com/saketsinhaquantique/quantique-field-validator/issues"
   },
-  "homepage": "https://github.com/saketsinhaquantique/quantique-field-validator#readme"
+  "homepage": "https://github.com/saketsinhaquantique/quantique-field-validator#readme",
+  "dependencies": {
+    "libphonenumber-js": "^1.12.6"
+  }
 }