Merge pull request #1421 from ronnnnn/fix-hive-store-to-map

fix(graphql): transform nested object from box
zino-hofmann · Apr 13, 2024 · 6b28b45 · 6b28b45
2 parents 385c331 + 3ac14cc
commit 6b28b45
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 2 deletions.
diff --git a/packages/graphql/lib/src/cache/hive_store.dart b/packages/graphql/lib/src/cache/hive_store.dart
@@ -1,7 +1,7 @@
 import 'dart:async';
-import 'package:meta/meta.dart';
 
 import 'package:hive/hive.dart';
+import 'package:meta/meta.dart';
 
 import './store.dart';
 
@@ -92,7 +92,15 @@ class HiveStore extends Store {
   }
 
   @override
-  Map<String, Map<String, dynamic>?> toMap() => Map.unmodifiable(box.toMap());
+  Map<String, Map<String, dynamic>?> toMap() {
+    final map = <String, Map<String, dynamic>?>{};
+    for (final key in box.keys) {
+      if (key is String) {
+        map[key] = get(key);
+      }
+    }
+    return Map.unmodifiable(map);
+  }
 
   Future<void> reset() => box.clear();
 }
diff --git a/packages/graphql/test/cache/store_test.dart b/packages/graphql/test/cache/store_test.dart
@@ -121,6 +121,28 @@ void main() {
         expect(readData2?['bob'], isA<List<dynamic>>());
         expect(readData2?['bob'][0], isA<Map<String, dynamic>>());
       });
+      test("Can re-open and reference nested data", () async {
+        final box1 = await HiveStore.openBox(
+          're-open-store',
+          path: path,
+        );
+        final store = HiveStore(box1);
+        final data = {
+          'foo': 'bar',
+          'bob': [
+            {'nested': true}
+          ]
+        };
+        store.put("id", data);
+        expect(store.toMap(), equals({'id': data}));
+        await box1.close();
+        final box2 = await HiveStore.openBox(
+          're-open-store',
+          path: path,
+        );
+        final store2 = HiveStore(box2);
+        expect(store2.toMap(), equals({'id': data}));
+      });
       test("Can put null", () async {
         final box1 = await HiveStore.openBox(
           'put-null',