Merge pull request #589 from roipeker/fix_get_create

Fix for Get.create() lifecycle

@@ -74,3 +74,9 @@ captures/
 !.vscode/tasks.json
 !.vscode/tasks.json
 !.vscode/launch.json
 !.vscode/launch.json
 !.vscode/extensions.json
 !.vscode/extensions.json
+
+example/macos/Flutter/ephemeral/Flutter-Generated.xcconfig
+
+example/macos/Flutter/ephemeral/
+
+example/macos/Flutter/GeneratedPluginRegistrant.swift

@@ -38,9 +38,15 @@ extension Inst on GetInterface {
           {String tag, bool permanent = false}) async =>
           {String tag, bool permanent = false}) async =>
       GetInstance().putAsync<S>(builder, tag: tag, permanent: permanent);
       GetInstance().putAsync<S>(builder, tag: tag, permanent: permanent);
 
 
-  /// Creates a new Instance<[S]> from the <[S]>[builder] callback.
+  /// Creates a new Class Instance [S] from the builder callback[S].
   /// Every time [find]<[S]>() is used, it calls the builder method to generate
   /// Every time [find]<[S]>() is used, it calls the builder method to generate
   /// a new Instance [S].
   /// a new Instance [S].
+  /// It also registers each [instance.onClose()] with the current
+  /// Route [GetConfig.currentRoute] to keep the lifecycle active.
+  /// Is important to know that the instances created are only stored per Route.
+  /// So, if you call `Get.delete<T>()` the "instance factory" used in this
+  /// method ([Get.create<T>()]) will be removed, but NOT the instances
+  /// already created by it.
   ///
   ///
   /// Example:
   /// Example:
   ///
   ///

+import 'dart:async';
+import 'dart:collection';
+
 import '../core/log.dart';
 import '../core/log.dart';
 import '../navigation/root/smart_management.dart';
 import '../navigation/root/smart_management.dart';
 import '../state_manager/rx/rx_core/rx_interface.dart';
 import '../state_manager/rx/rx_core/rx_interface.dart';
@@ -30,6 +33,12 @@ class GetInstance {
   /// created to manage the memory.
   /// created to manage the memory.
   static final Map<String, String> _routesKey = {};
   static final Map<String, String> _routesKey = {};
 
 
+  /// Stores the onClose() references of instances created with [Get.create()]
+  /// using the [GetConfig.currentRoute].
+  /// Experimental feature to keep the lifecycle and memory management with
+  /// non-singleton instances.
+  static final Map<String, HashSet<Function>> _routesByCreate = {};
+
   static final _queue = GetQueue();
   static final _queue = GetQueue();
 
 
   /// Creates a new Instance<S> lazily from the [<S>builder()] callback.
   /// Creates a new Instance<S> lazily from the [<S>builder()] callback.
@@ -101,6 +110,12 @@ class GetInstance {
   /// Creates a new Class Instance [S] from the builder callback[S].
   /// Creates a new Class Instance [S] from the builder callback[S].
   /// Every time [find]<[S]>() is used, it calls the builder method to generate
   /// Every time [find]<[S]>() is used, it calls the builder method to generate
   /// a new Instance [S].
   /// a new Instance [S].
+  /// It also registers each [instance.onClose()] with the current
+  /// Route [GetConfig.currentRoute] to keep the lifecycle active.
+  /// Is important to know that the instances created are only stored per Route.
+  /// So, if you call `Get.delete<T>()` the "instance factory" used in this
+  /// method ([Get.create<T>()]) will be removed, but NOT the instances
+  /// already created by it.
   ///
   ///
   /// Example:
   /// Example:
   ///
   ///
@@ -144,6 +159,19 @@ class GetInstance {
       }
       }
     });
     });
 
 
+    /// Removes [Get.create()] instances registered in [routeName].
+    if (_routesByCreate.containsKey(routeName)) {
+      for (final onClose in _routesByCreate[routeName]) {
+        // assure the [DisposableInterface] instance holding a reference
+        // to [onClose()] wasn't disposed.
+        if (onClose != null) {
+          await onClose();
+        }
+      }
+      _routesByCreate[routeName].clear();
+      _routesByCreate.remove(routeName);
+    }
+
     for (final element in keysToRemove) {
     for (final element in keysToRemove) {
       await delete(key: element);
       await delete(key: element);
     }
     }
@@ -159,16 +187,20 @@ class GetInstance {
   /// Optionally associating the current Route to the lifetime of the instance,
   /// Optionally associating the current Route to the lifetime of the instance,
   /// if [GetConfig.smartManagement] is marked as [SmartManagement.full] or
   /// if [GetConfig.smartManagement] is marked as [SmartManagement.full] or
   /// [GetConfig.keepFactory]
   /// [GetConfig.keepFactory]
+  /// Only flags `isInit` if it's using `Get.create()`
+  /// (not for Singletons access).
   bool _initDependencies<S>({String name}) {
   bool _initDependencies<S>({String name}) {
     final key = _getKey(S, name);
     final key = _getKey(S, name);
     final isInit = _singl[key].isInit;
     final isInit = _singl[key].isInit;
     if (!isInit) {
     if (!isInit) {
       _startController<S>(tag: name);
       _startController<S>(tag: name);
+      if (_singl[key].isSingleton) {
         _singl[key].isInit = true;
         _singl[key].isInit = true;
         if (GetConfig.smartManagement != SmartManagement.onlyBuilder) {
         if (GetConfig.smartManagement != SmartManagement.onlyBuilder) {
           _registerRouteInstance<S>(tag: name);
           _registerRouteInstance<S>(tag: name);
         }
         }
       }
       }
+    }
     return true;
     return true;
   }
   }
 
 
@@ -193,6 +225,10 @@ class GetInstance {
         i.onStart();
         i.onStart();
         GetConfig.log('"$key" has been initialized');
         GetConfig.log('"$key" has been initialized');
       }
       }
+      if (!_singl[key].isSingleton && i.onClose != null) {
+        _routesByCreate[GetConfig.currentRoute] ??= HashSet<Function>();
+        _routesByCreate[GetConfig.currentRoute].add(i.onClose);
+      }
     }
     }
   }
   }