deserializeAndSave

Author: frank06

lib/src/adapter/adapter.dart

@@ -217,33 +217,42 @@ abstract class _BaseAdapter<T extends DataModelMixin<T>> with _Lifecycle {
     });
   }
 
-  Future<void> saveManyLocal(Iterable<DataModelMixin> models,
-      {bool notify = true}) async {
-    final savedKeys = await runInIsolate((adapter) async {
-      final db = adapter.db;
-      final savedKeys = <String>[];
-
-      final grouped = models.groupSetsBy((e) => e._adapter);
-      for (final e in grouped.entries) {
-        final adapter = e.key;
-        final ps = db.prepare(
-            'REPLACE INTO ${adapter.internalType} (key, data) VALUES (?, ?) RETURNING key;');
-        for (final model in e.value) {
-          final key = model._key!.detypifyKey();
-          final map = adapter.serializeLocal(model, withRelationships: false);
-          final data = jsonEncode(map);
-          final result = ps.select([key, data]);
-          savedKeys.add(
-              (result.first['key'] as int).typifyWith(adapter.internalType));
-        }
-        ps.dispose();
+  List<String> _saveManyLocal(
+      Adapter adapter, Iterable<DataModelMixin> models) {
+    final db = adapter.db;
+    final savedKeys = <String>[];
+
+    final grouped = models.groupSetsBy((e) => e._adapter);
+    for (final e in grouped.entries) {
+      final adapter = e.key;
+      final ps = db.prepare(
+          'REPLACE INTO ${adapter.internalType} (key, data) VALUES (?, ?) RETURNING key;');
+      for (final model in e.value) {
+        final key = model._key!.detypifyKey();
+        final map = adapter.serializeLocal(model, withRelationships: false);
+        final data = jsonEncode(map);
+        final result = ps.select([key, data]);
+        savedKeys
+            .add((result.first['key'] as int).typifyWith(adapter.internalType));
       }
-      return savedKeys;
-    });
+      ps.dispose();
+    }
+    return savedKeys;
+  }
 
-    if (notify) {
-      core._notify(savedKeys, type: DataGraphEventType.updateNode);
+  Future<List<String>?> saveManyLocal(Iterable<DataModelMixin> models,
+      {bool notify = true, bool async = true}) async {
+    final savedKeys = async
+        ? await runInIsolate(
+            (adapter) => adapter._saveManyLocal(adapter, models))
+        : _saveManyLocal(this as Adapter, models);
+    if (async) {
+      if (notify) {
+        core._notify(savedKeys, type: DataGraphEventType.updateNode);
+        return null;
+      }
     }
+    return savedKeys;
   }
 
   /// Deletes model of type [T] from local storage.

lib/src/adapter/remote_adapter.dart

@@ -531,28 +531,23 @@ mixin _RemoteAdapter<T extends DataModelMixin<T>> on _SerializationAdapter<T> {
       return response.body as R?;
     }
 
-    final deserialized = await deserialize(body);
+    final deserialized = await deserializeAndSave(body);
+    deserialized._log(adapter, label);
 
     if (isFindAll || (isCustom && deserialized.model == null)) {
-      await _saveDeserialized(deserialized);
-      deserialized._log(adapter, label);
-
       late R? models;
       if (response.statusCode == 304) {
-        models = await adapter.findAll(remote: false) as R?;
+        models = adapter.findAllLocal() as R?;
       } else {
         models = deserialized.models as R?;
       }
       return models;
     }
 
     if (isFindOne || (isCustom && deserialized.model != null)) {
-      await _saveDeserialized(deserialized);
-      deserialized._log(adapter, label);
-
       late R? model;
       if (response.statusCode == 304) {
-        model = await adapter.findOne(label.id!, remote: false) as R?;
+        model = adapter.findOneLocalById(label.id!) as R?;
       } else {
         model = deserialized.model as R?;
       }

lib/src/adapter/serialization_adapter.dart

@@ -3,8 +3,6 @@ part of flutter_data;
 mixin _SerializationAdapter<T extends DataModelMixin<T>> on _BaseAdapter<T> {
   /// Returns a serialized version of a model of [T],
   /// as a [Map<String, dynamic>] ready to be JSON-encoded.
-  @protected
-  @visibleForTesting
   Future<Map<String, dynamic>> serialize(T model,
       {bool withRelationships = true}) async {
     final map = serializeLocal(model, withRelationships: withRelationships);
@@ -99,8 +97,6 @@ mixin _SerializationAdapter<T extends DataModelMixin<T>> on _BaseAdapter<T> {
 
   /// Returns a [DeserializedData] object when deserializing a given [data].
   ///
-  @protected
-  @visibleForTesting
   Future<DeserializedData<T>> deserialize(Object? data,
       {String? key, bool async = true}) async {
     final record = async
@@ -109,6 +105,30 @@ mixin _SerializationAdapter<T extends DataModelMixin<T>> on _BaseAdapter<T> {
         : _deserialize(this as Adapter, data, key: key);
     return DeserializedData<T>(record.$1.cast<T>(), included: record.$2);
   }
+
+  Future<DeserializedData<T>> deserializeAndSave(Object? data,
+      {String? key, bool notify = true, bool ignoreReturn = false}) async {
+    final record = await runInIsolate<
+        (
+          List<DataModelMixin>,
+          List<DataModelMixin>,
+          List<String>
+        )>((adapter) async {
+      final emptyDm = <DataModelMixin>[];
+      final r = adapter._deserialize(adapter, data, key: key);
+      final models = [...r.$1, ...r.$2];
+      if (models.isEmpty) return (emptyDm, emptyDm, <String>[]);
+      final savedKeys = await adapter.saveManyLocal(models, async: false);
+      return ignoreReturn
+          ? (emptyDm, emptyDm, savedKeys!)
+          : (r.$1, r.$2, savedKeys!);
+    });
+    final (models, included, savedKeys) = record;
+    if (notify && savedKeys.isNotEmpty) {
+      core._notify(savedKeys, type: DataGraphEventType.updateNode);
+    }
+    return DeserializedData<T>(models.cast<T>(), included: included);
+  }
 }
 
 /// A utility class used to return deserialized main [models] AND [included] models.