- HotFix for Postpone singleton initialisation to respect environment…

… filters

injectable/CHANGELOG.md

@@ -1,4 +1,8 @@
 # ChangeLog
+## [2.3.4]
+- HotFix for Postpone singleton initialisation to respect environment filters
+## [2.3.3] (skip)
+- Fix Postpone singleton initialisation to respect environment filters by @lrampazzo
 ## [2.3.2]
 - Add option to pass instance callback function to the init function by @Adam-Langley
 ## [2.3.1]

injectable/lib/src/get_it_helper.dart

@@ -12,17 +12,20 @@ class GetItHelper {
   late final EnvironmentFilter _environmentFilter;
 
   /// creates a new instance of GetItHelper
-  GetItHelper(this.getIt, [String? environment, EnvironmentFilter? environmentFilter])
+  GetItHelper(this.getIt,
+      [String? environment, EnvironmentFilter? environmentFilter])
       : assert(environmentFilter == null || environment == null) {
     // register current EnvironmentsFilter as lazy singleton
-    if (!getIt.isRegistered<EnvironmentFilter>(instanceName: kEnvironmentsFilterName)) {
+    if (!getIt.isRegistered<EnvironmentFilter>(
+        instanceName: kEnvironmentsFilterName)) {
       _environmentFilter = environmentFilter ?? NoEnvOrContains(environment);
       getIt.registerLazySingleton<EnvironmentFilter>(
         () => _environmentFilter,
         instanceName: kEnvironmentsFilterName,
       );
     } else {
-      _environmentFilter = getIt<EnvironmentFilter>(instanceName: kEnvironmentsFilterName);
+      _environmentFilter =
+          getIt<EnvironmentFilter>(instanceName: kEnvironmentsFilterName);
     }
 
     // register current Environments as lazy singleton
@@ -213,7 +216,7 @@ class GetItHelper {
       if (preResolve) {
         return factoryFunc().then(
           (instance) => getIt.registerSingleton(
-            () => instance,
+            instance,
             instanceName: instanceName,
             signalsReady: signalsReady,
           ),
@@ -255,7 +258,8 @@ class GetItHelper {
   /// a helper method to push a new scope and init it's dependencies
   /// asynchronously inside of [GetIt]
   Future<GetIt> initScopeAsync(String name,
-      {required Future<void> Function(GetItHelper gh) init, ScopeDisposeFunc? dispose}) {
+      {required Future<void> Function(GetItHelper gh) init,
+      ScopeDisposeFunc? dispose}) {
     final completer = Completer<GetIt>();
     getIt.pushNewScope(
       scopeName: name,
@@ -270,7 +274,9 @@ class GetItHelper {
 
   /// a helper method to push a new scope and init it's dependencies
   /// inside of [GetIt]
-  GetIt initScope(String name, {required void Function(GetItHelper gh) init, ScopeDisposeFunc? dispose}) {
+  GetIt initScope(String name,
+      {required void Function(GetItHelper gh) init,
+      ScopeDisposeFunc? dispose}) {
     getIt.pushNewScope(
       scopeName: name,
       init: (_) => init(this),

injectable/pubspec.yaml

@@ -1,6 +1,6 @@
 name: injectable
 description: Injectable is a convenient code generator for get_it. Inspired by Angular DI, Guice DI and inject.dart.
-version: 2.3.2
+version: 2.3.4
 homepage: https://github.com/Milad-Akarie/injectable
 
 environment:

injectable_generator/pubspec.lock

@@ -252,11 +252,10 @@ packages:
   injectable:
     dependency: "direct main"
     description:
-      name: injectable
-      sha256: cd3c422e13270c81f64ab73c80406b2b2ed563fe59d0ff2093eb7eee63d0bbeb
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.3.2"
+      path: "../injectable"
+      relative: true
+    source: path
+    version: "2.3.3"
   io:
     dependency: transitive
     description:

injectable_generator/pubspec.yaml

@@ -15,7 +15,7 @@ dependencies:
   code_builder: ^4.4.0
   dart_style: ^2.0.3
   injectable:
-    ^2.3.2
+    ^2.3.4
 #    path: ../injectable
   collection: ^1.17.1
   recase: ^4.1.0