fix initialization

Author: frank06

example/lib/main.dart

@@ -27,8 +27,7 @@ void main() async {
 
     print('Using temporary directory: ${_dir.path}');
 
-    container.read(adapterProviders.notifier).state = adapterProvidersMap;
-    await container.read(initializeAdapters.future);
+    await container.read(initializeFlutterData(adapterProvidersMap).future);
     container.users.logLevel = 2;
     container.tasks.logLevel = 2;
 

lib/src/adapter/adapter.dart

@@ -59,7 +59,7 @@ abstract class _BaseAdapter<T extends DataModelMixin<T>> with _Lifecycle {
   /// This [Map] is typically required when initializing new models, and passed as-is.
   @protected
   @nonVirtual
-  Map<String, Adapter> get adapters => _internalAdapters!;
+  Map<String, Adapter> get adapters => _internalAdaptersMap!;
 
   /// Give access to the dependency injection system
   @nonVirtual
@@ -188,8 +188,8 @@ abstract class _BaseAdapter<T extends DataModelMixin<T>> with _Lifecycle {
 
   @protected
   Future<R> runInIsolate<R>(FutureOr<R> fn(Adapter adapter)) async {
-    final _path = Directory(storage.path).parent.path;
-    final _internalProviders = ref.read(adapterProviders)!;
+    final storagePath = Directory(storage.path).parent.path;
+    final internalProvidersMap = _internalProvidersMap!;
     final _internalType = internalType;
 
     return await Isolate.run(() async {
@@ -198,20 +198,18 @@ abstract class _BaseAdapter<T extends DataModelMixin<T>> with _Lifecycle {
         container = ProviderContainer(
           overrides: [
             localStorageProvider.overrideWith(
-              (ref) => LocalStorage(baseDirFn: () => _path),
+              (ref) => LocalStorage(baseDirFn: () => storagePath),
             ),
           ],
         );
 
-        // TODO improve initializer API
-        // set providers from outer context and start initialization
-        container.read(adapterProviders.notifier).state = _internalProviders;
-        await container.read(initializeAdapters.future);
+        await container
+            .read(initializeFlutterData(internalProvidersMap).future);
 
-        final adapter = _internalProviders[_internalType]!;
+        final adapter = internalProvidersMap[_internalType]!;
         return fn(container.read(adapter));
       } finally {
-        for (final provider in container.read(adapterProviders)!.values) {
+        for (final provider in internalProvidersMap.values) {
           container.read(provider).dispose();
         }
         container.read(localStorageProvider).dispose();

lib/src/model/data_model.dart

@@ -31,10 +31,10 @@ mixin DataModelMixin<T extends DataModelMixin<T>> {
   T get _this => this as T;
 
   /// Exposes this type's [Adapter]
-  Adapter<T> get _adapter => _internalAdapters![_internalType] as Adapter<T>;
+  Adapter<T> get _adapter => _internalAdaptersMap![_internalType] as Adapter<T>;
 
   T init() {
-    final adapter = _internalAdapters![_internalType];
+    final adapter = _internalAdaptersMap![_internalType];
     if (adapter != null) {
       adapter.initModel(
         this,

lib/src/model/relationship/relationship.dart

@@ -19,14 +19,14 @@ sealed class Relationship<E extends DataModelMixin<E>, N> with EquatableMixin {
     // type will always be first in split
     final [type, ..._] = ownerKey.split('#');
 
-    final adapter = _internalAdapters![type]!;
+    final adapter = _internalAdaptersMap![type]!;
     return adapter.findOneLocal(ownerKey) as DataModelMixin?;
   }
 
   String get name => _name!;
   String? get inverseName => _inverseName;
 
-  Adapter<E> get _adapter => _internalAdapters![_internalType] as Adapter<E>;
+  Adapter<E> get _adapter => _internalAdaptersMap![_internalType] as Adapter<E>;
 
   Set<String>? _uninitializedKeys;
   String get _internalType => DataHelpers.internalTypeFor(E.toString());

lib/src/utils/framework.dart

@@ -269,12 +269,6 @@ class DataResponse {
       {this.body, required this.statusCode, this.headers = const {}});
 }
 
-final adapterProviders =
-    StateProvider<Map<String, Provider<Adapter<DataModelMixin>>>?>(
-        (ref) => null);
-
-Map<String, Adapter>? _internalAdapters;
-
 R logTime<R>(String? name, R cb()) {
   if (name == null) return cb();
   final a1 = DateTime.now().millisecondsSinceEpoch;
@@ -296,14 +290,20 @@ Future<R> logTimeAsync<R>(String? name, Future<R> cb()) async {
 @protected
 mixin NothingMixin {}
 
-final initializeAdapters = FutureProvider<bool>((ref) async {
-  final arg = ref.read(adapterProviders)!;
-  _internalAdapters = arg.map((key, value) => MapEntry(key, ref.read(value)));
+Map<String, Adapter>? _internalAdaptersMap;
+Map<String, Provider<Adapter<DataModelMixin>>>? _internalProvidersMap;
+
+final initializeFlutterData =
+    FutureProvider.family<bool, Map<String, Provider<Adapter<DataModelMixin>>>>(
+        (ref, arg) async {
+  _internalProvidersMap = arg;
+  _internalAdaptersMap =
+      arg.map((key, value) => MapEntry(key, ref.read(value)));
 
   await ref.read(localStorageProvider).initialize();
 
   // initialize and register
-  for (final adapter in _internalAdapters!.values) {
+  for (final adapter in _internalAdaptersMap!.values) {
     adapter.dispose();
     await adapter.initialize(ref: ref);
   }

lib/src/utils/offline_operations.dart

@@ -136,7 +136,7 @@ final _offlineCallbackProvider =
 
 final offlineRetryProvider = StreamProvider<void>((ref) async* {
   Set<OfflineOperation> _offlineOperations() {
-    return _internalAdapters!.values
+    return _internalAdaptersMap!.values
         .map((adapter) {
           // if the stream is called before initialization
           // (or after disposal) simply return an empty set

test/_support/setup.dart

@@ -65,8 +65,7 @@ Future<void> setUpFn() async {
     '${_kIsWeb ? 'node1s' : 'nodes'}': nodesAdapterProvider
   };
 
-  container.read(adapterProviders.notifier).state = adapterProvidersMap;
-  await container.read(initializeAdapters.future);
+  await container.read(initializeFlutterData(adapterProvidersMap).future);
 
   container.read(dogsAdapterProvider).logLevel = 2;