WIP try several transform versions

include/ureact/adaptor/transform2.hpp

@@ -0,0 +1,126 @@
+//
+//         Copyright (C) 2014-2017 Sebastian Jeckel.
+//         Copyright (C) 2020-2023 Krylov Yaroslav.
+//
+// Distributed under the Boost Software License, Version 1.0.
+//    (See accompanying file LICENSE_1_0.txt or copy at
+//          http://www.boost.org/LICENSE_1_0.txt)
+//
+
+#ifndef UREACT_ADAPTOR_TRANSFORM_2_HPP
+#define UREACT_ADAPTOR_TRANSFORM_2_HPP
+
+#include <functional>
+
+#include <ureact/detail/adaptor.hpp>
+#include <ureact/detail/deduce_result_type.hpp>
+#include <ureact/detail/node_base.hpp>
+#include <ureact/detail/synced_adaptor_base.hpp>
+#include <ureact/events.hpp>
+
+UREACT_BEGIN_NAMESPACE
+
+namespace detail
+{
+
+template <typename InE, typename OutE, typename Func, typename... Deps>
+class event_transform2_node final : public event_stream_node<OutE>
+{
+public:
+    template <typename F>
+    event_transform2_node( const context& context,
+        const events<InE>& source,
+        F&& func,
+        const signal_pack<Deps...>& deps )
+        : event_transform2_node::event_stream_node( context )
+        , m_source( source )
+        , m_func( std::forward<F>( func ) )
+        , m_deps( deps )
+    {
+        this->attach_to( source );
+        this->attach_to( deps.data );
+    }
+
+    ~event_transform2_node() override
+    {
+        this->detach_from_all();
+    }
+
+    UREACT_WARN_UNUSED_RESULT update_result update() override
+    {
+        const auto& src_events = get_internals( m_source ).get_events();
+        if( !src_events.empty() )
+        {
+            std::apply(
+                [this, &src_events]( const signal<Deps>&... args ) {
+                    for( const InE& e : src_events )
+                    {
+                        UREACT_CALLBACK_GUARD( this->get_graph() );
+                        this->get_events().push_back( //
+                            std::invoke( m_func, e, get_internals( args ).value_ref()... ) );
+                    }
+                },
+                m_deps.data );
+        }
+
+        return !this->get_events().empty() ? update_result::changed : update_result::unchanged;
+    }
+
+private:
+    events<InE> m_source;
+    Func m_func;
+    signal_pack<Deps...> m_deps;
+};
+
+template <typename EIn = void>
+struct Transform2Adaptor : SyncedAdaptorBase<Transform2Adaptor<EIn>>
+{
+    /*!
+	 * @brief Create a new event stream that transforms events from other stream
+	 *
+	 *  For every event e in source, emit t = func(e, deps...).
+	 *  Synchronized values of signals in dep_pack are passed to func as additional arguments.
+	 *
+	 *  The signature of func should be equivalent to:
+	 *  * T func(const E&, const Deps& ...)
+	 *
+	 *  Semantically equivalent of ranges::transform
+	 *
+	 *  @note Changes of signals in dep_pack do not trigger an update - only received events do
+	 */
+    template <typename InE, typename InF, typename... Deps>
+    UREACT_WARN_UNUSED_RESULT constexpr auto operator()(
+        const events<InE>& source, const signal_pack<Deps...>& dep_pack, InF&& func ) const
+    {
+        using OutE = deduce_result_type<EIn, InF, InE, Deps...>;
+
+        using F = std::decay_t<InF>;
+
+        const context& context = source.get_context();
+
+        return detail::create_wrapped_node<events<OutE>,
+            event_transform2_node<InE, OutE, F, Deps...>>(
+            context, source, std::forward<InF>( func ), dep_pack );
+    }
+
+    using SyncedAdaptorBase<Transform2Adaptor<EIn>>::operator();
+};
+
+} // namespace detail
+
+/*!
+ * @brief Create a new event stream that transforms events from other stream
+ *
+ *  Type of resulting events should be explicitly specified.
+ */
+template <typename EIn = void>
+inline constexpr detail::Transform2Adaptor<EIn> transform2_as;
+
+/*!
+ * @brief Create a new event stream that transforms events from other stream
+ */
+inline constexpr detail::Transform2Adaptor<> transform2;
+
+UREACT_END_NAMESPACE
+
+#endif // UREACT_ADAPTOR_TRANSFORM_2_HPP

include/ureact/adaptor/transform3.hpp

@@ -0,0 +1,138 @@
+//
+//         Copyright (C) 2014-2017 Sebastian Jeckel.
+//         Copyright (C) 2020-2023 Krylov Yaroslav.
+//
+// Distributed under the Boost Software License, Version 1.0.
+//    (See accompanying file LICENSE_1_0.txt or copy at
+//          http://www.boost.org/LICENSE_1_0.txt)
+//
+
+#ifndef UREACT_ADAPTOR_TRANSFORM_3_HPP
+#define UREACT_ADAPTOR_TRANSFORM_3_HPP
+
+#include <functional>
+
+#include <ureact/detail/adaptor.hpp>
+#include <ureact/detail/deduce_result_type.hpp>
+#include <ureact/detail/node_base.hpp>
+#include <ureact/detail/synced_adaptor_base.hpp>
+#include <ureact/events.hpp>
+
+UREACT_BEGIN_NAMESPACE
+
+namespace detail
+{
+
+template <typename InE, typename OutE, typename Func, typename... Deps>
+class event_transform3_node final : public event_stream_node<OutE>
+{
+public:
+    template <typename F>
+    event_transform3_node( const context& context,
+        const events<InE>& source,
+        F&& func,
+        const signal_pack<Deps...>& deps )
+        : event_transform3_node::event_stream_node( context )
+        , m_source( source )
+        , m_func( std::forward<F>( func ) )
+        , m_deps( deps )
+    {
+        this->attach_to( source );
+        this->attach_to( deps.data );
+    }
+
+    ~event_transform3_node() override
+    {
+        this->detach_from_all();
+    }
+
+    UREACT_WARN_UNUSED_RESULT update_result update() override
+    {
+        const auto& src_events = get_internals( m_source ).get_events();
+        if( !src_events.empty() )
+        {
+            if constexpr( sizeof...( Deps ) > 1 )
+            {
+                std::apply(
+                    [this, &src_events]( const signal<Deps>&... args ) {
+                        for( const InE& e : src_events )
+                        {
+                            UREACT_CALLBACK_GUARD( this->get_graph() );
+                            this->get_events().push_back( //
+                                std::invoke( m_func, e, get_internals( args ).value_ref()... ) );
+                        }
+                    },
+                    m_deps.data );
+            }
+            else
+            {
+                for( const InE& e : src_events )
+                {
+                    UREACT_CALLBACK_GUARD( this->get_graph() );
+                    this->get_events().push_back( //
+                        std::invoke( m_func, e ) );
+                }
+            }
+        }
+
+        return !this->get_events().empty() ? update_result::changed : update_result::unchanged;
+    }
+
+private:
+    events<InE> m_source;
+    Func m_func;
+    signal_pack<Deps...> m_deps;
+};
+
+template <typename EIn = void>
+struct Transform3Adaptor : SyncedAdaptorBase<Transform3Adaptor<EIn>>
+{
+    /*!
+	 * @brief Create a new event stream that transforms events from other stream
+	 *
+	 *  For every event e in source, emit t = func(e, deps...).
+	 *  Synchronized values of signals in dep_pack are passed to func as additional arguments.
+	 *
+	 *  The signature of func should be equivalent to:
+	 *  * T func(const E&, const Deps& ...)
+	 *
+	 *  Semantically equivalent of ranges::transform
+	 *
+	 *  @note Changes of signals in dep_pack do not trigger an update - only received events do
+	 */
+    template <typename InE, typename InF, typename... Deps>
+    UREACT_WARN_UNUSED_RESULT constexpr auto operator()(
+        const events<InE>& source, const signal_pack<Deps...>& dep_pack, InF&& func ) const
+    {
+        using OutE = deduce_result_type<EIn, InF, InE, Deps...>;
+
+        using F = std::decay_t<InF>;
+
+        const context& context = source.get_context();
+
+        return detail::create_wrapped_node<events<OutE>,
+            event_transform3_node<InE, OutE, F, Deps...>>(
+            context, source, std::forward<InF>( func ), dep_pack );
+    }
+
+    using SyncedAdaptorBase<Transform3Adaptor<EIn>>::operator();
+};
+
+} // namespace detail
+
+/*!
+ * @brief Create a new event stream that transforms events from other stream
+ *
+ *  Type of resulting events should be explicitly specified.
+ */
+template <typename EIn = void>
+inline constexpr detail::Transform3Adaptor<EIn> transform3_as;
+
+/*!
+ * @brief Create a new event stream that transforms events from other stream
+ */
+inline constexpr detail::Transform3Adaptor<> transform3;
+
+UREACT_END_NAMESPACE
+
+#endif // UREACT_ADAPTOR_TRANSFORM_3_HPP