penkovsky_sa/cherrypick
1
0
Fork 0
mirror of https://github.com/pese-git/cherrypick.git synced 2026-01-23 21:13:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactored pr

Browse Source
This commit is contained in:
Sergey Penkovsky
2023-01-04 11:03:29 +03:00
parent 8c3a0df452
commit e0f5874621
3 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
example/bin/main.dart
View File

@@ -29,7 +29,7 @@ class FeatureModule extends Module {
) )
.singleton(); .singleton();
bind<DataBloc>().toProvideWithParam( bind<DataBloc>().toProvideWithParams(
(param) => DataBloc( (param) => DataBloc(
currentScope.resolve<DataRepository>(named: 'networkRepo'), currentScope.resolve<DataRepository>(named: 'networkRepo'),
param, param,
@@ -47,7 +47,7 @@ void main() async {
.openSubScope('featureScope') .openSubScope('featureScope')
.installModules([FeatureModule(isMock: true)]); .installModules([FeatureModule(isMock: true)]);
final dataBloc = subScope.resolve<DataBloc>(param: 'PARAMETER'); final dataBloc = subScope.resolve<DataBloc>(params: 'PARAMETER');
dataBloc.data.listen((d) => print('Received data: $d'), dataBloc.data.listen((d) => print('Received data: $d'),
onError: (e) => print('Error: $e'), onDone: () => print('DONE')); onError: (e) => print('Error: $e'), onDone: () => print('DONE'));

15
lib/src/binding.dart
View File

@@ -13,7 +13,7 @@
enum Mode { SIMPLE, INSTANCE, PROVIDER_INSTANCE, PROVIDER_WITH_PARAMS_INSTANCE } enum Mode { SIMPLE, INSTANCE, PROVIDER_INSTANCE, PROVIDER_WITH_PARAMS_INSTANCE }
typedef ProviderWithParam<T> = T Function(dynamic param); typedef ProviderWithParams<T> = T Function(dynamic params);
/// RU: Класс Binding<T> настраивает параметры экземпляра. /// RU: Класс Binding<T> настраивает параметры экземпляра.
/// ENG: The Binding<T> class configures the settings for the instance. /// ENG: The Binding<T> class configures the settings for the instance.
@@ -24,7 +24,7 @@ class Binding<T> {
late String _name; late String _name;
T? _instance; T? _instance;
T? Function()? _provider; T? Function()? _provider;
ProviderWithParam<T>? _providerWithParam; ProviderWithParams<T>? _providerWithParams;
late bool _isSingleton = false; late bool _isSingleton = false;
late bool _isNamed = false; late bool _isNamed = false;
@@ -98,9 +98,9 @@ class Binding<T> {
/// ENG: Initialization instance via provider [value] with a dynamic param. /// ENG: Initialization instance via provider [value] with a dynamic param.
/// ///
/// return [Binding] /// return [Binding]
Binding<T> toProvideWithParam(ProviderWithParam<T> value) { Binding<T> toProvideWithParams(ProviderWithParams<T> value) {
_mode = Mode.PROVIDER_WITH_PARAMS_INSTANCE; _mode = Mode.PROVIDER_WITH_PARAMS_INSTANCE;
_providerWithParam = value; _providerWithParams = value;
return this; return this;
} }
@@ -132,10 +132,11 @@ class Binding<T> {
} }
/// RU: Поиск экземпляра с параметром. /// RU: Поиск экземпляра с параметром.
/// ENG: Resolve instance with param. ///
/// ENG: Resolve instance with [params].
/// ///
/// return [T] /// return [T]
T? providerWithParam(dynamic param) { T? providerWithParams(dynamic params) {
return _providerWithParam?.call(param); return _providerWithParams?.call(params);
} }
} }

13
lib/src/scope.dart
View File

@@ -86,8 +86,8 @@ class Scope {
/// If you want to get [null] if the dependency cannot be found then use [tryResolve] instead /// 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] /// return - returns an object of type [T] or [StateError]
/// ///
T resolve<T>({String? named, dynamic param}) { T resolve<T>({String? named, dynamic params}) {
var resolved = tryResolve<T>(named: named, param: param); var resolved = tryResolve<T>(named: named, params: params);
if (resolved != null) { if (resolved != null) {
return resolved; return resolved;
} else { } else {
@@ -99,7 +99,7 @@ class Scope {
/// RU: Возвращает найденную зависимость типа [T] или null, если она не может быть найдена. /// RU: Возвращает найденную зависимость типа [T] или null, если она не может быть найдена.
/// ENG: Returns found dependency of type [T] or null if it cannot be found. /// ENG: Returns found dependency of type [T] or null if it cannot be found.
/// ///
T? tryResolve<T>({String? named, dynamic param}) { T? tryResolve<T>({String? named, dynamic params}) {
// 1 Поиск зависимости по всем модулям текущего скоупа // 1 Поиск зависимости по всем модулям текущего скоупа
if (_modulesList.isNotEmpty) { if (_modulesList.isNotEmpty) {
for (var module in _modulesList) { for (var module in _modulesList) {
@@ -113,11 +113,10 @@ class Scope {
case Mode.PROVIDER_INSTANCE: case Mode.PROVIDER_INSTANCE:
return binding.provider; return binding.provider;
case Mode.PROVIDER_WITH_PARAMS_INSTANCE: case Mode.PROVIDER_WITH_PARAMS_INSTANCE:
if (param == null) { if (params == null) {
throw StateError( throw StateError('Param is null. Maybe you forget pass it');
'Param is null. Maybe you forget pass it');
} }
return binding.providerWithParam(param); return binding.providerWithParams(params);
default: default:
return null; return null;
} }