changed package version

AUTHORS.md

@@ -0,0 +1 @@
+Sergey Penkovsky <sergey.penkovsky@gmail.com>

CHANGELOG.md

@@ -1,6 +1,9 @@
 
 # Changelog
 
+0.1.2+1  Fixed initializtaion error
+
+---
 0.1.2  Fixed warnings in code
 
 ---

doc/quick_start_en.md

@@ -85,8 +85,7 @@ Example:
 ```dart
 import 'dart:async';
 import 'package:meta/meta.dart';
-import 'package:cherrypick/scope.dart';
-import 'package:cherrypick/module.dart';
+import 'package:cherrypick/cherrypick.dart';
 
 class AppModule extends Module {
   @override

doc/quick_start_ru.md

@@ -85,8 +85,7 @@ Scope - это контейнер, который хранит все дерев
 ```dart
 import 'dart:async';
 import 'package:meta/meta.dart';
-import 'package:cherrypick/scope.dart';
-import 'package:cherrypick/module.dart';
+import 'package:cherrypick/cherrypick.dart';
 
 class AppModule extends Module {
   @override

example/bin/main.dart

@@ -1,7 +1,7 @@
 import 'dart:async';
+
+import 'package:cherrypick/cherrypick.dart';
 import 'package:meta/meta.dart';
-import 'package:cherrypick/scope.dart';
-import 'package:cherrypick/module.dart';
 
 class AppModule extends Module {
   @override

example/pubspec.yaml

@@ -1,6 +1,5 @@
 name: example
 version: 1.0.0
-author: "Sergey Penkovsky <sergey.penkovsky@gmail.com>"
 homepage: localhost
 publish_to: none
 

lib/cherrypick.dart

@@ -11,9 +11,9 @@
 /// limitations under the License.
 ///
 
-library dart_di;
+library cherrypick;
 
-export 'package:cherrypick/scope.dart';
-export 'package:cherrypick/module.dart';
-export 'package:cherrypick/binding.dart';
-export 'package:cherrypick/di.dart';
+export 'package:cherrypick/src/binding.dart';
+export 'package:cherrypick/src/helper.dart';
+export 'package:cherrypick/src/module.dart';
+export 'package:cherrypick/src/scope.dart';

lib/di.dart

@@ -1,37 +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/scope.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;
-    }
-  }
-}

lib/src/binding.dart

@@ -96,9 +96,6 @@ class Binding<T> {
   ///
   /// return [Binding]
   Binding<T> singeltone() {
-    if (_mode == Mode.PROVIDER_INSTANCE) {
-      _instance = _provider?.call();
-    }
     _isSingeltone = true;
     return this;
   }
@@ -113,5 +110,11 @@ class Binding<T> {
   /// ENG: Resolve instance.
   ///
   /// return [T]
-  T? get provider => _provider?.call();
+  T? get provider {
+    if (_isSingeltone) {
+      _instance ??= _provider?.call();
+      return _instance;
+    }
+    return _provider?.call();
+  }
 }

lib/src/factory.dart

@@ -10,8 +10,7 @@
 /// See the License for the specific language governing permissions and
 /// limitations under the License.
 ///
-
-import 'package:cherrypick/scope.dart';
+import 'package:cherrypick/src/scope.dart';
 
 abstract class Factory<T> {
   T createInstance(Scope scope);

lib/src/helper.dart

@@ -0,0 +1,105 @@
+///
+/// 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]);
+    }
+  }
+}

lib/src/module.dart

@@ -10,11 +10,10 @@
 /// See the License for the specific language governing permissions and
 /// limitations under the License.
 ///
-
 import 'dart:collection';
 
-import 'package:cherrypick/binding.dart';
-import 'package:cherrypick/scope.dart';
+import 'package:cherrypick/src/binding.dart';
+import 'package:cherrypick/src/scope.dart';
 
 /// RU: Класс Module является основой для пользовательских модулей.
 ///  Этот класс нужен для инициализации [Scope].

lib/src/scope.dart

@@ -10,11 +10,10 @@
 /// See the License for the specific language governing permissions and
 /// limitations under the License.
 ///
-
 import 'dart:collection';
 
-import 'package:cherrypick/binding.dart';
-import 'package:cherrypick/module.dart';
+import 'package:cherrypick/src/binding.dart';
+import 'package:cherrypick/src/module.dart';
 
 Scope openRootScope() => Scope(null);
 
@@ -112,9 +111,7 @@ class Scope {
               case Mode.INSTANCE:
                 return binding.instance;
               case Mode.PROVIDER_INSTANCE:
-                return binding.isSingeltone
-                    ? binding.instance
-                    : binding.provider;
+                return binding.provider;
               default:
                 return null;
             }

pubspec.yaml

@@ -1,6 +1,6 @@
 name: cherrypick
 description: Cherrypick is a small dependency injection (DI) library for dart/flutter projects.
-version: 0.1.2
+version: 1.0.0
 homepage: https://github.com/pese-git/cherrypick
 documentation: https://github.com/pese-git/cherrypick/wiki
 repository: https://github.com/pese-git/cherrypick

test/src/binding_test.dart

@@ -1,4 +1,4 @@
-import 'package:cherrypick/binding.dart';
+import 'package:cherrypick/src/binding.dart';
 import 'package:test/test.dart';
 
 void main() {

test/src/scope_test.dart

@@ -1,5 +1,5 @@
-import 'package:cherrypick/module.dart';
-import 'package:cherrypick/scope.dart';
+import 'package:cherrypick/src/module.dart';
+import 'package:cherrypick/src/scope.dart';
 import 'package:test/test.dart';
 
 void main() {