fix(core): ignore region code if E164 is provided

fix #51
grantila · Aug 18, 2020 · 32e2bb7 · 32e2bb7
1 parent 86f7262
commit 32e2bb7
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/lib/index.js b/lib/index.js
diff --git a/src/index.js b/src/index.js
@@ -143,14 +143,12 @@ function PhoneNumber( phoneNumber, regionCode )
 
 	if ( !isInternal )
 	{
+		phoneNumber = phoneNumber.trim( );
+
 		if ( regionCode && ( phoneNumber.charAt( 0 ) === '+' ) )
-		{
-			// Ensure region code is valid
-			var cc = PhoneNumber.getCountryCodeForRegionCode( regionCode );
-			if ( phoneNumber.substr( 1, ( '' + cc ).length ) !== '' + cc )
-				// Wrong region code, let's fix it
-				regionCode = null;
-		}
+			// Ignore region code if we have an international phonenumber,
+			// it'll be extracted properly by libphonenumber.
+			regionCode = null;
 
 		if ( !regionCode )
 			// Guess region code

diff --git a/test.in/awesome-phonenumber/should-compile.ts b/test.in/awesome-phonenumber/should-compile.ts
@@ -115,6 +115,12 @@ describe( 'general', function( ) {
 		expect( pn.getRegionCode( ) ).to.equal( 'CA' );
 	} );
 
+	it( 'should not use US for known CA numbers', function( ) {
+		// Issue #51
+		const pn = new PhoneNumber( '+1613 734.6759', 'US' );
+		expect( pn.getRegionCode( ) ).to.equal( 'CA' );
+	} );
+
 	it( 'should extract region by prefix as early as possible', function( ) {
 		const pn1 = new PhoneNumber( '+1' );
 		const pn1x = new PhoneNumber( '+12' );