refactor: simplify DIAdapter interface with a single registration callback; update benchmarks and cherrypick adapter accordingly

benchmark_cherrypick/lib/benchmarks/universal_chain_async_benchmark.dart

@@ -18,14 +18,16 @@ class UniversalChainAsyncBenchmark extends AsyncBenchmarkBase {
 
   @override
   Future<void> setup() async {
-    di.setupModules([
+    di.setupDependencies((scope) {
-      UniversalChainModule(
+      scope.installModules([
-        chainCount: chainCount,
+        UniversalChainModule(
-        nestingDepth: nestingDepth,
+          chainCount: chainCount,
-        bindingMode: mode,
+          nestingDepth: nestingDepth,
-        scenario: UniversalScenario.asyncChain,
+          bindingMode: mode,
-      )
+          scenario: UniversalScenario.asyncChain,
-    ]);
+        ),
+      ]);
+    });
   }
 
   @override

benchmark_cherrypick/lib/benchmarks/universal_chain_benchmark.dart

@@ -23,33 +23,39 @@ class UniversalChainBenchmark extends BenchmarkBase {
   void setup() {
     switch (scenario) {
       case UniversalScenario.override:
-        _di.setupModules([
+        _di.setupDependencies((scope) {
-          UniversalChainModule(
+          scope.installModules([
-            chainCount: chainCount,
+            UniversalChainModule(
-            nestingDepth: nestingDepth,
+              chainCount: chainCount,
-            bindingMode: UniversalBindingMode.singletonStrategy,
+              nestingDepth: nestingDepth,
-            scenario: UniversalScenario.register,
+              bindingMode: UniversalBindingMode.singletonStrategy,
-          )
+              scenario: UniversalScenario.register,
-        ]);
+            ),
+          ]);
+        });
         _childDi = _di.openSubScope('child');
-        _childDi!.setupModules([
+        _childDi!.setupDependencies((scope) {
-          UniversalChainModule(
+          scope.installModules([
-            chainCount: chainCount,
+            UniversalChainModule(
-            nestingDepth: nestingDepth,
+              chainCount: chainCount,
-            bindingMode: UniversalBindingMode.singletonStrategy,
+              nestingDepth: nestingDepth,
-            scenario: UniversalScenario.register,
+              bindingMode: UniversalBindingMode.singletonStrategy,
-          )
+              scenario: UniversalScenario.register,
-        ]);
+            ),
+          ]);
+        });
         break;
       default:
-        _di.setupModules([
+        _di.setupDependencies((scope) {
-          UniversalChainModule(
+          scope.installModules([
-            chainCount: chainCount,
+            UniversalChainModule(
-            nestingDepth: nestingDepth,
+              chainCount: chainCount,
-            bindingMode: mode,
+              nestingDepth: nestingDepth,
-            scenario: scenario,
+              bindingMode: mode,
-          )
+              scenario: scenario,
-        ]);
+            ),
+          ]);
+        });
         break;
     }
   }

benchmark_cherrypick/lib/di_adapters/cherrypick_adapter.dart

@@ -1,33 +1,23 @@
 import 'package:cherrypick/cherrypick.dart';
 import 'di_adapter.dart';
 
-/// DIAdapter implementation for the CherryPick DI library.
+/// DIAdapter implementation for the CherryPick DI library using registration callbacks.
-///
-/// Wraps a CherryPick [Scope] and provides methods
-/// to setup modules, resolve dependencies, teardown,
-/// and open nested sub-scopes for benchmarking.
 class CherrypickDIAdapter implements DIAdapter {
   Scope? _scope;
-
+  
   @override
-  void setupModules(List<Module> modules) {
+  void setupDependencies(void Function(dynamic container) registration) {
     _scope = CherryPick.openRootScope();
-    _scope!.installModules(modules);
+    registration(_scope!);
   }
 
   @override
-  T resolve<T>({String? named}) {
+  T resolve<T>({String? named}) =>
-    return named == null
+      named == null ? _scope!.resolve<T>() : _scope!.resolve<T>(named: named);
-      ? _scope!.resolve<T>()
-      : _scope!.resolve<T>(named: named);
-  }
 
   @override
-  Future<T> resolveAsync<T>({String? named}) async {
+  Future<T> resolveAsync<T>({String? named}) async =>
-    return named == null
+      named == null ? await _scope!.resolveAsync<T>() : await _scope!.resolveAsync<T>(named: named);
-      ? await _scope!.resolveAsync<T>()
-      : await _scope!.resolveAsync<T>(named: named);
-  }
 
   @override
   void teardown() {
@@ -42,33 +32,27 @@ class CherrypickDIAdapter implements DIAdapter {
   }
 }
 
-/// Internal adapter for a CherryPick sub-scope.
+/// Internal adapter for a CherryPick sub-scope (callbacks based).
-/// Used for simulating child/override DI scopes in benchmarks.
 class _CherrypickSubScopeAdapter extends CherrypickDIAdapter {
   final Scope _subScope;
   _CherrypickSubScopeAdapter(this._subScope);
+
   @override
-  void setupModules(List<Module> modules) {
+  void setupDependencies(void Function(dynamic container) registration) {
-    _subScope.installModules(modules);
+    registration(_subScope);
   }
 
   @override
-  T resolve<T>({String? named}) {
+  T resolve<T>({String? named}) =>
-    return named == null
+      named == null ? _subScope.resolve<T>() : _subScope.resolve<T>(named: named);
-      ? _subScope.resolve<T>()
-      : _subScope.resolve<T>(named: named);
-  }
 
   @override
-  Future<T> resolveAsync<T>({String? named}) async {
+  Future<T> resolveAsync<T>({String? named}) async =>
-    return named == null
+      named == null ? await _subScope.resolveAsync<T>() : await _subScope.resolveAsync<T>(named: named);
-      ? await _subScope.resolveAsync<T>()
-      : await _subScope.resolveAsync<T>(named: named);
-  }
 
   @override
   void teardown() {
-    // subScope teardown убирать отдельно не требуется
+    // subScope teardown не требуется
   }
 
   @override

benchmark_cherrypick/lib/di_adapters/di_adapter.dart

@@ -1,22 +1,21 @@
-import 'package:cherrypick/cherrypick.dart';
+/// Абстракция для DI-адаптера с использованием функций регистрации.
-
-/// Abstraction for Dependency Injection (DI) Adapter.
 ///
-/// Provides a uniform interface to setup, resolve, and teardown DI containers/modules
+/// Позволяет использовать любые DI-контейнеры: и модульные, и безмодульные.
-/// and open sub-scopes to benchmark them under different libraries.
 abstract class DIAdapter {
-  /// Installs the provided modules into the DI container.
+  /// Устанавливает зависимости с помощью одной функции регистрации.
-  void setupModules(List<Module> modules);
+  ///
+  /// Функция принимает выбранный DI-контейнер, задаваемый реализацией.
+  void setupDependencies(void Function(dynamic container) registration);
 
-  /// Resolves an instance of type [T] by optional [named] tag.
+  /// Резолвит (возвращает) экземпляр типа [T] (по имени, если требуется).
   T resolve<T>({String? named});
 
-  /// Asynchronously resolves an instance of type [T] by optional [named] tag.
+  /// Асинхронно резолвит экземпляр типа [T].
   Future<T> resolveAsync<T>({String? named});
 
-  /// Tears down or disposes of the DI container.
+  /// Уничтожает/отчищает DI-контейнер.
   void teardown();
 
-  /// Opens a child DI sub-scope, useful for override/child-scope benchmarks.
+  /// Открывает дочерний под-scope (если применимо).
   DIAdapter openSubScope(String name);
 }