update documentation and examples

7bitcoder · 7bitcoder · commit 40813b428935 · 2024-04-05T17:48:05.000+02:00
diff --git a/Docs/advanced-guides.rst b/Docs/advanced-guides.rst
@@ -9,5 +9,7 @@ Advanced Guides
    advanced-guides/external-singleton
    advanced-guides/keyed-services
    advanced-guides/using-aliases
+   advanced-guides/register-utility-class
+   advanced-guides/injected-utility-class
    advanced-guides/configuring-service-provider
    advanced-guides/building-library
diff --git a/Docs/advanced-guides/injected-utility-class.rst b/Docs/advanced-guides/injected-utility-class.rst
@@ -0,0 +1,19 @@
+Injected Utility Class
+========================================
+
+Library provides also Injected_ utility class.
+This base class has inject() method that can be used to inject services in simple inline way, also
+there are InjectedSingleton, InjectedScoped and InjectedTransient base classes that are inheriting
+from Injected and Registered classes to combine these two features
+
+.. note::
+   Class should inherit Injected constructor with 'using Injected::Injected;' in public section
+
+.. literalinclude:: ../../Examples/Guides/InjectedUtilityClass.cpp
+   :caption: Examples/Guides/InjectedUtilityClass
+   :language: C++
+
+.. code-block:: console
+   :caption: Output
+
+   actionA, actionB executed.
diff --git a/Docs/advanced-guides/register-utility-class.rst b/Docs/advanced-guides/register-utility-class.rst
@@ -0,0 +1,25 @@
+Injected Utility Class
+========================================
+
+Library provides simple template RegisterService_ utility class.
+This base class can be used to automatically register class in service collection with use of specjalized TRegisterer:
+There are already created aliases RegisterSingleton_, RegisterScoped_, RegisterTransient_ that are registering services
+in GlobalServices_ singleton.
+
+.. note::
+   Class should inherit Injected constructor with 'using Injected::Injected;' in public section
+
+.. _RegisterService: ../reference/di/utils/register.html
+.. _RegisterSingleton: ../reference/di/utils/register.html
+.. _RegisterScoped: ../reference/di/utils/register.html
+.. _RegisterTransient: ../reference/di/utils/register.html
+.. _GlobalServices: ../reference/di/utils/globalservices.html
+
+.. literalinclude:: ../../Examples/Guides/RegisterUtilityClass.cpp
+   :caption: Examples/Guides/RegisterUtilityClass
+   :language: C++
+
+.. code-block:: console
+   :caption: Output
+
+   actionA_, actionB executed.
diff --git a/Docs/reference.rst b/Docs/reference.rst
@@ -6,6 +6,7 @@ Reference
    :titlesonly:
 
    reference/di
+   reference/di/utils
    reference/di/details/containers
    reference/di/details/core
    reference/di/details/factories
diff --git a/Docs/reference/di/details/utils/meta.rst b/Docs/reference/di/details/utils/meta.rst
@@ -28,11 +28,3 @@ Meta
 .. doxygenstruct:: sb::di::details::RemoveUniquePtr< std::unique_ptr< T > >
    :members:
    :undoc-members:
-
-.. doxygenstruct:: sb::di::details::IsInPlaceObject
-   :members:
-   :undoc-members:
-
-.. doxygenstruct:: sb::di::details::IsInPlaceObjectConstructable
-  :members:
-  :undoc-members:
diff --git a/Docs/reference/di/utils.rst b/Docs/reference/di/utils.rst
@@ -0,0 +1,11 @@
+sb::di - Utils
+========================================
+
+.. toctree::
+   :maxdepth: 5
+   :titlesonly:
+
+   di/utils/globalservices
+   di/utils/injected
+   di/utils/register
+   di/utils/serviceextractor
diff --git a/Docs/reference/di/utils/globalservices.rst b/Docs/reference/di/utils/globalservices.rst
@@ -0,0 +1,6 @@
+GlobalServices
+========================================
+
+.. doxygenstruct:: sb::di::GlobalServices
+   :members:
+   :undoc-members:
diff --git a/Docs/reference/di/utils/injected.rst b/Docs/reference/di/utils/injected.rst
@@ -0,0 +1,18 @@
+Injected
+========================================
+
+.. doxygenstruct:: sb::di::Injected
+   :members:
+   :undoc-members:
+
+.. doxygenstruct:: sb::di::InjectedSingleton
+   :members:
+   :undoc-members:
+
+.. doxygenstruct:: sb::di::InjectedScoped
+   :members:
+   :undoc-members:
+
+.. doxygenstruct:: sb::di::InjectedTransient
+   :members:
+   :undoc-members:
diff --git a/Docs/reference/di/utils/register.rst b/Docs/reference/di/utils/register.rst
@@ -0,0 +1,30 @@
+Register
+========================================
+
+.. doxygenstruct:: sb::di::RegisterService
+   :members:
+   :undoc-members:
+
+.. doxygenstruct:: sb::di::SingletonRegisterer
+   :members:
+   :undoc-members:
+
+.. doxygenstruct:: sb::di::ScopedRegisterer
+   :members:
+   :undoc-members:
+
+.. doxygenstruct:: sb::di::TransientRegisterer
+   :members:
+   :undoc-members:
+
+.. doxygenstruct:: sb::di::RegisterSingleton
+   :members:
+   :undoc-members:
+
+.. doxygenstruct:: sb::di::RegisterScoped
+   :members:
+   :undoc-members:
+
+.. doxygenstruct:: sb::di::RegisterTransient
+   :members:
+   :undoc-members:
diff --git a/Docs/reference/di/utils/serviceextractor.rst b/Docs/reference/di/utils/serviceextractor.rst
@@ -0,0 +1,6 @@
+ServiceExtractor
+========================================
+
+.. doxygenstruct:: sb::di::ServiceExtractor
+   :members:
+   :undoc-members:
diff --git a/Examples/Cli.cpp b/Examples/Cli.cpp
@@ -83,16 +83,15 @@ class CliHandler final : public ICliHandler
     {
         for (int i = 1; i < argc; ++i)
         {
-            auto [name, value] = _optionParser.parse(argv[i]);
-            if (auto it = _options.find(name); it != _options.end())
+            std::string option = argv[i];
+            auto [name, value] = _optionParser.parse(option);
+            auto it = _options.find(name);
+            if (it == _options.end())
             {
-                const auto handler = it->second;
-                handler->handle(value);
-            }
-            else
-            {
-                std::cout << "Unrecognized option: " << argv[i] << std::endl;
+                throw std::runtime_error{"Unrecognized option: " + option};
             }
+            const auto handler = it->second;
+            handler->handle(value);
         }
     }
 };
diff --git a/Tests/Helpers/Utilities/ParamsTest.hpp b/Tests/Helpers/Utilities/ParamsTest.hpp
