updated to nnbd

Author: OlehMarch

LICENSE

@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 2020, MarchDev Toolkit
+Copyright (c) 2021, MarchDev Toolkit
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

example/bin/main.dart

@@ -1,11 +1,11 @@
-// Copyright (c) 2020, the MarchDev Toolkit project authors. Please see the AUTHORS file
+// Copyright (c) 2021, the MarchDev Toolkit project authors. Please see the AUTHORS file
 // 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 'src/iterable.set.examples.dart';
-import 'src/iterable.math.examples.dart';
 import 'src/iterable.common.examples.dart';
 import 'src/iterable.comparable.examples.dart';
+import 'src/iterable.math.examples.dart';
+import 'src/iterable.set.examples.dart';
 
 main(List<String> arguments) {
   iterableCommonTest();

example/bin/src/iterable.common.examples.dart

@@ -1,4 +1,4 @@
-// Copyright (c) 2020, the MarchDev Toolkit project authors. Please see the AUTHORS file
+// Copyright (c) 2021, the MarchDev Toolkit project authors. Please see the AUTHORS file
 // 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.
 
@@ -218,7 +218,7 @@ void _notNull() {
 
   final numCollection = [null, ..._numCollection, null];
 
-  final result = numCollection.notNull;
+  final result = numCollection.notNull as Iterable<int>;
   assert(result.toString() == _numCollection.toString());
   print(result.toString());
 
@@ -240,7 +240,7 @@ void _group() {
           Pet("dog", "Rex"),
         ],
       }.toString()); // true
-  print(result?.toString());
+  print(result.toString());
 
   print('---- ----- ----\n');
 }
@@ -255,7 +255,7 @@ void _groupMap() {
         true: 2,
         false: 1,
       }.toString()); // true
-  print(result?.toString());
+  print(result.toString());
 
   print('---- -------- ----\n');
 }

example/bin/src/iterable.comparable.examples.dart

@@ -1,4 +1,4 @@
-// Copyright (c) 2020, the MarchDev Toolkit project authors. Please see the AUTHORS file
+// Copyright (c) 2021, the MarchDev Toolkit project authors. Please see the AUTHORS file
 // 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.
 
@@ -19,12 +19,12 @@ void _min() {
   // [ Pet("rat", "Mike"), Pet("dog", "Rex"), Pet("cat", "Lucy") ]
   var result = _collection.min;
   assert(result == Pet("cat", "Lucy")); // true
-  print(result?.toString());
+  print(result.toString());
 
   try {
     result = _emptyCollection.min; // []
     assert(false);
-    print(result?.toString());
+    print(result.toString());
   } catch (e) {
     assert(e is StateError); // true (No element)
     print(e.toString());
@@ -39,12 +39,12 @@ void _minWhere() {
   // [ Pet("rat", "Mike"), Pet("dog", "Rex"), Pet("cat", "Lucy") ]
   var result = _collection.minWhere((_) => _.name != "cat");
   assert(result == Pet("dog", "Rex")); // true
-  print(result?.toString());
+  print(result.toString());
 
   try {
     result = _collection.minWhere((_) => _.name == "rabbit"); // []
     assert(false);
-    print(result?.toString());
+    print(result.toString());
   } catch (e) {
     assert(e is StateError); // true (No element)
     print(e.toString());
@@ -89,12 +89,12 @@ void _max() {
   // [ Pet("rat", "Mike"), Pet("dog", "Rex"), Pet("cat", "Lucy") ]
   var result = _collection.max;
   assert(result == Pet("rat", "Mike")); // true
-  print(result?.toString());
+  print(result.toString());
 
   try {
     result = _emptyCollection.max; // []
     assert(false);
-    print(result?.toString());
+    print(result.toString());
   } catch (e) {
     assert(e is StateError); // true (No element)
     print(e.toString());
@@ -109,12 +109,12 @@ void _maxWhere() {
   // [ Pet("rat", "Mike"), Pet("dog", "Rex"), Pet("cat", "Lucy") ]
   var result = _collection.maxWhere((_) => _.name != "cat");
   assert(result == Pet("rat", "Mike")); // true
-  print(result?.toString());
+  print(result.toString());
 
   try {
     result = _collection.maxWhere((_) => _.name == "rabbit"); // []
     assert(false);
-    print(result?.toString());
+    print(result.toString());
   } catch (e) {
     assert(e is StateError); // true (No element)
     print(e.toString());

example/bin/src/iterable.math.examples.dart

@@ -1,4 +1,4 @@
-// Copyright (c) 2020, the MarchDev Toolkit project authors. Please see the AUTHORS file
+// Copyright (c) 2021, the MarchDev Toolkit project authors. Please see the AUTHORS file
 // 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.
 

example/bin/src/iterable.set.examples.dart

@@ -1,4 +1,4 @@
-// Copyright (c) 2020, the MarchDev Toolkit project authors. Please see the AUTHORS file
+// Copyright (c) 2021, the MarchDev Toolkit project authors. Please see the AUTHORS file
 // 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.
 
@@ -21,6 +21,6 @@ void iterableSetTest() {
   print(collectionOne.intersectionWhere(collectionTwo, (_) => _ < 4)); // []
   print(collectionOne.differenceWhere(collectionTwo, (_) => _ < 4)); // [2]
   print(collectionTwo.differenceWhere(collectionOne, (_) => _ < 4)); // [1, 3]
- 
+
   print('---- ------------ ----\n');
 }

example/bin/src/pet.model.dart

@@ -1,4 +1,4 @@
-// Copyright (c) 2020, the MarchDev Toolkit project authors. Please see the AUTHORS file
+// Copyright (c) 2021, the MarchDev Toolkit project authors. Please see the AUTHORS file
 // 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.
 

example/pubspec.yaml

@@ -2,7 +2,7 @@ name: flinq_example
 description: Example command line application of flinq package.
 
 environment:
-  sdk: '>=2.6.0 <3.0.0'
+  sdk: '>=2.12.0 <3.0.0'
 
 dependencies:
   flinq:

lib/flinq.dart

@@ -1,10 +1,10 @@
-// Copyright (c) 2020, the MarchDev Toolkit project authors. Please see the AUTHORS file
+// Copyright (c) 2021, the MarchDev Toolkit project authors. Please see the AUTHORS file
 // 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.
 
 library flinq;
 
-export 'src/iterable.comparable.extension.dart';
 export 'src/iterable.common.extension.dart';
+export 'src/iterable.comparable.extension.dart';
 export 'src/iterable.math.extension.dart';
 export 'src/iterable.set.extension.dart';

lib/src/iterable.common.extension.dart

@@ -1,15 +1,17 @@
-// Copyright (c) 2020, the MarchDev Toolkit project authors. Please see the AUTHORS file
+// Copyright (c) 2021, the MarchDev Toolkit project authors. Please see the AUTHORS file
 // 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 'package:collection/collection.dart' show IterableExtension;
+
 /// Common extensions for `Iterable`
 extension IterableCommonExtension<T> on Iterable<T> {
   /// Returns the first element.
   ///
   /// If `this` is empty, the result of invoking is [null].
   /// Otherwise returns the first element in the iteration order,
   /// equivalent to `this.elementAt(0)`.
-  T get firstOrNull => this.firstWhere((_) => true, orElse: () => null);
+  T? get firstOrNull => this.firstWhereOrNull((_) => true);
 
   /// Returns the last element.
   ///
@@ -19,21 +21,20 @@ extension IterableCommonExtension<T> on Iterable<T> {
   /// Some iterables may have more efficient ways to find the last element
   /// (for example a list can directly access the last element,
   /// without iterating through the previous ones).
-  T get lastOrNull => this.lastWhere((_) => true, orElse: () => null);
+  T? get lastOrNull => this.lastWhereOrNull((_) => true);
 
   /// Checks that this iterable has only one element, and returns that element.
   ///
   /// If `this` has no element, the result is [null].
   /// Throws a [StateError] if `this` has more than one element.
-  T get singleOrNull => this.singleWhere((_) => true, orElse: () => null);
+  T? get singleOrNull => this.singleWhereOrNull((_) => true);
 
   /// Returns the first element that satisfies the given predicate [test].
   ///
   /// Iterates through elements and returns the first to satisfy [test].
   ///
   /// If no element satisfies [test], the result of invoking is [null].
-  T firstOrNullWhere(bool test(T element)) =>
-      this.firstWhere(test, orElse: () => null);
+  T? firstOrNullWhere(bool test(T element)) => this.firstWhereOrNull(test);
 
   /// Returns the last element that satisfies the given predicate [test].
   ///
@@ -45,17 +46,15 @@ extension IterableCommonExtension<T> on Iterable<T> {
   /// and finally returns that last one that matched.
   ///
   /// If no element satisfies [test], the result of invoking is [null].
-  T lastOrNullWhere(bool test(T element)) =>
-      this.lastWhere(test, orElse: () => null);
+  T? lastOrNullWhere(bool test(T element)) => this.lastWhereOrNull(test);
 
   /// Returns the single element that satisfies [test].
   ///
   /// Checks elements to see if `test(element)` returns true.
   /// If exactly one element satisfies [test], that element is returned.
   /// If more than one matching element is found, throws [StateError].
   /// If no matching element is found, returns [null].
-  T singleOrNullWhere(bool test(T element)) =>
-      this.singleWhere(test, orElse: () => null);
+  T? singleOrNullWhere(bool test(T element)) => this.singleWhereOrNull(test);
 
   /// Maps [Iterable] and casts it to a [List].
   ///
@@ -120,7 +119,7 @@ extension IterableCommonExtension<T> on Iterable<T> {
       final key = by(value);
 
       if (map.containsKey(key)) {
-        map[key].add(value);
+        map[key]!.add(value);
       } else {
         map[key] = <T>[value];
       }