added license header for src. Added changelog

refactored di library.
fixed binding and writed unit tests
2026-01-24 13:47:24 +00:00 · 2021-04-26 10:40:27 +03:00 · 2021-04-26 09:44:04 +03:00 · 2021-04-23 17:52:33 +03:00 · 2021-04-23 17:29:42 +03:00 · 2021-04-23 10:34:33 +03:00
124 changed files with 780 additions and 8000 deletions
--- a/.fvmrc
+++ b/.fvmrc
@@ -1,3 +0,0 @@
-{
-  "flutter": "3.24.2"
-}
--- a/.github/workflows/pipeline.yml
+++ b/.github/workflows/pipeline.yml
@@ -1,38 +0,0 @@
-name: Melos + FVM CI
-
-on:
-  push:
-    branches: [ "master" ]
-  pull_request:
-    branches: [ "master" ]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: dart-lang/setup-dart@v1
-        # также актуализация Flutter, если нужен fvm
-
-      - name: Install FVM
-        run: dart pub global activate fvm
-
-      - name: Install Flutter version via FVM
-        run: fvm install
-
-      # ВАЖНО: активируем melos через flutter, чтобы не было несовместимости
-      - name: Install Melos
-        run: fvm flutter pub global activate melos
-
-      - name: Bootstrap workspace
-        run: fvm flutter pub global run melos bootstrap
-
-      - name: CodeGen
-        run: fvm flutter pub global run melos run codegen
-
-      - name: Analyze all packages
-        run: fvm flutter pub global run melos run analyze
-
-      - name: Run all tests
-        run: fvm flutter pub global run melos run test
--- a/.gitignore
+++ b/.gitignore
@@ -1,20 +1,21 @@
-.DS_Store
-
-# FVM Version Cache
-.fvm/
+# See https://www.dartlang.org/guides/libraries/private-files

+# Files and directories created by pub
 .dart_tool/
-.idea/
-.vscode/
+.packages
+build/
+# If you're building an application, you may want to check-in your pubspec.lock
+pubspec.lock

+# Directory created by dartdoc
+# If you don't generate documentation locally you can remove this line.
+doc/api/

-**/*.g.dart
-**/*.gr.dart
-**/*.freezed.dart
-**/*.cherrypick_injectable.g.dart
-
-pubspec_overrides.yaml
-
-melos_cherrypick.iml
-melos_cherrypick_workspace.iml
-melos_cherrypick_flutter.iml
+# Avoid committing generated Javascript files:
+*.dart.js
+*.info.json      # Produced by the --dump-info flag.
+*.js             # When generated by dart2js. Don't specify *.js if your
+                 # project includes source files written in JavaScript.
+*.js_
+*.js.deps
+*.js.map
--- a/cherrypick/.gitlab-ci.yml
+++ b/cherrypick/.gitlab-ci.yml
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,272 +1,6 @@
-# Change Log
-
-All notable changes to this project will be documented in this file.
-See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
-
-## 2025-05-23
-
-### Changes

 ---

-Packages with breaking changes:
-
- - There are no breaking changes in this release.
-
-Packages with other changes:
-
- - [`cherrypick_annotations` - `v1.1.0-dev.1`](#cherrypick_annotations---v110-dev1)
- - [`cherrypick_generator` - `v1.1.0-dev.3`](#cherrypick_generator---v110-dev3)
-
---
-
-#### `cherrypick_annotations` - `v1.1.0-dev.1`
-
- - **FEAT**: implement InjectGenerator.
-
-#### `cherrypick_generator` - `v1.1.0-dev.3`
-
- - **FEAT**: implement InjectGenerator.
-
-
-## 2025-05-23
-
-### Changes
-
---
-
-Packages with breaking changes:
-
- - There are no breaking changes in this release.
-
-Packages with other changes:
-
- - [`cherrypick_generator` - `v1.1.0-dev.2`](#cherrypick_generator---v110-dev2)
-
---
-
-#### `cherrypick_generator` - `v1.1.0-dev.2`
-
- - **FIX**: update instance generator code.
-
-
-## 2025-05-22
-
-### Changes
-
---
-
-Packages with breaking changes:
-
- - There are no breaking changes in this release.
-
-Packages with other changes:
-
- - [`cherrypick` - `v2.2.0-dev.1`](#cherrypick---v220-dev1)
- - [`cherrypick_generator` - `v1.1.0-dev.1`](#cherrypick_generator---v110-dev1)
- - [`cherrypick_flutter` - `v1.1.2-dev.1`](#cherrypick_flutter---v112-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.2-dev.1`
-
---
-
-#### `cherrypick` - `v2.2.0-dev.1`
-
- - **FIX**: fix warnings.
-
-#### `cherrypick_generator` - `v1.1.0-dev.1`
-
- - **FIX**: optimize code.
-
-
-## 2025-05-22
-
-### Changes
-
---
-
-Packages with breaking changes:
-
- - There are no breaking changes in this release.
-
-Packages with other changes:
-
- - [`cherrypick` - `v2.2.0-dev.0`](#cherrypick---v220-dev0)
- - [`cherrypick_annotations` - `v1.1.0-dev.0`](#cherrypick_annotations---v110-dev0)
- - [`cherrypick_flutter` - `v1.1.2-dev.0`](#cherrypick_flutter---v112-dev0)
- - [`cherrypick_generator` - `v1.1.0-dev.0`](#cherrypick_generator---v110-dev0)
-
---
-
-#### `cherrypick` - `v2.2.0-dev.0`
-
- - **FEAT**: Add async dependency resolution and enhance example.
- - **FEAT**: implement toInstanceAync binding.
-
-#### `cherrypick_annotations` - `v1.1.0-dev.0`
-
- - **FEAT**: implement generator for dynamic params.
- - **FEAT**: implement instance/provide annotations.
- - **FEAT**: implement generator for named annotation.
- - **FEAT**: implement generator di module.
- - **FEAT**: implement annotations.
-
-#### `cherrypick_flutter` - `v1.1.2-dev.0`
-
- - **FIX**: fix warning.
- - **FIX**: fix warnings.
-
-#### `cherrypick_generator` - `v1.1.0-dev.0`
-
- - **FIX**: fix warning conflict with names.
- - **FIX**: fix warnings.
- - **FIX**: fix module generator.
- - **FIX**: fix generator for  singletone annotation.
- - **FEAT**: implement generator for dynamic params.
- - **FEAT**: implement async mode for instance/provide annotations.
- - **FEAT**: generate instance async code.
- - **FEAT**: implement instance/provide annotations.
- - **FEAT**: implement named dependency.
- - **FEAT**: implement generator for named annotation.
- - **FEAT**: implement generator di module.
- - **FEAT**: implement annotations.
-
-
-## 2025-05-19
-
-### Changes
-
---
-
-Packages with breaking changes:
-
- - [`cherrypick_flutter` - `v1.1.1`](#cherrypick_flutter---v111)
-
-Packages with other changes:
-
- - [`cherrypick` - `v2.1.0`](#cherrypick---v210)
-
-Packages graduated to a stable release (see pre-releases prior to the stable version for changelog entries):
-
- - `cherrypick` - `v2.1.0`
- - `cherrypick_flutter` - `v1.1.1`
-
---
-
-#### `cherrypick_flutter` - `v1.1.1`
-
-#### `cherrypick` - `v2.1.0`
-
-
-## 2025-05-16
-
-### Changes
-
---
-
-Packages with breaking changes:
-
- - There are no breaking changes in this release.
-
-Packages with other changes:
-
- - [`cherrypick` - `v2.1.0-dev.1`](#cherrypick---v210-dev1)
- - [`cherrypick_flutter` - `v1.1.1-dev.1`](#cherrypick_flutter---v111-dev1)
-
---
-
-#### `cherrypick` - `v2.1.0-dev.1`
-
- - **FIX**: fix warnings.
- - **FIX**: fix warnings.
- - **FIX**: support passing params when resolving dependency recursively in parent scope.
- - **FEAT**: Add async dependency resolution and enhance example.
- - **FEAT**: Add async dependency resolution and enhance example.
-
-#### `cherrypick_flutter` - `v1.1.1-dev.1`
-
- - **FIX**: fix warnings.
-
-
-## 2025-05-16
-
-### Changes
-
---
-
-Packages with breaking changes:
-
- - There are no breaking changes in this release.
-
-Packages with other changes:
-
- - [`cherrypick` - `v2.0.2`](#cherrypick---v202)
- - [`cherrypick_flutter` - `v1.1.1`](#cherrypick_flutter---v111)
-
-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.1`
-
---
-
-#### `cherrypick` - `v2.0.2`
-
- - **FIX**: support passing params when resolving dependency recursively in parent scope.
-
-
-## 2025-05-03
-
-### Changes
-
---
-
-Packages with breaking changes:
-
- - There are no breaking changes in this release.
-
-Packages with other changes:
-
- - [`cherrypick_flutter` - `v1.1.0`](#cherrypick_flutter---v110)
-
---
-
-#### `cherrypick_flutter` - `v1.1.0`
-
- - **FIX**: update description.
- - **FIX**: update gitignore.
- - **FEAT**: modify api in CherryPickProvider.
-
-
-## 2025-05-02
-
-### Changes
-
---
-
-Packages with breaking changes:
-
- - There are no breaking changes in this release.
-
-Packages with other changes:
-
- - [`cherrypick` - `v2.0.1`](#cherrypick---v201)
- - [`cherrypick_flutter` - `v1.0.1`](#cherrypick_flutter---v101)
-
-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.0.1`
-
---
-
-#### `cherrypick` - `v2.0.1`
-
- - **FIX**: fix warning.
+0.1.0  Initial release

+---
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -1,4 +0,0 @@
-# Contributors
-
- Sergey Penkovsky <sergey.penkovsky@gmail.com>
- Klim Yaroshevich <yarashevich_kv@st.by>
--- a/README.md
+++ b/README.md
@@ -1,145 +1,13 @@
-# CherryPick Workspace
+# dart_di

-CherryPick Workspace is a modular, open-source dependency injection ecosystem for Dart and Flutter, designed to offer lightweight, flexible, and scalable DI suitable for both backend and frontend (Flutter) development. This monorepo contains the main DI runtime library, annotation helpers, code generation for modular bindings, and seamless Flutter integration.
+Experimental development of DI in the Dart language

---
+- [New Api ENG](/doc/quick_start_en.md)
+- [New Api RU](/doc/quick_start_ru.md)

-## Packages Overview

- **[`cherrypick`](./cherrypick)**  
-  The core dependency injection library. Supports modular bindings, hierarchical scopes, named and singleton bindings, provider functions (sync/async), runtime parameters, and test-friendly composition.  
-  _Intended for use in pure Dart and Flutter projects._
+### Features

- **[`cherrypick_annotations`](./cherrypick_annotations)**  
-  A set of Dart annotations (`@module`, `@singleton`, `@instance`, `@provide`, `@named`, `@params`) enabling concise, declarative DI modules and providers, primarily for use with code generation tools.
-
- **[`cherrypick_generator`](./cherrypick_generator)**  
-  A [source_gen](https://pub.dev/packages/source_gen)-based code generator that automatically converts your annotated modules and providers into ready-to-use boilerplate for registration and resolution within your app.  
-  _Reduces manual wiring and errors; compatible with build_runner._
-
- **[`cherrypick_flutter`](./cherrypick_flutter)**  
-  Adds Flutter-native integration, exposing DI scopes and modules to the widget tree through `CherryPickProvider` and enabling dependency management throughout your Flutter app.
-
---
-
-## Why CherryPick?
-
- **Zero-overhead and intuitive API:**  
-  Clean, minimal syntax, strong typing, powerful binding lifecycle control.
- **High testability:**  
-  Supports overriding and hierarchical scope trees.
- **Both Sync & Async support:**  
-  Register and resolve async providers, factories, and dependencies.
- **Seamless code generation:**  
-  Effortless setup with annotations + generator—skip boilerplate!
- **Works with or without Flutter.**
- **Production ready:**  
-  Robust enough for apps, packages, and server-side Dart.
- **Extensible & Modular:**  
-  Add bindings at runtime, use sub-modules, or integrate via codegen.
-
---
-
-## Get Started
-
-### 1. Add dependencies
-
-In your `pubspec.yaml`:
-
-```yaml
-dependencies:
-  cherrypick: ^<latest-version>
-  cherrypick_annotations: ^<latest-version>
-
-dev_dependencies:
-  build_runner: ^<latest>
-  cherrypick_generator: ^<latest-version>
-```
-
-For Flutter projects, add:
-
-```yaml
-dependencies:
-  cherrypick_flutter: ^<latest-version>
-```
-
-### 2. Write a DI Module (with annotations)
-
-```dart
-import 'package:cherrypick_annotations/cherrypick_annotations.dart';
-import 'package:cherrypick/cherrypick.dart';
-
-@module()
-abstract class MyModule extends Module {
-  @singleton()
-  ApiClient apiClient() => ApiClient();
-
-  @provide()
-  DataRepository dataRepo(ApiClient client) => DataRepository(client);
-
-  @provide()
-  String greeting(@params() String name) => 'Hello, $name!';
-}
-```
-
-### 3. Generate the bindings
-
-```sh
-dart run build_runner build
-# or for Flutter:
-flutter pub run build_runner build
-```
-
-The generator will create a `$MyModule` class with binding code.
-
-### 4. Install and Resolve
-
-```dart
-final scope = CherryPick.openRootScope()
-  ..installModules([$MyModule()]);
-
-final repo = scope.resolve<DataRepository>();
-final greeting = scope.resolveWithParams<String>('John'); // 'Hello, John!'
-```
-
-_For Flutter, wrap your app with `CherryPickProvider` for DI scopes in the widget tree:_
-
-```dart
-void main() {
-  runApp(
-    CherryPickProvider(child: MyApp()),
-  );
-}
-```
-
---
-
-## Features at a Glance
-
- ⚡ **Fast, lightweight DI** for any Dart/Flutter project
- 🧩 **Modular & hierarchical scopes** (root, subscopes)
- 🔖 **Named/bound/singleton instances** out of the box
- 🔄 **Sync and async provider support**
- ✏️ **Runtime parameters for dynamic factory methods**
- 🏷️ **Code generator** for annotation-based DI setup (`cherrypick_generator`)
- 🕹️ **Deep Flutter integration** via `CherryPickProvider`
-
---
-
-## Example Usage
-
-Please see:
- [`cherrypick/README.md`](./cherrypick/README.md) for core DI features and examples
- [`cherrypick_flutter/README.md`](./cherrypick_flutter/README.md) for Flutter-specific usage
- [`cherrypick_annotations/README.md`](./cherrypick_annotations/README.md) and [`cherrypick_generator/README.md`](./cherrypick_generator/README.md) for codegen and annotations
-
---
-
-## Contribution & License
-
- **Contributions:** PRs, issues, and feedback are welcome on [GitHub](https://github.com/pese-git/cherrypick).
- **License:** Apache 2.0 for all packages in this workspace.
-
---
-
-**Happy Cherry Picking! 🍒**
+- [x] Scope
+- [x] Sub scope
+- [x] Initialization instance with name
--- a/cherrypick/.fvmrc
+++ b/cherrypick/.fvmrc
@@ -1,4 +0,0 @@
-{
-  "flutter": "3.24.2",
-  "flavors": {}
-}
--- a/cherrypick/.gitignore
+++ b/cherrypick/.gitignore
@@ -1,24 +0,0 @@
-# See https://www.dartlang.org/guides/libraries/private-files
-
-# Files and directories created by pub
-.dart_tool/
-.packages
-build/
-# If you're building an application, you may want to check-in your pubspec.lock
-pubspec.lock
-
-# Directory created by dartdoc
-# If you don't generate documentation locally you can remove this line.
-doc/api/
-
-# Avoid committing generated Javascript files:
-*.dart.js
-*.info.json      # Produced by the --dump-info flag.
-*.js             # When generated by dart2js. Don't specify *.js if your
-                 # project includes source files written in JavaScript.
-*.js_
-*.js.deps
-*.js.map
-
-# FVM Version Cache
-.fvm/
--- a/cherrypick/AUTHORS.md
+++ b/cherrypick/AUTHORS.md
@@ -1 +0,0 @@
-Sergey Penkovsky <sergey.penkovsky@gmail.com>
--- a/cherrypick/CHANGELOG.md
+++ b/cherrypick/CHANGELOG.md
@@ -1,69 +0,0 @@
-## 2.2.0-dev.1
-
- - **FIX**: fix warnings.
-
-## 2.2.0-dev.0
-
- - **FEAT**: Add async dependency resolution and enhance example.
- - **FEAT**: implement toInstanceAync binding.
-
-## 2.1.0
-
- - Graduate package to a stable release. See pre-releases prior to this version for changelog entries.
-
-## 2.1.0-dev.1
-
- - **FIX**: fix warnings.
- - **FIX**: fix warnings.
- - **FIX**: support passing params when resolving dependency recursively in parent scope.
- - **FEAT**: Add async dependency resolution and enhance example.
- - **FEAT**: Add async dependency resolution and enhance example.
-
-## 2.0.2
- **FIX**: support passing params when resolving dependency recursively in parent scope.
-
-## 2.1.0-dev.0
-
- - **FEAT**: Add async dependency resolution and enhance example.
-
-## 2.0.1
- **FIX**: fix warning.
-
-## 2.0.0
- **FEAT**: support for Dart 3.0.
-
-## 1.1.0
- **FEAT**: verified Dart 3.0 support.
-
-## 1.0.4
- **FIX**: Fixed exception "ConcurrentModificationError".
-
-## 1.0.3
- **FEAT**: Added provider with params.
-
-## 1.0.2
- **DOCS**: Updated docs and fixed syntax error.
-
-## 1.0.1
- **FIX**: Fixed syntax error.
-
-## 1.0.0
- **REFACTOR**: Refactored code and added experimental API.
-
-## 0.1.2+1
- **FIX**: Fixed initialization error.
-
-## 0.1.2
- **FIX**: Fixed warnings in code.
-
-## 0.1.1+2
- **MAINT**: Updated libraries and fixed warnings.
-
-## 0.1.1+1
- **MAINT**: Updated pubspec and readme.md.
-
-## 0.1.1
- **MAINT**: Updated pubspec.
-
-## 0.1.0
- **INIT**: Initial release.
--- a/cherrypick/LICENSE
+++ b/cherrypick/LICENSE
@@ -1,201 +0,0 @@
-                                 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.
--- a/cherrypick/README.md
+++ b/cherrypick/README.md
@@ -1,255 +0,0 @@
-# CherryPick
-
-`cherrypick` is a flexible and lightweight dependency injection library for Dart and Flutter. It provides an easy-to-use system for registering, scoping, and resolving dependencies using modular bindings and hierarchical scopes. The design enables cleaner architecture, testability, and modular code in your applications.
-
-## Key Concepts
-
-### Binding
-
-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
- Named instances for resolving by string key
- Optional singleton lifecycle
-
-#### Example
-
-```dart
-// Provide a direct instance
-Binding<String>().toInstance("Hello world");
-
-// Provide an async direct instance
-Binding<String>().toInstanceAsync(Future.value("Hello world"));
-
-// Provide a lazy sync instance using a factory
-Binding<String>().toProvide(() => "Hello world");
-
-// Provide a lazy async instance using a factory
-Binding<String>().toProvideAsync(() async => "Hello async world");
-
-// Provide an instance with dynamic parameters (sync)
-Binding<String>().toProvideWithParams((params) => "Hello $params");
-
-// Provide an instance with dynamic parameters (async)
-Binding<String>().toProvideAsyncWithParams((params) async => "Hello $params");
-
-// Named instance for retrieval by name
-Binding<String>().toProvide(() => "Hello world").withName("my_string");
-
-// Mark as singleton (only one instance within the scope)
-Binding<String>().toProvide(() => "Hello world").singleton();
-```
-
-### Module
-
-A **Module** is a logical collection point for bindings, designed for grouping and initializing related dependencies. Implement the `builder` method to define how dependencies should be bound within the scope.
-
-#### Example
-
-```dart
-class AppModule extends Module {
-  @override
-  void builder(Scope currentScope) {
-    bind<ApiClient>().toInstance(ApiClientMock());
-    bind<String>().toProvide(() => "Hello world!");
-  }
-}
-```
-
-### Scope
-
-A **Scope** manages a tree of modules and dependency instances. Scopes can be nested into hierarchies (parent-child), supporting modular app composition and context-specific overrides.
-
-You typically work with the root scope, but can also create named subscopes as needed.
-
-#### Example
-
-```dart
-// Open the main/root scope
-final rootScope = CherryPick.openRootScope();
-
-// Install a custom module
-rootScope.installModules([AppModule()]);
-
-// Resolve a dependency synchronously
-final str = rootScope.resolve<String>();
-
-// Resolve a dependency asynchronously
-final result = await rootScope.resolveAsync<String>();
-
-// Close the root scope once done
-CherryPick.closeRootScope();
-```
-
-#### Working with Subscopes
-
-```dart
-// Open a named child scope (e.g., for a feature/module)
-final subScope = rootScope.openSubScope('featureScope')
-  ..installModules([FeatureModule()]);
-
-// Resolve from subScope, with fallback to parents if missing
-final dataBloc = await subScope.resolveAsync<DataBloc>();
-```
-
-### Dependency Lookup API
-
- `resolve<T>()` — Locates a dependency instance or throws if missing.
- `resolveAsync<T>()` — Async variant for dependencies requiring async binding.
- `tryResolve<T>()` — Returns `null` if not found (sync).
- `tryResolveAsync<T>()` — Returns `null` async if not found.
-
-Supports:
- Synchronous and asynchronous dependencies
- Named dependencies
- Provider functions with and without runtime parameters
-
-## Example Application
-
-Below is a complete example illustrating modules, subscopes, async providers, and dependency resolution.
-
-```dart
-import 'dart:async';
-import 'package:meta/meta.dart';
-import 'package:cherrypick/cherrypick.dart';
-
-class AppModule extends Module {
-  @override
-  void builder(Scope currentScope) {
-    bind<ApiClient>().withName("apiClientMock").toInstance(ApiClientMock());
-    bind<ApiClient>().withName("apiClientImpl").toInstance(ApiClientImpl());
-  }
-}
-
-class FeatureModule extends Module {
-  final bool isMock;
-  FeatureModule({required this.isMock});
-  @override
-  void builder(Scope currentScope) {
-    // Async provider for DataRepository with named dependency selection
-    bind<DataRepository>()
-        .withName("networkRepo")
-        .toProvideAsync(() async {
-          final client = await Future.delayed(
-            Duration(milliseconds: 100),
-            () => currentScope.resolve<ApiClient>(
-              named: isMock ? "apiClientMock" : "apiClientImpl",
-            ),
-          );
-          return NetworkDataRepository(client);
-        })
-        .singleton();
-
-    // Chained async provider for DataBloc
-    bind<DataBloc>().toProvideAsync(
-      () async {
-        final repo = await currentScope.resolveAsync<DataRepository>(
-            named: "networkRepo");
-        return DataBloc(repo);
-      },
-    );
-  }
-}
-
-void main() async {
-  final scope = CherryPick.openRootScope().installModules([AppModule()]);
-  final featureScope = scope.openSubScope("featureScope")
-    ..installModules([FeatureModule(isMock: true)]);
-
-  final dataBloc = await featureScope.resolveAsync<DataBloc>();
-  dataBloc.data.listen(
-    (d) => print('Received data: $d'),
-    onError: (e) => print('Error: $e'),
-    onDone: () => print('DONE'),
-  );
-
-  await dataBloc.fetchData();
-}
-
-class DataBloc {
-  final DataRepository _dataRepository;
-  Stream<String> get data => _dataController.stream;
-  final StreamController<String> _dataController = StreamController.broadcast();
-
-  DataBloc(this._dataRepository);
-
-  Future<void> fetchData() async {
-    try {
-      _dataController.sink.add(await _dataRepository.getData());
-    } catch (e) {
-      _dataController.sink.addError(e);
-    }
-  }
-
-  void dispose() {
-    _dataController.close();
-  }
-}
-
-abstract class DataRepository {
-  Future<String> getData();
-}
-
-class NetworkDataRepository implements DataRepository {
-  final ApiClient _apiClient;
-  final _token = 'token';
-  NetworkDataRepository(this._apiClient);
-
-  @override
-  Future<String> getData() async =>
-      await _apiClient.sendRequest(
-        url: 'www.google.com',
-        token: _token,
-        requestBody: {'type': 'data'},
-      );
-}
-
-abstract class ApiClient {
-  Future sendRequest({@required String? url, String? token, Map? requestBody});
-}
-
-class ApiClientMock implements ApiClient {
-  @override
-  Future sendRequest(
-      {@required String? url, String? token, Map? requestBody}) async {
-    return 'Local Data';
-  }
-}
-
-class ApiClientImpl implements ApiClient {
-  @override
-  Future sendRequest(
-      {@required String? url, String? token, Map? requestBody}) async {
-    return 'Network data';
-  }
-}
-```
-
-## Features
-
- [x] Main Scope and Named Subscopes
- [x] Named Instance Binding and Resolution
- [x] Asynchronous and Synchronous Providers
- [x] Providers Supporting Runtime Parameters
- [x] Singleton Lifecycle Management
- [x] Modular and Hierarchical Composition
- [x] Null-safe Resolution (tryResolve/tryResolveAsync)
-
-## Contributing
-
-Contributions are welcome! Please open issues or submit pull requests on [GitHub](https://github.com/pese-git/cherrypick).
-
-## License
-
-Licensed under the [Apache License 2.0](http://www.apache.org/licenses/LICENSE-2.0).
-
---
-
-**Important:** 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 specific language governing permissions and limitations under the License.
-
-## Links
-
- [GitHub Repository](https://github.com/pese-git/cherrypick)
--- a/cherrypick/analysis_options.yaml
+++ b/cherrypick/analysis_options.yaml
@@ -1,30 +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
-
-# 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
--- a/cherrypick/example/bin/main.dart
+++ b/cherrypick/example/bin/main.dart
@@ -1,112 +0,0 @@
-import 'dart:async';
-import 'package:cherrypick/cherrypick.dart';
-
-class AppModule extends Module {
-  @override
-  void builder(Scope currentScope) {
-    bind<ApiClient>().withName("apiClientMock").toInstance(ApiClientMock());
-    bind<ApiClient>().withName("apiClientImpl").toInstance(ApiClientImpl());
-  }
-}
-
-class FeatureModule extends Module {
-  final bool isMock;
-
-  FeatureModule({required this.isMock});
-
-  @override
-  void builder(Scope currentScope) {
-    // Using toProvideAsync for async initialization
-    bind<DataRepository>().withName("networkRepo").toProvideAsync(() async {
-      final client = await Future.delayed(
-          Duration(milliseconds: 100),
-          () => currentScope.resolve<ApiClient>(
-              named: isMock ? "apiClientMock" : "apiClientImpl"));
-      return NetworkDataRepository(client);
-    }).singleton();
-
-    // Asynchronous initialization of DataBloc
-    bind<DataBloc>().toProvideAsync(
-      () async {
-        final repo = await currentScope.resolveAsync<DataRepository>(
-            named: "networkRepo");
-        return DataBloc(repo);
-      },
-    );
-  }
-}
-
-Future<void> main() async {
-  try {
-    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'));
-
-    await dataBloc.fetchData();
-  } catch (e) {
-    print('Error resolving dependency: $e');
-  }
-}
-
-class DataBloc {
-  final DataRepository _dataRepository;
-
-  final StreamController<String> _dataController = StreamController.broadcast();
-  Stream<String> get data => _dataController.stream;
-
-  DataBloc(this._dataRepository);
-
-  Future<void> fetchData() async {
-    try {
-      _dataController.sink.add(await _dataRepository.getData());
-    } catch (e) {
-      _dataController.sink.addError(e);
-    }
-  }
-
-  void dispose() {
-    _dataController.close();
-  }
-}
-
-abstract class DataRepository {
-  Future<String> getData();
-}
-
-class NetworkDataRepository implements DataRepository {
-  final ApiClient _apiClient;
-  final _token = 'token';
-
-  NetworkDataRepository(this._apiClient);
-
-  @override
-  Future<String> getData() async => await _apiClient.sendRequest(
-      url: 'www.google.com', token: _token, requestBody: {'type': 'data'});
-}
-
-abstract class ApiClient {
-  Future sendRequest({String url, String token, Map requestBody});
-}
-
-class ApiClientMock implements ApiClient {
-  @override
-  Future sendRequest({String? url, String? token, Map? requestBody}) async {
-    return 'Local Data';
-  }
-}
-
-class ApiClientImpl implements ApiClient {
-  @override
-  Future sendRequest({String? url, String? token, Map? requestBody}) async {
-    return 'Network data';
-  }
-}
--- a/cherrypick/lib/cherrypick.dart
+++ b/cherrypick/lib/cherrypick.dart
@@ -1,19 +0,0 @@
-library;
-
-//
-// 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.
-//
-
-export 'package:cherrypick/src/binding.dart';
-export 'package:cherrypick/src/helper.dart';
-export 'package:cherrypick/src/module.dart';
-export 'package:cherrypick/src/scope.dart';
--- a/cherrypick/lib/src/binding.dart
+++ b/cherrypick/lib/src/binding.dart
@@ -1,190 +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.
-//
-
-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.
-///
-class Binding<T> {
-  late Mode _mode;
-  late Type _key;
-  late String _name;
-  T? _instance;
-  Future<T>? _instanceAsync;
-  Provider<T>? _provider;
-  ProviderWithParams<T>? _providerWithParams;
-
-  AsyncProvider<T>? asyncProvider;
-  AsyncProviderWithParams<T>? asyncProviderWithParams;
-
-  late bool _isSingleton = false;
-  late bool _isNamed = false;
-
-  Binding() {
-    _mode = Mode.simple;
-    _key = T;
-  }
-
-  /// 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.
-  ///
-  /// return [Type]
-  Type get key => _key;
-
-  /// RU: Метод возвращает имя экземпляра.
-  /// ENG: The method returns the name of the instance.
-  ///
-  /// return [String]
-  String get name => _name;
-
-  /// RU: Метод проверяет сингелтон экземпляр или нет.
-  /// ENG: The method checks the singleton instance or not.
-  ///
-  /// return [bool]
-  bool get isSingleton => _isSingleton;
-
-  /// 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].
-  ///
-  /// return [Binding]
-  Binding<T> withName(String name) {
-    _name = name;
-    _isNamed = true;
-    return this;
-  }
-
-  /// RU: Инициализация экземляпяра [value].
-  /// ENG: Initialization instance [value].
-  ///
-  /// return [Binding]
-  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;
-  }
-
-  /// RU: Инициализация экземляпяра  через провайдер [value].
-  /// ENG: Initialization instance via provider [value].
-  ///
-  /// return [Binding]
-  Binding<T> toProvide(Provider<T> value) {
-    _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;
-  }
-
-  /// RU: Инициализация экземляпяра  через провайдер [value] c динамическим параметром.
-  /// ENG: Initialization instance via provider [value] with a dynamic param.
-  ///
-  /// return [Binding]
-  Binding<T> toProvideWithParams(ProviderWithParams<T> value) {
-    _mode = Mode.providerInstanceWithParams;
-    _providerWithParams = value;
-    return this;
-  }
-
-  /// 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].
-  /// ENG: Initialization instance as a singelton [value].
-  ///
-  /// return [Binding]
-  Binding<T> singleton() {
-    _isSingleton = true;
-    return this;
-  }
-
-  /// 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 _provider?.call();
-  }
-
-  /// RU: Поиск экземпляра с параметром.
-  ///
-  /// ENG: Resolve instance with [params].
-  ///
-  /// return [T]
-  T? providerWithParams(dynamic params) {
-    return _providerWithParams?.call(params);
-  }
-}
--- a/cherrypick/lib/src/factory.dart
+++ b/cherrypick/lib/src/factory.dart
@@ -1,17 +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 'package:cherrypick/src/scope.dart';
-
-abstract class Factory<T> {
-  T createInstance(Scope scope);
-}
--- a/cherrypick/lib/src/helper.dart
+++ b/cherrypick/lib/src/helper.dart
@@ -1,105 +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 'package:cherrypick/src/scope.dart';
-import 'package:meta/meta.dart';
-
-Scope? _rootScope;
-
-class CherryPick {
-  /// RU: Метод открывает главный [Scope].
-  /// ENG: The method opens the main [Scope].
-  ///
-  /// return
-  static Scope openRootScope() {
-    _rootScope ??= Scope(null);
-    return _rootScope!;
-  }
-
-  /// RU: Метод закрывает главный [Scope].
-  /// ENG: The method close the main [Scope].
-  ///
-  ///
-  static void closeRootScope() {
-    if (_rootScope != null) {
-      _rootScope = null;
-    }
-  }
-
-  /// RU: Метод открывает  дочерний [Scope].
-  /// ENG: The method open the child [Scope].
-  ///
-  /// Дочерний [Scope] открывается с [scopeName]
-  /// Child [Scope] open with [scopeName]
-  ///
-  /// Example:
-  /// ```
-  /// final String scopeName = 'firstScope.secondScope';
-  /// final subScope = CherryPick.openScope(scopeName);
-  /// ```
-  ///
-  ///
-  @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');
-    }
-
-    return nameParts.fold(
-        openRootScope(),
-        (Scope previousValue, String element) =>
-            previousValue.openSubScope(element));
-  }
-
-  /// RU: Метод открывает  дочерний [Scope].
-  /// ENG: The method open the child [Scope].
-  ///
-  /// Дочерний [Scope] открывается с [scopeName]
-  /// Child [Scope] open with [scopeName]
-  ///
-  /// Example:
-  /// ```
-  /// final String scopeName = 'firstScope.secondScope';
-  /// final subScope = CherryPick.closeScope(scopeName);
-  /// ```
-  ///
-  ///
-  @experimental
-  static void closeScope({String scopeName = '', String separator = '.'}) {
-    if (scopeName.isEmpty) {
-      closeRootScope();
-    }
-
-    final nameParts = scopeName.split(separator);
-    if (nameParts.isEmpty) {
-      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 previousValue, String element) =>
-              previousValue.openSubScope(element));
-      scope.closeSubScope(lastPart);
-    } else {
-      openRootScope().closeSubScope(nameParts[0]);
-    }
-  }
-}
--- a/cherrypick/lib/src/scope.dart
+++ b/cherrypick/lib/src/scope.dart
@@ -1,183 +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/binding.dart';
-import 'package:cherrypick/src/module.dart';
-
-Scope openRootScope() => Scope(null);
-
-class Scope {
-  final Scope? _parentScope;
-
-  /// RU: Метод возвращает родительский [Scope].
-  ///
-  /// ENG: The method returns the parent [Scope].
-  ///
-  /// return [Scope]
-  Scope? get parentScope => _parentScope;
-
-  final Map<String, Scope> _scopeMap = HashMap();
-
-  Scope(this._parentScope);
-
-  final Set<Module> _modulesList = HashSet();
-
-  /// RU: Метод открывает дочерний (дополнительный) [Scope].
-  ///
-  /// ENG: The method opens child (additional) [Scope].
-  ///
-  /// return [Scope]
-  Scope openSubScope(String name) {
-    if (!_scopeMap.containsKey(name)) {
-      _scopeMap[name] = Scope(this);
-    }
-    return _scopeMap[name]!;
-  }
-
-  /// RU: Метод закрывает дочерний (дополнительный) [Scope].
-  ///
-  /// ENG: The method closes child (additional) [Scope].
-  ///
-  /// return [Scope]
-  void closeSubScope(String name) {
-    _scopeMap.remove(name);
-  }
-
-  /// RU: Метод инициализирует пользовательские модули в  [Scope].
-  ///
-  /// ENG: The method initializes custom modules in [Scope].
-  ///
-  /// return [Scope]
-  Scope installModules(List<Module> modules) {
-    _modulesList.addAll(modules);
-    for (var module in modules) {
-      module.builder(this);
-    }
-    return this;
-  }
-
-  /// RU: Метод удаляет пользовательские модули из [Scope].
-  ///
-  /// ENG: This method removes custom modules from [Scope].
-  ///
-  /// return [Scope]
-  Scope dropModules() {
-    // [AlexeyYuPopkov](https://github.com/AlexeyYuPopkov) Thank you for the [Removed exception "ConcurrentModificationError"](https://github.com/pese-git/cherrypick/pull/2)
-    _modulesList.clear();
-
-    return this;
-  }
-
-  /// RU: Возвращает найденную зависимость, определенную параметром типа [T].
-  /// Выдает [StateError], если зависимость не может быть разрешена.
-  /// Если вы хотите получить [null], если зависимость не может быть найдена,
-  /// то используйте вместо этого [tryResolve]
-  /// return - возвращает объект типа [T]  или [StateError]
-  ///
-  /// ENG: Returns the found dependency specified by the type parameter [T].
-  /// Throws [StateError] if the dependency cannot be resolved.
-  /// If you want to get [null] if the dependency cannot be found then use [tryResolve] instead
-  /// return - returns an object of type [T] or [StateError]
-  ///
-  T resolve<T>({String? named, dynamic params}) {
-    var resolved = tryResolve<T>(named: named, params: params);
-    if (resolved != null) {
-      return resolved;
-    } else {
-      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}) {
-    // 1 Поиск зависимости по всем модулям текущего скоупа
-    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].
-  /// Выдает [StateError], если зависимость не может быть разрешена.
-  /// Если хотите получить [null], если зависимость не может быть найдена, используйте [tryResolveAsync].
-  /// return - возвращает объект типа [T] or [StateError]
-  ///
-  /// ENG: Asynchronously returns the found dependency specified by the type parameter [T].
-  /// Throws [StateError] if the dependency cannot be resolved.
-  /// If you want to get [null] if the dependency cannot be found, use [tryResolveAsync] instead.
-  /// return - returns an object of type [T] or [StateError]
-  ///
-  Future<T> resolveAsync<T>({String? named, dynamic params}) async {
-    var resolved = await tryResolveAsync<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 (_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;
-            }
-
-            if (binding.asyncProvider != null) {
-              return await binding.asyncProvider?.call();
-            }
-
-            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);
-  }
-}
--- a/cherrypick/pubspec.yaml
+++ b/cherrypick/pubspec.yaml
@@ -1,20 +0,0 @@
-name: cherrypick
-description: Cherrypick is a small dependency injection (DI) library for dart/flutter projects.
-version: 2.2.0-dev.1
-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
-
-environment:
-  sdk: ">=3.5.2 <4.0.0"
-
-dependencies:
-  meta: ^1.3.0
-
-dev_dependencies:
-  lints: ^5.0.0
-  test: ^1.25.15
-
-  mockito: ^5.0.6
-  melos: ^6.3.2
--- a/cherrypick/test/src/binding_test.dart
+++ b/cherrypick/test/src/binding_test.dart
@@ -1,271 +0,0 @@
-import 'package:cherrypick/src/binding.dart';
-import 'package:test/test.dart';
-
-void main() {
-  // --- Instance binding (synchronous) ---
-  group('Instance Binding (toInstance)', () {
-    group('Without name', () {
-      test('Returns null by default', () {
-        final binding = Binding<int>();
-        expect(binding.instance, null);
-      });
-
-      test('Sets mode to instance', () {
-        final binding = Binding<int>().toInstance(5);
-        expect(binding.mode, Mode.instance);
-      });
-
-      test('isSingleton is true', () {
-        final binding = Binding<int>().toInstance(5);
-        expect(binding.isSingleton, true);
-      });
-
-      test('Stores value', () {
-        final binding = Binding<int>().toInstance(5);
-        expect(binding.instance, 5);
-      });
-    });
-
-    group('With name', () {
-      test('Returns null by default', () {
-        final binding = Binding<int>().withName('n');
-        expect(binding.instance, null);
-      });
-
-      test('Sets mode to instance', () {
-        final binding = Binding<int>().withName('n').toInstance(5);
-        expect(binding.mode, Mode.instance);
-      });
-
-      test('Sets key', () {
-        final binding = Binding<int>().withName('n').toInstance(5);
-        expect(binding.key, int);
-      });
-
-      test('isSingleton is true', () {
-        final binding = Binding<int>().withName('n').toInstance(5);
-        expect(binding.isSingleton, true);
-      });
-
-      test('Stores value', () {
-        final binding = Binding<int>().withName('n').toInstance(5);
-        expect(binding.instance, 5);
-      });
-
-      test('Sets name', () {
-        final binding = Binding<int>().withName('n').toInstance(5);
-        expect(binding.name, 'n');
-      });
-    });
-
-    test('Multiple toInstance calls change value', () {
-      final binding = Binding<int>().toInstance(1).toInstance(2);
-      expect(binding.instance, 2);
-    });
-  });
-
-  // --- Instance binding (asynchronous) ---
-  group('Async Instance Binding (toInstanceAsync)', () {
-    test('Resolves instanceAsync with expected value', () async {
-      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>().toInstanceAsync(Future.value(5));
-      expect(binding.mode, Mode.instance);
-    });
-
-    test('isSingleton is true after toInstanceAsync', () {
-      final binding = Binding<int>().toInstanceAsync(Future.value(5));
-      expect(binding.isSingleton, isTrue);
-    });
-
-    test('Composes with withName', () async {
-      final binding = Binding<int>()
-          .withName('asyncValue')
-          .toInstanceAsync(Future.value(7));
-      expect(binding.isNamed, isTrue);
-      expect(binding.name, 'asyncValue');
-      expect(await binding.instanceAsync, 7);
-    });
-
-    test('Keeps value after multiple awaits', () async {
-      final binding = Binding<int>().toInstanceAsync(Future.value(123));
-      final result1 = await binding.instanceAsync;
-      final result2 = await binding.instanceAsync;
-      expect(result1, equals(result2));
-    });
-  });
-
-  // --- Provider binding (synchronous) ---
-  group('Provider Binding (toProvide)', () {
-    group('Without name', () {
-      test('Returns null by default', () {
-        final binding = Binding<int>();
-        expect(binding.provider, null);
-      });
-
-      test('Sets mode to providerInstance', () {
-        final binding = Binding<int>().toProvide(() => 5);
-        expect(binding.mode, Mode.providerInstance);
-      });
-
-      test('isSingleton is false by default', () {
-        final binding = Binding<int>().toProvide(() => 5);
-        expect(binding.isSingleton, false);
-      });
-
-      test('Returns provided value', () {
-        final binding = Binding<int>().toProvide(() => 5);
-        expect(binding.provider, 5);
-      });
-    });
-
-    group('With name', () {
-      test('Returns null by default', () {
-        final binding = Binding<int>().withName('n');
-        expect(binding.provider, null);
-      });
-
-      test('Sets mode to providerInstance', () {
-        final binding = Binding<int>().withName('n').toProvide(() => 5);
-        expect(binding.mode, Mode.providerInstance);
-      });
-
-      test('Sets key', () {
-        final binding = Binding<int>().withName('n').toProvide(() => 5);
-        expect(binding.key, int);
-      });
-
-      test('isSingleton is false by default', () {
-        final binding = Binding<int>().withName('n').toProvide(() => 5);
-        expect(binding.isSingleton, false);
-      });
-
-      test('Returns provided value', () {
-        final binding = Binding<int>().withName('n').toProvide(() => 5);
-        expect(binding.provider, 5);
-      });
-
-      test('Sets name', () {
-        final binding = Binding<int>().withName('n').toProvide(() => 5);
-        expect(binding.name, 'n');
-      });
-    });
-  });
-
-  // --- Async provider binding ---
-  group('Async Provider Binding', () {
-    test('Resolves asyncProvider value', () async {
-      final binding = Binding<int>().toProvideAsync(() async => 5);
-      expect(await binding.asyncProvider?.call(), 5);
-    });
-
-    test('Resolves asyncProviderWithParams value', () async {
-      final binding = Binding<int>()
-          .toProvideAsyncWithParams((param) async => 5 + (param as int));
-      expect(await binding.asyncProviderWithParams?.call(3), 8);
-    });
-  });
-
-  // --- Singleton provider binding ---
-  group('Singleton Provider Binding', () {
-    group('Without name', () {
-      test('Returns null if no provider set', () {
-        final binding = Binding<int>().singleton();
-        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', () {
-        final binding = Binding<int>().toProvide(() => 5).singleton();
-        expect(binding.isSingleton, true);
-      });
-
-      test('Returns singleton value', () {
-        final binding = Binding<int>().toProvide(() => 5).singleton();
-        expect(binding.provider, 5);
-      });
-
-      test('Returns same value each call and provider only called once', () {
-        int counter = 0;
-        final binding = Binding<int>().toProvide(() {
-          counter++;
-          return counter;
-        }).singleton();
-
-        final first = binding.provider;
-        final second = binding.provider;
-        expect(first, equals(second));
-        expect(counter, 1);
-      });
-    });
-
-    group('With name', () {
-      test('Returns null if no provider set', () {
-        final binding = Binding<int>().withName('n').singleton();
-        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', () {
-        final binding =
-            Binding<int>().withName('n').toProvide(() => 5).singleton();
-        expect(binding.key, int);
-      });
-
-      test('isSingleton is true', () {
-        final binding =
-            Binding<int>().withName('n').toProvide(() => 5).singleton();
-        expect(binding.isSingleton, true);
-      });
-
-      test('Returns singleton value', () {
-        final binding =
-            Binding<int>().withName('n').toProvide(() => 5).singleton();
-        expect(binding.provider, 5);
-      });
-
-      test('Sets name', () {
-        final binding =
-            Binding<int>().withName('n').toProvide(() => 5).singleton();
-        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 ---
-  group('Named binding & helpers', () {
-    test('withName sets isNamed true and stores name', () {
-      final binding = Binding<int>().withName('foo');
-      expect(binding.isNamed, true);
-      expect(binding.name, 'foo');
-    });
-
-    test('providerWithParams returns null if not set', () {
-      final binding = Binding<int>();
-      expect(binding.providerWithParams(123), null);
-    });
-  });
-}
--- a/cherrypick/test/src/scope_test.dart
+++ b/cherrypick/test/src/scope_test.dart
@@ -1,208 +0,0 @@
-import 'package:cherrypick/src/module.dart';
-import 'package:cherrypick/src/scope.dart';
-import 'package:test/test.dart';
-
-void main() {
-  // --------------------------------------------------------------------------
-  group('Scope & Subscope Management', () {
-    test('Scope has no parent if constructed with null', () {
-      final scope = Scope(null);
-      expect(scope.parentScope, null);
-    });
-
-    test('Can open and retrieve the same subScope by key', () {
-      final scope = Scope(null);
-      final subScope = scope.openSubScope('subScope');
-      expect(scope.openSubScope('subScope'), subScope);
-    });
-
-    test('closeSubScope removes subscope so next openSubScope returns new', () {
-      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 scope = Scope(null);
-      expect(() => scope.resolve<String>(), throwsA(isA<StateError>()));
-    });
-
-    test('Resolves value after adding a dependency', () {
-      final expectedValue = 'test string';
-      final scope = Scope(null)
-          .installModules([TestModule<String>(value: expectedValue)]);
-      expect(scope.resolve<String>(), expectedValue);
-    });
-
-    test('Returns a value from parent scope', () {
-      final expectedValue = 5;
-      final parentScope = Scope(null);
-      final scope = Scope(parentScope);
-
-      parentScope.installModules([TestModule<int>(value: expectedValue)]);
-
-      expect(scope.resolve<int>(), expectedValue);
-    });
-
-    test('Returns several values from parent container', () {
-      final expectedIntValue = 5;
-      final expectedStringValue = 'Hello world';
-      final parentScope = Scope(null).installModules([
-        TestModule<int>(value: expectedIntValue),
-        TestModule<String>(value: expectedStringValue)
-      ]);
-      final scope = Scope(parentScope);
-
-      expect(scope.resolve<int>(), expectedIntValue);
-      expect(scope.resolve<String>(), expectedStringValue);
-    });
-
-    test("Throws StateError if parent hasn't value too", () {
-      final parentScope = Scope(null);
-      final scope = Scope(parentScope);
-      expect(() => scope.resolve<int>(), throwsA(isA<StateError>()));
-    });
-
-    test("After dropModules resolves fail", () {
-      final scope = Scope(null)..installModules([TestModule<int>(value: 5)]);
-      expect(scope.resolve<int>(), 5);
-      scope.dropModules();
-      expect(() => scope.resolve<int>(), throwsA(isA<StateError>()));
-    });
-  });
-
-  // --------------------------------------------------------------------------
-  group('Named Dependencies', () {
-    test('Resolve named binding', () {
-      final scope = Scope(null)
-        ..installModules([
-          TestModule<String>(value: "first"),
-          TestModule<String>(value: "second", name: "special")
-        ]);
-      expect(scope.resolve<String>(named: "special"), "second");
-      expect(scope.resolve<String>(), "first");
-    });
-
-    test('Named binding does not clash with unnamed', () {
-      final scope = Scope(null)
-        ..installModules([
-          TestModule<String>(value: "foo", name: "bar"),
-        ]);
-      expect(() => scope.resolve<String>(), throwsA(isA<StateError>()));
-      expect(scope.resolve<String>(named: "bar"), "foo");
-    });
-
-    test("tryResolve returns null for missing named", () {
-      final scope = Scope(null)
-        ..installModules([
-          TestModule<String>(value: "foo"),
-        ]);
-      expect(scope.tryResolve<String>(named: "bar"), isNull);
-    });
-  });
-
-  // --------------------------------------------------------------------------
-  group('Provider with parameters', () {
-    test('Resolve dependency using providerWithParams', () {
-      final scope = Scope(null)
-        ..installModules([
-          _InlineModule((m, s) {
-            m.bind<int>().toProvideWithParams((param) => (param as int) * 2);
-          }),
-        ]);
-      expect(scope.resolve<int>(params: 3), 6);
-      expect(() => scope.resolve<int>(), throwsA(isA<StateError>()));
-    });
-  });
-
-  // --------------------------------------------------------------------------
-  group('Async Resolution', () {
-    test('Resolve async instance', () async {
-      final scope = Scope(null)
-        ..installModules([
-          _InlineModule((m, s) {
-            m.bind<String>().toInstanceAsync(Future.value('async value'));
-          }),
-        ]);
-      expect(await scope.resolveAsync<String>(), "async value");
-    });
-
-    test('Resolve async provider', () async {
-      final scope = Scope(null)
-        ..installModules([
-          _InlineModule((m, s) {
-            m.bind<int>().toProvideAsync(() async => 7);
-          }),
-        ]);
-      expect(await scope.resolveAsync<int>(), 7);
-    });
-
-    test('Resolve async provider with param', () async {
-      final scope = Scope(null)
-        ..installModules([
-          _InlineModule((m, s) {
-            m.bind<int>().toProvideAsyncWithParams((x) async => (x as int) * 3);
-          }),
-        ]);
-      expect(await scope.resolveAsync<int>(params: 2), 6);
-      expect(() => scope.resolveAsync<int>(), throwsA(isA<StateError>()));
-    });
-
-    test('tryResolveAsync returns null for missing', () async {
-      final scope = Scope(null);
-      final result = await scope.tryResolveAsync<String>();
-      expect(result, isNull);
-    });
-  });
-
-  // --------------------------------------------------------------------------
-  group('Optional resolution and error handling', () {
-    test("tryResolve returns null for missing dependency", () {
-      final scope = Scope(null);
-      expect(scope.tryResolve<int>(), isNull);
-    });
-
-    // Не реализован:
-    // test("Container bind() throws state error (if it's parent already has a resolver)", () {
-    //   final parentScope = new Scope(null).installModules([TestModule<String>(value: "string one")]);
-    //   final scope = new Scope(parentScope);
-
-    //   expect(
-    //       () => scope.installModules([TestModule<String>(value: "string two")]),
-    //       throwsA(isA<StateError>()));
-    // });
-  });
-}
-
-// ----------------------------------------------------------------------------
-// Вспомогательные модули
-
-class TestModule<T> extends Module {
-  final T value;
-  final String? name;
-
-  TestModule({required this.value, this.name});
-  @override
-  void builder(Scope currentScope) {
-    if (name == null) {
-      bind<T>().toInstance(value);
-    } else {
-      bind<T>().withName(name!).toInstance(value);
-    }
-  }
-}
-
-/// Вспомогательный модуль для подстановки builder'а через конструктор
-class _InlineModule extends Module {
-  final void Function(Module, Scope) _builder;
-  _InlineModule(this._builder);
-
-  @override
-  void builder(Scope s) => _builder(this, s);
-}
--- a/cherrypick_annotations/.gitignore
+++ b/cherrypick_annotations/.gitignore
@@ -1,26 +0,0 @@
-# See https://www.dartlang.org/guides/libraries/private-files
-
-# Files and directories created by pub
-.dart_tool/
-.packages
-build/
-# If you're building an application, you may want to check-in your pubspec.lock
-pubspec.lock
-
-# Directory created by dartdoc
-# If you don't generate documentation locally you can remove this line.
-doc/api/
-
-# Avoid committing generated Javascript files:
-*.dart.js
-*.info.json      # Produced by the --dump-info flag.
-*.js             # When generated by dart2js. Don't specify *.js if your
-                 # project includes source files written in JavaScript.
-*.js_
-*.js.deps
-*.js.map
-
-# FVM Version Cache
-.fvm/
-
-melos_cherrypick_annotations.iml
--- a/cherrypick_annotations/CHANGELOG.md
+++ b/cherrypick_annotations/CHANGELOG.md
@@ -1,15 +0,0 @@
-## 1.1.0-dev.1
-
- - **FEAT**: implement InjectGenerator.
-
-## 1.1.0-dev.0
-
- - **FEAT**: implement generator for dynamic params.
- - **FEAT**: implement instance/provide annotations.
- - **FEAT**: implement generator for named annotation.
- - **FEAT**: implement generator di module.
- - **FEAT**: implement annotations.
-
-## 1.0.0
-
- Initial version.
--- a/cherrypick_annotations/LICENSE
+++ b/cherrypick_annotations/LICENSE
@@ -1,201 +0,0 @@
-                                 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.
--- a/cherrypick_annotations/README.md
+++ b/cherrypick_annotations/README.md
@@ -1,157 +0,0 @@
-# cherrypick_annotations
-
-[![License](https://img.shields.io/badge/license-Apache%202.0-blue.svg)](LICENSE)
-
-A lightweight set of Dart annotations designed for dependency injection (DI) frameworks and code generation, inspired by modern approaches like Dagger and Injectable. Works best in tandem with [`cherrypick_generator`](https://pub.dev/packages/cherrypick_generator).
-
---
-
-## Features
-
- **@module** – Marks a class as a DI module for service/provider registration.
- **@singleton** – Declares that a method or class should be provided as a singleton.
- **@instance** – Marks a method or class so that a new instance is provided on each request (not a singleton).
- **@provide** – Marks a method whose return value should be registered as a provider, supporting dependency injection into parameters.
- **@named** – Assigns a string name to a binding for keyed resolution.
- **@params** – Indicates that a parameter should be injected with runtime-supplied arguments.
-
-These annotations streamline DI configuration and serve as markers for code generation tools such as [`cherrypick_generator`](https://pub.dev/packages/cherrypick_generator).
-
---
-
-## Getting Started
-
-### 1. Add dependency
-
-```yaml
-dependencies:
-  cherrypick_annotations: ^latest
-```
-
-Add as a `dev_dependency` for code generation:
-
-```yaml
-dev_dependencies:
-  build_runner: ^latest
-  cherrypick_generator:
-```
-
-### 2. Annotate your DI modules and providers
-
-```dart
-import 'package:cherrypick_annotations/cherrypick_annotations.dart';
-import 'package:cherrypick/cherrypick.dart';
-
-@module()
-abstract class AppModule extends Module {
-  @singleton()
-  Dio dio() => Dio();
-
-  @named('baseUrl')
-  String baseUrl() => 'https://api.example.com';
-
-  @instance()
-  Foo foo() => Foo();
-
-  @provide()
-  Bar bar(Foo foo) => Bar(foo);
-
-  @provide()
-  String greet(@params() dynamic params) => 'Hello $params';
-}
-```
-
-When used with `cherrypick_generator`, code similar to the following will be generated:
-
-```dart
-final class $AppModule extends AppModule {
-  @override
-  void builder(Scope currentScope) {
-    bind<Dio>().toProvide(() => dio()).singleton();
-    bind<String>().toProvide(() => baseUrl()).withName('baseUrl');
-    bind<Foo>().toInstance(foo());
-    bind<Bar>().toProvide(() => bar(currentScope.resolve<Foo>()));
-    bind<String>().toProvideWithParams((args) => greet(args));
-  }
-}
-```
-
---
-
-## Annotation Reference
-
-### `@module`
-
-```dart
-@module()
-abstract class AppModule extends Module {}
-```
-Use on classes to mark them as a DI module. This is the root for registering your dependency providers.
-
---
-
-### `@singleton`
-
-```dart
-@singleton()
-Dio dio() => Dio();
-```
-Use on methods or classes to provide a singleton instance (the same instance is reused).
-
---
-
-### `@instance`
-
-```dart
-@instance()
-Foo foo() => Foo();
-```
-Use on methods or classes to provide a new instance on each request (not a singleton).
-
---
-
-### `@provide`
-
-```dart
-@provide()
-Bar bar(Foo foo) => Bar(foo);
-```
-Use on methods to indicate they provide a dependency to the DI module. Dependencies listed as parameters (e.g., `foo`) are resolved and injected.
-
---
-
-### `@named`
-
-```dart
-@named('token')
-String token() => 'abc';
-```
-Assigns a name to a binding for keyed injection or resolution.
-
---
-
-### `@params`
-
-```dart
-@provide()
-String greet(@params() dynamic params) => 'Hello $params';
-```
-Use on method parameters to indicate that this parameter should receive runtime-supplied arguments during dependency resolution (for example, via `.toProvide*((params) => greate(params))` in generated code).
-
---
-
-## License
-
-Licensed under the [Apache License 2.0](LICENSE).
-
---
-
-## Contributing
-
-Pull requests and feedback are welcome!
-
---
-
-## Author
-
-Sergey Penkovsky (<sergey.penkovsky@gmail.com>)
--- a/cherrypick_annotations/analysis_options.yaml
+++ b/cherrypick_annotations/analysis_options.yaml
@@ -1,30 +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
-
-# 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
--- a/cherrypick_annotations/lib/cherrypick_annotations.dart
+++ b/cherrypick_annotations/lib/cherrypick_annotations.dart
@@ -1,24 +0,0 @@
-library;
-
-//
-// 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.
-//
-
-export 'src/module.dart';
-export 'src/provide.dart';
-export 'src/instance.dart';
-export 'src/singleton.dart';
-export 'src/named.dart';
-export 'src/params.dart';
-export 'src/inject.dart';
-export 'src/injectable.dart';
-export 'src/scope.dart';
--- a/cherrypick_annotations/lib/src/inject.dart
+++ b/cherrypick_annotations/lib/src/inject.dart
@@ -1,20 +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 'package:meta/meta.dart';
-
-@experimental
-// ignore: camel_case_types
-final class inject {
-  const inject();
-}
--- a/cherrypick_annotations/lib/src/injectable.dart
+++ b/cherrypick_annotations/lib/src/injectable.dart
@@ -1,20 +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 'package:meta/meta.dart';
-
-@experimental
-// ignore: camel_case_types
-final class injectable {
-  const injectable();
-}
--- a/cherrypick_annotations/lib/src/instance.dart
+++ b/cherrypick_annotations/lib/src/instance.dart
@@ -1,68 +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.
-//
-
-/// ENGLISH:
-/// Annotation to specify that a new instance should be provided on each request.
-///
-/// Use the `@instance()` annotation for methods or classes in your DI module
-/// to declare that the DI container must create a new object every time
-/// the dependency is injected (i.e., no singleton behavior).
-///
-/// Example:
-/// ```dart
-/// @module()
-/// abstract class AppModule extends Module {
-///   @instance()
-///   Foo foo() => Foo();
-/// }
-/// ```
-///
-/// This will generate:
-/// ```dart
-/// final class $AppModule extends AppModule {
-///   @override
-///   void builder(Scope currentScope) {
-///     bind<Foo>().toInstance(() => foo());
-///   }
-/// }
-/// ```
-///
-/// RUSSIAN (Русский):
-/// Аннотация для создания нового экземпляра при каждом запросе.
-///
-/// Используйте `@instance()` для методов или классов в DI-модуле,
-/// чтобы указать, что контейнер внедрения зависимостей должен создавать
-/// новый объект при каждом обращении к зависимости (то есть, не синглтон).
-///
-/// Пример:
-/// ```dart
-/// @module()
-/// abstract class AppModule extends Module {
-///   @instance()
-///   Foo foo() => Foo();
-/// }
-/// ```
-///
-/// Будет сгенерирован следующий код:
-/// ```dart
-/// final class $AppModule extends AppModule {
-///   @override
-///   void builder(Scope currentScope) {
-///     bind<Foo>().toInstance(() => foo());
-///   }
-/// }
-/// ```
-// ignore: camel_case_types
-final class instance {
-  const instance();
-}
--- a/cherrypick_annotations/lib/src/module.dart
+++ b/cherrypick_annotations/lib/src/module.dart
@@ -1,69 +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.
-//
-
-/// ENGLISH:
-/// Annotation for marking Dart classes or libraries as modules.
-///
-/// Use the `@module()` annotation on abstract classes (or on a library)
-/// to indicate that the class represents a DI (Dependency Injection) module.
-/// This is commonly used in code generation tools to automatically register
-/// and configure dependencies defined within the module.
-///
-/// Example:
-/// ```dart
-/// @module()
-/// abstract class AppModule extends Module {
-///   // Dependency definitions go here.
-/// }
-/// ```
-///
-/// Generates code like:
-/// ```dart
-/// final class $AppModule extends AppModule {
-///   @override
-///   void builder(Scope currentScope) {
-///     // Dependency registration...
-///   }
-/// }
-/// ```
-///
-/// RUSSIAN (Русский):
-/// Аннотация для пометки классов или библиотек Dart как модуля.
-///
-/// Используйте `@module()` для абстрактных классов (или библиотек), чтобы
-/// показать, что класс реализует DI-модуль (Dependency Injection).
-/// Обычно используется генераторами кода для автоматической регистрации
-/// и конфигурирования зависимостей, определённых в модуле.
-///
-/// Пример:
-/// ```dart
-/// @module()
-/// abstract class AppModule extends Module {
-///   // Определения зависимостей
-/// }
-/// ```
-///
-/// Будет сгенерирован код:
-/// ```dart
-/// final class $AppModule extends AppModule {
-///   @override
-///   void builder(Scope currentScope) {
-///     // Регистрация зависимостей...
-///   }
-/// }
-/// ```
-// ignore: camel_case_types
-final class module {
-  /// Creates a [module] annotation.
-  const module();
-}
--- a/cherrypick_annotations/lib/src/named.dart
+++ b/cherrypick_annotations/lib/src/named.dart
@@ -1,77 +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.
-//
-
-/// ENGLISH:
-/// Annotation to assign a name or identifier to a class, method, or other element.
-///
-/// The `@named('value')` annotation allows you to specify a string name
-/// for a dependency, factory, or injectable. This is useful for distinguishing
-/// between multiple registrations of the same type in dependency injection,
-/// code generation, and for providing human-readable metadata.
-///
-/// Example:
-/// ```dart
-/// @module()
-/// abstract class AppModule extends Module {
-///   @named('dio')
-///   Dio dio() => Dio();
-/// }
-/// ```
-///
-/// This will generate:
-/// ```dart
-/// final class $AppModule extends AppModule {
-///   @override
-///   void builder(Scope currentScope) {
-///     bind<Dio>().toProvide(() => dio()).withName('dio').singleton();
-///   }
-/// }
-/// ```
-///
-/// RUSSIAN (Русский):
-/// Аннотация для задания имени или идентификатора классу, методу или другому элементу.
-///
-/// Аннотация `@named('значение')` позволяет указать строковое имя для зависимости,
-/// фабрики или внедряемого значения. Это удобно для различения нескольких
-/// регистраций одного типа в DI, генерации кода.
-///
-/// Пример:
-/// ```dart
-/// @module()
-/// abstract class AppModule extends Module {
-///   @named('dio')
-///   Dio dio() => Dio();
-/// }
-/// ```
-///
-/// Будет сгенерирован следующий код:
-/// ```dart
-/// final class $AppModule extends AppModule {
-///   @override
-///   void builder(Scope currentScope) {
-///     bind<Dio>().toProvide(() => dio()).withName('dio').singleton();
-///   }
-/// }
-/// ```
-// ignore: camel_case_types
-final class named {
-  /// EN: The assigned name or identifier for the element.
-  ///
-  /// RU: Назначенное имя или идентификатор для элемента.
-  final String value;
-
-  /// EN: Creates a [named] annotation with the given [value].
-  ///
-  /// RU: Создаёт аннотацию [named] с заданным значением [value].
-  const named(this.value);
-}
--- a/cherrypick_annotations/lib/src/params.dart
+++ b/cherrypick_annotations/lib/src/params.dart
@@ -1,56 +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.
-//
-
-/// ENGLISH:
-/// Annotation to mark a method parameter for injection with run-time arguments.
-///
-/// Use the `@params()` annotation to specify that a particular parameter of a
-/// provider method should be assigned a value supplied at resolution time,
-/// rather than during static dependency graph creation. This is useful in DI
-/// when a dependency must receive dynamic data passed by the consumer
-/// (via `.withParams(...)` in the generated code).
-///
-/// Example:
-/// ```dart
-/// @provide()
-/// String greet(@params() dynamic params) => 'Hello $params';
-/// ```
-///
-/// This will generate:
-/// ```dart
-/// bind<String>().toProvideWithParams((args) => greet(args));
-/// ```
-///
-/// RUSSIAN (Русский):
-/// Аннотация для пометки параметра метода, который будет внедряться со значением во время выполнения.
-///
-/// Используйте `@params()` чтобы указать, что конкретный параметр метода-провайдера
-/// должен получать значение, передаваемое в момент обращения к зависимости,
-/// а не на этапе построения графа зависимостей. Это полезно, если зависимость
-/// должна получать данные динамически от пользователя или другого процесса
-/// через `.withParams(...)` в сгенерированном коде.
-///
-/// Пример:
-/// ```dart
-/// @provide()
-/// String greet(@params() dynamic params) => 'Hello $params';
-/// ```
-///
-/// Будет сгенерировано:
-/// ```dart
-/// bind<String>().toProvideWithParams((args) => greet(args));
-/// ```
-// ignore: camel_case_types
-final class params {
-  const params();
-}
--- a/cherrypick_annotations/lib/src/provide.dart
+++ b/cherrypick_annotations/lib/src/provide.dart
@@ -1,70 +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.
-//
-
-/// ENGLISH:
-/// Annotation to declare a factory/provider method or class as a singleton.
-///
-/// Use the `@singleton()` annotation on methods in your DI module to specify
-/// that only one instance of the resulting object should be created and shared
-/// for all consumers. This is especially useful in dependency injection
-/// frameworks and service locators.
-///
-/// Example:
-/// ```dart
-/// @module()
-/// abstract class AppModule extends Module {
-///   @singleton()
-///   Dio dio() => Dio();
-/// }
-/// ```
-///
-/// This generates the following code:
-/// ```dart
-/// final class $AppModule extends AppModule {
-///   @override
-///   void builder(Scope currentScope) {
-///     bind<Dio>().toProvide(() => dio()).singleton();
-///   }
-/// }
-/// ```
-///
-/// RUSSIAN (Русский):
-/// Аннотация для объявления фабричного/провайдерного метода или класса синглтоном.
-///
-/// Используйте `@singleton()` для методов внутри DI-модуля, чтобы указать,
-/// что соответствующий объект (экземпляр класса) должен быть создан только один раз
-/// и использоваться всеми компонентами приложения (единый общий экземпляр).
-/// Это характерно для систем внедрения зависимостей и сервис-локаторов.
-///
-/// Пример:
-/// ```dart
-/// @module()
-/// abstract class AppModule extends Module {
-///   @singleton()
-///   Dio dio() => Dio();
-/// }
-/// ```
-///
-/// Будет сгенерирован следующий код:
-/// ```dart
-/// final class $AppModule extends AppModule {
-///   @override
-///   void builder(Scope currentScope) {
-///     bind<Dio>().toProvide(() => dio()).singleton();
-///   }
-/// }
-/// ```
-// ignore: camel_case_types
-final class provide {
-  const provide();
-}
--- a/cherrypick_annotations/lib/src/scope.dart
+++ b/cherrypick_annotations/lib/src/scope.dart
@@ -1,21 +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 'package:meta/meta.dart';
-
-@experimental
-// ignore: camel_case_types
-final class scope {
-  final String? name;
-  const scope(this.name);
-}
--- a/cherrypick_annotations/lib/src/singleton.dart
+++ b/cherrypick_annotations/lib/src/singleton.dart
@@ -1,73 +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.
-//
-
-/// ENGLISH:
-/// Annotation to declare a dependency as a singleton.
-///
-/// Use the `@singleton()` annotation on provider methods inside a module
-/// to indicate that only a single instance of this dependency should be
-/// created and shared throughout the application's lifecycle. This is
-/// typically used in dependency injection frameworks or service locators
-/// to guarantee a single shared instance.
-///
-/// Example:
-/// ```dart
-/// @module()
-/// abstract class AppModule extends Module {
-///   @singleton()
-///   Dio dio() => Dio();
-/// }
-/// ```
-///
-/// This will generate code like:
-/// ```dart
-/// final class $AppModule extends AppModule {
-///   @override
-///   void builder(Scope currentScope) {
-///     bind<Dio>().toProvide(() => dio()).singleton();
-///   }
-/// }
-/// ```
-///
-/// RUSSIAN (Русский):
-/// Аннотация для объявления зависимости как синглтона.
-///
-/// Используйте `@singleton()` для методов-провайдеров внутри модуля,
-/// чтобы указать, что соответствующий объект должен быть создан
-/// единожды и использоваться во всём приложении (общий синглтон).
-/// Это характерно для систем внедрения зависимостей и сервис-локаторов,
-/// чтобы гарантировать один общий экземпляр.
-///
-/// Пример:
-/// ```dart
-/// @module()
-/// abstract class AppModule extends Module {
-///   @singleton()
-///   Dio dio() => Dio();
-/// }
-/// ```
-///
-/// Будет сгенерирован следующий код:
-/// ```dart
-/// final class $AppModule extends AppModule {
-///   @override
-///   void builder(Scope currentScope) {
-///     bind<Dio>().toProvide(() => dio()).singleton();
-///   }
-/// }
-/// ```
-// ignore: camel_case_types
-final class singleton {
-  /// Creates a [singleton] annotation.
-  const singleton();
-}
--- a/cherrypick_annotations/pubspec.yaml
+++ b/cherrypick_annotations/pubspec.yaml
@@ -1,19 +0,0 @@
-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-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
-
-environment:
-  sdk: ">=3.5.2 <4.0.0"
-
-# Add regular dependencies here.
-dependencies:
-  meta: ^1.15.0
-  # path: ^1.8.0
-
-dev_dependencies:
-  lints: ^5.0.0
-  test: ^1.25.8
--- a/cherrypick_annotations/test/cherrypick_annotations_test.dart
+++ b/cherrypick_annotations/test/cherrypick_annotations_test.dart
@@ -1,13 +0,0 @@
-import 'package:test/test.dart';
-
-void main() {
-  group('A group of tests', () {
-    setUp(() {
-      // Additional setup goes here.
-    });
-
-    test('First Test', () {
-      expect(1, 1);
-    });
-  });
-}
--- a/cherrypick_flutter/.gitignore
+++ b/cherrypick_flutter/.gitignore
@@ -1,32 +0,0 @@
-# Miscellaneous
-*.class
-*.log
-*.pyc
-*.swp
-.DS_Store
-.atom/
-.buildlog/
-.history
-.svn/
-migrate_working_dir/
-
-# IntelliJ related
-*.iml
-*.ipr
-*.iws
-.idea/
-
-# The .vscode folder contains launch configuration and tasks you configure in
-# VS Code which you may wish to be included in version control, so this line
-# is commented out by default.
-#.vscode/
-
-# Flutter/Dart/Pub related
-# Libraries should not include pubspec.lock, per https://dart.dev/guides/libraries/private-files#pubspeclock.
-/pubspec.lock
-**/doc/api/
-.dart_tool/
-build/
-
-
-pubspec_overrides.yaml
--- a/cherrypick_flutter/.metadata
+++ b/cherrypick_flutter/.metadata
@@ -1,10 +0,0 @@
-# This file tracks properties of this Flutter project.
-# Used by Flutter tool to assess capabilities and perform upgrades etc.
-#
-# This file should be version controlled and should not be manually edited.
-
-version:
-  revision: "4cf269e36de2573851eaef3c763994f8f9be494d"
-  channel: "stable"
-
-project_type: package
--- a/cherrypick_flutter/CHANGELOG.md
+++ b/cherrypick_flutter/CHANGELOG.md
@@ -1,34 +0,0 @@
-## 1.1.2-dev.1
-
- - Update a dependency to the latest release.
-
-## 1.1.2-dev.0
-
- - **FIX**: fix warning.
- - **FIX**: fix warnings.
-
-## 1.1.1
-
- - Graduate package to a stable release. See pre-releases prior to this version for changelog entries.
-
-## 1.1.1-dev.1
-
- - **FIX**: fix warnings.
-
-## 1.1.1-dev.0
-
- - Update a dependency to the latest release.
-
-## 1.1.0
-
- - **FIX**: update description.
- - **FIX**: update gitignore.
- - **FEAT**: modify api in CherryPickProvider.
-
-## 1.0.1
-
- - Update a dependency to the latest release.
-
-## 0.0.1
-
-* TODO: Describe initial release.
--- a/cherrypick_flutter/LICENSE
+++ b/cherrypick_flutter/LICENSE
@@ -1,201 +0,0 @@
-                                 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.
--- a/cherrypick_flutter/README.md
+++ b/cherrypick_flutter/README.md
@@ -1,97 +0,0 @@
-# CherryPick Flutter
-
-`cherrypick_flutter` offers a Flutter integration to access and manage dependency injection scopes using the `CherryPickProvider`. This setup facilitates accessing the root scope directly from the widget tree, providing a straightforward mechanism for dependences management within Flutter applications.
-
-## Installation
-
-Add `cherrypick_flutter` to your `pubspec.yaml`:
-
-```yaml
-dependencies:
-  cherrypick_flutter: ^1.0.0
-```
-
-Run `flutter pub get` to install the package dependencies.
-
-## Usage
-
-### Importing the Package
-
-To begin using `cherrypick_flutter`, import it within your Dart file:
-
-```dart
-import 'package:cherrypick_flutter/cherrypick_flutter.dart';
-```
-
-### Providing State with `CherryPickProvider`
-
-Use `CherryPickProvider` to encase the widget tree section that requires access to the root or specific subscopes:
-
-```dart
-import 'package:flutter/material.dart';
-import 'package:cherrypick_flutter/cherrypick_flutter.dart';
-
-void main() {
-  runApp(
-    CherryPickProvider(
-      child: MyApp(),
-    ),
-  );
-}
-```
-
-Note: The current implementation of `CherryPickProvider` does not directly pass a `rootScope`. Instead, it utilizes its methods to open root and sub-scopes internally.
-
-### Accessing State
-
-Access the state provided by `CherryPickProvider` within widget `build` methods using the `of` method:
-
-```dart
-class MyWidget extends StatelessWidget {
-  @override
-  Widget build(BuildContext context) {
-    final CherryPickProvider cherryPick = CherryPickProvider.of(context);
-    final rootScope = cherryPick.openRootScope();
-
-    // Use the rootScope or open a subScope as needed
-    final subScope = cherryPick.openSubScope(scopeName: "exampleScope");
-
-    return Text('Scope accessed!');
-  }
-}
-```
-
-### Updating State
-
-The `CherryPickProvider` setup internally manages state updates. Ensure the `updateShouldNotify` method accurately reflects when the dependents should receive updates. In the provided implementation, it currently does not notify updates automatically.
-
-## Example
-
-Here is an example illustrating how to implement and utilize `CherryPickProvider` within a Flutter application:
-
-```dart
-class MyApp extends StatelessWidget {
-  const MyApp({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    final rootScope = CherryPickProvider.of(context).openRootScope();
-
-    return MaterialApp.router(
-      routerDelegate: rootScope.resolve<AppRouter>().delegate(),
-      routeInformationParser:
-          rootScope.resolve<AppRouter>().defaultRouteParser(),
-    );
-  }
-}
-```
-
-In this example, `CherryPickProvider` accesses and resolves dependencies using root scope and potentially sub-scopes configured by the application.
-
-## Contributing
-
-Contributions to improve this library are welcome. Feel free to open issues and submit pull requests on the repository.
-
-## License
-
-This project is licensed under the Apache License 2.0. A copy of the license can be obtained at [Apache License 2.0](http://www.apache.org/licenses/LICENSE-2.0).
--- a/cherrypick_flutter/analysis_options.yaml
+++ b/cherrypick_flutter/analysis_options.yaml
@@ -1,4 +0,0 @@
-include: package:flutter_lints/flutter.yaml
-
-# Additional information about this file can be found at
-# https://dart.dev/guides/language/analysis-options
--- a/cherrypick_flutter/lib/cherrypick_flutter.dart
+++ b/cherrypick_flutter/lib/cherrypick_flutter.dart
@@ -1,15 +0,0 @@
-library;
-//
-// 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.
-//
-
-export 'src/cherrypick_provider.dart';
--- a/cherrypick_flutter/lib/src/cherrypick_provider.dart
+++ b/cherrypick_flutter/lib/src/cherrypick_provider.dart
@@ -1,44 +0,0 @@
-import 'package:cherrypick/cherrypick.dart';
-import 'package:flutter/widgets.dart';
-
-///
-/// 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.
-///
-
-final class CherryPickProvider extends InheritedWidget {
-  Scope openRootScope() => CherryPick.openRootScope();
-
-  Scope openSubScope({String scopeName = '', String separator = '.'}) =>
-      CherryPick.openScope(scopeName: scopeName, separator: separator);
-
-  // Constructor for CherryPickProvider. Initializes with a required rootScope and child widget.
-  const CherryPickProvider({
-    super.key,
-    required super.child,
-  });
-
-  // Method to access the nearest CherryPickProvider instance from the context
-  static CherryPickProvider of(BuildContext context) {
-    // Looks up the widget tree for an instance of CherryPickProvider
-    final CherryPickProvider? result =
-        context.dependOnInheritedWidgetOfExactType<CherryPickProvider>();
-    // Assert to ensure a CherryPickProvider is present in the context
-    assert(result != null, 'No CherryPickProvider found in context');
-    return result!;
-  }
-
-  // Determines whether the widget should notify dependents when it changes
-  @override
-  bool updateShouldNotify(CherryPickProvider oldWidget) {
-    return false;
-  }
-}
--- a/cherrypick_flutter/pubspec.yaml
+++ b/cherrypick_flutter/pubspec.yaml
@@ -1,60 +0,0 @@
-name: cherrypick_flutter
-description: "Flutter library that allows access to the root scope through the context using `CherryPickProvider`."
-version: 1.1.2-dev.1
-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
-
-environment:
-  sdk: ">=3.5.2 <4.0.0"
-  flutter: ">=3.24.0"
-
-dependencies:
-  flutter:
-    sdk: flutter
-  cherrypick: ^2.2.0-dev.1
-
-dev_dependencies:
-  flutter_test:
-    sdk: flutter
-  flutter_lints: ^5.0.0
-  test: ^1.25.7
-  melos: ^6.3.2
-
-# For information on the generic Dart part of this file, see the
-# following page: https://dart.dev/tools/pub/pubspec
-
-# The following section is specific to Flutter packages.
-flutter:
-
-  # To add assets to your package, add an assets section, like this:
-  # assets:
-  #   - images/a_dot_burr.jpeg
-  #   - images/a_dot_ham.jpeg
-  #
-  # For details regarding assets in packages, see
-  # https://flutter.dev/to/asset-from-package
-  #
-  # An image asset can refer to one or more resolution-specific "variants", see
-  # https://flutter.dev/to/resolution-aware-images
-
-  # To add custom fonts to your package, add a fonts section here,
-  # in this "flutter" section. Each entry in this list should have a
-  # "family" key with the font family name, and a "fonts" key with a
-  # list giving the asset and other descriptors for the font. For
-  # example:
-  # fonts:
-  #   - family: Schyler
-  #     fonts:
-  #       - asset: fonts/Schyler-Regular.ttf
-  #       - asset: fonts/Schyler-Italic.ttf
-  #         style: italic
-  #   - family: Trajan Pro
-  #     fonts:
-  #       - asset: fonts/TrajanPro.ttf
-  #       - asset: fonts/TrajanPro_Bold.ttf
-  #         weight: 700
-  #
-  # For details regarding fonts in packages, see
-  # https://flutter.dev/to/font-from-package
--- a/cherrypick_flutter/test/cherrypick_flutter_test.dart
+++ b/cherrypick_flutter/test/cherrypick_flutter_test.dart
@@ -1,7 +0,0 @@
-import 'package:flutter_test/flutter_test.dart';
-
-void main() {
-  test('adds one to input values', () {
-    expect(1, 1);
-  });
-}
--- a/cherrypick_generator/.gitignore
+++ b/cherrypick_generator/.gitignore
@@ -1,28 +0,0 @@
-# See https://www.dartlang.org/guides/libraries/private-files
-
-# Files and directories created by pub
-.dart_tool/
-.packages
-build/
-# If you're building an application, you may want to check-in your pubspec.lock
-pubspec.lock
-
-# Directory created by dartdoc
-# If you don't generate documentation locally you can remove this line.
-doc/api/
-
-# Avoid committing generated Javascript files:
-*.dart.js
-*.info.json      # Produced by the --dump-info flag.
-*.js             # When generated by dart2js. Don't specify *.js if your
-                 # project includes source files written in JavaScript.
-*.js_
-*.js.deps
-*.js.map
-
-# FVM Version Cache
-.fvm/
-
-melos_cherrypick_generator.iml
-
-**/*.mocks.dart
--- a/cherrypick_generator/CHANGELOG.md
+++ b/cherrypick_generator/CHANGELOG.md
@@ -1,30 +0,0 @@
-## 1.1.0-dev.3
-
- - **FEAT**: implement InjectGenerator.
-
-## 1.1.0-dev.2
-
- - **FIX**: update instance generator code.
-
-## 1.1.0-dev.1
-
- - **FIX**: optimize code.
-
-## 1.1.0-dev.0
-
- - **FIX**: fix warning conflict with names.
- - **FIX**: fix warnings.
- - **FIX**: fix module generator.
- - **FIX**: fix generator for  singletone annotation.
- - **FEAT**: implement generator for dynamic params.
- - **FEAT**: implement async mode for instance/provide annotations.
- - **FEAT**: generate instance async code.
- - **FEAT**: implement instance/provide annotations.
- - **FEAT**: implement named dependency.
- - **FEAT**: implement generator for named annotation.
- - **FEAT**: implement generator di module.
- - **FEAT**: implement annotations.
-
-## 1.0.0
-
- Initial version.
--- a/cherrypick_generator/LICENSE
+++ b/cherrypick_generator/LICENSE
@@ -1,201 +0,0 @@
-                                 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.
--- a/cherrypick_generator/README.md
+++ b/cherrypick_generator/README.md
@@ -1,167 +0,0 @@
-# Cherrypick Generator
-
-**Cherrypick Generator** is a Dart code generation library for automatic boilerplate creation in dependency injection (DI) modules. It processes classes annotated with `@module()` (from [cherrypick_annotations](https://pub.dev/packages/cherrypick_annotations)) and generates code for registering dependencies, handling singletons, named bindings, runtime parameters, and more.
-
---
-
-## Features
-
- **Automatic Binding Generation:**  
-  Generates `bind<Type>()` registration code for every method in a DI module marked with `@module()`.
-
- **Support for DI Annotations:**  
-  Understands and processes meta-annotations such as `@singleton`, `@named`, `@instance`, `@provide`, and `@params`.
-
- **Runtime & Compile-Time Parameters:**  
-  Handles both injected (compile-time) and runtime parameters for provider/binding methods.
-
- **Synchronous & Asynchronous Support:**  
-  Correctly distinguishes between synchronous and asynchronous bindings (including `Future<T>` return types).
-
- **Named Bindings:**  
-  Allows registration of named services via the `@named()` annotation.
-
- **Singletons:**  
-  Registers singletons via the `@singleton` annotation.
-
---
-
-## How It Works
-
-1. **Annotations**  
-   Annotate your module classes and methods using `@module()`, `@instance`, `@provide`, `@singleton`, and `@named` as needed.
-
-2. **Code Scanning**  
-   During the build process (with `build_runner`), the generator scans your annotated classes.
-
-3. **Code Generation**  
-   For each `@module()` class, a new class (with a `$` prefix) is generated.  
-   This class overrides the `builder(Scope)` method to register all bindings.
-
-4. **Binding Logic**  
-   Each binding method's signature and annotations are analyzed. Registration code is generated according to:
-   - Return type (sync/async)
-   - Annotations (`@singleton`, `@named`, etc.)
-   - Parameter list (DI dependencies, `@named`, or `@params` for runtime values)
-
---
-
-## Example
-
-Given the following annotated Dart code:
-
-```dart
-import 'package:cherrypick_annotations/cherrypick_annotations.dart';
-
-@module()
-class MyModule {
-  @singleton
-  @instance
-  SomeService provideService(ApiClient client);
-
-  @provide
-  @named('special')
-  Future<Handler> createHandler(@params Map<String, dynamic> params);
-}
-```
-
-The generator will output (simplified):
-
-```dart
-final class $MyModule extends MyModule {
-  @override
-  void builder(Scope currentScope) {
-    bind<SomeService>()
-      .toInstance(provideService(currentScope.resolve<ApiClient>()))
-      .singleton();
-
-    bind<Handler>()
-      .toProvideAsyncWithParams((args) => createHandler(args))
-      .withName('special');
-  }
-}
-```
-
---
-
-## Generated Code Overview
-
- **Constructor Registration:**  
-  All non-abstract methods are considered as providers and processed for DI registration.
-
- **Parameter Handling:**  
-  Each method parameter is analyzed:
-    - Standard DI dependency: resolved via `currentScope.resolve<Type>()`.
-    - Named dependency: resolved via `currentScope.resolve<Type>(named: 'name')`.
-    - Runtime parameter (`@params`): passed through as-is (e.g., `args`).
-
- **Binding Types:**  
-  Supports both `.toInstance()` and `.toProvide()` (including async variants).
-
- **Singleton/Named:**  
-  Appends `.singleton()` and/or `.withName('name')` as appropriate.
-
---
-
-## Usage
-
-1. **Add dependencies**  
-   In your `pubspec.yaml`:
-   ```yaml
-   dependencies:
-     cherrypick_annotations: ^x.y.z
-
-   dev_dependencies:
-     build_runner: ^2.1.0
-     cherrypick_generator: ^x.y.z
-   ```
-
-2. **Apply annotations**  
-   Annotate your DI modules and provider methods as shown above.
-
-3. **Run the generator**  
-   ```
-   dart run build_runner build
-   # or with Flutter:
-   flutter pub run build_runner build
-   ```
-
-4. **Import and use the generated code**  
-   The generated files (suffix `.cherrypick.g.dart`) contain your `$YourModule` classes ready for use with your DI framework.
-
---
-
-## Advanced
-
- **Customizing Parameter Names:**  
-  Use the `@named('value')` annotation on methods and parameters for named bindings.
-
- **Runtime Arguments:**  
-  Use `@params` to designate parameters as runtime arguments that are supplied at injection time.
-
- **Async Factories:**  
-  Methods returning `Future<T>` generate the appropriate `.toProvideAsync()` or `.toInstanceAsync()` bindings.
-
---
-
-## Developer Notes
-
- The generator relies on Dart's analyzer, source_gen, and build packages.
- Each class and method is parsed for annotations; missing required annotations (like `@instance` or `@provide`) will result in a generation error.
- The generated code is designed to extend your original module classes while injecting all binding logic.
-
---
-
-## License
-
-```
-Licensed under the Apache License, Version 2.0
-```
-
---
-
-## Contribution
-
-Pull requests and issues are welcome! Please open git issues or submit improvements as needed.
-
---
--- a/cherrypick_generator/analysis_options.yaml
+++ b/cherrypick_generator/analysis_options.yaml
@@ -1,30 +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
-
-# 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
--- a/cherrypick_generator/build.yaml
+++ b/cherrypick_generator/build.yaml
@@ -1,27 +0,0 @@
-builders:
-  module_generator:
-    import: "package:cherrypick_generator/module_generator.dart"
-    builder_factories: ["moduleBuilder"]
-    build_extensions: {".dart": [".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": [".cherrypick.g.dart"]}
-    auto_apply: dependents
-    required_inputs: ["lib/**"]
-    runs_before: []
-    build_to: source
-
-targets:
-  $default:
-    builders:
-      cherrypick_generator|module_generator:
-        generate_for:
-          - lib/**.dart
-      cherrypick_generator|inject_generator:
-        generate_for:
-          - lib/**.dart
--- a/cherrypick_generator/lib/cherrypick_generator.dart
+++ b/cherrypick_generator/lib/cherrypick_generator.dart
@@ -1,17 +0,0 @@
-library;
-
-//
-// 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.
-//
-
-export 'module_generator.dart';
-export 'inject_generator.dart';
--- a/cherrypick_generator/lib/inject_generator.dart
+++ b/cherrypick_generator/lib/inject_generator.dart
@@ -1,186 +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:async';
-import 'package:analyzer/dart/constant/value.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;
-
-/// InjectGenerator generates a mixin for a class marked with @injectable()
-/// and injects all fields annotated with @inject(), using CherryPick DI.
-///
-/// For Future<T> fields it calls .resolveAsync<T>(),
-/// otherwise .resolve<T>() is used. Scope and named qualifiers are supported.
-///
-/// ---
-///
-/// InjectGenerator генерирует миксин для класса с аннотацией @injectable()
-/// и внедряет все поля, помеченные @inject(), используя DI-фреймворк CherryPick.
-///
-/// Для Future<T> полей вызывается .resolveAsync<T>(),
-/// для остальных — .resolve<T>(). Поддерживаются scope и named qualifier.
-///
-class InjectGenerator extends GeneratorForAnnotation<ann.injectable> {
-  const InjectGenerator();
-
-  /// The main entry point for code generation.
-  ///
-  /// Checks class validity, collects injectable fields, and produces injection code.
-  ///
-  /// Основная точка входа генератора. Проверяет класс, собирает инъектируемые поля и создает код внедрения зависимостей.
-  @override
-  FutureOr<String> generateForAnnotatedElement(
-    Element element,
-    ConstantReader annotation,
-    BuildStep buildStep,
-  ) {
-    if (element is! ClassElement) {
-      throw InvalidGenerationSourceError(
-        '@injectable() can only be applied to classes.',
-        element: element,
-      );
-    }
-
-    final classElement = element;
-    final className = classElement.name;
-    final mixinName = '_\$$className';
-
-    final buffer = StringBuffer()
-      ..writeln('mixin $mixinName {')
-      ..writeln('  void _inject($className instance) {');
-
-    // Collect and process all @inject fields.
-    // Собираем и обрабатываем все поля с @inject.
-    final injectFields =
-        classElement.fields.where(_isInjectField).map(_parseInjectField);
-
-    for (final parsedField in injectFields) {
-      buffer.writeln(_generateInjectionLine(parsedField));
-    }
-
-    buffer
-      ..writeln('  }')
-      ..writeln('}');
-
-    return buffer.toString();
-  }
-
-  /// Checks if a field has the @inject annotation.
-  ///
-  /// Проверяет, отмечено ли поле аннотацией @inject.
-  static bool _isInjectField(FieldElement field) {
-    return field.metadata.any(
-      (m) => m.computeConstantValue()?.type?.getDisplayString() == 'inject',
-    );
-  }
-
-  /// Parses the field for scope/named qualifiers and determines its type.
-  /// Returns a [_ParsedInjectField] describing injection information.
-  ///
-  /// Разбирает поле на наличие модификаторов scope/named и выясняет его тип.
-  /// Возвращает [_ParsedInjectField] с информацией о внедрении.
-  static _ParsedInjectField _parseInjectField(FieldElement field) {
-    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();
-      }
-    }
-
-    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;
-    }
-
-    return _ParsedInjectField(
-      fieldName: field.name,
-      coreType: coreTypeName,
-      isFuture: isFuture,
-      scopeName: scopeName,
-      namedValue: namedValue,
-    );
-  }
-
-  /// Generates a line of code that performs the dependency injection for a field.
-  /// Handles resolve/resolveAsync, scoping, and named qualifiers.
-  ///
-  /// Генерирует строку кода, которая внедряет зависимость для поля.
-  /// Учитывает resolve/resolveAsync, scoping и named qualifier.
-  String _generateInjectionLine(_ParsedInjectField field) {
-    final methodName = field.isFuture
-        ? 'resolveAsync<${field.coreType}>'
-        : 'resolve<${field.coreType}>';
-    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.$methodName$params;";
-  }
-}
-
-/// Data structure representing all information required to generate
-/// injection code for a field.
-///
-/// Структура данных, содержащая всю информацию,
-/// необходимую для генерации кода внедрения для поля.
-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;
-
-  /// Optional scope annotation argument / Опциональное имя scope.
-  final String? scopeName;
-
-  /// Optional named annotation argument / Опциональное имя named.
-  final String? namedValue;
-
-  _ParsedInjectField({
-    required this.fieldName,
-    required this.coreType,
-    required this.isFuture,
-    this.scopeName,
-    this.namedValue,
-  });
-}
-
-/// Builder factory. Used by build_runner.
-///
-/// Фабрика билдера. Используется build_runner.
-Builder injectBuilder(BuilderOptions options) =>
-    PartBuilder([InjectGenerator()], '.inject.cherrypick.g.dart');
--- a/cherrypick_generator/lib/module_generator.dart
+++ b/cherrypick_generator/lib/module_generator.dart
@@ -1,93 +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 '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';
-
-/// ---------------------------------------------------------------------------
-/// ModuleGenerator for code generation of dependency-injected modules.
-///
-/// ENGLISH
-/// This generator scans for Dart classes annotated with `@module()` and
-/// automatically generates boilerplate code for dependency injection
-/// (DI) based on the public methods in those classes. Each method can be
-/// annotated to describe how an object should be provided to the DI container.
-/// The generated code registers those methods as bindings. This automates the
-/// creation of factories, singletons, and named instances, reducing repetitive
-/// manual code.
-///
-/// RUSSIAN
-/// Генератор зависимостей для DI-контейнера на основе аннотаций.
-/// Данный генератор автоматически создаёт код для внедрения зависимостей (DI)
-/// на основе аннотаций в вашем исходном коде. Когда вы отмечаете класс
-/// аннотацией `@module()`, этот генератор обработает все его публичные методы
-/// и автоматически сгенерирует класс с биндингами (регистрациями зависимостей)
-/// для DI-контейнера. Это избавляет от написания однообразного шаблонного кода.
-/// ---------------------------------------------------------------------------
-
-class ModuleGenerator extends GeneratorForAnnotation<ann.module> {
-  /// -------------------------------------------------------------------------
-  /// ENGLISH
-  /// Generates the Dart source for a class marked with the `@module()` annotation.
-  /// - [element]: the original Dart class element.
-  /// - [annotation]: the annotation parameters (not usually used here).
-  /// - [buildStep]: the current build step info.
-  ///
-  /// RUSSIAN
-  /// Генерирует исходный код для класса-модуля с аннотацией `@module()`.
-  /// [element] — исходный класс, помеченный аннотацией.
-  /// [annotation] — значения параметров аннотации.
-  /// [buildStep] — информация о текущем шаге генерации.
-  /// -------------------------------------------------------------------------
-  @override
-  String generateForAnnotatedElement(
-    Element element,
-    ConstantReader annotation,
-    BuildStep buildStep,
-  ) {
-    // Only classes are supported for @module() annotation
-    // Обрабатываются только классы (другие элементы — ошибка)
-    if (element is! ClassElement) {
-      throw InvalidGenerationSourceError(
-        '@module() can only be applied to classes. / @module() может быть применён только к классам.',
-        element: element,
-      );
-    }
-
-    final classElement = element;
-
-    // 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();
-  }
-}
-
-/// ---------------------------------------------------------------------------
-/// ENGLISH
-/// Entry point for build_runner. Returns a Builder used to generate code for
-/// every file with a @module() annotation.
-///
-/// RUSSIAN
-/// Точка входа для генератора build_runner.
-/// Возвращает Builder, используемый build_runner для генерации кода для всех
-/// файлов, где встречается @module().
-/// ---------------------------------------------------------------------------
-Builder moduleBuilder(BuilderOptions options) =>
-    PartBuilder([ModuleGenerator()], '.module.cherrypick.g.dart');
--- a/cherrypick_generator/lib/src/bind_parameters_spec.dart
+++ b/cherrypick_generator/lib/src/bind_parameters_spec.dart
@@ -1,75 +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.
-//
-
-/// ----------------------------------------------------------------------------
-/// BindParameterSpec - describes a single method parameter and how to resolve it.
-///
-/// ENGLISH
-/// Describes a single parameter for a provider/binding method in the DI system.
-/// Stores the parameter type, its optional `@named` key for named resolution,
-/// and whether it is a runtime "params" argument. Used to generate code that
-/// resolves dependencies from the DI scope:
-///   - If the parameter is a dependency type (e.g. SomeDep), emits:
-///         currentScope.resolve<SomeDep>()
-///   - If the parameter is named, emits:
-///         currentScope.resolve<SomeDep>(named: 'yourName')
-///   - If it's a runtime parameter (e.g. via @params()), emits:
-///         args
-///
-/// RUSSIAN
-/// Описывает один параметр метода в DI, и его способ разрешения из контейнера.
-/// Сохраняет имя типа, дополнительное имя (если параметр аннотирован через @named),
-/// и признак runtime-параметра (@params).
-/// Для обычной зависимости типа (например, SomeDep) генерирует строку вида:
-///   currentScope.resolve<SomeDep>()
-/// Для зависимости с именем:
-///   currentScope.resolve<SomeDep>(named: 'имя')
-/// Для runtime-параметра:
-///   args
-/// ----------------------------------------------------------------------------
-class BindParameterSpec {
-  /// Type name of the parameter (e.g. SomeService)
-  /// Имя типа параметра (например, SomeService)
-  final String typeName;
-
-  /// Optional name for named resolution (from @named)
-  /// Необязательное имя для разрешения по имени (если аннотировано через @named)
-  final String? named;
-
-  /// True if this parameter uses @params and should be provided from runtime args
-  /// Признак, что параметр — runtime (через @params)
-  final bool isParams;
-
-  BindParameterSpec(this.typeName, this.named, {this.isParams = false});
-
-  /// --------------------------------------------------------------------------
-  /// generateArg
-  ///
-  /// ENGLISH
-  /// Generates Dart code for resolving the dependency from the DI scope,
-  /// considering type, named, and param-argument.
-  ///
-  /// RUSSIAN
-  /// Генерирует строку для получения зависимости из DI scope (с учётом имени
-  /// и типа параметра или runtime-режима @params).
-  /// --------------------------------------------------------------------------
-  String generateArg([String paramsVar = 'args']) {
-    if (isParams) {
-      return paramsVar;
-    }
-    if (named != null) {
-      return "currentScope.resolve<$typeName>(named: '$named')";
-    }
-    return "currentScope.resolve<$typeName>()";
-  }
-}
--- a/cherrypick_generator/lib/src/bind_spec.dart
+++ b/cherrypick_generator/lib/src/bind_spec.dart
@@ -1,260 +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 'package:analyzer/dart/element/element.dart';
-import 'package:source_gen/source_gen.dart';
-
-import 'bind_parameters_spec.dart';
-import 'metadata_utils.dart';
-
-enum BindingType {
-  instance,
-  provide;
-}
-
-/// ---------------------------------------------------------------------------
-/// BindSpec -- describes a binding specification generated for a dependency.
-///
-/// ENGLISH
-/// Represents all the data necessary to generate a DI binding for a single
-/// method in a module class. Each BindSpec corresponds to one public method
-/// and contains information about its type, provider method, lifecycle (singleton),
-/// parameters (with their annotations), binding strategy (instance/provide),
-/// asynchronous mode, and named keys. It is responsible for generating the
-/// correct Dart code to register this binding with the DI container, in both
-/// sync and async cases, with and without named or runtime arguments.
-///
-/// RUSSIAN
-/// Описывает параметры для создания одного биндинга зависимости (binding spec).
-/// Каждый биндинг соответствует одному публичному методу класса-модуля и
-/// содержит всю информацию для генерации кода регистрации этого биндинга в
-/// DI-контейнере: тип возвращаемой зависимости, имя метода, параметры, аннотации
-/// (@singleton, @named, @instance, @provide), асинхронность, признак runtime
-/// аргументов и др. Генерирует правильный Dart-код для регистрации биндера.
-/// ---------------------------------------------------------------------------
-class BindSpec {
-  /// The type this binding provides (e.g. SomeService)
-  /// Тип, который предоставляет биндинг (например, SomeService)
-  final String returnType;
-
-  /// Method name that implements the binding
-  /// Имя метода, который реализует биндинг
-  final String methodName;
-
-  /// Optional name for named dependency (from @named)
-  /// Необязательное имя, для именованной зависимости (используется с @named)
-  final String? named;
-
-  /// Whether the dependency is a singleton (@singleton annotation)
-  /// Является ли зависимость синглтоном (имеется ли аннотация @singleton)
-  final bool isSingleton;
-
-  /// List of method parameters to inject dependencies with
-  /// Список параметров, которые требуются методу для внедрения зависимостей
-  final List<BindParameterSpec> parameters;
-
-  /// Binding type: 'instance' or 'provide' (@instance or @provide)
-  final BindingType bindingType; // 'instance' | 'provide'
-
-  /// True if the method is asynchronous and uses instance binding (Future)
-  final bool isAsyncInstance;
-
-  /// True if the method is asynchronous and uses provide binding (Future)
-  final bool isAsyncProvide;
-
-  /// True if the binding method accepts runtime "params" argument (@params)
-  final bool hasParams;
-
-  BindSpec({
-    required this.returnType,
-    required this.methodName,
-    required this.isSingleton,
-    required this.parameters,
-    this.named,
-    required this.bindingType,
-    required this.isAsyncInstance,
-    required this.isAsyncProvide,
-    required this.hasParams,
-  });
-
-  /// -------------------------------------------------------------------------
-  /// generateBind
-  ///
-  /// ENGLISH
-  /// Generates a line of Dart code registering the binding with the DI framework.
-  /// Produces something like:
-  ///   bind<Type>().toProvide(() => method(args)).withName('name').singleton();
-  /// Indent parameter allows formatted multiline output.
-  ///
-  /// RUSSIAN
-  /// Формирует dart-код для биндинга, например:
-  ///   bind<Type>().toProvide(() => method(args)).withName('name').singleton();
-  /// Параметр [indent] задаёт отступ для красивого форматирования кода.
-  /// -------------------------------------------------------------------------
-  String generateBind(int indent) {
-    final indentStr = ' ' * indent;
-    final provide = _generateProvideClause(indent);
-    final postfix = _generatePostfix();
-    return '$indentStr'
-        'bind<$returnType>()'
-        '$provide'
-        '$postfix;';
-  }
-
-  // Internal method: decides how the provide clause should be generated by param kind.
-  String _generateProvideClause(int indent) {
-    if (hasParams) return _generateWithParamsProvideClause(indent);
-    return _generatePlainProvideClause(indent);
-  }
-
-  /// EN / RU: Supports runtime parameters (@params).
-  String _generateWithParamsProvideClause(int indent) {
-    // Safe variable name for parameters.
-    const paramVar = 'args';
-    final fnArgs = parameters.map((p) => p.generateArg(paramVar)).join(', ');
-    final multiLine = fnArgs.length > 60 || fnArgs.contains('\n');
-    switch (bindingType) {
-      case BindingType.instance:
-        throw StateError(
-            'Internal error: _generateWithParamsProvideClause called for @instance binding with @params.');
-      //return isAsyncInstance
-      //    ? '.toInstanceAsync(($fnArgs) => $methodName($fnArgs))'
-      //    : '.toInstance(($fnArgs) => $methodName($fnArgs))';
-      case BindingType.provide:
-      default:
-        if (isAsyncProvide) {
-          return multiLine
-              ? '.toProvideAsyncWithParams(\n${' ' * (indent + 2)}($paramVar) => $methodName($fnArgs))'
-              : '.toProvideAsyncWithParams(($paramVar) => $methodName($fnArgs))';
-        } else {
-          return multiLine
-              ? '.toProvideWithParams(\n${' ' * (indent + 2)}($paramVar) => $methodName($fnArgs))'
-              : '.toProvideWithParams(($paramVar) => $methodName($fnArgs))';
-        }
-    }
-  }
-
-  /// EN / RU: Supports only injected dependencies, not runtime (@params).
-  String _generatePlainProvideClause(int indent) {
-    final argsStr = parameters.map((p) => p.generateArg()).join(', ');
-    final multiLine = argsStr.length > 60 || argsStr.contains('\n');
-    switch (bindingType) {
-      case BindingType.instance:
-        return isAsyncInstance
-            ? '.toInstanceAsync($methodName($argsStr))'
-            : '.toInstance($methodName($argsStr))';
-      case BindingType.provide:
-      default:
-        if (isAsyncProvide) {
-          return multiLine
-              ? '.toProvideAsync(\n${' ' * (indent + 2)}() => $methodName($argsStr))'
-              : '.toProvideAsync(() => $methodName($argsStr))';
-        } else {
-          return multiLine
-              ? '.toProvide(\n${' ' * (indent + 2)}() => $methodName($argsStr))'
-              : '.toProvide(() => $methodName($argsStr))';
-        }
-    }
-  }
-
-  /// EN / RU: Adds .withName and .singleton if needed.
-  String _generatePostfix() {
-    final namePart = named != null ? ".withName('$named')" : '';
-    final singletonPart = isSingleton ? '.singleton()' : '';
-    return '$namePart$singletonPart';
-  }
-
-  /// -------------------------------------------------------------------------
-  /// fromMethod
-  ///
-  /// ENGLISH
-  /// Creates a BindSpec from a module class method by analyzing its return type,
-  /// annotations, list of parameters (with their own annotations), and async-ness.
-  /// Throws if a method does not have the required @instance() or @provide().
-  ///
-  /// RUSSIAN
-  /// Создаёт спецификацию биндинга (BindSpec) из метода класса-модуля, анализируя
-  /// возвращаемый тип, аннотации, параметры (и их аннотации), а также факт
-  /// асинхронности. Если нет @instance или @provide — кидает ошибку.
-  /// -------------------------------------------------------------------------
-  static BindSpec fromMethod(MethodElement method) {
-    var returnType = method.returnType.getDisplayString();
-
-    final methodName = method.displayName;
-    // Check for @singleton annotation.
-    final isSingleton = MetadataUtils.anyMeta(method.metadata, 'singleton');
-
-    // Get @named value if present.
-    final named = MetadataUtils.getNamedValue(method.metadata);
-
-    // Parse each method parameter.
-    final params = <BindParameterSpec>[];
-    bool hasParams = false;
-    for (final p in method.parameters) {
-      final typeStr = p.type.getDisplayString();
-      final paramNamed = MetadataUtils.getNamedValue(p.metadata);
-      final isParams = MetadataUtils.anyMeta(p.metadata, 'params');
-      if (isParams) hasParams = true;
-      params.add(BindParameterSpec(typeStr, paramNamed, isParams: isParams));
-    }
-
-    // Determine bindingType: @instance or @provide.
-    final hasInstance = MetadataUtils.anyMeta(method.metadata, 'instance');
-    final hasProvide = MetadataUtils.anyMeta(method.metadata, 'provide');
-    if (!hasInstance && !hasProvide) {
-      throw InvalidGenerationSourceError(
-        'Method $methodName must be marked with @instance() or @provide().',
-        element: method,
-      );
-    }
-    final bindingType =
-        hasInstance ? BindingType.instance : BindingType.provide;
-
-    // PROHIBIT @params with @instance bindings!
-    if (bindingType == BindingType.instance && hasParams) {
-      throw InvalidGenerationSourceError(
-        '@params() (runtime arguments) cannot be used together with @instance() on method $methodName. '
-        'Use @provide() instead if you want runtime arguments.',
-        element: method,
-      );
-    }
-
-    // -- Extract inner type for Future<T> and set async flags.
-    bool isAsyncInstance = false;
-    bool isAsyncProvide = false;
-    final futureInnerType = _extractFutureInnerType(returnType);
-    if (futureInnerType != null) {
-      returnType = futureInnerType;
-      if (bindingType == BindingType.instance) isAsyncInstance = true;
-      if (bindingType == BindingType.provide) isAsyncProvide = true;
-    }
-
-    return BindSpec(
-      returnType: returnType,
-      methodName: methodName,
-      isSingleton: isSingleton,
-      named: named,
-      parameters: params,
-      bindingType: bindingType,
-      isAsyncInstance: isAsyncInstance,
-      isAsyncProvide: isAsyncProvide,
-      hasParams: hasParams,
-    );
-  }
-
-  /// EN / RU: Extracts inner type from Future<T>, returns e.g. "T" or null.
-  static String? _extractFutureInnerType(String typeName) {
-    final match = RegExp(r'^Future<(.+)>$').firstMatch(typeName);
-    return match?.group(1)?.trim();
-  }
-}
--- a/cherrypick_generator/lib/src/generated_class.dart
+++ b/cherrypick_generator/lib/src/generated_class.dart
@@ -1,115 +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 'package:analyzer/dart/element/element.dart';
-
-import 'bind_spec.dart';
-
-/// ---------------------------------------------------------------------------
-/// GeneratedClass -- represents the result of processing a single module class.
-///
-/// ENGLISH
-/// Encapsulates all the information produced from analyzing a DI module class:
-/// - The original class name,
-/// - Its generated class name (e.g., `$SomeModule`),
-/// - The collection of bindings (BindSpec) for all implemented provider methods.
-///
-/// Also provides code generation functionality, allowing to generate the source
-/// code for the derived DI module class, including all binding registrations.
-///
-/// RUSSIAN
-/// Описывает результат обработки одного класса-модуля DI:
-/// - Имя оригинального класса,
-/// - Имя генерируемого класса (например, `$SomeModule`),
-/// - Список всех бидингов (BindSpec) — по публичным методам модуля.
-///
-/// Также содержит функцию генерации исходного кода для этого класса и
-/// регистрации всех зависимостей через bind(...).
-/// ---------------------------------------------------------------------------
-class GeneratedClass {
-  /// The name of the original module class.
-  /// Имя исходного класса-модуля
-  final String className;
-
-  /// The name of the generated class (e.g., $SomeModule).
-  /// Имя генерируемого класса (например, $SomeModule)
-  final String generatedClassName;
-
-  /// List of all discovered bindings for the class.
-  /// Список всех обнаруженных биндингов
-  final List<BindSpec> binds;
-
-  GeneratedClass(
-    this.className,
-    this.generatedClassName,
-    this.binds,
-  );
-
-  /// -------------------------------------------------------------------------
-  /// fromClassElement
-  ///
-  /// ENGLISH
-  /// Static factory: creates a GeneratedClass from a Dart ClassElement (AST representation).
-  /// Discovers all non-abstract methods, builds BindSpec for each, and computes the
-  /// generated class name by prefixing `$`.
-  ///
-  /// RUSSIAN
-  /// Строит объект класса по элементу AST (ClassElement): имя класса,
-  /// сгенерированное имя, список BindSpec по всем не абстрактным методам.
-  /// Имя ген-класса строится с префиксом `$`.
-  /// -------------------------------------------------------------------------
-  static GeneratedClass fromClassElement(ClassElement element) {
-    final className = element.displayName;
-    // Generated class name with '$' prefix (standard for generated Dart code).
-    final generatedClassName = r'$' + className;
-    // Collect bindings for all non-abstract methods.
-    final binds = element.methods
-        .where((m) => !m.isAbstract)
-        .map(BindSpec.fromMethod)
-        .toList();
-
-    return GeneratedClass(className, generatedClassName, binds);
-  }
-
-  /// -------------------------------------------------------------------------
-  /// generate
-  ///
-  /// ENGLISH
-  /// Generates Dart source code for the DI module class. The generated class
-  /// inherits from the original, overrides the 'builder' method, and registers
-  /// all bindings in the DI scope.
-  ///
-  /// RUSSIAN
-  /// Генерирует исходный Dart-код для класса-модуля DI.
-  /// Новая версия класса наследует оригинальный, переопределяет builder(Scope),
-  /// и регистрирует все зависимости через методы bind<Type>()...
-  /// -------------------------------------------------------------------------
-  String generate() {
-    final buffer = StringBuffer();
-
-    buffer.writeln('final class $generatedClassName extends $className {');
-    buffer.writeln(' @override');
-    buffer.writeln(' void builder(Scope currentScope) {');
-
-    // For each binding, generate bind<Type>() code string.
-    // Для каждого биндинга — генерируем строку bind<Type>()...
-    for (final bind in binds) {
-      buffer.writeln(bind.generateBind(4));
-    }
-
-    buffer.writeln(' }');
-    buffer.writeln('}');
-
-    return buffer.toString();
-  }
-}
--- a/cherrypick_generator/lib/src/metadata_utils.dart
+++ b/cherrypick_generator/lib/src/metadata_utils.dart
@@ -1,76 +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 'package:analyzer/dart/element/element.dart';
-
-/// ---------------------------------------------------------------------------
-/// MetadataUtils -- utilities for analyzing method and parameter annotations.
-///
-/// ENGLISH
-/// Provides static utility methods to analyze Dart annotations on methods or
-/// parameters. For instance, helps to find if an element is annotated with
-/// `@named()`, `@singleton()`, or other meta-annotations used in this DI framework.
-///
-/// RUSSIAN
-/// Утилиты для разбора аннотаций методов и параметров.
-/// Позволяют находить наличие аннотаций, например, @named() и @singleton(),
-/// у методов и параметров. Используется для анализа исходного кода при генерации.
-/// ---------------------------------------------------------------------------
-class MetadataUtils {
-  /// -------------------------------------------------------------------------
-  /// anyMeta
-  ///
-  /// ENGLISH
-  /// Checks if any annotation in the list has a type name that contains
-  /// [typeName] (case insensitive).
-  ///
-  /// RUSSIAN
-  /// Проверяет: есть ли среди аннотаций метка, имя которой содержит [typeName]
-  /// (регистр не учитывается).
-  /// -------------------------------------------------------------------------
-  static bool anyMeta(List<ElementAnnotation> meta, String typeName) {
-    return meta.any((m) =>
-        m
-            .computeConstantValue()
-            ?.type
-            ?.getDisplayString()
-            .toLowerCase()
-            .contains(typeName.toLowerCase()) ??
-        false);
-  }
-
-  /// -------------------------------------------------------------------------
-  /// getNamedValue
-  ///
-  /// ENGLISH
-  /// Retrieves the value from a `@named('value')` annotation if present.
-  /// Returns the string value or null if not found.
-  ///
-  /// RUSSIAN
-  /// Находит значение из аннотации @named('значение').
-  /// Возвращает строку значения, если аннотация присутствует; иначе null.
-  /// -------------------------------------------------------------------------
-  static String? getNamedValue(List<ElementAnnotation> meta) {
-    for (final m in meta) {
-      final cv = m.computeConstantValue();
-
-      final typeStr = cv?.type?.getDisplayString().toLowerCase();
-
-      if (typeStr?.contains('named') ?? false) {
-        return cv?.getField('value')?.toStringValue();
-      }
-    }
-
-    return null;
-  }
-}
--- a/cherrypick_generator/pubspec.yaml
+++ b/cherrypick_generator/pubspec.yaml
@@ -1,26 +0,0 @@
-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-dev.3
-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
-
-environment:
-  sdk: ">=3.5.2 <4.0.0"
-
-# Add regular dependencies here.
-dependencies:
-  cherrypick_annotations: ^1.1.0-dev.1
-  analyzer: ^6.7.0
-  dart_style: ^2.3.7
-  build: ^2.4.1
-  build_runner: ^2.4.13
-  source_gen: ^1.5.0
-  collection: ^1.18.0
-
-dev_dependencies:
-  lints: ^5.0.0
-  mockito: ^5.4.4
-  test: ^1.25.8
--- a/cherrypick_generator/test/cherrypick_generator_test.dart
+++ b/cherrypick_generator/test/cherrypick_generator_test.dart
@@ -1,13 +0,0 @@
-import 'package:test/test.dart';
-
-void main() {
-  group('A group of tests', () {
-    setUp(() {
-      // Additional setup goes here.
-    });
-
-    test('First Test', () {
-      expect(2, 2);
-    });
-  });
-}
--- a/cherrypick/doc/quick_start_en.md
+++ b/cherrypick/doc/quick_start_en.md
@@ -7,7 +7,7 @@

 Binding is a custom instance configurator that contains methods for configuring a dependency.

-There are two main methods for initializing a custom instance `toInstance ()` and `toProvide ()` and auxiliary `withName ()` and `singleton ()`.
+There are two main methods for initializing a custom instance `toInstance ()` and `toProvide ()` and auxiliary `withName ()` and `singeltone ()`.

 `toInstance()` - takes a initialized instance

@@ -15,7 +15,7 @@ There are two main methods for initializing a custom instance `toInstance ()` an

 `withName()` - takes a string to name the instance. By this name, it will be possible to extract instance from the DI container

-`singleton()` -  sets a flag in the Binding that tells the DI container that there is only one dependency.
+`singeltone()` -  sets a flag in the Binding that tells the DI container that there is only one dependency.

 Example:

@@ -36,7 +36,7 @@ Example:
 // instance initialization like singleton
 Binding<String>().toInstance("hello world");
 // or
- Binding<String>().toProvide(() => "hello world").singleton();
+ Binding<String>().toProvide(() => "hello world").singeltone();

 ```

@@ -65,7 +65,7 @@ Example:

 ```dart
    // open main scope
-    final rootScope =  Cherrypick.openRootScope();
+    final rootScope =  DartDi.openRootScope();

    // initializing scope with a custom module
    rootScope.installModules([AppModule()]);
@@ -76,7 +76,7 @@ Example:
    final str = rootScope.tryResolve<String>();

    // close main scope
-    Cherrypick.closeRootScope();
+    DartDi.closeRootScope();
 ```

 ## Example app
@@ -85,7 +85,8 @@ Example:
 ```dart
 import 'dart:async';
 import 'package:meta/meta.dart';
-import 'package:cherrypick/cherrypick.dart';
+import 'package:dart_di/experimental/scope.dart';
+import 'package:dart_di/experimental/module.dart';

 class AppModule extends Module {
  @override
@@ -111,7 +112,7 @@ class FeatureModule extends Module {
            ),
          ),
        )
-        .singleton();
+        .singeltone();
    bind<DataBloc>().toProvide(
      () => DataBloc(
        currentScope.resolve<DataRepository>(named: "networkRepo"),
--- a/cherrypick/doc/quick_start_ru.md
+++ b/cherrypick/doc/quick_start_ru.md
@@ -7,7 +7,7 @@

 Binding - по сути это конфигуратор  для  пользовательского instance, который соддержит методы для конфигурирования зависимости.

-Есть два основных метода для инициализации пользовательского instance `toInstance()` и `toProvide()` и вспомогательных `withName()` и `singleton()`.
+Есть два основных метода для инициализации пользовательского instance `toInstance()` и `toProvide()` и вспомогательных `withName()` и `singeltone()`.

 `toInstance()` - принимает готовый экземпляр

@@ -15,7 +15,7 @@ Binding - по сути это конфигуратор  для  пользов

 `withName()` - принимает строку для именования экземпляра. По этому имени можно будет извлечь instance из  DI контейнера

-`singleton()` -  устанавливает флаг в Binding, который говорит DI контейнеру, что зависимость одна.
+`singeltone()` -  устанавливает флаг в Binding, который говорит DI контейнеру, что зависимость одна.

 Пример:

@@ -36,7 +36,7 @@ Binding - по сути это конфигуратор  для  пользов
 // инициализация экземпляра, как сингелтон
 Binding<String>().toInstance("hello world");
 // или
- Binding<String>().toProvide(() => "hello world").singleton();
+ Binding<String>().toProvide(() => "hello world").singeltone();

 ```

@@ -65,7 +65,7 @@ Scope - это контейнер, который хранит все дерев

 ```dart
    // открыть главный scope
-    final rootScope =  CherryPick.openRootScope();
+    final rootScope =  DartDi.openRootScope();

    // инициализация scope пользовательским модулем
    rootScope.installModules([AppModule()]);
@@ -76,7 +76,7 @@ Scope - это контейнер, который хранит все дерев
    final str = rootScope.tryResolve<String>();

    // закрыть главный scope
-    Cherrypick.closeRootScope();
+    DartDi.closeRootScope();
 ```

 ## Пример приложения
@@ -85,7 +85,8 @@ Scope - это контейнер, который хранит все дерев
 ```dart
 import 'dart:async';
 import 'package:meta/meta.dart';
-import 'package:cherrypick/cherrypick.dart';
+import 'package:dart_di/experimental/scope.dart';
+import 'package:dart_di/experimental/module.dart';

 class AppModule extends Module {
  @override
@@ -111,7 +112,7 @@ class FeatureModule extends Module {
            ),
          ),
        )
-        .singleton();
+        .singeltone();
    bind<DataBloc>().toProvide(
      () => DataBloc(
        currentScope.resolve<DataRepository>(named: "networkRepo"),
@@ -191,4 +192,4 @@ class ApiClientImpl implements ApiClient {
    return 'Network data';
  }
 }
-```
+```
--- a/cherrypick/example/README.md
+++ b/cherrypick/example/README.md
@@ -1,30 +1,7 @@
-# Example
-
-pubspec.yaml:
-
-```yaml
-name: example
-version: 1.0.0
-
-environment:
-  sdk: ">=2.12.0 <3.0.0"
-
-
-dependencies:
-  cherrypick:
-    path: ../
-
-dev_dependencies:
-  test: ^1.16.8
-```
-
-main.dart:
-
-```dart
 import 'dart:async';
 import 'package:meta/meta.dart';
-import 'package:cherrypick/scope.dart';
-import 'package:cherrypick/module.dart';
+import 'package:dart_di/scope.dart';
+import 'package:dart_di/module.dart';

 class AppModule extends Module {
  @override
@@ -50,7 +27,7 @@ class FeatureModule extends Module {
            ),
          ),
        )
-        .singleton();
+        .singeltone();
    bind<DataBloc>().toProvide(
      () => DataBloc(
        currentScope.resolve<DataRepository>(named: "networkRepo"),
@@ -130,4 +107,3 @@ class ApiClientImpl implements ApiClient {
    return 'Network data';
  }
 }
-```
--- a/cherrypick/example/pubspec.yaml
+++ b/cherrypick/example/pubspec.yaml
@@ -1,16 +1,14 @@
 name: example
 version: 1.0.0
+author: "Sergey Penkovsky <sergey.penkovsky@gmail.com>"
 homepage: localhost
-publish_to: none

 environment:
  sdk: ">=2.12.0 <3.0.0"


 dependencies:
-  meta: ^1.3.0
-  
-  cherrypick:
+  dart_di:
    path: ../

 dev_dependencies:
--- a/examples/client_app/.gitignore
+++ b/examples/client_app/.gitignore
@@ -1,53 +0,0 @@
-# Miscellaneous
-*.class
-*.log
-*.pyc
-*.swp
-.DS_Store
-.atom/
-.buildlog/
-.history
-.svn/
-migrate_working_dir/
-
-# IntelliJ related
-*.iml
-*.ipr
-*.iws
-.idea/
-
-# The .vscode folder contains launch configuration and tasks you configure in
-# VS Code which you may wish to be included in version control, so this line
-# is commented out by default.
-#.vscode/
-
-# Flutter/Dart/Pub related
-**/doc/api/
-**/ios/Flutter/.last_build_id
-.dart_tool/
-.flutter-plugins
-.flutter-plugins-dependencies
-.pub-cache/
-.pub/
-/build/
-
-# Symbolication related
-app.*.symbols
-
-# Obfuscation related
-app.*.map.json
-
-# Android Studio will place build artifacts here
-/android/app/debug
-/android/app/profile
-/android/app/release
-
-
-pubspec_overrides.yaml
-
-
-**/*.g.dart
-**/*.gr.dart
-**/*.freezed.dart
-**/*.cherrypick_injectable.g.dart
-
--- a/examples/client_app/.metadata
+++ b/examples/client_app/.metadata
@@ -1,30 +0,0 @@
-# This file tracks properties of this Flutter project.
-# Used by Flutter tool to assess capabilities and perform upgrades etc.
-#
-# This file should be version controlled and should not be manually edited.
-
-version:
-  revision: "4cf269e36de2573851eaef3c763994f8f9be494d"
-  channel: "stable"
-
-project_type: app
-
-# Tracks metadata for the flutter migrate command
-migration:
-  platforms:
-    - platform: root
-      create_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
-      base_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
-    - platform: web
-      create_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
-      base_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
-
-  # User provided section
-
-  # List of Local paths (relative to this file) that should be
-  # ignored by the migrate tool.
-  #
-  # Files that are not part of the templates will be ignored by default.
-  unmanaged_files:
-    - 'lib/main.dart'
-    - 'ios/Runner.xcodeproj/project.pbxproj'
--- a/examples/client_app/README.md
+++ b/examples/client_app/README.md
@@ -1,16 +0,0 @@
-# client_app
-
-A new Flutter project.
-
-## Getting Started
-
-This project is a starting point for a Flutter application.
-
-A few resources to get you started if this is your first Flutter project:
-
- [Lab: Write your first Flutter app](https://docs.flutter.dev/get-started/codelab)
- [Cookbook: Useful Flutter samples](https://docs.flutter.dev/cookbook)
-
-For help getting started with Flutter development, view the
-[online documentation](https://docs.flutter.dev/), which offers tutorials,
-samples, guidance on mobile development, and a full API reference.
--- a/examples/client_app/analysis_options.yaml
+++ b/examples/client_app/analysis_options.yaml
@@ -1,28 +0,0 @@
-# This file configures the analyzer, which statically analyzes Dart code to
-# check for errors, warnings, and lints.
-#
-# The issues identified by the analyzer are surfaced in the UI of Dart-enabled
-# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be
-# invoked from the command line by running `flutter analyze`.
-
-# The following line activates a set of recommended lints for Flutter apps,
-# packages, and plugins designed to encourage good coding practices.
-include: package:flutter_lints/flutter.yaml
-
-linter:
-  # The lint rules applied to this project can be customized in the
-  # section below to disable rules from the `package:flutter_lints/flutter.yaml`
-  # included above or to enable additional rules. A list of all available lints
-  # and their documentation is published at https://dart.dev/lints.
-  #
-  # Instead of disabling a lint rule for the entire project in the
-  # section below, it can also be suppressed for a single line of code
-  # or a specific dart file by using the `// ignore: name_of_lint` and
-  # `// ignore_for_file: name_of_lint` syntax on the line or in the file
-  # producing the lint.
-  rules:
-    # avoid_print: false  # Uncomment to disable the `avoid_print` rule
-    # prefer_single_quotes: true  # Uncomment to enable the `prefer_single_quotes` rule
-
-# Additional information about this file can be found at
-# https://dart.dev/guides/language/analysis-options
--- a/examples/client_app/lib/main.dart
+++ b/examples/client_app/lib/main.dart
@@ -1,30 +0,0 @@
-import 'package:cherrypick/cherrypick.dart';
-import 'package:client_app/my_home_page.dart';
-import 'package:flutter/material.dart';
-import 'package:cherrypick_flutter/cherrypick_flutter.dart';
-
-void main() {
-  // Здесь происходит инициализация рутового скоупа и привязка зависимостей
-  CherryPick.openRootScope().installModules([
-    // Создаем модуль, который будет предоставлять UseCase
-  ]);
-
-  runApp(
-    const CherryPickProvider(
-      child: MyApp(),
-    ),
-  );
-}
-
-class MyApp extends StatelessWidget {
-  const MyApp({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return CherryPickProvider(
-      child: MaterialApp(
-        home: MyHomePage(),
-      ),
-    );
-  }
-}
--- a/examples/client_app/lib/my_home_page.dart
+++ b/examples/client_app/lib/my_home_page.dart
@@ -1,22 +0,0 @@
-import 'package:flutter/material.dart';
-import 'use_case.dart';
-
-class MyHomePage extends StatelessWidget {
-  late final UseCase useCase;
-
-  // ignore: prefer_const_constructors_in_immutables
-  MyHomePage({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    //_inject(context); // Make sure this function is called in context
-    return Scaffold(
-      appBar: AppBar(
-        title: const Text('Example App'),
-      ),
-      body: Center(
-        child: Text(useCase.fetchData()),
-      ),
-    );
-  }
-}
--- a/examples/client_app/lib/use_case.dart
+++ b/examples/client_app/lib/use_case.dart
@@ -1,3 +0,0 @@
-class UseCase {
-  String fetchData() => "Data fetched by UseCase";
-}
--- a/examples/client_app/pubspec.lock
+++ b/examples/client_app/pubspec.lock
@@ -1,598 +0,0 @@
-# Generated by pub
-# See https://dart.dev/tools/pub/glossary#lockfile
-packages:
-  _fe_analyzer_shared:
-    dependency: transitive
-    description:
-      name: _fe_analyzer_shared
-      sha256: f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834
-      url: "https://pub.dev"
-    source: hosted
-    version: "72.0.0"
-  _macros:
-    dependency: transitive
-    description: dart
-    source: sdk
-    version: "0.3.2"
-  analyzer:
-    dependency: transitive
-    description:
-      name: analyzer
-      sha256: b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139
-      url: "https://pub.dev"
-    source: hosted
-    version: "6.7.0"
-  args:
-    dependency: transitive
-    description:
-      name: args
-      sha256: d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.7.0"
-  async:
-    dependency: transitive
-    description:
-      name: async
-      sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.11.0"
-  boolean_selector:
-    dependency: transitive
-    description:
-      name: boolean_selector
-      sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.1"
-  build:
-    dependency: transitive
-    description:
-      name: build
-      sha256: "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.4.1"
-  build_config:
-    dependency: transitive
-    description:
-      name: build_config
-      sha256: bf80fcfb46a29945b423bd9aad884590fb1dc69b330a4d4700cac476af1708d1
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.1"
-  build_daemon:
-    dependency: transitive
-    description:
-      name: build_daemon
-      sha256: "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.0.2"
-  build_resolvers:
-    dependency: transitive
-    description:
-      name: build_resolvers
-      sha256: "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.4.2"
-  build_runner:
-    dependency: "direct dev"
-    description:
-      name: build_runner
-      sha256: "028819cfb90051c6b5440c7e574d1896f8037e3c96cf17aaeb054c9311cfbf4d"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.4.13"
-  build_runner_core:
-    dependency: transitive
-    description:
-      name: build_runner_core
-      sha256: f8126682b87a7282a339b871298cc12009cb67109cfa1614d6436fb0289193e0
-      url: "https://pub.dev"
-    source: hosted
-    version: "7.3.2"
-  built_collection:
-    dependency: transitive
-    description:
-      name: built_collection
-      sha256: "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100"
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.1.1"
-  built_value:
-    dependency: transitive
-    description:
-      name: built_value
-      sha256: ea90e81dc4a25a043d9bee692d20ed6d1c4a1662a28c03a96417446c093ed6b4
-      url: "https://pub.dev"
-    source: hosted
-    version: "8.9.5"
-  characters:
-    dependency: transitive
-    description:
-      name: characters
-      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.3.0"
-  checked_yaml:
-    dependency: transitive
-    description:
-      name: checked_yaml
-      sha256: feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.3"
-  cherrypick:
-    dependency: "direct main"
-    description:
-      path: "../../cherrypick"
-      relative: true
-    source: path
-    version: "2.2.0-dev.1"
-  cherrypick_annotations:
-    dependency: "direct main"
-    description:
-      path: "../../cherrypick_annotations"
-      relative: true
-    source: path
-    version: "1.1.0-dev.0"
-  cherrypick_flutter:
-    dependency: "direct main"
-    description:
-      path: "../../cherrypick_flutter"
-      relative: true
-    source: path
-    version: "1.1.2-dev.1"
-  cherrypick_generator:
-    dependency: "direct dev"
-    description:
-      path: "../../cherrypick_generator"
-      relative: true
-    source: path
-    version: "1.1.0-dev.2"
-  clock:
-    dependency: transitive
-    description:
-      name: clock
-      sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.1"
-  code_builder:
-    dependency: transitive
-    description:
-      name: code_builder
-      sha256: "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.10.1"
-  collection:
-    dependency: transitive
-    description:
-      name: collection
-      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.18.0"
-  convert:
-    dependency: transitive
-    description:
-      name: convert
-      sha256: b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.1.2"
-  crypto:
-    dependency: transitive
-    description:
-      name: crypto
-      sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.6"
-  cupertino_icons:
-    dependency: "direct main"
-    description:
-      name: cupertino_icons
-      sha256: ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.8"
-  dart_style:
-    dependency: transitive
-    description:
-      name: dart_style
-      sha256: "7856d364b589d1f08986e140938578ed36ed948581fbc3bc9aef1805039ac5ab"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.3.7"
-  fake_async:
-    dependency: transitive
-    description:
-      name: fake_async
-      sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.3.1"
-  file:
-    dependency: transitive
-    description:
-      name: file
-      sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4
-      url: "https://pub.dev"
-    source: hosted
-    version: "7.0.1"
-  fixnum:
-    dependency: transitive
-    description:
-      name: fixnum
-      sha256: b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.1"
-  flutter:
-    dependency: "direct main"
-    description: flutter
-    source: sdk
-    version: "0.0.0"
-  flutter_lints:
-    dependency: "direct dev"
-    description:
-      name: flutter_lints
-      sha256: "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1"
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.0.0"
-  flutter_test:
-    dependency: "direct dev"
-    description: flutter
-    source: sdk
-    version: "0.0.0"
-  frontend_server_client:
-    dependency: transitive
-    description:
-      name: frontend_server_client
-      sha256: f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.0.0"
-  glob:
-    dependency: transitive
-    description:
-      name: glob
-      sha256: c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.3"
-  graphs:
-    dependency: transitive
-    description:
-      name: graphs
-      sha256: "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.3.2"
-  http_multi_server:
-    dependency: transitive
-    description:
-      name: http_multi_server
-      sha256: aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.2.2"
-  http_parser:
-    dependency: transitive
-    description:
-      name: http_parser
-      sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.0.2"
-  io:
-    dependency: transitive
-    description:
-      name: io
-      sha256: dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.5"
-  js:
-    dependency: transitive
-    description:
-      name: js
-      sha256: c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.7.1"
-  json_annotation:
-    dependency: transitive
-    description:
-      name: json_annotation
-      sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.9.0"
-  leak_tracker:
-    dependency: transitive
-    description:
-      name: leak_tracker
-      sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
-      url: "https://pub.dev"
-    source: hosted
-    version: "10.0.5"
-  leak_tracker_flutter_testing:
-    dependency: transitive
-    description:
-      name: leak_tracker_flutter_testing
-      sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.5"
-  leak_tracker_testing:
-    dependency: transitive
-    description:
-      name: leak_tracker_testing
-      sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.1"
-  lints:
-    dependency: transitive
-    description:
-      name: lints
-      sha256: "3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413"
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.0.0"
-  logging:
-    dependency: transitive
-    description:
-      name: logging
-      sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.3.0"
-  macros:
-    dependency: transitive
-    description:
-      name: macros
-      sha256: "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.1.2-main.4"
-  matcher:
-    dependency: transitive
-    description:
-      name: matcher
-      sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.12.16+1"
-  material_color_utilities:
-    dependency: transitive
-    description:
-      name: material_color_utilities
-      sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.11.1"
-  meta:
-    dependency: transitive
-    description:
-      name: meta
-      sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.15.0"
-  mime:
-    dependency: transitive
-    description:
-      name: mime
-      sha256: "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.0"
-  package_config:
-    dependency: transitive
-    description:
-      name: package_config
-      sha256: f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.2.0"
-  path:
-    dependency: transitive
-    description:
-      name: path
-      sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.9.0"
-  pool:
-    dependency: transitive
-    description:
-      name: pool
-      sha256: "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.5.1"
-  pub_semver:
-    dependency: transitive
-    description:
-      name: pub_semver
-      sha256: "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.2.0"
-  pubspec_parse:
-    dependency: transitive
-    description:
-      name: pubspec_parse
-      sha256: "81876843eb50dc2e1e5b151792c9a985c5ed2536914115ed04e9c8528f6647b0"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.4.0"
-  shelf:
-    dependency: transitive
-    description:
-      name: shelf
-      sha256: ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.4.1"
-  shelf_web_socket:
-    dependency: transitive
-    description:
-      name: shelf_web_socket
-      sha256: cc36c297b52866d203dbf9332263c94becc2fe0ceaa9681d07b6ef9807023b67
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.1"
-  sky_engine:
-    dependency: transitive
-    description: flutter
-    source: sdk
-    version: "0.0.99"
-  source_gen:
-    dependency: transitive
-    description:
-      name: source_gen
-      sha256: "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.5.0"
-  source_span:
-    dependency: transitive
-    description:
-      name: source_span
-      sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.10.0"
-  stack_trace:
-    dependency: transitive
-    description:
-      name: stack_trace
-      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.11.1"
-  stream_channel:
-    dependency: transitive
-    description:
-      name: stream_channel
-      sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.2"
-  stream_transform:
-    dependency: transitive
-    description:
-      name: stream_transform
-      sha256: ad47125e588cfd37a9a7f86c7d6356dde8dfe89d071d293f80ca9e9273a33871
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.1"
-  string_scanner:
-    dependency: transitive
-    description:
-      name: string_scanner
-      sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.2.0"
-  term_glyph:
-    dependency: transitive
-    description:
-      name: term_glyph
-      sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.2.1"
-  test_api:
-    dependency: transitive
-    description:
-      name: test_api
-      sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.7.2"
-  timing:
-    dependency: transitive
-    description:
-      name: timing
-      sha256: "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.2"
-  typed_data:
-    dependency: transitive
-    description:
-      name: typed_data
-      sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.4.0"
-  vector_math:
-    dependency: transitive
-    description:
-      name: vector_math
-      sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.4"
-  vm_service:
-    dependency: transitive
-    description:
-      name: vm_service
-      sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
-      url: "https://pub.dev"
-    source: hosted
-    version: "14.2.5"
-  watcher:
-    dependency: transitive
-    description:
-      name: watcher
-      sha256: "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.1"
-  web:
-    dependency: transitive
-    description:
-      name: web
-      sha256: "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.1.1"
-  web_socket:
-    dependency: transitive
-    description:
-      name: web_socket
-      sha256: "34d64019aa8e36bf9842ac014bb5d2f5586ca73df5e4d9bf5c936975cae6982c"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.0.1"
-  web_socket_channel:
-    dependency: transitive
-    description:
-      name: web_socket_channel
-      sha256: d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.3"
-  yaml:
-    dependency: transitive
-    description:
-      name: yaml
-      sha256: b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.1.3"
-sdks:
-  dart: ">=3.5.2 <4.0.0"
-  flutter: ">=3.18.0-18.0.pre.54"
--- a/examples/client_app/pubspec.yaml
+++ b/examples/client_app/pubspec.yaml
@@ -1,70 +0,0 @@
-name: client_app
-description: "A new Flutter project."
-publish_to: 'none'
-
-version: 1.0.0+1
-
-environment:
-  sdk: ">=3.5.2 <4.0.0"
-
-
-dependencies:
-  flutter:
-    sdk: flutter
-  cherrypick: ^2.2.0-dev.1
-  cherrypick_flutter: ^1.1.2-dev.1
-
-  cherrypick_annotations: ^1.1.0-dev.1
-
-  cupertino_icons: ^1.0.8
-
-dev_dependencies:
-  flutter_test:
-    sdk: flutter
-
-  flutter_lints: ^5.0.0
-
-  cherrypick_generator: ^1.1.0-dev.3
-  build_runner: ^2.4.13
-
-# For information on the generic Dart part of this file, see the
-# following page: https://dart.dev/tools/pub/pubspec
-
-# The following section is specific to Flutter packages.
-flutter:
-
-  # The following line ensures that the Material Icons font is
-  # included with your application, so that you can use the icons in
-  # the material Icons class.
-  uses-material-design: true
-
-  # To add assets to your application, add an assets section, like this:
-  # assets:
-  #   - images/a_dot_burr.jpeg
-  #   - images/a_dot_ham.jpeg
-
-  # An image asset can refer to one or more resolution-specific "variants", see
-  # https://flutter.dev/to/resolution-aware-images
-
-  # For details regarding adding assets from package dependencies, see
-  # https://flutter.dev/to/asset-from-package
-
-  # To add custom fonts to your application, add a fonts section here,
-  # in this "flutter" section. Each entry in this list should have a
-  # "family" key with the font family name, and a "fonts" key with a
-  # list giving the asset and other descriptors for the font. For
-  # example:
-  # fonts:
-  #   - family: Schyler
-  #     fonts:
-  #       - asset: fonts/Schyler-Regular.ttf
-  #       - asset: fonts/Schyler-Italic.ttf
-  #         style: italic
-  #   - family: Trajan Pro
-  #     fonts:
-  #       - asset: fonts/TrajanPro.ttf
-  #       - asset: fonts/TrajanPro_Bold.ttf
-  #         weight: 700
-  #
-  # For details regarding fonts from package dependencies,
-  # see https://flutter.dev/to/font-from-package
--- a/examples/client_app/test/widget_test.dart
+++ b/examples/client_app/test/widget_test.dart
@@ -1,31 +0,0 @@
-// This is a basic Flutter widget test.
-//
-// To perform an interaction with a widget in your test, use the WidgetTester
-// utility in the flutter_test package. For example, you can send tap and scroll
-// gestures. You can also use WidgetTester to find child widgets in the widget
-// tree, read text, and verify that the values of widget properties are correct.
-
-//import 'package:flutter/material.dart';
-import 'package:flutter_test/flutter_test.dart';
-
-//import 'package:client_app/main.dart';
-
-void main() {
-  testWidgets('Counter increments smoke test', (WidgetTester tester) async {
-    expect(1, 1);
-    // Build our app and trigger a frame.
-    //await tester.pumpWidget(const MyApp());
-
-    //// Verify that our counter starts at 0.
-    //expect(find.text('0'), findsOneWidget);
-    //expect(find.text('1'), findsNothing);
-
-    //// Tap the '+' icon and trigger a frame.
-    //await tester.tap(find.byIcon(Icons.add));
-    //await tester.pump();
-
-    //// Verify that our counter has incremented.
-    //expect(find.text('0'), findsNothing);
-    //expect(find.text('1'), findsOneWidget);
-  });
-}
--- a/examples/client_app/web/favicon.png
+++ b/examples/client_app/web/favicon.png
--- a/examples/client_app/web/icons/Icon-192.png
+++ b/examples/client_app/web/icons/Icon-192.png
--- a/examples/client_app/web/icons/Icon-512.png
+++ b/examples/client_app/web/icons/Icon-512.png
--- a/examples/client_app/web/icons/Icon-maskable-192.png
+++ b/examples/client_app/web/icons/Icon-maskable-192.png
--- a/examples/client_app/web/icons/Icon-maskable-512.png
+++ b/examples/client_app/web/icons/Icon-maskable-512.png
--- a/examples/client_app/web/index.html
+++ b/examples/client_app/web/index.html
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <!--
-    If you are serving your web app in a path other than the root, change the
-    href value below to reflect the base path you are serving from.
-
-    The path provided below has to start and end with a slash "/" in order for
-    it to work correctly.
-
-    For more details:
-    * https://developer.mozilla.org/en-US/docs/Web/HTML/Element/base
-
-    This is a placeholder for base href that will be replaced by the value of
-    the `--base-href` argument provided to `flutter build`.
-  -->
-  <base href="$FLUTTER_BASE_HREF">
-
-  <meta charset="UTF-8">
-  <meta content="IE=Edge" http-equiv="X-UA-Compatible">
-  <meta name="description" content="A new Flutter project.">
-
-  <!-- iOS meta tags & icons -->
-  <meta name="apple-mobile-web-app-capable" content="yes">
-  <meta name="apple-mobile-web-app-status-bar-style" content="black">
-  <meta name="apple-mobile-web-app-title" content="client_app">
-  <link rel="apple-touch-icon" href="icons/Icon-192.png">
-
-  <!-- Favicon -->
-  <link rel="icon" type="image/png" href="favicon.png"/>
-
-  <title>client_app</title>
-  <link rel="manifest" href="manifest.json">
-</head>
-<body>
-  <script src="flutter_bootstrap.js" async></script>
-</body>
-</html>
--- a/examples/client_app/web/manifest.json
+++ b/examples/client_app/web/manifest.json
@@ -1,35 +0,0 @@
-{
-    "name": "client_app",
-    "short_name": "client_app",
-    "start_url": ".",
-    "display": "standalone",
-    "background_color": "#0175C2",
-    "theme_color": "#0175C2",
-    "description": "A new Flutter project.",
-    "orientation": "portrait-primary",
-    "prefer_related_applications": false,
-    "icons": [
-        {
-            "src": "icons/Icon-192.png",
-            "sizes": "192x192",
-            "type": "image/png"
-        },
-        {
-            "src": "icons/Icon-512.png",
-            "sizes": "512x512",
-            "type": "image/png"
-        },
-        {
-            "src": "icons/Icon-maskable-192.png",
-            "sizes": "192x192",
-            "type": "image/png",
-            "purpose": "maskable"
-        },
-        {
-            "src": "icons/Icon-maskable-512.png",
-            "sizes": "512x512",
-            "type": "image/png",
-            "purpose": "maskable"
-        }
-    ]
-}
--- a/examples/postly/.gitignore
+++ b/examples/postly/.gitignore
@@ -1,48 +0,0 @@
-# Miscellaneous
-*.class
-*.log
-*.pyc
-*.swp
-.DS_Store
-.atom/
-.buildlog/
-.history
-.svn/
-migrate_working_dir/
-
-# IntelliJ related
-*.iml
-*.ipr
-*.iws
-.idea/
-
-# The .vscode folder contains launch configuration and tasks you configure in
-# VS Code which you may wish to be included in version control, so this line
-# is commented out by default.
-#.vscode/
-
-# Flutter/Dart/Pub related
-**/doc/api/
-**/ios/Flutter/.last_build_id
-.dart_tool/
-.flutter-plugins
-.flutter-plugins-dependencies
-.pub-cache/
-.pub/
-/build/
-
-# Symbolication related
-app.*.symbols
-
-# Obfuscation related
-app.*.map.json
-
-# Android Studio will place build artifacts here
-/android/app/debug
-/android/app/profile
-/android/app/release
-
-
-**/*.g.dart
-**/*.gr.dart
-**/*.freezed.dart
--- a/examples/postly/.metadata
+++ b/examples/postly/.metadata
@@ -1,30 +0,0 @@
-# This file tracks properties of this Flutter project.
-# Used by Flutter tool to assess capabilities and perform upgrades etc.
-#
-# This file should be version controlled and should not be manually edited.
-
-version:
-  revision: "4cf269e36de2573851eaef3c763994f8f9be494d"
-  channel: "stable"
-
-project_type: app
-
-# Tracks metadata for the flutter migrate command
-migration:
-  platforms:
-    - platform: root
-      create_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
-      base_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
-    - platform: web
-      create_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
-      base_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
-
-  # User provided section
-
-  # List of Local paths (relative to this file) that should be
-  # ignored by the migrate tool.
-  #
-  # Files that are not part of the templates will be ignored by default.
-  unmanaged_files:
-    - 'lib/main.dart'
-    - 'ios/Runner.xcodeproj/project.pbxproj'
--- a/examples/postly/README.md
+++ b/examples/postly/README.md
@@ -1,16 +0,0 @@
-# postly
-
-A new Flutter project.
-
-## Getting Started
-
-This project is a starting point for a Flutter application.
-
-A few resources to get you started if this is your first Flutter project:
-
- [Lab: Write your first Flutter app](https://docs.flutter.dev/get-started/codelab)
- [Cookbook: Useful Flutter samples](https://docs.flutter.dev/cookbook)
-
-For help getting started with Flutter development, view the
-[online documentation](https://docs.flutter.dev/), which offers tutorials,
-samples, guidance on mobile development, and a full API reference.
--- a/examples/postly/analysis_options.yaml
+++ b/examples/postly/analysis_options.yaml
@@ -1,28 +0,0 @@
-# This file configures the analyzer, which statically analyzes Dart code to
-# check for errors, warnings, and lints.
-#
-# The issues identified by the analyzer are surfaced in the UI of Dart-enabled
-# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be
-# invoked from the command line by running `flutter analyze`.
-
-# The following line activates a set of recommended lints for Flutter apps,
-# packages, and plugins designed to encourage good coding practices.
-include: package:flutter_lints/flutter.yaml
-
-linter:
-  # The lint rules applied to this project can be customized in the
-  # section below to disable rules from the `package:flutter_lints/flutter.yaml`
-  # included above or to enable additional rules. A list of all available lints
-  # and their documentation is published at https://dart.dev/lints.
-  #
-  # Instead of disabling a lint rule for the entire project in the
-  # section below, it can also be suppressed for a single line of code
-  # or a specific dart file by using the `// ignore: name_of_lint` and
-  # `// ignore_for_file: name_of_lint` syntax on the line or in the file
-  # producing the lint.
-  rules:
-    # avoid_print: false  # Uncomment to disable the `avoid_print` rule
-    # prefer_single_quotes: true  # Uncomment to enable the `prefer_single_quotes` rule
-
-# Additional information about this file can be found at
-# https://dart.dev/guides/language/analysis-options
--- a/examples/postly/devtools_options.yaml
+++ b/examples/postly/devtools_options.yaml
@@ -1,3 +0,0 @@
-description: This file stores settings for Dart & Flutter DevTools.
-documentation: https://docs.flutter.dev/tools/devtools/extensions#configure-extension-enablement-states
-extensions:
--- a/examples/postly/lib/app.dart
+++ b/examples/postly/lib/app.dart
@@ -1,35 +0,0 @@
-import 'package:cherrypick/cherrypick.dart';
-import 'package:cherrypick_annotations/cherrypick_annotations.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-
-import 'domain/repository/post_repository.dart';
-import 'presentation/bloc/post_bloc.dart';
-import 'router/app_router.dart';
-
-part 'app.inject.cherrypick.g.dart';
-
-@injectable()
-class MyApp extends StatelessWidget with _$MyApp {
-  final _appRouter = AppRouter();
-
-  @named('repo')
-  @inject()
-  late final PostRepository repository;
-
-  MyApp({super.key}) {
-    _inject(this);
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return BlocProvider(
-      create: (_) => PostBloc(repository),
-      child: MaterialApp.router(
-        routeInformationParser: _appRouter.defaultRouteParser(),
-        routerDelegate: _appRouter.delegate(),
-        theme: ThemeData.light(),
-      ),
-    );
-  }
-}
--- a/examples/postly/lib/data/model/post_model.dart
+++ b/examples/postly/lib/data/model/post_model.dart
@@ -1,16 +0,0 @@
-import 'package:freezed_annotation/freezed_annotation.dart';
-
-part 'post_model.freezed.dart';
-part 'post_model.g.dart';
-
-@freezed
-class PostModel with _$PostModel {
-  const factory PostModel({
-    required int id,
-    required String title,
-    required String body,
-  }) = _PostModel;
-
-  factory PostModel.fromJson(Map<String, dynamic> json) =>
-      _$PostModelFromJson(json);
-}
--- a/examples/postly/lib/data/network/json_placeholder_api.dart
+++ b/examples/postly/lib/data/network/json_placeholder_api.dart
@@ -1,17 +0,0 @@
-import 'package:retrofit/retrofit.dart';
-import 'package:dio/dio.dart';
-
-import '../model/post_model.dart';
-
-part 'json_placeholder_api.g.dart';
-
-@RestApi(baseUrl: 'https://jsonplaceholder.typicode.com/')
-abstract class JsonPlaceholderApi {
-  factory JsonPlaceholderApi(Dio dio, {String baseUrl}) = _JsonPlaceholderApi;
-
-  @GET('/posts')
-  Future<List<PostModel>> getPosts();
-
-  @GET('/posts/{id}')
-  Future<PostModel> getPost(@Path('id') int id);
-}
--- a/examples/postly/lib/data/post_repository_impl.dart
+++ b/examples/postly/lib/data/post_repository_impl.dart
@@ -1,32 +0,0 @@
-import 'package:dartz/dartz.dart';
-import '../domain/entity/post.dart';
-import '../domain/repository/post_repository.dart';
-import 'network/json_placeholder_api.dart';
-
-class PostRepositoryImpl implements PostRepository {
-  final JsonPlaceholderApi api;
-
-  PostRepositoryImpl(this.api);
-
-  @override
-  Future<Either<Exception, List<Post>>> getPosts() async {
-    try {
-      final posts = await api.getPosts();
-      return Right(posts
-          .map((e) => Post(id: e.id, title: e.title, body: e.body))
-          .toList());
-    } catch (e) {
-      return Left(Exception(e.toString()));
-    }
-  }
-
-  @override
-  Future<Either<Exception, Post>> getPost(int id) async {
-    try {
-      final post = await api.getPost(id);
-      return Right(Post(id: post.id, title: post.title, body: post.body));
-    } catch (e) {
-      return Left(Exception(e.toString()));
-    }
-  }
-}
--- a/examples/postly/lib/di/app_module.dart
+++ b/examples/postly/lib/di/app_module.dart
@@ -1,69 +0,0 @@
-import 'package:cherrypick_annotations/cherrypick_annotations.dart';
-import 'package:dio/dio.dart';
-import 'package:cherrypick/cherrypick.dart';
-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';
-
-@module()
-abstract class AppModule extends Module {
-  @instance()
-  int timeout() => 1000;
-
-  @instance()
-  @named('Delay')
-  Future<int> delay() => Future.value(1000);
-
-  @instance()
-  @named('Size')
-  Future<int> size() async => 10;
-
-  @instance()
-  @named('baseUrl')
-  String baseUrl() => "https://google.com";
-
-  @provide()
-  @named('Delay1')
-  Future<int> delay1() => Future.value(1000);
-
-  @provide()
-  @named('Size1')
-  Future<int> size1() async => 10;
-
-  @provide()
-  @singleton()
-  @named('dio')
-  Dio dio(@named('baseUrl') String baseUrl) =>
-      Dio(BaseOptions(baseUrl: baseUrl));
-
-  @provide()
-  @singleton()
-  JsonPlaceholderApi api(@named('dio') Dio dio) => JsonPlaceholderApi(dio);
-
-  @provide()
-  @named('repo')
-  PostRepository repo(JsonPlaceholderApi api) => PostRepositoryImpl(api);
-
-  @provide()
-  @named('TestProvideWithParams')
-  String testProvideWithParams(@params() dynamic params) => "hello $params";
-
-  @provide()
-  @named('TestProvideAsyncWithParams')
-  Future<String> testProvideAsyncWithParams(@params() dynamic params) async =>
-      "hello $params";
-
-  @provide()
-  @named('TestProvideWithParams1')
-  String testProvideWithParams1(
-          @named('baseUrl') String baseUrl, @params() dynamic params) =>
-      "hello $params";
-
-  @provide()
-  @named('TestProvideAsyncWithParams1')
-  Future<String> testProvideAsyncWithParams1(
-          @named('baseUrl') String baseUrl, @params() dynamic params) async =>
-      "hello $params";
-}
--- a/examples/postly/lib/domain/entity/post.dart
+++ b/examples/postly/lib/domain/entity/post.dart
@@ -1,12 +0,0 @@
-import 'package:freezed_annotation/freezed_annotation.dart';
-
-part 'post.freezed.dart';
-
-@freezed
-class Post with _$Post {
-  const factory Post({
-    required int id,
-    required String title,
-    required String body,
-  }) = _Post;
-}
--- a/examples/postly/lib/domain/repository/post_repository.dart
+++ b/examples/postly/lib/domain/repository/post_repository.dart
@@ -1,7 +0,0 @@
-import 'package:dartz/dartz.dart';
-import '../entity/post.dart';
-
-abstract class PostRepository {
-  Future<Either<Exception, List<Post>>> getPosts();
-  Future<Either<Exception, Post>> getPost(int id);
-}
--- a/examples/postly/lib/main.dart
+++ b/examples/postly/lib/main.dart
@@ -1,9 +0,0 @@
-import 'package:cherrypick/cherrypick.dart';
-import 'package:flutter/material.dart';
-import 'package:postly/app.dart';
-import 'di/app_module.dart';
-
-void main() {
-  CherryPick.openRootScope().installModules([$AppModule()]);
-  runApp(MyApp());
-}
--- a/examples/postly/lib/presentation/bloc/post_bloc.dart
+++ b/examples/postly/lib/presentation/bloc/post_bloc.dart
@@ -1,38 +0,0 @@
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:freezed_annotation/freezed_annotation.dart';
-import '../../domain/entity/post.dart';
-import '../../domain/repository/post_repository.dart';
-
-part 'post_bloc.freezed.dart';
-
-@freezed
-class PostEvent with _$PostEvent {
-  const factory PostEvent.fetchAll() = _FetchAll;
-}
-
-@freezed
-class PostState with _$PostState {
-  const factory PostState.initial() = _Initial;
-  const factory PostState.loading() = _Loading;
-  const factory PostState.loaded(List<Post> posts) = _Loaded;
-  const factory PostState.failure(String message) = _Failure;
-}
-
-class PostBloc extends Bloc<PostEvent, PostState> {
-  final PostRepository repository;
-
-  PostBloc(this.repository) : super(const PostState.initial()) {
-    on<PostEvent>((event, emit) async {
-      await event.map(
-        fetchAll: (e) async {
-          emit(const PostState.loading());
-          final result = await repository.getPosts();
-          result.fold(
-            (l) => emit(PostState.failure(l.toString())),
-            (r) => emit(PostState.loaded(r)),
-          );
-        },
-      );
-    });
-  }
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Sergey Penkovsky	fc43167756	added license header for src. Added changelog	2021-04-26 10:40:27 +03:00
Sergey Penkovsky	e726e3bf30	refactored di library.	2021-04-26 09:44:04 +03:00
Sergey Penkovsky	9032abe21a	fixed binding and writed unit tests	2021-04-23 17:52:33 +03:00
Sergey Penkovsky	0708b87753	fixed binding and writed unit tests	2021-04-23 17:29:42 +03:00
Sergey Penkovsky	b1973ca418	refactored code and implemented unit tests	2021-04-23 10:34:33 +03:00
Sergey Penkovsky	52c7786a49	implemented doc	2021-04-23 08:43:10 +03:00
Sergey Penkovsky	45f81225b0	added documentation	2021-04-22 17:30:32 +03:00
Sergey Penkovsky	475ca5aedc	added documents	2021-04-22 15:22:09 +03:00
Sergey Penkovsky	dce2f4f7a9	added documentation	2021-04-22 10:25:38 +03:00
Sergey Penkovsky	6d7a52f0fa	added documentation	2021-04-22 10:10:34 +03:00
Sergey Penkovsky	b1c4f908fe	added documentation	2021-04-22 09:56:37 +03:00
Sergey Penkovsky	666221199d	fixed resolve method	2021-04-21 08:25:55 +03:00
Sergey Penkovsky	3868bdb0a7	fixed example	2021-04-21 08:12:23 +03:00
Sergey Penkovsky	b46cfc36a2	implemented expiremental di with new api	2021-04-21 08:05:38 +03:00
Sergey Penkovsky	1aa0ae045e	Добавить .gitlab-ci.yml	2021-04-14 17:19:35 +03:00
Sergey Penkovsky	12d877333a	upgraded code for nullsafety	2021-03-27 19:48:03 +03:00
				`@@ -1 +0,0 @@`
				`Sergey Penkovsky <sergey.penkovsky@gmail.com>`