Intl4x API refactorings.

.gitignore

@@ -18,3 +18,5 @@ pkgs/intl/test/number_format_compact_google3_icu_test.dart
 pkgs/intl/update_from_cldr_data.sh
 
 .vscode
+
+doc/

pkgs/intl4x/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 0.15.0
+
+- API overhaul:
+  - Getting rid of the Intl object, as it only served as a wrapper of Locale. So the ...Format objects are now the top-level things.
+  - Remove most ...Options objects from the public API, as they make it more verbose. Users now directly input the options to the top-level ...Format constructor.
+  - Use => instead of block bodies for methods where possible.
+  - Fix some imports
+  - Add documentation to some classes (more to follow!)
+  - Remove some methods which are not implemented in ICU4X
+
 ## 0.14.0
 
 - Change timezone API, adding a dependency on package:timezone.

pkgs/intl4x/README.md

@@ -9,16 +9,17 @@ A lightweight modular library for internationalization (i18n) functionality.
 * Formatting for dates, numbers, and lists. 
 * Collation.
 * Display names.
+* Plural rules.
 
 ## Status - experimental
 
 We're actively iterating on the API for this package (please provide feedback
 via our [issue tracker](https://github.com/dart-lang/i18n/issues)).
 
-|   | Number format  | List format  | Date format  | Collation  | Display names | Plural Rules | Case mapping |
+|   | Number format | List format | Date format | Collation | Display names | Plural rules | Case mapping |
 |---|:---:|:---:|:---:|:---:|:---:|:---:|:---:|
-| **ECMA402 (web)** | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
-| **ICU4X (web/native)**  | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: |
+| **ECMA402 (web)** | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ |
+| **ICU4X (web/native)**  | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ | ✔ |
 
 ## Implementation and Goals
 

pkgs/intl4x/analysis_options.yaml

@@ -2,8 +2,8 @@ include: package:dart_flutter_team_lints/analysis_options.yaml
 
 linter:
   rules:
-    - conditional_uri_does_not_exist
-    - prefer_const_constructors
     - prefer_final_locals
-    - prefer_relative_imports
     - unnecessary_parenthesis
+    - prefer_expression_function_bodies
+    - document_ignores
+    - parameter_assignments

pkgs/intl4x/dart_test.yaml

@@ -4,3 +4,8 @@ tags:
       vm:
         skip: "Not implemented in ICU4X yet. Use -P force to force tests."
         presets: { force: { skip: false } }
+  ecmaUnsupported:
+    on_platform:
+      browser:
+        skip: "Either unimplemented or buggy on the browser."
+        presets: { force: { skip: false } }

pkgs/intl4x/example/bin/example.dart

@@ -3,19 +3,19 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:intl4x/datetime_format.dart';
-import 'package:intl4x/intl4x.dart';
+import 'package:intl4x/number_format.dart';
 
 void main(List<String> arguments) {
   final timeZone = 'Europe/Paris';
   final dateTime = DateTime.parse('2024-07-01T08:50:07');
 
-  print(Intl().locale.toString());
+  print(Locale.system);
 
-  print(Intl().dateTimeFormat().d().format(DateTime.now()));
+  print(NumberFormat.compact().format(3.14));
 
-  final withTimeZoneLong = Intl(locale: Locale.parse('en'))
-      .dateTimeFormat()
-      .ymdt(dateStyle: DateFormatStyle.full, timeStyle: TimeFormatStyle.short)
-      .withTimeZoneLong();
-  print(withTimeZoneLong.format(dateTime, timeZone));
+  final formatter = DateTimeFormat.yearMonthDayTime(
+    locale: Locale.parse('en'),
+    length: DateTimeLength.long,
+  ).withTimeZoneLong();
+  print(formatter.format(dateTime, timeZone));
 }

pkgs/intl4x/lib/case_mapping.dart

@@ -2,14 +2,15 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import 'intl4x.dart';
+import 'src/case_mapping/case_mapping.dart';
+import 'src/locale/locale.dart' show Locale;
 
 export 'src/case_mapping/case_mapping.dart' show CaseMapping;
-export 'src/locale/locale.dart';
+export 'src/locale/locale.dart' show Locale;
 
 extension CaseMappingWithIntl4X on String {
   String toLocaleLowerCase(Locale locale) =>
-      Intl(locale: locale).caseMapping.toLowerCase(this);
+      CaseMapping(locale: locale).toLowerCase(this);
   String toLocaleUpperCase(Locale locale) =>
-      Intl(locale: locale).caseMapping.toUpperCase(this);
+      CaseMapping(locale: locale).toUpperCase(this);
 }

pkgs/intl4x/lib/collation.dart

@@ -2,16 +2,18 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import 'intl4x.dart';
+import 'src/collation/collation.dart' show Collation;
+import 'src/locale/locale.dart' show Locale;
 
 export 'src/collation/collation.dart' show Collation;
-export 'src/collation/collation_options.dart';
-export 'src/options.dart';
+export 'src/collation/collation_options.dart'
+    show CaseFirst, Sensitivity, Usage;
+export 'src/locale/locale.dart' show Locale;
 
 extension CollationExt on String {
   /// Compare two strings in a locale-dependent manner.
   ///
-  /// For more options, use [Intl.collation] directly.
+  /// For more options, use [Collation] directly.
   int compareLocale(String other, {Locale? locale}) =>
-      Intl(locale: locale).collation().compare(this, other);
+      Collation(locale: locale).compare(this, other);
 }

pkgs/intl4x/lib/datetime_format.dart

@@ -2,8 +2,18 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-export 'src/datetime_format/datetime_format.dart' show DateTimeFormatBuilder;
+export 'src/datetime_format/datetime_format.dart' show DateTimeFormat;
 export 'src/datetime_format/datetime_format_impl.dart'
     show DateTimeFormatter, ZonedDateTimeFormatter;
-export 'src/datetime_format/datetime_format_options.dart';
-export 'src/options.dart';
+export 'src/datetime_format/datetime_format_options.dart'
+    show
+        Calendar,
+        ClockStyle,
+        DateTimeAlignment,
+        DateTimeLength,
+        EnumComparisonOperators,
+        NumberingSystem,
+        TimePrecision,
+        TimeZoneType,
+        YearStyle;
+export 'src/locale/locale.dart' show Locale;

pkgs/intl4x/lib/display_names.dart

@@ -2,6 +2,40 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
+/// Formatting names in different locales.
+///
+/// For a given [Locale], show the name of some information in that locale.
+/// Provides several options as part of the [DisplayNames] constructor, such as
+/// [Style], [LanguageDisplay], or [Fallback].
+///
+/// Languages:
+/// ```dart
+/// // Display the name of the language German in English
+/// DisplayNames(locale: Locale.parse('en-US'))
+///   .ofLanguage(Locale.parse('de-DE')); // German (Germany)
+///
+/// // Display the name of the language French in Chinese
+/// DisplayNames(locale: Locale.parse('zh-Hant'))
+///   .ofLanguage(Locale.parse('fr')); // 法文
+/// ```
+///
+/// Regions:
+/// ```dart
+/// // Display the name of the region es-419, Latin America, in English
+/// DisplayNames(locale: Locale.parse('en'))
+///   .ofRegion('419'); // Latin America
+///
+/// // Display the name of the region Germany in Spanish
+/// DisplayNames(locale: Locale.parse('es-419'))
+///   .ofLanguage(Locale.parse('de')); // Alemania
+/// ```
+///
+///
+library;
+
+import 'display_names.dart';
+
 export 'src/display_names/display_names.dart' show DisplayNames;
-export 'src/display_names/display_names_options.dart';
-export 'src/options.dart';
+export 'src/display_names/display_names_options.dart'
+    show DisplayType, Fallback, LanguageDisplay, Style;
+export 'src/locale/locale.dart' show Locale;

pkgs/intl4x/lib/list_format.dart

@@ -2,38 +2,36 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import 'intl4x.dart';
-import 'list_format.dart';
+import 'src/list_format/list_format.dart';
+import 'src/list_format/list_format_options.dart';
+import 'src/locale/locale.dart' show Locale;
 
 export 'src/list_format/list_format.dart' show ListFormat;
-export 'src/list_format/list_format_options.dart';
-export 'src/options.dart';
+export 'src/list_format/list_format_options.dart' show ListStyle, ListType;
+export 'src/locale/locale.dart' show Locale;
 
 extension ListFormatIntl4x on List<String> {
   /// Join a list in a locale-dependent manner using `and`-based grouping.
   ///
-  /// Example: "A, B, and C". See also [Type.and].
+  /// Example: "A, B, and C". See also [ListType.and].
   ///
-  /// For more options, use [Intl.listFormat] directly.
-  String joinAnd({Locale? locale}) => Intl(
-    locale: locale,
-  ).listFormat(const ListFormatOptions(type: Type.and)).format(this);
+  /// For more options, use [ListFormat] directly.
+  String joinAnd({Locale? locale}) =>
+      ListFormat(locale: locale, type: ListType.and).format(this);
 
   /// Join a list in a locale-dependent manner using `or`-based grouping.
   ///
-  /// Example: "A, B, or C". See also [Type.or].
+  /// Example: "A, B, or C". See also [ListType.or].
   ///
-  /// For more options, use [Intl.listFormat] directly.
-  String joinOr({Locale? locale}) => Intl(
-    locale: locale,
-  ).listFormat(const ListFormatOptions(type: Type.or)).format(this);
+  /// For more options, use [ListFormat] directly.
+  String joinOr({Locale? locale}) =>
+      ListFormat(locale: locale, type: ListType.or).format(this);
 
   /// Join a list in a locale-dependent manner using unit-based grouping.
   ///
-  /// Example: "A, B, C". See also [Type.unit].
+  /// Example: "A, B, C". See also [ListType.unit].
   ///
-  /// For more options, use [Intl.listFormat] directly.
-  String joinUnit({Locale? locale}) => Intl(
-    locale: locale,
-  ).listFormat(const ListFormatOptions(type: Type.unit)).format(this);
+  /// For more options, use [ListFormat] directly.
+  String joinUnit({Locale? locale}) =>
+      ListFormat(locale: locale, type: ListType.unit).format(this);
 }

pkgs/intl4x/lib/number_format.dart

@@ -2,6 +2,30 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
+export 'src/locale/locale.dart' show Locale;
 export 'src/number_format/number_format.dart' show NumberFormat;
-export 'src/number_format/number_format_options.dart';
-export 'src/options.dart';
+export 'src/number_format/number_format_options.dart'
+    show
+        CompactDisplay,
+        CompactNotation,
+        CurrencyDisplay,
+        CurrencySign,
+        CurrencyStyle,
+        DecimalStyle,
+        Digits,
+        EngineeringNotation,
+        FormatStyle,
+        FractionDigits,
+        Grouping,
+        Notation,
+        PercentStyle,
+        RoundingMode,
+        RoundingPriority,
+        ScientificNotation,
+        SignDisplay,
+        SignificantDigits,
+        StandardNotation,
+        TrailingZeroDisplay,
+        Unit,
+        UnitDisplay,
+        UnitStyle;

pkgs/intl4x/lib/plural_rules.dart

@@ -2,6 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-export 'src/options.dart';
+export 'src/locale/locale.dart' show Locale;
 export 'src/plural_rules/plural_rules.dart' show PluralCategory, PluralRules;
-export 'src/plural_rules/plural_rules_options.dart';
+export 'src/plural_rules/plural_rules_options.dart'
+    show Digits, PluralType, RoundingMode, TrailingZeroDisplay;