Organize imports and fix trailing commas

lib/dartx.dart

@@ -10,17 +10,17 @@ import 'package:characters/characters.dart' as characters;
 import 'package:collection/collection.dart' as collection;
 import 'package:crypto/crypto.dart' as crypto;
 
-export 'package:time/time.dart';
 export 'package:characters/characters.dart';
+export 'package:time/time.dart';
 
 part 'src/comparable.dart';
 part 'src/comparator.dart';
 part 'src/function.dart';
-part 'src/iterable_num.dart';
 part 'src/iterable.dart';
+part 'src/iterable_num.dart';
 part 'src/list.dart';
 part 'src/map.dart';
 part 'src/num.dart';
+part 'src/range.dart';
 part 'src/sorted_list.dart';
 part 'src/string.dart';
-part 'src/range.dart';

lib/src/comparable.dart

@@ -26,8 +26,10 @@ extension ComparableCoerceInExtension<T extends Comparable<T>> on T {
   /// or [maximumValue] if this value is greater than [maximumValue].
   T coerceIn(T minimumValue, [T? maximumValue]) {
     if (maximumValue != null && minimumValue > maximumValue) {
-      throw ArgumentError('Cannot coerce value to an empty range: '
-          'maximum $maximumValue is less than minimum $minimumValue.');
+      throw ArgumentError(
+        'Cannot coerce value to an empty range: '
+        'maximum $maximumValue is less than minimum $minimumValue.',
+      );
     }
     if (this < minimumValue) return minimumValue;
     if (maximumValue != null && this > maximumValue) return maximumValue;

lib/src/io/directory.dart

@@ -1,13 +1,15 @@
 part of dartx_io;
 
 extension DirectorySubDirExtension on Directory {
-  Directory subdir(String part1,
-      [String? part2,
-      String? part3,
-      String? part4,
-      String? part5,
-      String? part6,
-      String? part7]) {
+  Directory subdir(
+    String part1, [
+    String? part2,
+    String? part3,
+    String? part4,
+    String? part5,
+    String? part6,
+    String? part7,
+  ]) {
     return Directory(
       path_helper.join(path, part1, part2, part3, part4, part5, part6, part7),
     );
@@ -35,7 +37,9 @@ extension DirectoryCopyRecursivelyExtension on Directory {
     await target.create(recursive: true);
     await for (final file in list(recursive: true)) {
       final copyTo = path_helper.join(
-          target.path, path_helper.relative(file.path, from: path));
+        target.path,
+        path_helper.relative(file.path, from: path),
+      );
       if (file is Directory) {
         await Directory(copyTo).create(recursive: true);
       } else if (file is File) {
@@ -56,11 +60,14 @@ extension DirectoryContainsExtension on Directory {
   /// Returns a [Future<bool>] holding the value.
   ///
   /// For the sync method, see [containsSync()].
-  Future<bool> contains(FileSystemEntity entity,
-      {bool recursive = false}) async {
+  Future<bool> contains(
+    FileSystemEntity entity, {
+    bool recursive = false,
+  }) async {
     final entities = list(recursive: recursive);
     return entities.any(
-        (element) => FileSystemEntity.identicalSync(entity.path, element.path));
+      (element) => FileSystemEntity.identicalSync(entity.path, element.path),
+    );
   }
 }
 
@@ -76,7 +83,8 @@ extension DirectoryContainsSyncExtension on Directory {
   bool containsSync(FileSystemEntity entity, {bool recursive = false}) {
     final entities = listSync(recursive: recursive);
     return entities.any(
-        (element) => FileSystemEntity.identicalSync(entity.path, element.path));
+      (element) => FileSystemEntity.identicalSync(entity.path, element.path),
+    );
   }
 }
 

lib/src/io/file.dart

@@ -26,7 +26,9 @@ extension FileForEachBlockExtension on File {
   ///
   /// You can use this function for huge files.
   Future<void> forEachBlock(
-      int blockSize, void Function(Uint8List buffer) action) async {
+    int blockSize,
+    void Function(Uint8List buffer) action,
+  ) async {
     final raf = await open();
     // ignore: literal_only_boolean_expressions
     while (true) {

lib/src/iterable.dart

@@ -600,7 +600,9 @@ extension IterableFilterIndexedTo<E> on Iterable<E> {
   /// Appends all elements matching the given [predicate] to the given
   /// [destination].
   void filterIndexedTo(
-          List<E> destination, bool Function(E element, int index) predicate) =>
+    List<E> destination,
+    bool Function(E element, int index) predicate,
+  ) =>
       whereIndexedTo(destination, predicate);
 }
 
@@ -627,7 +629,9 @@ extension IterableFilterNotToIndexed<E> on Iterable<E> {
   /// Appends all elements not matching the given [predicate] to the given
   /// [destination].
   void filterNotToIndexed(
-          List<E> destination, bool Function(E element, int index) predicate) =>
+    List<E> destination,
+    bool Function(E element, int index) predicate,
+  ) =>
       whereNotToIndexed(destination, predicate);
 }
 
@@ -639,7 +643,8 @@ extension IterableFilterNotNull<E> on Iterable<E?> {
 extension IterableWhereIndexed<E> on Iterable<E> {
   /// Returns all elements that satisfy the given [predicate].
   Iterable<E> whereIndexed(
-      bool Function(E element, int index) predicate) sync* {
+    bool Function(E element, int index) predicate,
+  ) sync* {
     var index = 0;
     for (final element in this) {
       if (predicate(element, index++)) {
@@ -665,7 +670,9 @@ extension IterableWhereIndexedTo<E> on Iterable<E> {
   /// Appends all elements matching the given [predicate] to the given
   /// [destination].
   void whereIndexedTo(
-      List<E> destination, bool Function(E element, int index) predicate) {
+    List<E> destination,
+    bool Function(E element, int index) predicate,
+  ) {
     var index = 0;
     for (final element in this) {
       if (predicate(element, index++)) {
@@ -689,7 +696,8 @@ extension IterableWhereNot<E> on Iterable<E> {
 extension IterableWhereNotIndexed<E> on Iterable<E> {
   /// Returns all elements not matching the given [predicate].
   Iterable<E> whereNotIndexed(
-      bool Function(E element, int index) predicate) sync* {
+    bool Function(E element, int index) predicate,
+  ) sync* {
     var index = 0;
     for (final element in this) {
       if (!predicate(element, index++)) {
@@ -715,7 +723,9 @@ extension IterableWhereNotToIndexed<E> on Iterable<E> {
   /// Appends all elements not matching the given [predicate] to the given
   /// [destination].
   void whereNotToIndexed(
-      List<E> destination, bool Function(E element, int index) predicate) {
+    List<E> destination,
+    bool Function(E element, int index) predicate,
+  ) {
     var index = 0;
     for (final element in this) {
       if (!predicate(element, index++)) {

lib/src/map.dart

@@ -156,7 +156,8 @@ extension MapMapValues<K, V> on Map<K, V> {
 extension MapMaxBy<K, V> on Map<K, V> {
   /// Returns the first entry yielding the largest value of the given function or `null` if there are no entries.
   MapEntry<K, V>? maxBy<R extends Comparable>(
-      R Function(MapEntry<K, V>) selector) {
+    R Function(MapEntry<K, V>) selector,
+  ) {
     final i = entries.iterator;
     if (!i.moveNext()) return null;
     MapEntry<K, V> maxElement = i.current;
@@ -192,7 +193,8 @@ extension MapMaxWith<K, V> on Map<K, V> {
 extension MapMinBy<K, V> on Map<K, V> {
   /// Returns the first entry yielding the smallest value of the given function or `null` if there are no entries.
   MapEntry<K, V>? minBy<R extends Comparable>(
-      R Function(MapEntry<K, V>) selector) {
+    R Function(MapEntry<K, V>) selector,
+  ) {
     final i = entries.iterator;
     if (!i.moveNext()) return null;
     MapEntry<K, V> minElement = i.current;
@@ -278,7 +280,7 @@ class Pair<A, B> {
   final B second;
 
   @override
-  String toString() => "($first, $second)";
+  String toString() => '($first, $second)';
 
   @override
   bool operator ==(Object other) =>

lib/src/num.dart

@@ -16,8 +16,10 @@ extension NumCoerceInExtension<T extends num> on T {
   /// ````
   T coerceIn(T minimumValue, [T? maximumValue]) {
     if (maximumValue != null && minimumValue > maximumValue) {
-      throw ArgumentError('Cannot coerce value to an empty range: '
-          'maximum $maximumValue is less than minimum $minimumValue.');
+      throw ArgumentError(
+        'Cannot coerce value to an empty range: '
+        'maximum $maximumValue is less than minimum $minimumValue.',
+      );
     }
     if (this < minimumValue) return minimumValue;
     if (maximumValue != null && this > maximumValue) return maximumValue;

lib/src/sorted_list.dart

@@ -1,8 +1,10 @@
 part of dartx;
 
 Comparator<E> _getComparator<E>(
-    int order, Comparable Function(E element) selector,
-    {Comparator<E>? parent}) {
+  int order,
+  Comparable Function(E element) selector, {
+  Comparator<E>? parent,
+}) {
   int newComparator(E a, E b) {
     return order * selector(a).compareTo(selector(b));
   }
@@ -190,8 +192,12 @@ abstract class _DelegatingList<E> extends _DelegatingIterable<E>
       delegate.setAll(index, iterable);
 
   @override
-  void setRange(int start, int end, Iterable<E> iterable,
-          [int skipCount = 0]) =>
+  void setRange(
+    int start,
+    int end,
+    Iterable<E> iterable, [
+    int skipCount = 0,
+  ]) =>
       delegate.setRange(start, end, iterable, skipCount);
 
   @override

test/comparable_test.dart

@@ -14,47 +14,61 @@ class _WrappedInt implements Comparable<_WrappedInt> {
 void main() {
   group('ComparableX', () {
     test('.coerceIn()', () {
-      expect(DateTime(1984, 11, 19).coerceIn(DateTime(1984, 11, 1)),
-          DateTime(1984, 11, 19));
       expect(
-          DateTime(1984, 11, 19).coerceIn(
-            DateTime(1984, 11, 1),
-            DateTime(1984, 11, 20),
-          ),
-          DateTime(1984, 11, 19));
+        DateTime(1984, 11, 19).coerceIn(DateTime(1984, 11, 1)),
+        DateTime(1984, 11, 19),
+      );
       expect(
-          DateTime(1984, 10, 28).coerceIn(
-            DateTime(1984, 11, 1),
-            DateTime(1984, 11, 20),
-          ),
-          DateTime(1984, 11, 1));
+        DateTime(1984, 11, 19).coerceIn(
+          DateTime(1984, 11, 1),
+          DateTime(1984, 11, 20),
+        ),
+        DateTime(1984, 11, 19),
+      );
       expect(
-          DateTime(1984, 12, 1).coerceIn(
-            DateTime(1984, 11, 1),
-            DateTime(1984, 11, 20),
-          ),
-          DateTime(1984, 11, 20));
+        DateTime(1984, 10, 28).coerceIn(
+          DateTime(1984, 11, 1),
+          DateTime(1984, 11, 20),
+        ),
+        DateTime(1984, 11, 1),
+      );
+      expect(
+        DateTime(1984, 12, 1).coerceIn(
+          DateTime(1984, 11, 1),
+          DateTime(1984, 11, 20),
+        ),
+        DateTime(1984, 11, 20),
+      );
       expect(() => 10.coerceIn(3, 2), throwsArgumentError);
       expect(
-          () => DateTime.now().coerceIn(
-                DateTime(1984, 11, 20),
-                DateTime(1984, 11, 1),
-              ),
-          throwsArgumentError);
+        () => DateTime.now().coerceIn(
+          DateTime(1984, 11, 20),
+          DateTime(1984, 11, 1),
+        ),
+        throwsArgumentError,
+      );
     });
 
     test('.coerceAtLeast()', () {
-      expect(DateTime(1984, 11, 19).coerceAtLeast(DateTime(1984, 1, 1)),
-          DateTime(1984, 11, 19));
-      expect(DateTime(1984, 11, 19).coerceAtLeast(DateTime(1984, 11, 20)),
-          DateTime(1984, 11, 20));
+      expect(
+        DateTime(1984, 11, 19).coerceAtLeast(DateTime(1984, 1, 1)),
+        DateTime(1984, 11, 19),
+      );
+      expect(
+        DateTime(1984, 11, 19).coerceAtLeast(DateTime(1984, 11, 20)),
+        DateTime(1984, 11, 20),
+      );
     });
 
     test('.coerceAtMost()', () {
-      expect(DateTime(1984, 11, 19).coerceAtMost(DateTime(1984, 11, 20)),
-          DateTime(1984, 11, 19));
-      expect(DateTime(1984, 11, 19).coerceAtMost(DateTime(1984, 11, 1)),
-          DateTime(1984, 11, 1));
+      expect(
+        DateTime(1984, 11, 19).coerceAtMost(DateTime(1984, 11, 20)),
+        DateTime(1984, 11, 19),
+      );
+      expect(
+        DateTime(1984, 11, 19).coerceAtMost(DateTime(1984, 11, 1)),
+        DateTime(1984, 11, 1),
+      );
     });
 
     test('.between()', () {

test/directory.dart

@@ -1,8 +1,8 @@
 import 'dart:io';
 
+import 'package:dartx/dartx_io.dart';
 import 'package:path/path.dart';
 import 'package:test/test.dart';
-import 'package:dartx/dartx_io.dart';
 
 void main() {
   group('Directory', () {

test/file_system_entity.dart

@@ -1,7 +1,7 @@
 import 'dart:io';
 
-import 'package:test/test.dart';
 import 'package:dartx/dartx_io.dart';
+import 'package:test/test.dart';
 
 void main() {
   group('FileSystemEntity', () {

test/function_test.dart

@@ -1,6 +1,6 @@
 // ignore_for_file: prefer_function_declarations_over_variables
-import 'package:test/test.dart';
 import 'package:dartx/dartx.dart';
+import 'package:test/test.dart';
 
 void main() {
   group('Function', () {

test/iterable_num_test.dart

@@ -1,5 +1,5 @@
-import 'package:test/test.dart';
 import 'package:dartx/dartx.dart';
+import 'package:test/test.dart';
 
 void main() {
   group('IterableNumX', () {