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

This commit is contained in:
Sergey Penkovsky
2025-08-07 08:28:23 +03:00
parent b72dec9944
commit d523a5f261
4 changed files with 67 additions and 76 deletions

View File

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