diff --git a/example/bin/main.dart b/example/bin/main.dart index 553b401..c57e00f 100644 --- a/example/bin/main.dart +++ b/example/bin/main.dart @@ -22,15 +22,15 @@ class FeatureModule extends Module { .withName('networkRepo') .toProvide( () => NetworkDataRepository( - currentScope.resolve( - named: isMock ? 'apiClientMock' : 'apiClientImpl', - ), - ), - ) + currentScope.resolve( + named: isMock ? 'apiClientMock' : 'apiClientImpl', + ), + ), + ) .singleton(); - bind().toProvideWithParam( - (param) => DataBloc( + bind().toProvideWithParams( + (param) => DataBloc( currentScope.resolve(named: 'networkRepo'), param, ), @@ -47,7 +47,7 @@ void main() async { .openSubScope('featureScope') .installModules([FeatureModule(isMock: true)]); - final dataBloc = subScope.resolve(param: 'PARAMETER'); + final dataBloc = subScope.resolve(params: 'PARAMETER'); dataBloc.data.listen((d) => print('Received data: $d'), onError: (e) => print('Error: $e'), onDone: () => print('DONE')); diff --git a/lib/src/binding.dart b/lib/src/binding.dart index 14b165d..c1d98ce 100644 --- a/lib/src/binding.dart +++ b/lib/src/binding.dart @@ -13,7 +13,7 @@ enum Mode { SIMPLE, INSTANCE, PROVIDER_INSTANCE, PROVIDER_WITH_PARAMS_INSTANCE } -typedef ProviderWithParam = T Function(dynamic param); +typedef ProviderWithParams = T Function(dynamic params); /// RU: Класс Binding настраивает параметры экземпляра. /// ENG: The Binding class configures the settings for the instance. @@ -24,7 +24,7 @@ class Binding { late String _name; T? _instance; T? Function()? _provider; - ProviderWithParam? _providerWithParam; + ProviderWithParams? _providerWithParams; late bool _isSingleton = false; late bool _isNamed = false; @@ -98,9 +98,9 @@ class Binding { /// ENG: Initialization instance via provider [value] with a dynamic param. /// /// return [Binding] - Binding toProvideWithParam(ProviderWithParam value) { + Binding toProvideWithParams(ProviderWithParams value) { _mode = Mode.PROVIDER_WITH_PARAMS_INSTANCE; - _providerWithParam = value; + _providerWithParams = value; return this; } @@ -132,10 +132,11 @@ class Binding { } /// RU: Поиск экземпляра с параметром. - /// ENG: Resolve instance with param. + /// + /// ENG: Resolve instance with [params]. /// /// return [T] - T? providerWithParam(dynamic param) { - return _providerWithParam?.call(param); + T? providerWithParams(dynamic params) { + return _providerWithParams?.call(params); } } diff --git a/lib/src/scope.dart b/lib/src/scope.dart index 0e5aefc..66dfb94 100644 --- a/lib/src/scope.dart +++ b/lib/src/scope.dart @@ -86,8 +86,8 @@ class Scope { /// If you want to get [null] if the dependency cannot be found then use [tryResolve] instead /// return - returns an object of type [T] or [StateError] /// - T resolve({String? named, dynamic param}) { - var resolved = tryResolve(named: named, param: param); + T resolve({String? named, dynamic params}) { + var resolved = tryResolve(named: named, params: params); if (resolved != null) { return resolved; } else { @@ -99,7 +99,7 @@ class Scope { /// RU: Возвращает найденную зависимость типа [T] или null, если она не может быть найдена. /// ENG: Returns found dependency of type [T] or null if it cannot be found. /// - T? tryResolve({String? named, dynamic param}) { + T? tryResolve({String? named, dynamic params}) { // 1 Поиск зависимости по всем модулям текущего скоупа if (_modulesList.isNotEmpty) { for (var module in _modulesList) { @@ -113,11 +113,10 @@ class Scope { case Mode.PROVIDER_INSTANCE: return binding.provider; case Mode.PROVIDER_WITH_PARAMS_INSTANCE: - if (param == null) { - throw StateError( - 'Param is null. Maybe you forget pass it'); + if (params == null) { + throw StateError('Param is null. Maybe you forget pass it'); } - return binding.providerWithParam(param); + return binding.providerWithParams(params); default: return null; }