testing collation

Author: mosuem

pkgs/intl4x/lib/src/collation/collation_4x.dart

@@ -19,28 +19,22 @@ CollationImpl getCollator4X(
 class Collation4X extends CollationImpl {
   final icu.Collator _collator;
 
-  Collation4X(super.locale, Data data, super.options)
-    : _collator = icu.Collator(
-        data.to4X(),
-        locale.to4X(),
-        options.to4xOptions(),
-      );
+  Collation4X(super.locale, Data? data, super.options)
+    : _collator =
+          data != null
+              ? icu.Collator.createWithProvider(
+                data.to4X(),
+                locale.to4X(),
+                options.to4xOptions(),
+              )
+              : icu.Collator(locale.to4X(), options.to4xOptions());
 
   @override
   int compareImpl(String a, String b) => _collator.compare(a, b);
 }
 
 extension on CollationOptions {
   icu.CollatorOptions to4xOptions() {
-    final icuNumeric =
-        numeric ? icu.CollatorNumeric.on : icu.CollatorNumeric.off;
-
-    final icuCaseFirst = switch (caseFirst) {
-      CaseFirst.upper => icu.CollatorCaseFirst.upperFirst,
-      CaseFirst.lower => icu.CollatorCaseFirst.lowerFirst,
-      CaseFirst.localeDependent => icu.CollatorCaseFirst.off,
-    };
-
     final icuStrength = switch (sensitivity) {
       Sensitivity.base => icu.CollatorStrength.primary,
       Sensitivity.accent => icu.CollatorStrength.secondary,
@@ -56,12 +50,9 @@ extension on CollationOptions {
 
     return icu.CollatorOptions(
       strength: icuStrength,
-      numeric: icuNumeric,
-      caseFirst: icuCaseFirst,
       caseLevel: icuCaseLevel,
       alternateHandling: icu.CollatorAlternateHandling.nonIgnorable,
-      backwardSecondLevel: icu.CollatorBackwardSecondLevel.off,
-      maxVariable: icu.CollatorMaxVariable.auto,
+      //TODO(mosuem) maxVariable: map to ecma
     );
   }
 }

pkgs/intl4x/lib/src/collation/collation_ecma.dart

@@ -67,11 +67,6 @@ extension on CollationOptions {
   JSAny toJsOptions() =>
       {
         'localeMatcher': localeMatcher.jsName,
-        'usage': usage.name,
         if (sensitivity != null) 'sensitivity': sensitivity!.jsName,
-        'ignorePunctuation': ignorePunctuation,
-        'numeric': numeric,
-        'caseFirst': caseFirst.jsName,
-        if (collation != null) 'collation': collation,
       }.jsify()!;
 }

pkgs/intl4x/lib/src/collation/collation_options.dart

@@ -5,55 +5,26 @@
 import '../options.dart';
 
 class CollationOptions {
-  final Usage usage;
-  final Sensitivity? sensitivity;
-  final bool ignorePunctuation;
-  final bool numeric;
-  final CaseFirst caseFirst;
-  final String? collation;
   final LocaleMatcher localeMatcher;
+  final Sensitivity? sensitivity;
 
   const CollationOptions({
     this.localeMatcher = LocaleMatcher.bestfit,
-    this.usage = Usage.sort,
     this.sensitivity,
-    this.ignorePunctuation = false,
-    this.numeric = false,
-    this.caseFirst = CaseFirst.localeDependent,
-    this.collation,
   });
 
   CollationOptions copyWith({
-    Usage? usage,
-    Sensitivity? sensitivity,
-    bool? ignorePunctuation,
-    bool? numeric,
-    CaseFirst? caseFirst,
-    String? collation,
     LocaleMatcher? localeMatcher,
+    Sensitivity? sensitivity,
   }) {
     return CollationOptions(
-      usage: usage ?? this.usage,
       sensitivity: sensitivity ?? this.sensitivity,
-      ignorePunctuation: ignorePunctuation ?? this.ignorePunctuation,
-      numeric: numeric ?? this.numeric,
-      caseFirst: caseFirst ?? this.caseFirst,
-      collation: collation ?? this.collation,
       localeMatcher: localeMatcher ?? this.localeMatcher,
     );
   }
 }
 
-/// Whether to use collation for searching for strings in an array, or rather
-/// sorting an array of strings.
-///
-/// Example: For the `de` locale, `['AE', 'Ä']` is the correct order for
-/// [Usage.search], but `['Ä', 'AE']` for [Usage.sort].
-enum Usage { search, sort }
-
 /// Which differences in the strings should lead to non-zero result values.
-/// The default is [Sensitivity.variant] for usage [Usage.sort]; it's locale
-/// dependent for [Usage.search].
 enum Sensitivity {
   /// Only strings that differ in base letters compare as unequal.
   /// Examples: a ≠ b, a = á, a = A.
@@ -78,16 +49,3 @@ enum Sensitivity {
 
   const Sensitivity([this._jsName]);
 }
-
-/// How upper case or lower case letters should be sorted.
-enum CaseFirst {
-  upper,
-  lower,
-  localeDependent('false');
-
-  String get jsName => _jsName ?? name;
-
-  final String? _jsName;
-
-  const CaseFirst([this._jsName]);
-}

pkgs/intl4x/lib/src/data.dart

@@ -11,11 +11,3 @@ final class AssetData extends Data {
 
   const AssetData(this.key);
 }
-
-final class BundleData extends Data {
-  const BundleData();
-}
-
-final class NoData extends Data {
-  const NoData();
-}

pkgs/intl4x/lib/src/data_4x.dart

@@ -11,7 +11,5 @@ extension DataProvider on Data {
     AssetData() => icu.DataProvider.fromByteSlice(
       File((this as AssetData).key).readAsBytesSync().buffer,
     ),
-    BundleData() => icu.DataProvider.compiled(),
-    NoData() => icu.DataProvider.empty(),
   };
 }