Merge pull request #645 from RodrigoSMarques/nullsafety

New method for ParseQuery / Bugfix ParseQuery methods / Bugfix ParseRelation.getQuery

Author: RodrigoSMarques

packages/dart/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 3.1.0
+Bug fixes
+General improvements
+Updated dependencies
+
+## 3.0.0
+Stable null safety release.
+
 ## 2.1.0
 Option para uses ParseHTTPClient (default) or ParseDioClient (slow on Flutter Web).
     **BREAKING CHANGE** if use progress callback at the file upload in version 2.0.1
@@ -6,6 +14,7 @@ Changed to the method POST on Login
 Bug fixes
 General improvements
 Updated dependencies
+
 ## 2.0.1
 Fixed network exceptions. [#482](https://github.com/parse-community/Parse-SDK-Flutter/pull/482)
 

packages/dart/README.md

@@ -17,13 +17,8 @@ This is a Dart package that allows communication with a Parse Server, (https://p
 This is a work in progress and we are consistently updating it. Please let us know if you think anything needs changing/adding, and more than ever, please do join in on this project. (Even if it is just to improve our documentation)
 
 ## Getting Started
-To install, either add to your pubspec.yaml
-```yml
-dependencies:  
-    parse_server_sdk: ^2.1.0
-```
-or clone this repository and add to your project. As this is an early development with multiple contributors, it is probably best to download/clone and keep updating as an when a new feature is added.
 
+To install, either add [dependency in your pubspec.yaml file](https://pub.dev/packages/parse_server_sdk/install).
 
 Once you have the library added to your project, upon first call to your app (Similar to what your application class would be) add the following...
 
@@ -66,7 +61,6 @@ When running via express, set [ParseServerOptions](https://parseplatform.org/par
 
 Be aware that for web ParseInstallation does include app name, version or package identifier.
 
-
 ## Objects
 You can create custom objects by calling:
 ```dart
@@ -312,6 +306,7 @@ The features available are:-
  * WithinKilometers
  * WithinRadians
  * WithinGeoBox
+ * WithinPolygon
  * MatchesQuery
  * DoesNotMatchQuery
  * MatchesKeyInQuery

packages/dart/lib/src/network/parse_query.dart

@@ -115,10 +115,10 @@ class QueryBuilder<T extends ParseObject> {
       {bool caseSensitive = false}) {
     if (caseSensitive) {
       queries.add(MapEntry<String, dynamic>(
-          _SINGLE_QUERY, '\"$column\":{\"\$regex\": \"$query^\"}'));
+          _SINGLE_QUERY, '\"$column\":{\"\$regex\": \"$query\$\"}'));
     } else {
       queries.add(MapEntry<String, dynamic>(_SINGLE_QUERY,
-          '\"$column\":{\"\$regex\": \"$query^\", \"\$options\": \"i\"}'));
+          '\"$column\":{\"\$regex\": \"$query\$\", \"\$options\": \"i\"}'));
     }
   }
 
@@ -226,11 +226,14 @@ class QueryBuilder<T extends ParseObject> {
   /// Powerful search for containing whole words. This search is much quicker than regex and can search for whole words including wether they are case sensitive or not.
   /// This search can also order by the score of the search
   void whereContainsWholeWord(String column, String query,
-      {bool caseSensitive = false, bool orderByScore = true}) {
+      {bool caseSensitive = false,
+      bool orderByScore = true,
+      bool diacriticSensitive = false}) {
     queries.add(MapEntry<String, dynamic>(_SINGLE_QUERY,
-        '\"$column\":{\"\$text\":{\"\$search\":{\"\$term\": \"$query\", \"\$caseSensitive\": $caseSensitive }}}'));
+        '\"$column\":{\"\$text\":{\"\$search\":{\"\$term\": \"$query\", \"\$caseSensitive\": $caseSensitive , \"\$diacriticSensitive\": $diacriticSensitive }}}'));
     if (orderByScore) {
-      orderByDescending('score');
+      orderByAscending('\$score');
+      keysToReturn(['\$score']);
     }
   }
 
@@ -285,7 +288,20 @@ class QueryBuilder<T extends ParseObject> {
         '\"$column\":{\"\$within\":{\"\$box\": [{\"__type\": \"GeoPoint\",\"latitude\":$latitudeS,\"longitude\":$longitudeS},{\"__type\": \"GeoPoint\",\"latitude\":$latitudeN,\"longitude\":$longitudeN}]}}'));
   }
 
-  // Add a constraint to the query that requires a particular key's value match another QueryBuilder
+  /// Return an object with key coordinates be contained within and on the bounds of a given polygon.
+  /// Supports closed and open (last point is connected to first) paths
+  /// Polygon must have at least 3 points
+  void whereWithinPolygon(String column, List<ParseGeoPoint> points) {
+    if (points.length < 3)
+      throw ArgumentError('Polygon must have at least 3 points');
+    Map<String, dynamic> dictionary = <String, dynamic>{};
+    dictionary['\$polygon'] = points.map((e) => e.toJson()).toList();
+
+    queries.add(MapEntry<String, dynamic>(_SINGLE_QUERY,
+        '\"$column\":{\"\$geoWithin\":${jsonEncode(dictionary)}}'));
+  }
+
+  /// Add a constraint to the query that requires a particular key's value match another QueryBuilder
   void whereMatchesQuery<E extends ParseObject>(
       String column, QueryBuilder<E> query) {
     final String inQuery =
@@ -295,7 +311,7 @@ class QueryBuilder<T extends ParseObject> {
         _SINGLE_QUERY, '\"$column\":{\"\$inQuery\":$inQuery}'));
   }
 
-  //Add a constraint to the query that requires a particular key's value does not match another QueryBuilder
+  ///Add a constraint to the query that requires a particular key's value does not match another QueryBuilder
   void whereDoesNotMatchQuery<E extends ParseObject>(
       String column, QueryBuilder<E> query) {
     final String inQuery =
@@ -305,7 +321,7 @@ class QueryBuilder<T extends ParseObject> {
         _SINGLE_QUERY, '\"$column\":{\"\$notInQuery\":$inQuery}'));
   }
 
-  // Add a constraint to the query that requires a particular key's value matches a value for a key in the results of another ParseQuery.
+  /// Add a constraint to the query that requires a particular key's value matches a value for a key in the results of another ParseQuery.
   void whereMatchesKeyInQuery<E extends ParseObject>(
       String column, String keyInQuery, QueryBuilder<E> query) {
     if (query.queries.isEmpty) {
@@ -325,7 +341,7 @@ class QueryBuilder<T extends ParseObject> {
         _SINGLE_QUERY, '\"$column\":{\"\$select\":$inQuery}'));
   }
 
-  // Add a constraint to the query that requires a particular key's value does not match any value for a key in the results of another ParseQuery
+  /// Add a constraint to the query that requires a particular key's value does not match any value for a key in the results of another ParseQuery
   void whereDoesNotMatchKeyInQuery<E extends ParseObject>(
       String column, String keyInQuery, QueryBuilder<E> query) {
     if (query.queries.isEmpty) {

packages/dart/lib/src/objects/parse_geo_point.dart

@@ -5,7 +5,15 @@ const String keyLongitude = 'longitude';
 
 class ParseGeoPoint {
   /// Creates a Parse Object of type GeoPoint
-  ParseGeoPoint({this.latitude = 0.0, this.longitude = 0.0});
+  ParseGeoPoint({this.latitude = 0.0, this.longitude = 0.0})
+      : assert(
+            latitude < 90, 'Latitude must be within the range (-90.0, 90.0).'),
+        assert(
+            latitude > -90, 'Latitude must be within the range (-90.0, 90.0).'),
+        assert(latitude < 180,
+            'Longitude must be within the range (-180.0, 180.0).'),
+        assert(latitude > -180,
+            'Longitude must be within the range (-180.0, 180.0).');
 
   double latitude, longitude;
 
@@ -15,4 +23,9 @@ class ParseGeoPoint {
         'latitude': latitude,
         'longitude': longitude
       };
+
+  @override
+  String toString() {
+    return 'latitude: $latitude, longitude: $longitude';
+  }
 }

packages/dart/lib/src/objects/parse_relation.dart

@@ -3,6 +3,10 @@ part of flutter_parse_sdk;
 // ignore_for_file: always_specify_types
 class ParseRelation<T extends ParseObject> {
   ParseRelation({required ParseObject parent, required String key}) {
+    if (!parent.containsKey(key)) {
+      throw 'Invalid Relation key name';
+    }
+    _targetClass = parent.get<ParseRelation>(key)!.getTargetClass;
     _parent = parent;
     _key = key;
     _parentObjectId = parent.objectId!;
@@ -41,6 +45,8 @@ class ParseRelation<T extends ParseObject> {
     _parent!.removeRelation(_key, _knownObjects!.toList());
   }
 
+  String get getTargetClass => _targetClass ?? '';
+
   Map<String, dynamic> toJson() => <String, dynamic>{
         '__type': keyRelation,
         'className': _targetClass,

packages/dart/pubspec.yaml

@@ -9,11 +9,11 @@ environment:
 dependencies:
   # Networking
   dio: ^4.0.0
-  http: ^0.13.1
-  web_socket_channel: ^2.0.0
+  http: ^0.13.3
+  web_socket_channel: ^2.1.0
 
   #Database
-  sembast: ^3.0.1
+  sembast: ^3.1.0+2
   sembast_web: ^2.0.0+2
   xxtea: ^2.1.0
 
@@ -25,6 +25,6 @@ dependencies:
 
 dev_dependencies:
   # Testing
-  build_runner: ^2.0.1
-  mockito: ^5.0.4
-  test: ^1.16.8
+  build_runner: ^2.0.4
+  mockito: ^5.0.10
+  test: ^1.17.7

packages/flutter/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 3.1.0
+Bug fixes
+General improvements
+Updated dependencies
+
+## 3.0.0
+Stable null safety release.
+
 ## 2.1.0
 Option para uses ParseHTTPClient (default) or ParseDioClient (slow on Flutter Web).
     **BREAKING CHANGE** if use progress callback at the file upload in version 2.0.1

packages/flutter/README.md

@@ -11,13 +11,7 @@ Hi, this is a Flutter plugin that allows communication with a Parse Server, (htt
 This is a work in progress and we are consistently updating it. Please let us know if you think anything needs changing/adding, and more than ever, please do join in on this project. (Even if it is just to improve our documentation)
 
 ## Getting Started
-To install, either add to your pubspec.yaml
-```yml
-dependencies:  
-    parse_server_sdk_flutter: ^3.1.0
-```
-or clone this repository and add to your project. As this is an early development with multiple contributors, it is probably best to download/clone and keep updating as an when a new feature is added.
-
+To install, either add [dependency in your pubspec.yaml file](https://pub.dev/packages/parse_server_sdk_flutter/install).
 
 Once you have the library added to your project, upon first call to your app (Similar to what your application class would be) add the following...
 
@@ -329,6 +323,7 @@ The features available are:-
  * WithinKilometers
  * WithinRadians
  * WithinGeoBox
+ * WithinPolygon
  * MatchesQuery
  * DoesNotMatchQuery
  * MatchesKeyInQuery

packages/flutter/example/linux/flutter/ephemeral/.plugin_symlinks/connectivity_plus_linux

@@ -1 +1 @@
-C:/flutter/.pub-cache/hosted/pub.dartlang.org/connectivity_plus_linux-1.0.1/
+/Users/rodrigo/flutter/.pub-cache/hosted/pub.dartlang.org/connectivity_plus_linux-1.0.2/

packages/flutter/example/linux/flutter/ephemeral/.plugin_symlinks/path_provider_linux

@@ -1 +1 @@
-C:/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_linux-2.0.0/
+/Users/rodrigo/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_linux-2.0.0/

packages/flutter/example/linux/flutter/ephemeral/.plugin_symlinks/shared_preferences_linux

@@ -1 +1 @@
-C:/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences_linux-2.0.0/
+/Users/rodrigo/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences_linux-2.0.0/

packages/flutter/pubspec.yaml

@@ -10,12 +10,12 @@ dependencies:
   flutter:
     sdk: flutter
 
-  # Uncomment for Release version
-  parse_server_sdk: ^3.1.0
+  #Uncomment for Release version
+  #parse_server_sdk: ^3.1.0
 
   # Uncomment for local testing
-  #parse_server_sdk:
-  #   path: ../dart
+  parse_server_sdk:
+     path: ../dart
 
   # Uncomment for test with Github Branch
   #parse_server_sdk:
@@ -41,4 +41,4 @@ dev_dependencies:
   # Testing
   flutter_test:
     sdk: flutter
-  mockito: ^5.0.2
+  mockito: ^5.0.10