feat(cli): pretty build.yaml generation, full English docs, robust init command\n\n- build.yaml is always formatted\n- CLI help and output in English\n- README with usage and examples\n- Custom output dir and build.yaml supported\n- Safe update of existing configs\n- json2yaml for pretty YAML output

- Removed all unused imports and variables across generator sources and tests
- Applied Dart 3 super parameters to all custom exceptions
- Project now passes 'dart analyze' with zero warnings or infos
- All tests (164/164) are green

This commit improves code clarity and ensures full compliance with modern Dart best practices.

.gitignore

@@ -7,7 +7,7 @@
 .idea/
 .vscode/
 
-
+**/generated
 **/*.g.dart
 **/*.gr.dart
 **/*.freezed.dart
@@ -17,6 +17,4 @@ pubspec_overrides.yaml
 
 melos_cherrypick.iml
 melos_cherrypick_workspace.iml
-melos_cherrypick_flutter.iml
-
-coverage
+melos_cherrypick_flutter.iml

CHANGELOG.md

@@ -3,7 +3,7 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## 2025-08-08
+## 2025-07-15
 
 ### Changes
 
@@ -11,239 +11,30 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 Packages with breaking changes:
 
- - [`cherrypick` - `v3.0.0-dev.6`](#cherrypick---v300-dev6)
+ - [`cherrypick_generator` - `v1.1.0-dev.6`](#cherrypick_generator---v110-dev6)
 
 Packages with other changes:
 
- - [`cherrypick_flutter` - `v1.1.3-dev.6`](#cherrypick_flutter---v113-dev6)
+ - [`cherrypick` - `v2.2.0-dev.2`](#cherrypick---v220-dev2)
+ - [`cherrypick_flutter` - `v1.1.2-dev.2`](#cherrypick_flutter---v112-dev2)
 
 Packages with dependency updates only:
 
 > Packages listed below depend on other packages in this workspace that have had changes. Their versions have been incremented to bump the minimum dependency versions of the packages they depend upon in this project.
 
- - `cherrypick_flutter` - `v1.1.3-dev.6`
+ - `cherrypick_flutter` - `v1.1.2-dev.2`
 
 ---
 
-#### `cherrypick` - `v3.0.0-dev.6`
+#### `cherrypick_generator` - `v1.1.0-dev.6`
 
- - **FIX**: improve global cycle detector logic.
- - **DOCS**(readme): add comprehensive DI state and action logging to features.
- - **DOCS**(helper): add complete DartDoc with real usage examples for CherryPick class.
- - **DOCS**(log_format): add detailed English documentation for formatLogMessage function.
- - **BREAKING** **FEAT**(core): refactor root scope API, improve logger injection, helpers, and tests.
- - **BREAKING** **FEAT**(logger): add extensible logging API, usage examples, and bilingual documentation.
+ - **FIX**: format test code.
+ - **FEAT**(generator): support output_dir and build_extensions config for generated files.
+ - **BREAKING** **FEAT**(generator): complete code generation testing framework with 100% test coverage.
 
+#### `cherrypick` - `v2.2.0-dev.2`
 
-## 2025-08-07
-
-### Changes
-
----
-
-Packages with breaking changes:
-
- - There are no breaking changes in this release.
-
-Packages with other changes:
-
- - [`cherrypick` - `v3.0.0-dev.5`](#cherrypick---v300-dev5)
- - [`cherrypick_flutter` - `v1.1.3-dev.5`](#cherrypick_flutter---v113-dev5)
-
-Packages with dependency updates only:
-
-> Packages listed below depend on other packages in this workspace that have had changes. Their versions have been incremented to bump the minimum dependency versions of the packages they depend upon in this project.
-
- - `cherrypick_flutter` - `v1.1.3-dev.5`
-
----
-
-#### `cherrypick` - `v3.0.0-dev.5`
-
- - **REFACTOR**(scope): simplify _findBindingResolver<T> with one-liner and optional chaining.
- - **PERF**(scope): speed up dependency lookup with Map-based binding resolver index.
- - **DOCS**(perf): clarify Map-based resolver optimization applies since v3.0.0 in all docs.
- - **DOCS**: update EN/RU quick start and tutorial with Fast Map-based lookup section; clarify performance benefit in README.
-
-
-## 2025-08-07
-
-### Changes
-
----
-
-Packages with breaking changes:
-
- - There are no breaking changes in this release.
-
-Packages with other changes:
-
- - [`cherrypick` - `v3.0.0-dev.4`](#cherrypick---v300-dev4)
- - [`cherrypick_flutter` - `v1.1.3-dev.4`](#cherrypick_flutter---v113-dev4)
-
-Packages with dependency updates only:
-
-> Packages listed below depend on other packages in this workspace that have had changes. Their versions have been incremented to bump the minimum dependency versions of the packages they depend upon in this project.
-
- - `cherrypick_flutter` - `v1.1.3-dev.4`
-
----
-
-#### `cherrypick` - `v3.0.0-dev.4`
-
- - **REFACTOR**(scope): simplify _findBindingResolver<T> with one-liner and optional chaining.
- - **PERF**(scope): speed up dependency lookup with Map-based binding resolver index.
- - **DOCS**(perf): clarify Map-based resolver optimization applies since v3.0.0 in all docs.
- - **DOCS**: update EN/RU quick start and tutorial with Fast Map-based lookup section; clarify performance benefit in README.
-
-
-## 2025-08-07
-
-### Changes
-
----
-
-Packages with breaking changes:
-
- - There are no breaking changes in this release.
-
-Packages with other changes:
-
- - [`cherrypick` - `v3.0.0-dev.3`](#cherrypick---v300-dev3)
- - [`cherrypick_flutter` - `v1.1.3-dev.3`](#cherrypick_flutter---v113-dev3)
-
-Packages with dependency updates only:
-
-> Packages listed below depend on other packages in this workspace that have had changes. Their versions have been incremented to bump the minimum dependency versions of the packages they depend upon in this project.
-
- - `cherrypick_flutter` - `v1.1.3-dev.3`
-
----
-
-#### `cherrypick` - `v3.0.0-dev.3`
-
- - **REFACTOR**(scope): simplify _findBindingResolver<T> with one-liner and optional chaining.
- - **PERF**(scope): speed up dependency lookup with Map-based binding resolver index.
- - **DOCS**(perf): clarify Map-based resolver optimization applies since v3.0.0 in all docs.
- - **DOCS**: update EN/RU quick start and tutorial with Fast Map-based lookup section; clarify performance benefit in README.
-
-
-## 2025-08-04
-
-### Changes
-
----
-
-Packages with breaking changes:
-
- - [`cherrypick` - `v3.0.0-dev.2`](#cherrypick---v300-dev2)
-
-Packages with other changes:
-
- - [`cherrypick_flutter` - `v1.1.3-dev.2`](#cherrypick_flutter---v113-dev2)
-
-Packages with dependency updates only:
-
-> Packages listed below depend on other packages in this workspace that have had changes. Their versions have been incremented to bump the minimum dependency versions of the packages they depend upon in this project.
-
- - `cherrypick_flutter` - `v1.1.3-dev.2`
-
----
-
-#### `cherrypick` - `v3.0.0-dev.2`
-
- - **FEAT**(binding): add deprecated proxy async methods for backward compatibility and highlight transition to modern API.
- - **DOCS**: add quick guide for circular dependency detection to README.
- - **DOCS**: add quick guide for circular dependency detection to README.
- - **BREAKING** **FEAT**: implement comprehensive circular dependency detection system.
- - **BREAKING** **FEAT**: implement comprehensive circular dependency detection system.
-
-
-## 2025-07-30
-
-### Changes
-
----
-
-Packages with breaking changes:
-
- - There are no breaking changes in this release.
-
-Packages with other changes:
-
- - [`cherrypick` - `v3.0.0-dev.1`](#cherrypick---v300-dev1)
- - [`cherrypick_flutter` - `v1.1.3-dev.1`](#cherrypick_flutter---v113-dev1)
-
-Packages with dependency updates only:
-
-> Packages listed below depend on other packages in this workspace that have had changes. Their versions have been incremented to bump the minimum dependency versions of the packages they depend upon in this project.
-
- - `cherrypick_flutter` - `v1.1.3-dev.1`
-
----
-
-#### `cherrypick` - `v3.0.0-dev.1`
-
- - **DOCS**: add quick guide for circular dependency detection to README.
-
-
-## 2025-07-30
-
-### Changes
-
----
-
-Packages with breaking changes:
-
- - [`cherrypick` - `v3.0.0-dev.0`](#cherrypick---v300-dev0)
-
-Packages with other changes:
-
- - [`cherrypick_flutter` - `v1.1.3-dev.0`](#cherrypick_flutter---v113-dev0)
-
----
-
-#### `cherrypick` - `v3.0.0-dev.0`
-
- - **BREAKING** **FEAT**: implement comprehensive circular dependency detection system.
-
-#### `cherrypick_flutter` - `v1.1.3-dev.0`
-
- - **FIX**: update deps.
-
-
-## 2025-07-28
-
-### Changes
-
----
-
-Packages with breaking changes:
-
- - [`cherrypick_flutter` - `v1.1.2`](#cherrypick_flutter---v112)
-
-Packages with other changes:
-
- - [`cherrypick` - `v2.2.0`](#cherrypick---v220)
- - [`cherrypick_annotations` - `v1.1.0`](#cherrypick_annotations---v110)
- - [`cherrypick_generator` - `v1.1.0`](#cherrypick_generator---v110)
-
-Packages graduated to a stable release (see pre-releases prior to the stable version for changelog entries):
-
- - `cherrypick` - `v2.2.0`
- - `cherrypick_annotations` - `v1.1.0`
- - `cherrypick_flutter` - `v1.1.2`
- - `cherrypick_generator` - `v1.1.0`
-
----
-
-#### `cherrypick_flutter` - `v1.1.2`
-
-#### `cherrypick` - `v2.2.0`
-
-#### `cherrypick_annotations` - `v1.1.0`
-
-#### `cherrypick_generator` - `v1.1.0`
+ - **DOCS**: move and update quick start guides to ./doc directory.
 
 
 ## 2025-06-04

README.md

@@ -99,7 +99,7 @@ final scope = CherryPick.openRootScope()
   ..installModules([$MyModule()]);
 
 final repo = scope.resolve<DataRepository>();
-final greeting = scope.resolve<String>(params: 'John'); // 'Hello, John!'
+final greeting = scope.resolveWithParams<String>('John'); // 'Hello, John!'
 ```
 
 _For Flutter, wrap your app with `CherryPickProvider` for DI scopes in the widget tree:_

benchmark_di/README.md

@@ -1,275 +0,0 @@
-# benchmark_di
-
-_Benchmark suite for cherrypick DI container, get_it, and other DI solutions._
-
-## Overview
-
-benchmark_di is a flexible benchmarking suite to compare DI containers (like cherrypick and get_it) on synthetic, deep, and real-world dependency scenarios – chains, factories, async, named, override, etc.
-
-**Features:**
-- Universal registration layer and modular scenario setup (works with any DI)
-- Built-in support for [cherrypick](https://github.com/) and [get_it](https://pub.dev/packages/get_it)
-- Clean CLI for matrix runs and output formats (Markdown, CSV, JSON, pretty)
-- Reports metrics: timings, memory (RSS, peak), statistical spreads, and more
-- Extendable via your own DIAdapter or benchmark scenarios
-
----
-
-## Benchmark Scenarios
-
-- **registerSingleton**: Simple singleton registration/resolution
-- **chainSingleton**: Resolution of long singleton chains (A→B→C...)
-- **chainFactory**: Chain resolution via factories (new instances each time)
-- **asyncChain**: Async chain (with async providers)
-- **named**: Named/qualified resolution (e.g. from multiple implementations)
-- **override**: Resolution and override in subScopes/child adapters
-
----
-
-## Supported DI
-
-- **cherrypick** (default)
-- **get_it**
-- Easy to add your own DI by creating a DIAdapter
-
-Switch DI with the CLI option: `--di`
-
----
-
-## How to Run
-
-1. **Install dependencies:**
-   ```shell
-   dart pub get
-   ```
-
-2. **Run all benchmarks (default: all scenarios, 2 warmup, 2 repeats):**
-   ```shell
-   dart run bin/main.dart --benchmark=all --format=markdown
-   ```
-
-3. **For get_it:**
-   ```shell
-   dart run bin/main.dart --di=getit --benchmark=all --format=markdown
-   ```
-
-4. **Show all CLI options:**
-   ```shell
-   dart run bin/main.dart --help
-   ```
-
-### CLI Parameters
-
-- `--di` — DI implementation: `cherrypick` (default) or `getit`
-- `--benchmark, -b` — Scenario: `registerSingleton`, `chainSingleton`, `chainFactory`, `asyncChain`, `named`, `override`, `all`
-- `--chainCount, -c` — Number of parallel chains (e.g. `10,100`)
-- `--nestingDepth, -d` — Chain depth (e.g. `5,10`)
-- `--repeat, -r` — Measurement repeats (default: 2)
-- `--warmup, -w` — Warmup runs (default: 1)
-- `--format, -f` — Output: `pretty`, `csv`, `json`, `markdown`
-- `--help, -h` — Usage
-
-### Run Examples
-
-- **All benchmarks for cherrypick:**
-  ```shell
-  dart run bin/main.dart --di=cherrypick --benchmark=all --format=markdown
-  ```
-
-- **For get_it (all scenarios):**
-  ```shell
-  dart run bin/main.dart --di=getit --benchmark=all --format=markdown
-  ```
-
-- **Specify chains/depth matrix:**
-  ```shell
-  dart run bin/main.dart --benchmark=chainSingleton --chainCount=10,100 --nestingDepth=5,10 --repeat=3 --format=csv
-  ```
-
----
-
-## Universal DI registration: Adapter-centric approach
-
-Starting from vX.Y.Z, all DI registration scenarios and logic are encapsulated in the adapter itself via the `universalRegistration` method.
-
-### How to use (in Dart code):
-
-```dart
-final di = CherrypickDIAdapter(); // or GetItAdapter(), RiverpodAdapter(), etc
-
-di.setupDependencies(
-  di.universalRegistration(
-    scenario: UniversalScenario.chain,
-    chainCount: 10,
-    nestingDepth: 5,
-    bindingMode: UniversalBindingMode.singletonStrategy,
-  ),
-);
-```
-- There is **no more need to use any global function or switch**: each adapter provides its own type-safe implementation.
-
-### How to add a new scenario or DI:
-- Implement `universalRegistration<S extends Enum>(...)` in your adapter
-- Use your own Enum if you want adapter-specific scenarios!
-- Benchmarks and CLI become automatically extensible for custom DI and scenarios.
-
-### CLI usage (runs all universal scenarios for Cherrypick, GetIt, Riverpod):
-
-```
-dart run bin/main.dart --di=cherrypick --benchmark=all
-dart run bin/main.dart --di=getit --benchmark=all
-dart run bin/main.dart --di=riverpod --benchmark=all
-```
-
-See the `benchmark_di/lib/di_adapters/` folder for ready-to-use adapters.
-
----
-## Advantages
-
-- **Type-safe:** Zero dynamic/object usage in DI flows.
-- **Extensible:** New scenarios are just new Enum values and a method extension.
-- **No global registration logic:** All DI-related logic is where it belongs: in the adapter.
-
-=======
-## How to Add Your Own DI
-
-1. Implement a class extending `DIAdapter` (`lib/di_adapters/your_adapter.dart`)
-2. Implement the `universalRegistration<S extends Enum>(...)` method directly in your adapter for type-safe and scenario-specific registration
-3. Register your adapter in CLI (see `cli/benchmark_cli.dart`)
-4. No global function needed — all logic is within the adapter!
-
----
-## Universal DI registration: Adapter-centric approach
-
-Starting from vX.Y.Z, all DI registration scenarios and logic are encapsulated in the adapter itself via the `universalRegistration` method.
-
-### How to use (in Dart code):
-
-```dart
-final di = CherrypickDIAdapter(); // or GetItAdapter(), RiverpodAdapter(), etc
-
-di.setupDependencies(
-  di.universalRegistration(
-    scenario: UniversalScenario.chain,
-    chainCount: 10,
-    nestingDepth: 5,
-    bindingMode: UniversalBindingMode.singletonStrategy,
-  ),
-);
-```
-- There is **no more need to use any global function or switch**: each adapter provides its own type-safe implementation.
-
-### How to add a new scenario or DI:
-- Implement `universalRegistration<S extends Enum>(...)` in your adapter
-- Use your own Enum if you want adapter-specific scenarios!
-- Benchmarks and CLI become automatically extensible for custom DI and scenarios.
-
-### CLI usage (runs all universal scenarios for Cherrypick, GetIt, Riverpod):
-
-```
-dart run bin/main.dart --di=cherrypick --benchmark=all
-dart run bin/main.dart --di=getit --benchmark=all
-dart run bin/main.dart --di=riverpod --benchmark=all
-```
-
-See the `benchmark_di/lib/di_adapters/` folder for ready-to-use adapters.
-
-## Advantages
-
-- **Type-safe:** Zero dynamic/object usage in DI flows.
-- **Extensible:** New scenarios are just new Enum values and a method extension.
-- **No global registration logic:** All DI-related logic is where it belongs: in the adapter.
-
----
-
-## Architecture
-
-```mermaid
-classDiagram
-    class BenchmarkCliRunner {
-        +run(args)
-    }
-    class UniversalChainBenchmark~TContainer~ {
-        +setup()
-        +run()
-        +teardown()
-    }
-    class UniversalChainAsyncBenchmark~TContainer~ {
-        +setup()
-        +run()
-        +teardown()
-    }
-    class DIAdapter~TContainer~ {
-        <<interface>>
-        +setupDependencies(cb)
-        +resolve~T~(named)
-        +resolveAsync~T~(named)
-        +teardown()
-        +openSubScope(name)
-        +waitForAsyncReady()
-        +universalRegistration<S extends Enum>(...)
-    }
-    class CherrypickDIAdapter
-    class GetItAdapter
-    class RiverpodAdapter
-    class UniversalChainModule {
-        +builder(scope)
-        +chainCount
-        +nestingDepth
-        +bindingMode
-        +scenario
-    }
-    class UniversalService {
-        <<interface>>
-        +value
-        +dependency
-    }
-    class UniversalServiceImpl {
-        +UniversalServiceImpl(value, dependency)
-    }
-    class Scope
-    class UniversalScenario
-    class UniversalBindingMode
-
-    %% Relationships
-
-    BenchmarkCliRunner --> UniversalChainBenchmark
-    BenchmarkCliRunner --> UniversalChainAsyncBenchmark
-
-    UniversalChainBenchmark *-- DIAdapter
-    UniversalChainAsyncBenchmark *-- DIAdapter
-
-    DIAdapter <|.. CherrypickDIAdapter
-    DIAdapter <|.. GetItAdapter
-    DIAdapter <|.. RiverpodAdapter
-
-    CherrypickDIAdapter ..> Scope
-    GetItAdapter ..> GetIt: "uses GetIt"
-    RiverpodAdapter ..> Map~String, ProviderBase~: "uses Provider registry"
-
-    DIAdapter o--> UniversalChainModule : setupDependencies
-
-    UniversalChainModule ..> UniversalScenario
-    UniversalChainModule ..> UniversalBindingMode
-
-    UniversalChainModule o-- UniversalServiceImpl : creates
-    UniversalService <|.. UniversalServiceImpl
-    UniversalServiceImpl --> UniversalService : dependency
-
-    %% 
-    %% Each concrete adapter implements universalRegistration<S extends Enum>
-    %% You can add new scenario enums for custom adapters
-    %% Extensibility is achieved via adapter logic, not global functions
-```
-
----
-
-## Metrics
-
-Always collected:
-- **Timings** (microseconds): mean, median, stddev, min, max
-- **Memory**: RSS difference, peak RSS
-
-## License
-
-MIT

benchmark_di/README.ru.md

@@ -1,226 +0,0 @@
-# benchmark_di
-
-_Бенчмаркинговый набор для cherrypick, get_it и других DI-контейнеров._
-
-## Общее описание
-
-benchmark_di — это современный фреймворк для измерения производительности DI-контейнеров (как cherrypick, так и get_it) на синтетических, сложных и реальных сценариях: цепочки зависимостей, factory, async, именованные биндинги, override и пр.
-
-**Возможности:**
-- Универсальный слой регистрации сценариев (работает с любым DI)
-- Готовая поддержка [cherrypick](https://github.com/) и [get_it](https://pub.dev/packages/get_it)
-- Удобный CLI для запусков по матрице значений параметров и различных форматов вывода (Markdown, CSV, JSON, pretty)
-- Сбор и вывод метрик: время, память (RSS, peak), статистика (среднее, медиана, stddev, min/max)
-- Легко расширять — создавайте свой DIAdapter и новые сценарии
-
----
-
-## Сценарии бенчмарков
-
-- **registerSingleton**: Регистрация и резолвинг singleton
-- **chainSingleton**: Разрешение длинных singleton-цепочек (A→B→C…)
-- **chainFactory**: То же, но с factory (каждый раз — новый объект)
-- **asyncChain**: Асинхронная цепочка (async factory/provider)
-- **named**: Разрешение по имени (например, из нескольких реализаций)
-- **override**: Переопределение зависимостей в subScope
-
----
-
-## Поддерживаемые DI-контейнеры
-
-- **cherrypick** (по умолчанию)
-- **get_it**
-- Легко добавить свой DI через DIAdapter
-
-Меняется одной CLI-опцией: `--di`
-
----
-
-## Как запустить
-
-1. **Установить зависимости:**
-   ```shell
-   dart pub get
-   ```
-
-2. **Запустить все бенчмарки (по умолчанию: все сценарии, 2 прогрева, 2 замера):**
-   ```shell
-   dart run bin/main.dart --benchmark=all --format=markdown
-   ```
-
-3. **Для get_it:**
-   ```shell
-   dart run bin/main.dart --di=getit --benchmark=all --format=markdown
-   ```
-
-4. **Показать все опции CLI:**
-   ```shell
-   dart run bin/main.dart --help
-   ```
-
-### Параметры CLI
-
-- `--di` — Какой DI использовать: `cherrypick` (по умолчанию) или `getit`
-- `--benchmark, -b` — Сценарий: `registerSingleton`, `chainSingleton`, `chainFactory`, `asyncChain`, `named`, `override`, `all`
-- `--chainCount, -c` — Сколько параллельных цепочек (например, `10,100`)
-- `--nestingDepth, -d` — Глубина цепочки (например, `5,10`)
-- `--repeat, -r` — Повторов замера (по умолчанию 2)
-- `--warmup, -w` — Прогревочных запусков (по умолчанию 1)
-- `--format, -f` — Формат отчёта: `pretty`, `csv`, `json`, `markdown`
-- `--help, -h` — Справка
-
-### Примеры запуска
-
-- **Все бенчмарки для cherrypick:**
-  ```shell
-  dart run bin/main.dart --di=cherrypick --benchmark=all --format=markdown
-  ```
-
-- **Для get_it (все сценарии):**
-  ```shell
-  dart run bin/main.dart --di=getit --benchmark=all --format=markdown
-  ```
-
-- **Запуск по матрице параметров:**
-  ```shell
-  dart run bin/main.dart --benchmark=chainSingleton --chainCount=10,100 --nestingDepth=5,10 --repeat=3 --format=csv
-  ```
-
----
-
-## Универсальная регистрация зависимостей: теперь через adapter
-
-В версии X.Y.Z вся логика сценариев регистрации DI-инфраструктуры локализована в adapter через метод `universalRegistration`.
-
-### Использование в Dart:
-
-```dart
-final di = CherrypickDIAdapter(); // или GetItAdapter(), RiverpodAdapter() и т.д.
-
-di.setupDependencies(
-  di.universalRegistration(
-    scenario: UniversalScenario.chain,
-    chainCount: 10,
-    nestingDepth: 5,
-    bindingMode: UniversalBindingMode.singletonStrategy,
-  ),
-);
-```
-- **Теперь нет необходимости вызывать глобальные функции или switch-case по типу DI!** Каждый adapter сам предоставляет типобезопасную функцию регистрации.
-
-### Как добавить новый сценарий или DI:
-
-- Реализуйте метод `universalRegistration<S extends Enum>(...)` в своём adapter.
-- Можно использовать как UniversalScenario, так и собственные enum-сценарии!
-- Бенчмарки CLI автоматически расширяются под ваш DI и ваши сценарии, если реализован метод-расширение.
-
-### Запуск CLI (все сценарии DI Cherrypick, GetIt, Riverpod):
-
-```
-dart run bin/main.dart --di=cherrypick --benchmark=all
-dart run bin/main.dart --di=getit --benchmark=all
-dart run bin/main.dart --di=riverpod --benchmark=all
-```
-
-Смотрите примеры готовых adapters в `benchmark_di/lib/di_adapters/`.
-
-## Преимущества
-
-- **Type-safe:** Исключено использование dynamic/object в стороне DI.
-- **Масштабируемость:** Новый сценарий — просто enum + метод в adapter.
-- **Вся логика регистрации теперь только в adapter:** Добавление или изменение не затрагивает глобальные функции.
-
-
----
-
-## Архитектура
-
-```mermaid
-classDiagram
-    class BenchmarkCliRunner {
-        +run(args)
-    }
-    class UniversalChainBenchmark~TContainer~ {
-        +setup()
-        +run()
-        +teardown()
-    }
-    class UniversalChainAsyncBenchmark~TContainer~ {
-        +setup()
-        +run()
-        +teardown()
-    }
-    class DIAdapter~TContainer~ {
-        <<interface>>
-        +setupDependencies(cb)
-        +resolve~T~(named)
-        +resolveAsync~T~(named)
-        +teardown()
-        +openSubScope(name)
-        +waitForAsyncReady()
-        +universalRegistration<S extends Enum>(...)
-    }
-    class CherrypickDIAdapter
-    class GetItAdapter
-    class RiverpodAdapter
-    class UniversalChainModule {
-        +builder(scope)
-        +chainCount
-        +nestingDepth
-        +bindingMode
-        +scenario
-    }
-    class UniversalService {
-        <<interface>>
-        +value
-        +dependency
-    }
-    class UniversalServiceImpl {
-        +UniversalServiceImpl(value, dependency)
-    }
-    class Scope
-    class UniversalScenario
-    class UniversalBindingMode
-
-    %% Relationships
-
-    BenchmarkCliRunner --> UniversalChainBenchmark
-    BenchmarkCliRunner --> UniversalChainAsyncBenchmark
-
-    UniversalChainBenchmark *-- DIAdapter
-    UniversalChainAsyncBenchmark *-- DIAdapter
-
-    DIAdapter <|.. CherrypickDIAdapter
-    DIAdapter <|.. GetItAdapter
-    DIAdapter <|.. RiverpodAdapter
-
-    CherrypickDIAdapter ..> Scope
-    GetItAdapter ..> GetIt: "uses GetIt"
-    RiverpodAdapter ..> Map~String, ProviderBase~: "uses Provider registry"
-
-    DIAdapter o--> UniversalChainModule : setupDependencies
-
-    UniversalChainModule ..> UniversalScenario
-    UniversalChainModule ..> UniversalBindingMode
-
-    UniversalChainModule o-- UniversalServiceImpl : creates
-    UniversalService <|.. UniversalServiceImpl
-    UniversalServiceImpl --> UniversalService : dependency
-
-    %% 
-    %% Each concrete adapter implements universalRegistration<S extends Enum>
-    %% You can add new scenario enums for custom adapters
-    %% Extensibility is achieved via adapter logic, not global functions
-```
-
----
-
-## Метрики
-
-Всегда собираются:
-- **Время** (мкс): среднее, медиана, stddev, min, max
-- **Память**: прирост RSS, пиковое значение RSS
-
-## Лицензия
-
-MIT

benchmark_di/REPORT.md

@@ -1,51 +0,0 @@
-# Comparative DI Benchmark Report: cherrypick vs get_it vs riverpod
-
-## Benchmark Scenarios
-
-1. **RegisterSingleton** — Registers and resolves a singleton. Baseline DI speed.
-2. **ChainSingleton** — A dependency chain A → B → ... → N (singleton). Deep singleton chain resolution.
-3. **ChainFactory** — All chain elements are factories. Stateless creation chain.
-4. **AsyncChain** — Async chain (async factory). Performance on async graphs.
-5. **Named** — Registers two bindings with names, resolves by name. Named lookup test.
-6. **Override** — Registers a chain/alias in a child scope. Tests scope overrides.
-
----
-
-## Comparative Table: chainCount=10, nestingDepth=10 (Mean, PeakRSS)
-
-| Scenario           | cherrypick Mean (us) | cherrypick PeakRSS | get_it Mean (us) | get_it PeakRSS | riverpod Mean (us) | riverpod PeakRSS |
-|--------------------|---------------------:|-------------------:|-----------------:|---------------:|-------------------:|-----------------:|
-| RegisterSingleton  | 13.00                | 273104             | 8.40             | 261872         | 9.80               | 268512           |
-| ChainSingleton     | 13.80                | 271072             | 2.00             | 262000         | 33.60              | 268784           |
-| ChainFactory       | 5.00                 | 299216             | 4.00             | 297136         | 22.80              | 271296           |
-| AsyncChain         | 28.60                | 290640             | 24.60            | 342976         | 78.20              | 285920           |
-| Named              | 2.20                 | 297008             | 0.20             | 449824         | 6.20               | 281136           |
-| Override           | 7.00                 | 297024             | 0.00             | 449824         | 30.20              | 281152           |
-
-## Maximum Load: chainCount=100, nestingDepth=100 (Mean, PeakRSS)
-
-| Scenario           | cherrypick Mean (us) | cherrypick PeakRSS | get_it Mean (us) | get_it PeakRSS | riverpod Mean (us) | riverpod PeakRSS |
-|--------------------|---------------------:|-------------------:|-----------------:|---------------:|-------------------:|-----------------:|
-| RegisterSingleton  | 4.00                 | 271072             | 1.00             | 262000         | 2.00               | 268688           |
-| ChainSingleton     | 76.60                | 303312             | 2.00             | 297136         | 221.80             | 270784           |
-| ChainFactory       | 80.00                | 293952             | 39.20            | 342720         | 195.80             | 308640           |
-| AsyncChain         | 251.40               | 297008             | 18.20            | 450640         | 748.80             | 285968           |
-| Named              | 2.20                 | 297008             | 0.00             | 449824         | 1.00               | 281136           |
-| Override           | 104.80               | 301632             | 2.20             | 477344         | 120.80             | 294752           |
-
----
-
-## Analysis
-
-- **get_it** is the absolute leader in all scenarios, especially under deep/nested chains and async.
-- **cherrypick** is highly competitive and much faster than riverpod on any complex graph.
-- **riverpod** is only suitable for small/simple DI graphs due to major slowdowns with depth, async, or override.
-
-### Recommendations
-- Use **get_it** for performance-critical and deeply nested graphs.
-- Use **cherrypick** for scalable/testable apps if a small speed loss is acceptable.
-- Use **riverpod** only if you rely on Flutter integration and your DI chains are simple.
-
----
-
-_Last updated: August 8, 2025._

benchmark_di/REPORT.ru.md

@@ -1,51 +0,0 @@
-# Сравнительный отчет DI-бенчмарка: cherrypick vs get_it vs riverpod
-
-## Описание сценариев
-
-1. **RegisterSingleton** — регистрация и получение объекта-синглтона (базовая скорость DI).
-2. **ChainSingleton** — цепочка зависимостей A → B → ... → N (singleton). Глубокий singleton-резолвинг.
-3. **ChainFactory** — все элементы цепочки — фабрики. Stateless построение графа.
-4. **AsyncChain** — асинхронная цепочка (async factory). Тестирует async/await граф.
-5. **Named** — регистрация двух биндингов с именами, разрешение по имени.
-6. **Override** — регистрация биндинга/цепочки в дочернем scope. Проверка override/scoping.
-
----
-
-## Сводная таблица: chainCount=10, nestingDepth=10 (Mean, PeakRSS)
-
-| Сценарий           | cherrypick Mean (мкс) | cherrypick PeakRSS | get_it Mean (мкс) | get_it PeakRSS | riverpod Mean (мкс) | riverpod PeakRSS |
-|--------------------|----------------------:|-------------------:|------------------:|---------------:|--------------------:|-----------------:|
-| RegisterSingleton  | 13.00                 | 273104             | 8.40              | 261872         | 9.80                | 268512           |
-| ChainSingleton     | 13.80                 | 271072             | 2.00              | 262000         | 33.60               | 268784           |
-| ChainFactory       | 5.00                  | 299216             | 4.00              | 297136         | 22.80               | 271296           |
-| AsyncChain         | 28.60                 | 290640             | 24.60             | 342976         | 78.20               | 285920           |
-| Named              | 2.20                  | 297008             | 0.20              | 449824         | 6.20                | 281136           |
-| Override           | 7.00                  | 297024             | 0.00              | 449824         | 30.20               | 281152           |
-
-## Максимальная нагрузка: chainCount=100, nestingDepth=100 (Mean, PeakRSS)
-
-| Сценарий           | cherrypick Mean (мкс) | cherrypick PeakRSS | get_it Mean (мкс) | get_it PeakRSS | riverpod Mean (мкс) | riverpod PeakRSS |
-|--------------------|----------------------:|-------------------:|------------------:|---------------:|--------------------:|-----------------:|
-| RegisterSingleton  | 4.00                  | 271072             | 1.00              | 262000         | 2.00                | 268688           |
-| ChainSingleton     | 76.60                 | 303312             | 2.00              | 297136         | 221.80              | 270784           |
-| ChainFactory       | 80.00                 | 293952             | 39.20             | 342720         | 195.80              | 308640           |
-| AsyncChain         | 251.40                | 297008             | 18.20             | 450640         | 748.80              | 285968           |
-| Named              | 2.20                  | 297008             | 0.00              | 449824         | 1.00                | 281136           |
-| Override           | 104.80                | 301632             | 2.20              | 477344         | 120.80              | 294752           |
-
----
-
-## Краткий анализ и рекомендации
-
-- **get_it** всегда лидер, особенно на глубине/асинхронных графах.
-- **cherrypick** заметно быстрее riverpod на сложных сценариях, опережая его в разы.
-- **riverpod** подходит только для простых/небольших графов — при росте глубины или async/override резко проигрывает по скорости.
-
-### Рекомендации
-- Используйте **get_it** для критичных к скорости приложений/сложных графов зависимостей.
-- Выбирайте **cherrypick** для масштабируемых, тестируемых архитектур, если микросекундная разница не критична.
-- **riverpod** уместен только для реактивного UI или простых графов DI.
-
----
-
-_Обновлено: 8 августа 2025_

benchmark_di/analysis_options.yaml

@@ -1,34 +0,0 @@
-# This file configures the static analysis results for your project (errors,
-# warnings, and lints).
-#
-# This enables the 'recommended' set of lints from `package:lints`.
-# This set helps identify many issues that may lead to problems when running
-# or consuming Dart code, and enforces writing Dart using a single, idiomatic
-# style and format.
-#
-# If you want a smaller set of lints you can change this to specify
-# 'package:lints/core.yaml'. These are just the most critical lints
-# (the recommended set includes the core lints).
-# The core lints are also what is used by pub.dev for scoring packages.
-
-include: package:lints/recommended.yaml
-analyzer:
-  errors:
-    deprecated_member_use: ignore
-    depend_on_referenced_packages: ignore
-
-# Uncomment the following section to specify additional rules.
-
-# linter:
-#   rules:
-#     - camel_case_types
-
-# analyzer:
-#   exclude:
-#     - path/to/excluded/files/**
-
-# For more information about the core and recommended set of lints, see
-# https://dart.dev/go/core-lints
-
-# For additional information about configuring this file, see
-# https://dart.dev/guides/language/analysis-options

benchmark_di/bin/main.dart

@@ -1,5 +0,0 @@
-import 'package:benchmark_di/cli/benchmark_cli.dart';
-
-Future<void> main(List<String> args) async {
-  await BenchmarkCliRunner().run(args);
-}

benchmark_di/lib/benchmarks/universal_chain_async_benchmark.dart

@@ -1,41 +0,0 @@
-import 'package:benchmark_di/scenarios/universal_binding_mode.dart';
-import 'package:benchmark_di/scenarios/universal_scenario.dart';
-import 'package:benchmark_harness/benchmark_harness.dart';
-import 'package:benchmark_di/di_adapters/di_adapter.dart';
-import 'package:benchmark_di/scenarios/universal_service.dart';
-
-class UniversalChainAsyncBenchmark<TContainer> extends AsyncBenchmarkBase {
-  final DIAdapter<TContainer> di;
-  final int chainCount;
-  final int nestingDepth;
-  final UniversalBindingMode mode;
-
-  UniversalChainAsyncBenchmark(
-    this.di, {
-    this.chainCount = 1,
-    this.nestingDepth = 3,
-    this.mode = UniversalBindingMode.asyncStrategy,
-  }) : super('UniversalAsync: asyncChain/$mode CD=$chainCount/$nestingDepth');
-
-  @override
-  Future<void> setup() async {
-    di.setupDependencies(di.universalRegistration(
-      chainCount: chainCount,
-      nestingDepth: nestingDepth,
-      bindingMode: mode,
-      scenario: UniversalScenario.asyncChain,
-    ));
-    await di.waitForAsyncReady();
-  }
-
-  @override
-  Future<void> teardown() async {
-    di.teardown();
-  }
-
-  @override
-  Future<void> run() async {
-    final serviceName = '${chainCount}_$nestingDepth';
-    await di.resolveAsync<UniversalService>(named: serviceName);
-  }
-}

benchmark_di/lib/benchmarks/universal_chain_benchmark.dart

@@ -1,79 +0,0 @@
-import 'package:benchmark_di/scenarios/universal_binding_mode.dart';
-import 'package:benchmark_di/scenarios/universal_scenario.dart';
-import 'package:benchmark_harness/benchmark_harness.dart';
-import 'package:benchmark_di/di_adapters/di_adapter.dart';
-import 'package:benchmark_di/scenarios/universal_service.dart';
-
-class UniversalChainBenchmark<TContainer> extends BenchmarkBase {
-  final DIAdapter<TContainer> _di;
-  final int chainCount;
-  final int nestingDepth;
-  final UniversalBindingMode mode;
-  final UniversalScenario scenario;
-  DIAdapter<TContainer>? _childDi;
-
-  UniversalChainBenchmark(
-    this._di, {
-    this.chainCount = 1,
-    this.nestingDepth = 3,
-    this.mode = UniversalBindingMode.singletonStrategy,
-    this.scenario = UniversalScenario.chain,
-  }) : super('Universal: $scenario/$mode CD=$chainCount/$nestingDepth');
-
-  @override
-  void setup() {
-    switch (scenario) {
-      case UniversalScenario.override:
-        _di.setupDependencies(_di.universalRegistration(
-          chainCount: chainCount,
-          nestingDepth: nestingDepth,
-          bindingMode: UniversalBindingMode.singletonStrategy,
-          scenario: UniversalScenario.chain,
-        ));
-        _childDi = _di.openSubScope('child');
-        _childDi!.setupDependencies(_childDi!.universalRegistration(
-          chainCount: chainCount,
-          nestingDepth: nestingDepth,
-          bindingMode: UniversalBindingMode.singletonStrategy,
-          scenario: UniversalScenario.chain,
-        ));
-        break;
-      default:
-        _di.setupDependencies(_di.universalRegistration(
-          chainCount: chainCount,
-          nestingDepth: nestingDepth,
-          bindingMode: mode,
-          scenario: scenario,
-        ));
-        break;
-    }
-  }
-
-  @override
-  void teardown() => _di.teardown();
-
-  @override
-  void run() {
-    switch (scenario) {
-      case UniversalScenario.register:
-        _di.resolve<UniversalService>();
-        break;
-      case UniversalScenario.named:
-        if (_di.runtimeType.toString().contains('GetItAdapter')) {
-          _di.resolve<UniversalService>(named: 'impl2');
-        } else {
-          _di.resolve<UniversalService>(named: 'impl2');
-        }
-        break;
-      case UniversalScenario.chain:
-        final serviceName = '${chainCount}_$nestingDepth';
-        _di.resolve<UniversalService>(named: serviceName);
-        break;
-      case UniversalScenario.override:
-        _childDi!.resolve<UniversalService>();
-        break;
-      case UniversalScenario.asyncChain:
-        throw UnsupportedError('asyncChain supported only in UniversalChainAsyncBenchmark');
-    }
-  }
-}

benchmark_di/lib/cli/benchmark_cli.dart

@@ -1,133 +0,0 @@
-import 'dart:math';
-
-import 'package:benchmark_di/cli/report/markdown_report.dart';
-import 'package:benchmark_di/scenarios/universal_scenario.dart';
-import 'package:cherrypick/cherrypick.dart';
-import 'package:get_it/get_it.dart';
-import 'package:riverpod/riverpod.dart' as rp;
-
-import 'report/pretty_report.dart';
-import 'report/csv_report.dart';
-import 'report/json_report.dart';
-import 'parser.dart';
-import 'runner.dart';
-import 'package:benchmark_di/benchmarks/universal_chain_benchmark.dart';
-import 'package:benchmark_di/benchmarks/universal_chain_async_benchmark.dart';
-import 'package:benchmark_di/di_adapters/cherrypick_adapter.dart';
-import 'package:benchmark_di/di_adapters/get_it_adapter.dart';
-import 'package:benchmark_di/di_adapters/riverpod_adapter.dart';
-
-/// Command-line interface (CLI) runner for benchmarks.
-///
-/// Parses CLI arguments, orchestrates benchmarks for different
-/// scenarios and configurations, collects results, and generates reports
-/// in the desired output format.
-class BenchmarkCliRunner {
-  /// Runs benchmarks based on CLI [args], configuring different test scenarios.
-  Future<void> run(List<String> args) async {
-    final config = parseBenchmarkCli(args);
-    final results = <Map<String, dynamic>>[];
-    for (final bench in config.benchesToRun) {
-      final scenario = toScenario(bench);
-      final mode = toMode(bench);
-      for (final c in config.chainCounts) {
-        for (final d in config.nestDepths) {
-          BenchmarkResult benchResult;
-          if (config.di == 'getit') {
-            final di = GetItAdapter();
-            if (scenario == UniversalScenario.asyncChain) {
-              final benchAsync = UniversalChainAsyncBenchmark<GetIt>(di,
-                chainCount: c, nestingDepth: d, mode: mode,
-              );
-              benchResult = await BenchmarkRunner.runAsync(
-                benchmark: benchAsync,
-                warmups: config.warmups,
-                repeats: config.repeats,
-              );
-            } else {
-              final benchSync = UniversalChainBenchmark<GetIt>(di,
-                chainCount: c, nestingDepth: d, mode: mode, scenario: scenario,
-              );
-              benchResult = await BenchmarkRunner.runSync(
-                benchmark: benchSync,
-                warmups: config.warmups,
-                repeats: config.repeats,
-              );
-            }
-          } else if (config.di == 'riverpod') {
-            final di = RiverpodAdapter();
-            if (scenario == UniversalScenario.asyncChain) {
-              final benchAsync = UniversalChainAsyncBenchmark<Map<String, rp.ProviderBase<Object?>>>(di,
-                chainCount: c, nestingDepth: d, mode: mode,
-              );
-              benchResult = await BenchmarkRunner.runAsync(
-                benchmark: benchAsync,
-                warmups: config.warmups,
-                repeats: config.repeats,
-              );
-            } else {
-              final benchSync = UniversalChainBenchmark<Map<String, rp.ProviderBase<Object?>>>(di,
-                chainCount: c, nestingDepth: d, mode: mode, scenario: scenario,
-              );
-              benchResult = await BenchmarkRunner.runSync(
-                benchmark: benchSync,
-                warmups: config.warmups,
-                repeats: config.repeats,
-              );
-            }
-          } else {
-            final di = CherrypickDIAdapter();
-            if (scenario == UniversalScenario.asyncChain) {
-              final benchAsync = UniversalChainAsyncBenchmark<Scope>(di,
-                chainCount: c, nestingDepth: d, mode: mode,
-              );
-              benchResult = await BenchmarkRunner.runAsync(
-                benchmark: benchAsync,
-                warmups: config.warmups,
-                repeats: config.repeats,
-              );
-            } else {
-              final benchSync = UniversalChainBenchmark<Scope>(di,
-                chainCount: c, nestingDepth: d, mode: mode, scenario: scenario,
-              );
-              benchResult = await BenchmarkRunner.runSync(
-                benchmark: benchSync,
-                warmups: config.warmups,
-                repeats: config.repeats,
-              );
-            }
-          }
-          final timings = benchResult.timings;
-          timings.sort();
-          var mean = timings.reduce((a, b) => a + b) / timings.length;
-          var median = timings[timings.length ~/ 2];
-          var minVal = timings.first;
-          var maxVal = timings.last;
-          var stddev = timings.isEmpty ? 0 : sqrt(timings.map((x) => pow(x - mean, 2)).reduce((a, b) => a + b) / timings.length);
-          results.add({
-            'benchmark': 'Universal_$bench',
-            'chainCount': c,
-            'nestingDepth': d,
-            'mean_us': mean.toStringAsFixed(2),
-            'median_us': median.toStringAsFixed(2),
-            'stddev_us': stddev.toStringAsFixed(2),
-            'min_us': minVal.toStringAsFixed(2),
-            'max_us': maxVal.toStringAsFixed(2),
-            'trials': timings.length,
-            'timings_us': timings.map((t) => t.toStringAsFixed(2)).toList(),
-            'memory_diff_kb': benchResult.memoryDiffKb,
-            'delta_peak_kb': benchResult.deltaPeakKb,
-            'peak_rss_kb': benchResult.peakRssKb,
-          });
-        }
-      }
-    }
-    final reportGenerators = {
-      'pretty': PrettyReport(),
-      'csv': CsvReport(),
-      'json': JsonReport(),
-      'markdown': MarkdownReport(),
-    };
-    print(reportGenerators[config.format]?.render(results) ?? PrettyReport().render(results));
-  }
-}

benchmark_di/lib/cli/parser.dart

@@ -1,130 +0,0 @@
-import 'dart:io';
-
-import 'package:args/args.dart';
-import 'package:benchmark_di/scenarios/universal_binding_mode.dart';
-import 'package:benchmark_di/scenarios/universal_scenario.dart';
-
-/// Enum describing all supported Universal DI benchmark types.
-enum UniversalBenchmark {
-  /// Simple singleton registration benchmark
-  registerSingleton,
-  /// Chain of singleton dependencies
-  chainSingleton,
-  /// Chain using factories
-  chainFactory,
-  /// Async chain resolution
-  chainAsync,
-  /// Named registration benchmark
-  named,
-  /// Override/child-scope benchmark
-  override,
-}
-
-/// Maps [UniversalBenchmark] to the scenario enum for DI chains.
-UniversalScenario toScenario(UniversalBenchmark b) {
-  switch (b) {
-    case UniversalBenchmark.registerSingleton:
-      return UniversalScenario.register;
-    case UniversalBenchmark.chainSingleton:
-      return UniversalScenario.chain;
-    case UniversalBenchmark.chainFactory:
-      return UniversalScenario.chain;
-    case UniversalBenchmark.chainAsync:
-      return UniversalScenario.asyncChain;
-    case UniversalBenchmark.named:
-      return UniversalScenario.named;
-    case UniversalBenchmark.override:
-      return UniversalScenario.override;
-  }
-}
-
-/// Maps benchmark to registration mode (singleton/factory/async).
-UniversalBindingMode toMode(UniversalBenchmark b) {
-  switch (b) {
-    case UniversalBenchmark.registerSingleton:
-      return UniversalBindingMode.singletonStrategy;
-    case UniversalBenchmark.chainSingleton:
-      return UniversalBindingMode.singletonStrategy;
-    case UniversalBenchmark.chainFactory:
-      return UniversalBindingMode.factoryStrategy;
-    case UniversalBenchmark.chainAsync:
-      return UniversalBindingMode.asyncStrategy;
-    case UniversalBenchmark.named:
-      return UniversalBindingMode.singletonStrategy;
-    case UniversalBenchmark.override:
-      return UniversalBindingMode.singletonStrategy;
-  }
-}
-
-/// Utility to parse a string into its corresponding enum value [T].
-T parseEnum<T>(String value, List<T> values, T defaultValue) {
-  return values.firstWhere(
-    (v) => v.toString().split('.').last.toLowerCase() == value.toLowerCase(),
-    orElse: () => defaultValue,
-  );
-}
-
-/// Parses comma-separated integer list from [s].
-List<int> parseIntList(String s) =>
-    s.split(',').map((e) => int.tryParse(e.trim()) ?? 0).where((x) => x > 0).toList();
-
-/// CLI config describing what and how to benchmark.
-class BenchmarkCliConfig {
-  /// Benchmarks enabled to run (scenarios).
-  final List<UniversalBenchmark> benchesToRun;
-  /// List of chain counts (parallel, per test).
-  final List<int> chainCounts;
-  /// List of nesting depths (max chain length, per test).
-  final List<int> nestDepths;
-  /// How many times to repeat each trial.
-  final int repeats;
-  /// How many times to warm-up before measuring.
-  final int warmups;
-  /// Output report format.
-  final String format;
-  /// Name of DI implementation ("cherrypick" or "getit")
-  final String di;
-  BenchmarkCliConfig({
-    required this.benchesToRun,
-    required this.chainCounts,
-    required this.nestDepths,
-    required this.repeats,
-    required this.warmups,
-    required this.format,
-    required this.di,
-  });
-}
-
-/// Parses CLI arguments [args] into a [BenchmarkCliConfig].
-/// Supports --benchmark, --chainCount, --nestingDepth, etc.
-BenchmarkCliConfig parseBenchmarkCli(List<String> args) {
-  final parser = ArgParser()
-    ..addOption('benchmark', abbr: 'b', defaultsTo: 'chainSingleton')
-    ..addOption('chainCount', abbr: 'c', defaultsTo: '10')
-    ..addOption('nestingDepth', abbr: 'd', defaultsTo: '5')
-    ..addOption('repeat', abbr: 'r', defaultsTo: '2')
-    ..addOption('warmup', abbr: 'w', defaultsTo: '1')
-    ..addOption('format', abbr: 'f', defaultsTo: 'pretty')
-    ..addOption('di', defaultsTo: 'cherrypick', help: 'DI implementation: cherrypick, getit or riverpod')
-    ..addFlag('help', abbr: 'h', negatable: false, help: 'Show help');
-  final result = parser.parse(args);
-  if (result['help'] == true) {
-    print(parser.usage);
-    exit(0);
-  }
-  final benchName = result['benchmark'] as String;
-  final isAll = benchName == 'all';
-  final allBenches = UniversalBenchmark.values;
-  final benchesToRun = isAll
-      ? allBenches
-      : [parseEnum(benchName, allBenches, UniversalBenchmark.chainSingleton)];
-  return BenchmarkCliConfig(
-    benchesToRun: benchesToRun,
-    chainCounts: parseIntList(result['chainCount'] as String),
-    nestDepths: parseIntList(result['nestingDepth'] as String),
-    repeats: int.tryParse(result['repeat'] as String? ?? "") ?? 2,
-    warmups: int.tryParse(result['warmup'] as String? ?? "") ?? 1,
-    format: result['format'] as String,
-    di: result['di'] as String? ?? 'cherrypick',
-  );
-}

benchmark_di/lib/cli/report/csv_report.dart

@@ -1,24 +0,0 @@
-import 'report_generator.dart';
-
-/// Generates a CSV-formatted report for benchmark results.
-class CsvReport extends ReportGenerator {
-  /// List of all keys/columns to include in the CSV output.
-  @override
-  final List<String> keys = [
-    'benchmark','chainCount','nestingDepth','mean_us','median_us','stddev_us',
-    'min_us','max_us','trials','timings_us','memory_diff_kb','delta_peak_kb','peak_rss_kb'
-  ];
-  /// Renders rows as a CSV table string.
-  @override
-  String render(List<Map<String, dynamic>> rows) {
-    final header = keys.join(',');
-    final lines = rows.map((r) =>
-      keys.map((k) {
-        final v = r[k];
-        if (v is List) return '"${v.join(';')}"';
-        return (v ?? '').toString();
-      }).join(',')
-    ).toList();
-    return ([header] + lines).join('\n');
-  }
-}

benchmark_di/lib/cli/report/json_report.dart

@@ -1,13 +0,0 @@
-import 'report_generator.dart';
-
-/// Generates a JSON-formatted report for benchmark results.
-class JsonReport extends ReportGenerator {
-  /// No specific keys; outputs all fields in raw map.
-  @override
-  List<String> get keys => [];
-  /// Renders all result rows as a pretty-printed JSON array.
-  @override
-  String render(List<Map<String, dynamic>> rows) {
-    return '[\n${rows.map((r) => '  $r').join(',\n')}\n]';
-  }
-}

benchmark_di/lib/cli/report/markdown_report.dart

@@ -1,78 +0,0 @@
-import 'report_generator.dart';
-
-/// Generates a Markdown-formatted report for benchmark results.
-///
-/// Displays result rows as a visually clear Markdown table including a legend for all metrics.
-class MarkdownReport extends ReportGenerator {
-  /// List of columns (keys) to show in the Markdown table.
-  @override
-  final List<String> keys = [
-    'benchmark','chainCount','nestingDepth','mean_us','median_us','stddev_us',
-    'min_us','max_us','trials','memory_diff_kb','delta_peak_kb','peak_rss_kb'
-  ];
-
-  /// Friendly display names for each benchmark type.
-  static const nameMap = {
-    'Universal_UniversalBenchmark.registerSingleton':'RegisterSingleton',
-    'Universal_UniversalBenchmark.chainSingleton':'ChainSingleton',
-    'Universal_UniversalBenchmark.chainFactory':'ChainFactory',
-    'Universal_UniversalBenchmark.chainAsync':'AsyncChain',
-    'Universal_UniversalBenchmark.named':'Named',
-    'Universal_UniversalBenchmark.override':'Override',
-  };
-
-  /// Renders all results as a formatted Markdown table with aligned columns and a legend.
-  @override
-  String render(List<Map<String, dynamic>> rows) {
-    final headers = [
-      'Benchmark', 'Chain Count', 'Depth', 'Mean (us)', 'Median', 'Stddev', 'Min', 'Max', 'N', 'ΔRSS(KB)', 'ΔPeak(KB)', 'PeakRSS(KB)'
-    ];
-    final dataRows = rows.map((r) {
-      final readableName = nameMap[r['benchmark']] ?? r['benchmark'];
-      return [
-        readableName,
-        r['chainCount'],
-        r['nestingDepth'],
-        r['mean_us'],
-        r['median_us'],
-        r['stddev_us'],
-        r['min_us'],
-        r['max_us'],
-        r['trials'],
-        r['memory_diff_kb'],
-        r['delta_peak_kb'],
-        r['peak_rss_kb'],
-      ].map((cell) => cell.toString()).toList();
-    }).toList();
-
-    // Calculate column width for pretty alignment
-    final all = [headers] + dataRows;
-    final widths = List.generate(headers.length, (i) {
-      return all.map((row) => row[i].length).reduce((a, b) => a > b ? a : b);
-    });
-
-    String rowToLine(List<String> row, {String sep = ' | '}) =>
-        '| ${List.generate(row.length, (i) => row[i].padRight(widths[i])).join(sep)} |';
-
-    final headerLine = rowToLine(headers);
-    final divider = '| ${widths.map((w) => '-' * w).join(' | ')} |';
-    final lines = dataRows.map(rowToLine).toList();
-
-    final legend = '''
-      > **Legend:**  
-      > `Benchmark` – Test name  
-      > `Chain Count` – Number of independent chains  
-      > `Depth` – Depth of each chain  
-      > `Mean (us)` – Average time per run (microseconds)  
-      > `Median` – Median time per run  
-      > `Stddev` – Standard deviation  
-      > `Min`, `Max` – Min/max run time  
-      > `N` – Number of measurements  
-      > `ΔRSS(KB)` – Change in process memory (KB)  
-      > `ΔPeak(KB)` – Change in peak RSS (KB)  
-      > `PeakRSS(KB)` – Max observed RSS memory (KB)  
-      ''';
-
-    return '$legend\n\n${([headerLine, divider] + lines).join('\n')}' ;
-  }
-}

benchmark_di/lib/cli/report/pretty_report.dart

@@ -1,50 +0,0 @@
-import 'report_generator.dart';
-
-/// Generates a human-readable, tab-delimited report for benchmark results.
-///
-/// Used for terminal and log output; shows each result as a single line with labeled headers.
-class PrettyReport extends ReportGenerator {
-  /// List of columns to output in the pretty report.
-  @override
-  final List<String> keys = [
-    'benchmark','chainCount','nestingDepth','mean_us','median_us','stddev_us',
-    'min_us','max_us','trials','memory_diff_kb','delta_peak_kb','peak_rss_kb'
-  ];
-
-  /// Mappings from internal benchmark IDs to display names.
-  static const nameMap = {
-    'Universal_UniversalBenchmark.registerSingleton':    'RegisterSingleton',
-    'Universal_UniversalBenchmark.chainSingleton':       'ChainSingleton',
-    'Universal_UniversalBenchmark.chainFactory':         'ChainFactory',
-    'Universal_UniversalBenchmark.chainAsync':           'AsyncChain',
-    'Universal_UniversalBenchmark.named':                'Named',
-    'Universal_UniversalBenchmark.override':             'Override',
-  };
-
-  /// Renders the results as a header + tab-separated value table.
-  @override
-  String render(List<Map<String, dynamic>> rows) {
-    final headers = [
-      'Benchmark', 'Chain Count', 'Depth', 'Mean (us)', 'Median', 'Stddev', 'Min', 'Max', 'N', 'ΔRSS(KB)', 'ΔPeak(KB)', 'PeakRSS(KB)'
-    ];
-    final header = headers.join('\t');
-    final lines = rows.map((r) {
-      final readableName = nameMap[r['benchmark']] ?? r['benchmark'];
-      return [
-        readableName,
-        r['chainCount'],
-        r['nestingDepth'],
-        r['mean_us'],
-        r['median_us'],
-        r['stddev_us'],
-        r['min_us'],
-        r['max_us'],
-        r['trials'],
-        r['memory_diff_kb'],
-        r['delta_peak_kb'],
-        r['peak_rss_kb'],
-      ].join('\t');
-    }).toList();
-    return ([header] + lines).join('\n');
-  }
-}

benchmark_di/lib/cli/report/report_generator.dart

@@ -1,9 +0,0 @@
-/// Abstract base for generating benchmark result reports in different formats.
-///
-/// Subclasses implement [render] to output results, and [keys] to define columns (if any).
-abstract class ReportGenerator {
-  /// Renders the given [results] as a formatted string (table, markdown, csv, etc).
-  String render(List<Map<String, dynamic>> results);
-  /// List of output columns/keys included in the export (or [] for auto/all).
-  List<String> get keys;
-}

benchmark_di/lib/cli/runner.dart

@@ -1,96 +0,0 @@
-import 'dart:io';
-import 'dart:math';
-import 'package:benchmark_di/benchmarks/universal_chain_benchmark.dart';
-import 'package:benchmark_di/benchmarks/universal_chain_async_benchmark.dart';
-
-/// Holds the results for a single benchmark execution.
-class BenchmarkResult {
-  /// List of timings for each run (in microseconds).
-  final List<num> timings;
-  /// Difference in memory (RSS, in KB) after running.
-  final int memoryDiffKb;
-  /// Difference between peak RSS and initial RSS (in KB).
-  final int deltaPeakKb;
-  /// Peak RSS memory observed (in KB).
-  final int peakRssKb;
-  BenchmarkResult({
-    required this.timings,
-    required this.memoryDiffKb,
-    required this.deltaPeakKb,
-    required this.peakRssKb,
-  });
-  /// Computes a BenchmarkResult instance from run timings and memory data.
-  factory BenchmarkResult.collect({
-    required List<num> timings,
-    required List<int> rssValues,
-    required int memBefore,
-  }) {
-    final memAfter = ProcessInfo.currentRss;
-    final memDiffKB = ((memAfter - memBefore) / 1024).round();
-    final peakRss = [...rssValues, memBefore].reduce(max);
-    final deltaPeakKb = ((peakRss - memBefore) / 1024).round();
-    return BenchmarkResult(
-      timings: timings,
-      memoryDiffKb: memDiffKB,
-      deltaPeakKb: deltaPeakKb,
-      peakRssKb: (peakRss / 1024).round(),
-    );
-  }
-}
-
-/// Static methods to execute and time benchmarks for DI containers.
-class BenchmarkRunner {
-  /// Runs a synchronous benchmark ([UniversalChainBenchmark]) for a given number of [warmups] and [repeats].
-  /// Collects execution time and observed memory.
-  static Future<BenchmarkResult> runSync({
-    required UniversalChainBenchmark benchmark,
-    required int warmups,
-    required int repeats,
-  }) async {
-    final timings = <num>[];
-    final rssValues = <int>[];
-    for (int i = 0; i < warmups; i++) {
-      benchmark.setup();
-      benchmark.run();
-      benchmark.teardown();
-    }
-    final memBefore = ProcessInfo.currentRss;
-    for (int i = 0; i < repeats; i++) {
-      benchmark.setup();
-      final sw = Stopwatch()..start();
-      benchmark.run();
-      sw.stop();
-      timings.add(sw.elapsedMicroseconds);
-      rssValues.add(ProcessInfo.currentRss);
-      benchmark.teardown();
-    }
-    return BenchmarkResult.collect(timings: timings, rssValues: rssValues, memBefore: memBefore);
-  }
-
-  /// Runs an asynchronous benchmark ([UniversalChainAsyncBenchmark]) for a given number of [warmups] and [repeats].
-  /// Collects execution time and observed memory.
-  static Future<BenchmarkResult> runAsync({
-    required UniversalChainAsyncBenchmark benchmark,
-    required int warmups,
-    required int repeats,
-  }) async {
-    final timings = <num>[];
-    final rssValues = <int>[];
-    for (int i = 0; i < warmups; i++) {
-      await benchmark.setup();
-      await benchmark.run();
-      await benchmark.teardown();
-    }
-    final memBefore = ProcessInfo.currentRss;
-    for (int i = 0; i < repeats; i++) {
-      await benchmark.setup();
-      final sw = Stopwatch()..start();
-      await benchmark.run();
-      sw.stop();
-      timings.add(sw.elapsedMicroseconds);
-      rssValues.add(ProcessInfo.currentRss);
-      await benchmark.teardown();
-    }
-    return BenchmarkResult.collect(timings: timings, rssValues: rssValues, memBefore: memBefore);
-  }
-}

benchmark_di/lib/di_adapters/cherrypick_adapter.dart

@@ -1,188 +0,0 @@
-import 'package:benchmark_di/scenarios/universal_binding_mode.dart';
-import 'package:benchmark_di/scenarios/universal_scenario.dart';
-import 'package:benchmark_di/scenarios/universal_service.dart';
-import 'package:cherrypick/cherrypick.dart';
-import 'di_adapter.dart';
-
-
-/// Test module that generates a chain of service bindings for benchmarking.
-///
-/// Configurable by chain count, nesting depth, binding mode, and scenario
-/// to support various DI performance tests (singleton, factory, async, etc).
-class UniversalChainModule extends Module {
-  /// Number of chains to create.
-  final int chainCount;
-  /// Depth of each chain.
-  final int nestingDepth;
-  /// How modules are registered (factory/singleton/async).
-  final UniversalBindingMode bindingMode;
-  /// Which di scenario to generate (chained, named, etc).
-  final UniversalScenario scenario;
-
-  /// Constructs a configured test DI module for the benchmarks.
-  UniversalChainModule({
-    required this.chainCount,
-    required this.nestingDepth,
-    this.bindingMode = UniversalBindingMode.singletonStrategy,
-    this.scenario = UniversalScenario.chain,
-  });
-
-  @override
-  void builder(Scope currentScope) {
-    if (scenario == UniversalScenario.asyncChain) {
-      // Generate async chain with singleton async bindings.
-      for (var chainIndex = 0; chainIndex < chainCount; chainIndex++) {
-        for (var levelIndex = 0; levelIndex < nestingDepth; levelIndex++) {
-          final chain = chainIndex + 1;
-          final level = levelIndex + 1;
-          final prevDepName = '${chain}_${level - 1}';
-          final depName = '${chain}_$level';
-          bind<UniversalService>()
-            .toProvideAsync(() async {
-              final prev = level > 1
-                  ? await currentScope.resolveAsync<UniversalService>(named: prevDepName)
-                  : null;
-              return UniversalServiceImpl(
-                value: depName,
-                dependency: prev,
-              );
-            })
-            .withName(depName)
-            .singleton();
-        }
-      }
-      return;
-    }
-
-    switch (scenario) {
-      case UniversalScenario.register:
-        // Simple singleton registration.
-        bind<UniversalService>()
-            .toProvide(() => UniversalServiceImpl(value: 'reg', dependency: null))
-            .singleton();
-        break;
-      case UniversalScenario.named:
-        // Named factory registration for two distinct objects.
-        bind<UniversalService>().toProvide(() => UniversalServiceImpl(value: 'impl1')).withName('impl1');
-        bind<UniversalService>().toProvide(() => UniversalServiceImpl(value: 'impl2')).withName('impl2');
-        break;
-      case UniversalScenario.chain:
-        // Chain of nested services, with dependency on previous level by name.
-        for (var chainIndex = 0; chainIndex < chainCount; chainIndex++) {
-          for (var levelIndex = 0; levelIndex < nestingDepth; levelIndex++) {
-            final chain = chainIndex + 1;
-            final level = levelIndex + 1;
-            final prevDepName = '${chain}_${level - 1}';
-            final depName = '${chain}_$level';
-            switch (bindingMode) {
-              case UniversalBindingMode.singletonStrategy:
-                bind<UniversalService>()
-                    .toProvide(() => UniversalServiceImpl(
-                          value: depName,
-                          dependency: currentScope.tryResolve<UniversalService>(named: prevDepName),
-                        ))
-                    .withName(depName)
-                    .singleton();
-                break;
-              case UniversalBindingMode.factoryStrategy:
-                bind<UniversalService>()
-                    .toProvide(() => UniversalServiceImpl(
-                          value: depName,
-                          dependency: currentScope.tryResolve<UniversalService>(named: prevDepName),
-                        ))
-                    .withName(depName);
-                break;
-              case UniversalBindingMode.asyncStrategy:
-                bind<UniversalService>()
-                    .toProvideAsync(() async => UniversalServiceImpl(
-                          value: depName,
-                          dependency: await currentScope.resolveAsync<UniversalService>(named: prevDepName),
-                        ))
-                    .withName(depName)
-                    .singleton();
-                break;
-            }
-          }
-        }
-        // Регистрация алиаса без имени (на последний элемент цепочки)
-        final depName = '${chainCount}_$nestingDepth';
-        bind<UniversalService>()
-            .toProvide(() => currentScope.resolve<UniversalService>(named: depName))
-            .singleton();
-        break;
-      case UniversalScenario.override:
-        // handled at benchmark level, но алиас нужен прямо в этом scope!
-        final depName = '${chainCount}_$nestingDepth';
-        bind<UniversalService>()
-            .toProvide(() => currentScope.resolve<UniversalService>(named: depName))
-            .singleton();
-        break;
-      case UniversalScenario.asyncChain:
-        // already handled above
-        break;
-    }
-  }
-}
-
-
-class CherrypickDIAdapter extends DIAdapter<Scope> {
-  Scope? _scope;
-  final bool _isSubScope;
-
-  CherrypickDIAdapter([Scope? scope, this._isSubScope = false]) {
-    _scope = scope;
-  }
-
-  @override
-  void setupDependencies(void Function(Scope container) registration) {
-    _scope ??= CherryPick.openRootScope();
-    registration(_scope!);
-  }
-
-  @override
-  Registration<Scope> universalRegistration<S extends Enum>({
-    required S scenario,
-    required int chainCount,
-    required int nestingDepth,
-    required UniversalBindingMode bindingMode,
-  }) {
-    if (scenario is UniversalScenario) {
-      return (scope) {
-        scope.installModules([
-          UniversalChainModule(
-            chainCount: chainCount,
-            nestingDepth: nestingDepth,
-            bindingMode: bindingMode,
-            scenario: scenario,
-          ),
-        ]);
-      };
-    }
-    throw UnsupportedError('Scenario $scenario not supported by CherrypickDIAdapter');
-  }
-
-  @override
-  T resolve<T extends Object>({String? named}) =>
-      _scope!.resolve<T>(named: named);
-
-  @override
-  Future<T> resolveAsync<T extends Object>({String? named}) async =>
-      _scope!.resolveAsync<T>(named: named);
-
-  @override
-  void teardown() {
-    if (!_isSubScope) {
-      CherryPick.closeRootScope();
-      _scope = null;
-    }
-    // SubScope teardown не требуется
-  }
-
-  @override
-  CherrypickDIAdapter openSubScope(String name) {
-    return CherrypickDIAdapter(_scope!.openSubScope(name), true);
-  }
-
-  @override
-  Future<void> waitForAsyncReady() async {}
-}

benchmark_di/lib/di_adapters/di_adapter.dart

@@ -1,32 +0,0 @@
-import 'package:benchmark_di/scenarios/universal_binding_mode.dart';
-/// Универсальная абстракция для DI-адаптера с унифицированной функцией регистрации.
-/// Теперь для каждого адаптера задаём строгий generic тип контейнера.
-typedef Registration<TContainer> = void Function(TContainer);
-
-abstract class DIAdapter<TContainer> {
-  /// Устанавливает зависимости с помощью строго типизированного контейнера.
-  void setupDependencies(void Function(TContainer container) registration);
-
-  /// Возвращает типобезопасную функцию регистрации зависимостей под конкретный сценарий.
-  Registration<TContainer> universalRegistration<S extends Enum>({
-    required S scenario,
-    required int chainCount,
-    required int nestingDepth,
-    required UniversalBindingMode bindingMode,
-  });
-
-  /// Резолвит (возвращает) экземпляр типа [T] (по имени, если требуется).
-  T resolve<T extends Object>({String? named});
-
-  /// Асинхронно резолвит экземпляр типа [T] (если нужно).
-  Future<T> resolveAsync<T extends Object>({String? named});
-
-  /// Уничтожает/отчищает DI-контейнер.
-  void teardown();
-
-  /// Открывает дочерний scope и возвращает новый адаптер (если поддерживается).
-  DIAdapter<TContainer> openSubScope(String name);
-
-  /// Ожидание готовности DI контейнера (если нужно для async DI).
-  Future<void> waitForAsyncReady() async {}
-}

benchmark_di/lib/di_adapters/get_it_adapter.dart

@@ -1,156 +0,0 @@
-import 'package:benchmark_di/scenarios/universal_binding_mode.dart';
-import 'package:benchmark_di/scenarios/universal_scenario.dart';
-import 'package:benchmark_di/scenarios/universal_service.dart';
-import 'package:get_it/get_it.dart';
-import 'di_adapter.dart';
-
-/// Универсальный DIAdapter для GetIt c поддержкой scopes и строгой типизацией.
-class GetItAdapter extends DIAdapter<GetIt> {
-  late GetIt _getIt;
-  final String? _scopeName;
-  final bool _isSubScope;
-  bool _scopePushed = false;
-
-  /// Основной (root) и subScope-конструкторы.
-  GetItAdapter({GetIt? instance, String? scopeName, bool isSubScope = false})
-      : _scopeName = scopeName,
-        _isSubScope = isSubScope {
-    if (instance != null) {
-      _getIt = instance;
-    }
-  }
-
-  @override
-  void setupDependencies(void Function(GetIt container) registration) {
-    if (_isSubScope) {
-      // Создаём scope через pushNewScope с init
-      _getIt.pushNewScope(
-        scopeName: _scopeName,
-        init: (getIt) => registration(getIt),
-      );
-      _scopePushed = true;
-    } else {
-      _getIt = GetIt.asNewInstance();
-      registration(_getIt);
-    }
-  }
-
-  @override
-  T resolve<T extends Object>({String? named}) =>
-      _getIt<T>(instanceName: named);
-
-  @override
-  Future<T> resolveAsync<T extends Object>({String? named}) async =>
-      _getIt<T>(instanceName: named);
-
-  @override
-  void teardown() {
-    if (_isSubScope && _scopePushed) {
-      _getIt.popScope();
-      _scopePushed = false;
-    } else {
-      _getIt.reset();
-    }
-  }
-
-  @override
-  GetItAdapter openSubScope(String name) =>
-      GetItAdapter(instance: _getIt, scopeName: name, isSubScope: true);
-
-  @override
-  Future<void> waitForAsyncReady() async {
-    await _getIt.allReady();
-  }
-
-  @override
-  Registration<GetIt> universalRegistration<S extends Enum>({
-    required S scenario,
-    required int chainCount,
-    required int nestingDepth,
-    required UniversalBindingMode bindingMode,
-  }) {
-    if (scenario is UniversalScenario) {
-      return (getIt) {
-        switch (scenario) {
-          case UniversalScenario.asyncChain:
-            for (int chain = 1; chain <= chainCount; chain++) {
-              for (int level = 1; level <= nestingDepth; level++) {
-                final prevDepName = '${chain}_${level - 1}';
-                final depName = '${chain}_$level';
-                getIt.registerSingletonAsync<UniversalService>(
-                  () async {
-                    final prev = level > 1
-                        ? await getIt.getAsync<UniversalService>(instanceName: prevDepName)
-                        : null;
-                    return UniversalServiceImpl(value: depName, dependency: prev);
-                  },
-                  instanceName: depName,
-                );
-              }
-            }
-            break;
-          case UniversalScenario.register:
-            getIt.registerSingleton<UniversalService>(UniversalServiceImpl(value: 'reg', dependency: null));
-            break;
-          case UniversalScenario.named:
-            getIt.registerFactory<UniversalService>(() => UniversalServiceImpl(value: 'impl1'), instanceName: 'impl1');
-            getIt.registerFactory<UniversalService>(() => UniversalServiceImpl(value: 'impl2'), instanceName: 'impl2');
-            break;
-          case UniversalScenario.chain:
-            for (int chain = 1; chain <= chainCount; chain++) {
-              for (int level = 1; level <= nestingDepth; level++) {
-                final prevDepName = '${chain}_${level - 1}';
-                final depName = '${chain}_$level';
-                switch (bindingMode) {
-                  case UniversalBindingMode.singletonStrategy:
-                    getIt.registerSingleton<UniversalService>(
-                      UniversalServiceImpl(
-                        value: depName,
-                        dependency: level > 1
-                          ? getIt<UniversalService>(instanceName: prevDepName)
-                          : null,
-                      ),
-                      instanceName: depName,
-                    );
-                    break;
-                  case UniversalBindingMode.factoryStrategy:
-                    getIt.registerFactory<UniversalService>(
-                      () => UniversalServiceImpl(
-                        value: depName,
-                        dependency: level > 1
-                            ? getIt<UniversalService>(instanceName: prevDepName)
-                            : null,
-                      ),
-                      instanceName: depName,
-                    );
-                    break;
-                  case UniversalBindingMode.asyncStrategy:
-                    getIt.registerSingletonAsync<UniversalService>(
-                      () async => UniversalServiceImpl(
-                        value: depName,
-                        dependency: level > 1
-                          ? await getIt.getAsync<UniversalService>(instanceName: prevDepName)
-                          : null,
-                      ),
-                      instanceName: depName,
-                    );
-                    break;
-                }
-              }
-            }
-            break;
-          case UniversalScenario.override:
-            // handled at benchmark level
-            break;
-        }
-        if (scenario == UniversalScenario.chain || scenario == UniversalScenario.override) {
-          final depName = '${chainCount}_$nestingDepth';
-          getIt.registerSingleton<UniversalService>(
-            getIt<UniversalService>(instanceName: depName),
-          );
-        }
-      };
-    }
-    throw UnsupportedError('Scenario $scenario not supported by GetItAdapter');
-  }
-}

benchmark_di/lib/di_adapters/riverpod_adapter.dart

@@ -1,137 +0,0 @@
-import 'package:benchmark_di/scenarios/universal_binding_mode.dart';
-import 'package:benchmark_di/scenarios/universal_scenario.dart';
-import 'package:benchmark_di/scenarios/universal_service.dart';
-import 'package:riverpod/riverpod.dart' as rp;
-import 'di_adapter.dart';
-
-/// Унифицированный DIAdapter для Riverpod с поддержкой scopes и строгой типизацией.
-class RiverpodAdapter extends DIAdapter<Map<String, rp.ProviderBase<Object?>>> {
-  rp.ProviderContainer? _container;
-  final Map<String, rp.ProviderBase<Object?>> _namedProviders;
-  final rp.ProviderContainer? _parent;
-
-  RiverpodAdapter({
-    rp.ProviderContainer? container,
-    Map<String, rp.ProviderBase<Object?>>? providers,
-    rp.ProviderContainer? parent,
-    bool isSubScope = false,
-  })  : _container = container,
-        _namedProviders = providers ?? <String, rp.ProviderBase<Object?>>{},
-        _parent = parent;
-
-  @override
-  void setupDependencies(void Function(Map<String, rp.ProviderBase<Object?>> container) registration) {
-    _container ??= _parent == null
-        ? rp.ProviderContainer()
-        : rp.ProviderContainer(parent: _parent);
-    registration(_namedProviders);
-  }
-
-  @override
-  T resolve<T extends Object>({String? named}) {
-    final key = named ?? T.toString();
-    final provider = _namedProviders[key];
-    if (provider == null) {
-      throw Exception('Provider not found for $key');
-    }
-    return _container!.read(provider) as T;
-  }
-
-  @override
-  Future<T> resolveAsync<T extends Object>({String? named}) async {
-    final key = named ?? T.toString();
-    final provider = _namedProviders[key];
-    if (provider == null) {
-      throw Exception('Provider not found for $key');
-    }
-    // Если это FutureProvider — используем .future
-    if (provider.runtimeType.toString().contains('FutureProvider')) {
-      return await _container!.read((provider as dynamic).future) as T;
-    }
-    return resolve<T>(named: named);
-  }
-
-  @override
-  void teardown() {
-    _container?.dispose();
-    _container = null;
-    _namedProviders.clear();
-  }
-
-  @override
-  RiverpodAdapter openSubScope(String name) {
-    final newContainer = rp.ProviderContainer(parent: _container);
-    return RiverpodAdapter(
-      container: newContainer,
-      providers: Map.of(_namedProviders),
-      parent: _container,
-      isSubScope: true,
-    );
-  }
-
-  @override
-  Future<void> waitForAsyncReady() async {
-    // Riverpod синхронный по умолчанию.
-    return;
-  }
-
-  @override
-  Registration<Map<String, rp.ProviderBase<Object?>>> universalRegistration<S extends Enum>({
-    required S scenario,
-    required int chainCount,
-    required int nestingDepth,
-    required UniversalBindingMode bindingMode,
-  }) {
-    if (scenario is UniversalScenario) {
-      return (providers) {
-        switch (scenario) {
-          case UniversalScenario.register:
-            providers['UniversalService'] = rp.Provider<UniversalService>((ref) => UniversalServiceImpl(value: 'reg', dependency: null));
-            break;
-          case UniversalScenario.named:
-            providers['impl1'] = rp.Provider<UniversalService>((ref) => UniversalServiceImpl(value: 'impl1'));
-            providers['impl2'] = rp.Provider<UniversalService>((ref) => UniversalServiceImpl(value: 'impl2'));
-            break;
-          case UniversalScenario.chain:
-            for (int chain = 1; chain <= chainCount; chain++) {
-              for (int level = 1; level <= nestingDepth; level++) {
-                final prevDepName = '${chain}_${level - 1}';
-                final depName = '${chain}_$level';
-                providers[depName] = rp.Provider<UniversalService>((ref) => UniversalServiceImpl(
-                  value: depName,
-                  dependency: level > 1 ? ref.watch(providers[prevDepName] as rp.ProviderBase<UniversalService>) : null,
-                ));
-              }
-            }
-            final depName = '${chainCount}_$nestingDepth';
-            providers['UniversalService'] = rp.Provider<UniversalService>((ref) => ref.watch(providers[depName] as rp.ProviderBase<UniversalService>));
-            break;
-          case UniversalScenario.override:
-            // handled at benchmark level
-            break;
-          case UniversalScenario.asyncChain:
-            for (int chain = 1; chain <= chainCount; chain++) {
-              for (int level = 1; level <= nestingDepth; level++) {
-                final prevDepName = '${chain}_${level - 1}';
-                final depName = '${chain}_$level';
-                providers[depName] = rp.FutureProvider<UniversalService>((ref) async {
-                  return UniversalServiceImpl(
-                    value: depName,
-                    dependency: level > 1
-                        ? await ref.watch((providers[prevDepName] as rp.FutureProvider<UniversalService>).future) as UniversalService?
-                        : null,
-                  );
-                });
-              }
-            }
-            final depName = '${chainCount}_$nestingDepth';
-            providers['UniversalService'] = rp.FutureProvider<UniversalService>((ref) async {
-              return await ref.watch((providers[depName] as rp.FutureProvider<UniversalService>).future);
-            });
-            break;
-        }
-      };
-    }
-    throw UnsupportedError('Scenario $scenario not supported by RiverpodAdapter');
-  }
-}

benchmark_di/lib/scenarios/universal_binding_mode.dart

@@ -1,11 +0,0 @@
-/// Enum to represent the DI registration/binding mode.
-enum UniversalBindingMode {
-  /// Singleton/provider binding.
-  singletonStrategy,
-
-  /// Factory-based binding.
-  factoryStrategy,
-
-  /// Async-based binding.
-  asyncStrategy,
-}

benchmark_di/lib/scenarios/universal_scenario.dart

@@ -1,13 +0,0 @@
-/// Enum to represent which scenario is constructed for the benchmark.
-enum UniversalScenario {
-  /// Single registration.
-  register,
-  /// Chain of dependencies.
-  chain,
-  /// Named registrations.
-  named,
-  /// Child-scope override scenario.
-  override,
-  /// Asynchronous chain scenario.
-  asyncChain,
-}

benchmark_di/lib/scenarios/universal_service.dart

@@ -1,17 +0,0 @@
-
-/// Base interface for any universal service in the benchmarks.
-///
-/// Represents an object in the dependency chain with an identifiable value
-/// and (optionally) a dependency on a previous service in the chain.
-abstract class UniversalService {
-  /// String ID for this service instance (e.g. chain/level info).
-  final String value;
-  /// Optional reference to dependency service in the chain.
-  final UniversalService? dependency;
-  UniversalService({required this.value, this.dependency});
-}
-
-/// Default implementation for [UniversalService] used in service chains.
-class UniversalServiceImpl extends UniversalService {
-  UniversalServiceImpl({required super.value, super.dependency});
-}

benchmark_di/melos_benchmark_cherrypick.iml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/.dart_tool" />
-      <excludeFolder url="file://$MODULE_DIR$/.pub" />
-      <excludeFolder url="file://$MODULE_DIR$/build" />
-    </content>
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Dart SDK" level="project" />
-    <orderEntry type="library" name="Dart Packages" level="project" />
-  </component>
-</module>

benchmark_di/pubspec.lock

@@ -1,132 +0,0 @@
-# Generated by pub
-# See https://dart.dev/tools/pub/glossary#lockfile
-packages:
-  ansi_modifier:
-    dependency: transitive
-    description:
-      name: ansi_modifier
-      sha256: "4b97c241f345e49c929bd56d0198b567b7dfcca7ec8d4f798745c9ced998684c"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.1.4"
-  args:
-    dependency: "direct main"
-    description:
-      name: args
-      sha256: d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.7.0"
-  async:
-    dependency: transitive
-    description:
-      name: async
-      sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.13.0"
-  benchmark_harness:
-    dependency: "direct dev"
-    description:
-      name: benchmark_harness
-      sha256: "83f65107165883ba8623eb822daacb23dcf9f795c66841de758c9dd7c5a0cf28"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.3.1"
-  benchmark_runner:
-    dependency: "direct dev"
-    description:
-      name: benchmark_runner
-      sha256: "7de181228eb74cb34507ded2260fe88b3b71e0aacfe0dfa794df49edaf041ca3"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.0.4"
-  cherrypick:
-    dependency: "direct main"
-    description:
-      path: "../cherrypick"
-      relative: true
-    source: path
-    version: "3.0.0-dev.3"
-  collection:
-    dependency: transitive
-    description:
-      name: collection
-      sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.19.1"
-  exception_templates:
-    dependency: transitive
-    description:
-      name: exception_templates
-      sha256: "517f7c770da690073663f867ee2057ae2f4ffb28edae9da9faa624aa29ac76eb"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.3.1"
-  get_it:
-    dependency: "direct main"
-    description:
-      name: get_it
-      sha256: a4292e7cf67193f8e7c1258203104eb2a51ec8b3a04baa14695f4064c144297b
-      url: "https://pub.dev"
-    source: hosted
-    version: "8.2.0"
-  lazy_memo:
-    dependency: transitive
-    description:
-      name: lazy_memo
-      sha256: dcb30b4184a6d767e1d779d74ce784d752d38313b8fb4bad6b659ae7af4bb34d
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.2.3"
-  lints:
-    dependency: "direct dev"
-    description:
-      name: lints
-      sha256: c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.1.1"
-  meta:
-    dependency: transitive
-    description:
-      name: meta
-      sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.17.0"
-  path:
-    dependency: transitive
-    description:
-      name: path
-      sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.9.1"
-  riverpod:
-    dependency: "direct main"
-    description:
-      name: riverpod
-      sha256: "59062512288d3056b2321804332a13ffdd1bf16df70dcc8e506e411280a72959"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.6.1"
-  stack_trace:
-    dependency: transitive
-    description:
-      name: stack_trace
-      sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.12.1"
-  state_notifier:
-    dependency: transitive
-    description:
-      name: state_notifier
-      sha256: b8677376aa54f2d7c58280d5a007f9e8774f1968d1fb1c096adcb4792fba29bb
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.0"
-sdks:
-  dart: ">=3.6.0 <4.0.0"

benchmark_di/pubspec.yaml

@@ -1,19 +0,0 @@
-name: benchmark_di
-version: 0.1.0
-publish_to: none
-description: Universal benchmark for any DI library (cherrypick, get_it, and others)
-
-environment:
-  sdk: '>=3.0.0 <4.0.0'
-
-dependencies:
-  cherrypick:
-    path: ../cherrypick
-  args: ^2.7.0
-  get_it: ^8.2.0
-  riverpod: ^2.6.1
-
-dev_dependencies:
-  lints: ^5.0.0
-  benchmark_harness: ^2.2.2
-  benchmark_runner: ^0.0.2

cherrypick/.gitignore

@@ -21,6 +21,4 @@ doc/api/
 *.js.map
 
 # FVM Version Cache
-.fvm/
-
-pubspec_overrides.yaml
+.fvm/

cherrypick/CHANGELOG.md

@@ -1,58 +1,6 @@
-## 3.0.0-dev.6
+## 2.2.0-dev.2
 
-> Note: This release has breaking changes.
-
- - **FIX**: improve global cycle detector logic.
- - **DOCS**(readme): add comprehensive DI state and action logging to features.
- - **DOCS**(helper): add complete DartDoc with real usage examples for CherryPick class.
- - **DOCS**(log_format): add detailed English documentation for formatLogMessage function.
- - **BREAKING** **FEAT**(core): refactor root scope API, improve logger injection, helpers, and tests.
- - **BREAKING** **FEAT**(logger): add extensible logging API, usage examples, and bilingual documentation.
-
-## 3.0.0-dev.5
-
- - **REFACTOR**(scope): simplify _findBindingResolver<T> with one-liner and optional chaining.
- - **PERF**(scope): speed up dependency lookup with Map-based binding resolver index.
- - **DOCS**(perf): clarify Map-based resolver optimization applies since v3.0.0 in all docs.
- - **DOCS**: update EN/RU quick start and tutorial with Fast Map-based lookup section; clarify performance benefit in README.
-
-## 3.0.0-dev.4
-
- - **REFACTOR**(scope): simplify _findBindingResolver<T> with one-liner and optional chaining.
- - **PERF**(scope): speed up dependency lookup with Map-based binding resolver index.
- - **DOCS**(perf): clarify Map-based resolver optimization applies since v3.0.0 in all docs.
- - **DOCS**: update EN/RU quick start and tutorial with Fast Map-based lookup section; clarify performance benefit in README.
-
-## 3.0.0-dev.3
-
- - **REFACTOR**(scope): simplify _findBindingResolver<T> with one-liner and optional chaining.
- - **PERF**(scope): speed up dependency lookup with Map-based binding resolver index.
- - **DOCS**(perf): clarify Map-based resolver optimization applies since v3.0.0 in all docs.
- - **DOCS**: update EN/RU quick start and tutorial with Fast Map-based lookup section; clarify performance benefit in README.
-
-## 3.0.0-dev.2
-
-> Note: This release has breaking changes.
-
- - **FEAT**(binding): add deprecated proxy async methods for backward compatibility and highlight transition to modern API.
- - **DOCS**: add quick guide for circular dependency detection to README.
- - **DOCS**: add quick guide for circular dependency detection to README.
- - **BREAKING** **FEAT**: implement comprehensive circular dependency detection system.
- - **BREAKING** **FEAT**: implement comprehensive circular dependency detection system.
-
-## 3.0.0-dev.1
-
- - **DOCS**: add quick guide for circular dependency detection to README.
-
-## 3.0.0-dev.0
-
-> Note: This release has breaking changes.
-
- - **BREAKING** **FEAT**: implement comprehensive circular dependency detection system.
-
-## 2.2.0
-
- - Graduate package to a stable release. See pre-releases prior to this version for changelog entries.
+ - **DOCS**: move and update quick start guides to ./doc directory.
 
 ## 2.2.0-dev.1
 

cherrypick/README.md

@@ -8,6 +8,7 @@
 
 A **Binding** acts as a configuration for how to create or provide a particular dependency. Bindings support:
 
+
 - Direct instance assignment (`toInstance()`, `toInstanceAsync()`)
 - Lazy providers (sync/async functions)
 - Provider functions supporting dynamic parameters
@@ -94,13 +95,6 @@ final subScope = rootScope.openSubScope('featureScope')
 final dataBloc = await subScope.resolveAsync<DataBloc>();
 ```
 
-### Fast Dependency Lookup (Performance Improvement)
-
-> **Performance Note:**  
-> **Starting from version 3.0.0**, CherryPick uses a Map-based resolver index for dependency lookup. This means calls to `resolve<T>()` and related methods are now O(1) operations, regardless of the number of modules or bindings in your scope. Previously, the library had to iterate over all modules and bindings to locate the requested dependency, which could impact performance as your project grew.
->
-> This optimization is internal and does not change any library APIs or usage patterns, but it significantly improves resolution speed in larger applications.
-
 ### Dependency Lookup API
 
 - `resolve<T>()` — Locates a dependency instance or throws if missing.
@@ -234,32 +228,6 @@ class ApiClientImpl implements ApiClient {
 }
 ```
 
-## Logging
-
-CherryPick supports centralized logging of all dependency injection (DI) events and errors. You can globally enable logs for your application or test environment with:
-
-```dart
-import 'package:cherrypick/cherrypick.dart';
-
-void main() {
-  // Set a global logger before any scopes are created
-  CherryPick.setGlobalLogger(PrintLogger()); // or your custom logger
-
-  final scope = CherryPick.openRootScope();
-  // All DI actions and errors will now be logged!
-}
-```
-- All dependency resolution, scope creation, module installation, and circular dependency errors will be sent to your logger (via info/error method).
-- By default, logs are off (SilentLogger is used in production).
-
-If you want fine-grained, test-local, or isolated logging, you can provide a logger directly to each scope:
-
-```dart
-final logger = MockLogger();
-final scope = Scope(null, logger: logger); // works in tests for isolation
-scope.installModules([...]);
-```
-
 ## Features
 
 - [x] Main Scope and Named Subscopes
@@ -269,81 +237,6 @@ scope.installModules([...]);
 - [x] Singleton Lifecycle Management
 - [x] Modular and Hierarchical Composition
 - [x] Null-safe Resolution (tryResolve/tryResolveAsync)
-- [x] Circular Dependency Detection (Local and Global)
-- [x] Comprehensive logging of dependency injection state and actions
-
-## Quick Guide: Circular Dependency Detection
-
-CherryPick can detect circular dependencies in your DI configuration, helping you avoid infinite loops and hard-to-debug errors.
-
-**How to use:**
-
-### 1. Enable Cycle Detection for Development
-
-**Local detection (within one scope):**
-```dart
-final scope = CherryPick.openSafeRootScope(); // Local detection enabled by default
-// or, for an existing scope:
-scope.enableCycleDetection();
-```
-
-**Global detection (across all scopes):**
-```dart
-CherryPick.enableGlobalCrossScopeCycleDetection();
-final rootScope = CherryPick.openGlobalSafeRootScope();
-```
-
-### 2. Error Example
-
-If you declare mutually dependent services:
-```dart
-class A { A(B b); }
-class B { B(A a); }
-
-scope.installModules([
-  Module((bind) {
-    bind<A>().to((s) => A(s.resolve<B>()));
-    bind<B>().to((s) => B(s.resolve<A>()));
-  }),
-]);
-
-scope.resolve<A>(); // Throws CircularDependencyException
-```
-
-### 3. Typical Usage Pattern
-
-- **Always enable detection** in debug and test environments for maximum safety.
-- **Disable detection** in production for performance (after code is tested).
-
-```dart
-import 'package:flutter/foundation.dart';
-
-void main() {
-  if (kDebugMode) {
-    CherryPick.enableGlobalCycleDetection();
-    CherryPick.enableGlobalCrossScopeCycleDetection();
-  }
-  runApp(MyApp());
-}
-```
-
-### 4. Handling and Debugging Errors
-
-On detection, `CircularDependencyException` is thrown with a readable dependency chain:
-```dart
-try {
-  scope.resolve<MyService>();
-} on CircularDependencyException catch (e) {
-  print('Dependency chain: ${e.dependencyChain}');
-}
-```
-
-**More details:** See [cycle_detection.en.md](doc/cycle_detection.en.md)
-
-## Documentation
-
-- [Circular Dependency Detection (English)](doc/cycle_detection.en.md)
-- [Обнаружение циклических зависимостей (Русский)](doc/cycle_detection.ru.md)
 
 ## Contributing
 
@@ -359,4 +252,4 @@ Licensed under the [Apache License 2.0](http://www.apache.org/licenses/LICENSE-2
 
 ## Links
 
-- [GitHub Repository](https://github.com/pese-git/cherrypick)
+- [GitHub Repository](https://github.com/pese-git/cherrypick)

cherrypick/example/bin/main.dart

@@ -17,28 +17,19 @@ class FeatureModule extends Module {
   @override
   void builder(Scope currentScope) {
     // Using toProvideAsync for async initialization
-    bind<DataRepository>()
-        .withName("networkRepo")
-        .toProvideWithParams((params) async {
-      print('REPO PARAMS: $params');
-
+    bind<DataRepository>().withName("networkRepo").toProvideAsync(() async {
       final client = await Future.delayed(
-        Duration(milliseconds: 1000),
-        () => currentScope.resolve<ApiClient>(
-          named: isMock ? "apiClientMock" : "apiClientImpl",
-        ),
-      );
-
+          Duration(milliseconds: 100),
+          () => currentScope.resolve<ApiClient>(
+              named: isMock ? "apiClientMock" : "apiClientImpl"));
       return NetworkDataRepository(client);
     }).singleton();
 
     // Asynchronous initialization of DataBloc
-    bind<DataBloc>().toProvide(
+    bind<DataBloc>().toProvideAsync(
       () async {
         final repo = await currentScope.resolveAsync<DataRepository>(
-          named: "networkRepo",
-          params: 'Some params',
-        );
+            named: "networkRepo");
         return DataBloc(repo);
       },
     );
@@ -47,19 +38,18 @@ class FeatureModule extends Module {
 
 Future<void> main() async {
   try {
-  final scope = CherryPick.openRootScope().installModules([AppModule()]);
+    final scope = openRootScope().installModules([
+      AppModule(),
+    ]);
 
     final subScope = scope
         .openSubScope("featureScope")
         .installModules([FeatureModule(isMock: true)]);
 
-  // Asynchronous instance resolution
-  final dataBloc = await subScope.resolveAsync<DataBloc>();
-  dataBloc.data.listen(
-    (d) => print('Received data: $d'),
-    onError: (e) => print('Error: $e'),
-    onDone: () => print('DONE'),
-  );
+    // Asynchronous instance resolution
+    final dataBloc = await subScope.resolveAsync<DataBloc>();
+    dataBloc.data.listen((d) => print('Received data: $d'),
+        onError: (e) => print('Error: $e'), onDone: () => print('DONE'));
 
     await dataBloc.fetchData();
   } catch (e) {

cherrypick/example/cherrypick_helper_example.dart

@@ -1,230 +0,0 @@
-import 'package:cherrypick/cherrypick.dart';
-
-// Пример сервисов для демонстрации
-class DatabaseService {
-  void connect() => print('🔌 Connecting to database');
-}
-
-class ApiService {
-  final DatabaseService database;
-  ApiService(this.database);
-  
-  void fetchData() {
-    database.connect();
-    print('📡 Fetching data via API');
-  }
-}
-
-class UserService {
-  final ApiService apiService;
-  UserService(this.apiService);
-  
-  void getUser(String id) {
-    apiService.fetchData();
-    print('👤 Fetching user: $id');
-  }
-}
-
-// Модули для различных feature
-class DatabaseModule extends Module {
-  @override
-  void builder(Scope currentScope) {
-    bind<DatabaseService>().singleton().toProvide(() => DatabaseService());
-  }
-}
-
-class ApiModule extends Module {
-  @override
-  void builder(Scope currentScope) {
-    bind<ApiService>().toProvide(() => ApiService(
-      currentScope.resolve<DatabaseService>()
-    ));
-  }
-}
-
-class UserModule extends Module {
-  @override
-  void builder(Scope currentScope) {
-    bind<UserService>().toProvide(() => UserService(
-      currentScope.resolve<ApiService>()
-    ));
-  }
-}
-
-// Пример циклических зависимостей для демонстрации обнаружения
-class CircularServiceA {
-  final CircularServiceB serviceB;
-  CircularServiceA(this.serviceB);
-}
-
-class CircularServiceB {
-  final CircularServiceA serviceA;
-  CircularServiceB(this.serviceA);
-}
-
-class CircularModuleA extends Module {
-  @override
-  void builder(Scope currentScope) {
-    bind<CircularServiceA>().toProvide(() => CircularServiceA(
-      currentScope.resolve<CircularServiceB>()
-    ));
-  }
-}
-
-class CircularModuleB extends Module {
-  @override
-  void builder(Scope currentScope) {
-    bind<CircularServiceB>().toProvide(() => CircularServiceB(
-      currentScope.resolve<CircularServiceA>()
-    ));
-  }
-}
-
-void main() {
-  print('=== Improved CherryPick Helper Demonstration ===\n');
-  
-  // Example 1: Global enabling of cycle detection
-  print('1. Globally enable cycle detection:');
-  
-  CherryPick.enableGlobalCycleDetection();
-  print('✅ Global cycle detection enabled: ${CherryPick.isGlobalCycleDetectionEnabled}');
-  
-  // All new scopes will automatically have cycle detection enabled
-  final globalScope = CherryPick.openRootScope();
-  print('✅ Root scope has cycle detection enabled: ${globalScope.isCycleDetectionEnabled}');
-  
-  // Install modules without circular dependencies
-  globalScope.installModules([
-    DatabaseModule(),
-    ApiModule(),
-    UserModule(),
-  ]);
-  
-  final userService = globalScope.resolve<UserService>();
-  userService.getUser('user123');
-  print('');
-  
-  // Example 2: Safe scope creation
-  print('2. Creating safe scopes:');
-  
-  CherryPick.closeRootScope(); // Закрываем предыдущий скоуп
-  CherryPick.disableGlobalCycleDetection(); // Отключаем глобальную настройку
-  
-  // Создаем безопасный скоуп (с автоматически включенным обнаружением)
-  final safeScope = CherryPick.openSafeRootScope();
-  print('✅ Safe scope created with cycle detection: ${safeScope.isCycleDetectionEnabled}');
-  
-  safeScope.installModules([
-    DatabaseModule(),
-    ApiModule(),
-    UserModule(),
-  ]);
-  
-  final safeUserService = safeScope.resolve<UserService>();
-  safeUserService.getUser('safe_user456');
-  print('');
-  
-  // Example 3: Detecting cycles
-  print('3. Detecting circular dependencies:');
-  
-  final cyclicScope = CherryPick.openSafeRootScope();
-  cyclicScope.installModules([
-    CircularModuleA(),
-    CircularModuleB(),
-  ]);
-  
-  try {
-    cyclicScope.resolve<CircularServiceA>();
-    print('❌ This should not be executed');
-  } catch (e) {
-    if (e is CircularDependencyException) {
-      print('❌ Circular dependency detected!');
-      print('   Message: ${e.message}');
-      print('   Chain: ${e.dependencyChain.join(' -> ')}');
-    }
-  }
-  print('');
-  
-  // Example 4: Managing detection for specific scopes
-  print('4. Managing detection for specific scopes:');
-  
-  CherryPick.closeRootScope();
-  
-  // Создаем скоуп без обнаружения
-  // ignore: unused_local_variable
-  final specificScope = CherryPick.openRootScope();
-  print('   Detection in root scope: ${CherryPick.isCycleDetectionEnabledForScope()}');
-  
-  // Включаем обнаружение для конкретного скоупа
-  CherryPick.enableCycleDetectionForScope();
-  print('✅ Detection enabled for root scope: ${CherryPick.isCycleDetectionEnabledForScope()}');
-  
-  // Создаем дочерний скоуп
-  // ignore: unused_local_variable
-  final featureScope = CherryPick.openScope(scopeName: 'feature.auth');
-  print('   Detection in feature.auth scope: ${CherryPick.isCycleDetectionEnabledForScope(scopeName: 'feature.auth')}');
-  
-  // Включаем обнаружение для дочернего скоупа
-  CherryPick.enableCycleDetectionForScope(scopeName: 'feature.auth');
-  print('✅ Detection enabled for feature.auth scope: ${CherryPick.isCycleDetectionEnabledForScope(scopeName: 'feature.auth')}');
-  print('');
-  
-  // Example 5: Creating safe child scopes
-  print('5. Creating safe child scopes:');
-  
-  final safeFeatureScope = CherryPick.openSafeScope(scopeName: 'feature.payments');
-  print('✅ Safe feature scope created: ${safeFeatureScope.isCycleDetectionEnabled}');
-  
-  // You can create a complex hierarchy of scopes
-  final complexScope = CherryPick.openSafeScope(scopeName: 'app.feature.auth.login');
-  print('✅ Complex scope created: ${complexScope.isCycleDetectionEnabled}');
-  print('');
-  
-  // Example 6: Tracking resolution chains
-  print('6. Tracking dependency resolution chains:');
-  
-  final trackingScope = CherryPick.openSafeRootScope();
-  trackingScope.installModules([
-    DatabaseModule(),
-    ApiModule(),
-    UserModule(),
-  ]);
-  
-  print('   Chain before resolve: ${CherryPick.getCurrentResolutionChain()}');
-  
-  // The chain is populated during resolution, but cleared after completion
-  // ignore: unused_local_variable
-  final trackedUserService = trackingScope.resolve<UserService>();
-  print('   Chain after resolve: ${CherryPick.getCurrentResolutionChain()}');
-  print('');
-  
-  // Example 7: Usage recommendations
-  print('7. Recommended usage:');
-  print('');
-  
-  print('🔧 Development mode:');
-  print('   CherryPick.enableGlobalCycleDetection(); // Enable globally');
-  print('   or');
-  print('   final scope = CherryPick.openSafeRootScope(); // Safe scope');
-  print('');
-  
-  print('🚀 Production mode:');
-  print('   CherryPick.disableGlobalCycleDetection(); // Disable for performance');
-  print('   final scope = CherryPick.openRootScope(); // Regular scope');
-  print('');
-  
-  print('🧪 Testing:');
-  print('   setUp(() => CherryPick.enableGlobalCycleDetection());');
-  print('   tearDown(() => CherryPick.closeRootScope());');
-  print('');
-  
-  print('🎯 Feature-specific:');
-  print('   CherryPick.enableCycleDetectionForScope(scopeName: "feature.critical");');
-  print('   // Enable only for critical features');
-  
-  // Cleanup
-  CherryPick.closeRootScope();
-  CherryPick.disableGlobalCycleDetection();
-  
-  print('\n=== Demonstration complete ===');
-}

cherrypick/example/cherrypick_logger_demo.dart

@@ -1,37 +0,0 @@
-import 'package:cherrypick/cherrypick.dart';
-
-/// Example of a simple service class.
-class UserRepository {
-  String getUserName() => 'Sergey DI';
-}
-
-/// DI module for registering dependencies.
-class AppModule extends Module {
-  @override
-  void builder(Scope currentScope) {
-    bind<UserRepository>().toInstance(UserRepository());
-  }
-}
-
-void main() {
-  // Set a global logger for the DI system
-  CherryPick.setGlobalLogger(PrintLogger());
-
-  // Open the root scope
-  final rootScope = CherryPick.openRootScope();
-
-  // Register the DI module
-  rootScope.installModules([AppModule()]);
-
-  // Resolve a dependency (service)
-  final repo = rootScope.resolve<UserRepository>();
-  print('User: ${repo.getUserName()}');
-
-  // Work with a sub-scope (create/close)
-  final subScope = rootScope.openSubScope('feature.profile');
-  subScope.closeSubScope('feature.profile');
-
-  // Demonstrate disabling and re-enabling logging
-  CherryPick.setGlobalLogger(const SilentLogger());
-  rootScope.resolve<UserRepository>(); // now without logs
-}

cherrypick/example/cycle_detection_example.dart

@@ -1,197 +0,0 @@
-import 'package:cherrypick/cherrypick.dart';
-
-// Пример сервисов с циклической зависимостью
-class UserService {
-  final OrderService orderService;
-  
-  UserService(this.orderService);
-  
-  void createUser(String name) {
-    print('Creating user: $name');
-    // Пытаемся получить заказы пользователя, что создает циклическую зависимость
-    orderService.getOrdersForUser(name);
-  }
-}
-
-class OrderService {
-  final UserService userService;
-  
-  OrderService(this.userService);
-  
-  void getOrdersForUser(String userName) {
-    print('Getting orders for user: $userName');
-    // Пытаемся получить информацию о пользователе, что создает циклическую зависимость
-    userService.createUser(userName);
-  }
-}
-
-// Модули с циклическими зависимостями
-class UserModule extends Module {
-  @override
-  void builder(Scope currentScope) {
-    bind<UserService>().toProvide(() => UserService(
-      currentScope.resolve<OrderService>()
-    ));
-  }
-}
-
-class OrderModule extends Module {
-  @override
-  void builder(Scope currentScope) {
-    bind<OrderService>().toProvide(() => OrderService(
-      currentScope.resolve<UserService>()
-    ));
-  }
-}
-
-// Правильная реализация без циклических зависимостей
-class UserRepository {
-  void createUser(String name) {
-    print('Creating user in repository: $name');
-  }
-  
-  String getUserInfo(String name) {
-    return 'User info for: $name';
-  }
-}
-
-class OrderRepository {
-  void createOrder(String orderId, String userName) {
-    print('Creating order $orderId for user: $userName');
-  }
-  
-  List<String> getOrdersForUser(String userName) {
-    return ['order1', 'order2', 'order3'];
-  }
-}
-
-class ImprovedUserService {
-  final UserRepository userRepository;
-  
-  ImprovedUserService(this.userRepository);
-  
-  void createUser(String name) {
-    userRepository.createUser(name);
-  }
-  
-  String getUserInfo(String name) {
-    return userRepository.getUserInfo(name);
-  }
-}
-
-class ImprovedOrderService {
-  final OrderRepository orderRepository;
-  final ImprovedUserService userService;
-  
-  ImprovedOrderService(this.orderRepository, this.userService);
-  
-  void createOrder(String orderId, String userName) {
-    // Проверяем, что пользователь существует
-    final userInfo = userService.getUserInfo(userName);
-    print('User exists: $userInfo');
-    
-    orderRepository.createOrder(orderId, userName);
-  }
-  
-  List<String> getOrdersForUser(String userName) {
-    return orderRepository.getOrdersForUser(userName);
-  }
-}
-
-// Правильные модули без циклических зависимостей
-class ImprovedUserModule extends Module {
-  @override
-  void builder(Scope currentScope) {
-    bind<UserRepository>().singleton().toProvide(() => UserRepository());
-    bind<ImprovedUserService>().toProvide(() => ImprovedUserService(
-      currentScope.resolve<UserRepository>()
-    ));
-  }
-}
-
-class ImprovedOrderModule extends Module {
-  @override
-  void builder(Scope currentScope) {
-    bind<OrderRepository>().singleton().toProvide(() => OrderRepository());
-    bind<ImprovedOrderService>().toProvide(() => ImprovedOrderService(
-      currentScope.resolve<OrderRepository>(),
-      currentScope.resolve<ImprovedUserService>()
-    ));
-  }
-}
-
-void main() {
-  print('=== Circular Dependency Detection Example ===\n');
-  
-  // Example 1: Demonstrate circular dependency
-  print('1. Attempt to create a scope with circular dependencies:');
-  try {
-    final scope = CherryPick.openRootScope();
-    scope.enableCycleDetection(); // Включаем обнаружение циклических зависимостей
-    
-    scope.installModules([
-      UserModule(),
-      OrderModule(),
-    ]);
-    
-    // Это должно выбросить CircularDependencyException
-    final userService = scope.resolve<UserService>();
-    print('UserService created: $userService');
-  } catch (e) {
-    print('❌ Circular dependency detected: $e\n');
-  }
-  
-  // Example 2: Without circular dependency detection (dangerous!)
-  print('2. Same code without circular dependency detection:');
-  try {
-    final scope = CherryPick.openRootScope();
-    // НЕ включаем обнаружение циклических зависимостей
-    
-    scope.installModules([
-      UserModule(),
-      OrderModule(),
-    ]);
-    
-    // Это приведет к StackOverflowError при попытке использования
-    final userService = scope.resolve<UserService>();
-    print('UserService создан: $userService');
-    
-    // Попытка использовать сервис приведет к бесконечной рекурсии
-    // userService.createUser('John'); // Раскомментируйте для демонстрации StackOverflow
-    print('⚠️  UserService created, but using it will cause StackOverflow\n');
-  } catch (e) {
-    print('❌ Error: $e\n');
-  }
-  
-  // Example 3: Correct architecture without circular dependencies
-  print('3. Correct architecture without circular dependencies:');
-  try {
-    final scope = CherryPick.openRootScope();
-    scope.enableCycleDetection(); // Включаем для безопасности
-    
-    scope.installModules([
-      ImprovedUserModule(),
-      ImprovedOrderModule(),
-    ]);
-    
-    final userService = scope.resolve<ImprovedUserService>();
-    final orderService = scope.resolve<ImprovedOrderService>();
-    
-    print('✅ Services created successfully');
-    
-    // Демонстрация работы
-    userService.createUser('John');
-    orderService.createOrder('ORD-001', 'John');
-    final orders = orderService.getOrdersForUser('John');
-    print('✅ Orders for user John: $orders');
-    
-  } catch (e) {
-    print('❌ Error: $e');
-  }
-  
-  print('\n=== Recommendations ===');
-  print('1. Always enable circular dependency detection in development mode.');
-  print('2. Use repositories and services to separate concerns.');
-  print('3. Avoid mutual dependencies between services at the same level.');
-  print('4. Use events or mediators to decouple components.');
-}

cherrypick/lib/cherrypick.dart

@@ -13,11 +13,7 @@ library;
 // limitations under the License.
 //
 
-export 'package:cherrypick/src/binding_resolver.dart';
 export 'package:cherrypick/src/binding.dart';
-export 'package:cherrypick/src/cycle_detector.dart';
-export 'package:cherrypick/src/global_cycle_detector.dart';
 export 'package:cherrypick/src/helper.dart';
 export 'package:cherrypick/src/module.dart';
 export 'package:cherrypick/src/scope.dart';
-export 'package:cherrypick/src/logger.dart';

cherrypick/lib/src/binding.dart

@@ -11,73 +11,44 @@
 // limitations under the License.
 //
 
-import 'package:cherrypick/src/binding_resolver.dart';
+enum Mode { simple, instance, providerInstance, providerInstanceWithParams }
+
+typedef Provider<T> = T? Function();
+
+typedef ProviderWithParams<T> = T Function(dynamic params);
+
+typedef AsyncProvider<T> = Future<T> Function();
+
+typedef AsyncProviderWithParams<T> = Future<T> Function(dynamic params);
 
 /// RU: Класс Binding<T> настраивает параметры экземпляра.
 /// ENG: The Binding<T> class configures the settings for the instance.
 ///
-import 'package:cherrypick/src/logger.dart';
-import 'package:cherrypick/src/log_format.dart';
-
 class Binding<T> {
+  late Mode _mode;
   late Type _key;
-  String? _name;
+  late String _name;
+  T? _instance;
+  Future<T>? _instanceAsync;
+  Provider<T>? _provider;
+  ProviderWithParams<T>? _providerWithParams;
 
-  BindingResolver<T>? _resolver;
+  AsyncProvider<T>? asyncProvider;
+  AsyncProviderWithParams<T>? asyncProviderWithParams;
 
-  CherryPickLogger? logger;
+  late bool _isSingleton = false;
+  late bool _isNamed = false;
 
-  // Deferred logging flags
-  bool _createdLogged = false;
-  bool _namedLogged = false;
-  bool _singletonLogged = false;
-
-  Binding({this.logger}) {
+  Binding() {
+    _mode = Mode.simple;
     _key = T;
-    // Не логируем здесь! Делаем deferred лог после назначения logger
   }
 
-  void markCreated() {
-    if (!_createdLogged) {
-      logger?.info(formatLogMessage(
-        type: 'Binding',
-        name: T.toString(),
-        params: _name != null ? {'name': _name} : null,
-        description: 'created',
-      ));
-      _createdLogged = true;
-    }
-  }
-
-  void markNamed() {
-    if (isNamed && !_namedLogged) {
-      logger?.info(formatLogMessage(
-        type: 'Binding',
-        name: T.toString(),
-        params: {'name': _name},
-        description: 'named',
-      ));
-      _namedLogged = true;
-    }
-  }
-
-  void markSingleton() {
-    if (isSingleton && !_singletonLogged) {
-      logger?.info(formatLogMessage(
-        type: 'Binding',
-        name: T.toString(),
-        params: _name != null ? {'name': _name} : null,
-        description: 'singleton mode enabled',
-      ));
-      _singletonLogged = true;
-    }
-  }
-
-  void logAllDeferred() {
-    markCreated();
-    markNamed();
-    markSingleton();
-  }
+  /// RU: Метод возвращает [Mode] экземпляра.
+  /// ENG: The method returns the [Mode] of the instance.
+  ///
+  /// return [Mode]
+  Mode get mode => _mode;
 
   /// RU: Метод возвращает тип экземпляра.
   /// ENG: The method returns the type of the instance.
@@ -89,21 +60,19 @@ class Binding<T> {
   /// ENG: The method returns the name of the instance.
   ///
   /// return [String]
-  String? get name => _name;
-
-  /// RU: Метод проверяет именован экземпляр или нет.
-  /// ENG: The method checks whether the instance is named or not.
-  ///
-  /// return [bool]
-  bool get isNamed => _name != null;
+  String get name => _name;
 
   /// RU: Метод проверяет сингелтон экземпляр или нет.
   /// ENG: The method checks the singleton instance or not.
   ///
   /// return [bool]
-  bool get isSingleton => _resolver?.isSingleton ?? false;
+  bool get isSingleton => _isSingleton;
 
-  BindingResolver<T>? get resolver => _resolver;
+  /// RU: Метод проверяет именован экземпляр или нет.
+  /// ENG: The method checks whether the instance is named or not.
+  ///
+  /// return [bool]
+  bool get isNamed => _isNamed;
 
   /// RU: Добавляет имя для экземляпя [value].
   /// ENG: Added name for instance [value].
@@ -111,7 +80,7 @@ class Binding<T> {
   /// return [Binding]
   Binding<T> withName(String name) {
     _name = name;
-    // Не логируем здесь, deferred log via markNamed()
+    _isNamed = true;
     return this;
   }
 
@@ -119,8 +88,21 @@ class Binding<T> {
   /// ENG: Initialization instance [value].
   ///
   /// return [Binding]
-  Binding<T> toInstance(Instance<T> value) {
-    _resolver = InstanceResolver<T>(value);
+  Binding<T> toInstance(T value) {
+    _mode = Mode.instance;
+    _instance = value;
+    _isSingleton = true;
+    return this;
+  }
+
+  /// RU: Инициализация экземляпяра [value].
+  /// ENG: Initialization instance [value].
+  ///
+  /// return [Binding]
+  Binding<T> toInstanceAsync(Future<T> value) {
+    _mode = Mode.instance;
+    _instanceAsync = value;
+    _isSingleton = true;
     return this;
   }
 
@@ -129,7 +111,18 @@ class Binding<T> {
   ///
   /// return [Binding]
   Binding<T> toProvide(Provider<T> value) {
-    _resolver = ProviderResolver<T>((_) => value.call(), withParams: false);
+    _mode = Mode.providerInstance;
+    _provider = value;
+    return this;
+  }
+
+  /// RU: Инициализация экземляпяра  через провайдер [value].
+  /// ENG: Initialization instance via provider [value].
+  ///
+  /// return [Binding]
+  Binding<T> toProvideAsync(AsyncProvider<T> provider) {
+    _mode = Mode.providerInstance;
+    asyncProvider = provider;
     return this;
   }
 
@@ -138,23 +131,19 @@ class Binding<T> {
   ///
   /// return [Binding]
   Binding<T> toProvideWithParams(ProviderWithParams<T> value) {
-    _resolver = ProviderResolver<T>(value, withParams: true);
+    _mode = Mode.providerInstanceWithParams;
+    _providerWithParams = value;
     return this;
   }
 
-  @Deprecated('Use toInstance instead of toInstanceAsync')
-  Binding<T> toInstanceAsync(Instance<T> value) {
-    return this.toInstance(value);
-  }
-
-  @Deprecated('Use toProvide instead of toProvideAsync')
-  Binding<T> toProvideAsync(Provider<T> value) {
-    return this.toProvide(value);
-  }
-
-  @Deprecated('Use toProvideWithParams instead of toProvideAsyncWithParams')
-  Binding<T> toProvideAsyncWithParams(ProviderWithParams<T> value) {
-    return this.toProvideWithParams(value);
+  /// RU: Инициализация экземляра через асинхронный провайдер [value] с динамическим параметром.
+  /// ENG: Initializes the instance via async provider [value] with a dynamic param.
+  ///
+  /// return [Binding]
+  Binding<T> toProvideAsyncWithParams(AsyncProviderWithParams<T> provider) {
+    _mode = Mode.providerInstanceWithParams;
+    asyncProviderWithParams = provider;
+    return this;
   }
 
   /// RU: Инициализация экземляпяра  как сингелтон [value].
@@ -162,74 +151,40 @@ class Binding<T> {
   ///
   /// return [Binding]
   Binding<T> singleton() {
-    _resolver?.toSingleton();
-    // Не логируем здесь, deferred log via markSingleton()
+    _isSingleton = true;
     return this;
   }
 
-  T? resolveSync([dynamic params]) {
-    final res = resolver?.resolveSync(params);
-    if (res != null) {
-      logger?.info(formatLogMessage(
-        type: 'Binding',
-        name: T.toString(),
-        params: {
-          if (_name != null) 'name': _name,
-          'method': 'resolveSync',
-        },
-        description: 'object created/resolved',
-      ));
-    } else {
-      logger?.warn(formatLogMessage(
-        type: 'Binding',
-        name: T.toString(),
-        params: {
-          if (_name != null) 'name': _name,
-          'method': 'resolveSync',
-        },
-        description: 'resolveSync returned null',
-      ));
+  /// RU: Поиск экземпляра.
+  /// ENG: Resolve instance.
+  ///
+  /// return [T]
+  T? get instance => _instance;
+
+  /// RU: Поиск экземпляра.
+  /// ENG: Resolve instance.
+  ///
+  /// return [T]
+  Future<T>? get instanceAsync => _instanceAsync;
+
+  /// RU: Поиск экземпляра.
+  /// ENG: Resolve instance.
+  ///
+  /// return [T]
+  T? get provider {
+    if (_isSingleton) {
+      _instance ??= _provider?.call();
+      return _instance;
     }
-    return res;
+    return _provider?.call();
   }
 
-  Future<T>? resolveAsync([dynamic params]) {
-    final future = resolver?.resolveAsync(params);
-    if (future != null) {
-      future
-          .then((res) => logger?.info(formatLogMessage(
-                type: 'Binding',
-                name: T.toString(),
-                params: {
-                  if (_name != null) 'name': _name,
-                  'method': 'resolveAsync',
-                },
-                description: 'Future resolved',
-              )))
-          .catchError((e, s) => logger?.error(
-                formatLogMessage(
-                  type: 'Binding',
-                  name: T.toString(),
-                  params: {
-                    if (_name != null) 'name': _name,
-                    'method': 'resolveAsync',
-                  },
-                  description: 'resolveAsync error',
-                ),
-                e,
-                s,
-              ));
-    } else {
-      logger?.warn(formatLogMessage(
-        type: 'Binding',
-        name: T.toString(),
-        params: {
-          if (_name != null) 'name': _name,
-          'method': 'resolveAsync',
-        },
-        description: 'resolveAsync returned null',
-      ));
-    }
-    return future;
+  /// RU: Поиск экземпляра с параметром.
+  ///
+  /// ENG: Resolve instance with [params].
+  ///
+  /// return [T]
+  T? providerWithParams(dynamic params) {
+    return _providerWithParams?.call(params);
   }
 }

cherrypick/lib/src/binding_resolver.dart

@@ -1,129 +0,0 @@
-import 'dart:async';
-
-typedef Instance<T> = FutureOr<T>;
-
-/// RU: Синхронный или асинхронный провайдер без параметров, возвращающий [T] или [Future<T>].
-/// ENG: Synchronous or asynchronous provider without parameters, returning [T] or [Future<T>].
-typedef Provider<T> = FutureOr<T> Function();
-
-/// RU: Провайдер с динамическим параметром, возвращающий [T] или [Future<T>] в зависимости от реализации.
-/// ENG: Provider with dynamic parameter, returning [T] or [Future<T>] depending on implementation.
-typedef ProviderWithParams<T> = FutureOr<T> Function(dynamic);
-
-/// RU: Абстрактный интерфейс для классов, которые разрешают зависимости типа [T].
-/// ENG: Abstract interface for classes that resolve dependencies of type [T].
-abstract class BindingResolver<T> {
-  /// RU: Синхронное разрешение зависимости с параметром [params].
-  /// ENG: Synchronous resolution of the dependency with [params].
-  T? resolveSync([dynamic params]);
-
-  /// RU: Асинхронное разрешение зависимости с параметром [params].
-  /// ENG: Asynchronous resolution of the dependency with [params].
-  Future<T>? resolveAsync([dynamic params]);
-
-  /// RU: Помечает текущий резолвер как синглтон — результат будет закеширован.
-  /// ENG: Marks this resolver as singleton — result will be cached.
-  void toSingleton();
-
-  bool get isSingleton;
-}
-
-/// RU: Резолвер, оборачивающий конкретный экземпляр [T] (или Future<T>), без вызова провайдера.
-/// ENG: Resolver that wraps a concrete instance of [T] (or Future<T>), without provider invocation.
-class InstanceResolver<T> implements BindingResolver<T> {
-  final Instance<T> _instance;
-
-  /// RU: Создаёт резолвер, оборачивающий значение [instance].
-  /// ENG: Creates a resolver that wraps the given [instance].
-  InstanceResolver(this._instance);
-
-  @override
-  T resolveSync([_]) {
-    if (_instance is T) return _instance;
-    throw StateError(
-      'Instance $_instance is Future; '
-      'use resolveAsync() instead',
-    );
-  }
-
-  @override
-  Future<T> resolveAsync([_]) {
-    if (_instance is Future<T>) return _instance;
-
-    return Future.value(_instance);
-  }
-
-  @override
-  void toSingleton() {}
-
-  @override
-  bool get isSingleton => true;
-}
-
-/// RU: Резолвер, оборачивающий провайдер, с возможностью синглтон-кеширования.
-/// ENG: Resolver that wraps a provider, with optional singleton caching.
-class ProviderResolver<T> implements BindingResolver<T> {
-  final ProviderWithParams<T> _provider;
-  final bool _withParams;
-
-  FutureOr<T>? _cache;
-  bool _singleton = false;
-
-  /// RU: Создаёт резолвер из произвольной функции [raw], поддерживающей ноль или один параметр.
-  /// ENG: Creates a resolver from arbitrary function [raw], supporting zero or one parameter.
-  ProviderResolver(
-    ProviderWithParams<T> provider, {
-    required bool withParams,
-  })  : _provider = provider,
-        _withParams = withParams;
-
-  @override
-  T resolveSync([dynamic params]) {
-    _checkParams(params);
-
-    final result = _cache ?? _provider(params);
-
-    if (result is T) {
-      if (_singleton) {
-        _cache ??= result;
-      }
-      return result;
-    }
-
-    throw StateError(
-      'Provider [$_provider] return Future<$T>. Use resolveAsync() instead.',
-    );
-  }
-
-  @override
-  Future<T> resolveAsync([dynamic params]) {
-    _checkParams(params);
-
-    final result = _cache ?? _provider(params);
-    final target = result is Future<T> ? result : Future<T>.value(result);
-
-    if (_singleton) {
-      _cache ??= target;
-    }
-
-    return target;
-  }
-
-  @override
-  void toSingleton() {
-    _singleton = true;
-  }
-
-  @override
-  bool get isSingleton => _singleton;
-
-  /// RU: Проверяет, был ли передан параметр, если провайдер требует его.
-  /// ENG: Checks if parameter is passed when the provider expects it.
-  void _checkParams(dynamic params) {
-    if (_withParams && params == null) {
-      throw StateError(
-        '[$T] Params is null. Maybe you forgot to pass it?',
-      );
-    }
-  }
-}

cherrypick/lib/src/cycle_detector.dart

@@ -1,211 +0,0 @@
-//
-// Copyright 2021 Sergey Penkovsky (sergey.penkovsky@gmail.com)
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//      http://www.apache.org/licenses/LICENSE-2.0
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-import 'dart:collection';
-import 'package:cherrypick/src/logger.dart';
-import 'package:cherrypick/src/log_format.dart';
-
-/// RU: Исключение, выбрасываемое при обнаружении циклической зависимости.
-/// ENG: Exception thrown when a circular dependency is detected.
-class CircularDependencyException implements Exception {
-  final String message;
-  final List<String> dependencyChain;
-
-  CircularDependencyException(this.message, this.dependencyChain) {
-    // DEBUG
-    
-  }
-
-  @override
-  String toString() {
-    final chain = dependencyChain.join(' -> ');
-    return 'CircularDependencyException: $message\nDependency chain: $chain';
-  }
-}
-
-/// RU: Детектор циклических зависимостей для CherryPick DI контейнера.
-/// ENG: Circular dependency detector for CherryPick DI container.
-class CycleDetector {
-  final CherryPickLogger _logger;
-  final Set<String> _resolutionStack = HashSet<String>();
-  final List<String> _resolutionHistory = [];
-
-  CycleDetector({required CherryPickLogger logger}): _logger = logger;
-
-  /// RU: Начинает отслеживание разрешения зависимости.
-  /// ENG: Starts tracking dependency resolution.
-  /// 
-  /// Throws [CircularDependencyException] if circular dependency is detected.
-  void startResolving<T>({String? named}) {
-    final dependencyKey = _createDependencyKey<T>(named);
-    print('[DEBUG] CycleDetector logger type=${_logger.runtimeType} hash=${_logger.hashCode}');
-    _logger.info(formatLogMessage(
-      type: 'CycleDetector',
-      name: dependencyKey.toString(),
-      params: {'event': 'startResolving', 'stackSize': _resolutionStack.length},
-      description: 'start resolving',
-    ));
-    if (_resolutionStack.contains(dependencyKey)) {
-      // Найдена циклическая зависимость
-      final cycleStartIndex = _resolutionHistory.indexOf(dependencyKey);
-      final cycle = _resolutionHistory.sublist(cycleStartIndex)..add(dependencyKey);
-      // print removed (trace)
-      final msg = formatLogMessage(
-        type: 'CycleDetector',
-        name: dependencyKey.toString(),
-        params: {'chain': cycle.join('->')},
-        description: 'cycle detected',
-      );
-      _logger.error(msg);
-      throw CircularDependencyException(
-        'Circular dependency detected for $dependencyKey',
-        cycle,
-      );
-    }
-    
-    _resolutionStack.add(dependencyKey);
-    _resolutionHistory.add(dependencyKey);
-  }
-
-  /// RU: Завершает отслеживание разрешения зависимости.
-  /// ENG: Finishes tracking dependency resolution.
-  void finishResolving<T>({String? named}) {
-    final dependencyKey = _createDependencyKey<T>(named);
-    _logger.info(formatLogMessage(
-      type: 'CycleDetector',
-      name: dependencyKey.toString(),
-      params: {'event': 'finishResolving'},
-      description: 'finish resolving',
-    ));
-    _resolutionStack.remove(dependencyKey);
-    // Удаляем из истории только если это последний элемент
-    if (_resolutionHistory.isNotEmpty && 
-        _resolutionHistory.last == dependencyKey) {
-      _resolutionHistory.removeLast();
-    }
-  }
-
-  /// RU: Очищает все состояние детектора.
-  /// ENG: Clears all detector state.
-  void clear() {
-    _logger.info(formatLogMessage(
-      type: 'CycleDetector',
-      params: {'event': 'clear'},
-      description: 'resolution stack cleared',
-    ));
-    _resolutionStack.clear();
-    _resolutionHistory.clear();
-  }
-
-  /// RU: Проверяет, находится ли зависимость в процессе разрешения.
-  /// ENG: Checks if dependency is currently being resolved.
-  bool isResolving<T>({String? named}) {
-    final dependencyKey = _createDependencyKey<T>(named);
-    return _resolutionStack.contains(dependencyKey);
-  }
-
-  /// RU: Возвращает текущую цепочку разрешения зависимостей.
-  /// ENG: Returns current dependency resolution chain.
-  List<String> get currentResolutionChain => List.unmodifiable(_resolutionHistory);
-
-  /// RU: Создает уникальный ключ для зависимости.
-  /// ENG: Creates unique key for dependency.
-  String _createDependencyKey<T>(String? named) {
-    final typeName = T.toString();
-    return named != null ? '$typeName@$named' : typeName;
-  }
-}
-
-/// RU: Миксин для добавления поддержки обнаружения циклических зависимостей.
-/// ENG: Mixin for adding circular dependency detection support.
-mixin CycleDetectionMixin {
-  CycleDetector? _cycleDetector;
-  CherryPickLogger get logger;
-
-  /// RU: Включает обнаружение циклических зависимостей.
-  /// ENG: Enables circular dependency detection.
-  void enableCycleDetection() {
-    _cycleDetector = CycleDetector(logger: logger);
-    logger.info(formatLogMessage(
-      type: 'CycleDetection',
-      params: {'event': 'enable'},
-      description: 'cycle detection enabled',
-    ));
-  }
-
-  /// RU: Отключает обнаружение циклических зависимостей.
-  /// ENG: Disables circular dependency detection.
-  void disableCycleDetection() {
-    _cycleDetector?.clear();
-    logger.info(formatLogMessage(
-      type: 'CycleDetection',
-      params: {'event': 'disable'},
-      description: 'cycle detection disabled',
-    ));
-    _cycleDetector = null;
-  }
-
-  /// RU: Проверяет, включено ли обнаружение циклических зависимостей.
-  /// ENG: Checks if circular dependency detection is enabled.
-  bool get isCycleDetectionEnabled => _cycleDetector != null;
-
-  /// RU: Выполняет действие с отслеживанием циклических зависимостей.
-  /// ENG: Executes action with circular dependency tracking.
-  T withCycleDetection<T>(
-    Type dependencyType,
-    String? named,
-    T Function() action,
-  ) {
-    if (_cycleDetector == null) {
-      return action();
-    }
-
-    final dependencyKey = named != null 
-        ? '${dependencyType.toString()}@$named' 
-        : dependencyType.toString();
-
-    if (_cycleDetector!._resolutionStack.contains(dependencyKey)) {
-      final cycleStartIndex = _cycleDetector!._resolutionHistory.indexOf(dependencyKey);
-      final cycle = _cycleDetector!._resolutionHistory.sublist(cycleStartIndex)
-        ..add(dependencyKey);
-      logger.error(formatLogMessage(
-        type: 'CycleDetector',
-        name: dependencyKey.toString(),
-        params: {'chain': cycle.join('->')},
-        description: 'cycle detected',
-      ));
-      throw CircularDependencyException(
-        'Circular dependency detected for $dependencyKey',
-        cycle,
-      );
-    }
-
-    _cycleDetector!._resolutionStack.add(dependencyKey);
-    _cycleDetector!._resolutionHistory.add(dependencyKey);
-
-    try {
-      return action();
-    } finally {
-      _cycleDetector!._resolutionStack.remove(dependencyKey);
-      if (_cycleDetector!._resolutionHistory.isNotEmpty && 
-          _cycleDetector!._resolutionHistory.last == dependencyKey) {
-        _cycleDetector!._resolutionHistory.removeLast();
-      }
-    }
-  }
-
-  /// RU: Возвращает текущую цепочку разрешения зависимостей.
-  /// ENG: Returns current dependency resolution chain.
-  List<String> get currentResolutionChain => 
-      _cycleDetector?.currentResolutionChain ?? [];
-}

cherrypick/lib/src/global_cycle_detector.dart

@@ -1,236 +0,0 @@
-//
-// Copyright 2021 Sergey Penkovsky (sergey.penkovsky@gmail.com)
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//      http://www.apache.org/licenses/LICENSE-2.0
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-import 'dart:collection';
-import 'package:cherrypick/cherrypick.dart';
-import 'package:cherrypick/src/log_format.dart';
-
-
-/// RU: Глобальный детектор циклических зависимостей для всей иерархии скоупов.
-/// ENG: Global circular dependency detector for entire scope hierarchy.
-class GlobalCycleDetector {
-  static GlobalCycleDetector? _instance;
-
-  final CherryPickLogger _logger;
-  
-  // Глобальный стек разрешения зависимостей
-  final Set<String> _globalResolutionStack = HashSet<String>();
-  
-  // История разрешения для построения цепочки зависимостей
-  final List<String> _globalResolutionHistory = [];
-  
-  // Карта активных детекторов по скоупам
-  final Map<String, CycleDetector> _scopeDetectors = HashMap<String, CycleDetector>();
-
-  GlobalCycleDetector._internal({required CherryPickLogger logger}): _logger = logger;
-
-  /// RU: Получить единственный экземпляр глобального детектора.
-  /// ENG: Get singleton instance of global detector.
-  static GlobalCycleDetector get instance {
-    _instance ??= GlobalCycleDetector._internal(logger:  CherryPick.globalLogger);
-    return _instance!;
-  }
-
-  /// RU: Сбросить глобальный детектор (полезно для тестов).
-  /// ENG: Reset global detector (useful for tests).
-  static void reset() {
-    _instance?._globalResolutionStack.clear();
-    _instance?._globalResolutionHistory.clear();
-    _instance?._scopeDetectors.clear();
-    _instance = null;
-  }
-
-  /// RU: Начать отслеживание разрешения зависимости в глобальном контексте.
-  /// ENG: Start tracking dependency resolution in global context.
-  void startGlobalResolving<T>({String? named, String? scopeId}) {
-    final dependencyKey = _createDependencyKeyFromType(T, named, scopeId);
-    
-    if (_globalResolutionStack.contains(dependencyKey)) {
-      // Найдена глобальная циклическая зависимость
-      final cycleStartIndex = _globalResolutionHistory.indexOf(dependencyKey);
-      final cycle = _globalResolutionHistory.sublist(cycleStartIndex)..add(dependencyKey);
-      _logger.error(formatLogMessage(
-        type: 'CycleDetector',
-        name: dependencyKey.toString(),
-        params: {'chain': cycle.join('->')},
-        description: 'cycle detected',
-      ));
-      throw CircularDependencyException(
-        'Global circular dependency detected for $dependencyKey',
-        cycle,
-      );
-    }
-    
-    _globalResolutionStack.add(dependencyKey);
-    _globalResolutionHistory.add(dependencyKey);
-  }
-
-  /// RU: Завершить отслеживание разрешения зависимости в глобальном контексте.
-  /// ENG: Finish tracking dependency resolution in global context.
-  void finishGlobalResolving<T>({String? named, String? scopeId}) {
-    final dependencyKey = _createDependencyKeyFromType(T, named, scopeId);
-    _globalResolutionStack.remove(dependencyKey);
-    
-    // Удаляем из истории только если это последний элемент
-    if (_globalResolutionHistory.isNotEmpty && 
-        _globalResolutionHistory.last == dependencyKey) {
-      _globalResolutionHistory.removeLast();
-    }
-  }
-
-  /// RU: Выполнить действие с глобальным отслеживанием циклических зависимостей.
-  /// ENG: Execute action with global circular dependency tracking.
-  T withGlobalCycleDetection<T>(
-    Type dependencyType,
-    String? named,
-    String? scopeId,
-    T Function() action,
-  ) {
-    final dependencyKey = _createDependencyKeyFromType(dependencyType, named, scopeId);
-    
-    if (_globalResolutionStack.contains(dependencyKey)) {
-      final cycleStartIndex = _globalResolutionHistory.indexOf(dependencyKey);
-      final cycle = _globalResolutionHistory.sublist(cycleStartIndex)
-        ..add(dependencyKey);
-      _logger.error(formatLogMessage(
-        type: 'CycleDetector',
-        name: dependencyKey.toString(),
-        params: {'chain': cycle.join('->')},
-        description: 'cycle detected',
-      ));
-      throw CircularDependencyException(
-        'Global circular dependency detected for $dependencyKey',
-        cycle,
-      );
-    }
-
-    _globalResolutionStack.add(dependencyKey);
-    _globalResolutionHistory.add(dependencyKey);
-
-    try {
-      return action();
-    } finally {
-      _globalResolutionStack.remove(dependencyKey);
-      if (_globalResolutionHistory.isNotEmpty && 
-          _globalResolutionHistory.last == dependencyKey) {
-        _globalResolutionHistory.removeLast();
-      }
-    }
-  }
-
-  /// RU: Получить детектор для конкретного скоупа.
-  /// ENG: Get detector for specific scope.
-  CycleDetector getScopeDetector(String scopeId) {
-    return _scopeDetectors.putIfAbsent(scopeId, () => CycleDetector(logger: CherryPick.globalLogger));
-  }
-
-  /// RU: Удалить детектор для скоупа.
-  /// ENG: Remove detector for scope.
-  void removeScopeDetector(String scopeId) {
-    _scopeDetectors.remove(scopeId);
-  }
-
-  /// RU: Проверить, находится ли зависимость в процессе глобального разрешения.
-  /// ENG: Check if dependency is currently being resolved globally.
-  bool isGloballyResolving<T>({String? named, String? scopeId}) {
-    final dependencyKey = _createDependencyKeyFromType(T, named, scopeId);
-    return _globalResolutionStack.contains(dependencyKey);
-  }
-
-  /// RU: Получить текущую глобальную цепочку разрешения зависимостей.
-  /// ENG: Get current global dependency resolution chain.
-  List<String> get globalResolutionChain => List.unmodifiable(_globalResolutionHistory);
-
-  /// RU: Очистить все состояние детектора.
-  /// ENG: Clear all detector state.
-  void clear() {
-    _globalResolutionStack.clear();
-    _globalResolutionHistory.clear();
-    _scopeDetectors.values.forEach(_detectorClear);
-    _scopeDetectors.clear();
-  }
-
-  void _detectorClear(detector) => detector.clear();
-
-  /// RU: Создать уникальный ключ для зависимости с учетом скоупа.
-  /// ENG: Create unique key for dependency including scope.
-  //String _createDependencyKey<T>(String? named, String? scopeId) {
-  //  return _createDependencyKeyFromType(T, named, scopeId);
-  //}
-
-  /// RU: Создать уникальный ключ для зависимости по типу с учетом скоупа.
-  /// ENG: Create unique key for dependency by type including scope.
-  String _createDependencyKeyFromType(Type type, String? named, String? scopeId) {
-    final typeName = type.toString();
-    final namePrefix = named != null ? '@$named' : '';
-    final scopePrefix = scopeId != null ? '[$scopeId]' : '';
-    return '$scopePrefix$typeName$namePrefix';
-  }
-}
-
-/// RU: Улучшенный миксин для глобального обнаружения циклических зависимостей.
-/// ENG: Enhanced mixin for global circular dependency detection.
-mixin GlobalCycleDetectionMixin {
-  String? _scopeId;
-  bool _globalCycleDetectionEnabled = false;
-
-  /// RU: Установить идентификатор скоупа для глобального отслеживания.
-  /// ENG: Set scope identifier for global tracking.
-  void setScopeId(String scopeId) {
-    _scopeId = scopeId;
-  }
-
-  /// RU: Получить идентификатор скоупа.
-  /// ENG: Get scope identifier.
-  String? get scopeId => _scopeId;
-
-  /// RU: Включить глобальное обнаружение циклических зависимостей.
-  /// ENG: Enable global circular dependency detection.
-  void enableGlobalCycleDetection() {
-    _globalCycleDetectionEnabled = true;
-  }
-
-  /// RU: Отключить глобальное обнаружение циклических зависимостей.
-  /// ENG: Disable global circular dependency detection.
-  void disableGlobalCycleDetection() {
-    _globalCycleDetectionEnabled = false;
-  }
-
-  /// RU: Проверить, включено ли глобальное обнаружение циклических зависимостей.
-  /// ENG: Check if global circular dependency detection is enabled.
-  bool get isGlobalCycleDetectionEnabled => _globalCycleDetectionEnabled;
-
-  /// RU: Выполнить действие с глобальным отслеживанием циклических зависимостей.
-  /// ENG: Execute action with global circular dependency tracking.
-  T withGlobalCycleDetection<T>(
-    Type dependencyType,
-    String? named,
-    T Function() action,
-  ) {
-    if (!_globalCycleDetectionEnabled) {
-      return action();
-    }
-
-    return GlobalCycleDetector.instance.withGlobalCycleDetection<T>(
-      dependencyType,
-      named,
-      _scopeId,
-      action,
-    );
-  }
-
-  /// RU: Получить текущую глобальную цепочку разрешения зависимостей.
-  /// ENG: Get current global dependency resolution chain.
-  List<String> get globalResolutionChain => 
-      GlobalCycleDetector.instance.globalResolutionChain;
-}

cherrypick/lib/src/helper.dart

@@ -10,364 +10,96 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-
 import 'package:cherrypick/src/scope.dart';
-import 'package:cherrypick/src/global_cycle_detector.dart';
-import 'package:cherrypick/src/logger.dart';
 import 'package:meta/meta.dart';
 
-
 Scope? _rootScope;
 
-/// Global logger for all [Scope]s managed by [CherryPick].
-///
-/// Defaults to [SilentLogger] unless set via [setGlobalLogger].
-CherryPickLogger _globalLogger = const SilentLogger();
-
-/// Whether global local-cycle detection is enabled for all Scopes ([Scope.enableCycleDetection]).
-bool _globalCycleDetectionEnabled = false;
-
-/// Whether global cross-scope cycle detection is enabled ([Scope.enableGlobalCycleDetection]).
-bool _globalCrossScopeCycleDetectionEnabled = false;
-
-/// Static facade for managing dependency graph, root scope, subscopes, logger, and global settings in the CherryPick DI container.
-///
-/// - Provides a singleton root scope for simple integration.
-/// - Supports hierarchical/named subscopes by string path.
-/// - Manages global/protected logging and DI diagnostics.
-/// - Suitable for most application & CLI scenarios. For test isolation, manually create [Scope]s instead.
-///
-/// ### Example: Opening a root scope and installing modules
-/// ```dart
-/// class AppModule extends Module {
-///   @override
-///   void builder(Scope scope) {
-///     scope.bind<Service>().toProvide(() => ServiceImpl());
-///   }
-/// }
-///
-/// final root = CherryPick.openRootScope();
-/// root.installModules([AppModule()]);
-/// final service = root.resolve<Service>();
-/// ```
 class CherryPick {
-  /// Sets the global logger for all [Scope]s created by CherryPick.
+  /// RU: Метод открывает главный [Scope].
+  /// ENG: The method opens the main [Scope].
   ///
-  /// Allows customizing log output and DI diagnostics globally.
-  ///
-  /// Example:
-  /// ```dart
-  /// CherryPick.setGlobalLogger(DefaultLogger());
-  /// ```
-  static void setGlobalLogger(CherryPickLogger logger) {
-    _globalLogger = logger;
-  }
-
-  /// Returns the current global logger used by CherryPick.
-  static CherryPickLogger get globalLogger => _globalLogger;
-
-  /// Returns the singleton root [Scope], creating it if needed.
-  ///
-  /// Applies configured [globalLogger] and cycle detection settings.
-  ///
-  /// Example:
-  /// ```dart
-  /// final root = CherryPick.openRootScope();
-  /// ```
+  /// return
   static Scope openRootScope() {
-    _rootScope ??= Scope(null, logger: _globalLogger);
-    // Apply cycle detection settings
-    if (_globalCycleDetectionEnabled && !_rootScope!.isCycleDetectionEnabled) {
-      _rootScope!.enableCycleDetection();
-    }
-    if (_globalCrossScopeCycleDetectionEnabled && !_rootScope!.isGlobalCycleDetectionEnabled) {
-      _rootScope!.enableGlobalCycleDetection();
-    }
+    _rootScope ??= Scope(null);
     return _rootScope!;
   }
 
-  /// Disposes and resets the root [Scope] singleton.
+  /// RU: Метод закрывает главный [Scope].
+  /// ENG: The method close the main [Scope].
   ///
-  /// Call before tests or when needing full re-initialization.
   ///
-  /// Example:
-  /// ```dart
-  /// CherryPick.closeRootScope();
-  /// ```
   static void closeRootScope() {
-    _rootScope = null;
-  }
-
-  /// Globally enables cycle detection for all new [Scope]s created by CherryPick.
-  ///
-  /// Strongly recommended for safety in all projects.
-  ///
-  /// Example:
-  /// ```dart
-  /// CherryPick.enableGlobalCycleDetection();
-  /// ```
-  static void enableGlobalCycleDetection() {
-    _globalCycleDetectionEnabled = true;
     if (_rootScope != null) {
-      _rootScope!.enableCycleDetection();
+      _rootScope = null;
     }
   }
 
-  /// Disables global local cycle detection. Existing and new scopes won't check for local cycles.
+  /// RU: Метод открывает  дочерний [Scope].
+  /// ENG: The method open the child [Scope].
+  ///
+  /// Дочерний [Scope] открывается с [scopeName]
+  /// Child [Scope] open with [scopeName]
   ///
   /// Example:
-  /// ```dart
-  /// CherryPick.disableGlobalCycleDetection();
   /// ```
-  static void disableGlobalCycleDetection() {
-    _globalCycleDetectionEnabled = false;
-    if (_rootScope != null) {
-      _rootScope!.disableCycleDetection();
-    }
-  }
-
-  /// Returns `true` if global local cycle detection is enabled.
-  static bool get isGlobalCycleDetectionEnabled => _globalCycleDetectionEnabled;
-
-  /// Enables cycle detection for a particular scope tree.
-  ///
-  /// [scopeName] - hierarchical string path (e.g. 'feature.api'), or empty for root.
-  /// [separator] - path separator (default: '.'), e.g. '/' for "feature/api/module"
-  ///
-  /// Example:
-  /// ```dart
-  /// CherryPick.enableCycleDetectionForScope(scopeName: 'api.feature');
+  /// final String scopeName = 'firstScope.secondScope';
+  /// final subScope = CherryPick.openScope(scopeName);
   /// ```
-  static void enableCycleDetectionForScope({String scopeName = '', String separator = '.'}) {
-    final scope = _getScope(scopeName, separator);
-    scope.enableCycleDetection();
-  }
-
-  /// Disables cycle detection for a given scope. See [enableCycleDetectionForScope].
-  static void disableCycleDetectionForScope({String scopeName = '', String separator = '.'}) {
-    final scope = _getScope(scopeName, separator);
-    scope.disableCycleDetection();
-  }
-
-  /// Returns `true` if cycle detection is enabled for the requested scope.
   ///
-  /// Example:
-  /// ```dart
-  /// CherryPick.isCycleDetectionEnabledForScope(scopeName: 'feature.api');
-  /// ```
-  static bool isCycleDetectionEnabledForScope({String scopeName = '', String separator = '.'}) {
-    final scope = _getScope(scopeName, separator);
-    return scope.isCycleDetectionEnabled;
-  }
-
-  /// Returns the current dependency resolution chain inside the given scope.
   ///
-  /// Useful for diagnostics (to print what types are currently resolving).
-  ///
-  /// Example:
-  /// ```dart
-  /// print(CherryPick.getCurrentResolutionChain(scopeName: 'feature.api'));
-  /// ```
-  static List<String> getCurrentResolutionChain({String scopeName = '', String separator = '.'}) {
-    final scope = _getScope(scopeName, separator);
-    return scope.currentResolutionChain;
-  }
-
-  /// Opens the root scope and enables local cycle detection.
-  ///
-  /// Example:
-  /// ```dart
-  /// final safeRoot = CherryPick.openSafeRootScope();
-  /// ```
-  static Scope openSafeRootScope() {
-    final scope = openRootScope();
-    scope.enableCycleDetection();
-    return scope;
-  }
-
-  /// Opens a named/nested scope and enables local cycle detection for it.
-  ///
-  /// Example:
-  /// ```dart
-  /// final api = CherryPick.openSafeScope(scopeName: 'feature.api');
-  /// ```
-  static Scope openSafeScope({String scopeName = '', String separator = '.'}) {
-    final scope = openScope(scopeName: scopeName, separator: separator);
-    scope.enableCycleDetection();
-    return scope;
-  }
-
-  /// Returns a [Scope] by path (or the root if none specified).
-  /// Used for internal diagnostics & helpers.
-  static Scope _getScope(String scopeName, String separator) {
-    if (scopeName.isEmpty) {
-      return openRootScope();
-    }
-    return openScope(scopeName: scopeName, separator: separator);
-  }
-
-  /// Opens (and creates nested subscopes if needed) a scope by hierarchical path.
-  ///
-  /// [scopeName] - dot-separated path ("api.feature"). Empty = root.
-  /// [separator] - path delimiter (default: '.')
-  ///
-  /// Applies global cycle detection settings to the returned scope.
-  ///
-  /// Example:
-  /// ```dart
-  /// final apiScope = CherryPick.openScope(scopeName: 'network.super.api');
-  /// ```
   @experimental
   static Scope openScope({String scopeName = '', String separator = '.'}) {
     if (scopeName.isEmpty) {
       return openRootScope();
     }
+
     final nameParts = scopeName.split(separator);
     if (nameParts.isEmpty) {
       throw Exception('Can not open sub scope because scopeName can not split');
     }
-    final scope = nameParts.fold(
-      openRootScope(),
-      (Scope previous, String element) => previous.openSubScope(element)
-    );
-    if (_globalCycleDetectionEnabled && !scope.isCycleDetectionEnabled) {
-      scope.enableCycleDetection();
-    }
-    if (_globalCrossScopeCycleDetectionEnabled && !scope.isGlobalCycleDetectionEnabled) {
-      scope.enableGlobalCycleDetection();
-    }
-    return scope;
+
+    return nameParts.fold(
+        openRootScope(),
+        (Scope previousValue, String element) =>
+            previousValue.openSubScope(element));
   }
 
-  /// Closes a named or root scope (if [scopeName] is omitted).
+  /// RU: Метод открывает  дочерний [Scope].
+  /// ENG: The method open the child [Scope].
   ///
-  /// [scopeName] - dot-separated hierarchical path (e.g. 'api.feature'). Empty = root.
-  /// [separator] - path delimiter.
+  /// Дочерний [Scope] открывается с [scopeName]
+  /// Child [Scope] open with [scopeName]
   ///
   /// Example:
-  /// ```dart
-  /// CherryPick.closeScope(scopeName: 'network.super.api');
   /// ```
+  /// final String scopeName = 'firstScope.secondScope';
+  /// final subScope = CherryPick.closeScope(scopeName);
+  /// ```
+  ///
+  ///
   @experimental
   static void closeScope({String scopeName = '', String separator = '.'}) {
     if (scopeName.isEmpty) {
       closeRootScope();
-      return;
     }
+
     final nameParts = scopeName.split(separator);
     if (nameParts.isEmpty) {
-      throw Exception('Can not close sub scope because scopeName can not split');
+      throw Exception(
+          'Can not close sub scope because scopeName can not split');
     }
+
     if (nameParts.length > 1) {
       final lastPart = nameParts.removeLast();
+
       final scope = nameParts.fold(
-        openRootScope(),
-        (Scope previous, String element) => previous.openSubScope(element)
-      );
+          openRootScope(),
+          (Scope previousValue, String element) =>
+              previousValue.openSubScope(element));
       scope.closeSubScope(lastPart);
     } else {
-      openRootScope().closeSubScope(nameParts.first);
+      openRootScope().closeSubScope(nameParts[0]);
     }
   }
-
-  /// Enables cross-scope cycle detection globally.
-  ///
-  /// This will activate detection of cycles that may span across multiple scopes
-  /// in the entire dependency graph. All new and existing [Scope]s will participate.
-  ///
-  /// Strongly recommended for complex solutions with modular architecture.
-  ///
-  /// Example:
-  /// ```dart
-  /// CherryPick.enableGlobalCrossScopeCycleDetection();
-  /// ```
-  static void enableGlobalCrossScopeCycleDetection() {
-    _globalCrossScopeCycleDetectionEnabled = true;
-    if (_rootScope != null) {
-      _rootScope!.enableGlobalCycleDetection();
-    }
-  }
-
-  /// Disables global cross-scope cycle detection.
-  ///
-  /// Existing and new scopes stop checking for global (cross-scope) cycles.
-  /// The internal global cycle detector will be cleared as well.
-  ///
-  /// Example:
-  /// ```dart
-  /// CherryPick.disableGlobalCrossScopeCycleDetection();
-  /// ```
-  static void disableGlobalCrossScopeCycleDetection() {
-    _globalCrossScopeCycleDetectionEnabled = false;
-    if (_rootScope != null) {
-      _rootScope!.disableGlobalCycleDetection();
-    }
-    GlobalCycleDetector.instance.clear();
-  }
-
-  /// Returns `true` if global cross-scope cycle detection is enabled.
-  ///
-  /// Example:
-  /// ```dart
-  /// if (CherryPick.isGlobalCrossScopeCycleDetectionEnabled) {
-  ///   print('Global cross-scope detection is ON');
-  /// }
-  /// ```
-  static bool get isGlobalCrossScopeCycleDetectionEnabled => _globalCrossScopeCycleDetectionEnabled;
-
-  /// Returns the current global dependency resolution chain (across all scopes).
-  ///
-  /// Shows the cross-scope resolution stack, which is useful for advanced diagnostics
-  /// and debugging cycle issues that occur between scopes.
-  ///
-  /// Example:
-  /// ```dart
-  /// print(CherryPick.getGlobalResolutionChain());
-  /// ```
-  static List<String> getGlobalResolutionChain() {
-    return GlobalCycleDetector.instance.globalResolutionChain;
-  }
-
-  /// Clears the global cross-scope cycle detector.
-  ///
-  /// Useful in tests or when resetting application state.
-  ///
-  /// Example:
-  /// ```dart
-  /// CherryPick.clearGlobalCycleDetector();
-  /// ```
-  static void clearGlobalCycleDetector() {
-    GlobalCycleDetector.reset();
-  }
-
-  /// Opens the root scope with both local and global cross-scope cycle detection enabled.
-  ///
-  /// This is the safest way to start IoC for most apps — cycles will be detected
-  /// both inside a single scope and between scopes.
-  ///
-  /// Example:
-  /// ```dart
-  /// final root = CherryPick.openGlobalSafeRootScope();
-  /// ```
-  static Scope openGlobalSafeRootScope() {
-    final scope = openRootScope();
-    scope.enableCycleDetection();
-    scope.enableGlobalCycleDetection();
-    return scope;
-  }
-
-  /// Opens the given named/nested scope and enables both local and cross-scope cycle detection on it.
-  ///
-  /// Recommended when creating feature/module scopes in large apps.
-  ///
-  /// Example:
-  /// ```dart
-  /// final featureScope = CherryPick.openGlobalSafeScope(scopeName: 'featureA.api');
-  /// ```
-  static Scope openGlobalSafeScope({String scopeName = '', String separator = '.'}) {
-    final scope = openScope(scopeName: scopeName, separator: separator);
-    scope.enableCycleDetection();
-    scope.enableGlobalCycleDetection();
-    return scope;
-  }
-}
+}

cherrypick/lib/src/log_format.dart

@@ -1,55 +0,0 @@
-//
-// Copyright 2021 Sergey Penkovsky (sergey.penkovsky@gmail.com)
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//      http://www.apache.org/licenses/LICENSE-2.0
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-
-/// Formats a log message string for CherryPick's logging system.
-///
-/// This function provides a unified structure for framework logs (info, warn, error, debug, etc.),
-/// making it easier to parse and analyze events related to DI operations such as resolving bindings,
-/// scope creation, module installation, etc.
-///
-/// All parameters except [name] and [params] are required.
-///
-/// Example:
-/// ```dart
-/// final msg = formatLogMessage(
-///   type: 'Binding',
-///   name: 'MyService',
-///   params: {'parent': 'AppModule', 'lifecycle': 'singleton'},
-///   description: 'created',
-/// );
-/// // Result: [Binding:MyService] parent=AppModule lifecycle=singleton created
-/// ```
-///
-/// Parameters:
-/// - [type]: The type of the log event subject (e.g., 'Binding', 'Scope', 'Module'). Required.
-/// - [name]: Optional name of the subject (binding/scope/module) to disambiguate multiple instances/objects.
-/// - [params]: Optional map for additional context (e.g., id, parent, lifecycle, named, etc.).
-/// - [description]: Concise description of the event. Required.
-///
-/// Returns a structured string:
-///   [type(:name)] param1=val1 param2=val2 ... description
-String formatLogMessage({
-  required String type,        // Binding, Scope, Module, ...
-  String? name,               // Имя binding/scope/module
-  Map<String, Object?>? params, // Дополнительные параметры (id, parent, named и др.)
-  required String description,   // Краткое описание события
-}) {
-  final label = name != null ? '$type:$name' : type;
-  final paramsStr = (params != null && params.isNotEmpty)
-      ? params.entries.map((e) => '${e.key}=${e.value}').join(' ')
-      : '';
-  return '[$label]'
-         '${paramsStr.isNotEmpty ? ' $paramsStr' : ''}'
-         ' $description';
-}

cherrypick/lib/src/logger.dart

@@ -1,108 +0,0 @@
-//
-// Copyright 2021 Sergey Penkovsky (sergey.penkovsky@gmail.com)
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//      http://www.apache.org/licenses/LICENSE-2.0
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-/// ----------------------------------------------------------------------------
-/// CherryPickLogger — интерфейс для логирования событий DI в CherryPick.
-///
-/// ENGLISH:
-/// Interface for dependency injection (DI) logger in CherryPick. Allows you to
-/// receive information about the internal events and errors in the DI system.
-/// Your implementation can use any logging framework or UI.
-///
-/// RUSSIAN:
-/// Интерфейс логгера для DI-контейнера CherryPick. Позволяет получать
-/// сообщения о работе DI-контейнера, его ошибках и событиях, и
-/// интегрировать любые готовые решения для логирования/сбора ошибок.
-/// ----------------------------------------------------------------------------
-abstract class CherryPickLogger {
-  /// ----------------------------------------------------------------------------
-  /// info — Информационное сообщение.
-  ///
-  /// ENGLISH:
-  /// Logs an informational message about DI operation or state.
-  ///
-  /// RUSSIAN:
-  /// Логирование информационного сообщения о событиях DI.
-  /// ----------------------------------------------------------------------------
-  void info(String message);
-
-  /// ----------------------------------------------------------------------------
-  /// warn — Предупреждение.
-  ///
-  /// ENGLISH:
-  /// Logs a warning related to DI events (for example, possible misconfiguration).
-  ///
-  /// RUSSIAN:
-  /// Логирование предупреждения, связанного с DI (например, возможная ошибка
-  /// конфигурации).
-  /// ----------------------------------------------------------------------------
-  void warn(String message);
-
-  /// ----------------------------------------------------------------------------
-  /// error — Ошибка.
-  ///
-  /// ENGLISH:
-  /// Logs an error message, may include error object and stack trace.
-  ///
-  /// RUSSIAN:
-  /// Логирование ошибки, дополнительно может содержать объект ошибки
-  /// и StackTrace.
-  /// ----------------------------------------------------------------------------
-  void error(String message, [Object? error, StackTrace? stackTrace]);
-}
-
-/// ----------------------------------------------------------------------------
-/// SilentLogger — «тихий» логгер CherryPick. Сообщения игнорируются.
-///
-/// ENGLISH:
-/// SilentLogger ignores all log messages. Used by default in production to
-/// avoid polluting logs with DI events.
-///
-/// RUSSIAN:
-/// SilentLogger игнорирует все события логгирования. Используется по умолчанию
-/// на production, чтобы не засорять логи техническими сообщениями DI.
-/// ----------------------------------------------------------------------------
-class SilentLogger implements CherryPickLogger {
-  const SilentLogger();
-  @override
-  void info(String message) {}
-  @override
-  void warn(String message) {}
-  @override
-  void error(String message, [Object? error, StackTrace? stackTrace]) {}
-}
-
-/// ----------------------------------------------------------------------------
-/// PrintLogger — логгер CherryPick, выводящий все сообщения через print.
-///
-/// ENGLISH:
-/// PrintLogger outputs all log messages to the console using `print()`.
-/// Suitable for debugging, prototyping, or simple console applications.
-///
-/// RUSSIAN:
-/// PrintLogger выводит все сообщения (info, warn, error) в консоль через print.
-/// Удобен для отладки или консольных приложений.
-/// ----------------------------------------------------------------------------
-class PrintLogger implements CherryPickLogger {
-  const PrintLogger();
-  @override
-  void info(String message) => print('[info][CherryPick] $message');
-  @override
-  void warn(String message) => print('[warn][CherryPick] $message');
-  @override
-  void error(String message, [Object? error, StackTrace? stackTrace]) {
-    print('[error][CherryPick] $message');
-    if (error != null) print('  error: $error');
-    if (stackTrace != null) print('  stack: $stackTrace');
-  }
-}

cherrypick/lib/src/scope.dart

@@ -11,23 +11,15 @@
 // limitations under the License.
 //
 import 'dart:collection';
-import 'dart:math';
 
-import 'package:cherrypick/src/cycle_detector.dart';
-import 'package:cherrypick/src/global_cycle_detector.dart';
-import 'package:cherrypick/src/binding_resolver.dart';
+import 'package:cherrypick/src/binding.dart';
 import 'package:cherrypick/src/module.dart';
-import 'package:cherrypick/src/logger.dart';
-import 'package:cherrypick/src/log_format.dart';
 
-class Scope with CycleDetectionMixin, GlobalCycleDetectionMixin {
+Scope openRootScope() => Scope(null);
+
+class Scope {
   final Scope? _parentScope;
 
-  late final CherryPickLogger _logger;
-
-  @override
-  CherryPickLogger get logger => _logger;
-
   /// RU: Метод возвращает родительский [Scope].
   ///
   /// ENG: The method returns the parent [Scope].
@@ -37,33 +29,10 @@ class Scope with CycleDetectionMixin, GlobalCycleDetectionMixin {
 
   final Map<String, Scope> _scopeMap = HashMap();
 
-  Scope(this._parentScope, {required CherryPickLogger logger}) : _logger = logger {
-    setScopeId(_generateScopeId());
-    logger.info(formatLogMessage(
-      type: 'Scope',
-      name: scopeId ?? 'NO_ID',
-      params: {
-        if (_parentScope?.scopeId != null) 'parent': _parentScope!.scopeId,
-      },
-      description: 'scope created',
-    ));
-  }
+  Scope(this._parentScope);
 
   final Set<Module> _modulesList = HashSet();
 
-  // индекс для мгновенного поиска binding’ов
-  final Map<Object, Map<String?, BindingResolver>> _bindingResolvers = {};
-
-
-  /// RU: Генерирует уникальный идентификатор для скоупа.
-  /// ENG: Generates unique identifier for scope.
-  String _generateScopeId() {
-    final random = Random();
-    final timestamp = DateTime.now().millisecondsSinceEpoch;
-    final randomPart = random.nextInt(10000);
-    return 'scope_${timestamp}_$randomPart';
-  }
-
   /// RU: Метод открывает дочерний (дополнительный) [Scope].
   ///
   /// ENG: The method opens child (additional) [Scope].
@@ -71,25 +40,7 @@ class Scope with CycleDetectionMixin, GlobalCycleDetectionMixin {
   /// return [Scope]
   Scope openSubScope(String name) {
     if (!_scopeMap.containsKey(name)) {
-      final childScope = Scope(this, logger: logger); // Наследуем логгер вниз по иерархии
-      // print removed (trace)
-      // Наследуем настройки обнаружения циклических зависимостей
-      if (isCycleDetectionEnabled) {
-        childScope.enableCycleDetection();
-      }
-      if (isGlobalCycleDetectionEnabled) {
-        childScope.enableGlobalCycleDetection();
-      }
-      _scopeMap[name] = childScope;
-      logger.info(formatLogMessage(
-        type: 'SubScope',
-        name: name,
-        params: {
-          'id': childScope.scopeId,
-          if (scopeId != null) 'parent': scopeId,
-        },
-        description: 'subscope created',
-      ));
+      _scopeMap[name] = Scope(this);
     }
     return _scopeMap[name]!;
   }
@@ -100,22 +51,6 @@ class Scope with CycleDetectionMixin, GlobalCycleDetectionMixin {
   ///
   /// return [Scope]
   void closeSubScope(String name) {
-    final childScope = _scopeMap[name];
-    if (childScope != null) {
-      // Очищаем детектор для дочернего скоупа
-      if (childScope.scopeId != null) {
-        GlobalCycleDetector.instance.removeScopeDetector(childScope.scopeId!);
-      }
-      logger.info(formatLogMessage(
-        type: 'SubScope',
-        name: name,
-        params: {
-          'id': childScope.scopeId,
-          if (scopeId != null) 'parent': scopeId,
-        },
-        description: 'subscope closed',
-      ));
-    }
     _scopeMap.remove(name);
   }
 
@@ -127,22 +62,8 @@ class Scope with CycleDetectionMixin, GlobalCycleDetectionMixin {
   Scope installModules(List<Module> modules) {
     _modulesList.addAll(modules);
     for (var module in modules) {
-      logger.info(formatLogMessage(
-        type: 'Module',
-        name: module.runtimeType.toString(),
-        params: {
-          'scope': scopeId,
-        },
-        description: 'module installed',
-      ));
       module.builder(this);
-      // После builder: для всех новых биндингов
-      for (final binding in module.bindingSet) {
-        binding.logger = logger;
-        binding.logAllDeferred();
-      }
     }
-    _rebuildResolversIndex();
     return this;
   }
 
@@ -152,13 +73,9 @@ class Scope with CycleDetectionMixin, GlobalCycleDetectionMixin {
   ///
   /// return [Scope]
   Scope dropModules() {
-    logger.info(formatLogMessage(
-      type: 'Scope',
-      name: scopeId,
-      description: 'modules dropped',
-    ));
+    // [AlexeyYuPopkov](https://github.com/AlexeyYuPopkov) Thank you for the [Removed exception "ConcurrentModificationError"](https://github.com/pese-git/cherrypick/pull/2)
     _modulesList.clear();
-    _rebuildResolversIndex();
+
     return this;
   }
 
@@ -174,113 +91,46 @@ class Scope with CycleDetectionMixin, GlobalCycleDetectionMixin {
   /// return - returns an object of type [T] or [StateError]
   ///
   T resolve<T>({String? named, dynamic params}) {
-    // Используем глобальное отслеживание, если включено
-    if (isGlobalCycleDetectionEnabled) {
-      try {
-        return withGlobalCycleDetection<T>(T, named, () {
-          return _resolveWithLocalDetection<T>(named: named, params: params);
-        });
-      } catch (e, s) {
-        logger.error(
-          formatLogMessage(
-            type: 'Scope',
-            name: scopeId,
-            params: {'resolve': T.toString()},
-            description: 'global cycle detection failed during resolve',
-          ),
-          e,
-          s,
-        );
-        rethrow;
-      }
+    var resolved = tryResolve<T>(named: named, params: params);
+    if (resolved != null) {
+      return resolved;
     } else {
-      try {
-        return _resolveWithLocalDetection<T>(named: named, params: params);
-      } catch (e, s) {
-        logger.error(
-          formatLogMessage(
-            type: 'Scope',
-            name: scopeId,
-            params: {'resolve': T.toString()},
-            description: 'failed to resolve',
-          ),
-          e,
-          s,
-        );
-        rethrow;
-      }
+      throw StateError(
+          'Can\'t resolve dependency `$T`. Maybe you forget register it?');
     }
   }
 
-  /// RU: Разрешение с локальным детектором циклических зависимостей.
-  /// ENG: Resolution with local circular dependency detector.
-  T _resolveWithLocalDetection<T>({String? named, dynamic params}) {
-    return withCycleDetection<T>(T, named, () {
-      var resolved = _tryResolveInternal<T>(named: named, params: params);
-      if (resolved != null) {
-        logger.info(formatLogMessage(
-          type: 'Scope',
-          name: scopeId,
-          params: {
-            'resolve': T.toString(),
-            if (named != null) 'named': named,
-          },
-          description: 'successfully resolved',
-        ));
-        return resolved;
-      } else {
-        logger.error(
-          formatLogMessage(
-            type: 'Scope',
-            name: scopeId,
-            params: {
-              'resolve': T.toString(),
-              if (named != null) 'named': named,
-            },
-            description: 'failed to resolve',
-          ),
-        );
-        throw StateError(
-            'Can\'t resolve dependency `$T`. Maybe you forget register it?');
-      }
-    });
-  }
-
   /// RU: Возвращает найденную зависимость типа [T] или null, если она не может быть найдена.
   /// ENG: Returns found dependency of type [T] or null if it cannot be found.
   ///
   T? tryResolve<T>({String? named, dynamic params}) {
-    // Используем глобальное отслеживание, если включено
-    if (isGlobalCycleDetectionEnabled) {
-      return withGlobalCycleDetection<T?>(T, named, () {
-        return _tryResolveWithLocalDetection<T>(named: named, params: params);
-      });
-    } else {
-      return _tryResolveWithLocalDetection<T>(named: named, params: params);
-    }
-  }
-
-  /// RU: Попытка разрешения с локальным детектором циклических зависимостей.
-  /// ENG: Try resolution with local circular dependency detector.
-  T? _tryResolveWithLocalDetection<T>({String? named, dynamic params}) {
-    if (isCycleDetectionEnabled) {
-      return withCycleDetection<T?>(T, named, () {
-        return _tryResolveInternal<T>(named: named, params: params);
-      });
-    } else {
-      return _tryResolveInternal<T>(named: named, params: params);
-    }
-  }
-
-  /// RU: Внутренний метод для разрешения зависимостей без проверки циклических зависимостей.
-  /// ENG: Internal method for dependency resolution without circular dependency checking.
-  T? _tryResolveInternal<T>({String? named, dynamic params}) {
-    final resolver = _findBindingResolver<T>(named);
-
     // 1 Поиск зависимости по всем модулям текущего скоупа
-    return resolver?.resolveSync(params) ??
-        // 2 Поиск зависимостей в родительском скоупе
-        _parentScope?.tryResolve(named: named, params: params);
+    if (_modulesList.isNotEmpty) {
+      for (var module in _modulesList) {
+        for (var binding in module.bindingSet) {
+          if (binding.key == T &&
+              ((!binding.isNamed && named == null) ||
+                  (binding.isNamed && named == binding.name))) {
+            switch (binding.mode) {
+              case Mode.instance:
+                return binding.instance;
+              case Mode.providerInstance:
+                return binding.provider;
+              case Mode.providerInstanceWithParams:
+                if (params == null) {
+                  throw StateError('Param is null. Maybe you forget pass it');
+                }
+                return binding.providerWithParams(params);
+              default:
+                return null;
+            }
+          }
+        }
+      }
+    }
+
+    // 2 Поиск зависимостей в родительском скоупе
+    return _parentScope?.tryResolve(named: named, params: params);
   }
 
   /// RU: Асинхронно возвращает найденную зависимость, определенную параметром типа [T].
@@ -294,76 +144,40 @@ class Scope with CycleDetectionMixin, GlobalCycleDetectionMixin {
   /// return - returns an object of type [T] or [StateError]
   ///
   Future<T> resolveAsync<T>({String? named, dynamic params}) async {
-    // Используем глобальное отслеживание, если включено
-    if (isGlobalCycleDetectionEnabled) {
-      return withGlobalCycleDetection<Future<T>>(T, named, () async {
-        return await _resolveAsyncWithLocalDetection<T>(named: named, params: params);
-      });
+    var resolved = await tryResolveAsync<T>(named: named, params: params);
+    if (resolved != null) {
+      return resolved;
     } else {
-      return await _resolveAsyncWithLocalDetection<T>(named: named, params: params);
+      throw StateError(
+          'Can\'t resolve async dependency `$T`. Maybe you forget register it?');
     }
   }
 
-  /// RU: Асинхронное разрешение с локальным детектором циклических зависимостей.
-  /// ENG: Async resolution with local circular dependency detector.
-  Future<T> _resolveAsyncWithLocalDetection<T>({String? named, dynamic params}) async {
-    return withCycleDetection<Future<T>>(T, named, () async {
-      var resolved = await _tryResolveAsyncInternal<T>(named: named, params: params);
-      if (resolved != null) {
-        return resolved;
-      } else {
-        throw StateError(
-            'Can\'t resolve async dependency `$T`. Maybe you forget register it?');
-      }
-    });
-  }
-
   Future<T?> tryResolveAsync<T>({String? named, dynamic params}) async {
-    // Используем глобальное отслеживание, если включено
-    if (isGlobalCycleDetectionEnabled) {
-      return withGlobalCycleDetection<Future<T?>>(T, named, () async {
-        return await _tryResolveAsyncWithLocalDetection<T>(named: named, params: params);
-      });
-    } else {
-      return await _tryResolveAsyncWithLocalDetection<T>(named: named, params: params);
-    }
-  }
+    if (_modulesList.isNotEmpty) {
+      for (var module in _modulesList) {
+        for (var binding in module.bindingSet) {
+          if (binding.key == T &&
+              ((!binding.isNamed && named == null) ||
+                  (binding.isNamed && named == binding.name))) {
+            if (binding.instanceAsync != null) {
+              return await binding.instanceAsync;
+            }
 
-  /// RU: Асинхронная попытка разрешения с локальным детектором циклических зависимостей.
-  /// ENG: Async try resolution with local circular dependency detector.
-  Future<T?> _tryResolveAsyncWithLocalDetection<T>({String? named, dynamic params}) async {
-    if (isCycleDetectionEnabled) {
-      return withCycleDetection<Future<T?>>(T, named, () async {
-        return await _tryResolveAsyncInternal<T>(named: named, params: params);
-      });
-    } else {
-      return await _tryResolveAsyncInternal<T>(named: named, params: params);
-    }
-  }
+            if (binding.asyncProvider != null) {
+              return await binding.asyncProvider?.call();
+            }
 
-  /// RU: Внутренний метод для асинхронного разрешения зависимостей без проверки циклических зависимостей.
-  /// ENG: Internal method for async dependency resolution without circular dependency checking.
-  Future<T?> _tryResolveAsyncInternal<T>({String? named, dynamic params}) async {
-    final resolver = _findBindingResolver<T>(named);
-
-    // 1 Поиск зависимости по всем модулям текущего скоупа
-    return resolver?.resolveAsync(params) ??
-        // 2 Поиск зависимостей в родительском скоупе
-        _parentScope?.tryResolveAsync(named: named, params: params);
-  }
-
-  BindingResolver<T>? _findBindingResolver<T>(String? named) =>
-      _bindingResolvers[T]?[named] as BindingResolver<T>?;
-
-  // Индексируем все binding’и после каждого installModules/dropModules
-  void _rebuildResolversIndex() {
-    _bindingResolvers.clear();
-    for (var module in _modulesList) {
-      for (var binding in module.bindingSet) {
-        _bindingResolvers.putIfAbsent(binding.key, () => {});
-        final nameKey = binding.isNamed ? binding.name : null;
-        _bindingResolvers[binding.key]![nameKey] = binding.resolver!;
+            if (binding.asyncProviderWithParams != null) {
+              if (params == null) {
+                throw StateError('Param is null. Maybe you forget pass it');
+              }
+              return await binding.asyncProviderWithParams!(params);
+            }
+          }
+        }
       }
     }
+    return _parentScope?.tryResolveAsync(named: named, params: params);
   }
 }

cherrypick/pubspec.yaml

@@ -1,16 +1,10 @@
 name: cherrypick
 description: Cherrypick is a small dependency injection (DI) library for dart/flutter projects.
-version: 3.0.0-dev.6
+version: 2.2.0-dev.2
 homepage: https://pese-git.github.io/cherrypick-site/
 documentation: https://github.com/pese-git/cherrypick/wiki
 repository: https://github.com/pese-git/cherrypick
 issue_tracker: https://github.com/pese-git/cherrypick/issues
-topics:
-  - di
-  - ioc
-  - dependency-injection
-  - dependency-management
-  - inversion-of-control
 
 environment:
   sdk: ">=3.5.2 <4.0.0"

cherrypick/test/logger_integration_test.dart

@@ -1,73 +0,0 @@
-import 'package:cherrypick/cherrypick.dart';
-import 'package:test/test.dart';
-import 'mock_logger.dart';
-
-class DummyService {}
-
-class DummyModule extends Module {
-  @override
-  void builder(Scope currentScope) {
-    bind<DummyService>().toInstance(DummyService()).withName('test');
-  }
-}
-
-class A {}
-class B {}
-
-class CyclicModule extends Module {
-  @override
-  void builder(Scope cs) {
-    bind<A>().toProvide(() => cs.resolve<B>() as A);
-    bind<B>().toProvide(() => cs.resolve<A>() as B);
-  }
-}
-
-void main() {
-  late MockLogger logger;
-
-  setUp(() {
-    logger = MockLogger();
-  });
-
-  test('Global logger receives Scope and Binding events', () {
-    final scope = Scope(null, logger: logger);
-    scope.installModules([DummyModule()]);
-    final _ = scope.resolve<DummyService>(named: 'test');
-
-    // Новый стиль проверки для formatLogMessage:
-    expect(
-      logger.infos.any((m) => m.startsWith('[Scope:') && m.contains('created')),
-      isTrue,
-    );
-    expect(
-      logger.infos.any((m) => m.startsWith('[Binding:DummyService') && m.contains('created')),
-      isTrue,
-    );
-    expect(
-      logger.infos.any((m) => m.startsWith('[Binding:DummyService') && m.contains('named') && m.contains('name=test')),
-      isTrue,
-    );
-    expect(
-      logger.infos.any((m) => m.startsWith('[Scope:') && m.contains('resolve=DummyService') && m.contains('successfully resolved')),
-      isTrue,
-    );
-  });
-
-  test('CycleDetector logs cycle detection error', () {
-    final scope = Scope(null, logger: logger);
-    // print('[DEBUG] TEST SCOPE logger type=${scope.logger.runtimeType} hash=${scope.logger.hashCode}');
-    scope.enableCycleDetection();
-    scope.installModules([CyclicModule()]);
-    expect(
-      () => scope.resolve<A>(),
-      throwsA(isA<CircularDependencyException>()),
-    );
-    // Дополнительно ищем и среди info на случай если лог от CycleDetector ошибочно не попал в errors
-    final foundInErrors = logger.errors.any((m) =>
-      m.startsWith('[CycleDetector:') && m.contains('cycle detected'));
-    final foundInInfos = logger.infos.any((m) =>
-      m.startsWith('[CycleDetector:') && m.contains('cycle detected'));
-    expect(foundInErrors || foundInInfos, isTrue,
-      reason: 'Ожидаем хотя бы один лог о цикле на уровне error или info; вот все errors: ${logger.errors}\ninfos: ${logger.infos}');
-  });
-}

cherrypick/test/mock_logger.dart

@@ -1,16 +0,0 @@
-import 'package:cherrypick/cherrypick.dart';
-
-class MockLogger implements CherryPickLogger {
-  final List<String> infos = [];
-  final List<String> warns = [];
-  final List<String> errors = [];
-
-  @override
-  void info(String message) => infos.add(message);
-  @override
-  void warn(String message) => warns.add(message);
-  @override
-  void error(String message, [Object? e, StackTrace? s]) =>
-      errors.add(
-          '$message${e != null ? ' $e' : ''}${s != null ? '\n$s' : ''}');
-}

cherrypick/test/src/binding_test.dart

@@ -1,4 +1,4 @@
-import 'package:cherrypick/cherrypick.dart';
+import 'package:cherrypick/src/binding.dart';
 import 'package:test/test.dart';
 
 void main() {
@@ -7,12 +7,12 @@ void main() {
     group('Without name', () {
       test('Returns null by default', () {
         final binding = Binding<int>();
-        expect(binding.resolver, null);
+        expect(binding.instance, null);
       });
 
       test('Sets mode to instance', () {
         final binding = Binding<int>().toInstance(5);
-        expect(binding.resolver, isA<InstanceResolver<int>>());
+        expect(binding.mode, Mode.instance);
       });
 
       test('isSingleton is true', () {
@@ -22,19 +22,19 @@ void main() {
 
       test('Stores value', () {
         final binding = Binding<int>().toInstance(5);
-        expect(binding.resolver?.resolveSync(), 5);
+        expect(binding.instance, 5);
       });
     });
 
     group('With name', () {
       test('Returns null by default', () {
         final binding = Binding<int>().withName('n');
-        expect(binding.resolver, null);
+        expect(binding.instance, null);
       });
 
       test('Sets mode to instance', () {
         final binding = Binding<int>().withName('n').toInstance(5);
-        expect(binding.resolver, isA<InstanceResolver<int>>());
+        expect(binding.mode, Mode.instance);
       });
 
       test('Sets key', () {
@@ -49,7 +49,7 @@ void main() {
 
       test('Stores value', () {
         final binding = Binding<int>().withName('n').toInstance(5);
-        expect(binding.resolver?.resolveSync(), 5);
+        expect(binding.instance, 5);
       });
 
       test('Sets name', () {
@@ -60,39 +60,45 @@ void main() {
 
     test('Multiple toInstance calls change value', () {
       final binding = Binding<int>().toInstance(1).toInstance(2);
-      expect(binding.resolver?.resolveSync(), 2);
+      expect(binding.instance, 2);
     });
   });
 
   // --- Instance binding (asynchronous) ---
   group('Async Instance Binding (toInstanceAsync)', () {
     test('Resolves instanceAsync with expected value', () async {
-      final binding = Binding<int>().toInstance(Future.value(42));
-      expect(await binding.resolveAsync(), 42);
+      final binding = Binding<int>().toInstanceAsync(Future.value(42));
+      expect(await binding.instanceAsync, 42);
+    });
+
+    test('Does not affect instance', () {
+      final binding = Binding<int>().toInstanceAsync(Future.value(5));
+      expect(binding.instance, null);
     });
 
     test('Sets mode to instance', () {
-      final binding = Binding<int>().toInstance(Future.value(5));
-      expect(binding.resolver, isA<InstanceResolver<int>>());
+      final binding = Binding<int>().toInstanceAsync(Future.value(5));
+      expect(binding.mode, Mode.instance);
     });
 
     test('isSingleton is true after toInstanceAsync', () {
-      final binding = Binding<int>().toInstance(Future.value(5));
+      final binding = Binding<int>().toInstanceAsync(Future.value(5));
       expect(binding.isSingleton, isTrue);
     });
 
     test('Composes with withName', () async {
-      final binding =
-          Binding<int>().withName('asyncValue').toInstance(Future.value(7));
+      final binding = Binding<int>()
+          .withName('asyncValue')
+          .toInstanceAsync(Future.value(7));
       expect(binding.isNamed, isTrue);
       expect(binding.name, 'asyncValue');
-      expect(await binding.resolveAsync(), 7);
+      expect(await binding.instanceAsync, 7);
     });
 
     test('Keeps value after multiple awaits', () async {
-      final binding = Binding<int>().toInstance(Future.value(123));
-      final result1 = await binding.resolveAsync();
-      final result2 = await binding.resolveAsync();
+      final binding = Binding<int>().toInstanceAsync(Future.value(123));
+      final result1 = await binding.instanceAsync;
+      final result2 = await binding.instanceAsync;
       expect(result1, equals(result2));
     });
   });
@@ -102,12 +108,12 @@ void main() {
     group('Without name', () {
       test('Returns null by default', () {
         final binding = Binding<int>();
-        expect(binding.resolver, null);
+        expect(binding.provider, null);
       });
 
       test('Sets mode to providerInstance', () {
         final binding = Binding<int>().toProvide(() => 5);
-        expect(binding.resolver, isA<ProviderResolver<int>>());
+        expect(binding.mode, Mode.providerInstance);
       });
 
       test('isSingleton is false by default', () {
@@ -117,19 +123,19 @@ void main() {
 
       test('Returns provided value', () {
         final binding = Binding<int>().toProvide(() => 5);
-        expect(binding.resolveSync(), 5);
+        expect(binding.provider, 5);
       });
     });
 
     group('With name', () {
       test('Returns null by default', () {
         final binding = Binding<int>().withName('n');
-        expect(binding.resolver, null);
+        expect(binding.provider, null);
       });
 
       test('Sets mode to providerInstance', () {
         final binding = Binding<int>().withName('n').toProvide(() => 5);
-        expect(binding.resolver, isA<ProviderResolver<int>>());
+        expect(binding.mode, Mode.providerInstance);
       });
 
       test('Sets key', () {
@@ -144,7 +150,7 @@ void main() {
 
       test('Returns provided value', () {
         final binding = Binding<int>().withName('n').toProvide(() => 5);
-        expect(binding.resolveSync(), 5);
+        expect(binding.provider, 5);
       });
 
       test('Sets name', () {
@@ -157,14 +163,14 @@ void main() {
   // --- Async provider binding ---
   group('Async Provider Binding', () {
     test('Resolves asyncProvider value', () async {
-      final binding = Binding<int>().toProvide(() async => 5);
-      expect(await binding.resolveAsync(), 5);
+      final binding = Binding<int>().toProvideAsync(() async => 5);
+      expect(await binding.asyncProvider?.call(), 5);
     });
 
     test('Resolves asyncProviderWithParams value', () async {
       final binding = Binding<int>()
-          .toProvideWithParams((param) async => 5 + (param as int));
-      expect(await binding.resolveAsync(3), 8);
+          .toProvideAsyncWithParams((param) async => 5 + (param as int));
+      expect(await binding.asyncProviderWithParams?.call(3), 8);
     });
   });
 
@@ -173,7 +179,12 @@ void main() {
     group('Without name', () {
       test('Returns null if no provider set', () {
         final binding = Binding<int>().singleton();
-        expect(binding.resolver, null);
+        expect(binding.provider, null);
+      });
+
+      test('Sets mode to providerInstance', () {
+        final binding = Binding<int>().toProvide(() => 5).singleton();
+        expect(binding.mode, Mode.providerInstance);
       });
 
       test('isSingleton is true', () {
@@ -183,7 +194,7 @@ void main() {
 
       test('Returns singleton value', () {
         final binding = Binding<int>().toProvide(() => 5).singleton();
-        expect(binding.resolveSync(), 5);
+        expect(binding.provider, 5);
       });
 
       test('Returns same value each call and provider only called once', () {
@@ -193,8 +204,8 @@ void main() {
           return counter;
         }).singleton();
 
-        final first = binding.resolveSync();
-        final second = binding.resolveSync();
+        final first = binding.provider;
+        final second = binding.provider;
         expect(first, equals(second));
         expect(counter, 1);
       });
@@ -203,7 +214,13 @@ void main() {
     group('With name', () {
       test('Returns null if no provider set', () {
         final binding = Binding<int>().withName('n').singleton();
-        expect(binding.resolver, null);
+        expect(binding.provider, null);
+      });
+
+      test('Sets mode to providerInstance', () {
+        final binding =
+            Binding<int>().withName('n').toProvide(() => 5).singleton();
+        expect(binding.mode, Mode.providerInstance);
       });
 
       test('Sets key', () {
@@ -221,7 +238,7 @@ void main() {
       test('Returns singleton value', () {
         final binding =
             Binding<int>().withName('n').toProvide(() => 5).singleton();
-        expect(binding.resolveSync(), 5);
+        expect(binding.provider, 5);
       });
 
       test('Sets name', () {
@@ -230,6 +247,12 @@ void main() {
         expect(binding.name, 'n');
       });
     });
+
+    test('Chained withName and singleton preserves mode', () {
+      final binding =
+          Binding<int>().toProvide(() => 3).withName("named").singleton();
+      expect(binding.mode, Mode.providerInstance);
+    });
   });
 
   // --- WithName / Named binding, isNamed, edge-cases ---
@@ -242,7 +265,7 @@ void main() {
 
     test('providerWithParams returns null if not set', () {
       final binding = Binding<int>();
-      expect(binding.resolveSync(123), null);
+      expect(binding.providerWithParams(123), null);
     });
   });
 }

cherrypick/test/src/cross_scope_cycle_test.dart

@@ -1,158 +0,0 @@
-import 'package:cherrypick/cherrypick.dart';
-import 'package:test/test.dart';
-
-void main() {
-  group('Cross-Scope Circular Dependency Detection', () {
-    tearDown(() {
-      CherryPick.closeRootScope();
-      CherryPick.disableGlobalCycleDetection();
-    });
-
-    test('should detect circular dependency across parent-child scopes', () {
-      // Создаем родительский скоуп с сервисом A
-      final parentScope = CherryPick.openSafeRootScope();
-      parentScope.installModules([ParentScopeModule()]);
-
-      // Создаем дочерний скоуп с сервисом B, который зависит от A
-      final childScope = parentScope.openSubScope('child');
-      childScope.enableCycleDetection();
-      childScope.installModules([ChildScopeModule()]);
-
-      // Сервис A в родительском скоупе пытается получить сервис B из дочернего скоупа
-      // Это создает циклическую зависимость между скоупами
-      expect(
-        () => parentScope.resolve<CrossScopeServiceA>(),
-        throwsA(isA<CircularDependencyException>()),
-      );
-    });
-
-    test('should detect circular dependency in complex scope hierarchy', () {
-      final rootScope = CherryPick.openSafeRootScope();
-      final level1Scope = rootScope.openSubScope('level1');
-      final level2Scope = level1Scope.openSubScope('level2');
-      
-      level1Scope.enableCycleDetection();
-      level2Scope.enableCycleDetection();
-
-      // Устанавливаем модули на разных уровнях
-      rootScope.installModules([RootLevelModule()]);
-      level1Scope.installModules([Level1Module()]);
-      level2Scope.installModules([Level2Module()]);
-
-      // Попытка разрешить зависимость, которая создает цикл через все уровни
-      expect(
-        () => level2Scope.resolve<Level2Service>(),
-        throwsA(isA<CircularDependencyException>()),
-      );
-    });
-
-    test('current implementation limitation - may not detect cross-scope cycles', () {
-      // Этот тест демонстрирует ограничение текущей реализации
-      final parentScope = CherryPick.openRootScope();
-      parentScope.enableCycleDetection();
-      
-      final childScope = parentScope.openSubScope('child');
-      // НЕ включаем cycle detection для дочернего скоупа
-      
-      parentScope.installModules([ParentScopeModule()]);
-      childScope.installModules([ChildScopeModule()]);
-
-      // В текущей реализации это может не обнаружить циклическую зависимость
-      // если детекторы работают независимо в каждом скоупе
-      try {
-        // ignore: unused_local_variable
-        final service = parentScope.resolve<CrossScopeServiceA>();
-        // Если мы дошли сюда, значит циклическая зависимость не была обнаружена
-        print('Циклическая зависимость между скоупами не обнаружена');
-      } catch (e) {
-        if (e is CircularDependencyException) {
-          print('Циклическая зависимость обнаружена: ${e.message}');
-        } else {
-          print('Другая ошибка: $e');
-        }
-      }
-    });
-  });
-}
-
-// Тестовые сервисы для демонстрации циклических зависимостей между скоупами
-
-class CrossScopeServiceA {
-  final CrossScopeServiceB serviceB;
-  CrossScopeServiceA(this.serviceB);
-}
-
-class CrossScopeServiceB {
-  final CrossScopeServiceA serviceA;
-  CrossScopeServiceB(this.serviceA);
-}
-
-class ParentScopeModule extends Module {
-  @override
-  void builder(Scope currentScope) {
-    bind<CrossScopeServiceA>().toProvide(() {
-      // Пытаемся получить сервис B из дочернего скоупа
-      final childScope = currentScope.openSubScope('child');
-      return CrossScopeServiceA(childScope.resolve<CrossScopeServiceB>());
-    });
-  }
-}
-
-class ChildScopeModule extends Module {
-  @override
-  void builder(Scope currentScope) {
-    bind<CrossScopeServiceB>().toProvide(() {
-      // Пытаемся получить сервис A из родительского скоупа
-      final parentScope = currentScope.parentScope!;
-      return CrossScopeServiceB(parentScope.resolve<CrossScopeServiceA>());
-    });
-  }
-}
-
-// Сервисы для сложной иерархии скоупов
-
-class RootLevelService {
-  final Level1Service level1Service;
-  RootLevelService(this.level1Service);
-}
-
-class Level1Service {
-  final Level2Service level2Service;
-  Level1Service(this.level2Service);
-}
-
-class Level2Service {
-  final RootLevelService rootService;
-  Level2Service(this.rootService);
-}
-
-class RootLevelModule extends Module {
-  @override
-  void builder(Scope currentScope) {
-    bind<RootLevelService>().toProvide(() {
-      final level1Scope = currentScope.openSubScope('level1');
-      return RootLevelService(level1Scope.resolve<Level1Service>());
-    });
-  }
-}
-
-class Level1Module extends Module {
-  @override
-  void builder(Scope currentScope) {
-    bind<Level1Service>().toProvide(() {
-      final level2Scope = currentScope.openSubScope('level2');
-      return Level1Service(level2Scope.resolve<Level2Service>());
-    });
-  }
-}
-
-class Level2Module extends Module {
-  @override
-  void builder(Scope currentScope) {
-    bind<Level2Service>().toProvide(() {
-      // Идем к корневому скоупу через цепочку родителей
-      var rootScope = currentScope.parentScope?.parentScope;
-      return Level2Service(rootScope!.resolve<RootLevelService>());
-    });
-  }
-}

cherrypick/test/src/cycle_detector_test.dart

@@ -1,220 +0,0 @@
-import 'package:test/test.dart';
-import 'package:cherrypick/cherrypick.dart';
-
-import '../mock_logger.dart';
-
-void main() {
-  late MockLogger logger;
-  setUp(() {
-    logger = MockLogger();
-    CherryPick.setGlobalLogger(logger);
-  });
-  group('CycleDetector', () {
-    late CycleDetector detector;
-
-    setUp(() {
-      detector = CycleDetector(logger: logger);
-    });
-
-    test('should detect simple circular dependency', () {
-      detector.startResolving<String>();
-      
-      expect(
-        () => detector.startResolving<String>(),
-        throwsA(isA<CircularDependencyException>()),
-      );
-    });
-
-    test('should detect circular dependency with named bindings', () {
-      detector.startResolving<String>(named: 'test');
-      
-      expect(
-        () => detector.startResolving<String>(named: 'test'),
-        throwsA(isA<CircularDependencyException>()),
-      );
-    });
-
-    test('should allow different types to be resolved simultaneously', () {
-      detector.startResolving<String>();
-      detector.startResolving<int>();
-      
-      expect(() => detector.finishResolving<int>(), returnsNormally);
-      expect(() => detector.finishResolving<String>(), returnsNormally);
-    });
-
-    test('should detect complex circular dependency chain', () {
-      detector.startResolving<String>();
-      detector.startResolving<int>();
-      detector.startResolving<bool>();
-      
-      expect(
-        () => detector.startResolving<String>(),
-        throwsA(predicate((e) => 
-          e is CircularDependencyException &&
-          e.dependencyChain.contains('String') &&
-          e.dependencyChain.length > 1
-        )),
-      );
-    });
-
-    test('should clear state properly', () {
-      detector.startResolving<String>();
-      detector.clear();
-      
-      expect(() => detector.startResolving<String>(), returnsNormally);
-    });
-
-    test('should track resolution history correctly', () {
-      detector.startResolving<String>();
-      detector.startResolving<int>();
-      
-      expect(detector.currentResolutionChain, contains('String'));
-      expect(detector.currentResolutionChain, contains('int'));
-      expect(detector.currentResolutionChain.length, equals(2));
-      
-      detector.finishResolving<int>();
-      expect(detector.currentResolutionChain.length, equals(1));
-      expect(detector.currentResolutionChain, contains('String'));
-    });
-  });
-
-  group('Scope with Cycle Detection', () {
-    test('should detect circular dependency in real scenario', () {
-      final scope = CherryPick.openRootScope();
-      scope.enableCycleDetection();
-      
-      // Создаем циклическую зависимость: A зависит от B, B зависит от A
-      scope.installModules([
-        CircularModuleA(),
-        CircularModuleB(),
-      ]);
-
-      expect(
-        () => scope.resolve<ServiceA>(),
-        throwsA(isA<CircularDependencyException>()),
-      );
-    });
-
-    test('should work normally without cycle detection enabled', () {
-      final scope = CherryPick.openRootScope();
-      // Не включаем обнаружение циклических зависимостей
-      
-      scope.installModules([
-        SimpleModule(),
-      ]);
-
-      expect(() => scope.resolve<SimpleService>(), returnsNormally);
-      expect(scope.resolve<SimpleService>(), isA<SimpleService>());
-    });
-
-    test('should allow disabling cycle detection', () {
-      final scope = CherryPick.openRootScope();
-      scope.enableCycleDetection();
-      expect(scope.isCycleDetectionEnabled, isTrue);
-      
-      scope.disableCycleDetection();
-      expect(scope.isCycleDetectionEnabled, isFalse);
-    });
-
-    test('should handle named dependencies in cycle detection', () {
-      final scope = CherryPick.openRootScope();
-      scope.enableCycleDetection();
-      
-      scope.installModules([
-        NamedCircularModule(),
-      ]);
-
-      expect(
-        () => scope.resolve<String>(named: 'circular'),
-        throwsA(isA<CircularDependencyException>()),
-      );
-    });
-
-    test('should detect cycles in async resolution', () async {
-      final scope = CherryPick.openRootScope();
-      scope.enableCycleDetection();
-      
-      scope.installModules([
-        AsyncCircularModule(),
-      ]);
-
-      expect(
-        () => scope.resolveAsync<AsyncServiceA>(),
-        throwsA(isA<CircularDependencyException>()),
-      );
-    });
-  });
-}
-
-// Test services and modules for circular dependency testing
-
-class ServiceA {
-  final ServiceB serviceB;
-  ServiceA(this.serviceB);
-}
-
-class ServiceB {
-  final ServiceA serviceA;
-  ServiceB(this.serviceA);
-}
-
-class CircularModuleA extends Module {
-  @override
-  void builder(Scope currentScope) {
-    bind<ServiceA>().toProvide(() => ServiceA(currentScope.resolve<ServiceB>()));
-  }
-}
-
-class CircularModuleB extends Module {
-  @override
-  void builder(Scope currentScope) {
-    bind<ServiceB>().toProvide(() => ServiceB(currentScope.resolve<ServiceA>()));
-  }
-}
-
-class SimpleService {
-  SimpleService();
-}
-
-class SimpleModule extends Module {
-  @override
-  void builder(Scope currentScope) {
-    bind<SimpleService>().toProvide(() => SimpleService());
-  }
-}
-
-class NamedCircularModule extends Module {
-  @override
-  void builder(Scope currentScope) {
-    bind<String>()
-        .withName('circular')
-        .toProvide(() => currentScope.resolve<String>(named: 'circular'));
-  }
-}
-
-class AsyncServiceA {
-  final AsyncServiceB serviceB;
-  AsyncServiceA(this.serviceB);
-}
-
-class AsyncServiceB {
-  final AsyncServiceA serviceA;
-  AsyncServiceB(this.serviceA);
-}
-
-class AsyncCircularModule extends Module {
-  @override
-  void builder(Scope currentScope) {
-    // ignore: deprecated_member_use_from_same_package
-    bind<AsyncServiceA>().toProvideAsync(() async {
-      final serviceB = await currentScope.resolveAsync<AsyncServiceB>();
-      return AsyncServiceA(serviceB);
-    });
-    
-    // ignore: deprecated_member_use_from_same_package
-    bind<AsyncServiceB>().toProvideAsync(() async {
-      final serviceA = await currentScope.resolveAsync<AsyncServiceA>();
-      return AsyncServiceB(serviceA);
-    });
-  }
-}

cherrypick/test/src/global_cycle_detection_test.dart

@@ -1,274 +0,0 @@
-import 'package:cherrypick/cherrypick.dart';
-import 'package:test/test.dart';
-
-void main() {
-  group('Global Cycle Detection', () {
-    setUp(() {
-      // Сбрасываем состояние перед каждым тестом
-      CherryPick.closeRootScope();
-      CherryPick.disableGlobalCycleDetection();
-      CherryPick.disableGlobalCrossScopeCycleDetection();
-      CherryPick.clearGlobalCycleDetector();
-    });
-
-    tearDown(() {
-      // Очищаем состояние после каждого теста
-      CherryPick.closeRootScope();
-      CherryPick.disableGlobalCycleDetection();
-      CherryPick.disableGlobalCrossScopeCycleDetection();
-      CherryPick.clearGlobalCycleDetector();
-    });
-
-    group('Global Cross-Scope Cycle Detection', () {
-      test('should enable global cross-scope cycle detection', () {
-        expect(CherryPick.isGlobalCrossScopeCycleDetectionEnabled, isFalse);
-        
-        CherryPick.enableGlobalCrossScopeCycleDetection();
-        
-        expect(CherryPick.isGlobalCrossScopeCycleDetectionEnabled, isTrue);
-      });
-
-      test('should disable global cross-scope cycle detection', () {
-        CherryPick.enableGlobalCrossScopeCycleDetection();
-        expect(CherryPick.isGlobalCrossScopeCycleDetectionEnabled, isTrue);
-        
-        CherryPick.disableGlobalCrossScopeCycleDetection();
-        
-        expect(CherryPick.isGlobalCrossScopeCycleDetectionEnabled, isFalse);
-      });
-
-      test('should automatically enable global cycle detection for new root scope', () {
-        CherryPick.enableGlobalCrossScopeCycleDetection();
-        
-        final scope = CherryPick.openRootScope();
-        
-        expect(scope.isGlobalCycleDetectionEnabled, isTrue);
-      });
-
-      test('should automatically enable global cycle detection for existing root scope', () {
-        final scope = CherryPick.openRootScope();
-        expect(scope.isGlobalCycleDetectionEnabled, isFalse);
-        
-        CherryPick.enableGlobalCrossScopeCycleDetection();
-        
-        expect(scope.isGlobalCycleDetectionEnabled, isTrue);
-      });
-    });
-
-    group('Global Safe Scope Creation', () {
-      test('should create global safe root scope with both detections enabled', () {
-        final scope = CherryPick.openGlobalSafeRootScope();
-        
-        expect(scope.isCycleDetectionEnabled, isTrue);
-        expect(scope.isGlobalCycleDetectionEnabled, isTrue);
-      });
-
-      test('should create global safe sub-scope with both detections enabled', () {
-        final scope = CherryPick.openGlobalSafeScope(scopeName: 'feature.global');
-        
-        expect(scope.isCycleDetectionEnabled, isTrue);
-        expect(scope.isGlobalCycleDetectionEnabled, isTrue);
-      });
-    });
-
-    group('Cross-Scope Circular Dependency Detection', () {
-      test('should detect circular dependency across parent-child scopes', () {
-        final parentScope = CherryPick.openGlobalSafeRootScope();
-        parentScope.installModules([GlobalParentModule()]);
-
-        final childScope = parentScope.openSubScope('child');
-        childScope.installModules([GlobalChildModule()]);
-
-        expect(
-          () => parentScope.resolve<GlobalServiceA>(),
-          throwsA(isA<CircularDependencyException>()),
-        );
-      });
-
-      test('should detect circular dependency in complex scope hierarchy', () {
-        final rootScope = CherryPick.openGlobalSafeRootScope();
-        final level1Scope = rootScope.openSubScope('level1');
-        final level2Scope = level1Scope.openSubScope('level2');
-
-        // Устанавливаем модули на разных уровнях
-        rootScope.installModules([GlobalRootModule()]);
-        level1Scope.installModules([GlobalLevel1Module()]);
-        level2Scope.installModules([GlobalLevel2Module()]);
-
-        expect(
-          () => level2Scope.resolve<GlobalLevel2Service>(),
-          throwsA(isA<CircularDependencyException>()),
-        );
-      });
-
-      test('should provide detailed global resolution chain in exception', () {
-        final scope = CherryPick.openGlobalSafeRootScope();
-        scope.installModules([GlobalParentModule()]);
-        
-        final childScope = scope.openSubScope('child');
-        childScope.installModules([GlobalChildModule()]);
-
-        try {
-          scope.resolve<GlobalServiceA>();
-          fail('Expected CircularDependencyException');
-        } catch (e) {
-          expect(e, isA<CircularDependencyException>());
-          final circularError = e as CircularDependencyException;
-          
-          // Проверяем, что цепочка содержит информацию о скоупах
-          expect(circularError.dependencyChain, isNotEmpty);
-          expect(circularError.dependencyChain.length, greaterThan(1));
-          
-          // Цепочка должна содержать оба сервиса
-          final chainString = circularError.dependencyChain.join(' -> ');
-          expect(chainString, contains('GlobalServiceA'));
-          expect(chainString, contains('GlobalServiceB'));
-        }
-      });
-
-      test('should track global resolution chain', () {
-        final scope = CherryPick.openGlobalSafeRootScope();
-        scope.installModules([SimpleGlobalModule()]);
-
-        // До разрешения цепочка должна быть пустой
-        expect(CherryPick.getGlobalResolutionChain(), isEmpty);
-
-        final service = scope.resolve<SimpleGlobalService>();
-        expect(service, isA<SimpleGlobalService>());
-
-        // После разрешения цепочка должна быть очищена
-        expect(CherryPick.getGlobalResolutionChain(), isEmpty);
-      });
-
-      test('should clear global cycle detector state', () {
-        CherryPick.enableGlobalCrossScopeCycleDetection();
-        // ignore: unused_local_variable
-        final scope = CherryPick.openGlobalSafeRootScope();
-        
-        expect(CherryPick.getGlobalResolutionChain(), isEmpty);
-        
-        CherryPick.clearGlobalCycleDetector();
-        
-        // После очистки детектор должен быть сброшен
-        expect(CherryPick.getGlobalResolutionChain(), isEmpty);
-      });
-    });
-
-    group('Inheritance of Global Settings', () {
-      test('should inherit global cycle detection in child scopes', () {
-        CherryPick.enableGlobalCrossScopeCycleDetection();
-        
-        final parentScope = CherryPick.openRootScope();
-        final childScope = parentScope.openSubScope('child');
-        
-        expect(parentScope.isGlobalCycleDetectionEnabled, isTrue);
-        expect(childScope.isGlobalCycleDetectionEnabled, isTrue);
-      });
-
-      test('should inherit both local and global cycle detection', () {
-        CherryPick.enableGlobalCycleDetection();
-        CherryPick.enableGlobalCrossScopeCycleDetection();
-        
-        final scope = CherryPick.openScope(scopeName: 'feature.test');
-        
-        expect(scope.isCycleDetectionEnabled, isTrue);
-        expect(scope.isGlobalCycleDetectionEnabled, isTrue);
-      });
-    });
-  });
-}
-
-// Test services for global circular dependency testing
-
-class GlobalServiceA {
-  final GlobalServiceB serviceB;
-  GlobalServiceA(this.serviceB);
-}
-
-class GlobalServiceB {
-  final GlobalServiceA serviceA;
-  GlobalServiceB(this.serviceA);
-}
-
-class GlobalParentModule extends Module {
-  @override
-  void builder(Scope currentScope) {
-    bind<GlobalServiceA>().toProvide(() {
-      // Получаем сервис B из дочернего скоупа
-      final childScope = currentScope.openSubScope('child');
-      return GlobalServiceA(childScope.resolve<GlobalServiceB>());
-    });
-  }
-}
-
-class GlobalChildModule extends Module {
-  @override
-  void builder(Scope currentScope) {
-    bind<GlobalServiceB>().toProvide(() {
-      // Получаем сервис A из родительского скоупа
-      final parentScope = currentScope.parentScope!;
-      return GlobalServiceB(parentScope.resolve<GlobalServiceA>());
-    });
-  }
-}
-
-// Services for complex hierarchy testing
-
-class GlobalRootService {
-  final GlobalLevel1Service level1Service;
-  GlobalRootService(this.level1Service);
-}
-
-class GlobalLevel1Service {
-  final GlobalLevel2Service level2Service;
-  GlobalLevel1Service(this.level2Service);
-}
-
-class GlobalLevel2Service {
-  final GlobalRootService rootService;
-  GlobalLevel2Service(this.rootService);
-}
-
-class GlobalRootModule extends Module {
-  @override
-  void builder(Scope currentScope) {
-    bind<GlobalRootService>().toProvide(() {
-      final level1Scope = currentScope.openSubScope('level1');
-      return GlobalRootService(level1Scope.resolve<GlobalLevel1Service>());
-    });
-  }
-}
-
-class GlobalLevel1Module extends Module {
-  @override
-  void builder(Scope currentScope) {
-    bind<GlobalLevel1Service>().toProvide(() {
-      final level2Scope = currentScope.openSubScope('level2');
-      return GlobalLevel1Service(level2Scope.resolve<GlobalLevel2Service>());
-    });
-  }
-}
-
-class GlobalLevel2Module extends Module {
-  @override
-  void builder(Scope currentScope) {
-    bind<GlobalLevel2Service>().toProvide(() {
-      // Идем к корневому скоупу через цепочку родителей
-      var rootScope = currentScope.parentScope?.parentScope;
-      return GlobalLevel2Service(rootScope!.resolve<GlobalRootService>());
-    });
-  }
-}
-
-// Simple service for non-circular testing
-
-class SimpleGlobalService {
-  SimpleGlobalService();
-}
-
-class SimpleGlobalModule extends Module {
-  @override
-  void builder(Scope currentScope) {
-    bind<SimpleGlobalService>().toProvide(() => SimpleGlobalService());
-  }
-}

cherrypick/test/src/helper_cycle_detection_test.dart

@@ -1,246 +0,0 @@
-import 'package:cherrypick/cherrypick.dart';
-import 'package:test/test.dart';
-import '../mock_logger.dart';
-
-void main() {
-  late MockLogger logger;
-  setUp(() {
-    logger = MockLogger();
-    CherryPick.setGlobalLogger(logger);
-  });
-  group('CherryPick Cycle Detection Helper Methods', () {
-    setUp(() {
-      // Сбрасываем состояние перед каждым тестом
-      CherryPick.closeRootScope();
-      CherryPick.disableGlobalCycleDetection();
-    });
-
-    tearDown(() {
-      // Очищаем состояние после каждого теста
-      CherryPick.closeRootScope();
-      CherryPick.disableGlobalCycleDetection();
-    });
-
-    group('Global Cycle Detection', () {
-      test('should enable global cycle detection', () {
-        expect(CherryPick.isGlobalCycleDetectionEnabled, isFalse);
-        
-        CherryPick.enableGlobalCycleDetection();
-        
-        expect(CherryPick.isGlobalCycleDetectionEnabled, isTrue);
-      });
-
-      test('should disable global cycle detection', () {
-        CherryPick.enableGlobalCycleDetection();
-        expect(CherryPick.isGlobalCycleDetectionEnabled, isTrue);
-        
-        CherryPick.disableGlobalCycleDetection();
-        
-        expect(CherryPick.isGlobalCycleDetectionEnabled, isFalse);
-      });
-
-      test('should automatically enable cycle detection for new root scope when global is enabled', () {
-        CherryPick.enableGlobalCycleDetection();
-        
-        final scope = CherryPick.openRootScope();
-        
-        expect(scope.isCycleDetectionEnabled, isTrue);
-      });
-
-      test('should automatically enable cycle detection for existing root scope when global is enabled', () {
-        final scope = CherryPick.openRootScope();
-        expect(scope.isCycleDetectionEnabled, isFalse);
-        
-        CherryPick.enableGlobalCycleDetection();
-        
-        expect(scope.isCycleDetectionEnabled, isTrue);
-      });
-
-      test('should automatically disable cycle detection for existing root scope when global is disabled', () {
-        CherryPick.enableGlobalCycleDetection();
-        final scope = CherryPick.openRootScope();
-        expect(scope.isCycleDetectionEnabled, isTrue);
-        
-        CherryPick.disableGlobalCycleDetection();
-        
-        expect(scope.isCycleDetectionEnabled, isFalse);
-      });
-
-      test('should apply global setting to sub-scopes', () {
-        CherryPick.enableGlobalCycleDetection();
-        
-        final scope = CherryPick.openScope(scopeName: 'test.subscope');
-        
-        expect(scope.isCycleDetectionEnabled, isTrue);
-      });
-    });
-
-    group('Scope-specific Cycle Detection', () {
-      test('should enable cycle detection for root scope', () {
-        final scope = CherryPick.openRootScope();
-        expect(scope.isCycleDetectionEnabled, isFalse);
-        
-        CherryPick.enableCycleDetectionForScope();
-        
-        expect(CherryPick.isCycleDetectionEnabledForScope(), isTrue);
-        expect(scope.isCycleDetectionEnabled, isTrue);
-      });
-
-      test('should disable cycle detection for root scope', () {
-        CherryPick.enableCycleDetectionForScope();
-        expect(CherryPick.isCycleDetectionEnabledForScope(), isTrue);
-        
-        CherryPick.disableCycleDetectionForScope();
-        
-        expect(CherryPick.isCycleDetectionEnabledForScope(), isFalse);
-      });
-
-      test('should enable cycle detection for specific scope', () {
-        final scopeName = 'feature.auth';
-        CherryPick.openScope(scopeName: scopeName);
-        
-        expect(CherryPick.isCycleDetectionEnabledForScope(scopeName: scopeName), isFalse);
-        
-        CherryPick.enableCycleDetectionForScope(scopeName: scopeName);
-        
-        expect(CherryPick.isCycleDetectionEnabledForScope(scopeName: scopeName), isTrue);
-      });
-
-      test('should disable cycle detection for specific scope', () {
-        final scopeName = 'feature.auth';
-        CherryPick.enableCycleDetectionForScope(scopeName: scopeName);
-        expect(CherryPick.isCycleDetectionEnabledForScope(scopeName: scopeName), isTrue);
-        
-        CherryPick.disableCycleDetectionForScope(scopeName: scopeName);
-        
-        expect(CherryPick.isCycleDetectionEnabledForScope(scopeName: scopeName), isFalse);
-      });
-    });
-
-    group('Safe Scope Creation', () {
-      test('should create safe root scope with cycle detection enabled', () {
-        final scope = CherryPick.openSafeRootScope();
-        
-        expect(scope.isCycleDetectionEnabled, isTrue);
-      });
-
-      test('should create safe sub-scope with cycle detection enabled', () {
-        final scope = CherryPick.openSafeScope(scopeName: 'feature.safe');
-        
-        expect(scope.isCycleDetectionEnabled, isTrue);
-      });
-
-      test('safe scope should work independently of global setting', () {
-        // Глобальная настройка отключена
-        expect(CherryPick.isGlobalCycleDetectionEnabled, isFalse);
-        
-        final scope = CherryPick.openSafeScope(scopeName: 'feature.independent');
-        
-        expect(scope.isCycleDetectionEnabled, isTrue);
-      });
-    });
-
-    group('Resolution Chain Tracking', () {
-      test('should return empty resolution chain for scope without cycle detection', () {
-        CherryPick.openRootScope();
-        
-        final chain = CherryPick.getCurrentResolutionChain();
-        
-        expect(chain, isEmpty);
-      });
-
-      test('should return empty resolution chain for scope with cycle detection but no active resolution', () {
-        CherryPick.enableCycleDetectionForScope();
-        
-        final chain = CherryPick.getCurrentResolutionChain();
-        
-        expect(chain, isEmpty);
-      });
-
-      test('should track resolution chain for specific scope', () {
-        final scopeName = 'feature.tracking';
-        CherryPick.enableCycleDetectionForScope(scopeName: scopeName);
-        
-        final chain = CherryPick.getCurrentResolutionChain(scopeName: scopeName);
-        
-        expect(chain, isEmpty); // Пустая, так как нет активного разрешения
-      });
-    });
-
-    group('Integration with Circular Dependencies', () {
-      test('should detect circular dependency with global cycle detection enabled', () {
-        CherryPick.enableGlobalCycleDetection();
-        
-        final scope = CherryPick.openRootScope();
-        scope.installModules([CircularTestModule()]);
-        
-        expect(
-          () => scope.resolve<CircularServiceA>(),
-          throwsA(isA<CircularDependencyException>()),
-        );
-      });
-
-      test('should detect circular dependency with safe scope', () {
-        final scope = CherryPick.openSafeRootScope();
-        scope.installModules([CircularTestModule()]);
-        
-        expect(
-          () => scope.resolve<CircularServiceA>(),
-          throwsA(isA<CircularDependencyException>()),
-        );
-      });
-
-      test('should not detect circular dependency when cycle detection is disabled', () {
-        final scope = CherryPick.openRootScope();
-        scope.installModules([CircularTestModule()]);
-        
-        // Без обнаружения циклических зависимостей не будет выброшено CircularDependencyException,
-        // но может произойти StackOverflowError при попытке создания объекта
-        expect(() => scope.resolve<CircularServiceA>(), 
-               throwsA(isA<StackOverflowError>()));
-      });
-    });
-
-    group('Scope Name Handling', () {
-      test('should handle empty scope name as root scope', () {
-        CherryPick.enableCycleDetectionForScope(scopeName: '');
-        
-        expect(CherryPick.isCycleDetectionEnabledForScope(scopeName: ''), isTrue);
-        expect(CherryPick.isCycleDetectionEnabledForScope(), isTrue);
-      });
-
-      test('should handle complex scope names', () {
-        final complexScopeName = 'app.feature.auth.login';
-        CherryPick.enableCycleDetectionForScope(scopeName: complexScopeName);
-        
-        expect(CherryPick.isCycleDetectionEnabledForScope(scopeName: complexScopeName), isTrue);
-      });
-
-      test('should handle custom separator', () {
-        final scopeName = 'app/feature/auth';
-        CherryPick.enableCycleDetectionForScope(scopeName: scopeName, separator: '/');
-        
-        expect(CherryPick.isCycleDetectionEnabledForScope(scopeName: scopeName, separator: '/'), isTrue);
-      });
-    });
-  });
-}
-
-// Test services for circular dependency testing
-class CircularServiceA {
-  final CircularServiceB serviceB;
-  CircularServiceA(this.serviceB);
-}
-
-class CircularServiceB {
-  final CircularServiceA serviceA;
-  CircularServiceB(this.serviceA);
-}
-
-class CircularTestModule extends Module {
-  @override
-  void builder(Scope currentScope) {
-    bind<CircularServiceA>().toProvide(() => CircularServiceA(currentScope.resolve<CircularServiceB>()));
-    bind<CircularServiceB>().toProvide(() => CircularServiceB(currentScope.resolve<CircularServiceA>()));
-  }
-}

cherrypick/test/src/scope_test.dart

@@ -1,51 +1,49 @@
-import 'package:cherrypick/cherrypick.dart';
+import 'package:cherrypick/src/module.dart';
+import 'package:cherrypick/src/scope.dart';
 import 'package:test/test.dart';
-import '../mock_logger.dart';
 
 void main() {
   // --------------------------------------------------------------------------
   group('Scope & Subscope Management', () {
     test('Scope has no parent if constructed with null', () {
-      final logger = MockLogger();
-      final scope = Scope(null, logger: logger);
+      final scope = Scope(null);
       expect(scope.parentScope, null);
     });
 
     test('Can open and retrieve the same subScope by key', () {
-      final logger = MockLogger();
-      final scope = Scope(null, logger: logger);
-      expect(Scope(scope, logger: logger), isNotNull); // эквивалент
+      final scope = Scope(null);
+      final subScope = scope.openSubScope('subScope');
+      expect(scope.openSubScope('subScope'), subScope);
     });
 
     test('closeSubScope removes subscope so next openSubScope returns new', () {
-      final logger = MockLogger();
-      final scope = Scope(null, logger: logger);
-      expect(Scope(scope, logger: logger), isNotNull); // эквивалент
-      // Нет необходимости тестировать open/closeSubScope в этом юните
+      final scope = Scope(null);
+      final subScope = scope.openSubScope("child");
+      expect(scope.openSubScope("child"), same(subScope));
+      scope.closeSubScope("child");
+      final newSubScope = scope.openSubScope("child");
+      expect(newSubScope, isNot(same(subScope)));
     });
   });
 
   // --------------------------------------------------------------------------
   group('Dependency Resolution (standard)', () {
     test("Throws StateError if value can't be resolved", () {
-      final logger = MockLogger();
-      final scope = Scope(null, logger: logger);
+      final scope = Scope(null);
       expect(() => scope.resolve<String>(), throwsA(isA<StateError>()));
     });
 
     test('Resolves value after adding a dependency', () {
-      final logger = MockLogger();
       final expectedValue = 'test string';
-      final scope = Scope(null, logger: logger)
+      final scope = Scope(null)
           .installModules([TestModule<String>(value: expectedValue)]);
       expect(scope.resolve<String>(), expectedValue);
     });
 
     test('Returns a value from parent scope', () {
-      final logger = MockLogger();
       final expectedValue = 5;
-      final parentScope = Scope(null, logger: logger);
-      final scope = Scope(parentScope, logger: logger);
+      final parentScope = Scope(null);
+      final scope = Scope(parentScope);
 
       parentScope.installModules([TestModule<int>(value: expectedValue)]);
 
@@ -53,29 +51,26 @@ void main() {
     });
 
     test('Returns several values from parent container', () {
-      final logger = MockLogger();
       final expectedIntValue = 5;
       final expectedStringValue = 'Hello world';
-      final parentScope = Scope(null, logger: logger).installModules([
+      final parentScope = Scope(null).installModules([
         TestModule<int>(value: expectedIntValue),
         TestModule<String>(value: expectedStringValue)
       ]);
-      final scope = Scope(parentScope, logger: logger);
+      final scope = Scope(parentScope);
 
       expect(scope.resolve<int>(), expectedIntValue);
       expect(scope.resolve<String>(), expectedStringValue);
     });
 
     test("Throws StateError if parent hasn't value too", () {
-      final logger = MockLogger();
-      final parentScope = Scope(null, logger: logger);
-      final scope = Scope(parentScope, logger: logger);
+      final parentScope = Scope(null);
+      final scope = Scope(parentScope);
       expect(() => scope.resolve<int>(), throwsA(isA<StateError>()));
     });
 
     test("After dropModules resolves fail", () {
-      final logger = MockLogger();
-      final scope = Scope(null, logger: logger)..installModules([TestModule<int>(value: 5)]);
+      final scope = Scope(null)..installModules([TestModule<int>(value: 5)]);
       expect(scope.resolve<int>(), 5);
       scope.dropModules();
       expect(() => scope.resolve<int>(), throwsA(isA<StateError>()));
@@ -85,8 +80,7 @@ void main() {
   // --------------------------------------------------------------------------
   group('Named Dependencies', () {
     test('Resolve named binding', () {
-      final logger = MockLogger();
-      final scope = Scope(null, logger: logger)
+      final scope = Scope(null)
         ..installModules([
           TestModule<String>(value: "first"),
           TestModule<String>(value: "second", name: "special")
@@ -96,8 +90,7 @@ void main() {
     });
 
     test('Named binding does not clash with unnamed', () {
-      final logger = MockLogger();
-      final scope = Scope(null, logger: logger)
+      final scope = Scope(null)
         ..installModules([
           TestModule<String>(value: "foo", name: "bar"),
         ]);
@@ -106,8 +99,7 @@ void main() {
     });
 
     test("tryResolve returns null for missing named", () {
-      final logger = MockLogger();
-      final scope = Scope(null, logger: logger)
+      final scope = Scope(null)
         ..installModules([
           TestModule<String>(value: "foo"),
         ]);
@@ -118,8 +110,7 @@ void main() {
   // --------------------------------------------------------------------------
   group('Provider with parameters', () {
     test('Resolve dependency using providerWithParams', () {
-      final logger = MockLogger();
-      final scope = Scope(null, logger: logger)
+      final scope = Scope(null)
         ..installModules([
           _InlineModule((m, s) {
             m.bind<int>().toProvideWithParams((param) => (param as int) * 2);
@@ -133,33 +124,30 @@ void main() {
   // --------------------------------------------------------------------------
   group('Async Resolution', () {
     test('Resolve async instance', () async {
-      final logger = MockLogger();
-      final scope = Scope(null, logger: logger)
+      final scope = Scope(null)
         ..installModules([
           _InlineModule((m, s) {
-            m.bind<String>().toInstance(Future.value('async value'));
+            m.bind<String>().toInstanceAsync(Future.value('async value'));
           }),
         ]);
       expect(await scope.resolveAsync<String>(), "async value");
     });
 
     test('Resolve async provider', () async {
-      final logger = MockLogger();
-      final scope = Scope(null, logger: logger)
+      final scope = Scope(null)
         ..installModules([
           _InlineModule((m, s) {
-            m.bind<int>().toProvide(() async => 7);
+            m.bind<int>().toProvideAsync(() async => 7);
           }),
         ]);
       expect(await scope.resolveAsync<int>(), 7);
     });
 
     test('Resolve async provider with param', () async {
-      final logger = MockLogger();
-      final scope = Scope(null, logger: logger)
+      final scope = Scope(null)
         ..installModules([
           _InlineModule((m, s) {
-            m.bind<int>().toProvideWithParams((x) async => (x as int) * 3);
+            m.bind<int>().toProvideAsyncWithParams((x) async => (x as int) * 3);
           }),
         ]);
       expect(await scope.resolveAsync<int>(params: 2), 6);
@@ -167,8 +155,7 @@ void main() {
     });
 
     test('tryResolveAsync returns null for missing', () async {
-      final logger = MockLogger();
-      final scope = Scope(null, logger: logger);
+      final scope = Scope(null);
       final result = await scope.tryResolveAsync<String>();
       expect(result, isNull);
     });
@@ -177,8 +164,7 @@ void main() {
   // --------------------------------------------------------------------------
   group('Optional resolution and error handling', () {
     test("tryResolve returns null for missing dependency", () {
-      final logger = MockLogger();
-      final scope = Scope(null, logger: logger);
+      final scope = Scope(null);
       expect(scope.tryResolve<int>(), isNull);
     });
 

cherrypick_annotations/.gitignore

@@ -23,6 +23,4 @@ doc/api/
 # FVM Version Cache
 .fvm/
 
-melos_cherrypick_annotations.iml
-
-pubspec_overrides.yaml
+melos_cherrypick_annotations.iml

cherrypick_annotations/CHANGELOG.md

@@ -1,7 +1,3 @@
-## 1.1.0
-
- - Graduate package to a stable release. See pre-releases prior to this version for changelog entries.
-
 ## 1.1.0-dev.1
 
  - **FEAT**: implement InjectGenerator.

cherrypick_annotations/pubspec.yaml

@@ -1,16 +1,10 @@
 name: cherrypick_annotations
 description: |
   Set of annotations for CherryPick dependency injection library. Enables code generation and declarative DI for Dart & Flutter projects.
-version: 1.1.0
+version: 1.1.0-dev.1
 documentation: https://github.com/pese-git/cherrypick/wiki
 repository: https://github.com/pese-git/cherrypick/cherrypick_annotations
 issue_tracker: https://github.com/pese-git/cherrypick/issues
-topics:
-  - di
-  - ioc
-  - dependency-injection
-  - dependency-management
-  - inversion-of-control
 
 environment:
   sdk: ">=3.5.2 <4.0.0"

cherrypick_cli/LICENSE

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

cherrypick_cli/README.md

@@ -0,0 +1,93 @@
+# CherryPick CLI
+
+A command-line tool for managing and generating `build.yaml` configuration for the [CherryPick](https://github.com/pese-git/cherrypick) dependency injection ecosystem for Dart & Flutter.
+
+---
+
+## Features
+- 📦 Quickly add or update CherryPick generator sections in your project's `build.yaml`.
+- 🛡️ Safely preserves unrelated configs and packages.
+- 📝 Always outputs a human-friendly, formatted YAML file.
+- 🏷️ Supports custom output directories and custom build.yaml file paths.
+
+---
+
+## Getting Started
+
+1. **Navigate to the CLI package directory:**
+   ```bash
+   cd cherrypick_cli
+   ```
+2. **Get dependencies:**
+   ```bash
+   dart pub get
+   ```
+3. **Run the CLI:**
+   ```bash
+   dart run cherrypick_cli init --output_dir=lib/generated
+   ```
+
+---
+
+## Usage
+
+### Show help
+```bash
+dart run cherrypick_cli --help
+```
+
+### Add or update CherryPick sections in build.yaml
+```bash
+dart run cherrypick_cli init --output_dir=lib/generated
+```
+
+#### Options:
+- `--output_dir`, `-o`  — Directory for generated code (default: `lib/generated`)
+- `--build_yaml`, `-f`  — Path to build.yaml file (default: `build.yaml`)
+
+#### Example with custom build.yaml
+```bash
+dart run cherrypick_cli init --output_dir=custom/dir --build_yaml=custom_build.yaml
+```
+
+---
+
+## What does it do?
+- Adds or updates the following sections in your `build.yaml` (or custom file):
+  - `cherrypick_generator|inject_generator`
+  - `cherrypick_generator|module_generator`
+- Ensures all YAML is pretty-printed and readable.
+- Leaves unrelated configs untouched.
+
+---
+
+## Example Output
+```yaml
+targets:
+  $default:
+    builders:
+      cherrypick_generator|inject_generator:
+        options:
+          build_extensions:
+            ^lib/{{}}.dart:
+              - lib/generated/{{}}.inject.cherrypick.g.dart
+          output_dir: lib/generated
+        generate_for:
+          - lib/**.dart
+      cherrypick_generator|module_generator:
+        options:
+          build_extensions:
+            ^lib/di/{{}}.dart:
+              - lib/generated/di/{{}}.module.cherrypick.g.dart
+          output_dir: lib/generated
+        generate_for:
+          - lib/**.dart
+```
+
+---
+
+## Contributing
+Pull requests and issues are welcome! See the [main CherryPick repo](https://github.com/pese-git/cherrypick) for more.
+
+## License
+See [LICENSE](LICENSE).

cherrypick_cli/bin/cherrypick_cli.dart

@@ -0,0 +1,8 @@
+import 'package:args/command_runner.dart';
+import 'package:cherrypick_cli/src/commands/init_command.dart';
+
+void main(List<String> args) {
+  final runner = CommandRunner('cherrypick_cli', 'CherryPick CLI')
+    ..addCommand(InitCommand());
+  runner.run(args);
+}

cherrypick_cli/lib/src/commands/init_command.dart

@@ -0,0 +1,34 @@
+import 'package:args/command_runner.dart';
+import '../utils/build_yaml_updater.dart';
+
+class InitCommand extends Command {
+  @override
+  final name = 'init';
+  @override
+  final description = 'Adds or updates cherrypick_generator sections in build.yaml, preserving other packages.';
+
+  InitCommand() {
+    argParser.addOption(
+      'output_dir',
+      abbr: 'o',
+      defaultsTo: 'lib/generated',
+      help: 'Directory for generated code.',
+    );
+    argParser.addOption(
+      'build_yaml',
+      abbr: 'f',
+      defaultsTo: 'build.yaml',
+      help: 'Path to build.yaml file.',
+    );
+  }
+
+  @override
+  void run() {
+    final outputDir = argResults?['output_dir'] as String? ?? 'lib/generated';
+    final buildYaml = argResults?['build_yaml'] as String? ?? 'build.yaml';
+    updateCherrypickBuildYaml(
+      buildYamlPath: buildYaml,
+      outputDir: outputDir,
+    );
+  }
+}

cherrypick_cli/lib/src/utils/build_yaml_updater.dart

@@ -0,0 +1,76 @@
+import 'dart:io';
+import 'package:yaml/yaml.dart';
+import 'package:json2yaml/json2yaml.dart';
+
+void updateCherrypickBuildYaml({
+  String buildYamlPath = 'build.yaml',
+  String outputDir = 'lib/generated',
+}) {
+  final file = File(buildYamlPath);
+  final exists = file.existsSync();
+  Map config = {};
+  if (exists) {
+    final content = file.readAsStringSync();
+    final loaded = loadYaml(content);
+    config = _deepYamlToMap(loaded);
+  }
+
+  // Гарантируем вложенность
+  config['targets'] ??= {};
+  final targets = config['targets'] as Map;
+  targets['\$default'] ??= {};
+  final def = targets['\$default'] as Map;
+  def['builders'] ??= {};
+  final builders = def['builders'] as Map;
+
+  builders['cherrypick_generator|inject_generator'] = {
+    'options': {
+      'build_extensions': {
+        '^lib/{{}}.dart': ['${outputDir}/{{}}.inject.cherrypick.g.dart']
+      },
+      'output_dir': outputDir
+    },
+    'generate_for': ['lib/**.dart']
+  };
+
+  builders['cherrypick_generator|module_generator'] = {
+    'options': {
+      'build_extensions': {
+        '^lib/di/{{}}.dart': ['${outputDir}/di/{{}}.module.cherrypick.g.dart']
+      },
+      'output_dir': outputDir
+    },
+    'generate_for': ['lib/**.dart']
+  };
+
+  final yamlString = json2yaml(_stringifyKeys(config), yamlStyle: YamlStyle.pubspecYaml);
+  file.writeAsStringSync(yamlString);
+  print('✅ build.yaml has been successfully updated and formatted (cherrypick sections added/updated).');
+}
+
+dynamic _stringifyKeys(dynamic node) {
+  if (node is Map) {
+    return Map.fromEntries(
+      node.entries.map(
+        (e) => MapEntry(e.key.toString(), _stringifyKeys(e.value)),
+      ),
+    );
+  } else if (node is List) {
+    return node.map(_stringifyKeys).toList();
+  } else {
+    return node;
+  }
+}
+
+
+/// Рекурсивно преобразует YamlMap/YamlList в обычные Map/List
+dynamic _deepYamlToMap(dynamic node) {
+  if (node is YamlMap) {
+    return Map.fromEntries(node.entries.map((e) => MapEntry(e.key, _deepYamlToMap(e.value))));
+  } else if (node is YamlList) {
+    return node.map(_deepYamlToMap).toList();
+  } else {
+    return node;
+  }
+}
+

cherrypick_cli/pubspec.lock

@@ -0,0 +1,85 @@
+# Generated by pub
+# See https://dart.dev/tools/pub/glossary#lockfile
+packages:
+  args:
+    dependency: "direct main"
+    description:
+      name: args
+      sha256: d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.7.0"
+  collection:
+    dependency: transitive
+    description:
+      name: collection
+      sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.19.1"
+  json2yaml:
+    dependency: "direct main"
+    description:
+      name: json2yaml
+      sha256: da94630fbc56079426fdd167ae58373286f603371075b69bf46d848d63ba3e51
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.1"
+  meta:
+    dependency: transitive
+    description:
+      name: meta
+      sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.17.0"
+  path:
+    dependency: transitive
+    description:
+      name: path
+      sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.9.1"
+  source_span:
+    dependency: transitive
+    description:
+      name: source_span
+      sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.10.1"
+  string_scanner:
+    dependency: transitive
+    description:
+      name: string_scanner
+      sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.4.1"
+  term_glyph:
+    dependency: transitive
+    description:
+      name: term_glyph
+      sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.2.2"
+  yaml:
+    dependency: "direct main"
+    description:
+      name: yaml
+      sha256: b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.1.3"
+  yaml_edit:
+    dependency: "direct main"
+    description:
+      name: yaml_edit
+      sha256: fb38626579fb345ad00e674e2af3a5c9b0cc4b9bfb8fd7f7ff322c7c9e62aef5
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.2"
+sdks:
+  dart: ">=3.5.0 <4.0.0"

cherrypick_cli/pubspec.yaml

@@ -0,0 +1,13 @@
+name: cherrypick_cli
+version: 0.1.0
+publish_to: none
+description: CLI tool for CherryPick DI ecosystem
+environment:
+  sdk: ">=3.0.0 <4.0.0"
+dependencies:
+  args: ^2.4.2
+  yaml: ^3.1.2
+  yaml_edit: ^2.1.1
+  json2yaml: ^3.0.0
+executables:
+  cherrypick_cli:

cherrypick_flutter/CHANGELOG.md

@@ -1,35 +1,7 @@
-## 1.1.3-dev.6
+## 1.1.2-dev.2
 
  - Update a dependency to the latest release.
 
-## 1.1.3-dev.5
-
- - Update a dependency to the latest release.
-
-## 1.1.3-dev.4
-
- - Update a dependency to the latest release.
-
-## 1.1.3-dev.3
-
- - Update a dependency to the latest release.
-
-## 1.1.3-dev.2
-
- - Update a dependency to the latest release.
-
-## 1.1.3-dev.1
-
- - Update a dependency to the latest release.
-
-## 1.1.3-dev.0
-
- - **FIX**: update deps.
-
-## 1.1.2
-
- - Graduate package to a stable release. See pre-releases prior to this version for changelog entries.
-
 ## 1.1.2-dev.1
 
  - Update a dependency to the latest release.

cherrypick_flutter/pubspec.yaml

@@ -1,16 +1,10 @@
 name: cherrypick_flutter
 description: "Flutter library that allows access to the root scope through the context using `CherryPickProvider`."
-version: 1.1.3-dev.6
+version: 1.1.2-dev.2
 homepage: https://pese-git.github.io/cherrypick-site/
 documentation: https://github.com/pese-git/cherrypick/wiki
 repository: https://github.com/pese-git/cherrypick
 issue_tracker: https://github.com/pese-git/cherrypick/issues
-topics:
-  - di
-  - ioc
-  - dependency-injection
-  - dependency-management
-  - inversion-of-control
 
 environment:
   sdk: ">=3.5.2 <4.0.0"
@@ -19,7 +13,7 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  cherrypick: ^3.0.0-dev.6
+  cherrypick: ^2.2.0-dev.2
 
 dev_dependencies:
   flutter_test:

cherrypick_generator/.gitignore

@@ -27,6 +27,4 @@ melos_cherrypick_generator.iml
 
 **/*.mocks.dart
 
-coverage
-
-pubspec_overrides.yaml
+coverage

cherrypick_generator/CHANGELOG.md

@@ -1,6 +1,10 @@
-## 1.1.0
+## 1.1.0-dev.6
 
- - Graduate package to a stable release. See pre-releases prior to this version for changelog entries.
+> Note: This release has breaking changes.
+
+ - **FIX**: format test code.
+ - **FEAT**(generator): support output_dir and build_extensions config for generated files.
+ - **BREAKING** **FEAT**(generator): complete code generation testing framework with 100% test coverage.
 
 ## 1.1.0-dev.5
 

cherrypick_generator/README.md

@@ -4,6 +4,50 @@
 
 ---
 
+### Advanced: Customizing Generated File Paths (`build_extensions`)
+
+You can further control the filenames and subdirectory structure of generated files using the `build_extensions` option in `build.yaml`. This is especially useful in large apps for keeping DI artifacts organized under `lib/generated/` or any custom location.
+
+**Example advanced build.yaml:**
+
+```yaml
+targets:
+  $default:
+    builders:
+      cherrypick_generator|inject_generator:
+        options:
+          build_extensions:
+            '^lib/app.dart': ['lib/generated/app.inject.cherrypick.g.dart']
+          output_dir: lib/generated
+        generate_for:
+          - lib/**.dart
+      cherrypick_generator|module_generator:
+        options:
+          build_extensions:
+            '^lib/di/{{}}.dart': ['lib/generated/di/{{}}.module.cherrypick.g.dart']
+          output_dir: lib/generated
+        generate_for:
+          - lib/**.dart
+```
+
+- **output_dir**: Path where all generated files are placed (e.g., `lib/generated`)
+- **build_extensions**: Allows templating of generated filenames and locations. You can use wildcards like `{{}}` to keep directory structure or group related files.
+
+**If you use these options, be sure to update your imports accordingly, for example:**
+
+```dart
+import 'package:your_package/generated/app.inject.cherrypick.g.dart';
+import 'package:your_package/generated/di/app_module.module.cherrypick.g.dart';
+```
+
+### FAQ / Troubleshooting
+
+- If files are missing or located in unexpected directories, double-check your `output_dir` and `build_extensions` configuration.
+- If you change generation paths, always update your imports in the codebase.
+- These options are backward compatible: omitting them preserves pre-existing (side-by-source) output behavior.
+
+---
+
 ## Features
 
 - **Automatic Field Injection:**  
@@ -170,6 +214,26 @@ final class $MyModule extends MyModule {
 
 ## Advanced Usage
 
+### Custom output directory for generated code (output_dir)
+
+You can control the directory where the generated files (`*.inject.cherrypick.g.dart`, `*.module.cherrypick.g.dart`) are placed using the `output_dir` option in your `build.yaml`:
+
+```yaml
+targets:
+  $default:
+    builders:
+      cherrypick_generator|injectBuilder:
+        options:
+          output_dir: lib/generated
+      cherrypick_generator|moduleBuilder:
+        options:
+          output_dir: lib/generated
+```
+
+**If `output_dir` is omitted, generated files are placed next to the original sources (default behavior).**
+
+After running code generation, you will find files like `lib/generated/app.inject.cherrypick.g.dart` and `lib/generated/your_module.module.cherrypick.g.dart`. You can import them as needed from that directory.
+
 - **Combining Modules and Field Injection:**  
   It's possible to mix both style of DI — modules for binding, and field injection for consuming services.
 - **Parameter and Named Injection:**  

cherrypick_generator/build.yaml

@@ -1,20 +1,18 @@
 builders:
-  module_generator:
-    import: "package:cherrypick_generator/module_generator.dart"
-    builder_factories: ["moduleBuilder"]
-    build_extensions: {".dart": [".module.cherrypick.g.dart"]}
-    auto_apply: dependents
-    required_inputs: ["lib/**"]
-    runs_before: []
-    build_to: source
   inject_generator:
     import: "package:cherrypick_generator/inject_generator.dart"
     builder_factories: ["injectBuilder"]
     build_extensions: {".dart": [".inject.cherrypick.g.dart"]}
     auto_apply: dependents
-    required_inputs: ["lib/**"]
-    runs_before: []
     build_to: source
+    applies_builders: ["source_gen|combining_builder"]
+  module_generator:
+    import: "package:cherrypick_generator/module_generator.dart"
+    builder_factories: ["moduleBuilder"]
+    build_extensions: {".dart": [".module.cherrypick.g.dart"]}
+    auto_apply: dependents
+    build_to: source
+    applies_builders: ["source_gen|combining_builder"]
 
 targets:
   $default:
@@ -24,4 +22,4 @@ targets:
           - lib/**.dart
       cherrypick_generator|inject_generator:
         generate_for:
-          - lib/**.dart
+          - lib/**.dart

cherrypick_generator/lib/cherrypick_custom_builders.dart

@@ -0,0 +1,110 @@
+import 'dart:async';
+import 'package:build/build.dart';
+import 'package:path/path.dart' as p;
+import 'package:source_gen/source_gen.dart';
+import 'inject_generator.dart';
+import 'module_generator.dart';
+
+/// Универсальный Builder для генераторов Cherrypick с поддержкой кастомного output_dir
+/// (указывает директорию для складывания сгенерированных файлов через build.yaml)
+class CustomOutputBuilder extends Builder {
+  final Generator generator;
+  final String extension;
+  final String outputDir;
+  final Map<String, List<String>> customBuildExtensions;
+
+  CustomOutputBuilder(this.generator, this.extension, this.outputDir, this.customBuildExtensions);
+
+  @override
+  Map<String, List<String>> get buildExtensions {
+    if (customBuildExtensions.isNotEmpty) {
+      return customBuildExtensions;
+    }
+    // Дефолт: рядом с исходником, как PartBuilder
+    return {
+      '.dart': [extension],
+    };
+  }
+
+  @override
+  Future<void> build(BuildStep buildStep) async {
+    final inputId = buildStep.inputId;
+    print('[CustomOutputBuilder] build() called for input: \\${inputId.path}');
+    final library = await buildStep.resolver.libraryFor(inputId);
+    print('[CustomOutputBuilder] resolved library for: \\${inputId.path}');
+    final generated = await generator.generate(LibraryReader(library), buildStep);
+    print('[CustomOutputBuilder] gen result for input: \\${inputId.path}, isNull: \\${generated == null}, isEmpty: \\${generated?.isEmpty}');
+    if (generated == null || generated.isEmpty) return;
+    String outputPath;
+    if (customBuildExtensions.isNotEmpty) {
+      // Кастомная директория/шаблон
+      final inputPath = inputId.path;
+      final relativeInput = p.relative(inputPath, from: 'lib/');
+      final parts = p.split(relativeInput);
+      String subdir = '';
+      String baseName = parts.last.replaceAll('.dart', '');
+      if (parts.length > 1) {
+        subdir = parts.first; // Например, 'di'
+      }
+      outputPath = subdir.isEmpty
+        ? p.join('lib', 'generated', '$baseName$extension')
+        : p.join('lib', 'generated', subdir, '$baseName$extension');
+    } else {
+      // Дефолт: рядом с исходником
+      outputPath = p.setExtension(inputId.path, extension);
+    }
+    final outputId = AssetId(inputId.package, outputPath);
+    // part of - всегда авто!
+    final partOfPath = p.relative(inputId.path, from: p.dirname(outputPath));
+    
+    // Check if generated code starts with formatting header
+    String finalCode;
+    if (generated.startsWith('// dart format width=80')) {
+      // Find the end of the header (after "// GENERATED CODE - DO NOT MODIFY BY HAND")
+      final lines = generated.split('\n');
+      int headerEndIndex = -1;
+      
+      for (int i = 0; i < lines.length; i++) {
+        if (lines[i].startsWith('// GENERATED CODE - DO NOT MODIFY BY HAND')) {
+          headerEndIndex = i;
+          break;
+        }
+      }
+      
+      if (headerEndIndex != -1) {
+        // Insert part of directive after the header
+        final headerLines = lines.sublist(0, headerEndIndex + 1);
+        final remainingLines = lines.sublist(headerEndIndex + 1);
+        
+        final headerPart = headerLines.join('\n');
+        final remainingPart = remainingLines.join('\n');
+        
+        // Preserve trailing newline if original had one
+        final hasTrailingNewline = generated.endsWith('\n');
+        finalCode = '$headerPart\n\npart of \'$partOfPath\';\n$remainingPart${hasTrailingNewline ? '' : '\n'}';
+      } else {
+        // Fallback: add part of at the beginning
+        finalCode = "part of '$partOfPath';\n\n$generated";
+      }
+    } else {
+      // No header, add part of at the beginning
+      finalCode = "part of '$partOfPath';\n\n$generated";
+    }
+    
+    print('[CustomOutputBuilder] writing to output: \\${outputId.path}');
+    await buildStep.writeAsString(outputId, finalCode);
+    print('[CustomOutputBuilder] successfully written for input: \\${inputId.path}');
+  }
+}
+
+Builder injectCustomBuilder(BuilderOptions options) {
+  final outputDir = options.config['output_dir'] as String? ?? '';
+  final buildExtensions = (options.config['build_extensions'] as Map?)?.map((k,v)=>MapEntry(k.toString(), (v as List).map((item)=>item.toString()).toList())) ?? {};
+  return CustomOutputBuilder(InjectGenerator(), '.inject.cherrypick.g.dart', outputDir, buildExtensions);
+}
+
+Builder moduleCustomBuilder(BuilderOptions options) {
+  final outputDir = options.config['output_dir'] as String? ?? '';
+  final buildExtensions = (options.config['build_extensions'] as Map?)?.map((k,v)=>MapEntry(k.toString(), (v as List).map((item)=>item.toString()).toList())) ?? {};
+  return CustomOutputBuilder(ModuleGenerator(), '.module.cherrypick.g.dart', outputDir, buildExtensions);
+}

cherrypick_generator/lib/inject_generator.dart

@@ -13,12 +13,16 @@
 
 import 'dart:async';
 import 'package:analyzer/dart/constant/value.dart';
-import 'package:analyzer/dart/element/nullability_suffix.dart';
-import 'package:analyzer/dart/element/type.dart';
+
+
 import 'package:build/build.dart';
 import 'package:source_gen/source_gen.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:cherrypick_annotations/cherrypick_annotations.dart' as ann;
+import 'cherrypick_custom_builders.dart' as custom;
+import 'src/exceptions.dart';
+import 'src/type_parser.dart';
+import 'src/annotation_validator.dart';
 
 /// InjectGenerator generates a mixin for a class marked with @injectable()
 /// and injects all fields annotated with @inject(), using CherryPick DI.
@@ -49,34 +53,68 @@ class InjectGenerator extends GeneratorForAnnotation<ann.injectable> {
     BuildStep buildStep,
   ) {
     if (element is! ClassElement) {
-      throw InvalidGenerationSourceError(
-        '@injectable() can only be applied to classes.',
+      throw CherryPickGeneratorException(
+        '@injectable() can only be applied to classes',
         element: element,
+        category: 'INVALID_TARGET',
+        suggestion: 'Apply @injectable() to a class instead of ${element.runtimeType}',
       );
     }
 
     final classElement = element;
+    
+    try {
+      // Validate class annotations
+      AnnotationValidator.validateClassAnnotations(classElement);
+      
+      return _generateInjectionCode(classElement);
+    } catch (e) {
+      if (e is CherryPickGeneratorException) {
+        rethrow;
+      }
+      throw CodeGenerationException(
+        'Failed to generate injection code: $e',
+        element: classElement,
+        suggestion: 'Check that all @inject fields have valid types and annotations',
+      );
+    }
+  }
+  
+  /// Generates the injection code for a class
+  String _generateInjectionCode(ClassElement classElement) {
     final className = classElement.name;
     final mixinName = '_\$$className';
+    
+    // Collect and process all @inject fields.
+    final injectFields = classElement.fields
+        .where(_isInjectField)
+        .map((field) => _parseInjectField(field, classElement))
+        .toList();
 
     final buffer = StringBuffer()
-      ..writeln('mixin $mixinName {')
-      ..writeln('  void _inject($className instance) {');
+      ..writeln('// dart format width=80')
+      ..writeln('// GENERATED CODE - DO NOT MODIFY BY HAND')
+      ..writeln()
+      ..writeln('// **************************************************************************')
+      ..writeln('// InjectGenerator')
+      ..writeln('// **************************************************************************')
+      ..writeln()
+      ..writeln('mixin $mixinName {');
 
-    // Collect and process all @inject fields.
-    // Собираем и обрабатываем все поля с @inject.
-    final injectFields =
-        classElement.fields.where(_isInjectField).map(_parseInjectField);
-
-    for (final parsedField in injectFields) {
-      buffer.writeln(_generateInjectionLine(parsedField));
+    if (injectFields.isEmpty) {
+      // For empty classes, generate a method with empty body
+      buffer.writeln('  void _inject($className instance) {}');
+    } else {
+      buffer.writeln('  void _inject($className instance) {');
+      for (final parsedField in injectFields) {
+        buffer.writeln(_generateInjectionLine(parsedField));
+      }
+      buffer.writeln('  }');
     }
+    
+    buffer.writeln('}');
 
-    buffer
-      ..writeln('  }')
-      ..writeln('}');
-
-    return buffer.toString();
+    return '${buffer.toString()}\n';
   }
 
   /// Checks if a field has the @inject annotation.
@@ -93,50 +131,51 @@ class InjectGenerator extends GeneratorForAnnotation<ann.injectable> {
   ///
   /// Разбирает поле на наличие модификаторов scope/named и выясняет его тип.
   /// Возвращает [_ParsedInjectField] с информацией о внедрении.
-  static _ParsedInjectField _parseInjectField(FieldElement field) {
-    String? scopeName;
-    String? namedValue;
+  static _ParsedInjectField _parseInjectField(FieldElement field, ClassElement classElement) {
+    try {
+      // Validate field annotations
+      AnnotationValidator.validateFieldAnnotations(field);
+      
+      // Parse type using improved type parser
+      final parsedType = TypeParser.parseType(field.type, field);
+      TypeParser.validateInjectableType(parsedType, field);
+      
+      // Extract metadata
+      String? scopeName;
+      String? namedValue;
 
-    for (final meta in field.metadata) {
-      final DartObject? obj = meta.computeConstantValue();
-      final type = obj?.type?.getDisplayString();
-      if (type == 'scope') {
-        scopeName = obj?.getField('name')?.toStringValue();
-      } else if (type == 'named') {
-        namedValue = obj?.getField('value')?.toStringValue();
+      for (final meta in field.metadata) {
+        final DartObject? obj = meta.computeConstantValue();
+        final type = obj?.type?.getDisplayString();
+        if (type == 'scope') {
+          scopeName = obj?.getField('name')?.toStringValue();
+        } else if (type == 'named') {
+          namedValue = obj?.getField('value')?.toStringValue();
+        }
       }
+
+      return _ParsedInjectField(
+        fieldName: field.name,
+        parsedType: parsedType,
+        scopeName: scopeName,
+        namedValue: namedValue,
+      );
+    } catch (e) {
+      if (e is CherryPickGeneratorException) {
+        rethrow;
+      }
+      throw DependencyResolutionException(
+        'Failed to parse inject field "${field.name}"',
+        element: field,
+        suggestion: 'Check that the field type is valid and properly imported',
+        context: {
+          'field_name': field.name,
+          'field_type': field.type.getDisplayString(),
+          'class_name': classElement.name,
+          'error': e.toString(),
+        },
+      );
     }
-
-    final DartType dartType = field.type;
-    String coreTypeName;
-    bool isFuture;
-
-    if (dartType.isDartAsyncFuture) {
-      final ParameterizedType paramType = dartType as ParameterizedType;
-      coreTypeName = paramType.typeArguments.first.getDisplayString();
-      isFuture = true;
-    } else {
-      coreTypeName = dartType.getDisplayString();
-      isFuture = false;
-    }
-
-    // ***
-    // Добавим определение nullable для типа (например PostRepository? или Future<PostRepository?>)
-    bool isNullable = dartType.nullabilitySuffix ==
-            NullabilitySuffix.question ||
-        (dartType is ParameterizedType &&
-            (dartType)
-                .typeArguments
-                .any((t) => t.nullabilitySuffix == NullabilitySuffix.question));
-
-    return _ParsedInjectField(
-      fieldName: field.name,
-      coreType: coreTypeName.replaceAll('?', ''), // удаляем "?" на всякий
-      isFuture: isFuture,
-      isNullable: isNullable,
-      scopeName: scopeName,
-      namedValue: namedValue,
-    );
   }
 
   /// Generates a line of code that performs the dependency injection for a field.
@@ -145,24 +184,47 @@ class InjectGenerator extends GeneratorForAnnotation<ann.injectable> {
   /// Генерирует строку кода, которая внедряет зависимость для поля.
   /// Учитывает resolve/resolveAsync, scoping и named qualifier.
   String _generateInjectionLine(_ParsedInjectField field) {
-    // Используем tryResolve для nullable, иначе resolve
-    final resolveMethod = field.isFuture
-        ? (field.isNullable
-            ? 'tryResolveAsync<${field.coreType}>'
-            : 'resolveAsync<${field.coreType}>')
-        : (field.isNullable
-            ? 'tryResolve<${field.coreType}>'
-            : 'resolve<${field.coreType}>');
-
+    final resolveMethod = '${field.parsedType.resolveMethodName}<${field.parsedType.codeGenType}>';
+    final fieldName = field.fieldName;
+    
+    // Build the scope call
     final openCall = (field.scopeName != null && field.scopeName!.isNotEmpty)
         ? "CherryPick.openScope(scopeName: '${field.scopeName}')"
         : "CherryPick.openRootScope()";
-
-    final params = (field.namedValue != null && field.namedValue!.isNotEmpty)
-        ? "(named: '${field.namedValue}')"
-        : '()';
-
-    return "    instance.${field.fieldName} = $openCall.$resolveMethod$params;";
+    
+    // Build the parameters
+    final hasNamedParam = field.namedValue != null && field.namedValue!.isNotEmpty;
+    final params = hasNamedParam ? "(named: '${field.namedValue}')" : '()';
+    
+    // Create the full line
+    final fullLine = "    instance.$fieldName = $openCall.$resolveMethod$params;";
+    
+    // Check if line is too long (dart format width=80, accounting for indentation)
+    if (fullLine.length <= 80) {
+      return fullLine;
+    }
+    
+    // Format long lines with proper line breaks
+    if (hasNamedParam && field.scopeName != null && field.scopeName!.isNotEmpty) {
+      // For scoped calls with named parameters, break after openScope
+      return "    instance.$fieldName = CherryPick.openScope(\n"
+             "      scopeName: '${field.scopeName}',\n"
+             "    ).$resolveMethod(named: '${field.namedValue}');";
+    } else if (hasNamedParam) {
+      // For named parameters without scope, break after the method call
+      return "    instance.$fieldName = $openCall.$resolveMethod(\n"
+             "      named: '${field.namedValue}',\n"
+             "    );";
+    } else if (field.scopeName != null && field.scopeName!.isNotEmpty) {
+      // For scoped calls without named params, break after openScope with proper parameter formatting
+      return "    instance.$fieldName = CherryPick.openScope(\n"
+             "      scopeName: '${field.scopeName}',\n"
+             "    ).$resolveMethod();";
+    } else {
+      // For simple long calls, break after openRootScope
+      return "    instance.$fieldName = $openCall\n"
+             "        .$resolveMethod();";
+    }
   }
 }
 
@@ -175,12 +237,8 @@ class _ParsedInjectField {
   /// The name of the field / Имя поля.
   final String fieldName;
 
-  /// The base type name (T or Future<T>) / Базовый тип (T или тип из Future<T>).
-  final String coreType;
-
-  /// True if the field type is Future<T>; false otherwise
-  /// Истина, если поле — Future<T>, иначе — ложь.
-  final bool isFuture;
+  /// Parsed type information / Информация о типе поля.
+  final ParsedType parsedType;
 
   /// Optional scope annotation argument / Опциональное имя scope.
   final String? scopeName;
@@ -188,20 +246,22 @@ class _ParsedInjectField {
   /// Optional named annotation argument / Опциональное имя named.
   final String? namedValue;
 
-  final bool isNullable;
-
   _ParsedInjectField({
     required this.fieldName,
-    required this.coreType,
-    required this.isFuture,
-    required this.isNullable,
+    required this.parsedType,
     this.scopeName,
     this.namedValue,
   });
+  
+  @override
+  String toString() {
+    return '_ParsedInjectField(fieldName: $fieldName, parsedType: $parsedType, '
+           'scopeName: $scopeName, namedValue: $namedValue)';
+  }
 }
 
 /// Builder factory. Used by build_runner.
 ///
 /// Фабрика билдера. Используется build_runner.
 Builder injectBuilder(BuilderOptions options) =>
-    PartBuilder([InjectGenerator()], '.inject.cherrypick.g.dart');
+    custom.injectCustomBuilder(options);

cherrypick_generator/lib/module_generator.dart

@@ -15,9 +15,10 @@ import 'package:analyzer/dart/element/element.dart';
 import 'package:build/build.dart';
 import 'package:source_gen/source_gen.dart';
 import 'package:cherrypick_annotations/cherrypick_annotations.dart' as ann;
-
 import 'src/generated_class.dart';
-
+import 'src/exceptions.dart';
+import 'src/annotation_validator.dart';
+import 'cherrypick_custom_builders.dart' as custom;
 /// ---------------------------------------------------------------------------
 /// ModuleGenerator for code generation of dependency-injected modules.
 ///
@@ -62,20 +63,40 @@ class ModuleGenerator extends GeneratorForAnnotation<ann.module> {
     // Only classes are supported for @module() annotation
     // Обрабатываются только классы (другие элементы — ошибка)
     if (element is! ClassElement) {
-      throw InvalidGenerationSourceError(
-        '@module() can only be applied to classes. / @module() может быть применён только к классам.',
+      throw CherryPickGeneratorException(
+        '@module() can only be applied to classes',
         element: element,
+        category: 'INVALID_TARGET',
+        suggestion: 'Apply @module() to a class instead of ${element.runtimeType}',
       );
     }
 
     final classElement = element;
 
-    // Build a representation of the generated bindings based on class methods /
-    // Создаёт объект, описывающий, какие биндинги нужно сгенерировать на основании методов класса
-    final generatedClass = GeneratedClass.fromClassElement(classElement);
+    try {
+      // Validate class annotations
+      AnnotationValidator.validateClassAnnotations(classElement);
+      
+      // Build a representation of the generated bindings based on class methods
+      final generatedClass = GeneratedClass.fromClassElement(classElement);
 
-    // Generate the resulting Dart code / Генерирует итоговый Dart-код
-    return generatedClass.generate();
+      // Generate the resulting Dart code
+      return generatedClass.generate();
+    } catch (e) {
+      if (e is CherryPickGeneratorException) {
+        rethrow;
+      }
+      throw CodeGenerationException(
+        'Failed to generate module code for class "${classElement.name}"',
+        element: classElement,
+        suggestion: 'Check that all methods have valid @instance or @provide annotations',
+        context: {
+          'class_name': classElement.name,
+          'method_count': classElement.methods.length,
+          'error': e.toString(),
+        },
+      );
+    }
   }
 }
 
@@ -89,5 +110,8 @@ class ModuleGenerator extends GeneratorForAnnotation<ann.module> {
 /// Возвращает Builder, используемый build_runner для генерации кода для всех
 /// файлов, где встречается @module().
 /// ---------------------------------------------------------------------------
+
+
+
 Builder moduleBuilder(BuilderOptions options) =>
-    PartBuilder([ModuleGenerator()], '.module.cherrypick.g.dart');
+    custom.moduleCustomBuilder(options);

cherrypick_generator/lib/src/annotation_validator.dart

@@ -20,7 +20,7 @@ class AnnotationValidator {
   /// Validates annotations on a method element
   static void validateMethodAnnotations(MethodElement method) {
     final annotations = _getAnnotationNames(method.metadata);
-
+    
     _validateMutuallyExclusiveAnnotations(method, annotations);
     _validateAnnotationCombinations(method, annotations);
     _validateAnnotationParameters(method);
@@ -29,14 +29,14 @@ class AnnotationValidator {
   /// Validates annotations on a field element
   static void validateFieldAnnotations(FieldElement field) {
     final annotations = _getAnnotationNames(field.metadata);
-
+    
     _validateInjectFieldAnnotations(field, annotations);
   }
 
   /// Validates annotations on a class element
   static void validateClassAnnotations(ClassElement classElement) {
     final annotations = _getAnnotationNames(classElement.metadata);
-
+    
     _validateModuleClassAnnotations(classElement, annotations);
     _validateInjectableClassAnnotations(classElement, annotations);
   }
@@ -58,8 +58,7 @@ class AnnotationValidator {
       throw AnnotationValidationException(
         'Method cannot have both @instance and @provide annotations',
         element: method,
-        suggestion:
-            'Use either @instance for direct instances or @provide for factory methods',
+        suggestion: 'Use either @instance for direct instances or @provide for factory methods',
         context: {
           'method_name': method.displayName,
           'annotations': annotations,
@@ -90,8 +89,7 @@ class AnnotationValidator {
       throw AnnotationValidationException(
         'Method must be marked with either @instance or @provide annotation',
         element: method,
-        suggestion:
-            'Add @instance() for direct instances or @provide() for factory methods',
+        suggestion: 'Add @instance() for direct instances or @provide() for factory methods',
         context: {
           'method_name': method.displayName,
           'available_annotations': annotations,
@@ -151,8 +149,7 @@ class AnnotationValidator {
         throw AnnotationValidationException(
           '@named value should follow valid identifier naming conventions',
           element: method,
-          suggestion:
-              'Use alphanumeric characters and underscores only, starting with a letter or underscore',
+          suggestion: 'Use alphanumeric characters and underscores only, starting with a letter or underscore',
           context: {
             'method_name': method.displayName,
             'named_value': namedValue,
@@ -170,13 +167,12 @@ class AnnotationValidator {
     }
   }
 
-  static void _validateParamsParameter(
-      ParameterElement param, MethodElement method) {
+  static void _validateParamsParameter(ParameterElement param, MethodElement method) {
     // @params parameter should typically be dynamic or Map<String, dynamic>
     final paramType = param.type.getDisplayString();
-
-    if (paramType != 'dynamic' &&
-        paramType != 'Map<String, dynamic>' &&
+    
+    if (paramType != 'dynamic' && 
+        paramType != 'Map<String, dynamic>' && 
         paramType != 'Map<String, dynamic>?') {
       // This is more of a warning - other types might be valid
       // We could add a warning system for this
@@ -236,8 +232,7 @@ class AnnotationValidator {
     }
 
     // Check if class has public methods
-    final publicMethods =
-        classElement.methods.where((m) => m.isPublic).toList();
+    final publicMethods = classElement.methods.where((m) => m.isPublic).toList();
     if (publicMethods.isEmpty) {
       throw AnnotationValidationException(
         'Module class must have at least one public method',
@@ -253,8 +248,7 @@ class AnnotationValidator {
     // Validate that public methods have appropriate annotations
     for (final method in publicMethods) {
       final methodAnnotations = _getAnnotationNames(method.metadata);
-      if (!methodAnnotations.contains('instance') &&
-          !methodAnnotations.contains('provide')) {
+      if (!methodAnnotations.contains('instance') && !methodAnnotations.contains('provide')) {
         throw AnnotationValidationException(
           'Public methods in module class must have @instance or @provide annotation',
           element: method,
@@ -297,15 +291,14 @@ class AnnotationValidator {
         throw AnnotationValidationException(
           'Injectable fields should be final for immutability',
           element: field,
-          suggestion:
-              'Add final keyword to injectable field (preferably late final)',
+          suggestion: 'Add final keyword to injectable field (preferably late final)',
           context: {
             'class_name': classElement.displayName,
             'field_name': field.displayName,
           },
         );
       }
-
+      
       // Check if field is late (recommended pattern)
       try {
         final isLate = (field as dynamic).isLate ?? false;

cherrypick_generator/lib/src/bind_spec.dart

@@ -13,6 +13,7 @@
 
 import 'package:analyzer/dart/element/element.dart';
 
+
 import 'bind_parameters_spec.dart';
 import 'metadata_utils.dart';
 import 'exceptions.dart';
@@ -107,26 +108,26 @@ class BindSpec {
     final indentStr = ' ' * indent;
     final provide = _generateProvideClause(indent);
     final postfix = _generatePostfix();
-
+    
     // Create the full single-line version first
     final singleLine = '${indentStr}bind<$returnType>()$provide$postfix;';
-
+    
     // Check if we need multiline formatting
     final needsMultiline = singleLine.length > 80 || provide.contains('\n');
-
+    
     if (!needsMultiline) {
       return singleLine;
     }
-
+    
     // For multiline formatting, check if we need to break after bind<Type>()
     if (provide.contains('\n')) {
       // Provider clause is already multiline
       if (postfix.isNotEmpty) {
         // If there's a postfix, break after bind<Type>()
         final multilinePostfix = _generateMultilinePostfix(indent);
-        return '${indentStr}bind<$returnType>()'
-            '\n${' ' * (indent + 4)}$provide'
-            '$multilinePostfix;';
+        return '${indentStr}bind<$returnType>()'  
+               '\n${' ' * (indent + 4)}$provide'
+               '$multilinePostfix;';
       } else {
         // No postfix, keep bind<Type>() with provide start
         return '${indentStr}bind<$returnType>()$provide;';
@@ -135,12 +136,12 @@ class BindSpec {
       // Simple multiline: break after bind<Type>()
       if (postfix.isNotEmpty) {
         final multilinePostfix = _generateMultilinePostfix(indent);
-        return '${indentStr}bind<$returnType>()'
-            '\n${' ' * (indent + 4)}$provide'
-            '$multilinePostfix;';
+        return '${indentStr}bind<$returnType>()'  
+               '\n${' ' * (indent + 4)}$provide'
+               '$multilinePostfix;';
       } else {
-        return '${indentStr}bind<$returnType>()'
-            '\n${' ' * (indent + 4)}$provide;';
+        return '${indentStr}bind<$returnType>()'  
+               '\n${' ' * (indent + 4)}$provide;';
       }
     }
   }
@@ -181,12 +182,11 @@ class BindSpec {
   /// EN / RU: Supports only injected dependencies, not runtime (@params).
   String _generatePlainProvideClause(int indent) {
     final argsStr = parameters.map((p) => p.generateArg()).join(', ');
-
+    
     // Check if we need multiline formatting based on total line length
     final singleLineCall = '$methodName($argsStr)';
-    final needsMultiline =
-        singleLineCall.length >= 45 || argsStr.contains('\n');
-
+    final needsMultiline = singleLineCall.length >= 45 || argsStr.contains('\n');
+    
     switch (bindingType) {
       case BindingType.instance:
         return isAsyncInstance
@@ -195,20 +195,16 @@ class BindSpec {
       case BindingType.provide:
         if (isAsyncProvide) {
           if (needsMultiline) {
-            final lambdaIndent =
-                (isSingleton || named != null) ? indent + 6 : indent + 2;
-            final closingIndent =
-                (isSingleton || named != null) ? indent + 4 : indent;
+            final lambdaIndent = (isSingleton || named != null) ? indent + 6 : indent + 2;
+            final closingIndent = (isSingleton || named != null) ? indent + 4 : indent;
             return '.toProvideAsync(\n${' ' * lambdaIndent}() => $methodName($argsStr),\n${' ' * closingIndent})';
           } else {
             return '.toProvideAsync(() => $methodName($argsStr))';
           }
         } else {
           if (needsMultiline) {
-            final lambdaIndent =
-                (isSingleton || named != null) ? indent + 6 : indent + 2;
-            final closingIndent =
-                (isSingleton || named != null) ? indent + 4 : indent;
+            final lambdaIndent = (isSingleton || named != null) ? indent + 6 : indent + 2;
+            final closingIndent = (isSingleton || named != null) ? indent + 4 : indent;
             return '.toProvide(\n${' ' * lambdaIndent}() => $methodName($argsStr),\n${' ' * closingIndent})';
           } else {
             return '.toProvide(() => $methodName($argsStr))';
@@ -223,7 +219,7 @@ class BindSpec {
     final singletonPart = isSingleton ? '.singleton()' : '';
     return '$namePart$singletonPart';
   }
-
+  
   /// EN / RU: Generates multiline postfix with proper indentation.
   String _generateMultilinePostfix(int indent) {
     final parts = <String>[];
@@ -234,7 +230,7 @@ class BindSpec {
       parts.add('.singleton()');
     }
     if (parts.isEmpty) return '';
-
+    
     return parts.map((part) => '\n${' ' * (indent + 4)}$part').join('');
   }
 
@@ -255,12 +251,12 @@ class BindSpec {
     try {
       // Validate method annotations
       AnnotationValidator.validateMethodAnnotations(method);
-
+      
       // Parse return type using improved type parser
       final parsedReturnType = TypeParser.parseType(method.returnType, method);
-
+      
       final methodName = method.displayName;
-
+      
       // Check for @singleton annotation.
       final isSingleton = MetadataUtils.anyMeta(method.metadata, 'singleton');
 
@@ -281,22 +277,20 @@ class BindSpec {
       // Determine bindingType: @instance or @provide.
       final hasInstance = MetadataUtils.anyMeta(method.metadata, 'instance');
       final hasProvide = MetadataUtils.anyMeta(method.metadata, 'provide');
-
+      
       if (!hasInstance && !hasProvide) {
         throw AnnotationValidationException(
           'Method must be marked with either @instance() or @provide() annotation',
           element: method,
-          suggestion:
-              'Add @instance() for direct instances or @provide() for factory methods',
+          suggestion: 'Add @instance() for direct instances or @provide() for factory methods',
           context: {
             'method_name': methodName,
             'return_type': parsedReturnType.displayString,
           },
         );
       }
-
-      final bindingType =
-          hasInstance ? BindingType.instance : BindingType.provide;
+      
+      final bindingType = hasInstance ? BindingType.instance : BindingType.provide;
 
       // PROHIBIT @params with @instance bindings!
       if (bindingType == BindingType.instance && hasParams) {
@@ -313,10 +307,8 @@ class BindSpec {
       }
 
       // Set async flags based on parsed type
-      final isAsyncInstance =
-          bindingType == BindingType.instance && parsedReturnType.isFuture;
-      final isAsyncProvide =
-          bindingType == BindingType.provide && parsedReturnType.isFuture;
+      final isAsyncInstance = bindingType == BindingType.instance && parsedReturnType.isFuture;
+      final isAsyncProvide = bindingType == BindingType.provide && parsedReturnType.isFuture;
 
       return BindSpec(
         returnType: parsedReturnType.codeGenType,
@@ -336,8 +328,7 @@ class BindSpec {
       throw CodeGenerationException(
         'Failed to create BindSpec from method "${method.displayName}"',
         element: method,
-        suggestion:
-            'Check that the method has valid annotations and return type',
+        suggestion: 'Check that the method has valid annotations and return type',
         context: {
           'method_name': method.displayName,
           'return_type': method.returnType.getDisplayString(),

cherrypick_generator/lib/src/exceptions.dart

@@ -39,17 +39,17 @@ class CherryPickGeneratorException extends InvalidGenerationSourceError {
     Element element,
   ) {
     final buffer = StringBuffer();
-
+    
     // Header with category
     buffer.writeln('[$category] $message');
-
+    
     // Element context
     buffer.writeln('');
     buffer.writeln('Context:');
     buffer.writeln('  Element: ${element.displayName}');
     buffer.writeln('  Type: ${element.runtimeType}');
     buffer.writeln('  Location: ${element.source?.fullName ?? 'unknown'}');
-
+    
     // Note: enclosingElement may not be available in all analyzer versions
     try {
       final enclosing = (element as dynamic).enclosingElement;
@@ -59,7 +59,7 @@ class CherryPickGeneratorException extends InvalidGenerationSourceError {
     } catch (e) {
       // Ignore if enclosingElement is not available
     }
-
+    
     // Additional context
     if (context != null && context.isNotEmpty) {
       buffer.writeln('');
@@ -68,13 +68,13 @@ class CherryPickGeneratorException extends InvalidGenerationSourceError {
         buffer.writeln('  $key: $value');
       });
     }
-
+    
     // Suggestion
     if (suggestion != null) {
       buffer.writeln('');
       buffer.writeln('💡 Suggestion: $suggestion');
     }
-
+    
     return buffer.toString();
   }
 }

cherrypick_generator/lib/src/generated_class.dart

@@ -103,6 +103,13 @@ class GeneratedClass {
   /// -------------------------------------------------------------------------
   String generate() {
     final buffer = StringBuffer()
+      ..writeln('// dart format width=80')
+      ..writeln('// GENERATED CODE - DO NOT MODIFY BY HAND')
+      ..writeln()
+      ..writeln('// **************************************************************************')
+      ..writeln('// ModuleGenerator')
+      ..writeln('// **************************************************************************')
+      ..writeln()
       ..writeln('final class $generatedClassName extends $className {')
       ..writeln('  @override')
       ..writeln('  void builder(Scope currentScope) {');

cherrypick_generator/lib/src/type_parser.dart

@@ -38,17 +38,17 @@ class TypeParser {
   static ParsedType _parseTypeInternal(DartType dartType, Element context) {
     final displayString = dartType.getDisplayString();
     final isNullable = dartType.nullabilitySuffix == NullabilitySuffix.question;
-
+    
     // Check if it's a Future type
     if (dartType.isDartAsyncFuture) {
       return _parseFutureType(dartType, context, isNullable);
     }
-
+    
     // Check if it's a generic type (List, Map, etc.)
     if (dartType is ParameterizedType && dartType.typeArguments.isNotEmpty) {
       return _parseGenericType(dartType, context, isNullable);
     }
-
+    
     // Simple type
     return ParsedType(
       displayString: displayString,
@@ -60,8 +60,7 @@ class TypeParser {
     );
   }
 
-  static ParsedType _parseFutureType(
-      DartType dartType, Element context, bool isNullable) {
+  static ParsedType _parseFutureType(DartType dartType, Element context, bool isNullable) {
     if (dartType is! ParameterizedType || dartType.typeArguments.isEmpty) {
       throw TypeParsingException(
         'Future type must have a type argument',
@@ -73,7 +72,7 @@ class TypeParser {
 
     final innerType = dartType.typeArguments.first;
     final innerParsed = _parseTypeInternal(innerType, context);
-
+    
     return ParsedType(
       displayString: dartType.getDisplayString(),
       coreType: innerParsed.coreType,
@@ -85,14 +84,13 @@ class TypeParser {
     );
   }
 
-  static ParsedType _parseGenericType(
-      ParameterizedType dartType, Element context, bool isNullable) {
+  static ParsedType _parseGenericType(ParameterizedType dartType, Element context, bool isNullable) {
     final typeArguments = dartType.typeArguments
         .map((arg) => _parseTypeInternal(arg, context))
         .toList();
-
+    
     final baseType = dartType.element?.name ?? dartType.getDisplayString();
-
+    
     return ParsedType(
       displayString: dartType.getDisplayString(),
       coreType: baseType,
@@ -135,22 +133,22 @@ class TypeParser {
 class ParsedType {
   /// The full display string of the type (e.g., "Future<List<String>?>")
   final String displayString;
-
+  
   /// The core type name without nullability and Future wrapper (e.g., "List<String>")
   final String coreType;
-
+  
   /// Whether the type is nullable
   final bool isNullable;
-
+  
   /// Whether the type is wrapped in Future
   final bool isFuture;
-
+  
   /// Whether the type has generic parameters
   final bool isGeneric;
-
+  
   /// Parsed type arguments for generic types
   final List<ParsedType> typeArguments;
-
+  
   /// For Future types, the inner type
   final ParsedType? innerType;
 
@@ -169,13 +167,13 @@ class ParsedType {
     if (isFuture && innerType != null) {
       return innerType!.codeGenType;
     }
-
+    
     // For generic types, include type arguments
     if (isGeneric && typeArguments.isNotEmpty) {
       final args = typeArguments.map((arg) => arg.codeGenType).join(', ');
       return '$coreType<$args>';
     }
-
+    
     return coreType;
   }
 
@@ -193,7 +191,7 @@ class ParsedType {
   @override
   String toString() {
     return 'ParsedType(displayString: $displayString, coreType: $coreType, '
-        'isNullable: $isNullable, isFuture: $isFuture, isGeneric: $isGeneric)';
+           'isNullable: $isNullable, isFuture: $isFuture, isGeneric: $isGeneric)';
   }
 
   @override

cherrypick_generator/pubspec.yaml

@@ -2,28 +2,23 @@ name: cherrypick_generator
 description: |
   Source code generator for the cherrypick dependency injection system. Processes annotations to generate binding and module code for Dart & Flutter projects.
 
-version: 1.1.0
+version: 1.1.0-dev.6
 documentation: https://github.com/pese-git/cherrypick/wiki
 repository: https://github.com/pese-git/cherrypick/cherrypick_generator
 issue_tracker: https://github.com/pese-git/cherrypick/issues
-topics:
-  - di
-  - ioc
-  - dependency-injection
-  - dependency-management
-  - inversion-of-control
 
 environment:
   sdk: ">=3.5.2 <4.0.0"
 
 # Add regular dependencies here.
 dependencies:
-  cherrypick_annotations: ^1.1.0
+  cherrypick_annotations: ^1.1.0-dev.1
   analyzer: ^7.0.0
   dart_style: ^3.0.0
   build: ^2.4.1
   source_gen: ^2.0.0
   collection: ^1.18.0
+  path: ^1.9.1
 
 dev_dependencies:
   lints: ^4.0.0

cherrypick_generator/test/annotation_validator_test.dart

@@ -0,0 +1,415 @@
+import 'package:test/test.dart';
+import 'package:analyzer/dart/element/element.dart';
+import 'package:analyzer/dart/constant/value.dart';
+import 'package:analyzer/dart/element/type.dart';
+import 'package:analyzer/source/source.dart';
+import 'package:cherrypick_generator/src/annotation_validator.dart';
+import 'package:cherrypick_generator/src/exceptions.dart';
+
+void main() {
+  group('AnnotationValidator', () {
+    group('validateMethodAnnotations', () {
+      test('should pass for valid @instance method', () {
+        final method = _createMockMethod(
+          name: 'createService',
+          annotations: ['instance'],
+        );
+
+        expect(
+          () => AnnotationValidator.validateMethodAnnotations(method),
+          returnsNormally,
+        );
+      });
+
+      test('should pass for valid @provide method', () {
+        final method = _createMockMethod(
+          name: 'createService',
+          annotations: ['provide'],
+        );
+
+        expect(
+          () => AnnotationValidator.validateMethodAnnotations(method),
+          returnsNormally,
+        );
+      });
+
+      test('should throw for method with both @instance and @provide', () {
+        final method = _createMockMethod(
+          name: 'createService',
+          annotations: ['instance', 'provide'],
+        );
+
+        expect(
+          () => AnnotationValidator.validateMethodAnnotations(method),
+          throwsA(isA<AnnotationValidationException>()),
+        );
+      });
+
+      test('should throw for method with @params but no @provide', () {
+        final method = _createMockMethod(
+          name: 'createService',
+          annotations: ['instance', 'params'],
+        );
+
+        expect(
+          () => AnnotationValidator.validateMethodAnnotations(method),
+          throwsA(isA<AnnotationValidationException>()),
+        );
+      });
+
+      test('should throw for method with neither @instance nor @provide', () {
+        final method = _createMockMethod(
+          name: 'createService',
+          annotations: ['singleton'],
+        );
+
+        expect(
+          () => AnnotationValidator.validateMethodAnnotations(method),
+          throwsA(isA<AnnotationValidationException>()),
+        );
+      });
+
+      test('should pass for @provide method with @params', () {
+        final method = _createMockMethod(
+          name: 'createService',
+          annotations: ['provide', 'params'],
+        );
+
+        expect(
+          () => AnnotationValidator.validateMethodAnnotations(method),
+          returnsNormally,
+        );
+      });
+
+      test('should pass for @singleton method', () {
+        final method = _createMockMethod(
+          name: 'createService',
+          annotations: ['provide', 'singleton'],
+        );
+
+        expect(
+          () => AnnotationValidator.validateMethodAnnotations(method),
+          returnsNormally,
+        );
+      });
+    });
+
+    group('validateFieldAnnotations', () {
+      test('should pass for valid @inject field', () {
+        final field = _createMockField(
+          name: 'service',
+          annotations: ['inject'],
+          type: 'String',
+        );
+
+        expect(
+          () => AnnotationValidator.validateFieldAnnotations(field),
+          returnsNormally,
+        );
+      });
+
+      test('should throw for @inject field with void type', () {
+        final field = _createMockField(
+          name: 'service',
+          annotations: ['inject'],
+          type: 'void',
+        );
+
+        expect(
+          () => AnnotationValidator.validateFieldAnnotations(field),
+          throwsA(isA<AnnotationValidationException>()),
+        );
+      });
+
+      test('should pass for non-inject field', () {
+        final field = _createMockField(
+          name: 'service',
+          annotations: [],
+          type: 'String',
+        );
+
+        expect(
+          () => AnnotationValidator.validateFieldAnnotations(field),
+          returnsNormally,
+        );
+      });
+    });
+
+    group('validateClassAnnotations', () {
+      test('should pass for valid @module class', () {
+        final classElement = _createMockClass(
+          name: 'AppModule',
+          annotations: ['module'],
+          methods: [
+            _createMockMethod(name: 'createService', annotations: ['provide']),
+          ],
+        );
+
+        expect(
+          () => AnnotationValidator.validateClassAnnotations(classElement),
+          returnsNormally,
+        );
+      });
+
+      test('should throw for @module class with no public methods', () {
+        final classElement = _createMockClass(
+          name: 'AppModule',
+          annotations: ['module'],
+          methods: [],
+        );
+
+        expect(
+          () => AnnotationValidator.validateClassAnnotations(classElement),
+          throwsA(isA<AnnotationValidationException>()),
+        );
+      });
+
+      test('should throw for @module class with unannotated public methods', () {
+        final classElement = _createMockClass(
+          name: 'AppModule',
+          annotations: ['module'],
+          methods: [
+            _createMockMethod(name: 'createService', annotations: []),
+          ],
+        );
+
+        expect(
+          () => AnnotationValidator.validateClassAnnotations(classElement),
+          throwsA(isA<AnnotationValidationException>()),
+        );
+      });
+
+      test('should pass for valid @injectable class', () {
+        final classElement = _createMockClass(
+          name: 'AppService',
+          annotations: ['injectable'],
+          fields: [
+            _createMockField(name: 'dependency', annotations: ['inject'], type: 'String', isFinal: true),
+          ],
+        );
+
+        expect(
+          () => AnnotationValidator.validateClassAnnotations(classElement),
+          returnsNormally,
+        );
+      });
+
+      test('should pass for @injectable class with no inject fields', () {
+        final classElement = _createMockClass(
+          name: 'AppService',
+          annotations: ['injectable'],
+          fields: [
+            _createMockField(name: 'dependency', annotations: [], type: 'String'),
+          ],
+        );
+
+        expect(
+          () => AnnotationValidator.validateClassAnnotations(classElement),
+          returnsNormally,
+        );
+      });
+
+      test('should throw for @injectable class with non-final inject fields', () {
+        final classElement = _createMockClass(
+          name: 'AppService',
+          annotations: ['injectable'],
+          fields: [
+            _createMockField(
+              name: 'dependency',
+              annotations: ['inject'],
+              type: 'String',
+              isFinal: false,
+            ),
+          ],
+        );
+
+        expect(
+          () => AnnotationValidator.validateClassAnnotations(classElement),
+          throwsA(isA<AnnotationValidationException>()),
+        );
+      });
+      
+      test('should pass for @injectable class with final inject fields', () {
+        final classElement = _createMockClass(
+          name: 'AppService',
+          annotations: ['injectable'],
+          fields: [
+            _createMockField(
+              name: 'dependency',
+              annotations: ['inject'],
+              type: 'String',
+              isFinal: true,
+            ),
+          ],
+        );
+
+        expect(
+          () => AnnotationValidator.validateClassAnnotations(classElement),
+          returnsNormally,
+        );
+      });
+    });
+  });
+}
+
+// Mock implementations for testing
+MethodElement _createMockMethod({
+  required String name,
+  required List<String> annotations,
+}) {
+  return _MockMethodElement(name, annotations);
+}
+
+FieldElement _createMockField({
+  required String name,
+  required List<String> annotations,
+  required String type,
+  bool isFinal = false,
+}) {
+  return _MockFieldElement(name, annotations, type, isFinal);
+}
+
+ClassElement _createMockClass({
+  required String name,
+  required List<String> annotations,
+  List<MethodElement> methods = const [],
+  List<FieldElement> fields = const [],
+}) {
+  return _MockClassElement(name, annotations, methods, fields);
+}
+
+class _MockMethodElement implements MethodElement {
+  final String _name;
+  final List<String> _annotations;
+
+  _MockMethodElement(this._name, this._annotations);
+
+  @override
+  Source get source => _MockSource();
+
+  @override
+  String get displayName => _name;
+
+  @override
+  String get name => _name;
+
+  @override
+  List<ElementAnnotation> get metadata => _annotations.map((a) => _MockElementAnnotation(a)).toList();
+
+  @override
+  bool get isPublic => true;
+
+  @override
+  List<ParameterElement> get parameters => [];
+
+  @override
+  DartType get returnType => _MockDartType('String');
+
+  @override
+  noSuchMethod(Invocation invocation) => super.noSuchMethod(invocation);
+}
+
+class _MockFieldElement implements FieldElement {
+  final String _name;
+  final List<String> _annotations;
+  final String _type;
+  final bool _isFinal;
+
+  _MockFieldElement(this._name, this._annotations, this._type, this._isFinal);
+
+  @override
+  Source get source => _MockSource();
+
+  @override
+  String get displayName => _name;
+
+  @override
+  String get name => _name;
+
+  @override
+  List<ElementAnnotation> get metadata => _annotations.map((a) => _MockElementAnnotation(a)).toList();
+
+  @override
+  bool get isFinal => _isFinal;
+
+  @override
+  DartType get type => _MockDartType(_type);
+
+  @override
+  noSuchMethod(Invocation invocation) => super.noSuchMethod(invocation);
+}
+
+class _MockClassElement implements ClassElement {
+  final String _name;
+  final List<String> _annotations;
+  final List<MethodElement> _methods;
+  final List<FieldElement> _fields;
+
+  _MockClassElement(this._name, this._annotations, this._methods, this._fields);
+
+  @override
+  Source get source => _MockSource();
+
+  @override
+  String get displayName => _name;
+
+  @override
+  String get name => _name;
+
+  @override
+  List<ElementAnnotation> get metadata => _annotations.map((a) => _MockElementAnnotation(a)).toList();
+
+  @override
+  List<MethodElement> get methods => _methods;
+
+  @override
+  List<FieldElement> get fields => _fields;
+
+  @override
+  noSuchMethod(Invocation invocation) => super.noSuchMethod(invocation);
+}
+
+class _MockElementAnnotation implements ElementAnnotation {
+  final String _type;
+
+  _MockElementAnnotation(this._type);
+
+  @override
+  DartObject? computeConstantValue() {
+    return _MockDartObject(_type);
+  }
+
+  @override
+  noSuchMethod(Invocation invocation) => super.noSuchMethod(invocation);
+}
+
+class _MockDartObject implements DartObject {
+  final String _type;
+
+  _MockDartObject(this._type);
+
+  @override
+  DartType? get type => _MockDartType(_type);
+
+  @override
+  noSuchMethod(Invocation invocation) => super.noSuchMethod(invocation);
+}
+
+class _MockDartType implements DartType {
+  final String _name;
+
+  _MockDartType(this._name);
+
+  @override
+  String getDisplayString({bool withNullability = true}) => _name;
+
+  @override
+  noSuchMethod(Invocation invocation) => super.noSuchMethod(invocation);
+}
+class _MockSource implements Source {
+  @override
+  String get fullName => 'mock_source.dart';
+
+  @override
+  noSuchMethod(Invocation invocation) => super.noSuchMethod(invocation);
+}

cherrypick_generator/test/inject_generator_test.dart

@@ -202,8 +202,9 @@ part of 'test_widget.dart';
 
 mixin _\$TestWidget {
   void _inject(TestWidget instance) {
-    instance.service =
-        CherryPick.openScope(scopeName: 'userScope').resolve<MyService>();
+    instance.service = CherryPick.openScope(
+      scopeName: 'userScope',
+    ).resolve<MyService>();
   }
 }
 ''';
@@ -406,10 +407,9 @@ mixin _\$TestWidget {
     instance.cacheService = CherryPick.openRootScope().tryResolve<CacheService>(
       named: 'cache',
     );
-    instance.dbService =
-        CherryPick.openScope(
-          scopeName: 'dbScope',
-        ).resolveAsync<DatabaseService>();
+    instance.dbService = CherryPick.openScope(
+      scopeName: 'dbScope',
+    ).resolveAsync<DatabaseService>();
   }
 }
 ''';
@@ -451,10 +451,10 @@ part of 'test_widget.dart';
 mixin _\$TestWidget {
   void _inject(TestWidget instance) {
     instance.stringList = CherryPick.openRootScope().resolve<List<String>>();
-    instance.stringIntMap =
-        CherryPick.openRootScope().resolve<Map<String, int>>();
-    instance.futureStringList =
-        CherryPick.openRootScope().resolveAsync<List<String>>();
+    instance.stringIntMap = CherryPick.openRootScope()
+        .resolve<Map<String, int>>();
+    instance.futureStringList = CherryPick.openRootScope()
+        .resolveAsync<List<String>>();
   }
 }
 ''';

cherrypick_generator/test/type_parser_test.dart

@@ -41,8 +41,7 @@ void main() {
         );
 
         expect(
-          () => TypeParser.validateInjectableType(
-              parsedType, _createMockElement()),
+          () => TypeParser.validateInjectableType(parsedType, _createMockElement()),
           throwsA(isA<TypeParsingException>()),
         );
       });
@@ -58,8 +57,7 @@ void main() {
         );
 
         expect(
-          () => TypeParser.validateInjectableType(
-              parsedType, _createMockElement()),
+          () => TypeParser.validateInjectableType(parsedType, _createMockElement()),
           throwsA(isA<TypeParsingException>()),
         );
       });
@@ -75,8 +73,7 @@ void main() {
         );
 
         expect(
-          () => TypeParser.validateInjectableType(
-              parsedType, _createMockElement()),
+          () => TypeParser.validateInjectableType(parsedType, _createMockElement()),
           returnsNormally,
         );
       });
@@ -159,8 +156,7 @@ void main() {
       expect(parsedType.resolveMethodName, equals('resolveAsync'));
     });
 
-    test('should return correct resolveMethodName for nullable async types',
-        () {
+    test('should return correct resolveMethodName for nullable async types', () {
       final parsedType = ParsedType(
         displayString: 'Future<String?>',
         coreType: 'String',
@@ -226,7 +222,7 @@ class _MockElement implements Element {
 
   @override
   String get name => 'MockElement';
-
+  
   @override
   Source? get source => null;
 

doc/cycle_detection.en.md

@@ -1,572 +0,0 @@
-# Circular Dependency Detection
-
-CherryPick provides robust circular dependency detection to prevent infinite loops and stack overflow errors in your dependency injection setup.
-
-## What are Circular Dependencies?
-
-Circular dependencies occur when two or more services depend on each other directly or indirectly, creating a cycle in the dependency graph.
-
-### Example of circular dependencies within a scope
-
-```dart
-class UserService {
-  final OrderService orderService;
-  UserService(this.orderService);
-}
-
-class OrderService {
-  final UserService userService;
-  OrderService(this.userService);
-}
-```
-
-### Example of circular dependencies between scopes
-
-```dart
-// In parent scope
-class ParentService {
-  final ChildService childService;
-  ParentService(this.childService); // Gets from child scope
-}
-
-// In child scope
-class ChildService {
-  final ParentService parentService;
-  ChildService(this.parentService); // Gets from parent scope
-}
-```
-
-## Detection Types
-
-### 🔍 Local Detection
-
-Detects circular dependencies within a single scope. Fast and efficient.
-
-### 🌐 Global Detection
-
-Detects circular dependencies across the entire scope hierarchy. Slower but provides complete protection.
-
-## Usage
-
-### Local Detection
-
-```dart
-final scope = Scope(null);
-scope.enableCycleDetection(); // Enable local detection
-
-scope.installModules([
-  Module((bind) {
-    bind<UserService>().to((scope) => UserService(scope.resolve<OrderService>()));
-    bind<OrderService>().to((scope) => OrderService(scope.resolve<UserService>()));
-  }),
-]);
-
-try {
-  final userService = scope.resolve<UserService>(); // Will throw CircularDependencyException
-} catch (e) {
-  print(e); // CircularDependencyException: Circular dependency detected
-}
-```
-
-### Global Detection
-
-```dart
-// Enable global detection for all scopes
-CherryPick.enableGlobalCrossScopeCycleDetection();
-
-final rootScope = CherryPick.openGlobalSafeRootScope();
-final childScope = rootScope.openSubScope();
-
-// Configure dependencies that create cross-scope cycles
-rootScope.installModules([
-  Module((bind) {
-    bind<ParentService>().to((scope) => ParentService(childScope.resolve<ChildService>()));
-  }),
-]);
-
-childScope.installModules([
-  Module((bind) {
-    bind<ChildService>().to((scope) => ChildService(rootScope.resolve<ParentService>()));
-  }),
-]);
-
-try {
-  final parentService = rootScope.resolve<ParentService>(); // Will throw CircularDependencyException
-} catch (e) {
-  print(e); // CircularDependencyException with detailed chain information
-}
-```
-
-## CherryPick Helper API
-
-### Global Settings
-
-```dart
-// Enable/disable local detection globally
-CherryPick.enableGlobalCycleDetection();
-CherryPick.disableGlobalCycleDetection();
-
-// Enable/disable global cross-scope detection
-CherryPick.enableGlobalCrossScopeCycleDetection();
-CherryPick.disableGlobalCrossScopeCycleDetection();
-
-// Check current settings
-bool localEnabled = CherryPick.isGlobalCycleDetectionEnabled;
-bool globalEnabled = CherryPick.isGlobalCrossScopeCycleDetectionEnabled;
-```
-
-### Per-Scope Settings
-
-```dart
-// Enable/disable for specific scope
-CherryPick.enableCycleDetectionForScope(scope);
-CherryPick.disableCycleDetectionForScope(scope);
-
-// Enable/disable global detection for specific scope
-CherryPick.enableGlobalCycleDetectionForScope(scope);
-CherryPick.disableGlobalCycleDetectionForScope(scope);
-```
-
-### Safe Scope Creation
-
-```dart
-// Create scopes with detection automatically enabled
-final safeRootScope = CherryPick.openSafeRootScope(); // Local detection enabled
-final globalSafeRootScope = CherryPick.openGlobalSafeRootScope(); // Both local and global enabled
-final safeSubScope = CherryPick.openSafeSubScope(parentScope); // Inherits parent settings
-```
-
-## Performance Considerations
-
-| Detection Type | Overhead | Recommended Usage |
-|----------------|----------|-------------------|
-| **Local** | Minimal (~5%) | Development, Testing |
-| **Global** | Moderate (~15%) | Complex hierarchies, Critical features |
-| **Disabled** | None | Production (after testing) |
-
-### Recommendations
-
-- **Development**: Enable both local and global detection for maximum safety
-- **Testing**: Keep detection enabled to catch issues early
-- **Production**: Consider disabling for performance, but only after thorough testing
-
-```dart
-import 'package:flutter/foundation.dart';
-
-void configureCycleDetection() {
-  if (kDebugMode) {
-    // Enable full protection in debug mode
-    CherryPick.enableGlobalCycleDetection();
-    CherryPick.enableGlobalCrossScopeCycleDetection();
-  } else {
-    // Disable in release mode for performance
-    CherryPick.disableGlobalCycleDetection();
-    CherryPick.disableGlobalCrossScopeCycleDetection();
-  }
-}
-```
-
-## Architectural Patterns
-
-### Repository Pattern
-
-```dart
-// ✅ Correct: Repository doesn't depend on service
-class UserRepository {
-  final ApiClient apiClient;
-  UserRepository(this.apiClient);
-}
-
-class UserService {
-  final UserRepository repository;
-  UserService(this.repository);
-}
-
-// ❌ Incorrect: Circular dependency
-class UserRepository {
-  final UserService userService; // Don't do this!
-  UserRepository(this.userService);
-}
-```
-
-### Mediator Pattern
-
-```dart
-// ✅ Correct: Use mediator to break cycles
-abstract class EventBus {
-  void publish<T>(T event);
-  Stream<T> listen<T>();
-}
-
-class UserService {
-  final EventBus eventBus;
-  UserService(this.eventBus);
-  
-  void createUser(User user) {
-    // ... create user logic
-    eventBus.publish(UserCreatedEvent(user));
-  }
-}
-
-class OrderService {
-  final EventBus eventBus;
-  OrderService(this.eventBus) {
-    eventBus.listen<UserCreatedEvent>().listen(_onUserCreated);
-  }
-  
-  void _onUserCreated(UserCreatedEvent event) {
-    // React to user creation without direct dependency
-  }
-}
-```
-
-## Scope Hierarchy Best Practices
-
-### Proper Dependency Flow
-
-```dart
-// ✅ Correct: Dependencies flow downward in hierarchy
-// Root Scope: Core services
-final rootScope = CherryPick.openGlobalSafeRootScope();
-rootScope.installModules([
-  Module((bind) {
-    bind<DatabaseService>().singleton((scope) => DatabaseService());
-    bind<ApiClient>().singleton((scope) => ApiClient());
-  }),
-]);
-
-// Feature Scope: Feature-specific services
-final featureScope = rootScope.openSubScope();
-featureScope.installModules([
-  Module((bind) {
-    bind<UserRepository>().to((scope) => UserRepository(scope.resolve<ApiClient>()));
-    bind<UserService>().to((scope) => UserService(scope.resolve<UserRepository>()));
-  }),
-]);
-
-// UI Scope: UI-specific services
-final uiScope = featureScope.openSubScope();
-uiScope.installModules([
-  Module((bind) {
-    bind<UserController>().to((scope) => UserController(scope.resolve<UserService>()));
-  }),
-]);
-```
-
-### Avoid Cross-Scope Dependencies
-
-```dart
-// ❌ Incorrect: Child scope depending on parent's specific services
-childScope.installModules([
-  Module((bind) {
-    bind<ChildService>().to((scope) => 
-      ChildService(rootScope.resolve<ParentService>()) // Risky!
-    );
-  }),
-]);
-
-// ✅ Correct: Use interfaces and proper dependency injection
-abstract class IParentService {
-  void doSomething();
-}
-
-class ParentService implements IParentService {
-  void doSomething() { /* implementation */ }
-}
-
-// In root scope
-rootScope.installModules([
-  Module((bind) {
-    bind<IParentService>().to((scope) => ParentService());
-  }),
-]);
-
-// In child scope - resolve through normal hierarchy
-childScope.installModules([
-  Module((bind) {
-    bind<ChildService>().to((scope) => 
-      ChildService(scope.resolve<IParentService>()) // Safe!
-    );
-  }),
-]);
-```
-
-## Debug Mode
-
-### Resolution Chain Tracking
-
-```dart
-// Enable debug mode to track resolution chains
-final scope = CherryPick.openGlobalSafeRootScope();
-
-// Access current resolution chain for debugging
-print('Current resolution chain: ${scope.currentResolutionChain}');
-
-// Access global resolution chain
-print('Global resolution chain: ${GlobalCycleDetector.instance.currentGlobalResolutionChain}');
-```
-
-### Exception Details
-
-```dart
-try {
-  final service = scope.resolve<CircularService>();
-} on CircularDependencyException catch (e) {
-  print('Error: ${e.message}');
-  print('Dependency chain: ${e.dependencyChain.join(' -> ')}');
-  
-  // For global detection, additional context is available
-  if (e.message.contains('cross-scope')) {
-    print('This is a cross-scope circular dependency');
-  }
-}
-```
-
-## Testing Integration
-
-### Unit Tests
-
-```dart
-import 'package:test/test.dart';
-import 'package:cherrypick/cherrypick.dart';
-
-void main() {
-  group('Circular Dependency Detection', () {
-    setUp(() {
-      // Enable detection for tests
-      CherryPick.enableGlobalCycleDetection();
-      CherryPick.enableGlobalCrossScopeCycleDetection();
-    });
-    
-    tearDown(() {
-      // Clean up after tests
-      CherryPick.disableGlobalCycleDetection();
-      CherryPick.disableGlobalCrossScopeCycleDetection();
-    });
-    
-    test('should detect circular dependency', () {
-      final scope = CherryPick.openGlobalSafeRootScope();
-      
-      scope.installModules([
-        Module((bind) {
-          bind<ServiceA>().to((scope) => ServiceA(scope.resolve<ServiceB>()));
-          bind<ServiceB>().to((scope) => ServiceB(scope.resolve<ServiceA>()));
-        }),
-      ]);
-      
-      expect(
-        () => scope.resolve<ServiceA>(),
-        throwsA(isA<CircularDependencyException>()),
-      );
-    });
-  });
-}
-```
-
-### Integration Tests
-
-```dart
-testWidgets('should handle circular dependencies in widget tree', (tester) async {
-  // Enable detection
-  CherryPick.enableGlobalCycleDetection();
-  
-  await tester.pumpWidget(
-    CherryPickProvider(
-      create: () {
-        final scope = CherryPick.openGlobalSafeRootScope();
-        // Configure modules that might have cycles
-        return scope;
-      },
-      child: MyApp(),
-    ),
-  );
-  
-  // Test that circular dependencies are properly handled
-  expect(find.text('Error: Circular dependency detected'), findsNothing);
-});
-```
-
-## Migration Guide
-
-### From Version 2.1.x to 2.2.x
-
-1. **Update dependencies**:
-   ```yaml
-   dependencies:
-     cherrypick: ^2.2.0
-   ```
-
-2. **Enable detection in existing code**:
-   ```dart
-   // Before
-   final scope = Scope(null);
-   
-   // After - with local detection
-   final scope = CherryPick.openSafeRootScope();
-   
-   // Or with global detection
-   final scope = CherryPick.openGlobalSafeRootScope();
-   ```
-
-3. **Update error handling**:
-   ```dart
-   try {
-     final service = scope.resolve<MyService>();
-   } on CircularDependencyException catch (e) {
-     // Handle circular dependency errors
-     logger.error('Circular dependency detected: ${e.dependencyChain}');
-   }
-   ```
-
-4. **Configure for production**:
-   ```dart
-   void main() {
-     // Configure detection based on build mode
-     if (kDebugMode) {
-       CherryPick.enableGlobalCycleDetection();
-       CherryPick.enableGlobalCrossScopeCycleDetection();
-     }
-     
-     runApp(MyApp());
-   }
-   ```
-
-## API Reference
-
-### Scope Methods
-
-```dart
-class Scope {
-  // Local cycle detection
-  void enableCycleDetection();
-  void disableCycleDetection();
-  bool get isCycleDetectionEnabled;
-  List<String> get currentResolutionChain;
-  
-  // Global cycle detection
-  void enableGlobalCycleDetection();
-  void disableGlobalCycleDetection();
-  bool get isGlobalCycleDetectionEnabled;
-}
-```
-
-### CherryPick Helper Methods
-
-```dart
-class CherryPick {
-  // Global settings
-  static void enableGlobalCycleDetection();
-  static void disableGlobalCycleDetection();
-  static bool get isGlobalCycleDetectionEnabled;
-  
-  static void enableGlobalCrossScopeCycleDetection();
-  static void disableGlobalCrossScopeCycleDetection();
-  static bool get isGlobalCrossScopeCycleDetectionEnabled;
-  
-  // Per-scope settings
-  static void enableCycleDetectionForScope(Scope scope);
-  static void disableCycleDetectionForScope(Scope scope);
-  static void enableGlobalCycleDetectionForScope(Scope scope);
-  static void disableGlobalCycleDetectionForScope(Scope scope);
-  
-  // Safe scope creation
-  static Scope openSafeRootScope();
-  static Scope openGlobalSafeRootScope();
-  static Scope openSafeSubScope(Scope parent);
-}
-```
-
-### Exception Classes
-
-```dart
-class CircularDependencyException implements Exception {
-  final String message;
-  final List<String> dependencyChain;
-  
-  const CircularDependencyException(this.message, this.dependencyChain);
-  
-  @override
-  String toString() {
-    final chain = dependencyChain.join(' -> ');
-    return 'CircularDependencyException: $message\nDependency chain: $chain';
-  }
-}
-```
-
-## Best Practices
-
-### 1. Enable Detection During Development
-
-```dart
-void main() {
-  if (kDebugMode) {
-    CherryPick.enableGlobalCycleDetection();
-    CherryPick.enableGlobalCrossScopeCycleDetection();
-  }
-  
-  runApp(MyApp());
-}
-```
-
-### 2. Use Safe Scope Creation
-
-```dart
-// Instead of
-final scope = Scope(null);
-
-// Use
-final scope = CherryPick.openGlobalSafeRootScope();
-```
-
-### 3. Design Proper Architecture
-
-- Follow single responsibility principle
-- Use interfaces to decouple dependencies
-- Implement mediator pattern for complex interactions
-- Keep dependency flow unidirectional in scope hierarchy
-
-### 4. Handle Errors Gracefully
-
-```dart
-T resolveSafely<T>() {
-  try {
-    return scope.resolve<T>();
-  } on CircularDependencyException catch (e) {
-    logger.error('Circular dependency detected', e);
-    rethrow;
-  }
-}
-```
-
-### 5. Test Thoroughly
-
-- Write unit tests for dependency configurations
-- Use integration tests to verify complex scenarios
-- Enable detection in test environments
-- Test both positive and negative scenarios
-
-## Troubleshooting
-
-### Common Issues
-
-1. **False Positives**: If you're getting false circular dependency errors, check if you have proper async handling in your providers.
-
-2. **Performance Issues**: If global detection is too slow, consider using only local detection or disabling it in production.
-
-3. **Complex Hierarchies**: For very complex scope hierarchies, consider simplifying your architecture or using more interfaces.
-
-### Debug Tips
-
-1. **Check Resolution Chain**: Use `scope.currentResolutionChain` to see the current dependency resolution path.
-
-2. **Enable Logging**: Add logging to your providers to trace dependency resolution.
-
-3. **Simplify Dependencies**: Break complex dependencies into smaller, more manageable pieces.
-
-4. **Use Interfaces**: Abstract dependencies behind interfaces to reduce coupling.
-
-## Conclusion
-
-Circular dependency detection in CherryPick provides robust protection against infinite loops and stack overflow errors. By following the best practices and using the appropriate detection level for your use case, you can build reliable and maintainable dependency injection configurations.
-
-For more information, see the [main documentation](../README.md) and [examples](../example/).

doc/cycle_detection.ru.md

@@ -1,572 +0,0 @@
-# Обнаружение циклических зависимостей
-
-CherryPick предоставляет надежное обнаружение циклических зависимостей для предотвращения бесконечных циклов и ошибок переполнения стека в вашей настройке внедрения зависимостей.
-
-## Что такое циклические зависимости?
-
-Циклические зависимости возникают, когда два или более сервиса зависят друг от друга прямо или косвенно, создавая цикл в графе зависимостей.
-
-### Пример циклических зависимостей в рамках скоупа
-
-```dart
-class UserService {
-  final OrderService orderService;
-  UserService(this.orderService);
-}
-
-class OrderService {
-  final UserService userService;
-  OrderService(this.userService);
-}
-```
-
-### Пример циклических зависимостей между скоупами
-
-```dart
-// В родительском скоупе
-class ParentService {
-  final ChildService childService;
-  ParentService(this.childService); // Получает из дочернего скоупа
-}
-
-// В дочернем скоупе
-class ChildService {
-  final ParentService parentService;
-  ChildService(this.parentService); // Получает из родительского скоупа
-}
-```
-
-## Типы обнаружения
-
-### 🔍 Локальное обнаружение
-
-Обнаруживает циклические зависимости в рамках одного скоупа. Быстрое и эффективное.
-
-### 🌐 Глобальное обнаружение
-
-Обнаруживает циклические зависимости во всей иерархии скоупов. Более медленное, но обеспечивает полную защиту.
-
-## Использование
-
-### Локальное обнаружение
-
-```dart
-final scope = Scope(null);
-scope.enableCycleDetection(); // Включить локальное обнаружение
-
-scope.installModules([
-  Module((bind) {
-    bind<UserService>().to((scope) => UserService(scope.resolve<OrderService>()));
-    bind<OrderService>().to((scope) => OrderService(scope.resolve<UserService>()));
-  }),
-]);
-
-try {
-  final userService = scope.resolve<UserService>(); // Выбросит CircularDependencyException
-} catch (e) {
-  print(e); // CircularDependencyException: Circular dependency detected
-}
-```
-
-### Глобальное обнаружение
-
-```dart
-// Включить глобальное обнаружение для всех скоупов
-CherryPick.enableGlobalCrossScopeCycleDetection();
-
-final rootScope = CherryPick.openGlobalSafeRootScope();
-final childScope = rootScope.openSubScope();
-
-// Настроить зависимости, которые создают межскоуповые циклы
-rootScope.installModules([
-  Module((bind) {
-    bind<ParentService>().to((scope) => ParentService(childScope.resolve<ChildService>()));
-  }),
-]);
-
-childScope.installModules([
-  Module((bind) {
-    bind<ChildService>().to((scope) => ChildService(rootScope.resolve<ParentService>()));
-  }),
-]);
-
-try {
-  final parentService = rootScope.resolve<ParentService>(); // Выбросит CircularDependencyException
-} catch (e) {
-  print(e); // CircularDependencyException с детальной информацией о цепочке
-}
-```
-
-## API CherryPick Helper
-
-### Глобальные настройки
-
-```dart
-// Включить/отключить локальное обнаружение глобально
-CherryPick.enableGlobalCycleDetection();
-CherryPick.disableGlobalCycleDetection();
-
-// Включить/отключить глобальное межскоуповое обнаружение
-CherryPick.enableGlobalCrossScopeCycleDetection();
-CherryPick.disableGlobalCrossScopeCycleDetection();
-
-// Проверить текущие настройки
-bool localEnabled = CherryPick.isGlobalCycleDetectionEnabled;
-bool globalEnabled = CherryPick.isGlobalCrossScopeCycleDetectionEnabled;
-```
-
-### Настройки для конкретного скоупа
-
-```dart
-// Включить/отключить для конкретного скоупа
-CherryPick.enableCycleDetectionForScope(scope);
-CherryPick.disableCycleDetectionForScope(scope);
-
-// Включить/отключить глобальное обнаружение для конкретного скоупа
-CherryPick.enableGlobalCycleDetectionForScope(scope);
-CherryPick.disableGlobalCycleDetectionForScope(scope);
-```
-
-### Безопасное создание скоупов
-
-```dart
-// Создать скоупы с автоматически включенным обнаружением
-final safeRootScope = CherryPick.openSafeRootScope(); // Локальное обнаружение включено
-final globalSafeRootScope = CherryPick.openGlobalSafeRootScope(); // Включены локальное и глобальное
-final safeSubScope = CherryPick.openSafeSubScope(parentScope); // Наследует настройки родителя
-```
-
-## Соображения производительности
-
-| Тип обнаружения | Накладные расходы | Рекомендуемое использование |
-|-----------------|-------------------|----------------------------|
-| **Локальное** | Минимальные (~5%) | Разработка, тестирование |
-| **Глобальное** | Умеренные (~15%) | Сложные иерархии, критические функции |
-| **Отключено** | Нет | Продакшн (после тестирования) |
-
-### Рекомендации
-
-- **Разработка**: Включите локальное и глобальное обнаружение для максимальной безопасности
-- **Тестирование**: Оставьте обнаружение включенным для раннего выявления проблем
-- **Продакшн**: Рассмотрите отключение для производительности, но только после тщательного тестирования
-
-```dart
-import 'package:flutter/foundation.dart';
-
-void configureCycleDetection() {
-  if (kDebugMode) {
-    // Включить полную защиту в режиме отладки
-    CherryPick.enableGlobalCycleDetection();
-    CherryPick.enableGlobalCrossScopeCycleDetection();
-  } else {
-    // Отключить в релизном режиме для производительности
-    CherryPick.disableGlobalCycleDetection();
-    CherryPick.disableGlobalCrossScopeCycleDetection();
-  }
-}
-```
-
-## Архитектурные паттерны
-
-### Паттерн Repository
-
-```dart
-// ✅ Правильно: Repository не зависит от сервиса
-class UserRepository {
-  final ApiClient apiClient;
-  UserRepository(this.apiClient);
-}
-
-class UserService {
-  final UserRepository repository;
-  UserService(this.repository);
-}
-
-// ❌ Неправильно: Циклическая зависимость
-class UserRepository {
-  final UserService userService; // Не делайте так!
-  UserRepository(this.userService);
-}
-```
-
-### Паттерн Mediator
-
-```dart
-// ✅ Правильно: Используйте медиатор для разрыва циклов
-abstract class EventBus {
-  void publish<T>(T event);
-  Stream<T> listen<T>();
-}
-
-class UserService {
-  final EventBus eventBus;
-  UserService(this.eventBus);
-  
-  void createUser(User user) {
-    // ... логика создания пользователя
-    eventBus.publish(UserCreatedEvent(user));
-  }
-}
-
-class OrderService {
-  final EventBus eventBus;
-  OrderService(this.eventBus) {
-    eventBus.listen<UserCreatedEvent>().listen(_onUserCreated);
-  }
-  
-  void _onUserCreated(UserCreatedEvent event) {
-    // Реагировать на создание пользователя без прямой зависимости
-  }
-}
-```
-
-## Лучшие практики иерархии скоупов
-
-### Правильный поток зависимостей
-
-```dart
-// ✅ Правильно: Зависимости текут вниз по иерархии
-// Корневой скоуп: Основные сервисы
-final rootScope = CherryPick.openGlobalSafeRootScope();
-rootScope.installModules([
-  Module((bind) {
-    bind<DatabaseService>().singleton((scope) => DatabaseService());
-    bind<ApiClient>().singleton((scope) => ApiClient());
-  }),
-]);
-
-// Скоуп функции: Сервисы, специфичные для функции
-final featureScope = rootScope.openSubScope();
-featureScope.installModules([
-  Module((bind) {
-    bind<UserRepository>().to((scope) => UserRepository(scope.resolve<ApiClient>()));
-    bind<UserService>().to((scope) => UserService(scope.resolve<UserRepository>()));
-  }),
-]);
-
-// UI скоуп: Сервисы, специфичные для UI
-final uiScope = featureScope.openSubScope();
-uiScope.installModules([
-  Module((bind) {
-    bind<UserController>().to((scope) => UserController(scope.resolve<UserService>()));
-  }),
-]);
-```
-
-### Избегайте межскоуповых зависимостей
-
-```dart
-// ❌ Неправильно: Дочерний скоуп зависит от конкретных сервисов родителя
-childScope.installModules([
-  Module((bind) {
-    bind<ChildService>().to((scope) => 
-      ChildService(rootScope.resolve<ParentService>()) // Рискованно!
-    );
-  }),
-]);
-
-// ✅ Правильно: Используйте интерфейсы и правильное внедрение зависимостей
-abstract class IParentService {
-  void doSomething();
-}
-
-class ParentService implements IParentService {
-  void doSomething() { /* реализация */ }
-}
-
-// В корневом скоупе
-rootScope.installModules([
-  Module((bind) {
-    bind<IParentService>().to((scope) => ParentService());
-  }),
-]);
-
-// В дочернем скоупе - разрешение через обычную иерархию
-childScope.installModules([
-  Module((bind) {
-    bind<ChildService>().to((scope) => 
-      ChildService(scope.resolve<IParentService>()) // Безопасно!
-    );
-  }),
-]);
-```
-
-## Режим отладки
-
-### Отслеживание цепочки разрешения
-
-```dart
-// Включить режим отладки для отслеживания цепочек разрешения
-final scope = CherryPick.openGlobalSafeRootScope();
-
-// Доступ к текущей цепочке разрешения для отладки
-print('Текущая цепочка разрешения: ${scope.currentResolutionChain}');
-
-// Доступ к глобальной цепочке разрешения
-print('Глобальная цепочка разрешения: ${GlobalCycleDetector.instance.currentGlobalResolutionChain}');
-```
-
-### Детали исключений
-
-```dart
-try {
-  final service = scope.resolve<CircularService>();
-} on CircularDependencyException catch (e) {
-  print('Ошибка: ${e.message}');
-  print('Цепочка зависимостей: ${e.dependencyChain.join(' -> ')}');
-  
-  // Для глобального обнаружения доступен дополнительный контекст
-  if (e.message.contains('cross-scope')) {
-    print('Это межскоуповая циклическая зависимость');
-  }
-}
-```
-
-## Интеграция с тестированием
-
-### Модульные тесты
-
-```dart
-import 'package:test/test.dart';
-import 'package:cherrypick/cherrypick.dart';
-
-void main() {
-  group('Обнаружение циклических зависимостей', () {
-    setUp(() {
-      // Включить обнаружение для тестов
-      CherryPick.enableGlobalCycleDetection();
-      CherryPick.enableGlobalCrossScopeCycleDetection();
-    });
-    
-    tearDown(() {
-      // Очистка после тестов
-      CherryPick.disableGlobalCycleDetection();
-      CherryPick.disableGlobalCrossScopeCycleDetection();
-    });
-    
-    test('должен обнаружить циклическую зависимость', () {
-      final scope = CherryPick.openGlobalSafeRootScope();
-      
-      scope.installModules([
-        Module((bind) {
-          bind<ServiceA>().to((scope) => ServiceA(scope.resolve<ServiceB>()));
-          bind<ServiceB>().to((scope) => ServiceB(scope.resolve<ServiceA>()));
-        }),
-      ]);
-      
-      expect(
-        () => scope.resolve<ServiceA>(),
-        throwsA(isA<CircularDependencyException>()),
-      );
-    });
-  });
-}
-```
-
-### Интеграционные тесты
-
-```dart
-testWidgets('должен обрабатывать циклические зависимости в дереве виджетов', (tester) async {
-  // Включить обнаружение
-  CherryPick.enableGlobalCycleDetection();
-  
-  await tester.pumpWidget(
-    CherryPickProvider(
-      create: () {
-        final scope = CherryPick.openGlobalSafeRootScope();
-        // Настроить модули, которые могут иметь циклы
-        return scope;
-      },
-      child: MyApp(),
-    ),
-  );
-  
-  // Проверить, что циклические зависимости правильно обрабатываются
-  expect(find.text('Ошибка: Обнаружена циклическая зависимость'), findsNothing);
-});
-```
-
-## Руководство по миграции
-
-### С версии 2.1.x на 2.2.x
-
-1. **Обновите зависимости**:
-   ```yaml
-   dependencies:
-     cherrypick: ^2.2.0
-   ```
-
-2. **Включите обнаружение в существующем коде**:
-   ```dart
-   // Раньше
-   final scope = Scope(null);
-   
-   // Теперь - с локальным обнаружением
-   final scope = CherryPick.openSafeRootScope();
-   
-   // Или с глобальным обнаружением
-   final scope = CherryPick.openGlobalSafeRootScope();
-   ```
-
-3. **Обновите обработку ошибок**:
-   ```dart
-   try {
-     final service = scope.resolve<MyService>();
-   } on CircularDependencyException catch (e) {
-     // Обработать ошибки циклических зависимостей
-     logger.error('Обнаружена циклическая зависимость: ${e.dependencyChain}');
-   }
-   ```
-
-4. **Настройте для продакшна**:
-   ```dart
-   void main() {
-     // Настроить обнаружение в зависимости от режима сборки
-     if (kDebugMode) {
-       CherryPick.enableGlobalCycleDetection();
-       CherryPick.enableGlobalCrossScopeCycleDetection();
-     }
-     
-     runApp(MyApp());
-   }
-   ```
-
-## Справочник API
-
-### Методы Scope
-
-```dart
-class Scope {
-  // Локальное обнаружение циклов
-  void enableCycleDetection();
-  void disableCycleDetection();
-  bool get isCycleDetectionEnabled;
-  List<String> get currentResolutionChain;
-  
-  // Глобальное обнаружение циклов
-  void enableGlobalCycleDetection();
-  void disableGlobalCycleDetection();
-  bool get isGlobalCycleDetectionEnabled;
-}
-```
-
-### Методы CherryPick Helper
-
-```dart
-class CherryPick {
-  // Глобальные настройки
-  static void enableGlobalCycleDetection();
-  static void disableGlobalCycleDetection();
-  static bool get isGlobalCycleDetectionEnabled;
-  
-  static void enableGlobalCrossScopeCycleDetection();
-  static void disableGlobalCrossScopeCycleDetection();
-  static bool get isGlobalCrossScopeCycleDetectionEnabled;
-  
-  // Настройки для конкретного скоупа
-  static void enableCycleDetectionForScope(Scope scope);
-  static void disableCycleDetectionForScope(Scope scope);
-  static void enableGlobalCycleDetectionForScope(Scope scope);
-  static void disableGlobalCycleDetectionForScope(Scope scope);
-  
-  // Безопасное создание скоупов
-  static Scope openSafeRootScope();
-  static Scope openGlobalSafeRootScope();
-  static Scope openSafeSubScope(Scope parent);
-}
-```
-
-### Классы исключений
-
-```dart
-class CircularDependencyException implements Exception {
-  final String message;
-  final List<String> dependencyChain;
-  
-  const CircularDependencyException(this.message, this.dependencyChain);
-  
-  @override
-  String toString() {
-    final chain = dependencyChain.join(' -> ');
-    return 'CircularDependencyException: $message\nЦепочка зависимостей: $chain';
-  }
-}
-```
-
-## Лучшие практики
-
-### 1. Включайте обнаружение во время разработки
-
-```dart
-void main() {
-  if (kDebugMode) {
-    CherryPick.enableGlobalCycleDetection();
-    CherryPick.enableGlobalCrossScopeCycleDetection();
-  }
-  
-  runApp(MyApp());
-}
-```
-
-### 2. Используйте безопасное создание скоупов
-
-```dart
-// Вместо
-final scope = Scope(null);
-
-// Используйте
-final scope = CherryPick.openGlobalSafeRootScope();
-```
-
-### 3. Проектируйте правильную архитектуру
-
-- Следуйте принципу единственной ответственности
-- Используйте интерфейсы для разделения зависимостей
-- Реализуйте паттерн медиатор для сложных взаимодействий
-- Поддерживайте однонаправленный поток зависимостей в иерархии скоупов
-
-### 4. Обрабатывайте ошибки корректно
-
-```dart
-T resolveSafely<T>() {
-  try {
-    return scope.resolve<T>();
-  } on CircularDependencyException catch (e) {
-    logger.error('Обнаружена циклическая зависимость', e);
-    rethrow;
-  }
-}
-```
-
-### 5. Тестируйте тщательно
-
-- Пишите модульные тесты для конфигураций зависимостей
-- Используйте интеграционные тесты для проверки сложных сценариев
-- Включайте обнаружение в тестовых средах
-- Тестируйте как положительные, так и отрицательные сценарии
-
-## Устранение неполадок
-
-### Распространенные проблемы
-
-1. **Ложные срабатывания**: Если вы получаете ложные ошибки циклических зависимостей, проверьте правильность обработки async в ваших провайдерах.
-
-2. **Проблемы производительности**: Если глобальное обнаружение слишком медленное, рассмотрите использование только локального обнаружения или отключение в продакшне.
-
-3. **Сложные иерархии**: Для очень сложных иерархий скоупов рассмотрите упрощение архитектуры или использование большего количества интерфейсов.
-
-### Советы по отладке
-
-1. **Проверьте цепочку разрешения**: Используйте `scope.currentResolutionChain` для просмотра текущего пути разрешения зависимостей.
-
-2. **Включите логирование**: Добавьте логирование в ваши провайдеры для трассировки разрешения зависимостей.
-
-3. **Упростите зависимости**: Разбейте сложные зависимости на более мелкие, управляемые части.
-
-4. **Используйте интерфейсы**: Абстрагируйте зависимости за интерфейсами для уменьшения связанности.
-
-## Заключение
-
-Обнаружение циклических зависимостей в CherryPick обеспечивает надежную защиту от бесконечных циклов и ошибок переполнения стека. Следуя лучшим практикам и используя подходящий уровень обнаружения для вашего случая использования, вы можете создавать надежные и поддерживаемые конфигурации внедрения зависимостей.
-
-Для получения дополнительной информации см. [основную документацию](../README.md) и [примеры](../example/).

doc/full_tutorial_en.md

@@ -75,7 +75,7 @@ Allows you to create dependencies with runtime parameters, e.g., a service for a
 bind<UserService>().toProvideWithParams((userId) => UserService(userId));
 
 // Resolve:
-final userService = scope.resolve<UserService>(params: '123');
+final userService = scope.resolveWithParams<UserService>(params: '123');
 ```
 
 ---
@@ -177,14 +177,6 @@ final service = scope.tryResolve<OptionalService>(); // returns null if not exis
 
 ---
 
-### Fast Dependency Lookup (Performance Improvement)
-
-> **Performance Note:**  
-> **Starting from version 3.0.0**, CherryPick uses a Map-based resolver index for dependency lookup. This means calls to `resolve<T>()`, `tryResolve<T>()` and similar methods are now O(1) operations, regardless of the number of modules or bindings within your scope. Previously it would iterate over all modules and bindings, which could reduce performance as your project grew. This optimization is internal and does not affect the public API or usage patterns, but significantly improves resolution speed for larger applications.
-
----
-
-
 ## Dependency injection with annotations & code generation
 
 CherryPick supports DI with annotations, letting you eliminate manual DI setup.
@@ -313,7 +305,7 @@ final config = await scope.resolveAsync<RemoteConfig>();
 
 [`cherrypick_flutter`](https://pub.dev/packages/cherrypick_flutter) is the integration package for CherryPick DI in Flutter. It provides a convenient `CherryPickProvider` widget which sits in your widget tree and gives access to the root DI scope (and subscopes) from context.
 
-## Features
+### Features
 
 - **Global DI Scope Access:**  
   Use `CherryPickProvider` to access rootScope and subscopes anywhere in the widget tree.
@@ -356,26 +348,6 @@ class MyApp extends StatelessWidget {
 - You can create subscopes, e.g. for screens or modules:  
   `final subScope = CherryPickProvider.of(context).openSubScope(scopeName: "profileFeature");`
 
----
-
-## Logging
-
-To enable logging of all dependency injection (DI) events and errors in CherryPick, set the global logger before creating your scopes:
-
-```dart
-import 'package:cherrypick/cherrypick.dart';
-
-void main() {
-  // Set a global logger before any scopes are created
-  CherryPick.setGlobalLogger(PrintLogger()); // or your own custom logger
-  final scope = CherryPick.openRootScope();
-  // All DI events and cycle errors will now be sent to your logger
-}
-```
-
-- By default, CherryPick uses SilentLogger (no output in production).
-- Any dependency resolution, scope events, or cycle detection errors are logged via info/error on your logger.
-
 ---
 ## CherryPick is not just for Flutter!
 
@@ -407,6 +379,45 @@ You can use CherryPick in Dart CLI, server apps, and microservices. All major fe
 
 ---
 
+### Advanced: Customizing Generated Code Location
+
+CherryPick's code generator now supports flexible output configuration via `build.yaml`.
+
+You can control both the output directory (using `output_dir`) and filename templates (using `build_extensions`):
+
+```yaml
+targets:
+  $default:
+    builders:
+      cherrypick_generator|inject_generator:
+        options:
+          build_extensions:
+            '^lib/app.dart': ['lib/generated/app.inject.cherrypick.g.dart']
+          output_dir: lib/generated
+        generate_for:
+          - lib/**.dart
+      cherrypick_generator|module_generator:
+        options:
+          build_extensions:
+            '^lib/di/{{}}.dart': ['lib/generated/di/{{}}.module.cherrypick.g.dart']
+          output_dir: lib/generated
+        generate_for:
+          - lib/**.dart
+```
+
+- **output_dir**: Folder where all generated files will be placed.
+- **build_extensions**: Allows full customization of generated file names and subfolders.
+
+If you use these, be sure to update your imports accordingly, e.g.:
+```dart
+import 'package:your_project/generated/app.inject.cherrypick.g.dart';
+```
+If not specified, generated files will appear next to your source files, as before.
+
+---
+
+---
+
 ## Conclusion
 
 **CherryPick** is a modern DI solution for Dart and Flutter, combining a concise API and advanced annotation/codegen features. Scopes, parameterized providers, named bindings, and field-injection make it great for both small and large-scale projects.

doc/full_tutorial_ru.md

@@ -76,7 +76,7 @@ final api = scope.resolve<ApiClient>(named: 'mock');
 bind<UserService>().toProvideWithParams((userId) => UserService(userId));
 
 // Получение
-final userService = scope.resolve<UserService>(params: '123');
+final userService = scope.resolveWithParams<UserService>(params: '123');
 ```
 
 ---
@@ -178,13 +178,6 @@ final service = scope.tryResolve<OptionalService>(); // вернет null, ес
 
 ---
 
-### Быстрый поиск зависимостей (Performance Improvement)
-
-> **Примечание по производительности:**  
-> Начиная с версии **3.0.0**, CherryPick для поиска зависимости внутри scope использует Map-индекс. Благодаря этому методы `resolve<T>()`, `tryResolve<T>()` и аналогичные теперь работают за O(1), независимо от количества модулей и биндингов в вашем проекте. Ранее для поиска приходилось перебирать весь список вручную, что могло замедлять работу крупных приложений. Это внутреннее улучшение не меняет внешнего API или паттернов использования, но заметно ускоряет разрешение зависимостей на больших проектах.
-
----
-
 ## Внедрение зависимостей через аннотации и автогенерацию
 
 CherryPick поддерживает DI через аннотации, что позволяет полностью избавиться от ручного внедрения зависимостей.
@@ -358,26 +351,6 @@ class MyApp extends StatelessWidget {
 - Вы можете создавать подскоупы, если нужно, например, для экранов или модулей:  
   `final subScope = CherryPickProvider.of(context).openSubScope(scopeName: "profileFeature");`
 
----
-
-## Логирование
-
-Чтобы включить вывод логов о событиях и ошибках DI в CherryPick, настройте глобальный логгер до создания любых scope:
-
-```dart
-import 'package:cherrypick/cherrypick.dart';
-
-void main() {
-  // Установите глобальный логгер до создания scope
-  CherryPick.setGlobalLogger(PrintLogger()); // или свой логгер
-  final scope = CherryPick.openRootScope();
-  // Логи DI и циклов будут выводиться через ваш логгер
-}
-```
-
-- По умолчанию используется SilentLogger (нет логов в продакшене).
-- Любые ошибки резолва и события циклов логируются через info/error на логгере.
-
 ---
 ## CherryPick подходит не только для Flutter!
 
@@ -409,6 +382,45 @@ void main() {
 
 ---
 
+### Продвинутая настройка путей генерации кода
+
+В последних версиях генератора CherryPick добавлена поддержка гибкой настройки директорий и шаблонов имён файлов через `build.yaml`.
+
+Вы можете управлять и папкой назначения (через `output_dir`), и шаблоном имён (через `build_extensions`):
+
+```yaml
+targets:
+  $default:
+    builders:
+      cherrypick_generator|inject_generator:
+        options:
+          build_extensions:
+            '^lib/app.dart': ['lib/generated/app.inject.cherrypick.g.dart']
+          output_dir: lib/generated
+        generate_for:
+          - lib/**.dart
+      cherrypick_generator|module_generator:
+        options:
+          build_extensions:
+            '^lib/di/{{}}.dart': ['lib/generated/di/{{}}.module.cherrypick.g.dart']
+          output_dir: lib/generated
+        generate_for:
+          - lib/**.dart
+```
+
+- **output_dir**: Папка, куда будут складываться все сгенерированные файлы.
+- **build_extensions**: Полный контроль над именами итоговых файлов и подпапками.
+
+Если вы это используете, обязательно обновляйте импорты, например:
+```dart
+import 'package:your_project/generated/app.inject.cherrypick.g.dart';
+```
+Если не задать параметры, файлы будут сгенерированы рядом с исходными — как и раньше.
+
+---
+
+---
+
 ## Заключение
 
 **CherryPick** — это современное DI-решение для Dart и Flutter, сочетающее лаконичный API и расширенные возможности аннотирования и генерации кода. Гибкость Scopes, параметрические провайдеры, именованные биндинги и field-injection делают его особенно мощным как для небольших, так и для масштабных проектов.

doc/quick_start_en.md

@@ -19,7 +19,29 @@ There are two main methods for initializing a custom instance `toInstance ()` an
 
 Example:
 
-```dart
+```
+
+---
+
+## Advanced: Customizing Code Generation Output
+
+You can configure where generated files will be placed by updating your `build.yaml` (supports `output_dir` and `build_extensions`):
+
+```yaml
+targets:
+  $default:
+    builders:
+      cherrypick_generator|inject_generator:
+        options:
+          output_dir: lib/generated
+      cherrypick_generator|module_generator:
+        options:
+          output_dir: lib/generated
+```
+
+For full control and more examples, see the "Full Tutorial" or documentation on `build_extensions`.
+
+---
  // initializing a text string instance through a method toInstance()
  Binding<String>().toInstance("hello world");
 
@@ -79,24 +101,6 @@ Example:
     Cherrypick.closeRootScope();
 ```
 
-## Logging
-
-To enable logging of all dependency injection (DI) events and errors in CherryPick, set the global logger before creating your scopes:
-
-```dart
-import 'package:cherrypick/cherrypick.dart';
-
-void main() {
-  // Set a global logger before any scopes are created
-  CherryPick.setGlobalLogger(PrintLogger()); // or your own custom logger
-  final scope = CherryPick.openRootScope();
-  // All DI events and cycle errors will now be sent to your logger
-}
-```
-
-- By default, CherryPick uses SilentLogger (no output in production).
-- Any dependency resolution, scope events, or cycle detection errors are logged via info/error on your logger.
-
 ## Example app
 
 

doc/quick_start_ru.md

@@ -19,7 +19,29 @@ Binding - по сути это конфигуратор  для  пользов
 
 Пример:
 
-```dart
+```
+
+---
+
+## Продвинутая настройка генерации кода
+
+В файле `build.yaml` можно задать папку для сгенерированных файлов через параметр `output_dir` (а также использовать шаблон `build_extensions`):
+
+```yaml
+targets:
+  $default:
+    builders:
+      cherrypick_generator|inject_generator:
+        options:
+          output_dir: lib/generated
+      cherrypick_generator|module_generator:
+        options:
+          output_dir: lib/generated
+```
+
+Для полной настройки и шаблонов см. раздел “Полный гайд” или документацию по `build_extensions`.
+
+---
  // инициализация экземпляра текстовой строки через метод toInstance()
  Binding<String>().toInstance("hello world");
 
@@ -79,24 +101,6 @@ Scope - это контейнер, который хранит все дерев
     Cherrypick.closeRootScope();
 ```
 
-## Логирование
-
-Чтобы включить вывод логов о событиях и ошибках DI в CherryPick, настройте глобальный логгер до создания любых scope:
-
-```dart
-import 'package:cherrypick/cherrypick.dart';
-
-void main() {
-  // Установите глобальный логгер до создания scope
-  CherryPick.setGlobalLogger(PrintLogger()); // или свой логгер
-  final scope = CherryPick.openRootScope();
-  // Логи DI и циклов будут выводиться через ваш логгер
-}
-```
-
-- По умолчанию используется SilentLogger (нет логов в продакшене).
-- Любые ошибки резолва и события циклов логируются через info/error на логгере.
-
 ## Пример приложения
 
 

examples/client_app/pubspec.lock

@@ -127,28 +127,28 @@ packages:
       path: "../../cherrypick"
       relative: true
     source: path
-    version: "3.0.0-dev.3"
+    version: "2.2.0-dev.1"
   cherrypick_annotations:
     dependency: "direct main"
     description:
       path: "../../cherrypick_annotations"
       relative: true
     source: path
-    version: "1.1.0"
+    version: "1.1.0-dev.1"
   cherrypick_flutter:
     dependency: "direct main"
     description:
       path: "../../cherrypick_flutter"
       relative: true
     source: path
-    version: "1.1.3-dev.3"
+    version: "1.1.2-dev.1"
   cherrypick_generator:
     dependency: "direct dev"
     description:
       path: "../../cherrypick_generator"
       relative: true
     source: path
-    version: "1.1.0"
+    version: "1.1.0-dev.5"
   clock:
     dependency: transitive
     description:

examples/postly/build.yaml

@@ -0,0 +1,27 @@
+targets:
+  $default:
+    builders:
+      cherrypick_generator|inject_generator:
+        options:
+          build_extensions:
+            '^lib/app.dart': ['lib/generated/app.inject.cherrypick.g.dart']
+          output_dir: lib/generated
+        generate_for:
+          - lib/**.dart
+      cherrypick_generator|module_generator:
+        options:
+          build_extensions:
+            '^lib/di/{{}}.dart': ['lib/generated/di/{{}}.module.cherrypick.g.dart']
+          output_dir: lib/generated
+        generate_for:
+          - lib/**.dart
+
+#targets:
+#  $default:
+#    builders:
+#      cherrypick_generator|module_generator:
+#        generate_for:
+#          - lib/**.dart
+#      cherrypick_generator|inject_generator:
+#        generate_for:
+#          - lib/**.dart

examples/postly/lib/app.dart

@@ -7,7 +7,7 @@ import 'domain/repository/post_repository.dart';
 import 'presentation/bloc/post_bloc.dart';
 import 'router/app_router.dart';
 
-part 'app.inject.cherrypick.g.dart';
+part 'generated/app.inject.cherrypick.g.dart';
 
 @injectable()
 class MyApp extends StatelessWidget with _$MyApp {

examples/postly/lib/di/app_module.dart

@@ -5,7 +5,7 @@ import '../data/network/json_placeholder_api.dart';
 import '../data/post_repository_impl.dart';
 import '../domain/repository/post_repository.dart';
 
-part 'app_module.module.cherrypick.g.dart';
+part '../generated/di/app_module.module.cherrypick.g.dart';
 
 @module()
 abstract class AppModule extends Module {

examples/postly/lib/main.dart

@@ -1,18 +1,9 @@
 import 'package:cherrypick/cherrypick.dart';
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:postly/app.dart';
 import 'di/app_module.dart';
 
 void main() {
-  // Включаем cycle-detection только в debug/test
-  if (kDebugMode) {
-    CherryPick.setGlobalLogger(PrintLogger());
-    CherryPick.enableGlobalCycleDetection();
-    CherryPick.enableGlobalCrossScopeCycleDetection();
-  }
-
-  // Используем safe root scope для гарантии защиты
   CherryPick.openRootScope().installModules([$AppModule()]);
   runApp(MyApp());
 }

examples/postly/pubspec.lock

@@ -151,21 +151,21 @@ packages:
       path: "../../cherrypick"
       relative: true
     source: path
-    version: "3.0.0-dev.3"
+    version: "2.2.0-dev.1"
   cherrypick_annotations:
     dependency: "direct main"
     description:
       path: "../../cherrypick_annotations"
       relative: true
     source: path
-    version: "1.1.0"
+    version: "1.1.0-dev.1"
   cherrypick_generator:
     dependency: "direct dev"
     description:
       path: "../../cherrypick_generator"
       relative: true
     source: path
-    version: "1.1.0"
+    version: "1.1.0-dev.5"
   clock:
     dependency: transitive
     description:

melos.yaml

@@ -3,7 +3,6 @@ name: cherrypick_workspace
 sdkPath: .fvm/flutter_sdk
 
 packages:
-  - benchmark_di
   - cherrypick
   - cherrypick_flutter
   - cherrypick_annotations