Issue #46 (Wrong result from local number) fix

.gitignore

@@ -7,3 +7,7 @@ build/
 
 # Directory created by dartdoc
 doc/api/
+
+# macOS files
+.DS_Store
+

example/lib/main.dart

@@ -71,4 +71,9 @@ void main(List<String> arguments) {
   two - 1 == one;
   final another = one + 2;
   print('$another == $three');
+
+  final usLocalNumber = PhoneNumber.parse("(707) 555-1854", callerCountry: IsoCode.US);
+  final usIntrnNumber = PhoneNumber.parse("+1 (707) 555-1854");
+
+  print("US local number $usLocalNumber equals US international number $usIntrnNumber - ${usLocalNumber == usIntrnNumber}"); // true
 }

lib/src/metadata/metadata_matcher.dart

@@ -4,11 +4,11 @@ import 'package:phone_numbers_parser/src/parsers/_validator.dart';
 import 'models/phone_metadata.dart';
 
 abstract class MetadataMatcher {
-  static PhoneMetadata getMatchUsingPatterns(
+
+  static PhoneMetadata? getMatchUsingPatternsStrict(
     String nationalNumber,
-    List<PhoneMetadata> potentialFits,
+    List<PhoneMetadata> potentialFits
   ) {
-    if (potentialFits.length == 1) return potentialFits[0];
     potentialFits = reducePotentialMetadatasFits(nationalNumber, potentialFits);
     for (var fit in potentialFits) {
       final isValidForIso = Validator.validateWithPattern(
@@ -17,7 +17,14 @@ abstract class MetadataMatcher {
         return fit;
       }
     }
-    return potentialFits[0];
+    return null;
+  }
+
+  static PhoneMetadata getMatchUsingPatterns(
+    String nationalNumber,
+    List<PhoneMetadata> potentialFits,
+  ) {
+    return getMatchUsingPatternsStrict(nationalNumber, potentialFits) ?? potentialFits[0];
   }
 
   /// Given a list of metadata fits, return the ones that fit a national number

lib/src/parsers/phone_parser.dart

@@ -52,6 +52,7 @@ abstract class PhoneParser {
     final containsExitCode = withoutExitCode.length != phoneNumber.length;
     // if no destination metadata was provided we have to find it,
     destinationMetadata ??= _findDestinationMetadata(
+      phoneHadExitCode: containsExitCode,
       phoneWithoutExitCode: withoutExitCode,
       callerMetadata: callerMetadata,
     );
@@ -91,6 +92,7 @@ abstract class PhoneParser {
   // find destination of a normalized phone number, which supposedly
   // starts with a country code.
   static PhoneMetadata _findDestinationMetadata({
+    required bool phoneHadExitCode,
     required String phoneWithoutExitCode,
     required PhoneMetadata? callerMetadata,
   }) {
@@ -102,15 +104,50 @@ abstract class PhoneParser {
         phoneWithoutExitCode.startsWith(callerNationalPrefix)) {
       return callerMetadata;
     }
-    // if no caller was provided we need to make a best guess given the country code
-    final countryCode =
-        CountryCodeParser.extractCountryCode(phoneWithoutExitCode);
-    final national =
-        CountryCodeParser.removeCountryCode(phoneWithoutExitCode, countryCode);
-    // multiple countries use the same country code
-    final metadatas = MetadataFinder.getMetadatasForCountryCode(countryCode);
-    // if multiple countries share the same country code, patterns on the national number
-    // is used to find the correct country.
-    return MetadataMatcher.getMatchUsingPatterns(national, metadatas);
+
+    String? countryCode;
+    Object? countryCodeException;
+    List<PhoneMetadata>? metadatas;
+
+    try {
+      countryCode = CountryCodeParser.extractCountryCode(phoneWithoutExitCode);
+    } catch(e) {
+      countryCodeException = e;
+    }
+
+    if (countryCode != null) {
+      metadatas = MetadataFinder.getMetadatasForCountryCode(countryCode);
+      final national = CountryCodeParser.removeCountryCode(phoneWithoutExitCode, countryCode);
+      final metadataMatch = MetadataMatcher.getMatchUsingPatternsStrict(national, metadatas);
+
+      if (phoneHadExitCode) {
+        // 1.
+        // if phone number has the exit code, we should use it 
+        // despite caller's metadata and phone number validity
+        return metadataMatch ?? metadatas.first;
+      }
+
+      // 2.
+      // if number has no exit code. Try to figure out if it
+      // starts with a country code
+      if (metadataMatch != null) {
+        return metadataMatch;
+      }
+    }
+
+    // 3.
+    // If any direct match was't found, use provided callerMetadata
+    if (callerMetadata != null) {
+      return callerMetadata;
+    }
+
+    if (metadatas != null) {
+      // 4.
+      // The last resort. Use any of found metadatas ignoring validity
+      return metadatas.first;
+    }
+
+    // rethrow previously got error
+    throw countryCodeException!;
   }
 }

test/phone_number_test.dart

@@ -111,6 +111,24 @@ void main() {
             equals('499999999'));
         // expect()
       });
+
+      test(
+          'should resolve local numbers w/o national prefix as they belong to callerCountry',
+          () {
+        expect(
+            PhoneNumber.parse('(888) 555-5512', callerCountry: IsoCode.US)
+              .international,
+            equals('+18885555512'));
+        expect(
+            PhoneNumber.parse('(555) 522-8243', callerCountry: IsoCode.US)
+              .international,
+            equals('+15555228243'));
+        expect(
+            PhoneNumber.parse('(707) 555-1854', callerCountry: IsoCode.US)
+              .international,
+            equals('+17075551854'));
+        // expect()
+      });
     });
 
     group('Validity', () {