Switch from part structure to export layout (#169)

passsy · web-flow · commit 61f499b0c9e2 · 2023-07-16T04:02:40.000+02:00
diff --git a/lib/dartx.dart b/lib/dartx.dart
@@ -1,28 +1,19 @@
 /// Superpowers for Dart. Collection of useful static extension methods.
 library dartx;
 
-import 'dart:collection';
-import 'dart:convert';
-import 'dart:math';
-import 'dart:typed_data';
-
-import 'package:characters/characters.dart' as characters;
-import 'package:collection/collection.dart' as collection;
-import 'package:crypto/crypto.dart' as crypto;
-
 export 'package:characters/characters.dart';
 export 'package:time/time.dart';
 
-part 'src/arithmetic.dart';
-part 'src/comparable.dart';
-part 'src/comparator.dart';
-part 'src/function.dart';
-part 'src/int.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';
+export 'src/arithmetic.dart';
+export 'src/comparable.dart';
+export 'src/comparator.dart';
+export 'src/function.dart';
+export 'src/int.dart';
+export 'src/iterable.dart';
+export 'src/iterable_num.dart';
+export 'src/list.dart';
+export 'src/map.dart';
+export 'src/num.dart';
+export 'src/range.dart';
+export 'src/sorted_list.dart';
+export 'src/string.dart';
diff --git a/lib/dartx_io.dart b/lib/dartx_io.dart
@@ -1,14 +1,8 @@
 /// Superpowers for Dart IO. Collection of useful static extension methods.
 library dartx_io;
 
-import 'dart:convert';
-import 'dart:io';
-import 'dart:typed_data';
-
-import 'package:path/path.dart' as path_helper;
-
 export 'dartx.dart';
 
-part 'src/io/directory.dart';
-part 'src/io/file_system_entity.dart';
-part 'src/io/file.dart';
+export 'src/io/directory.dart';
+export 'src/io/file.dart';
+export 'src/io/file_system_entity.dart';
diff --git a/lib/src/arithmetic.dart b/lib/src/arithmetic.dart
@@ -1,5 +1,3 @@
-part of dartx;
-
 extension NumArithmeticX<T extends num> on T {
   /// Minus val if if it not null else returns `this`
   T? minus(T? val) => val == null ? this : this - val as T?;
diff --git a/lib/src/comparable.dart b/lib/src/comparable.dart
@@ -1,4 +1,4 @@
-part of dartx;
+import 'package:dartx/dartx.dart';
 
 /// Provides comparison operators for [Comparable] types.
 extension ComparableSmallerExtension<T extends Comparable<T>> on T {
diff --git a/lib/src/comparator.dart b/lib/src/comparator.dart
@@ -1,5 +1,3 @@
-part of dartx;
-
 extension CompararatorComposeExtensions<T> on Comparator<T> {
   /// return a new comparator,
   /// that sorts the items first by the criteria of this comparator,
diff --git a/lib/src/function.dart b/lib/src/function.dart
@@ -1,5 +1,3 @@
-part of dartx;
-
 typedef Function0<R> = R Function();
 typedef Function1<A, R> = R Function(A a);
 typedef Function2<A, B, R> = R Function(A a, B b);
diff --git a/lib/src/int.dart b/lib/src/int.dart
@@ -1,5 +1,3 @@
-part of dartx;
-
 extension Ordinals<T extends int> on T {
   /// Returns an ordinal number of `String` type for any integer
   ///
diff --git a/lib/src/io/directory.dart b/lib/src/io/directory.dart
@@ -1,4 +1,6 @@
-part of dartx_io;
+import 'dart:io';
+
+import 'package:path/path.dart' as path_helper;
 
 extension DirectorySubDirExtension on Directory {
   Directory subdir(
diff --git a/lib/src/io/file.dart b/lib/src/io/file.dart
@@ -1,4 +1,6 @@
-part of dartx_io;
+import 'dart:convert';
+import 'dart:io';
+import 'dart:typed_data';
 
 extension FileAppendBytesExtension on File {
   /// Appends an array of [bytes] to the content of this file.
diff --git a/lib/src/io/file_system_entity.dart b/lib/src/io/file_system_entity.dart
@@ -1,4 +1,6 @@
-part of dartx_io;
+import 'dart:io';
+
+import 'package:path/path.dart' as path_helper;
 
 extension FileSystemEntityNameExtension on FileSystemEntity {
   /// Gets the part of [path] after the last separator.
diff --git a/lib/src/iterable.dart b/lib/src/iterable.dart
@@ -1,4 +1,8 @@
-part of dartx;
+import 'dart:collection';
+import 'dart:math';
+
+import 'package:collection/collection.dart' as collection;
+import 'package:dartx/src/sorted_list.dart';
 
 extension IterableSecondItem<E> on Iterable<E> {
   /// Second element.
@@ -278,7 +282,7 @@ extension IterableSortedBy<E> on Iterable<E> {
   /// **Note:** The actual sorting is performed when an element is accessed for
   /// the first time.
   SortedList<E> sortedBy(Comparable Function(E element) selector) {
-    return SortedList<E>._withSelector(this, selector, 1, null);
+    return SortedList<E>.withSelector(this, selector, 1, null);
   }
 }
 
@@ -293,7 +297,7 @@ extension IterableSortedByDescending<E> on Iterable<E> {
   /// **Note:** The actual sorting is performed when an element is accessed for
   /// the first time.
   SortedList<E> sortedByDescending(Comparable Function(E element) selector) {
-    return SortedList<E>._withSelector(this, selector, -1, null);
+    return SortedList<E>.withSelector(this, selector, -1, null);
   }
 }
 
@@ -307,7 +311,7 @@ extension IterableSortedWith<E> on Iterable<E> {
   /// **Note:** The actual sorting is performed when an element is accessed for
   /// the first time.
   SortedList<E> sortedWith(Comparator<E> comparator) {
-    return SortedList<E>._(this, comparator);
+    return SortedList<E>(this, comparator);
   }
 }
 
diff --git a/lib/src/iterable_num.dart b/lib/src/iterable_num.dart
@@ -1,5 +1,3 @@
-part of dartx;
-
 /// Extensions for iterables
 extension IterableNumSumExtension<T extends num> on Iterable<T> {
   /// Returns the sum of all elements in the collection.
diff --git a/lib/src/list.dart b/lib/src/list.dart
@@ -1,6 +1,4 @@
-// ignore_for_file: deprecated_member_use
-
-part of dartx;
+import 'package:collection/collection.dart' as collection;
 
 extension ListExtension<E> on List<E> {
   /// Index of the first element or -1 if the collection is empty.
diff --git a/lib/src/map.dart b/lib/src/map.dart
@@ -1,5 +1,3 @@
-part of dartx;
-
 extension MapAll<K, V> on Map<K, V> {
   /// Returns true if all entries match the given [predicate].
   /// [predicate] must not be null.
diff --git a/lib/src/num.dart b/lib/src/num.dart
@@ -1,4 +1,6 @@
-part of dartx;
+import 'dart:typed_data';
+
+import 'package:dartx/dartx.dart';
 
 extension NumCoerceInExtension<T extends num> on T {
   /// Ensures that this value lies in the specified range
diff --git a/lib/src/range.dart b/lib/src/range.dart
@@ -1,4 +1,4 @@
-part of dartx;
+import 'dart:collection';
 
 /// Represents a range of values (for example, numbers or characters)
 /// with a fixed [start] value and a fixed [endInclusive] value.
diff --git a/lib/src/sorted_list.dart b/lib/src/sorted_list.dart
@@ -1,4 +1,5 @@
-part of dartx;
+import 'dart:math';
+import 'package:dartx/dartx.dart';
 
 Comparator<E> _getComparator<E>(
   int order,
@@ -17,12 +18,12 @@ class SortedList<E> extends _DelegatingList<E> {
   final Comparator<E> _comparator;
   List<E>? _sortedResults;
 
-  SortedList._(
+  SortedList(
     this._source,
     this._comparator,
   );
 
-  SortedList._withSelector(
+  SortedList.withSelector(
     this._source,
     Comparable Function(E element) selector,
     int order,
@@ -45,7 +46,7 @@ class SortedList<E> extends _DelegatingList<E> {
   /// **Note:** The actual sorting is performed when an element is accessed for
   /// the first time.
   SortedList<E> thenBy(Comparable Function(E element) selector) {
-    return SortedList<E>._withSelector(this, selector, 1, _comparator);
+    return SortedList<E>.withSelector(this, selector, 1, _comparator);
   }
 
   /// Returns a new list with all elements sorted according to previously
@@ -55,7 +56,7 @@ class SortedList<E> extends _DelegatingList<E> {
   /// **Note:** The actual sorting is performed when an element is accessed for
   /// the first time.
   SortedList<E> thenByDescending(Comparable Function(E element) selector) {
-    return SortedList<E>._withSelector(this, selector, -1, _comparator);
+    return SortedList<E>.withSelector(this, selector, -1, _comparator);
   }
 
   /// Returns a new list with all elements sorted according to previously
@@ -64,7 +65,7 @@ class SortedList<E> extends _DelegatingList<E> {
   /// **Note:** The actual sorting is performed when an element is accessed for
   /// the first time.
   SortedList<E> thenWith(Comparator<E> comparator) {
-    return SortedList<E>._(this, _comparator.compose(comparator));
+    return SortedList<E>(this, _comparator.compose(comparator));
   }
 
   @override
diff --git a/lib/src/string.dart b/lib/src/string.dart
@@ -1,4 +1,7 @@
-part of dartx;
+import 'dart:convert';
+
+import 'package:characters/characters.dart' as characters;
+import 'package:crypto/crypto.dart' as crypto;
 
 const _ascii = 0x007f;
 const _latin1 = 0x00ff;
diff --git a/test/sorted_list_test.dart b/test/sorted_list_test.dart
@@ -11,6 +11,14 @@ void main() {
   test('sort', () {
     expect([4, 2, 1, 3].sortedBy((it) => it), [1, 2, 3, 4]);
   });
+  test('thenBy', () {
+    final list = ['ba', 'c', 'aa'].sortedBy((it) => it.length);
+    expect(list, ['c', 'ba', 'aa']);
+    final thenBy = list.thenBy((it) => it);
+    expect(thenBy, ['c', 'aa', 'ba']);
+    final thenByDesc = list.thenByDescending((it) => it);
+    expect(thenByDesc, ['c', 'ba', 'aa']);
+  });
   group('_DelegatingIterable', () {
     test('any', () {
       expect(_sortedList.any((it) => it > 2), isTrue);

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-part of dartx;`
`2`		`-`
`3`	`1`	`extension NumArithmeticX<T extends num> on T {`
`4`	`2`	/// Minus val if if it not null else returns `this`
`5`	`3`	`T? minus(T? val) => val == null ? this : this - val as T?;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-part of dartx;`
	`1`	`+import 'package:dartx/dartx.dart';`
`2`	`2`
`3`	`3`	`/// Provides comparison operators for [Comparable] types.`
`4`	`4`	`extension ComparableSmallerExtension<T extends Comparable<T>> on T {`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-part of dartx;`
`2`		`-`
`3`	`1`	`extension CompararatorComposeExtensions<T> on Comparator<T> {`
`4`	`2`	`/// return a new comparator,`
`5`	`3`	`/// that sorts the items first by the criteria of this comparator,`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-part of dartx;`
`2`		`-`
`3`	`1`	`typedef Function0<R> = R Function();`
`4`	`2`	`typedef Function1<A, R> = R Function(A a);`
`5`	`3`	`typedef Function2<A, B, R> = R Function(A a, B b);`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-part of dartx;`
`2`		`-`
`3`	`1`	`extension Ordinals<T extends int> on T {`
`4`	`2`	/// Returns an ordinal number of `String` type for any integer
`5`	`3`	`///`