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

Code formatting fixes and dependency updates

Browse Source 
- Fixed code formatting in benchmark_di CLI and adapter files
- Updated pubspec.lock files for benchmark_di, client_app, and postly examples
- Minor formatting improvements in disposable example
This commit is contained in:
Sergey Penkovsky
2025-09-08 17:22:49 +03:00
parent 81f14f5231
commit b2fbce74b3
7 changed files with 95 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
benchmark_di/lib/cli/benchmark_cli.dart
View File

@@ -98,7 +98,7 @@ class BenchmarkCliRunner {
final di = RiverpodAdapter(); final di = RiverpodAdapter();
if (scenario == UniversalScenario.asyncChain) { if (scenario == UniversalScenario.asyncChain) {
final benchAsync = UniversalChainAsyncBenchmark< final benchAsync = UniversalChainAsyncBenchmark<
Map<String, rp.ProviderBase<Object?>>> ( Map<String, rp.ProviderBase<Object?>>>(
di, di,
chainCount: c, chainCount: c,
nestingDepth: d, nestingDepth: d,
@@ -111,7 +111,7 @@ class BenchmarkCliRunner {
); );
} else { } else {
final benchSync = UniversalChainBenchmark< final benchSync = UniversalChainBenchmark<
Map<String, rp.ProviderBase<Object?>>> ( Map<String, rp.ProviderBase<Object?>>>(
di, di,
chainCount: c, chainCount: c,
nestingDepth: d, nestingDepth: d,
@@ -127,7 +127,8 @@ class BenchmarkCliRunner {
} else if (config.di == 'yx_scope') { } else if (config.di == 'yx_scope') {
final di = YxScopeAdapter(); final di = YxScopeAdapter();
if (scenario == UniversalScenario.asyncChain) { if (scenario == UniversalScenario.asyncChain) {
final benchAsync = UniversalChainAsyncBenchmark<UniversalYxScopeContainer>( final benchAsync =
UniversalChainAsyncBenchmark<UniversalYxScopeContainer>(
di, di,
chainCount: c, chainCount: c,
nestingDepth: d, nestingDepth: d,
@@ -139,7 +140,8 @@ class BenchmarkCliRunner {
repeats: config.repeats, repeats: config.repeats,
); );
} else { } else {
final benchSync = UniversalChainBenchmark<UniversalYxScopeContainer>( final benchSync =
UniversalChainBenchmark<UniversalYxScopeContainer>(
di, di,
chainCount: c, chainCount: c,
nestingDepth: d, nestingDepth: d,

139
benchmark_di/lib/di_adapters/kiwi_adapter.dart
View File

@@ -20,77 +20,80 @@ class KiwiAdapter extends DIAdapter<KiwiContainer> {
registration(_container); registration(_container);
} }
@override @override
Registration<KiwiContainer> universalRegistration<S extends Enum>({ Registration<KiwiContainer> universalRegistration<S extends Enum>({
required S scenario, required S scenario,
required int chainCount, required int chainCount,
required int nestingDepth, required int nestingDepth,
required UniversalBindingMode bindingMode, required UniversalBindingMode bindingMode,
}) { }) {
if (scenario is UniversalScenario) { if (scenario is UniversalScenario) {
if (scenario == UniversalScenario.asyncChain || if (scenario == UniversalScenario.asyncChain ||
bindingMode == UniversalBindingMode.asyncStrategy) { bindingMode == UniversalBindingMode.asyncStrategy) {
throw UnsupportedError('Kiwi does not support async dependencies or async binding scenarios.'); throw UnsupportedError(
} 'Kiwi does not support async dependencies or async binding scenarios.');
return (container) { }
switch (scenario) { return (container) {
case UniversalScenario.asyncChain: switch (scenario) {
break; case UniversalScenario.asyncChain:
case UniversalScenario.register: break;
container.registerSingleton<UniversalService>( case UniversalScenario.register:
(c) => UniversalServiceImpl(value: 'reg', dependency: null), container.registerSingleton<UniversalService>(
); (c) => UniversalServiceImpl(value: 'reg', dependency: null),
break; );
case UniversalScenario.named: break;
container.registerFactory<UniversalService>( case UniversalScenario.named:
(c) => UniversalServiceImpl(value: 'impl1'), name: 'impl1'); container.registerFactory<UniversalService>(
container.registerFactory<UniversalService>( (c) => UniversalServiceImpl(value: 'impl1'),
(c) => UniversalServiceImpl(value: 'impl2'), name: 'impl2'); name: 'impl1');
break; container.registerFactory<UniversalService>(
case UniversalScenario.chain: (c) => UniversalServiceImpl(value: 'impl2'),
for (int chain = 1; chain <= chainCount; chain++) { name: 'impl2');
for (int level = 1; level <= nestingDepth; level++) { break;
final prevDepName = '${chain}_${level - 1}'; case UniversalScenario.chain:
final depName = '${chain}_$level'; for (int chain = 1; chain <= chainCount; chain++) {
switch (bindingMode) { for (int level = 1; level <= nestingDepth; level++) {
case UniversalBindingMode.singletonStrategy: final prevDepName = '${chain}_${level - 1}';
container.registerSingleton<UniversalService>( final depName = '${chain}_$level';
(c) => UniversalServiceImpl( switch (bindingMode) {
value: depName, case UniversalBindingMode.singletonStrategy:
dependency: level > 1 container.registerSingleton<UniversalService>(
? c.resolve<UniversalService>(prevDepName) (c) => UniversalServiceImpl(
: null), value: depName,
name: depName); dependency: level > 1
break; ? c.resolve<UniversalService>(prevDepName)
case UniversalBindingMode.factoryStrategy: : null),
container.registerFactory<UniversalService>( name: depName);
(c) => UniversalServiceImpl( break;
value: depName, case UniversalBindingMode.factoryStrategy:
dependency: level > 1 container.registerFactory<UniversalService>(
? c.resolve<UniversalService>(prevDepName) (c) => UniversalServiceImpl(
: null), value: depName,
name: depName); dependency: level > 1
break; ? c.resolve<UniversalService>(prevDepName)
case UniversalBindingMode.asyncStrategy: : null),
// Не поддерживается name: depName);
break; break;
case UniversalBindingMode.asyncStrategy:
// Не поддерживается
break;
}
} }
} }
} final depName = '${chainCount}_$nestingDepth';
final depName = '${chainCount}_$nestingDepth'; container.registerSingleton<UniversalService>(
container.registerSingleton<UniversalService>( (c) => c.resolve<UniversalService>(depName));
(c) => c.resolve<UniversalService>(depName)); break;
break; case UniversalScenario.override:
case UniversalScenario.override: final depName = '${chainCount}_$nestingDepth';
final depName = '${chainCount}_$nestingDepth'; container.registerSingleton<UniversalService>(
container.registerSingleton<UniversalService>( (c) => c.resolve<UniversalService>(depName));
(c) => c.resolve<UniversalService>(depName)); break;
break; }
} };
}; }
throw UnsupportedError('Scenario $scenario not supported by KiwiAdapter');
} }
throw UnsupportedError('Scenario $scenario not supported by KiwiAdapter');
}
@override @override
T resolve<T extends Object>({String? named}) { T resolve<T extends Object>({String? named}) {

12
benchmark_di/lib/di_adapters/yx_scope_adapter.dart
View File

@@ -11,7 +11,8 @@ class YxScopeAdapter extends DIAdapter<UniversalYxScopeContainer> {
late UniversalYxScopeContainer _scope; late UniversalYxScopeContainer _scope;
@override @override
void setupDependencies(void Function(UniversalYxScopeContainer container) registration) { void setupDependencies(
void Function(UniversalYxScopeContainer container) registration) {
_scope = UniversalYxScopeContainer(); _scope = UniversalYxScopeContainer();
registration(_scope); registration(_scope);
} }
@@ -45,7 +46,8 @@ class YxScopeAdapter extends DIAdapter<UniversalYxScopeContainer> {
} }
@override @override
Registration<UniversalYxScopeContainer> universalRegistration<S extends Enum>({ Registration<UniversalYxScopeContainer>
universalRegistration<S extends Enum>({
required S scenario, required S scenario,
required int chainCount, required int chainCount,
required int nestingDepth, required int nestingDepth,
@@ -112,7 +114,8 @@ class YxScopeAdapter extends DIAdapter<UniversalYxScopeContainer> {
// handled at benchmark level // handled at benchmark level
break; break;
} }
if (scenario == UniversalScenario.chain || scenario == UniversalScenario.override) { if (scenario == UniversalScenario.chain ||
scenario == UniversalScenario.override) {
final depName = '${chainCount}_$nestingDepth'; final depName = '${chainCount}_$nestingDepth';
final lastDep = scope.dep<UniversalService>( final lastDep = scope.dep<UniversalService>(
() => scope.depFor<UniversalService>(name: depName).get, () => scope.depFor<UniversalService>(name: depName).get,
@@ -121,6 +124,7 @@ class YxScopeAdapter extends DIAdapter<UniversalYxScopeContainer> {
} }
}; };
} }
throw UnsupportedError('Scenario $scenario not supported by YxScopeAdapter'); throw UnsupportedError(
'Scenario $scenario not supported by YxScopeAdapter');
} }
} }

2
benchmark_di/pubspec.lock
View File

@@ -47,7 +47,7 @@ packages:
path: "../cherrypick" path: "../cherrypick"
relative: true relative: true
source: path source: path
version: "3.0.0-dev.12" version: "3.0.0"
collection: collection:
dependency: transitive dependency: transitive
description: description:

8
examples/client_app/pubspec.lock
View File

@@ -127,28 +127,28 @@ packages:
path: "../../cherrypick" path: "../../cherrypick"
relative: true relative: true
source: path source: path
version: "3.0.0-dev.12" version: "3.0.0"
cherrypick_annotations: cherrypick_annotations:
dependency: "direct main" dependency: "direct main"
description: description:
path: "../../cherrypick_annotations" path: "../../cherrypick_annotations"
relative: true relative: true
source: path source: path
version: "3.0.0-dev.0" version: "3.0.0"
cherrypick_flutter: cherrypick_flutter:
dependency: "direct main" dependency: "direct main"
description: description:
path: "../../cherrypick_flutter" path: "../../cherrypick_flutter"
relative: true relative: true
source: path source: path
version: "3.0.0-dev.0" version: "3.0.0"
cherrypick_generator: cherrypick_generator:
dependency: "direct dev" dependency: "direct dev"
description: description:
path: "../../cherrypick_generator" path: "../../cherrypick_generator"
relative: true relative: true
source: path source: path
version: "3.0.0-dev.0" version: "3.0.0"
clock: clock:
dependency: transitive dependency: transitive
description: description:

8
examples/postly/pubspec.lock
View File

@@ -175,21 +175,21 @@ packages:
path: "../../cherrypick" path: "../../cherrypick"
relative: true relative: true
source: path source: path
version: "3.0.0-dev.12" version: "3.0.0"
cherrypick_annotations: cherrypick_annotations:
dependency: "direct main" dependency: "direct main"
description: description:
path: "../../cherrypick_annotations" path: "../../cherrypick_annotations"
relative: true relative: true
source: path source: path
version: "3.0.0-dev.0" version: "3.0.0"
cherrypick_generator: cherrypick_generator:
dependency: "direct main" dependency: "direct main"
description: description:
path: "../../cherrypick_generator" path: "../../cherrypick_generator"
relative: true relative: true
source: path source: path
version: "3.0.0-dev.0" version: "3.0.0"
cli_launcher: cli_launcher:
dependency: transitive dependency: transitive
description: description:
@@ -864,7 +864,7 @@ packages:
path: "../../talker_cherrypick_logger" path: "../../talker_cherrypick_logger"
relative: true relative: true
source: path source: path
version: "3.0.0-dev.0" version: "3.0.0"
talker_dio_logger: talker_dio_logger:
dependency: "direct main" dependency: "direct main"
description: description: