fix: Fix Adapter so that it can be used separately.

mathrunet · Oct 20, 2023 · 9a23fae · 9a23fae
1 parent c4c545f
commit 9a23fae
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 5 deletions.
diff --git a/packages/katana_model/lib/src/model_adapter.dart b/packages/katana_model/lib/src/model_adapter.dart
@@ -288,6 +288,11 @@ abstract class ModelAdapter {
     ModelBatchRef ref,
     ModelAdapterDocumentQuery query,
   );
+
+  @override
+  String toString() {
+    return "$runtimeType[$hashCode]";
+  }
 }
 
 /// Widget for setting [ModelAdapter].

diff --git a/packages/katana_model/lib/src/model_query.dart b/packages/katana_model/lib/src/model_query.dart
@@ -61,7 +61,7 @@ class DocumentModelQuery extends ModelQuery {
     if (_adapter == null) {
       return super.toString();
     }
-    return "${super.toString()}@${_adapter.runtimeType}";
+    return "${super.toString()}@${_adapter.toString()}";
   }
 
   @override
@@ -473,7 +473,7 @@ class CollectionModelQuery extends ModelQuery {
     if (_adapter == null) {
       return super.toString();
     }
-    return "${super.toString()}@${_adapter.runtimeType}";
+    return "${super.toString()}@${_adapter.toString()}";
   }
 
   @override

diff --git a/packages/katana_model_firestore/lib/adapter/firestore_model_adapter.dart b/packages/katana_model_firestore/lib/adapter/firestore_model_adapter.dart
@@ -796,6 +796,18 @@ class FirestoreModelAdapter extends ModelAdapter
     ];
   }
 
+  @override
+  bool operator ==(Object other) => hashCode == other.hashCode;
+
+  @override
+  int get hashCode {
+    return prefix.hashCode ^
+        localDatabase.hashCode ^
+        options.hashCode ^
+        database.hashCode ^
+        initialValue.hashCode;
+  }
+
   void _assert() {
     assert(
       prefix.isEmpty ||

diff --git a/packages/katana_model_firestore/lib/adapter/listenable_firestore_model_adapter.dart b/packages/katana_model_firestore/lib/adapter/listenable_firestore_model_adapter.dart
@@ -874,6 +874,18 @@ class ListenableFirestoreModelAdapter extends ModelAdapter
     }
   }
 
+  @override
+  bool operator ==(Object other) => hashCode == other.hashCode;
+
+  @override
+  int get hashCode {
+    return prefix.hashCode ^
+        localDatabase.hashCode ^
+        options.hashCode ^
+        database.hashCode ^
+        initialValue.hashCode;
+  }
+
   void _assert() {
     assert(
       prefix.isEmpty ||

diff --git a/packages/katana_model_firestore/pubspec.lock b/packages/katana_model_firestore/pubspec.lock
@@ -292,7 +292,7 @@ packages:
       path: "../katana_model"
       relative: true
     source: path
-    version: "2.13.2"
+    version: "2.13.3"
   lints:
     dependency: transitive
     description:

diff --git a/packages/katana_model_local/lib/adapter/local_model_adapter.dart b/packages/katana_model_local/lib/adapter/local_model_adapter.dart
@@ -251,7 +251,7 @@ class LocalModelAdapter extends ModelAdapter {
 
   @override
   int get hashCode {
-    return prefix.hashCode;
+    return prefix.hashCode ^ database.hashCode ^ initialValue.hashCode;
   }
 
   @override

diff --git a/packages/katana_model_local/pubspec.lock b/packages/katana_model_local/pubspec.lock
@@ -368,7 +368,7 @@ packages:
       path: "../katana_model"
       relative: true
     source: path
-    version: "2.13.2"
+    version: "2.13.3"
   lints:
     dependency: transitive
     description: