feat: added long month rule that can work for other languages

gbassisp · Nov 8, 2023 · bd504d9 · bd504d9
1 parent 6572343
commit bd504d9
Show file tree

Hide file tree

Showing 2 changed files with 130 additions and 8 deletions.
diff --git a/lib/src/any_date_rules.dart b/lib/src/any_date_rules.dart
@@ -231,21 +231,25 @@ final DateParsingRule ambiguousCase = SimpleRule((params) {
 final DateParsingRule ymd = MultipleRules([
   maybeDateTimeParse,
   ymdTextMonthRegex,
+  ymdNonLatinTextMonth,
   ymdRegex,
 ]);
 
 final DateParsingRule ydm = MultipleRules([
   ydmTextMonthRegex,
+  ydmNonLatinTextMonth,
   ydmRegex,
 ]);
 
 final DateParsingRule dmy = MultipleRules([
   dmyTextMonthRegex,
+  dmyNonLatinTextMonth,
   dmyRegex,
 ]);
 
 final DateParsingRule mdy = MultipleRules([
   mdyTextMonthRegex,
+  mdyNonLatinTextMonth,
   mdyRegex,
 ]);
 
@@ -268,6 +272,32 @@ DateParsingRule maybeDateTimeParse = SimpleRule((params) {
   return null;
 });
 
+DateParsingRule ymdNonLatinTextMonth = SimpleRule((params) {
+  final seps = params.parserInfo.allowedSeparators;
+  // ignore: prefer_interpolation_to_compose_strings
+  final textMonthPattern = '(?<month>' r'[^\d' + seps.join() + ']+)';
+
+  final base = '^'
+      '$_yearPattern'
+      '$_s'
+      '$textMonthPattern'
+      '$_s'
+      '$_dayPattern';
+  DateTime? res;
+  for (final timePattern in _timePatterns) {
+    final re = RegExp(base + _s + timePattern);
+    res = _tryTextMonth(re, params.formattedString, params.parserInfo.months);
+    if (res != null) {
+      return res;
+    }
+  }
+  return _tryTextMonth(
+    RegExp(base),
+    params.formattedString,
+    params.parserInfo.months,
+  );
+});
+
 DateParsingRule ymdTextMonthRegex = SimpleRule((params) {
   final base = '^'
       '$_yearPattern'
@@ -332,8 +362,33 @@ final DateParsingRule ydmRegex = SimpleRule((params) {
   );
 });
 
+DateParsingRule ydmNonLatinTextMonth = SimpleRule((params) {
+  final seps = params.parserInfo.allowedSeparators;
+  // ignore: prefer_interpolation_to_compose_strings
+  final textMonthPattern = '(?<month>' r'[^\d' + seps.join() + ']+)';
+
+  final base = '^'
+      '$_yearPattern'
+      '$_s'
+      '$_dayPattern'
+      '$_s'
+      '$textMonthPattern';
+  DateTime? res;
+  for (final timePattern in _timePatterns) {
+    final re = RegExp(base + _s + timePattern);
+    res = _tryTextMonth(re, params.formattedString, params.parserInfo.months);
+    if (res != null) {
+      return res;
+    }
+  }
+  return _tryTextMonth(
+    RegExp(base),
+    params.formattedString,
+    params.parserInfo.months,
+  );
+});
+
 DateParsingRule ydmTextMonthRegex = SimpleRule((params) {
-  // final s = separatorPattern(params.parserInfo.allowedSeparators);
   final base = '^'
       '$_yearPattern'
       '$_s'
@@ -376,8 +431,33 @@ final DateParsingRule mdyRegex = SimpleRule((params) {
   );
 });
 
+DateParsingRule mdyNonLatinTextMonth = SimpleRule((params) {
+  final seps = params.parserInfo.allowedSeparators;
+  // ignore: prefer_interpolation_to_compose_strings
+  final textMonthPattern = '(?<month>' r'[^\d' + seps.join() + ']+)';
+
+  final base = '^'
+      '$textMonthPattern'
+      '$_s'
+      '$_dayPattern'
+      '$_s'
+      '$_yearPattern';
+  DateTime? res;
+  for (final timePattern in _timePatterns) {
+    final re = RegExp(base + _s + timePattern);
+    res = _tryTextMonth(re, params.formattedString, params.parserInfo.months);
+    if (res != null) {
+      return res;
+    }
+  }
+  return _tryTextMonth(
+    RegExp(base),
+    params.formattedString,
+    params.parserInfo.months,
+  );
+});
+
 DateParsingRule mdyTextMonthRegex = SimpleRule((params) {
-  // final s = separatorPattern(params.parserInfo.allowedSeparators);
   final base = '^'
       '$_textMonthPattern'
       '$_s'
@@ -420,8 +500,33 @@ final DateParsingRule dmyRegex = SimpleRule((params) {
   );
 });
 
+DateParsingRule dmyNonLatinTextMonth = SimpleRule((params) {
+  final seps = params.parserInfo.allowedSeparators;
+  // ignore: prefer_interpolation_to_compose_strings
+  final textMonthPattern = '(?<month>' r'[^\d' + seps.join() + ']+)';
+
+  final base = '^'
+      '$_dayPattern'
+      '$_s'
+      '$textMonthPattern'
+      '$_s'
+      '$_yearPattern';
+  DateTime? res;
+  for (final timePattern in _timePatterns) {
+    final re = RegExp(base + _s + timePattern);
+    res = _tryTextMonth(re, params.formattedString, params.parserInfo.months);
+    if (res != null) {
+      return res;
+    }
+  }
+  return _tryTextMonth(
+    RegExp(base),
+    params.formattedString,
+    params.parserInfo.months,
+  );
+});
+
 DateParsingRule dmyTextMonthRegex = SimpleRule((params) {
-  // final s = separatorPattern(params.parserInfo.allowedSeparators);
   final base = '^'
       '$_dayPattern'
       '$_s'

diff --git a/test/locale_based_test.dart b/test/locale_based_test.dart
@@ -13,20 +13,16 @@ import 'test_values.dart' as values;
 final _locales = availableLocalesForDateFormatting;
 
 Iterable<DateFormat> formats(String locale) sync* {
-  // unsuported for lack of information (no year)
   // yield DateFormat.y(locale);
   // yield DateFormat.yM(locale);
   // yield DateFormat.yMMMM(locale);
   // yield DateFormat.yMMM(locale);
-
-  // in progress
   // yield DateFormat.yMEd(locale);
   // yield DateFormat.yMMMEd(locale);
   // yield DateFormat.yMMMMEEEEd(locale);
-
-  // basic
   // yield DateFormat.yMMMMd(locale);
   // yield DateFormat.yMMMd(locale);
+
   yield DateFormat.yMd(locale);
 }
 
@@ -117,5 +113,26 @@ Future<void> main() async {
         });
       }
     }
+
+    test('non-latin character month is identified', () {
+      final l = Locale.parse('am');
+      final info = l.parserInfo;
+      final longMonths = info.months;
+
+      bool containsMonth() {
+        for (final m in longMonths) {
+          if (m.name == 'ጁላይ') {
+            return true;
+          }
+        }
+        return false;
+      }
+
+      expect(
+        containsMonth(),
+        isTrue,
+        reason: 'expected "am" locale to include "ጁላይ" on month list',
+      );
+    });
   });
 }