Merge branch 'master' into big_nnbd_refactoring

# Conflicts:
#	pubspec.yaml
#	test/src/pick_test.dart

Author: passsy

CHANGELOG.md

@@ -1,3 +1,21 @@
+## 0.6.0-nullsafety.1
+
+- New `asXyzOrThrow()` methods as shorthand for `.required().asXyz()` featuring better error messages
+  - `asBoolOrThrow()`
+  - `asDateTimeOrThrow()`
+  - `asDoubleOrThrow()`
+  - `asIntOrThrow()`
+  - `letOrThrow()`
+  - `asListOrThrow()`
+  - `asMapOrThrow()`
+  - `asStringOrThrow()`
+- New `Pick.isAbsent` getter to check if a value is absent or `null` [#24](https://github.com/passsy/deep_pick/pull/24). Absent could mean
+  1. Accessing a key which doesn't exist in a `Map`
+  2. Reading the value from `List` when the index is greater than the length
+  3. Trying to access a key in a `Map` but the found data a `Object` which isn't a Map
+- The String `"true"` and `"false"` are now parsed as boolean
+- More nnbd refactoring
+
 ## 0.6.0-nullsafety.0
 
 - Migrate to nullsafety (required Dart >=2.12)

example/deep_pick_example.dart

@@ -81,7 +81,7 @@ void main() {
 
   // access value out of range
   final puma = pick(json, 'shoes', 1);
-  print(puma.isAbsent()); // true;
+  print(puma.isAbsent); // true;
   print(puma.value); // null
 }
 
@@ -111,7 +111,7 @@ class Shoe {
       tags: pick('tags').asListOrEmpty((it) => it.asString()),
       price: () {
         // when server doesn't send the price field the shoe is not available
-        if (pricePick.isAbsent()) return 'Not for sale';
+        if (pricePick.isAbsent) return 'Not for sale';
         return pricePick.asStringOrNull() ?? 'Price available soon';
       }(),
     );

lib/src/pick.dart

@@ -108,15 +108,15 @@ class Pick with PickLocation, PickContext<Pick> {
   /// - Trying to access a key in a [Map] but the found data structure is a [List]
   ///
   /// ```
-  /// pick({"a": null}, "a").isAbsent(); // false
-  /// pick({"a": null}, "b").isAbsent(); // true
+  /// pick({"a": null}, "a").isAbsent; // false
+  /// pick({"a": null}, "b").isAbsent; // true
   ///
-  /// pick([null], 0).isAbsent(); // false
-  /// pick([], 2).isAbsent(); // true
+  /// pick([null], 0).isAbsent; // false
+  /// pick([], 2).isAbsent; // true
   ///
-  /// pick([], "a").isAbsent(); // true
+  /// pick([], "a").isAbsent; // true
   /// ```
-  bool isAbsent() => missingValueAtIndex != null;
+  bool get isAbsent => missingValueAtIndex != null;
 
   @override
   List<dynamic> path;
@@ -166,7 +166,7 @@ class Pick with PickLocation, PickContext<Pick> {
       final more = fromContext(requiredPickErrorHintKey).value as String?;
       final moreSegment = more == null ? '' : ' $more';
       throw PickException('required value at location ${location()} '
-          'is ${isAbsent() ? 'absent' : 'null'}.$moreSegment');
+          'is ${isAbsent ? 'absent' : 'null'}.$moreSegment');
     }
     return RequiredPick(value, path: path, context: _context);
   }

lib/src/pick_double.dart

@@ -10,10 +10,41 @@ extension DoublePick on RequiredPick {
       return value.toDouble();
     }
     if (value is String) {
-      final parsed = double.tryParse(value);
+      var parsed = double.tryParse(value);
       if (parsed != null) {
         return parsed;
       }
+      // remove all spaces
+      final prepared = value.replaceAll(' ', '');
+
+      if (prepared.contains(',') && !prepared.contains('.')) {
+        // Germans use , instead of . as decimal separator
+        // 12,56 -> 12.56
+        parsed = double.tryParse(prepared.replaceAll(',', '.'));
+        if (parsed != null) {
+          return parsed;
+        }
+      }
+
+      // handle digit group separators
+      final firstDot = prepared.indexOf('.');
+      final firstComma = prepared.indexOf(',');
+
+      if (firstDot <= firstComma) {
+        // the germans again
+        // 10.000,00
+        parsed =
+            double.tryParse(prepared.replaceAll('.', '').replaceAll(',', '.'));
+        if (parsed != null) {
+          return parsed;
+        }
+      } else {
+        // 10,000.00
+        parsed = double.tryParse(prepared.replaceAll(',', ''));
+        if (parsed != null) {
+          return parsed;
+        }
+      }
     }
     throw PickException('value $value of type ${value.runtimeType} '
         'at location ${location()} can not be parsed as double');

pubspec.yaml

@@ -1,6 +1,6 @@
 name: deep_pick
 description: Simplifies manual JSON parsing with a type-safe API. No dynamic, no manual casting. Flexible inputs types, fixed output types. Useful parsing error messages
-version: 0.6.0-nullsafety.0
+version: 0.6.0-nullsafety.1
 homepage: https://github.com/passsy/deep_pick
 
 environment:

test/src/pick_double_test.dart

@@ -24,6 +24,17 @@ void main() {
         expect(pick('12345.01').asDoubleOrThrow(), 12345.01);
       });
 
+      test('parse german doubles', () {
+        expect(pick('1,0').asDoubleOrThrow(), 1.0);
+        expect(pick('12345,01').asDoubleOrThrow(), 12345.01);
+      });
+
+      test('parse double with separators', () {
+        expect(pick('12,345.01').asDoubleOrThrow(), 12345.01);
+        expect(pick('12 345,01').asDoubleOrThrow(), 12345.01);
+        expect(pick('12.345,01').asDoubleOrThrow(), 12345.01);
+      });
+
       test('null throws', () {
         expect(
           () => nullPick().asDoubleOrThrow(),

test/src/pick_test.dart

@@ -55,9 +55,10 @@ void main() {
 
     test('toString() prints value and path', () {
       expect(
-          // ignore: deprecated_member_use_from_same_package
-          Pick('a', path: ['b', 0]).toString(),
-          'Pick(value=a, path=[b, 0])');
+        // ignore: deprecated_member_use_from_same_package
+        Pick('a', path: ['b', 0]).toString(),
+        'Pick(value=a, path=[b, 0])',
+      );
     });
 
     test(
@@ -105,32 +106,32 @@ void main() {
       expect(level2Pick.path, [0, 'name']);
     });
 
-    group('isAbsent()', () {
+    group('isAbsent', () {
       test('is not absent because value', () {
         final p = pick('a');
         expect(p.value, isNotNull);
-        expect(p.isAbsent(), isFalse);
+        expect(p.isAbsent, isFalse);
         expect(p.missingValueAtIndex, null);
       });
 
       test('is not absent but null', () {
         final p = pick(null);
         expect(p.value, isNull);
-        expect(p.isAbsent(), isFalse);
+        expect(p.isAbsent, isFalse);
         expect(p.missingValueAtIndex, null);
       });
 
       test('is not absent but null further down', () {
         final p = pick({'a': null}, 'a');
         expect(p.value, isNull);
-        expect(p.isAbsent(), isFalse);
+        expect(p.isAbsent, isFalse);
         expect(p.missingValueAtIndex, null);
       });
 
       test('is not absent, not null', () {
         final p = pick({'a', 1}, 'b');
         expect(p.value, isNull);
-        expect(p.isAbsent(), isTrue);
+        expect(p.isAbsent, isTrue);
         expect(p.missingValueAtIndex, 0);
       });
 
@@ -140,7 +141,7 @@ void main() {
         };
         final p = pick(json, 'a', 'x' /*absent*/);
         expect(p.value, isNull);
-        expect(p.isAbsent(), isTrue);
+        expect(p.isAbsent, isTrue);
         expect(p.missingValueAtIndex, 1);
       });
     });
@@ -153,39 +154,39 @@ void main() {
         {'name': 'Daenerys Targaryen'},
       ];
       expect(pick(data, 10).value, isNull);
-      expect(pick(data, 10).isAbsent(), true);
+      expect(pick(data, 10).isAbsent, true);
     });
 
     test('unknown property in map returns null', () {
       final data = {'name': 'John Snow'};
       expect(pick(data, 'birthday').value, isNull);
-      expect(pick(data, 'birthday').isAbsent(), true);
+      expect(pick(data, 'birthday').isAbsent, true);
     });
 
     test('documentation example Map', () {
       final pa = pick({'a': null}, 'a');
       expect(pa.value, isNull);
-      expect(pa.isAbsent(), false);
+      expect(pa.isAbsent, false);
 
       final pb = pick({'a': null}, 'b');
       expect(pb.value, isNull);
-      expect(pb.isAbsent(), true);
+      expect(pb.isAbsent, true);
     });
 
     test('documentation example List', () {
       final p0 = pick([null], 0);
       expect(p0.value, isNull);
-      expect(p0.isAbsent(), false);
+      expect(p0.isAbsent, false);
 
       final p2 = pick([], 2);
       expect(p2.value, isNull);
-      expect(p2.isAbsent(), true);
+      expect(p2.isAbsent, true);
     });
 
     test('Map key for list', () {
       final p = pick([], 'a');
       expect(p.value, isNull);
-      expect(p.isAbsent(), true);
+      expect(p.isAbsent, true);
     });
   });