update version and changelogs

jtdLab · Mar 6, 2024 · 05d8f0a · 05d8f0a
1 parent 1758048
commit 05d8f0a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 21 deletions.
diff --git a/injectable/lib/src/get_it_helper.dart b/injectable/lib/src/get_it_helper.dart
@@ -12,20 +12,17 @@ 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
@@ -215,12 +212,10 @@ class GetItHelper {
     if (_canRegister(registerFor)) {
       if (preResolve) {
         return factoryFunc().then(
-          (instance) => singleton(
+          (instance) => getIt.registerSingleton(
             () => instance,
             instanceName: instanceName,
             signalsReady: signalsReady,
-            registerFor: registerFor,
-            dispose: dispose,
           ),
         );
       } else {
@@ -260,8 +255,7 @@ 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,
@@ -276,9 +270,7 @@ 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),

diff --git a/injectable_generator/test/code_builder/eager_singleton_test.dart b/injectable_generator/test/code_builder/eager_singleton_test.dart
@@ -16,7 +16,7 @@ void main() {
             type: ImportableType(name: 'Demo'),
             typeImpl: ImportableType(name: 'Demo'),
           )),
-          'gh.singleton<Demo>(Demo());');
+          'gh.singleton<Demo>(() => Demo());');
     });
 
     test("Singleton generator abstract", () {
@@ -26,7 +26,7 @@ void main() {
           type: ImportableType(name: 'AbstractType'),
           typeImpl: ImportableType(name: 'Demo'),
         )),
-        'gh.singleton<AbstractType>(Demo());',
+        'gh.singleton<AbstractType>(() => Demo());',
       );
     });
 
@@ -38,7 +38,7 @@ void main() {
           typeImpl: ImportableType(name: 'Demo'),
           instanceName: 'MyDemo',
         )),
-        "gh.singleton<Demo>(Demo(), instanceName: 'MyDemo', );",
+        "gh.singleton<Demo>(() => Demo(), instanceName: 'MyDemo', );",
       );
     });
 
@@ -98,7 +98,7 @@ void main() {
               )
             ],
           )),
-          'gh.singleton<Demo>(Demo(gh<Storage>()));');
+          'gh.singleton<Demo>(() => Demo(gh<Storage>()));');
     });
 
     test("Singleton generator with async Positional dependencies", () {
@@ -143,7 +143,7 @@ void main() {
               )
             ],
           )),
-          'gh.singleton<Demo>(Demo(storage: gh<Storage>()));');
+          'gh.singleton<Demo>(() => Demo(storage: gh<Storage>()));');
     });
 
     test("Singleton generator with async named dependencies", () {
@@ -201,7 +201,7 @@ void main() {
         ),
       ];
       expect(generate(dep, allDeps: allDeps),
-          'gh.singleton<Demo>(Demo(storage: gh<Storage>(instanceName: \'storageImpl\')));');
+          'gh.singleton<Demo>(() => Demo(storage: gh<Storage>(instanceName: \'storageImpl\')));');
     });
   });
 }
@@ -219,4 +219,4 @@ String generate(DependencyConfig input, {List<DependencyConfig>? allDeps}) {
     useNullSafetySyntax: false,
   );
   return statement.accept(emitter).toString();
-}
+}