BREAKING: make isValidNumberPrecise respect validationNumberType

Author: jackocnr

build/js/intlTelInput.d.ts

@@ -313,8 +313,8 @@ declare module "intl-tel-input" {
         getExtension(number: string, iso2: string | undefined): string;
         getNumberType: (number: string, iso2: string | undefined) => number;
         getValidationError(number: string, iso2: string | undefined): number;
-        isPossibleNumber(number: string, iso2: string | undefined, numberType?: string): boolean;
-        isValidNumber: (number: string, iso2: string | undefined) => boolean;
+        isPossibleNumber(number: string, iso2: string | undefined, numberType?: string | null): boolean;
+        isValidNumber: (number: string, iso2: string | undefined, numberType?: string | null) => boolean;
         numberFormat: {
             NATIONAL: number;
             INTERNATIONAL: number;

build/js/intlTelInput.js

@@ -3052,7 +3052,7 @@ var factoryOutput = (() => {
       return this._utilsIsValidNumber(val);
     }
     _utilsIsValidNumber(val) {
-      return intlTelInput.utils ? intlTelInput.utils.isValidNumber(val, this.selectedCountryData.iso2) : null;
+      return intlTelInput.utils ? intlTelInput.utils.isValidNumber(val, this.selectedCountryData.iso2, this.options.validationNumberType) : null;
     }
     //* Update the selected country, and update the input val accordingly.
     setCountry(iso2) {

build/js/intlTelInput.min.js

@@ -3047,7 +3047,7 @@ var Iti = class {
     return this._utilsIsValidNumber(val);
   }
   _utilsIsValidNumber(val) {
-    return intlTelInput.utils ? intlTelInput.utils.isValidNumber(val, this.selectedCountryData.iso2) : null;
+    return intlTelInput.utils ? intlTelInput.utils.isValidNumber(val, this.selectedCountryData.iso2, this.options.validationNumberType) : null;
   }
   //* Update the selected country, and update the input val accordingly.
   setCountry(iso2) {

build/js/intlTelInputWithUtils.js

@@ -313,8 +313,8 @@ declare module "intl-tel-input" {
         getExtension(number: string, iso2: string | undefined): string;
         getNumberType: (number: string, iso2: string | undefined) => number;
         getValidationError(number: string, iso2: string | undefined): number;
-        isPossibleNumber(number: string, iso2: string | undefined, numberType?: string): boolean;
-        isValidNumber: (number: string, iso2: string | undefined) => boolean;
+        isPossibleNumber(number: string, iso2: string | undefined, numberType?: string | null): boolean;
+        isValidNumber: (number: string, iso2: string | undefined, numberType?: string | null) => boolean;
         numberFormat: {
             NATIONAL: number;
             INTERNATIONAL: number;

build/js/intlTelInputWithUtils.min.js

@@ -3011,7 +3011,7 @@ var Iti = class {
     return this._utilsIsValidNumber(val);
   }
   _utilsIsValidNumber(val) {
-    return intlTelInput.utils ? intlTelInput.utils.isValidNumber(val, this.selectedCountryData.iso2) : null;
+    return intlTelInput.utils ? intlTelInput.utils.isValidNumber(val, this.selectedCountryData.iso2, this.options.validationNumberType) : null;
   }
   //* Update the selected country, and update the input val accordingly.
   setCountry(iso2) {

build/js/utils.js

@@ -31,8 +31,8 @@ type ItiUtils = {
   getExtension(number: string, iso2: string | undefined): string;
   getNumberType: (number: string, iso2: string | undefined) => number;
   getValidationError(number: string, iso2: string | undefined): number;
-  isPossibleNumber(number: string, iso2: string | undefined, numberType?: string): boolean;
-  isValidNumber: (number: string, iso2: string | undefined) => boolean;
+  isPossibleNumber(number: string, iso2: string | undefined, numberType?: string | null): boolean;
+  isValidNumber: (number: string, iso2: string | undefined, numberType?: string | null) => boolean;
   numberFormat: { NATIONAL: number, INTERNATIONAL: number, E164: number, RFC3966: number };
   numberType: object;
 };
@@ -2086,7 +2086,7 @@ export class Iti {
 
   private _utilsIsValidNumber(val: string): boolean | null {
     return intlTelInput.utils
-      ? intlTelInput.utils.isValidNumber(val, this.selectedCountryData.iso2)
+      ? intlTelInput.utils.isValidNumber(val, this.selectedCountryData.iso2, this.options.validationNumberType)
       : null;
   }
 

react/build/IntlTelInput.cjs

@@ -131,18 +131,23 @@ const getValidationError = (number, countryCode) => {
 };
 
 //* Check if given number is valid.
-const isValidNumber = (number, countryCode) => {
+const isValidNumber = (number, countryCode, numberTypeName) => {
   try {
     const phoneUtil = i18n.phonenumbers.PhoneNumberUtil.getInstance();
     const numberObj = phoneUtil.parseAndKeepRawInput(number, countryCode);
-    return phoneUtil.isValidNumber(numberObj);
+    const isValidNumber = phoneUtil.isValidNumber(numberObj);
+    if (numberTypeName) {
+      return isValidNumber && phoneUtil.getNumberType(numberObj) === numberType[numberTypeName];
+    }
+    return isValidNumber;
   } catch {
     return false;
   }
 };
 
 //* For internal use only - see isPossibleNumber.
 const isPossibleNumberForType = (phoneUtil, numberObj, numberTypeName) => {
+  //* Can't use phoneUtil.isPossibleNumberForType directly as it accepts IS_POSSIBLE_LOCAL_ONLY numbers e.g. local numbers that are much shorter.
   const resultForType = phoneUtil.isPossibleNumberForTypeWithReason(numberObj, numberType[numberTypeName]);
   const isPossibleForType = resultForType === i18n.phonenumbers.PhoneNumberUtil.ValidationResult.IS_POSSIBLE;
   return isPossibleForType;

react/build/IntlTelInput.d.ts

@@ -2434,7 +2434,7 @@ class G {
     return this._utilsIsValidNumber(t);
   }
   _utilsIsValidNumber(t) {
-    return l.utils ? l.utils.isValidNumber(t, this.selectedCountryData.iso2) : null;
+    return l.utils ? l.utils.isValidNumber(t, this.selectedCountryData.iso2, this.options.validationNumberType) : null;
   }
   //* Update the selected country, and update the input val accordingly.
   setCountry(t) {