7bitcoder · 7bitcoder · Apr 6, 2024 · Mar 30, 2024 · Apr 1, 2024 · Apr 1, 2024
diff --git a/.github/workflows/DevCI.yml b/.github/workflows/DevCI.yml
@@ -10,6 +10,8 @@ on:
 
 jobs:
   test:
+    timeout-minutes: 30
+
     strategy:
       fail-fast: false
       matrix:

diff --git a/.github/workflows/Linux.yml b/.github/workflows/Linux.yml
@@ -10,6 +10,8 @@ on:
 
 jobs:
   test:
+    timeout-minutes: 30
+
     strategy:
       fail-fast: false
       matrix:

diff --git a/.github/workflows/MacOs.yml b/.github/workflows/MacOs.yml
@@ -10,6 +10,8 @@ on:
 
 jobs:
   test:
+    timeout-minutes: 30
+
     strategy:
       fail-fast: false
       matrix:

diff --git a/.github/workflows/Windows.yml b/.github/workflows/Windows.yml
@@ -13,6 +13,8 @@ env:
 
 jobs:
   test:
+    timeout-minutes: 30
+
     strategy:
       fail-fast: false
       matrix:

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.15.0)
 set(_7BIT_DI_LIBRARY 7bitDI)
 
 set(_7BIT_DI_VERSION_MAJOR 3)
-set(_7BIT_DI_VERSION_MINOR 0)
+set(_7BIT_DI_VERSION_MINOR 1)
 set(_7BIT_DI_VERSION_PATCH 0)
 
 set(_7BIT_DI_VERSION ${_7BIT_DI_VERSION_MAJOR}.${_7BIT_DI_VERSION_MINOR}.${_7BIT_DI_VERSION_PATCH})

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,22 @@
+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. Injected class has also method
+getProvider(), raw provider can be used to get keyed services for example.
+
+.. _Injected: ../reference/di/utils/injected.html
+
+.. 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 @@
+Register 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 specialised 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/conf.py b/Docs/conf.py
@@ -12,7 +12,7 @@ def createIfNotExists(path):
 project = "7bitDI"
 copyright = "2023, 7BitCoder Sylwester Dawida"
 author = "Sylwester Dawida"
-version = "3.0.0"
+version = "3.1.0"
 
 extensions = [
     "sphinx.ext.autodoc",

diff --git a/Docs/examples.rst b/Docs/examples.rst
@@ -6,9 +6,5 @@ Examples
    :titlesonly:
 
    examples/simple
+   examples/logger
    examples/cli
-
-
-
-
-
diff --git a/Docs/examples/logger.rst b/Docs/examples/logger.rst
@@ -0,0 +1,6 @@
+Logger
+========================================
+
+.. literalinclude:: ../../Examples/Logger.cpp
+   :caption: Examples/Logger
+   :language: C++
diff --git a/Docs/getting-started.rst b/Docs/getting-started.rst
@@ -36,7 +36,7 @@ Installation
         FetchContent_Declare(
                 7bitDI
                 GIT_REPOSITORY https://github.com/7bitcoder/7bitDI.git
-                GIT_TAG v3.0.0
+                GIT_TAG v3.1.0
         )
         FetchContent_MakeAvailable(7bitDI)
 
@@ -48,7 +48,7 @@ Installation
     .. code-block:: Txt
 
         [requires]
-        7bitdi/2.1.0
+        7bitdi/3.1.0
 
     change the version to newer if available, then run the command:
 

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.rst b/Docs/reference/di/details/utils.rst
@@ -10,10 +10,7 @@ sb::di::details - Utils
    utils/check.rst
    utils/container.rst
    utils/ctorparamsnumber.rst
-   utils/iscopyctor.rst
-   utils/isinplaceobject.rst
-   utils/isuniqueptr.rst
-   utils/removeuniqueptr.rst
+   utils/meta.rst
    utils/require.rst
    utils/requiredescriptor.rst
    utils/requireinstance.rst
diff --git a/Docs/reference/di/details/utils/ctorparamsnumber.rst b/Docs/reference/di/details/utils/ctorparamsnumber.rst
@@ -1,4 +1,4 @@
-ctorParamsNumber
+CtorParamsNumber
 ========================================
 
 .. doxygenfunction:: sb::di::details::ctorParamsNumber
diff --git a/Docs/reference/di/details/utils/iscopyctor.rst b/Docs/reference/di/details/utils/iscopyctor.rst
diff --git a/Docs/reference/di/details/utils/isinplaceobject.rst b/Docs/reference/di/details/utils/isinplaceobject.rst
diff --git a/Docs/reference/di/details/utils/isuniqueptr.rst b/Docs/reference/di/details/utils/isuniqueptr.rst
diff --git a/Docs/reference/di/details/utils/meta.rst b/Docs/reference/di/details/utils/meta.rst
@@ -0,0 +1,30 @@
+Meta
+========================================
+
+.. doxygenstruct:: sb::di::details::IsCopyCtor
+   :members:
+   :undoc-members:
+
+.. doxygenstruct:: sb::di::details::IsCopyCtor< T, T >
+   :members:
+   :undoc-members:
+
+.. doxygenstruct:: sb::di::details::IsCopyCtor< T, const T >
+   :members:
+   :undoc-members:
+
+.. doxygenstruct:: sb::di::details::IsUniquePtr
+   :members:
+   :undoc-members:
+
+.. doxygenstruct:: sb::di::details::IsUniquePtr< std::unique_ptr< T > >
+   :members:
+   :undoc-members:
+
+.. doxygenstruct:: sb::di::details::RemoveUniquePtr
+   :members:
+   :undoc-members:
+
+.. doxygenstruct:: sb::di::details::RemoveUniquePtr< std::unique_ptr< T > >
+   :members:
+   :undoc-members:
diff --git a/Docs/reference/di/details/utils/removeuniqueptr.rst b/Docs/reference/di/details/utils/removeuniqueptr.rst
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:
+
+   utils/globalservices
+   utils/injected
+   utils/register
+   utils/serviceextractor
diff --git a/Docs/reference/di/utils/globalservices.rst b/Docs/reference/di/utils/globalservices.rst
@@ -0,0 +1,6 @@
+GlobalServices
+========================================
+
+.. doxygenclass:: 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,22 @@
+Injected
+========================================
+
+.. doxygenstruct:: sb::di::Injected
+   :members:
+   :protected-members:
+   :undoc-members:
+
+.. doxygenstruct:: sb::di::InjectedSingleton
+   :members:
+   :protected-members:
+   :undoc-members:
+
+.. doxygenstruct:: sb::di::InjectedScoped
+   :members:
+   :protected-members:
+   :undoc-members:
+
+.. doxygenstruct:: sb::di::InjectedTransient
+   :members:
+   :protected-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:
+
+.. doxygentypedef:: sb::di::RegisterSingleton
+   :members:
+   :undoc-members:
+
+.. doxygentypedef:: sb::di::RegisterScoped
+   :members:
+   :undoc-members:
+
+.. doxygentypedef:: 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:
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,6 +10,8 @@ on: @@
     jobs:
       test:
+        timeout-minutes: 30
         strategy:
           fail-fast: false
           matrix:
@@ Expand Down @@