@digigov/form 1.1.2-fd2cea11 → 1.1.2

package/CHANGELOG.md

@@ -1,6 +1,11 @@
 # Change Log - @digigov/form
 
-This log was last generated on Mon, 29 Jan 2024 17:45:11 GMT and should not be manually modified.
+This log was last generated on Fri, 16 Feb 2024 09:57:32 GMT and should not be manually modified.
+
+## 1.1.2
+Fri, 16 Feb 2024 09:57:32 GMT
+
+_Version update only_
 
 ## 1.1.1
 Mon, 29 Jan 2024 17:45:11 GMT

package/cjs/inputs/Input/Input.stories/index.js

@@ -55,18 +55,6 @@ Object.keys(_PhoneNumber).forEach(function (key) {
     }
   });
 });
-var _LandlineNumber = require("@digigov/form/inputs/Input/__stories__/LandlineNumber");
-Object.keys(_LandlineNumber).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _LandlineNumber[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function get() {
-      return _LandlineNumber[key];
-    }
-  });
-});
 var _MobilePhone = require("@digigov/form/inputs/Input/__stories__/MobilePhone");
 Object.keys(_MobilePhone).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;

package/cjs/inputs/Input/__stories__/MobilePhone/index.js

@@ -26,10 +26,6 @@ var MobilePhone = exports.MobilePhone = function MobilePhone() {
     label: {
       primary: 'Κινητό τηλέφωνο'
     },
-    extra: {
-      countries: ['gr'],
-      phoneType: 'mobile'
-    },
     required: true
   }), _ref);
 };

package/cjs/inputs/Input/__stories__/PhoneNumber/index.js

@@ -24,10 +24,7 @@ var PhoneNumber = exports.PhoneNumber = function PhoneNumber() {
     name: "phone-number",
     type: "phone_number",
     label: {
-      primary: 'Tηλέφωνο'
-    },
-    extra: {
-      countries: ['gr']
+      primary: 'Σταθερό τηλέφωνο'
     },
     required: true
   }), _ref);

package/cjs/validators/utils/phone/index.js

@@ -1,111 +1,87 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.PHONE_NUMBER_VALIDATOR = exports.MOBILE_PHONE_VALIDATOR = void 0;
-exports.discoverPhoneType = discoverPhoneType;
+exports.matchTypeOfPhoneNumber = matchTypeOfPhoneNumber;
 exports.validatePhoneNumber = validatePhoneNumber;
-var _slicedToArray2 = _interopRequireDefault(require("@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]
-    };
+var gPhoneNumber = _interopRequireWildcard(require("google-libphonenumber"));
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
+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;
   }
-  return expanded;
-}
-var PHONENUMBER_SPEC = expandPhoneNumberStructure(countryPhoneData);
-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 = (0, _slicedToArray2["default"])(_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
+  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;
     }
-  }
-
-  // If no category matches, return 'Unknown'
-  return "unknown";
-}
-function getNumberType(phoneNumber, country) {
-  var spec = PHONENUMBER_SPEC[country.toUpperCase()];
-  if (!spec) {
-    throw new Error("Country ".concat(country, " is not supported"));
-  }
-  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)) {
+var phoneNumberTypes = {
+  0: 'landline',
+  1: 'mobile',
+  2: 'landline_or_mobile'
+};
+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;
     }
+  } catch (error) {
+    console.error(error);
     return false;
-  });
-}
-function isNumberOfType(phoneNumber, country, type) {
-  var numberType = getNumberType(phoneNumber, country);
-  if (numberType === type) {
-    return true;
-  }
-  return false;
-}
-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');
+  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;
+  }
+  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);
+      }
+    }
+    return phoneUtil.isValidNumber(phone);
+  } catch (err) {
+    console.error(err);
+    return false;
+  }
 }
 var MOBILE_PHONE_VALIDATOR = exports.MOBILE_PHONE_VALIDATOR = {
   name: 'mobile-phone-validator',
@@ -119,7 +95,7 @@ var MOBILE_PHONE_VALIDATOR = exports.MOBILE_PHONE_VALIDATOR = {
 };
 var PHONE_NUMBER_VALIDATOR = exports.PHONE_NUMBER_VALIDATOR = function PHONE_NUMBER_VALIDATOR(field) {
   var _field$extra, _field$extra2;
-  var countryCodes = field === null || field === void 0 ? void 0 : (_field$extra = field.extra) === null || _field$extra === void 0 ? void 0 : _field$extra.countries;
+  var countryCode = 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',
@@ -137,7 +113,7 @@ var PHONE_NUMBER_VALIDATOR = exports.PHONE_NUMBER_VALIDATOR = function PHONE_NUM
       if (!value) {
         return true;
       }
-      return validatePhoneNumber(value, countryCodes, typeOfPhone);
+      return validatePhoneNumber(value, countryCode, typeOfPhone);
     }
   };
 };

package/index.js

@@ -1,4 +1,4 @@
-/** @license Digigov v1.1.2-fd2cea11
+/** @license Digigov v1.1.2
  *
  * This source code is licensed under the BSD-2-Clause license found in the
  * LICENSE file in the root directory of this source tree.

package/inputs/Input/Input.stories/index.js

@@ -8,7 +8,6 @@ export * from '@digigov/form/inputs/Input/__stories__/Default';
 export * from '@digigov/form/inputs/Input/__stories__/Integer';
 export * from '@digigov/form/inputs/Input/__stories__/Boolean';
 export * from '@digigov/form/inputs/Input/__stories__/PhoneNumber';
-export * from '@digigov/form/inputs/Input/__stories__/LandlineNumber';
 export * from '@digigov/form/inputs/Input/__stories__/MobilePhone';
 export * from '@digigov/form/inputs/Input/__stories__/AFM';
 export * from '@digigov/form/inputs/Input/__stories__/IBAN';

package/inputs/Input/Input.stories.d.ts

@@ -8,7 +8,6 @@ export * from "@digigov/form/inputs/Input/__stories__/Default";
 export * from "@digigov/form/inputs/Input/__stories__/Integer";
 export * from "@digigov/form/inputs/Input/__stories__/Boolean";
 export * from "@digigov/form/inputs/Input/__stories__/PhoneNumber";
-export * from "@digigov/form/inputs/Input/__stories__/LandlineNumber";
 export * from "@digigov/form/inputs/Input/__stories__/MobilePhone";
 export * from "@digigov/form/inputs/Input/__stories__/AFM";
 export * from "@digigov/form/inputs/Input/__stories__/IBAN";

package/inputs/Input/__stories__/MobilePhone/index.js

@@ -16,10 +16,6 @@ export var MobilePhone = function MobilePhone() {
     label: {
       primary: 'Κινητό τηλέφωνο'
     },
-    extra: {
-      countries: ['gr'],
-      phoneType: 'mobile'
-    },
     required: true
   }), _ref);
 };

package/inputs/Input/__stories__/PhoneNumber/index.js

@@ -14,10 +14,7 @@ export var PhoneNumber = function PhoneNumber() {
     name: "phone-number",
     type: "phone_number",
     label: {
-      primary: 'Tηλέφωνο'
-    },
-    extra: {
-      countries: ['gr']
+      primary: 'Σταθερό τηλέφωνο'
     },
     required: true
   }), _ref);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digigov/form",
-  "version": "1.1.2-fd2cea11",
+  "version": "1.1.2",
   "description": "@digigov form builder",
   "author": "GRNET Developers <devs@lists.grnet.gr>",
   "license": "BSD-2-Clause",
@@ -12,14 +12,15 @@
   "dependencies": {
     "react-hook-form": "7.33.1",
     "yup": "0.32.11",
+    "google-libphonenumber": "3.2.8",
     "dayjs": "1.10.4",
     "@hookform/resolvers": "2.9.6",
     "publint": "0.1.8",
-    "@digigov/react-icons": "1.1.2-fd2cea11"
+    "@digigov/react-icons": "1.1.2"
   },
   "peerDependencies": {
-    "@digigov/ui": "1.1.2-fd2cea11",
-    "@digigov/react-core": "1.2.0-fd2cea11",
+    "@digigov/ui": "1.1.2",
+    "@digigov/react-core": "1.2.0",
     "clsx": "1.1.1",
     "react": "^16.8.0 || ^17.0.0",
     "react-dom": "^16.8.0 || ^17.0.0"

package/src/inputs/Input/Input.stories.js

@@ -8,7 +8,6 @@ export * from '@digigov/form/inputs/Input/__stories__/Default';
 export * from '@digigov/form/inputs/Input/__stories__/Integer';
 export * from '@digigov/form/inputs/Input/__stories__/Boolean';
 export * from '@digigov/form/inputs/Input/__stories__/PhoneNumber';
-export * from '@digigov/form/inputs/Input/__stories__/LandlineNumber';
 export * from '@digigov/form/inputs/Input/__stories__/MobilePhone';
 export * from '@digigov/form/inputs/Input/__stories__/AFM';
 export * from '@digigov/form/inputs/Input/__stories__/IBAN';

package/src/inputs/Input/__stories__/MobilePhone.tsx

@@ -15,10 +15,6 @@ export const MobilePhone = () => (
       label={{
         primary: 'Κινητό τηλέφωνο',
       }}
-      extra={{
-        countries: ['gr'],
-        phoneType: 'mobile',
-      }}
       required
     />
     <Button type="submit">Συνέχεια</Button>

package/src/inputs/Input/__stories__/PhoneNumber.tsx

@@ -13,10 +13,7 @@ export const PhoneNumber = () => (
       name="phone-number"
       type="phone_number"
       label={{
-        primary: 'Tηλέφωνο',
-      }}
-      extra={{
-        countries: ['gr'],
+        primary: 'Σταθερό τηλέφωνο',
       }}
       required
     />

package/src/validators/utils/phone.ts

@@ -1,167 +1,87 @@
+import * as gPhoneNumber from 'google-libphonenumber';
 import { FieldSpec } from '@digigov/form/types';
 import { ValidatorSchema } from '@digigov/form/validators/types';
 
 export type PhoneNumberType = 'landline' | 'mobile' | null;
-// add more countries from here libphonenumber-js/metadata.full.json
-const 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) {
-  const countries = Object.keys(compressed);
-  const expanded: any = {}
-  for (const country of countries) {
-    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 expanded;
-}
-const PHONENUMBER_SPEC = expandPhoneNumberStructure(countryPhoneData);
-export function discoverPhoneType(
-  phoneNumber: string,
-  config: any
-): string {
-  const cleanNumber = phoneNumber
-    .replace(/\D/g, "")
-    .replace(/\s/g, "")
-    .replace(/^\+/, "")
-    .replace(new RegExp("^" + config.internationalPrefix, ""), "")
-    .replace(new RegExp("^" + config.countryCode, ""), "");
-  const categories = {
-    "landline": config.fixedLine,
-    mobile: config.mobile,
-    "toll-free": config.tollFree,
-    "premium-rate": config.premiumRate,
-  };
-
-  for (const [categoryName, categoryDetails] of Object.entries(categories)) {
-    const pattern = new RegExp(
-      "^(" + categoryDetails.nationalNumberPattern.replace(/\s/g, "") + ")$",
-      ""
-    );
-    if (cleanNumber.match(pattern)) {
-      return categoryName; // Returns the category name if the number matches the pattern
-    }
-  }
-
-  // If no category matches, return 'Unknown'
-  return "unknown";
-}
-function getNumberType(phoneNumber: string, country: string) {
-  const spec = PHONENUMBER_SPEC[country.toUpperCase()];
-  if(!spec) {
-    throw new Error(`Country ${country} is not supported`);
-  }
-  const type = discoverPhoneType(phoneNumber, spec);
-  return type;
-}
-
-function isPhoneNumberValid(phoneNumber: string, countries: string[], types=['mobile', 'landline']) {
-  return countries.some((country) => {
-    const numberType = getNumberType(phoneNumber, country);
-    if (numberType && types.includes(numberType)) {
-      return true
-    }
-    return false
-  })
-}
-function isNumberOfType(phoneNumber: string, country: string, type: string) {
-  const numberType = getNumberType(phoneNumber, country);
-  if (numberType === type) {
-    return true
-  }
-  return false
-}
 export function validatePhoneNumber(
   phoneNumber: string,
   countries: Array<string> = ['gr'],
-  typeOfPhoneNumber?: PhoneNumberType
+  typeOfPhoneNumber: PhoneNumberType
 ): boolean {
+  const phoneUtil = gPhoneNumber.PhoneNumberUtil.getInstance();
   if (!countries || countries.length === 0) {
     return true;
   }
-  return isPhoneNumberValid(phoneNumber, countries, typeOfPhoneNumber? [typeOfPhoneNumber] : undefined);
+  return countries.some((country) => {
+    try {
+      const 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;
+    }
+  });
+}
+const phoneNumberTypes = {
+  0: 'landline',
+  1: 'mobile',
+  2: 'landline_or_mobile',
+};
+export function matchTypeOfPhoneNumber(
+  phone: any,
+  type: string,
+  phoneUtil: any
+): boolean {
+  try {
+    const phoneNumberType = phoneUtil.getNumberType(phone);
+    const numberType = phoneNumberTypes[phoneNumberType];
+    if (numberType === 'landline_or_mobile' || numberType === type) {
+      return true;
+    } else {
+      return false;
+    }
+  } catch (error) {
+    console.error(error);
+    return false;
+  }
 }
-
-
 function validateMobile(value): boolean {
-  return isNumberOfType(value, 'gr','mobile');
+  const phoneUtil = gPhoneNumber.PhoneNumberUtil.getInstance();
+  const 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;
+  }
+  try {
+    let phone;
+    try {
+      phone = phoneUtil.parse(value);
+    } catch (err) {
+      try {
+        value = '+' + value;
+        phone = phoneUtil.parse(value);
+      } catch (err) {
+        value = '+30' + origValue;
+        phone = phoneUtil.parse(value);
+      }
+    }
+    return phoneUtil.isValidNumber(phone);
+  } catch (err) {
+    console.error(err);
+    return false;
+  }
 }
 
 export const MOBILE_PHONE_VALIDATOR = {
@@ -176,7 +96,7 @@ export const MOBILE_PHONE_VALIDATOR = {
 };
 
 export const PHONE_NUMBER_VALIDATOR = (field: FieldSpec): ValidatorSchema => {
-  const countryCodes = field?.extra?.countries;
+  const countryCode = field?.extra?.countries;
   const typeOfPhone: PhoneNumberType | null = field?.extra?.phoneType;
   return {
     name: 'phone-number-validator',
@@ -194,7 +114,7 @@ export const PHONE_NUMBER_VALIDATOR = (field: FieldSpec): ValidatorSchema => {
       if (!value) {
         return true;
       }
-      return validatePhoneNumber(value, countryCodes, typeOfPhone);
+      return validatePhoneNumber(value, countryCode, typeOfPhone);
     },
   };
 };

package/validators/utils/phone/index.js

@@ -1,102 +1,76 @@
-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]
-    };
+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;
   }
-  return expanded;
-}
-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
+  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;
     }
-  }
-
-  // If no category matches, return 'Unknown'
-  return "unknown";
-}
-function getNumberType(phoneNumber, country) {
-  var spec = PHONENUMBER_SPEC[country.toUpperCase()];
-  if (!spec) {
-    throw new Error("Country ".concat(country, " is not supported"));
-  }
-  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)) {
+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;
     }
+  } catch (error) {
+    console.error(error);
     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');
+  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;
+  }
+  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);
+      }
+    }
+    return phoneUtil.isValidNumber(phone);
+  } catch (err) {
+    console.error(err);
+    return false;
+  }
 }
 export var MOBILE_PHONE_VALIDATOR = {
   name: 'mobile-phone-validator',
@@ -110,7 +84,7 @@ export var MOBILE_PHONE_VALIDATOR = {
 };
 export var PHONE_NUMBER_VALIDATOR = function PHONE_NUMBER_VALIDATOR(field) {
   var _field$extra, _field$extra2;
-  var countryCodes = field === null || field === void 0 ? void 0 : (_field$extra = field.extra) === null || _field$extra === void 0 ? void 0 : _field$extra.countries;
+  var countryCode = 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',
@@ -128,7 +102,7 @@ export var PHONE_NUMBER_VALIDATOR = function PHONE_NUMBER_VALIDATOR(field) {
       if (!value) {
         return true;
       }
-      return validatePhoneNumber(value, countryCodes, typeOfPhone);
+      return validatePhoneNumber(value, countryCode, 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 discoverPhoneType(phoneNumber: string, config: any): string;
-export declare function validatePhoneNumber(phoneNumber: string, countries?: Array<string>, typeOfPhoneNumber?: PhoneNumberType): boolean;
+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 const MOBILE_PHONE_VALIDATOR: {
     name: string;
     message: string;

package/cjs/inputs/Input/__stories__/LandlineNumber/index.js

@@ -1,36 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-var _typeof = require("@babel/runtime/helpers/typeof");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = exports.LandlineNumber = void 0;
-var _react = _interopRequireDefault(require("react"));
-var _form = _interopRequireWildcard(require("@digigov/form"));
-var _Button = require("@digigov/ui/cjs/form/Button");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
-var _ref = /*#__PURE__*/_react["default"].createElement(_Button.Button, {
-  type: "submit"
-}, "\u03A3\u03C5\u03BD\u03AD\u03C7\u03B5\u03B9\u03B1");
-var LandlineNumber = exports.LandlineNumber = function LandlineNumber() {
-  return /*#__PURE__*/_react["default"].createElement(_form["default"], {
-    onSubmit: function onSubmit(data) {
-      console.log(data);
-    }
-  }, /*#__PURE__*/_react["default"].createElement(_form.Field, {
-    key: "phone-number",
-    name: "phone-number",
-    type: "phone_number",
-    label: {
-      primary: 'Σταθερό τηλέφωνο'
-    },
-    extra: {
-      countries: ['gr'],
-      phoneType: 'landline'
-    },
-    required: true
-  }), _ref);
-};
-var _default = exports["default"] = LandlineNumber;

package/inputs/Input/__stories__/LandlineNumber/index.js

@@ -1,26 +0,0 @@
-import React from 'react';
-import FormBuilder, { Field } from '@digigov/form';
-import { Button } from '@digigov/ui/form/Button';
-var _ref = /*#__PURE__*/React.createElement(Button, {
-  type: "submit"
-}, "\u03A3\u03C5\u03BD\u03AD\u03C7\u03B5\u03B9\u03B1");
-export var LandlineNumber = function LandlineNumber() {
-  return /*#__PURE__*/React.createElement(FormBuilder, {
-    onSubmit: function onSubmit(data) {
-      console.log(data);
-    }
-  }, /*#__PURE__*/React.createElement(Field, {
-    key: "phone-number",
-    name: "phone-number",
-    type: "phone_number",
-    label: {
-      primary: 'Σταθερό τηλέφωνο'
-    },
-    extra: {
-      countries: ['gr'],
-      phoneType: 'landline'
-    },
-    required: true
-  }), _ref);
-};
-export default LandlineNumber;

package/inputs/Input/__stories__/LandlineNumber/package.json

@@ -1,6 +0,0 @@
-{
-  "sideEffects": false,
-  "module": "./index.js",
-  "types": "./index.d.ts",
-  "main": "../../../../cjs/inputs/Input/__stories__/LandlineNumber/index.js"
-}

package/inputs/Input/__stories__/LandlineNumber.d.ts

@@ -1,3 +0,0 @@
-/// <reference types="react" />
-export declare const LandlineNumber: () => JSX.Element;
-export default LandlineNumber;

package/src/inputs/Input/__stories__/LandlineNumber.tsx

@@ -1,27 +0,0 @@
-import React from 'react';
-import FormBuilder, { Field } from '@digigov/form';
-import { Button } from '@digigov/ui/form/Button';
-
-export const LandlineNumber = () => (
-  <FormBuilder
-    onSubmit={(data) => {
-      console.log(data);
-    }}
-  >
-    <Field
-      key="phone-number"
-      name="phone-number"
-      type="phone_number"
-      label={{
-        primary: 'Σταθερό τηλέφωνο',
-      }}
-      extra={{
-        countries: ['gr'],
-        phoneType:'landline',
-      }}
-      required
-    />
-    <Button type="submit">Συνέχεια</Button>
-  </FormBuilder>
-);
-export default LandlineNumber;