fix dynamic connectable

src/rpp/rpp/observables/connectable_observable.hpp

@@ -69,21 +69,21 @@ namespace rpp
      * @ingroup observables
      */
     template<rpp::constraint::observable OriginalObservable, typename Subject>
-    class connectable_observable final : public decltype(std::declval<Subject>().get_observable())
+    class connectable_observable : public decltype(std::declval<Subject>().get_observable())
     {
         using base = decltype(std::declval<Subject>().get_observable());
 
     public:
         static_assert(rpp::constraint::subject<Subject>);
 
-        connectable_observable(const OriginalObservable& original_observable, const Subject& subject = Subject{})
+        connectable_observable(const OriginalObservable& original_observable, const Subject& subject)
             : base{subject.get_observable()}
             , m_original_observable{original_observable}
             , m_subject{subject}
         {
         }
 
-        connectable_observable(OriginalObservable && original_observable, const Subject& subject = Subject{})
+        connectable_observable(OriginalObservable && original_observable, const Subject& subject)
             : base{subject.get_observable()}
             , m_original_observable{std::move(original_observable)}
             , m_subject{subject}
@@ -166,6 +166,15 @@ namespace rpp
             return std::move(*this) | std::forward<Op>(op);
         }
 
+        auto as_dynamic_connectable() const &
+        {
+            return rpp::dynamic_connectable_observable<Subject>{m_original_observable.as_dynamic(), m_subject};
+        }
+        auto as_dynamic_connectable()&&
+        {
+            return rpp::dynamic_connectable_observable<Subject>{std::move(m_original_observable).as_dynamic(), std::move(m_subject)};
+        }
+
     private:
         RPP_NO_UNIQUE_ADDRESS OriginalObservable m_original_observable;
         Subject                                  m_subject;

src/rpp/rpp/observables/dynamic_connectable_observable.hpp

@@ -0,0 +1,41 @@
+//                   ReactivePlusPlus library
+//
+//           Copyright Aleksey Loginov 2023 - present.
+//  Distributed under the Boost Software License, Version 1.0.
+//     (See accompanying file LICENSE_1_0.txt or copy at
+//           https://www.boost.org/LICENSE_1_0.txt)
+//
+//  Project home: https://github.com/victimsnino/ReactivePlusPlus
+
+#pragma once
+
+#include <rpp/observables/connectable_observable.hpp>
+#include <rpp/observables/dynamic_observable.hpp>
+
+namespace rpp
+{
+    template<typename Subject>
+    class dynamic_connectable_observable final : public connectable_observable<rpp::dynamic_observable<rpp::subjects::utils::extract_subject_type_t<Subject>>, Subject>
+    {
+    public:
+        static_assert(rpp::constraint::subject<Subject>);
+
+        using base = connectable_observable<rpp::dynamic_observable<rpp::subjects::utils::extract_subject_type_t<Subject>>, Subject>;
+
+        using base::base;
+
+        template<rpp::constraint::observable_strategy<rpp::subjects::utils::extract_subject_type_t<Subject>> Strategy>
+            requires (!rpp::constraint::decayed_same_as<Strategy, rpp::dynamic_observable<rpp::subjects::utils::extract_subject_type_t<Subject>>>)
+        dynamic_connectable_observable(const rpp::connectable_observable<Strategy, Subject>& original)
+            : dynamic_connectable_observable{original.as_dynamic_connectable()}
+        {
+        }
+
+        template<rpp::constraint::observable_strategy<rpp::subjects::utils::extract_subject_type_t<Subject>> Strategy>
+            requires (!rpp::constraint::decayed_same_as<Strategy, rpp::dynamic_observable<rpp::subjects::utils::extract_subject_type_t<Subject>>>)
+        dynamic_connectable_observable(rpp::connectable_observable<Strategy, Subject>&& original)
+            : dynamic_connectable_observable{std::move(original).as_dynamic_connectable()}
+        {
+        }
+    };
+} // namespace rpp

src/rpp/rpp/observables/dynamic_observable.hpp

@@ -63,8 +63,7 @@ namespace rpp::details::observables
             template<rpp::constraint::observable Observable>
             static const vtable* create() noexcept
             {
-                static vtable s_res{
-                    .subscribe = forwarding_subscribe<Type, Observable>};
+                static vtable s_res{.subscribe = forwarding_subscribe<Type, Observable>};
                 return &s_res;
             }
         };
@@ -103,7 +102,4 @@ namespace rpp
         {
         }
     };
-
-    template<typename Subject>
-    using dynamic_connectable_observable = connectable_observable<rpp::dynamic_observable<rpp::subjects::utils::extract_subject_type_t<Subject>>, Subject>;
 } // namespace rpp

src/rpp/rpp/observables/fwd.hpp

@@ -172,6 +172,9 @@ namespace rpp
     template<constraint::decayed_type Type>
     class dynamic_observable;
 
+    template<typename Subject>
+    class dynamic_connectable_observable;
+
     template<constraint::decayed_type Type, constraint::observable_strategy<Type> Strategy>
     class blocking_observable;
 

src/tests/rpp/test_connectable_observable.cpp

@@ -11,6 +11,7 @@
 #include <doctest/doctest.h>
 
 #include <rpp/observables/connectable_observable.hpp>
+#include <rpp/observables/dynamic_connectable_observable.hpp>
 #include <rpp/observables/dynamic_observable.hpp>
 #include <rpp/observers/mock_observer.hpp>
 #include <rpp/operators/map.hpp>
@@ -82,6 +83,8 @@ TEST_CASE("connectable observable")
         test(rpp::connectable_observable{source, rpp::subjects::publish_subject<int>{}});
         SUBCASE("dynamic_connectable created manually")
         test(rpp::dynamic_connectable_observable<rpp::subjects::publish_subject<int>>{source, rpp::subjects::publish_subject<int>{}});
+        SUBCASE("dynamic_connectable coneverted")
+        test(rpp::dynamic_connectable_observable<rpp::subjects::publish_subject<int>>{rpp::connectable_observable{source, rpp::subjects::publish_subject<int>{}}});
         SUBCASE("connectable created via multicast")
         test(source | rpp::ops::multicast(rpp::subjects::publish_subject<int>{}));
         SUBCASE("connectable created via templated multicast")

src/tests/rpp/test_observables.cpp

@@ -99,10 +99,20 @@ TEST_CASE("create observable works properly as observable")
         test(observable.as_dynamic());
     }
 
+    SUBCASE("dynamic observable cast")
+    {
+        test(rpp::dynamic_observable<int>{observable});
+    }
+
     SUBCASE("dynamic observable via move")
     {
         test(std::move(observable).as_dynamic()); // NOLINT
     }
+
+    SUBCASE("dynamic observable cast via move")
+    {
+        test(rpp::dynamic_observable<int>{std::move(observable)}); // NOLINT
+    }
 }
 
 TEST_CASE("blocking_observable blocks subscribe call")

src/tests/rpp/test_observers.cpp

@@ -187,7 +187,10 @@ TEST_CASE("set_upstream without base disposable makes it main disposalbe")
     test_observer(original_observer);
 
     SUBCASE("dynamic observer")
-    test_observer(std::move(original_observer).as_dynamic());
+    test_observer(std::move(original_observer).as_dynamic()); // NOLINT
+
+    SUBCASE("dynamic observer via cast")
+    test_observer(rpp::dynamic_observer<int>{std::move(original_observer)}); // NOLINT
 }
 
 TEST_CASE("set_upstream can be called multiple times")