Saad Query Filters #3

Author: SaadArdati

lib/src/api/mixins.dart

@@ -1127,35 +1127,35 @@ mixin ConditionsMixin {
 /// A mixin that adds the ability to filter a collection of data
 /// on a node.
 mixin QueryableMixin {
-  /// List of where() operations to be applied to the query.
-  List<WhereQueryFilter> whereFilters = [];
-
-  /// List of orderBy() operations to be applied to the query.
-  List<OrderByQueryFilter> orderByOperations = [];
-
   /// Whether to use cloud database.
-  late bool useCloudDatabase;
+  bool useCloudDatabase = false;
 
   /// The path of the collection to query.
-  late String? collectionPath;
+  String? collectionPath;
 
   /// A limit integer to specify the number of documents to be returned.
-  late int limit;
+  int? limit;
 
   /// Whether the query operation is going to be restrictive.
   /// This pertains to Firestore's indexing rules.
   bool get restrictedIndexing => useCloudDatabase;
 
+  /// List of where() operations to be applied to the query.
+  List<WhereQueryFilter> whereFilters = [];
+
+  /// List of orderBy() operations to be applied to the query.
+  List<OrderByQueryFilter> orderByFilters = [];
+
   /// Sets the properties of this mixin.
   void setQueryableMixin({
     required List<WhereQueryFilter> whereFilters,
-    required List<OrderByQueryFilter> orderByOperations,
+    required List<OrderByQueryFilter> orderByFilters,
     required bool useCloudDatabase,
     required String? collectionPath,
-    required int limit,
+    required int? limit,
   }) {
     this.whereFilters = whereFilters;
-    this.orderByOperations = orderByOperations;
+    this.orderByFilters = orderByFilters;
     this.useCloudDatabase = useCloudDatabase;
     this.collectionPath = collectionPath;
     this.limit = limit;

lib/src/api/models/action/load_from_cloud_storage_action.dart

@@ -45,15 +45,15 @@ class LoadFromCloudStorageAction extends ActionModel
     super.nonBlocking,
     super.enabled,
     List<WhereQueryFilter>? whereFilters,
-    List<OrderByQueryFilter>? orderByOperations,
+    List<OrderByQueryFilter>? orderByFilters,
     int? limit,
   }) : super(type: ActionType.loadFromCloudStorage) {
     setQueryableMixin(
       collectionPath: path,
-      limit: limit ?? -1,
+      limit: limit,
       whereFilters: whereFilters ?? [],
-      orderByOperations: orderByOperations ?? [],
-      useCloudDatabase: false,
+      orderByFilters: orderByFilters ?? [],
+      useCloudDatabase: true,
     );
   }
 
@@ -64,7 +64,7 @@ class LoadFromCloudStorageAction extends ActionModel
     VariableData? variable,
     bool? loadSingleDocument,
     List<WhereQueryFilter>? whereFilters,
-    List<OrderByQueryFilter>? orderByOperations,
+    List<OrderByQueryFilter>? orderByFilters,
     int? limit,
   }) =>
       LoadFromCloudStorageAction(
@@ -73,7 +73,7 @@ class LoadFromCloudStorageAction extends ActionModel
         variable: variable ?? this.variable,
         loadSingleDocument: loadSingleDocument ?? this.loadSingleDocument,
         whereFilters: whereFilters ?? this.whereFilters,
-        orderByOperations: orderByOperations ?? this.orderByOperations,
+        orderByFilters: orderByFilters ?? this.orderByFilters,
         limit: limit ?? this.limit,
       );
 
@@ -84,7 +84,7 @@ class LoadFromCloudStorageAction extends ActionModel
         variable,
         loadSingleDocument,
         whereFilters,
-        orderByOperations,
+        orderByFilters,
         limit,
         useCloudDatabase,
         collectionPath,

lib/src/api/models/action/load_from_cloud_storage_action.g.dart

@@ -39,11 +39,11 @@ class OrderByQueryFilter extends QueryFilter with EquatableMixin {
   /// parameters.
   OrderByQueryFilter copyWith({
     String? field,
-    OrderByQuerySortOrder? operator,
+    OrderByQuerySortOrder? sortOrder,
   }) {
     return OrderByQueryFilter(
       field: field ?? this.field,
-      sortOrder: operator ?? this.sortOrder,
+      sortOrder: sortOrder ?? this.sortOrder,
     );
   }
 

lib/src/api/models/cloud_database_queries/order_by_query_filter.dart

@@ -43,16 +43,16 @@ enum WhereQueryOperator {
   greaterThanOrEqual('Greater Than Or Equal To', '>='),
 
   /// Checks if an array contains a value.
-  arrayContains('Array Contains', 'array-contains'),
+  arrayContains('Contains', 'array-contains'),
 
   /// Checks if an array contains any of the values in a given array.
-  arrayContainsAny('Array Contains Any', 'array-contains-any'),
+  arrayContainsAny('Contains any', 'array-contains-any'),
 
   /// Checks if a value is in a given array.
-  inArray('In Array', 'in'),
+  inArray('Is in', 'in'),
 
   /// Checks if a value is not in a given array.
-  notInArray('Not In Array', 'not-in');
+  notInArray('Is not in', 'not-in');
 
   /// The human-readable name of the operation.
   final String label;
@@ -79,6 +79,7 @@ enum WhereQueryOperator {
   bool get isEqualityOperator =>
       this == WhereQueryOperator.equal ||
       this == WhereQueryOperator.arrayContains ||
+      this == WhereQueryOperator.arrayContainsAny ||
       this == WhereQueryOperator.inArray;
 
   /// Returns a set of all range operators.
@@ -100,6 +101,7 @@ enum WhereQueryOperator {
   static Set<WhereQueryOperator> get equalityOperators => {
         WhereQueryOperator.equal,
         WhereQueryOperator.arrayContains,
+        WhereQueryOperator.arrayContainsAny,
         WhereQueryOperator.inArray,
       };
 
@@ -127,7 +129,7 @@ class WhereQueryFilter extends QueryFilter with EquatableMixin {
   final WhereQueryOperator operator;
 
   /// The value to compare against.
-  final dynamic value;
+  final String value;
 
   /// Creates a new [WhereQueryFilter] instance, given a [field], an [operator],
   /// and a [value].

lib/src/api/models/cloud_database_queries/where_query_filter.dart

@@ -62,9 +62,9 @@ class ListViewNode extends SinglePlaceholderNode
     // [CloudDatabaseMixin] properties.
     bool useCloudDatabase = false,
     String? collectionPath,
-    int limit = 20,
+    int? limit = 20,
     List<WhereQueryFilter>? whereOperations,
-    List<OrderByQueryFilter>? orderByOperations,
+    List<OrderByQueryFilter>? orderByFilters,
 
     // [ScrollableMixin] properties.
     AxisC scrollDirection = AxisC.vertical,
@@ -101,7 +101,7 @@ class ListViewNode extends SinglePlaceholderNode
       collectionPath: collectionPath,
       limit: limit,
       whereFilters: whereOperations ?? [],
-      orderByOperations: orderByOperations ?? [],
+      orderByFilters: orderByFilters ?? [],
     );
   }
 

lib/src/api/models/cloud_database_queries/where_query_filter.g.dart

@@ -18,6 +18,10 @@ typedef HasNode = bool Function(String id);
 /// An interface for computing text information. This is meant to be used as an
 /// abstraction to Flutter's [TextPainter].
 abstract class ITextSizeCalculator {
+
+  /// Disposes this instance of [ITextSizeCalculator].
+  void dispose();
+
   /// Returns the height of a defined [TextNode] based on its width.
   /// The details are dependant on the implementation.
   double getHeightForWidth(double width);