@digigov/form 1.1.5-496927f3 → 1.2.0-01ea6f24

package/validators/utils/phone/index.js

@@ -1,76 +1,102 @@
-import * as gPhoneNumber from 'google-libphonenumber';
-export function validatePhoneNumber(phoneNumber) {
-  var countries = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : ['gr'];
-  var typeOfPhoneNumber = arguments.length > 2 ? arguments[2] : undefined;
-  var phoneUtil = gPhoneNumber.PhoneNumberUtil.getInstance();
-  if (!countries || countries.length === 0) {
-    return true;
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+// add more countries from here libphonenumber-js/metadata.full.json
+var countryPhoneData = {
+  "GR": ["30", "00", "5005000\\d{3}|8\\d{9,11}|(?:[269]\\d|70)\\d{8}", [10, 11, 12], [["(\\d{2})(\\d{4})(\\d{4})", "$1 $2 $3", ["21|7"]], ["(\\d{4})(\\d{6})", "$1 $2", ["2(?:2|3[2-57-9]|4[2-469]|5[2-59]|6[2-9]|7[2-69]|8[2-49])|5"]], ["(\\d{3})(\\d{3})(\\d{4})", "$1 $2 $3", ["[2689]"]], ["(\\d{3})(\\d{3,4})(\\d{5})", "$1 $2 $3", ["8"]]], 0, 0, 0, 0, 0, 0, [["2(?:1\\d\\d|2(?:2[1-46-9]|[36][1-8]|4[1-7]|5[1-4]|7[1-5]|[89][1-9])|3(?:1\\d|2[1-57]|[35][1-3]|4[13]|7[1-7]|8[124-6]|9[1-79])|4(?:1\\d|2[1-8]|3[1-4]|4[13-5]|6[1-578]|9[1-5])|5(?:1\\d|[29][1-4]|3[1-5]|4[124]|5[1-6])|6(?:1\\d|[269][1-6]|3[1245]|4[1-7]|5[13-9]|7[14]|8[1-5])|7(?:1\\d|2[1-5]|3[1-6]|4[1-7]|5[1-57]|6[135]|9[125-7])|8(?:1\\d|2[1-5]|[34][1-4]|9[1-57]))\\d{6}", [10]], ["68[57-9]\\d{7}|(?:69|94)\\d{8}", [10]], ["800\\d{7,9}"], ["90[19]\\d{7}", [10]], ["70\\d{8}", [10]], 0, ["5005000\\d{3}", [10]], 0, 0, ["8(?:0[16]|12|[27]5|50)\\d{7}", [10]]]]
+};
+function expandPhoneNumberStructure(compressed) {
+  var countries = Object.keys(compressed);
+  var expanded = {};
+  for (var _i = 0, _countries = countries; _i < _countries.length; _i++) {
+    var country = _countries[_i];
+    expanded[country] = {
+      fixedLine: {
+        possibleLengths: {
+          _national: compressed[country][3].map(String)
+        },
+        nationalNumberPattern: compressed[country][11][0][0]
+      },
+      mobile: {
+        nationalNumberPattern: compressed[country][11][1][0]
+      },
+      tollFree: {
+        nationalNumberPattern: compressed[country][11][2][0]
+      },
+      premiumRate: {
+        nationalNumberPattern: compressed[country][11][3][0]
+      },
+      sharedCost: {
+        nationalNumberPattern: compressed[country][11][9][0]
+      },
+      personalNumber: {
+        nationalNumberPattern: compressed[country][11][4][0]
+      },
+      uan: {
+        nationalNumberPattern: compressed[country][11][6][0]
+      },
+      id: country,
+      countryCode: compressed[country][0],
+      internationalPrefix: compressed[country][1]
+    };
   }
-  return countries.some(function (country) {
-    try {
-      var phone = phoneUtil.parse(phoneNumber, country.toUpperCase());
-      if (phoneUtil.isValidNumber(phone)) {
-        if (typeOfPhoneNumber) {
-          if (matchTypeOfPhoneNumber(phone, typeOfPhoneNumber, phoneUtil)) {
-            return true;
-          } else {
-            return false;
-          }
-        } else {
-          return true;
-        }
-      }
-      return false;
-    } catch (error) {
-      console.error(error);
-      return false;
-    }
-  });
+  return expanded;
 }
-var phoneNumberTypes = {
-  0: 'landline',
-  1: 'mobile',
-  2: 'landline_or_mobile'
-};
-export function matchTypeOfPhoneNumber(phone, type, phoneUtil) {
-  try {
-    var phoneNumberType = phoneUtil.getNumberType(phone);
-    var numberType = phoneNumberTypes[phoneNumberType];
-    if (numberType === 'landline_or_mobile' || numberType === type) {
-      return true;
-    } else {
-      return false;
+var PHONENUMBER_SPEC = expandPhoneNumberStructure(countryPhoneData);
+export function discoverPhoneType(phoneNumber, config) {
+  var cleanNumber = phoneNumber.replace(/\D/g, "").replace(/\s/g, "").replace(/^\+/, "").replace(new RegExp("^" + config.internationalPrefix, ""), "").replace(new RegExp("^" + config.countryCode, ""), "");
+  var categories = {
+    "landline": config.fixedLine,
+    mobile: config.mobile,
+    "toll-free": config.tollFree,
+    "premium-rate": config.premiumRate
+  };
+  for (var _i2 = 0, _Object$entries = Object.entries(categories); _i2 < _Object$entries.length; _i2++) {
+    var _Object$entries$_i = _slicedToArray(_Object$entries[_i2], 2),
+      categoryName = _Object$entries$_i[0],
+      categoryDetails = _Object$entries$_i[1];
+    var pattern = new RegExp("^(" + categoryDetails.nationalNumberPattern.replace(/\s/g, "") + ")$", "");
+    if (cleanNumber.match(pattern)) {
+      return categoryName; // Returns the category name if the number matches the pattern
     }
-  } catch (error) {
-    console.error(error);
-    return false;
   }
+
+  // If no category matches, return 'Unknown'
+  return "unknown";
 }
-function validateMobile(value) {
-  var phoneUtil = gPhoneNumber.PhoneNumberUtil.getInstance();
-  var origValue = value;
-  // probably catch all the cases with a regex instead of gphonenumber
-  if (!value.match(/^((\+|00){0,1}\d{1,3}[- ]?)?\d{10}$/)) {
-    return false;
+function getNumberType(phoneNumber, country) {
+  var spec = PHONENUMBER_SPEC[country.toUpperCase()];
+  if (!spec) {
+    throw new Error("Country ".concat(country, " is not supported"));
   }
-  try {
-    var phone;
-    try {
-      phone = phoneUtil.parse(value);
-    } catch (err) {
-      try {
-        value = '+' + value;
-        phone = phoneUtil.parse(value);
-      } catch (err) {
-        value = '+30' + origValue;
-        phone = phoneUtil.parse(value);
-      }
+  var type = discoverPhoneType(phoneNumber, spec);
+  return type;
+}
+function isPhoneNumberValid(phoneNumber, countries) {
+  var types = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : ['mobile', 'landline'];
+  return countries.some(function (country) {
+    var numberType = getNumberType(phoneNumber, country);
+    if (numberType && types.includes(numberType)) {
+      return true;
     }
-    return phoneUtil.isValidNumber(phone);
-  } catch (err) {
-    console.error(err);
     return false;
+  });
+}
+function isNumberOfType(phoneNumber, country, type) {
+  var numberType = getNumberType(phoneNumber, country);
+  if (numberType === type) {
+    return true;
+  }
+  return false;
+}
+export function validatePhoneNumber(phoneNumber) {
+  var countries = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : ['gr'];
+  var typeOfPhoneNumber = arguments.length > 2 ? arguments[2] : undefined;
+  if (!countries || countries.length === 0) {
+    return true;
   }
+  return isPhoneNumberValid(phoneNumber, countries, typeOfPhoneNumber ? [typeOfPhoneNumber] : undefined);
+}
+function validateMobile(value) {
+  return isNumberOfType(value, 'gr', 'mobile');
 }
 export var MOBILE_PHONE_VALIDATOR = {
   name: 'mobile-phone-validator',
@@ -84,7 +110,7 @@ export var MOBILE_PHONE_VALIDATOR = {
 };
 export var PHONE_NUMBER_VALIDATOR = function PHONE_NUMBER_VALIDATOR(field) {
   var _field$extra, _field$extra2;
-  var countryCode = field === null || field === void 0 ? void 0 : (_field$extra = field.extra) === null || _field$extra === void 0 ? void 0 : _field$extra.countries;
+  var countryCodes = field === null || field === void 0 ? void 0 : (_field$extra = field.extra) === null || _field$extra === void 0 ? void 0 : _field$extra.countries;
   var typeOfPhone = field === null || field === void 0 ? void 0 : (_field$extra2 = field.extra) === null || _field$extra2 === void 0 ? void 0 : _field$extra2.phoneType;
   return {
     name: 'phone-number-validator',
@@ -102,7 +128,7 @@ export var PHONE_NUMBER_VALIDATOR = function PHONE_NUMBER_VALIDATOR(field) {
       if (!value) {
         return true;
       }
-      return validatePhoneNumber(value, countryCode, typeOfPhone);
+      return validatePhoneNumber(value, countryCodes, typeOfPhone);
     }
   };
 };

package/validators/utils/phone.d.ts

@@ -1,8 +1,8 @@
 import { FieldSpec } from '@digigov/form/types';
 import { ValidatorSchema } from '@digigov/form/validators/types';
 export type PhoneNumberType = 'landline' | 'mobile' | null;
-export declare function validatePhoneNumber(phoneNumber: string, countries: string[] | undefined, typeOfPhoneNumber: PhoneNumberType): boolean;
-export declare function matchTypeOfPhoneNumber(phone: any, type: string, phoneUtil: any): boolean;
+export declare function discoverPhoneType(phoneNumber: string, config: any): string;
+export declare function validatePhoneNumber(phoneNumber: string, countries?: Array<string>, typeOfPhoneNumber?: PhoneNumberType): boolean;
 export declare const MOBILE_PHONE_VALIDATOR: {
     name: string;
     message: string;