Revert "fix: snip infinite type recursion"

This reverts commit 38d4f26d03.

Cargo.toml

@@ -40,36 +40,36 @@ members = [
 exclude = ["benchmarks", "examples", "projects"]
 
 [workspace.package]
-version = "0.7.0-gamma"
+version = "0.7.0-beta6"
 edition = "2021"
 rust-version = "1.76"
 
 [workspace.dependencies]
-throw_error = { path = "./any_error/", version = "0.2.0-gamma" }
+throw_error = { path = "./any_error/", version = "0.2.0-beta6" }
 any_spawner = { path = "./any_spawner/", version = "0.1.0" }
 const_str_slice_concat = { path = "./const_str_slice_concat", version = "0.1.0" }
 either_of = { path = "./either_of/", version = "0.1.0" }
-hydration_context = { path = "./hydration_context", version = "0.2.0-gamma" }
-leptos = { path = "./leptos", version = "0.7.0-gamma" }
-leptos_config = { path = "./leptos_config", version = "0.7.0-gamma" }
-leptos_dom = { path = "./leptos_dom", version = "0.7.0-gamma" }
-leptos_hot_reload = { path = "./leptos_hot_reload", version = "0.7.0-gamma" }
-leptos_integration_utils = { path = "./integrations/utils", version = "0.7.0-gamma" }
-leptos_macro = { path = "./leptos_macro", version = "0.7.0-gamma" }
-leptos_router = { path = "./router", version = "0.7.0-gamma" }
-leptos_router_macro = { path = "./router_macro", version = "0.7.0-gamma" }
-leptos_server = { path = "./leptos_server", version = "0.7.0-gamma" }
-leptos_meta = { path = "./meta", version = "0.7.0-gamma" }
-next_tuple = { path = "./next_tuple", version = "0.1.0-gamma" }
+hydration_context = { path = "./hydration_context", version = "0.2.0-beta6" }
+leptos = { path = "./leptos", version = "0.7.0-beta6" }
+leptos_config = { path = "./leptos_config", version = "0.7.0-beta6" }
+leptos_dom = { path = "./leptos_dom", version = "0.7.0-beta6" }
+leptos_hot_reload = { path = "./leptos_hot_reload", version = "0.7.0-beta6" }
+leptos_integration_utils = { path = "./integrations/utils", version = "0.7.0-beta6" }
+leptos_macro = { path = "./leptos_macro", version = "0.7.0-beta6" }
+leptos_router = { path = "./router", version = "0.7.0-beta6" }
+leptos_router_macro = { path = "./router_macro", version = "0.7.0-beta6" }
+leptos_server = { path = "./leptos_server", version = "0.7.0-beta6" }
+leptos_meta = { path = "./meta", version = "0.7.0-beta6" }
+next_tuple = { path = "./next_tuple", version = "0.1.0-beta6" }
 oco_ref = { path = "./oco", version = "0.2.0" }
 or_poisoned = { path = "./or_poisoned", version = "0.1.0" }
-reactive_graph = { path = "./reactive_graph", version = "0.1.0-gamma" }
-reactive_stores = { path = "./reactive_stores", version = "0.1.0-gamma" }
-reactive_stores_macro = { path = "./reactive_stores_macro", version = "0.1.0-gamma" }
-server_fn = { path = "./server_fn", version = "0.7.0-gamma" }
-server_fn_macro = { path = "./server_fn_macro", version = "0.7.0-gamma" }
-server_fn_macro_default = { path = "./server_fn/server_fn_macro_default", version = "0.7.0-gamma" }
-tachys = { path = "./tachys", version = "0.1.0-gamma" }
+reactive_graph = { path = "./reactive_graph", version = "0.1.0-beta6" }
+reactive_stores = { path = "./reactive_stores", version = "0.1.0-beta6" }
+reactive_stores_macro = { path = "./reactive_stores_macro", version = "0.1.0-beta6" }
+server_fn = { path = "./server_fn", version = "0.7.0-beta6" }
+server_fn_macro = { path = "./server_fn_macro", version = "0.7.0-beta6" }
+server_fn_macro_default = { path = "./server_fn/server_fn_macro_default", version = "0.7.0-beta6" }
+tachys = { path = "./tachys", version = "0.1.0-beta6" }
 
 [profile.release]
 codegen-units = 1

any_error/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "throw_error"
-version = "0.2.0-gamma"
+version = "0.2.0-beta6"
 authors = ["Greg Johnston"]
 license = "MIT"
 readme = "../README.md"

examples/counter/tests/web.rs

@@ -1,7 +1,7 @@
 use counter::*;
 use leptos::mount::mount_to;
 use leptos::prelude::*;
-use leptos::task::tick;
+use leptos::spawn::tick;
 use wasm_bindgen::JsCast;
 use wasm_bindgen_test::*;
 

examples/counter_isomorphic/src/counters.rs

@@ -1,4 +1,4 @@
-use leptos::prelude::*;
+use leptos::{prelude::*, reactive_graph::actions::Action};
 use leptos_router::{
     components::{FlatRoutes, Route, Router, A},
     StaticSegment,

examples/counter_without_macros/tests/web.rs

@@ -1,5 +1,5 @@
 use counter_without_macros::counter;
-use leptos::{prelude::*, task::tick};
+use leptos::{prelude::*, spawn::tick};
 use pretty_assertions::assert_eq;
 use wasm_bindgen::JsCast;
 use wasm_bindgen_test::*;

examples/counters/tests/web.rs

@@ -4,7 +4,7 @@ use wasm_bindgen_test::*;
 wasm_bindgen_test_configure!(run_in_browser);
 use counters::Counters;
 use leptos::prelude::*;
-use leptos::task::tick;
+use leptos::spawn::tick;
 use web_sys::HtmlElement;
 
 #[wasm_bindgen_test]

examples/directives/tests/web.rs

@@ -1,5 +1,5 @@
 use directives::App;
-use leptos::{prelude::*, task::tick};
+use leptos::{prelude::*, spawn::tick};
 use wasm_bindgen::JsCast;
 use wasm_bindgen_test::*;
 use web_sys::HtmlElement;

examples/gtk/Cargo.toml

@@ -0,0 +1,18 @@
+[package]
+name = "gtk"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+leptos = { path = "../../leptos" }
+throw_error = { path = "../../any_error/" }
+
+# these are used to build the integration
+gtk = { version = "0.9.0", package = "gtk4" }
+next_tuple = { path = "../../next_tuple/" }
+paste = "1.0"
+
+# we want to support using glib for the reactive runtime event loop
+any_spawner = { path = "../../any_spawner/", features = ["glib"] }
+# yes, we want effects to run: this is a "frontend," not a backend
+reactive_graph = { path = "../../reactive_graph", features = ["effects"] }

examples/gtk/Makefile.toml

@@ -0,0 +1 @@
+extend = [{ path = "../cargo-make/main.toml" }]

examples/gtk/index.html

@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta name="color-scheme" content="dark">
+		<link rel="css" href="style.css" data-trunk>
+	</head>
+	<body></body>
+</html>

examples/gtk/src/leptos_gtk.rs

@@ -0,0 +1,645 @@
+use self::properties::Connect;
+use gtk::{
+    glib::{
+        object::{IsA, IsClass, ObjectExt},
+        Object, Value,
+    },
+    prelude::{Cast, WidgetExt},
+    Label, Orientation, Widget,
+};
+use leptos::{
+    reactive_graph::effect::RenderEffect,
+    tachys::{
+        renderer::{CastFrom, Renderer},
+        view::{Mountable, Render},
+    },
+};
+use next_tuple::NextTuple;
+use std::marker::PhantomData;
+
+#[derive(Debug)]
+pub struct LeptosGtk;
+
+#[derive(Debug, Clone)]
+pub struct Element(pub Widget);
+
+impl Element {
+    pub fn remove(&self) {
+        self.0.unparent();
+    }
+}
+
+#[derive(Debug, Clone)]
+pub struct Text(pub Element);
+
+impl<T> From<T> for Element
+where
+    T: Into<Widget>,
+{
+    fn from(value: T) -> Self {
+        Element(value.into())
+    }
+}
+
+impl Mountable<LeptosGtk> for Element {
+    fn unmount(&mut self) {
+        self.remove()
+    }
+
+    fn mount(
+        &mut self,
+        parent: &<LeptosGtk as Renderer>::Element,
+        marker: Option<&<LeptosGtk as Renderer>::Node>,
+    ) {
+        self.0
+            .insert_before(&parent.0, marker.as_ref().map(|m| &m.0));
+    }
+
+    fn insert_before_this(&self, child: &mut dyn Mountable<LeptosGtk>) -> bool {
+        if let Some(parent) = self.0.parent() {
+            child.mount(&Element(parent), Some(self));
+            return true;
+        }
+        false
+    }
+}
+
+impl Mountable<LeptosGtk> for Text {
+    fn unmount(&mut self) {
+        self.0.remove()
+    }
+
+    fn mount(
+        &mut self,
+        parent: &<LeptosGtk as Renderer>::Element,
+        marker: Option<&<LeptosGtk as Renderer>::Node>,
+    ) {
+        self.0
+             .0
+            .insert_before(&parent.0, marker.as_ref().map(|m| &m.0));
+    }
+
+    fn insert_before_this(&self, child: &mut dyn Mountable<LeptosGtk>) -> bool {
+        self.0.insert_before_this(child)
+    }
+}
+
+impl CastFrom<Element> for Element {
+    fn cast_from(source: Element) -> Option<Self> {
+        Some(source)
+    }
+}
+
+impl CastFrom<Element> for Text {
+    fn cast_from(source: Element) -> Option<Self> {
+        source
+            .0
+            .downcast::<Label>()
+            .ok()
+            .map(|n| Text(Element::from(n)))
+    }
+}
+
+impl AsRef<Element> for Element {
+    fn as_ref(&self) -> &Element {
+        self
+    }
+}
+
+impl AsRef<Element> for Text {
+    fn as_ref(&self) -> &Element {
+        &self.0
+    }
+}
+
+impl Renderer for LeptosGtk {
+    type Node = Element;
+    type Element = Element;
+    type Text = Text;
+    type Placeholder = Element;
+
+    fn intern(text: &str) -> &str {
+        text
+    }
+
+    fn create_text_node(text: &str) -> Self::Text {
+        Text(Element::from(Label::new(Some(text))))
+    }
+
+    fn create_placeholder() -> Self::Placeholder {
+        let label = Label::new(None);
+        label.set_visible(false);
+        Element::from(label)
+    }
+
+    fn set_text(node: &Self::Text, text: &str) {
+        let node_as_text = node.0 .0.downcast_ref::<Label>().unwrap();
+        node_as_text.set_label(text);
+    }
+
+    fn set_attribute(node: &Self::Element, name: &str, value: &str) {
+        node.0.set_property(name, value);
+    }
+
+    fn remove_attribute(node: &Self::Element, name: &str) {
+        node.0.set_property(name, None::<&str>);
+    }
+
+    fn insert_node(
+        parent: &Self::Element,
+        new_child: &Self::Node,
+        marker: Option<&Self::Node>,
+    ) {
+        new_child
+            .0
+            .insert_before(&parent.0, marker.as_ref().map(|n| &n.0));
+    }
+
+    fn remove_node(
+        _parent: &Self::Element,
+        _child: &Self::Node,
+    ) -> Option<Self::Node> {
+        todo!()
+    }
+
+    fn remove(_node: &Self::Node) {
+        todo!()
+    }
+
+    fn get_parent(node: &Self::Node) -> Option<Self::Node> {
+        node.0.parent().map(Element::from)
+    }
+
+    fn first_child(_node: &Self::Node) -> Option<Self::Node> {
+        todo!()
+    }
+
+    fn next_sibling(_node: &Self::Node) -> Option<Self::Node> {
+        todo!()
+    }
+
+    fn log_node(node: &Self::Node) {
+        println!("{node:?}");
+    }
+
+    fn clear_children(_parent: &Self::Element) {
+        todo!()
+    }
+}
+
+pub fn root<Chil>(children: Chil) -> (Widget, impl Mountable<LeptosGtk>)
+where
+    Chil: Render<LeptosGtk>,
+{
+    let state = r#box()
+        .orientation(Orientation::Vertical)
+        .spacing(12)
+        .child(children)
+        .build();
+    (state.as_widget().clone(), state)
+}
+
+pub trait WidgetClass {
+    type Widget: Into<Widget> + IsA<Object> + IsClass;
+}
+
+pub struct LGtkWidget<Widg, Props, Chil> {
+    widget: PhantomData<Widg>,
+    properties: Props,
+    children: Chil,
+}
+
+impl<Widg, Props, Chil> LGtkWidget<Widg, Props, Chil>
+where
+    Widg: WidgetClass,
+    Chil: NextTuple,
+{
+    pub fn child<T>(
+        self,
+        child: T,
+    ) -> LGtkWidget<Widg, Props, Chil::Output<T>> {
+        let LGtkWidget {
+            widget,
+            properties,
+            children,
+        } = self;
+        LGtkWidget {
+            widget,
+            properties,
+            children: children.next_tuple(child),
+        }
+    }
+}
+impl<Widg, Props, Chil> LGtkWidget<Widg, Props, Chil>
+where
+    Widg: WidgetClass,
+    Props: NextTuple,
+    Chil: Render<LeptosGtk>,
+{
+    pub fn connect<F>(
+        self,
+        signal_name: &'static str,
+        callback: F,
+    ) -> LGtkWidget<Widg, Props::Output<Connect<F>>, Chil>
+    where
+        F: Fn(&[Value]) -> Option<Value> + Send + Sync + 'static,
+    {
+        let LGtkWidget {
+            widget,
+            properties,
+            children,
+        } = self;
+        LGtkWidget {
+            widget,
+            properties: properties.next_tuple(Connect {
+                signal_name,
+                callback,
+            }),
+            children,
+        }
+    }
+}
+
+pub struct LGtkWidgetState<Widg, Props, Chil>
+where
+    Chil: Render<LeptosGtk>,
+    Props: Property,
+    Widg: WidgetClass,
+{
+    ty: PhantomData<Widg>,
+    widget: Element,
+    properties: Props::State,
+    children: Chil::State,
+}
+
+impl<Widg, Props, Chil> LGtkWidgetState<Widg, Props, Chil>
+where
+    Chil: Render<LeptosGtk>,
+    Props: Property,
+    Widg: WidgetClass,
+{
+    pub fn as_widget(&self) -> &Widget {
+        &self.widget.0
+    }
+}
+
+impl<Widg, Props, Chil> Render<LeptosGtk> for LGtkWidget<Widg, Props, Chil>
+where
+    Widg: WidgetClass,
+    Props: Property,
+    Chil: Render<LeptosGtk>,
+{
+    type State = LGtkWidgetState<Widg, Props, Chil>;
+
+    fn build(self) -> Self::State {
+        let widget = Object::new::<Widg::Widget>();
+        let widget = Element::from(widget);
+        let properties = self.properties.build(&widget);
+        let mut children = self.children.build();
+        children.mount(&widget, None);
+        LGtkWidgetState {
+            ty: PhantomData,
+            widget,
+            properties,
+            children,
+        }
+    }
+
+    fn rebuild(self, state: &mut Self::State) {
+        self.properties
+            .rebuild(&state.widget, &mut state.properties);
+        self.children.rebuild(&mut state.children);
+    }
+}
+
+impl<Widg, Props, Chil> Mountable<LeptosGtk>
+    for LGtkWidgetState<Widg, Props, Chil>
+where
+    Widg: WidgetClass,
+    Props: Property,
+    Chil: Render<LeptosGtk>,
+{
+    fn unmount(&mut self) {
+        self.children.unmount();
+        self.widget.remove();
+    }
+
+    fn mount(
+        &mut self,
+        parent: &<LeptosGtk as Renderer>::Element,
+        marker: Option<&<LeptosGtk as Renderer>::Node>,
+    ) {
+        self.children.mount(&self.widget, None);
+        LeptosGtk::insert_node(parent, &self.widget, marker);
+    }
+
+    fn insert_before_this(&self, child: &mut dyn Mountable<LeptosGtk>) -> bool {
+        self.widget.insert_before_this(child)
+    }
+}
+
+pub trait Property {
+    type State;
+
+    fn build(self, element: &Element) -> Self::State;
+
+    fn rebuild(self, element: &Element, state: &mut Self::State);
+}
+
+impl<T, F> Property for F
+where
+    T: Property,
+    T::State: 'static,
+    F: Fn() -> T + 'static,
+{
+    type State = RenderEffect<T::State>;
+
+    fn build(self, widget: &Element) -> Self::State {
+        let widget = widget.clone();
+        RenderEffect::new(move |prev| {
+            let value = self();
+            if let Some(mut prev) = prev {
+                value.rebuild(&widget, &mut prev);
+                prev
+            } else {
+                value.build(&widget)
+            }
+        })
+    }
+
+    fn rebuild(self, widget: &Element, state: &mut Self::State) {
+        let prev_value = state.take_value();
+        let widget = widget.to_owned();
+        *state = RenderEffect::new_with_value(
+            move |prev| {
+                let value = self();
+                if let Some(mut state) = prev {
+                    value.rebuild(&widget, &mut state);
+                    state
+                } else {
+                    unreachable!()
+                }
+            },
+            prev_value,
+        );
+    }
+}
+
+pub fn button() -> LGtkWidget<gtk::Button, (), ()> {
+    LGtkWidget {
+        widget: PhantomData,
+        properties: (),
+        children: (),
+    }
+}
+
+pub fn r#box() -> LGtkWidget<gtk::Box, (), ()> {
+    LGtkWidget {
+        widget: PhantomData,
+        properties: (),
+        children: (),
+    }
+}
+
+mod widgets {
+    use super::WidgetClass;
+
+    impl WidgetClass for gtk::Button {
+        type Widget = Self;
+    }
+
+    impl WidgetClass for gtk::Box {
+        type Widget = Self;
+    }
+}
+
+pub mod properties {
+    #![allow(dead_code)]
+
+    use super::{Element, LGtkWidget, LeptosGtk, Property, WidgetClass};
+    use gtk::glib::{object::ObjectExt, Value};
+    use leptos::tachys::{renderer::Renderer, view::Render};
+    use next_tuple::NextTuple;
+
+    pub struct Connect<F>
+    where
+        F: Fn(&[Value]) -> Option<Value> + Send + Sync + 'static,
+    {
+        pub signal_name: &'static str,
+        pub callback: F,
+    }
+
+    impl<F> Property for Connect<F>
+    where
+        F: Fn(&[Value]) -> Option<Value> + Send + Sync + 'static,
+    {
+        type State = ();
+
+        fn build(self, element: &Element) -> Self::State {
+            element.0.connect(self.signal_name, false, self.callback);
+        }
+
+        fn rebuild(self, _element: &Element, _state: &mut Self::State) {
+            // TODO we want to *remove* the previous listener, and reconnect with this new one
+        }
+    }
+
+    /* examples for macro */
+    pub struct Orientation {
+        value: gtk::Orientation,
+    }
+
+    pub struct OrientationState {
+        value: gtk::Orientation,
+    }
+
+    impl Property for Orientation {
+        type State = OrientationState;
+
+        fn build(self, element: &Element) -> Self::State {
+            element.0.set_property("orientation", self.value);
+            OrientationState { value: self.value }
+        }
+
+        fn rebuild(self, element: &Element, state: &mut Self::State) {
+            if self.value != state.value {
+                element.0.set_property("orientation", self.value);
+                state.value = self.value;
+            }
+        }
+    }
+
+    impl<Widg, Props, Chil> LGtkWidget<Widg, Props, Chil>
+    where
+        Widg: WidgetClass,
+        Props: NextTuple,
+        Chil: Render<LeptosGtk>,
+    {
+        pub fn orientation(
+            self,
+            value: impl Into<gtk::Orientation>,
+        ) -> LGtkWidget<Widg, Props::Output<Orientation>, Chil> {
+            let LGtkWidget {
+                widget,
+                properties,
+                children,
+            } = self;
+            LGtkWidget {
+                widget,
+                properties: properties.next_tuple(Orientation {
+                    value: value.into(),
+                }),
+                children,
+            }
+        }
+    }
+
+    pub struct Spacing {
+        value: i32,
+    }
+
+    pub struct SpacingState {
+        value: i32,
+    }
+
+    impl Property for Spacing {
+        type State = SpacingState;
+
+        fn build(self, element: &Element) -> Self::State {
+            element.0.set_property("spacing", self.value);
+            SpacingState { value: self.value }
+        }
+
+        fn rebuild(self, element: &Element, state: &mut Self::State) {
+            if self.value != state.value {
+                element.0.set_property("spacing", self.value);
+                state.value = self.value;
+            }
+        }
+    }
+
+    impl<Widg, Props, Chil> LGtkWidget<Widg, Props, Chil>
+    where
+        Widg: WidgetClass,
+        Props: NextTuple,
+        Chil: Render<LeptosGtk>,
+    {
+        pub fn spacing(
+            self,
+            value: impl Into<i32>,
+        ) -> LGtkWidget<Widg, Props::Output<Spacing>, Chil> {
+            let LGtkWidget {
+                widget,
+                properties,
+                children,
+            } = self;
+            LGtkWidget {
+                widget,
+                properties: properties.next_tuple(Spacing {
+                    value: value.into(),
+                }),
+                children,
+            }
+        }
+    }
+
+    /* end examples for properties macro */
+    #[derive(Debug)]
+    pub struct Label {
+        value: String,
+    }
+
+    impl Label {
+        pub fn new(value: impl Into<String>) -> Self {
+            Self {
+                value: value.into(),
+            }
+        }
+    }
+
+    pub struct LabelState {
+        value: String,
+    }
+
+    impl Property for Label {
+        type State = LabelState;
+
+        fn build(self, element: &Element) -> Self::State {
+            LeptosGtk::set_attribute(element, "label", &self.value);
+            LabelState { value: self.value }
+        }
+
+        fn rebuild(self, element: &Element, state: &mut Self::State) {
+            if self.value != state.value {
+                LeptosGtk::set_attribute(element, "label", &self.value);
+            }
+        }
+    }
+
+    impl Property for () {
+        type State = ();
+
+        fn build(self, _element: &Element) -> Self::State {}
+
+        fn rebuild(self, _element: &Element, _state: &mut Self::State) {}
+    }
+
+    macro_rules! tuples {
+        ($($ty:ident),* $(,)?) => {
+            impl<$($ty,)*> Property for ($($ty,)*)
+                where $($ty: Property,)*
+            {
+                type State = ($($ty::State,)*);
+
+                fn build(self, element: &Element) -> Self::State {
+                    #[allow(non_snake_case)]
+                    let ($($ty,)*) = self;
+                    ($($ty.build(element),)*)
+                }
+
+                fn rebuild(self, element: &Element, state: &mut Self::State) {
+                    paste::paste! {
+                        #[allow(non_snake_case)]
+                        let ($($ty,)*) = self;
+                        #[allow(non_snake_case)]
+                        let ($([<state_ $ty:lower>],)*) = state;
+                        $($ty.rebuild(element, [<state_ $ty:lower>]));*
+                    }
+                }
+            }
+        }
+    }
+
+    tuples!(A);
+    tuples!(A, B);
+    tuples!(A, B, C);
+    tuples!(A, B, C, D);
+    tuples!(A, B, C, D, E);
+    tuples!(A, B, C, D, E, F);
+    tuples!(A, B, C, D, E, F, G);
+    tuples!(A, B, C, D, E, F, G, H);
+    tuples!(A, B, C, D, E, F, G, H, I);
+    tuples!(A, B, C, D, E, F, G, H, I, J);
+    tuples!(A, B, C, D, E, F, G, H, I, J, K);
+    tuples!(A, B, C, D, E, F, G, H, I, J, K, L);
+    tuples!(A, B, C, D, E, F, G, H, I, J, K, L, M);
+    tuples!(A, B, C, D, E, F, G, H, I, J, K, L, M, N);
+    tuples!(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O);
+    tuples!(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P);
+    tuples!(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q);
+    tuples!(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R);
+    tuples!(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S);
+    tuples!(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T);
+    tuples!(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U);
+    tuples!(A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V);
+    tuples!(
+        A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W
+    );
+    tuples!(
+        A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X
+    );
+    tuples!(
+        A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X,
+        Y
+    );
+}

examples/gtk/src/main.rs

@@ -0,0 +1,107 @@
+use any_spawner::Executor;
+use gtk::{prelude::*, Application, ApplicationWindow, Orientation};
+use leptos::prelude::*;
+use leptos_gtk::LeptosGtk;
+use std::{mem, thread, time::Duration};
+mod leptos_gtk;
+
+const APP_ID: &str = "dev.leptos.Counter";
+
+// Basic GTK app setup from https://gtk-rs.org/gtk4-rs/stable/latest/book/hello_world.html
+fn main() {
+    // use the glib event loop to power the reactive system
+    _ = Executor::init_glib();
+    let app = Application::builder().application_id(APP_ID).build();
+
+    app.connect_startup(|_| load_css());
+
+    app.connect_activate(|app| {
+        // Connect to "activate" signal of `app`
+        let owner = Owner::new();
+        let view = owner.with(ui);
+        let (root, state) = leptos_gtk::root(view);
+
+        let window = ApplicationWindow::builder()
+            .application(app)
+            .title("TachyGTK")
+            .child(&root)
+            .build();
+        // Present window
+        window.present();
+        mem::forget((owner, state));
+    });
+
+    app.run();
+}
+
+fn ui() -> impl Render<LeptosGtk> {
+    let value = RwSignal::new(0);
+    let rows = RwSignal::new(vec![1, 2, 3, 4, 5]);
+
+    Effect::new(move |_| {
+        println!("value = {}", value.get());
+    });
+
+    // just an example of multithreaded reactivity
+    thread::spawn(move || loop {
+        thread::sleep(Duration::from_millis(250));
+        value.update(|n| *n += 1);
+    });
+
+    vstack((
+        hstack((
+            button("-1", move || {
+                println!("clicked -1");
+                value.update(|n| *n -= 1);
+            }),
+            move || value.get().to_string(),
+            button("+1", move || value.update(|n| *n += 1)),
+        )),
+        button("Swap", move || {
+            rows.update(|items| {
+                items.swap(1, 3);
+            })
+        }),
+        hstack(rows),
+    ))
+}
+
+fn button(
+    label: impl Render<LeptosGtk>,
+    callback: impl Fn() + Send + Sync + 'static,
+) -> impl Render<LeptosGtk> {
+    leptos_gtk::button()
+        .child(label)
+        .connect("clicked", move |_| {
+            callback();
+            None
+        })
+}
+
+fn vstack(children: impl Render<LeptosGtk>) -> impl Render<LeptosGtk> {
+    leptos_gtk::r#box()
+        .orientation(Orientation::Vertical)
+        .spacing(12)
+        .child(children)
+}
+
+fn hstack(children: impl Render<LeptosGtk>) -> impl Render<LeptosGtk> {
+    leptos_gtk::r#box()
+        .orientation(Orientation::Horizontal)
+        .spacing(12)
+        .child(children)
+}
+
+fn load_css() {
+    use gtk::{gdk::Display, CssProvider};
+
+    let provider = CssProvider::new();
+    provider.load_from_path("style.css");
+
+    // Add the provider to the default screen
+    gtk::style_context_add_provider_for_display(
+        &Display::default().expect("Could not connect to a display."),
+        &provider,
+        gtk::STYLE_PROVIDER_PRIORITY_APPLICATION,
+    );
+}

examples/islands_router/Cargo.toml

@@ -17,7 +17,7 @@ leptos = { path = "../../leptos", features = [
 leptos_router = { path = "../../router" }
 server_fn = { path = "../../server_fn", features = ["serde-lite"] }
 leptos_axum = { path = "../../integrations/axum", features = [
-  "dont-use-islands-router",
+  "islands-router",
 ], optional = true }
 log = "0.4.22"
 serde = { version = "1.0", features = ["derive"] }

examples/islands_router/README.md

@@ -1,14 +1,19 @@
-# Work in Progress
+# Leptos Todo App Sqlite with Axum
 
-This example is something I wrote on a long layover in the Orlando airport in July. (It was really hot!)
+This example creates a basic todo app with an Axum backend that uses Leptos' server functions to call sqlx from the client and seamlessly run it on the server.
 
-It is the culmination of a couple years of thinking and working toward being able to do this, which you can see 
-described pretty well in the pinned roadmap issue (#1830) and its discussion of different modes of client-side
-routing when you use islands.
+## Getting Started
 
-This uses *only* server rendering, with no actual islands, but still maintains client-side state across page navigations.
-It does this by building on the fact that we now have a statically-typed view tree to do pretty smart updates with 
-new HTML from the client, with extremely minimal diffing.
+See the [Examples README](../README.md) for setup and run instructions.
 
-The demo itself works, but the feature that supports it is incomplete. A couple people have accidentally
-used it and broken their applications in ways they don't understand, so I've renamed the feature to `dont-use-islands-router`.
+## E2E Testing
+
+See the [E2E README](./e2e/README.md) for more information about the testing strategy.
+
+## Rendering
+
+See the [SSR Notes](../SSR_NOTES.md) for more information about Server Side Rendering.
+
+## Quick Start
+
+Run `cargo leptos watch` to run this example.

examples/js-framework-benchmark/tests/web.rs

@@ -1,5 +1,5 @@
 use js_framework_benchmark_leptos::*;
-use leptos::{prelude::*, task::tick};
+use leptos::{prelude::*, spawn::tick};
 use wasm_bindgen::JsCast;
 use wasm_bindgen_test::*;
 

examples/portal/tests/web.rs

@@ -3,7 +3,7 @@ use wasm_bindgen::JsCast;
 use wasm_bindgen_test::*;
 
 wasm_bindgen_test_configure!(run_in_browser);
-use leptos::task::tick;
+use leptos::spawn::tick;
 use leptos::{leptos_dom::helpers::document, mount::mount_to};
 use web_sys::HtmlButtonElement;
 

examples/router/src/lib.rs

@@ -65,7 +65,7 @@ pub fn RouterExample() -> impl IntoView {
 // You can define other routes in their own component.
 // Routes implement the MatchNestedRoutes
 #[component]
-pub fn ContactRoutes() -> impl MatchNestedRoutes + Clone {
+pub fn ContactRoutes() -> impl MatchNestedRoutes<Dom> + Clone {
     view! {
         <ParentRoute path=path!("") view=ContactList>
             <Route path=path!("/") view=|| "Select a contact."/>

examples/server_fns_axum/Cargo.toml

@@ -40,8 +40,6 @@ pin-project-lite = "0.2.14"
 dashmap = { version = "6.0", optional = true }
 once_cell = { version = "1.19", optional = true }
 async-broadcast = { version = "0.7.1", optional = true }
-bytecheck = "0.8.0"
-rkyv = { version = "0.8.8" }
 
 [features]
 hydrate = ["leptos/hydrate"]

examples/server_fns_axum/src/app.rs

@@ -1,6 +1,6 @@
 use futures::StreamExt;
 use http::Method;
-use leptos::{html::Input, prelude::*, task::spawn_local};
+use leptos::{html::Input, prelude::*, spawn::spawn_local};
 use serde::{de::DeserializeOwned, Deserialize, Serialize};
 use server_fn::{
     client::{browser::BrowserClient, Client},
@@ -417,6 +417,7 @@ pub fn FileUploadWithProgress() -> impl IntoView {
     /// This requires us to store some global state of all the uploads. In a real app, you probably
     /// shouldn't do exactly what I'm doing here in the demo. For example, this map just
     /// distinguishes between files by filename, not by user.
+
     #[cfg(feature = "ssr")]
     mod progress {
         use async_broadcast::{broadcast, Receiver, Sender};

examples/server_fns_axum/src/main.rs

@@ -4,8 +4,6 @@ use leptos::{config::get_configuration, logging};
 use leptos_axum::{generate_route_list, LeptosRoutes};
 use server_fns_axum::*;
 
-// cargo make cli: error: unneeded `return` statement
-#[allow(clippy::needless_return)]
 #[tokio::main]
 async fn main() {
     simple_logger::init_with_level(log::Level::Error)

examples/todomvc/src/lib.rs

@@ -319,7 +319,10 @@ pub fn Todo(todo: Todo) -> impl IntoView {
                     node_ref=todo_input
                     class="toggle"
                     type="checkbox"
-                    bind:checked=todo.completed
+                    prop:checked=move || todo.completed.get()
+                    on:input:target=move |ev| {
+                        todo.completed.set(ev.target().checked());
+                    }
                 />
 
                 <label on:dblclick=move |_| {

flake.lock

@@ -5,11 +5,29 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1726560853,
-        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
+        "lastModified": 1701680307,
+        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
+        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_2": {
+      "inputs": {
+        "systems": "systems_2"
+      },
+      "locked": {
+        "lastModified": 1681202837,
+        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
         "type": "github"
       },
       "original": {
@@ -20,11 +38,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1727634051,
-        "narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=",
+        "lastModified": 1703961334,
+        "narHash": "sha256-M1mV/Cq+pgjk0rt6VxoyyD+O8cOUiai8t9Q6Yyq4noY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "06cf0e1da4208d3766d898b7fdab6513366d45b9",
+        "rev": "b0d36bd0a420ecee3bc916c91886caca87c894e9",
         "type": "github"
       },
       "original": {
@@ -36,11 +54,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1718428119,
-        "narHash": "sha256-WdWDpNaq6u1IPtxtYHHWpl5BmabtpmLnMAx0RdJ/vo8=",
+        "lastModified": 1681358109,
+        "narHash": "sha256-eKyxW4OohHQx9Urxi7TQlFBTDWII+F+x2hklDOQPB50=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e6cea36f83499eb4e9cd184c8a8e823296b50ad5",
+        "rev": "96ba1c52e54e74c3197f4d43026b3f3d92e83ff9",
         "type": "github"
       },
       "original": {
@@ -59,14 +77,15 @@
     },
     "rust-overlay": {
       "inputs": {
+        "flake-utils": "flake-utils_2",
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1727749966,
-        "narHash": "sha256-DUS8ehzqB1DQzfZ4bRXVSollJhu+y7cvh1DJ9mbWebE=",
+        "lastModified": 1704075545,
+        "narHash": "sha256-L3zgOuVKhPjKsVLc3yTm2YJ6+BATyZBury7wnhyc8QU=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "00decf1b4f9886d25030b9ee4aed7bfddccb5f66",
+        "rev": "a0df72e106322b67e9c6e591fe870380bd0da0d5",
         "type": "github"
       },
       "original": {
@@ -89,6 +108,21 @@
         "repo": "default",
         "type": "github"
       }
+    },
+    "systems_2": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
     }
   },
   "root": "root",

hydration_context/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "hydration_context"
-version = "0.2.0-gamma"
+version = "0.2.0-beta6"
 authors = ["Greg Johnston"]
 license = "MIT"
 readme = "../README.md"

integrations/actix/Cargo.toml

@@ -33,7 +33,7 @@ once_cell = "1"
 rustdoc-args = ["--generate-link-to-definition"]
 
 [features]
-dont-use-islands-router = []
+islands-router = []
 tracing = ["dep:tracing"]
 
 [package.metadata.cargo-all-features]

integrations/actix/src/lib.rs

@@ -24,7 +24,7 @@ use leptos::{
     config::LeptosOptions,
     context::{provide_context, use_context},
     prelude::expect_context,
-    reactive::{computed::ScopedFuture, owner::Owner},
+    reactive_graph::{computed::ScopedFuture, owner::Owner},
     IntoView,
 };
 use leptos_integration_utils::{
@@ -749,7 +749,7 @@ where
     IV: IntoView + 'static,
 {
     Box::pin(async move {
-        let app = if cfg!(feature = "dont-use-islands-router") {
+        let app = if cfg!(feature = "islands-router") {
             app.to_html_stream_in_order_branching()
         } else {
             app.to_html_stream_in_order()

integrations/axum/Cargo.toml

@@ -28,7 +28,7 @@ once_cell = "1"
 parking_lot = "0.12.3"
 serde_json = "1.0"
 tokio = { version = "1.39", default-features = false }
-tower = { version = "0.4.13", features = ["util"] }
+tower = "0.4.13"
 tower-http = "0.5.2"
 tracing = { version = "0.1.40", optional = true }
 
@@ -39,7 +39,7 @@ tokio = { version = "1.39", features = ["net", "rt-multi-thread"] }
 [features]
 wasm = []
 default = ["tokio/fs", "tokio/sync", "tower-http/fs", "tower/util"]
-dont-use-islands-router = []
+islands-router = []
 tracing = ["dep:tracing"]
 
 [package.metadata.docs.rs]

integrations/axum/src/lib.rs

@@ -53,7 +53,7 @@ use leptos::{
     config::LeptosOptions,
     context::{provide_context, use_context},
     prelude::*,
-    reactive::{computed::ScopedFuture, owner::Owner},
+    reactive_graph::{computed::ScopedFuture, owner::Owner},
     IntoView,
 };
 use leptos_integration_utils::{
@@ -76,7 +76,7 @@ use server_fn::{redirect::REDIRECT_HEADER, ServerFnError};
 use std::path::Path;
 use std::{fmt::Debug, io, pin::Pin, sync::Arc};
 #[cfg(feature = "default")]
-use tower::util::ServiceExt;
+use tower::ServiceExt;
 #[cfg(feature = "default")]
 use tower_http::services::ServeDir;
 // use tracing::Instrument; // TODO check tracing span -- was this used in 0.6 for a missing link?
@@ -784,7 +784,7 @@ where
     _ = replace_blocks; // TODO
     handle_response(additional_context, app_fn, |app, chunks| {
         Box::pin(async move {
-            let app = if cfg!(feature = "dont-use-islands-router") {
+            let app = if cfg!(feature = "islands-router") {
                 app.to_html_stream_out_of_order_branching()
             } else {
                 app.to_html_stream_out_of_order()
@@ -849,7 +849,7 @@ where
     IV: IntoView + 'static,
 {
     handle_response(additional_context, app_fn, |app, chunks| {
-        let app = if cfg!(feature = "dont-use-islands-router") {
+        let app = if cfg!(feature = "islands-router") {
             app.to_html_stream_in_order_branching()
         } else {
             app.to_html_stream_in_order()
@@ -1069,7 +1069,7 @@ where
 {
     handle_response(additional_context, app_fn, |app, chunks| {
         Box::pin(async move {
-            let app = if cfg!(feature = "dont-use-islands-router") {
+            let app = if cfg!(feature = "islands-router") {
                 app.to_html_stream_in_order_branching()
             } else {
                 app.to_html_stream_in_order()
@@ -1146,7 +1146,7 @@ where
     IV: IntoView + 'static,
 {
     Box::pin(async move {
-        let app = if cfg!(feature = "dont-use-islands-router") {
+        let app = if cfg!(feature = "islands-router") {
             app.to_html_stream_in_order_branching()
         } else {
             app.to_html_stream_in_order()

integrations/utils/src/lib.rs

@@ -2,7 +2,7 @@ use futures::{stream::once, Stream, StreamExt};
 use hydration_context::{SharedContext, SsrSharedContext};
 use leptos::{
     nonce::use_nonce,
-    reactive::owner::{Owner, Sandboxed},
+    reactive_graph::owner::{Owner, Sandboxed},
     IntoView,
 };
 use leptos_config::LeptosOptions;

leptos/src/await_.rs

@@ -1,8 +1,10 @@
-use crate::{prelude::Suspend, suspense_component::Suspense, IntoView};
+use crate::Suspense;
+use leptos_dom::IntoView;
 use leptos_macro::{component, view};
-use leptos_server::ArcOnceResource;
-use reactive_graph::prelude::ReadUntracked;
-use serde::{de::DeserializeOwned, Serialize};
+use leptos_reactive::{
+    create_blocking_resource, create_local_resource, create_resource,
+    store_value, Serializable,
+};
 
 #[component]
 /// Allows you to inline the data loading for an `async` block or
@@ -13,8 +15,11 @@ use serde::{de::DeserializeOwned, Serialize};
 /// Adding `let:{variable name}` to the props makes the data available in the children
 /// that variable name, when resolved.
 /// ```
-/// # use leptos::prelude::*;
+/// # use leptos_reactive::*;
+/// # use leptos_macro::*;
+/// # use leptos_dom::*; use leptos::*;
 /// # if false {
+/// # let runtime = create_runtime();
 /// async fn fetch_monkeys(monkey: i32) -> i32 {
 ///     // do some expensive work
 ///     3
@@ -22,23 +27,29 @@ use serde::{de::DeserializeOwned, Serialize};
 ///
 /// view! {
 ///     <Await
-///         future=fetch_monkeys(3)
+///         future=|| fetch_monkeys(3)
 ///         let:data
 ///     >
 ///         <p>{*data} " little monkeys, jumping on the bed."</p>
 ///     </Await>
 /// }
 /// # ;
+/// # runtime.dispose();
 /// # }
 /// ```
-pub fn Await<T, Fut, Chil, V>(
-    /// A [`Future`](std::future::Future) that will the component will `.await`
-    /// before rendering.
-    future: Fut,
-    /// If `true`, the component will create a blocking resource, preventing
+pub fn Await<T, Fut, FF, VF, V>(
+    /// A function that returns the [`Future`](std::future::Future) that
+    /// will the component will `.await` before rendering.
+    future: FF,
+    /// If `true`, the component will use [`create_blocking_resource`], preventing
     /// the HTML stream from returning anything before `future` has resolved.
     #[prop(optional)]
     blocking: bool,
+    /// If `true`, the component will use [`create_local_resource`], this will
+    /// always run on the local system and therefore its result type does not
+    /// need to be `Serializable`.
+    #[prop(optional)]
+    local: bool,
     /// A function that takes a reference to the resolved data from the `future`
     /// renders a view.
     ///
@@ -47,58 +58,65 @@ pub fn Await<T, Fut, Chil, V>(
     /// `let:` syntax to specify the name for the data variable.
     ///
     /// ```rust
-    /// # use leptos::prelude::*;
+    /// # use leptos::*;
     /// # if false {
+    /// # let runtime = create_runtime();
     /// # async fn fetch_monkeys(monkey: i32) -> i32 {
     /// #    3
     /// # }
     /// view! {
     ///     <Await
-    ///         future=fetch_monkeys(3)
+    ///         future=|| fetch_monkeys(3)
     ///         let:data
     ///     >
     ///         <p>{*data} " little monkeys, jumping on the bed."</p>
     ///     </Await>
     /// }
     /// # ;
+    /// # runtime.dispose();
     /// # }
     /// ```
     /// is the same as
     ///  ```rust
-    /// # use leptos::prelude::*;
+    /// # use leptos::*;
     /// # if false {
+    /// # let runtime = create_runtime();
     /// # async fn fetch_monkeys(monkey: i32) -> i32 {
     /// #    3
     /// # }
     /// view! {
     ///     <Await
-    ///         future=fetch_monkeys(3)
+    ///         future=|| fetch_monkeys(3)
     ///         children=|data| view! {
     ///           <p>{*data} " little monkeys, jumping on the bed."</p>
     ///         }
     ///     />
     /// }
     /// # ;
+    /// # runtime.dispose();
     /// # }
     /// ```
-    children: Chil,
+    children: VF,
 ) -> impl IntoView
 where
-    T: Send + Sync + Serialize + DeserializeOwned + 'static,
-    Fut: std::future::Future<Output = T> + Send + 'static,
-    Chil: FnOnce(&T) -> V + Send + 'static,
+    Fut: std::future::Future<Output = T> + 'static,
+    FF: Fn() -> Fut + 'static,
     V: IntoView,
+    VF: Fn(&T) -> V + 'static,
+    T: Serializable + 'static,
 {
-    let res = ArcOnceResource::<T>::new_with_options(future, blocking);
-    let ready = res.ready();
+    let res = if blocking {
+        create_blocking_resource(|| (), move |_| future())
+    } else if local {
+        create_local_resource(|| (), move |_| future())
+    } else {
+        create_resource(|| (), move |_| future())
+    };
+    let view = store_value(children);
 
     view! {
         <Suspense fallback=|| ()>
-            {Suspend::new(async move {
-                ready.await;
-                children(res.read_untracked().as_ref().unwrap())
-            })}
-
+            {move || res.map(|data| view.with_value(|view| view(data)))}
         </Suspense>
     }
 }

leptos/src/callback.rs

@@ -41,10 +41,7 @@
 //!
 //! Use `SyncCallback` if the function is not `Sync` and `Send`.
 
-use reactive_graph::{
-    owner::{LocalStorage, StoredValue},
-    traits::WithValue,
-};
+use reactive_graph::owner::{LocalStorage, StoredValue};
 use std::{fmt, rc::Rc, sync::Arc};
 
 /// A wrapper trait for calling callbacks.

leptos/src/children.rs

@@ -3,10 +3,13 @@ use std::{
     fmt::{self, Debug},
     sync::Arc,
 };
-use tachys::view::{
-    any_view::{AnyView, IntoAny},
-    fragment::{Fragment, IntoFragment},
-    RenderHtml,
+use tachys::{
+    renderer::dom::Dom,
+    view::{
+        any_view::{AnyView, IntoAny},
+        fragment::{Fragment, IntoFragment},
+        RenderHtml,
+    },
 };
 
 /// The most common type for the `children` property on components,
@@ -14,31 +17,31 @@ use tachys::view::{
 ///
 /// This does not support iterating over individual nodes within the children.
 /// To iterate over children, use [`ChildrenFragment`].
-pub type Children = Box<dyn FnOnce() -> AnyView + Send>;
+pub type Children = Box<dyn FnOnce() -> AnyView<Dom> + Send>;
 
 /// A type for the `children` property on components that can be called only once,
 /// and provides a collection of all the children passed to this component.
-pub type ChildrenFragment = Box<dyn FnOnce() -> Fragment + Send>;
+pub type ChildrenFragment = Box<dyn FnOnce() -> Fragment<Dom> + Send>;
 
 /// A type for the `children` property on components that can be called
 /// more than once.
-pub type ChildrenFn = Arc<dyn Fn() -> AnyView + Send + Sync>;
+pub type ChildrenFn = Arc<dyn Fn() -> AnyView<Dom> + Send + Sync>;
 
 /// A type for the `children` property on components that can be called more than once,
 /// and provides a collection of all the children passed to this component.
-pub type ChildrenFragmentFn = Arc<dyn Fn() -> Fragment + Send>;
+pub type ChildrenFragmentFn = Arc<dyn Fn() -> Fragment<Dom> + Send>;
 
 /// A type for the `children` property on components that can be called
 /// more than once, but may mutate the children.
-pub type ChildrenFnMut = Box<dyn FnMut() -> AnyView + Send>;
+pub type ChildrenFnMut = Box<dyn FnMut() -> AnyView<Dom> + Send>;
 
 /// A type for the `children` property on components that can be called more than once,
 /// but may mutate the children, and provides a collection of all the children
 /// passed to this component.
-pub type ChildrenFragmentMut = Box<dyn FnMut() -> Fragment + Send>;
+pub type ChildrenFragmentMut = Box<dyn FnMut() -> Fragment<Dom> + Send>;
 
 // This is to still support components that accept `Box<dyn Fn() -> AnyView>` as a children.
-type BoxedChildrenFn = Box<dyn Fn() -> AnyView + Send>;
+type BoxedChildrenFn = Box<dyn Fn() -> AnyView<Dom> + Send>;
 
 /// This trait can be used when constructing a component that takes children without needing
 /// to know exactly what children type the component expects. This is used internally by the
@@ -94,7 +97,7 @@ pub trait ToChildren<F> {
 impl<F, C> ToChildren<F> for Children
 where
     F: FnOnce() -> C + Send + 'static,
-    C: RenderHtml + Send + 'static,
+    C: RenderHtml<Dom> + Send + 'static,
 {
     #[inline]
     fn to_children(f: F) -> Self {
@@ -105,7 +108,7 @@ where
 impl<F, C> ToChildren<F> for ChildrenFn
 where
     F: Fn() -> C + Send + Sync + 'static,
-    C: RenderHtml + Send + 'static,
+    C: RenderHtml<Dom> + Send + 'static,
 {
     #[inline]
     fn to_children(f: F) -> Self {
@@ -116,7 +119,7 @@ where
 impl<F, C> ToChildren<F> for ChildrenFnMut
 where
     F: Fn() -> C + Send + 'static,
-    C: RenderHtml + Send + 'static,
+    C: RenderHtml<Dom> + Send + 'static,
 {
     #[inline]
     fn to_children(f: F) -> Self {
@@ -127,7 +130,7 @@ where
 impl<F, C> ToChildren<F> for BoxedChildrenFn
 where
     F: Fn() -> C + Send + 'static,
-    C: RenderHtml + Send + 'static,
+    C: RenderHtml<Dom> + Send + 'static,
 {
     #[inline]
     fn to_children(f: F) -> Self {
@@ -138,7 +141,7 @@ where
 impl<F, C> ToChildren<F> for ChildrenFragment
 where
     F: FnOnce() -> C + Send + 'static,
-    C: IntoFragment,
+    C: IntoFragment<Dom>,
 {
     #[inline]
     fn to_children(f: F) -> Self {
@@ -149,7 +152,7 @@ where
 impl<F, C> ToChildren<F> for ChildrenFragmentFn
 where
     F: Fn() -> C + Send + 'static,
-    C: IntoFragment,
+    C: IntoFragment<Dom>,
 {
     #[inline]
     fn to_children(f: F) -> Self {
@@ -160,7 +163,7 @@ where
 impl<F, C> ToChildren<F> for ChildrenFragmentMut
 where
     F: FnMut() -> C + Send + 'static,
-    C: IntoFragment,
+    C: IntoFragment<Dom>,
 {
     #[inline]
     fn to_children(mut f: F) -> Self {
@@ -171,7 +174,7 @@ where
 /// New-type wrapper for a function that returns a view with `From` and `Default` traits implemented
 /// to enable optional props in for example `<Show>` and `<Suspense>`.
 #[derive(Clone)]
-pub struct ViewFn(Arc<dyn Fn() -> AnyView + Send + Sync + 'static>);
+pub struct ViewFn(Arc<dyn Fn() -> AnyView<Dom> + Send + Sync + 'static>);
 
 impl Default for ViewFn {
     fn default() -> Self {
@@ -182,7 +185,7 @@ impl Default for ViewFn {
 impl<F, C> From<F> for ViewFn
 where
     F: Fn() -> C + Send + Sync + 'static,
-    C: RenderHtml + Send + 'static,
+    C: RenderHtml<Dom> + Send + 'static,
 {
     fn from(value: F) -> Self {
         Self(Arc::new(move || value().into_any()))
@@ -191,14 +194,14 @@ where
 
 impl ViewFn {
     /// Execute the wrapped function
-    pub fn run(&self) -> AnyView {
+    pub fn run(&self) -> AnyView<Dom> {
         (self.0)()
     }
 }
 
 /// New-type wrapper for a function, which will only be called once and returns a view with `From` and
 /// `Default` traits implemented to enable optional props in for example `<Show>` and `<Suspense>`.
-pub struct ViewFnOnce(Box<dyn FnOnce() -> AnyView + Send + 'static>);
+pub struct ViewFnOnce(Box<dyn FnOnce() -> AnyView<Dom> + Send + 'static>);
 
 impl Default for ViewFnOnce {
     fn default() -> Self {
@@ -209,7 +212,7 @@ impl Default for ViewFnOnce {
 impl<F, C> From<F> for ViewFnOnce
 where
     F: FnOnce() -> C + Send + 'static,
-    C: RenderHtml + Send + 'static,
+    C: RenderHtml<Dom> + Send + 'static,
 {
     fn from(value: F) -> Self {
         Self(Box::new(move || value().into_any()))
@@ -218,7 +221,7 @@ where
 
 impl ViewFnOnce {
     /// Execute the wrapped function
-    pub fn run(self) -> AnyView {
+    pub fn run(self) -> AnyView<Dom> {
         (self.0)()
     }
 }

leptos/src/error_boundary.rs

@@ -9,11 +9,12 @@ use reactive_graph::{
     traits::{Get, Update, With, WithUntracked},
 };
 use rustc_hash::FxHashMap;
-use std::{fmt::Debug, sync::Arc};
+use std::{fmt::Debug, marker::PhantomData, sync::Arc};
 use tachys::{
     html::attribute::Attribute,
     hydration::Cursor,
     reactive_graph::OwnedView,
+    renderer::Renderer,
     ssr::StreamBuilder,
     view::{
         add_attr::AddAnyAttr, Mountable, Position, PositionState, Render,
@@ -111,18 +112,20 @@ where
             children,
             errors,
             fallback,
+            rndr: PhantomData,
         },
         owner,
     )
 }
 
-struct ErrorBoundaryView<Chil, FalFn> {
+struct ErrorBoundaryView<Chil, FalFn, Rndr> {
     hook: Arc<dyn ErrorHook>,
     boundary_id: SerializedDataId,
     errors_empty: ArcMemo<bool>,
     children: Chil,
     fallback: FalFn,
     errors: ArcRwSignal<Errors>,
+    rndr: PhantomData<Rndr>,
 }
 
 struct ErrorBoundaryViewState<Chil, Fal> {
@@ -131,10 +134,11 @@ struct ErrorBoundaryViewState<Chil, Fal> {
     fallback: Option<Fal>,
 }
 
-impl<Chil, Fal> Mountable for ErrorBoundaryViewState<Chil, Fal>
+impl<Chil, Fal, Rndr> Mountable<Rndr> for ErrorBoundaryViewState<Chil, Fal>
 where
-    Chil: Mountable,
-    Fal: Mountable,
+    Chil: Mountable<Rndr>,
+    Fal: Mountable<Rndr>,
+    Rndr: Renderer,
 {
     fn unmount(&mut self) {
         if let Some(fallback) = &mut self.fallback {
@@ -144,11 +148,7 @@ where
         }
     }
 
-    fn mount(
-        &mut self,
-        parent: &tachys::renderer::types::Element,
-        marker: Option<&tachys::renderer::types::Node>,
-    ) {
+    fn mount(&mut self, parent: &Rndr::Element, marker: Option<&Rndr::Node>) {
         if let Some(fallback) = &mut self.fallback {
             fallback.mount(parent, marker);
         } else {
@@ -156,7 +156,7 @@ where
         }
     }
 
-    fn insert_before_this(&self, child: &mut dyn Mountable) -> bool {
+    fn insert_before_this(&self, child: &mut dyn Mountable<Rndr>) -> bool {
         if let Some(fallback) = &self.fallback {
             fallback.insert_before_this(child)
         } else {
@@ -165,11 +165,13 @@ where
     }
 }
 
-impl<Chil, FalFn, Fal> Render for ErrorBoundaryView<Chil, FalFn>
+impl<Chil, FalFn, Fal, Rndr> Render<Rndr>
+    for ErrorBoundaryView<Chil, FalFn, Rndr>
 where
-    Chil: Render + 'static,
+    Chil: Render<Rndr> + 'static,
     FalFn: FnMut(ArcRwSignal<Errors>) -> Fal + Send + 'static,
-    Fal: Render + 'static,
+    Fal: Render<Rndr> + 'static,
+    Rndr: Renderer,
 {
     type State = RenderEffect<ErrorBoundaryViewState<Chil::State, Fal::State>>;
 
@@ -226,21 +228,26 @@ where
     }
 }
 
-impl<Chil, FalFn, Fal> AddAnyAttr for ErrorBoundaryView<Chil, FalFn>
+impl<Chil, FalFn, Fal, Rndr> AddAnyAttr<Rndr>
+    for ErrorBoundaryView<Chil, FalFn, Rndr>
 where
-    Chil: RenderHtml + 'static,
+    Chil: RenderHtml<Rndr> + 'static,
     FalFn: FnMut(ArcRwSignal<Errors>) -> Fal + Send + 'static,
-    Fal: RenderHtml + Send + 'static,
+    Fal: RenderHtml<Rndr> + Send + 'static,
+    Rndr: Renderer,
 {
-    type Output<SomeNewAttr: Attribute> =
-        ErrorBoundaryView<Chil::Output<SomeNewAttr::CloneableOwned>, FalFn>;
+    type Output<SomeNewAttr: Attribute<Rndr>> = ErrorBoundaryView<
+        Chil::Output<SomeNewAttr::CloneableOwned>,
+        FalFn,
+        Rndr,
+    >;
 
-    fn add_any_attr<NewAttr: Attribute>(
+    fn add_any_attr<NewAttr: Attribute<Rndr>>(
         self,
         attr: NewAttr,
     ) -> Self::Output<NewAttr>
     where
-        Self::Output<NewAttr>: RenderHtml,
+        Self::Output<NewAttr>: RenderHtml<Rndr>,
     {
         let ErrorBoundaryView {
             hook,
@@ -249,6 +256,7 @@ where
             children,
             fallback,
             errors,
+            rndr,
         } = self;
         ErrorBoundaryView {
             hook,
@@ -257,17 +265,20 @@ where
             children: children.add_any_attr(attr.into_cloneable_owned()),
             fallback,
             errors,
+            rndr,
         }
     }
 }
 
-impl<Chil, FalFn, Fal> RenderHtml for ErrorBoundaryView<Chil, FalFn>
+impl<Chil, FalFn, Fal, Rndr> RenderHtml<Rndr>
+    for ErrorBoundaryView<Chil, FalFn, Rndr>
 where
-    Chil: RenderHtml + Send + 'static,
+    Chil: RenderHtml<Rndr> + Send + 'static,
     FalFn: FnMut(ArcRwSignal<Errors>) -> Fal + Send + 'static,
-    Fal: RenderHtml + Send + 'static,
+    Fal: RenderHtml<Rndr> + Send + 'static,
+    Rndr: Renderer,
 {
-    type AsyncOutput = ErrorBoundaryView<Chil::AsyncOutput, FalFn>;
+    type AsyncOutput = ErrorBoundaryView<Chil::AsyncOutput, FalFn, Rndr>;
 
     const MIN_LENGTH: usize = Chil::MIN_LENGTH;
 
@@ -292,6 +303,7 @@ where
             children: children.resolve().await,
             fallback,
             errors,
+            rndr: PhantomData,
         }
     }
 
@@ -365,7 +377,7 @@ where
 
     fn hydrate<const FROM_SERVER: bool>(
         mut self,
-        cursor: &Cursor,
+        cursor: &Cursor<Rndr>,
         position: &PositionState,
     ) -> Self::State {
         let mut children = Some(self.children);

leptos/src/for_loop.rs

@@ -157,7 +157,7 @@ where
     };
     move || keyed(each(), key.clone(), children.clone())
 }
-/*
+
 #[cfg(test)]
 mod tests {
     use crate::prelude::*;
@@ -168,7 +168,7 @@ mod tests {
     fn creates_list() {
         Owner::new().with(|| {
             let values = RwSignal::new(vec![1, 2, 3, 4, 5]);
-            let list: View<HtmlElement<_, _, _>> = view! {
+            let list: View<HtmlElement<_, _, _, Dom>> = view! {
                 <ol>
                     <For each=move || values.get() key=|i| *i let:i>
                         <li>{i}</li>
@@ -187,7 +187,7 @@ mod tests {
     fn creates_list_enumerate() {
         Owner::new().with(|| {
             let values = RwSignal::new(vec![1, 2, 3, 4, 5]);
-            let list: View<HtmlElement<_, _, _>> = view! {
+            let list: View<HtmlElement<_, _, _, Dom>> = view! {
                 <ol>
                     <ForEnumerate each=move || values.get() key=|i| *i let(index, i)>
                         <li>{move || index.get()}"-"{i}</li>
@@ -200,7 +200,7 @@ mod tests {
                 <!>-<!>4</li><li>4<!>-<!>5</li><!></ol>"
             );
 
-            let list: View<HtmlElement<_, _, _>> = view! {
+            let list: View<HtmlElement<_, _, _, Dom>> = view! {
                 <ol>
                     <ForEnumerate each=move || values.get() key=|i| *i let(index, i)>
                         <li>{move || index.get()}"-"{i}</li>
@@ -216,4 +216,3 @@ mod tests {
         });
     }
 }
- */

leptos/src/hydration/hydration_script.js

@@ -1,8 +1,8 @@
 (function (root, pkg_path, output_name, wasm_output_name) {
 	import(`${root}/${pkg_path}/${output_name}.js`)
 		.then(mod => {
-			mod.default(`${root}/${pkg_path}/${wasm_output_name}.wasm`).then(() => {
+			mod.default(`/${pkg_path}/${wasm_output_name}.wasm`).then(() => {
 				mod.hydrate();
 			});
 		})
-})
+})

leptos/src/hydration/island_script.js

@@ -38,7 +38,7 @@
 		if (islandFn) {
 			islandFn(el);
 		} else {
-			console.warn(`Could not find WASM function for the island ${id}.`);
+			console.warn(`Could not find WASM function for the island ${l}.`);
 		}
 	}
 	function hydrateIslands(entry, mod) {

leptos/src/into_view.rs

@@ -2,6 +2,7 @@ use std::borrow::Cow;
 use tachys::{
     html::attribute::Attribute,
     hydration::Cursor,
+    renderer::{dom::Dom, Renderer},
     ssr::StreamBuilder,
     view::{
         add_attr::AddAnyAttr, Position, PositionState, Render, RenderHtml,
@@ -49,14 +50,14 @@ impl<T> View<T> {
 
 pub trait IntoView
 where
-    Self: Sized + Render + RenderHtml + Send,
+    Self: Sized + Render<Dom> + RenderHtml<Dom> + Send,
 {
     fn into_view(self) -> View<Self>;
 }
 
 impl<T> IntoView for T
 where
-    T: Sized + Render + RenderHtml + Send, //+ AddAnyAttr,
+    T: Sized + Render<Dom> + RenderHtml<Dom> + Send, //+ AddAnyAttr<Dom>,
 {
     fn into_view(self) -> View<Self> {
         View {
@@ -67,7 +68,7 @@ where
     }
 }
 
-impl<T: Render> Render for View<T> {
+impl<T: Render<Rndr>, Rndr: Renderer> Render<Rndr> for View<T> {
     type State = T::State;
 
     fn build(self) -> Self::State {
@@ -79,10 +80,10 @@ impl<T: Render> Render for View<T> {
     }
 }
 
-impl<T: RenderHtml> RenderHtml for View<T> {
+impl<T: RenderHtml<Rndr>, Rndr: Renderer> RenderHtml<Rndr> for View<T> {
     type AsyncOutput = T::AsyncOutput;
 
-    const MIN_LENGTH: usize = <T as RenderHtml>::MIN_LENGTH;
+    const MIN_LENGTH: usize = <T as RenderHtml<Rndr>>::MIN_LENGTH;
 
     async fn resolve(self) -> Self::AsyncOutput {
         self.inner.resolve().await
@@ -146,7 +147,7 @@ impl<T: RenderHtml> RenderHtml for View<T> {
 
     fn hydrate<const FROM_SERVER: bool>(
         self,
-        cursor: &Cursor,
+        cursor: &Cursor<Rndr>,
         position: &PositionState,
     ) -> Self::State {
         self.inner.hydrate::<FROM_SERVER>(cursor, position)
@@ -165,15 +166,18 @@ impl<T: ToTemplate> ToTemplate for View<T> {
     }
 }
 
-impl<T: AddAnyAttr> AddAnyAttr for View<T> {
-    type Output<SomeNewAttr: Attribute> = View<T::Output<SomeNewAttr>>;
+impl<T: AddAnyAttr<Rndr>, Rndr> AddAnyAttr<Rndr> for View<T>
+where
+    Rndr: Renderer,
+{
+    type Output<SomeNewAttr: Attribute<Rndr>> = View<T::Output<SomeNewAttr>>;
 
-    fn add_any_attr<NewAttr: Attribute>(
+    fn add_any_attr<NewAttr: Attribute<Rndr>>(
         self,
         attr: NewAttr,
     ) -> Self::Output<NewAttr>
     where
-        Self::Output<NewAttr>: RenderHtml,
+        Self::Output<NewAttr>: RenderHtml<Rndr>,
     {
         let View {
             inner,

leptos/src/lib.rs

@@ -168,12 +168,13 @@ pub mod prelude {
         pub use leptos_server::*;
         pub use oco_ref::*;
         pub use reactive_graph::{
-            actions::*, computed::*, effect::*, graph::untrack, owner::*,
-            signal::*, wrappers::read::*,
+            actions::*, computed::*, effect::*, owner::*, signal::*, untrack,
+            wrappers::read::*,
         };
         pub use server_fn::{self, ServerFnError};
         pub use tachys::{
-            reactive_graph::{bind::BindAttribute, node_ref::*, Suspend},
+            self,
+            reactive_graph::{node_ref::*, Suspend},
             view::template::ViewTemplate,
         };
     }
@@ -200,11 +201,10 @@ pub mod error {
     pub use throw_error::*;
 }
 
-/// Control-flow components like `<Show>`, `<For>`, and `<Await>`.
+/// Control-flow components like `<Show>` and `<For>`.
 pub mod control_flow {
-    pub use crate::{await_::*, for_loop::*, show::*};
+    pub use crate::{for_loop::*, show::*};
 }
-mod await_;
 mod for_loop;
 mod show;
 
@@ -230,7 +230,6 @@ mod suspense_component;
 pub mod text_prop;
 mod transition;
 pub use leptos_macro::*;
-#[doc(inline)]
 pub use server_fn;
 #[doc(hidden)]
 pub use typed_builder;
@@ -238,22 +237,16 @@ pub use typed_builder;
 pub use typed_builder_macro;
 mod into_view;
 pub use into_view::IntoView;
-#[doc(inline)]
 pub use leptos_dom;
 mod provider;
-#[doc(inline)]
 pub use tachys;
 /// Tools to mount an application to the DOM, or to hydrate it from server-rendered HTML.
 pub mod mount;
-#[doc(inline)]
 pub use leptos_config as config;
-#[doc(inline)]
 pub use oco_ref as oco;
 mod from_form_data;
-#[doc(inline)]
 pub use either_of as either;
-#[doc(inline)]
-pub use reactive_graph as reactive;
+pub use reactive_graph;
 
 /// Provide and access data along the reactive graph, sharing data without directly passing arguments.
 pub mod context {
@@ -261,22 +254,17 @@ pub mod context {
     pub use reactive_graph::owner::{provide_context, use_context};
 }
 
-#[doc(inline)]
 pub use leptos_server as server;
 /// HTML attribute types.
-#[doc(inline)]
 pub use tachys::html::attribute as attr;
 /// HTML element types.
-#[doc(inline)]
 pub use tachys::html::element as html;
 /// HTML event types.
 #[doc(no_inline)]
 pub use tachys::html::event as ev;
 /// MathML element types.
-#[doc(inline)]
 pub use tachys::mathml as math;
 /// SVG element types.
-#[doc(inline)]
 pub use tachys::svg;
 
 /// Utilities for simple isomorphic logging to the console or terminal.
@@ -284,7 +272,7 @@ pub mod logging {
     pub use leptos_dom::{debug_warn, error, log, warn};
 }
 
-pub mod task {
+pub mod spawn {
     pub use any_spawner::Executor;
     use std::future::Future;
 
@@ -302,14 +290,9 @@ pub mod task {
         Executor::spawn_local(fut)
     }
 
-    /// Waits until the next "tick" of the current async executor.
     pub async fn tick() {
         Executor::tick().await
     }
-
-    pub use reactive_graph::{
-        spawn_local_scoped, spawn_local_scoped_with_cancellation,
-    };
 }
 
 // these reexports are used in islands
@@ -329,6 +312,7 @@ pub use web_sys;
 
 /*mod additional_attributes;
 pub use additional_attributes::*;
+mod await_;
 pub use await_::*;
 pub use leptos_config::{self, get_configuration, LeptosOptions};
 #[cfg(not(all(

leptos/src/mount.rs

@@ -5,8 +5,10 @@ use any_spawner::Executor;
 use reactive_graph::owner::Owner;
 #[cfg(debug_assertions)]
 use std::cell::Cell;
+use std::marker::PhantomData;
 use tachys::{
     dom::body,
+    renderer::{dom::Dom, Renderer},
     view::{Mountable, Render},
 };
 #[cfg(feature = "hydrate")]
@@ -36,7 +38,10 @@ thread_local! {
 
 #[cfg(feature = "hydrate")]
 /// Runs the provided closure and mounts the result to the provided element.
-pub fn hydrate_from<F, N>(parent: HtmlElement, f: F) -> UnmountHandle<N::State>
+pub fn hydrate_from<F, N>(
+    parent: HtmlElement,
+    f: F,
+) -> UnmountHandle<N::State, Dom>
 where
     F: FnOnce() -> N + 'static,
     N: IntoView,
@@ -80,7 +85,11 @@ where
 
     // returns a handle that owns the owner
     // when this is dropped, it will clean up the reactive system and unmount the view
-    UnmountHandle { owner, mountable }
+    UnmountHandle {
+        owner,
+        mountable,
+        rndr: PhantomData,
+    }
 }
 
 /// Runs the provided closure and mounts the result to the `<body>`.
@@ -94,7 +103,7 @@ where
 }
 
 /// Runs the provided closure and mounts the result to the provided element.
-pub fn mount_to<F, N>(parent: HtmlElement, f: F) -> UnmountHandle<N::State>
+pub fn mount_to<F, N>(parent: HtmlElement, f: F) -> UnmountHandle<N::State, Dom>
 where
     F: FnOnce() -> N + 'static,
     N: IntoView,
@@ -131,17 +140,22 @@ where
 
     // returns a handle that owns the owner
     // when this is dropped, it will clean up the reactive system and unmount the view
-    UnmountHandle { owner, mountable }
+    UnmountHandle {
+        owner,
+        mountable,
+        rndr: PhantomData,
+    }
 }
 
 /// Runs the provided closure and mounts the result to the provided element.
-pub fn mount_to_renderer<F, N>(
-    parent: &tachys::renderer::types::Element,
+pub fn mount_to_renderer<F, N, R>(
+    parent: &R::Element,
     f: F,
-) -> UnmountHandle<N::State>
+) -> UnmountHandle<N::State, R>
 where
     F: FnOnce() -> N + 'static,
-    N: Render,
+    N: Render<R>,
+    R: Renderer,
 {
     // use wasm-bindgen-futures to drive the reactive system
     // we ignore the return value because an Err here just means the wasm-bindgen executor is
@@ -159,7 +173,11 @@ where
 
     // returns a handle that owns the owner
     // when this is dropped, it will clean up the reactive system and unmount the view
-    UnmountHandle { owner, mountable }
+    UnmountHandle {
+        owner,
+        mountable,
+        rndr: PhantomData,
+    }
 }
 
 /// Hydrates any islands that are currently present on the page.
@@ -193,18 +211,21 @@ pub fn hydrate_islands() {
               reactive system. You should either call `.forget()` to keep the \
               view permanently mounted, or store the `UnmountHandle` somewhere \
               and drop it when you'd like to unmount the view."]
-pub struct UnmountHandle<M>
+pub struct UnmountHandle<M, R>
 where
-    M: Mountable,
+    M: Mountable<R>,
+    R: Renderer,
 {
     #[allow(dead_code)]
     owner: Owner,
     mountable: M,
+    rndr: PhantomData<R>,
 }
 
-impl<M> UnmountHandle<M>
+impl<M, R> UnmountHandle<M, R>
 where
-    M: Mountable,
+    M: Mountable<R>,
+    R: Renderer,
 {
     /// Leaks the handle, preventing the reactive system from being cleaned up and the view from
     /// being unmounted. This should always be called when [`mount_to`] is used for the root of an
@@ -214,9 +235,10 @@ where
     }
 }
 
-impl<M> Drop for UnmountHandle<M>
+impl<M, R> Drop for UnmountHandle<M, R>
 where
-    M: Mountable,
+    M: Mountable<R>,
+    R: Renderer,
 {
     fn drop(&mut self) {
         self.mountable.unmount();

leptos/src/nonce.rs

@@ -6,7 +6,7 @@ use base64::{
 };
 use rand::{thread_rng, RngCore};
 use std::{fmt::Display, ops::Deref, sync::Arc};
-use tachys::html::attribute::AttributeValue;
+use tachys::{html::attribute::AttributeValue, renderer::Renderer};
 
 /// A cryptographic nonce ("number used once") which can be
 /// used by Content Security Policy to determine whether or not a given
@@ -65,9 +65,12 @@ impl Display for Nonce {
     }
 }
 
-impl AttributeValue for Nonce {
+impl<R> AttributeValue<R> for Nonce
+where
+    R: Renderer,
+{
     type AsyncOutput = Self;
-    type State = <Arc<str> as AttributeValue>::State;
+    type State = <Arc<str> as AttributeValue<R>>::State;
     type Cloneable = Self;
     type CloneableOwned = Self;
 
@@ -76,7 +79,7 @@ impl AttributeValue for Nonce {
     }
 
     fn to_html(self, key: &str, buf: &mut String) {
-        <Arc<str> as AttributeValue>::to_html(self.0, key, buf)
+        <Arc<str> as AttributeValue<R>>::to_html(self.0, key, buf)
     }
 
     fn to_template(_key: &str, _buf: &mut String) {}
@@ -84,21 +87,17 @@ impl AttributeValue for Nonce {
     fn hydrate<const FROM_SERVER: bool>(
         self,
         key: &str,
-        el: &tachys::renderer::types::Element,
+        el: &<R as Renderer>::Element,
     ) -> Self::State {
-        <Arc<str> as AttributeValue>::hydrate::<FROM_SERVER>(self.0, key, el)
+        <Arc<str> as AttributeValue<R>>::hydrate::<FROM_SERVER>(self.0, key, el)
     }
 
-    fn build(
-        self,
-        el: &tachys::renderer::types::Element,
-        key: &str,
-    ) -> Self::State {
-        <Arc<str> as AttributeValue>::build(self.0, el, key)
+    fn build(self, el: &<R as Renderer>::Element, key: &str) -> Self::State {
+        <Arc<str> as AttributeValue<R>>::build(self.0, el, key)
     }
 
     fn rebuild(self, key: &str, state: &mut Self::State) {
-        <Arc<str> as AttributeValue>::rebuild(self.0, key, state)
+        <Arc<str> as AttributeValue<R>>::rebuild(self.0, key, state)
     }
 
     fn into_cloneable(self) -> Self::Cloneable {

leptos/src/portal.rs

@@ -1,7 +1,7 @@
 use crate::{children::TypedChildrenFn, mount, IntoView};
 use leptos_dom::helpers::document;
 use leptos_macro::component;
-use reactive_graph::{effect::Effect, graph::untrack, owner::Owner};
+use reactive_graph::{effect::Effect, owner::Owner, untrack};
 use std::sync::Arc;
 
 /// Renders components somewhere else in the DOM.

leptos/src/suspense_component.rs

@@ -21,6 +21,7 @@ use tachys::{
     html::attribute::Attribute,
     hydration::Cursor,
     reactive_graph::{OwnedView, OwnedViewState},
+    renderer::Renderer,
     ssr::StreamBuilder,
     view::{
         add_attr::AddAnyAttr,
@@ -134,14 +135,15 @@ pub(crate) struct SuspenseBoundary<const TRANSITION: bool, Fal, Chil> {
     pub children: Chil,
 }
 
-impl<const TRANSITION: bool, Fal, Chil> Render
+impl<const TRANSITION: bool, Fal, Chil, Rndr> Render<Rndr>
     for SuspenseBoundary<TRANSITION, Fal, Chil>
 where
-    Fal: Render + Send + 'static,
-    Chil: Render + Send + 'static,
+    Fal: Render<Rndr> + Send + 'static,
+    Chil: Render<Rndr> + Send + 'static,
+    Rndr: Renderer + 'static,
 {
     type State = RenderEffect<
-        OwnedViewState<EitherKeepAliveState<Chil::State, Fal::State>>,
+        OwnedViewState<EitherKeepAliveState<Chil::State, Fal::State>, Rndr>,
     >;
 
     fn build(self) -> Self::State {
@@ -185,24 +187,25 @@ where
     }
 }
 
-impl<const TRANSITION: bool, Fal, Chil> AddAnyAttr
+impl<const TRANSITION: bool, Fal, Chil, Rndr> AddAnyAttr<Rndr>
     for SuspenseBoundary<TRANSITION, Fal, Chil>
 where
-    Fal: RenderHtml + Send + 'static,
-    Chil: RenderHtml + Send + 'static,
+    Fal: RenderHtml<Rndr> + Send + 'static,
+    Chil: RenderHtml<Rndr> + Send + 'static,
+    Rndr: Renderer + 'static,
 {
-    type Output<SomeNewAttr: Attribute> = SuspenseBoundary<
+    type Output<SomeNewAttr: Attribute<Rndr>> = SuspenseBoundary<
         TRANSITION,
         Fal,
         Chil::Output<SomeNewAttr::CloneableOwned>,
     >;
 
-    fn add_any_attr<NewAttr: Attribute>(
+    fn add_any_attr<NewAttr: Attribute<Rndr>>(
         self,
         attr: NewAttr,
     ) -> Self::Output<NewAttr>
     where
-        Self::Output<NewAttr>: RenderHtml,
+        Self::Output<NewAttr>: RenderHtml<Rndr>,
     {
         let attr = attr.into_cloneable_owned();
         let SuspenseBoundary {
@@ -220,11 +223,12 @@ where
     }
 }
 
-impl<const TRANSITION: bool, Fal, Chil> RenderHtml
+impl<const TRANSITION: bool, Fal, Chil, Rndr> RenderHtml<Rndr>
     for SuspenseBoundary<TRANSITION, Fal, Chil>
 where
-    Fal: RenderHtml + Send + 'static,
-    Chil: RenderHtml + Send + 'static,
+    Fal: RenderHtml<Rndr> + Send + 'static,
+    Chil: RenderHtml<Rndr> + Send + 'static,
+    Rndr: Renderer + 'static,
 {
     // i.e., if this is the child of another Suspense during SSR, don't wait for it: it will handle
     // itself
@@ -401,7 +405,7 @@ where
 
     fn hydrate<const FROM_SERVER: bool>(
         self,
-        cursor: &Cursor,
+        cursor: &Cursor<Rndr>,
         position: &PositionState,
     ) -> Self::State {
         let cursor = cursor.to_owned();
@@ -451,9 +455,10 @@ impl<T> Unsuspend<T> {
     }
 }
 
-impl<T> Render for Unsuspend<T>
+impl<T, Rndr> Render<Rndr> for Unsuspend<T>
 where
-    T: Render,
+    T: Render<Rndr>,
+    Rndr: Renderer,
 {
     type State = T::State;
 
@@ -466,28 +471,30 @@ where
     }
 }
 
-impl<T> AddAnyAttr for Unsuspend<T>
+impl<T, Rndr> AddAnyAttr<Rndr> for Unsuspend<T>
 where
-    T: AddAnyAttr + 'static,
+    T: AddAnyAttr<Rndr> + 'static,
+    Rndr: Renderer,
 {
-    type Output<SomeNewAttr: Attribute> =
+    type Output<SomeNewAttr: Attribute<Rndr>> =
         Unsuspend<T::Output<SomeNewAttr::CloneableOwned>>;
 
-    fn add_any_attr<NewAttr: Attribute>(
+    fn add_any_attr<NewAttr: Attribute<Rndr>>(
         self,
         attr: NewAttr,
     ) -> Self::Output<NewAttr>
     where
-        Self::Output<NewAttr>: RenderHtml,
+        Self::Output<NewAttr>: RenderHtml<Rndr>,
     {
         let attr = attr.into_cloneable_owned();
         Unsuspend::new(move || (self.0)().add_any_attr(attr))
     }
 }
 
-impl<T> RenderHtml for Unsuspend<T>
+impl<T, Rndr> RenderHtml<Rndr> for Unsuspend<T>
 where
-    T: RenderHtml + 'static,
+    T: RenderHtml<Rndr> + 'static,
+    Rndr: Renderer,
 {
     type AsyncOutput = Self;
 
@@ -528,7 +535,7 @@ where
 
     fn hydrate<const FROM_SERVER: bool>(
         self,
-        cursor: &Cursor,
+        cursor: &Cursor<Rndr>,
         position: &PositionState,
     ) -> Self::State {
         (self.0)().hydrate::<FROM_SERVER>(cursor, position)

leptos/tests/ssr.rs

@@ -5,7 +5,7 @@ fn simple_ssr_test() {
     use leptos::prelude::*;
 
     let (value, set_value) = signal(0);
-    let rendered: View<HtmlElement<_, _, _>> = view! {
+    let rendered: View<HtmlElement<_, _, _, Dom>> = view! {
         <div>
             <button on:click=move |_| set_value.update(|value| *value -= 1)>"-1"</button>
             <span>"Value: " {move || value.get().to_string()} "!"</span>
@@ -36,7 +36,7 @@ fn ssr_test_with_components() {
         }
     }
 
-    let rendered: View<HtmlElement<_, _, _>> = view! {
+    let rendered: View<HtmlElement<_, _, _, Dom>> = view! {
         <div class="counters">
             <Counter initial_value=1/>
             <Counter initial_value=2/>
@@ -66,7 +66,7 @@ fn ssr_test_with_snake_case_components() {
             </div>
         }
     }
-    let rendered: View<HtmlElement<_, _, _>> = view! {
+    let rendered: View<HtmlElement<_, _, _, Dom>> = view! {
         <div class="counters">
             <SnakeCaseCounter initial_value=1/>
             <SnakeCaseCounter initial_value=2/>
@@ -86,7 +86,7 @@ fn test_classes() {
     use leptos::prelude::*;
 
     let (value, _set_value) = signal(5);
-    let rendered: View<HtmlElement<_, _, _>> = view! {
+    let rendered: View<HtmlElement<_, _, _, Dom>> = view! {
         <div
             class="my big"
             class:a=move || { value.get() > 10 }
@@ -104,7 +104,7 @@ fn ssr_with_styles() {
 
     let (_, set_value) = signal(0);
     let styles = "myclass";
-    let rendered: View<HtmlElement<_, _, _>> = view! { class=styles,
+    let rendered: View<HtmlElement<_, _, _, Dom>> = view! { class=styles,
         <div>
             <button class="btn" on:click=move |_| set_value.update(|value| *value -= 1)>
                 "-1"
@@ -124,7 +124,7 @@ fn ssr_option() {
     use leptos::prelude::*;
 
     let (_, _) = signal(0);
-    let rendered: View<HtmlElement<_, _, _>> = view! { <option></option> };
+    let rendered: View<HtmlElement<_, _, _, Dom>> = view! { <option></option> };
 
     assert_eq!(rendered.to_html(), "<option></option>");
 }

leptos_macro/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "leptos_macro"
-version = "0.7.0-gamma"
+version = "0.7.0-beta6"
 authors = ["Greg Johnston"]
 license = "MIT"
 repository = "https://github.com/leptos-rs/leptos"

leptos_macro/src/component.rs

@@ -255,7 +255,7 @@ impl ToTokens for Model {
         let body_name = unmodified_fn_name_from_fn_name(&body_name);
         let body_expr = if is_island {
             quote! {
-                ::leptos::reactive::owner::Owner::with_hydration(move || {
+                ::leptos::reactive_graph::owner::Owner::with_hydration(move || {
                     #body_name(#prop_names)
                 })
             }
@@ -266,7 +266,7 @@ impl ToTokens for Model {
         };
 
         let component = quote! {
-            ::leptos::prelude::untrack(
+            ::leptos::reactive_graph::untrack(
                 move || {
                     #tracing_guard_expr
                     #tracing_props_expr
@@ -280,7 +280,7 @@ impl ToTokens for Model {
             let hydrate_fn_name = hydrate_fn_name.as_ref().unwrap();
             quote! {
                 {
-                    if ::leptos::reactive::owner::Owner::current_shared_context()
+                    if ::leptos::reactive_graph::owner::Owner::current_shared_context()
                         .map(|sc| sc.get_is_hydrating())
                         .unwrap_or(false) {
                         ::leptos::either::Either::Left(
@@ -316,9 +316,9 @@ impl ToTokens for Model {
                 quote! {
                     use leptos::tachys::view::any_view::IntoAny;
                     let children = Box::new(|| {
-                        let sc = ::leptos::reactive::owner::Owner::current_shared_context().unwrap();
+                        let sc = ::leptos::reactive_graph::owner::Owner::current_shared_context().unwrap();
                         let prev = sc.get_is_hydrating();
-                        let value = ::leptos::reactive::owner::Owner::with_no_hydration(||
+                        let value = ::leptos::reactive_graph::owner::Owner::with_no_hydration(||
                             ::leptos::tachys::html::islands::IslandChildren::new(children()).into_any()
                         );
                         sc.set_is_hydrating(prev);

leptos_macro/src/memo.rs

@@ -40,9 +40,9 @@ impl ToTokens for MemoMacroInput {
         let path = &self.path;
 
         tokens.extend(quote! {
-            ::leptos::reactive::computed::Memo::new(
+            ::leptos::reactive_graph::computed::Memo::new(
                 move |_| {
-                    use ::leptos::reactive::traits::With;
+                    use ::leptos::reactive_graph::traits::With;
                     #root.with(|st: _| st.#path.clone())
                 }
             )

leptos_macro/src/slice.rs

@@ -40,7 +40,7 @@ impl ToTokens for SliceMacroInput {
         let path = &self.path;
 
         tokens.extend(quote! {
-            ::leptos::reactive::computed::create_slice(
+            ::leptos::reactive_graph::computed::create_slice(
                 #root,
                 |st: &_| st.#path.clone(),
                 |st: &mut _, n| st.#path = n

leptos_macro/src/view/component_builder.rs

@@ -1,5 +1,5 @@
 use super::{fragment_to_tokens, TagType};
-use crate::view::{attribute_absolute, utils::filter_prefixed_attrs};
+use crate::view::attribute_absolute;
 use proc_macro2::{Ident, TokenStream, TokenTree};
 use quote::{format_ident, quote, quote_spanned};
 use rstml::node::{
@@ -105,13 +105,20 @@ pub(crate) fn component_to_tokens(
                     return None;
                 }
             };
-
             let inputs = &binding.inputs;
             Some(quote! { #inputs })
         })
         .collect::<Vec<_>>();
 
-    let items_to_clone = filter_prefixed_attrs(attrs.iter(), "clone:");
+    let items_to_clone = attrs
+        .iter()
+        .filter_map(|attr| {
+            attr.key
+                .to_string()
+                .strip_prefix("clone:")
+                .map(|ident| format_ident!("{ident}", span = attr.key.span()))
+        })
+        .collect::<Vec<_>>();
 
     // include all attribute that are either
     // 1) blocks ({..attrs} or {attrs}),

leptos_macro/src/view/mod.rs

@@ -1,19 +1,14 @@
 mod component_builder;
 mod slot_helper;
-mod utils;
-
 use self::{
     component_builder::component_to_tokens,
     slot_helper::{get_slot, slot_to_tokens},
 };
-use convert_case::{
-    Case::{Snake, UpperCamel},
-    Casing,
-};
+use convert_case::{Case::Snake, Casing};
 use leptos_hot_reload::parsing::{is_component_node, value_to_string};
 use proc_macro2::{Ident, Span, TokenStream, TokenTree};
 use proc_macro_error2::abort;
-use quote::{format_ident, quote, quote_spanned, ToTokens};
+use quote::{quote, quote_spanned, ToTokens};
 use rstml::node::{
     CustomNode, KVAttributeValue, KeyedAttribute, Node, NodeAttribute,
     NodeBlock, NodeElement, NodeName, NodeNameFragment,
@@ -307,12 +302,10 @@ fn inert_element_to_tokens(
                 match current {
                     Node::RawText(raw) => {
                         let text = raw.to_string_best();
-                        let text = html_escape::encode_text(&text);
                         html.push_str(&text);
                     }
                     Node::Text(text) => {
                         let text = text.value_string();
-                        let text = html_escape::encode_text(&text);
                         html.push_str(&text);
                     }
                     Node::Element(node) => {
@@ -326,12 +319,9 @@ fn inert_element_to_tokens(
                         for attr in node.attributes() {
                             if let NodeAttribute::Attribute(attr) = attr {
                                 let attr_name = attr.key.to_string();
-                                // trim r# from raw identifiers like r#as
-                                let attr_name =
-                                    attr_name.trim_start_matches("r#");
                                 if attr_name != "class" {
                                     html.push(' ');
-                                    html.push_str(attr_name);
+                                    html.push_str(&attr_name);
                                 }
 
                                 if let Some(value) =
@@ -342,13 +332,11 @@ fn inert_element_to_tokens(
                                     )) = &value.value
                                     {
                                         if let Lit::Str(txt) = &lit.lit {
-                                            let value = txt.value();
-                                            let value = html_escape::encode_double_quoted_attribute(&value);
                                             if attr_name == "class" {
-                                                html.push_class(&value);
+                                                html.push_class(&txt.value());
                                             } else {
                                                 html.push_str("=\"");
-                                                html.push_str(&value);
+                                                html.push_str(&txt.value());
                                                 html.push('"');
                                             }
                                         }
@@ -548,9 +536,7 @@ fn node_to_tokens(
             view_marker,
             disable_inert_html,
         ),
-        Node::Block(block) => {
-            Some(quote! { ::leptos::prelude::IntoRender::into_render(#block) })
-        }
+        Node::Block(block) => Some(quote! { #block }),
         Node::Text(text) => Some(text_to_tokens(&text.value)),
         Node::RawText(raw) => {
             let text = raw.to_string_best();
@@ -727,11 +713,6 @@ pub(crate) fn element_to_tokens(
             quote! { ::leptos::tachys::html::element::#custom(#name) }
         } else if is_svg_element(&tag) {
             parent_type = TagType::Svg;
-            let name = if tag == "use" || tag == "use_" {
-                Ident::new_raw("use", name.span()).to_token_stream()
-            } else {
-                name.to_token_stream()
-            };
             quote! { ::leptos::tachys::svg::#name() }
         } else if is_math_ml_element(&tag) {
             parent_type = TagType::Math;
@@ -885,7 +866,7 @@ fn attribute_to_tokens(
                     NodeName::Path(path) => path.path.get_ident(),
                     _ => unreachable!(),
                 };
-                let value = attribute_value(node, false);
+                let value = attribute_value(node);
                 quote! {
                     .#node_ref(#value)
                 }
@@ -893,8 +874,6 @@ fn attribute_to_tokens(
                 directive_call_from_attribute_node(node, name)
             } else if let Some(name) = name.strip_prefix("on:") {
                 event_to_tokens(name, node)
-            } else if let Some(name) = name.strip_prefix("bind:") {
-                two_way_binding_to_tokens(name, node)
             } else if let Some(name) = name.strip_prefix("class:") {
                 let class = match &node.key {
                     NodeName::Punctuated(parts) => &parts[0],
@@ -935,13 +914,13 @@ fn attribute_to_tokens(
                 // we don't provide statically-checked methods for SVG attributes
                 || (tag_type == TagType::Svg && name != "inner_html")
             {
-                let value = attribute_value(node, true);
+                let value = attribute_value(node);
                 quote! {
                     .attr(#name, #value)
                 }
             } else {
                 let key = attribute_name(&node.key);
-                let value = attribute_value(node, true);
+                let value = attribute_value(node);
 
                 // special case of global_class and class attribute
                 if &node.key.to_string() == "class"
@@ -978,11 +957,11 @@ pub(crate) fn attribute_absolute(
                 let id = &parts[0];
                 match id {
                     NodeNameFragment::Ident(id) => {
+                        let value = attribute_value(node);
                         // ignore `let:` and `clone:`
                         if id == "let" || id == "clone" {
                             None
                         } else if id == "attr" {
-                        let value = attribute_value(node, true);
                             let key = &parts[1];
                             let key_name = key.to_string();
                             if key_name == "class" || key_name == "style" {
@@ -990,7 +969,6 @@ pub(crate) fn attribute_absolute(
                                     quote! { ::leptos::tachys::html::#key::#key(#value) },
                                 )
                             } else if key_name == "aria" {
-                                let value = attribute_value(node, true);
                                 let mut parts_iter = parts.iter();
                                 parts_iter.next();
                                 let fn_name = parts_iter.map(|p| p.to_string()).collect::<Vec<String>>().join("_");
@@ -1019,7 +997,6 @@ pub(crate) fn attribute_absolute(
                                 },
                             )
                         } else if id == "style" || id == "class" {
-                            let value = attribute_value(node, false);
                             let key = &node.key.to_string();
                             let key = key
                                 .replacen("style:", "", 1)
@@ -1028,7 +1005,6 @@ pub(crate) fn attribute_absolute(
                                 quote! { ::leptos::tachys::html::#id::#id((#key, #value)) },
                             )
                         } else if id == "prop" {
-                            let value = attribute_value(node, false);
                             let key = &node.key.to_string();
                             let key = key.replacen("prop:", "", 1);
                             Some(
@@ -1081,20 +1057,6 @@ pub(crate) fn attribute_absolute(
     }
 }
 
-pub(crate) fn two_way_binding_to_tokens(
-    name: &str,
-    node: &KeyedAttribute,
-) -> TokenStream {
-    let value = attribute_value(node, false);
-
-    let ident =
-        format_ident!("{}", name.to_case(UpperCamel), span = node.key.span());
-
-    quote! {
-        .bind(::leptos::attr::#ident, #value)
-    }
-}
-
 pub(crate) fn event_to_tokens(
     name: &str,
     node: &KeyedAttribute,
@@ -1110,7 +1072,7 @@ pub(crate) fn event_type_and_handler(
     name: &str,
     node: &KeyedAttribute,
 ) -> (TokenStream, TokenStream, TokenStream) {
-    let handler = attribute_value(node, false);
+    let handler = attribute_value(node);
 
     let (event_type, is_custom, is_force_undelegated, is_targeted) =
         parse_event_name(name);
@@ -1167,7 +1129,7 @@ fn class_to_tokens(
     class: TokenStream,
     class_name: Option<&str>,
 ) -> TokenStream {
-    let value = attribute_value(node, false);
+    let value = attribute_value(node);
     if let Some(class_name) = class_name {
         quote! {
             .#class((#class_name, #value))
@@ -1184,7 +1146,7 @@ fn style_to_tokens(
     style: TokenStream,
     style_name: Option<&str>,
 ) -> TokenStream {
-    let value = attribute_value(node, false);
+    let value = attribute_value(node);
     if let Some(style_name) = style_name {
         quote! {
             .#style((#style_name, #value))
@@ -1201,7 +1163,7 @@ fn prop_to_tokens(
     prop: TokenStream,
     key: &str,
 ) -> TokenStream {
-    let value = attribute_value(node, false);
+    let value = attribute_value(node);
     quote! {
         .#prop(#key, #value)
     }
@@ -1358,10 +1320,7 @@ fn attribute_name(name: &NodeName) -> TokenStream {
     }
 }
 
-fn attribute_value(
-    attr: &KeyedAttribute,
-    is_attribute_proper: bool,
-) -> TokenStream {
+fn attribute_value(attr: &KeyedAttribute) -> TokenStream {
     match attr.possible_value.to_value() {
         None => quote! { true },
         Some(value) => match &value.value {
@@ -1376,26 +1335,14 @@ fn attribute_value(
                     }
                 }
 
-                if matches!(expr, Expr::Lit(_)) || !is_attribute_proper {
-                    quote! {
-                        #expr
-                    }
-                } else {
-                    quote! {
-                        ::leptos::prelude::IntoAttributeValue::into_attribute_value(#expr)
-                    }
+                quote! {
+                    {#expr}
                 }
             }
             // any value in braces: expand as-is to give proper r-a support
             KVAttributeValue::InvalidBraced(block) => {
-                if is_attribute_proper {
-                    quote! {
-                        ::leptos::prelude::IntoAttributeValue::into_attribute_value(#block)
-                    }
-                } else {
-                    quote! {
-                        #block
-                    }
+                quote! {
+                    #block
                 }
             }
         },

leptos_macro/src/view/slot_helper.rs

@@ -1,7 +1,7 @@
 use super::{convert_to_snake_case, ident_from_tag_name};
-use crate::view::{fragment_to_tokens, utils::filter_prefixed_attrs, TagType};
+use crate::view::{fragment_to_tokens, TagType};
 use proc_macro2::{Ident, TokenStream, TokenTree};
-use quote::{quote, quote_spanned};
+use quote::{format_ident, quote, quote_spanned};
 use rstml::node::{CustomNode, KeyedAttribute, NodeAttribute, NodeElement};
 use std::collections::HashMap;
 use syn::spanned::Spanned;
@@ -70,9 +70,25 @@ pub(crate) fn slot_to_tokens(
             }
         });
 
-    let items_to_bind = filter_prefixed_attrs(attrs.iter(), "let:");
+    let items_to_bind = attrs
+        .iter()
+        .filter_map(|attr| {
+            attr.key
+                .to_string()
+                .strip_prefix("let:")
+                .map(|ident| format_ident!("{ident}", span = attr.key.span()))
+        })
+        .collect::<Vec<_>>();
 
-    let items_to_clone = filter_prefixed_attrs(attrs.iter(), "clone:");
+    let items_to_clone = attrs
+        .iter()
+        .filter_map(|attr| {
+            attr.key
+                .to_string()
+                .strip_prefix("clone:")
+                .map(|ident| format_ident!("{ident}", span = attr.key.span()))
+        })
+        .collect::<Vec<_>>();
 
     let dyn_attrs = attrs
         .iter()

leptos_macro/src/view/utils.rs

@@ -1,19 +0,0 @@
-use proc_macro2::Ident;
-use quote::format_ident;
-use rstml::node::KeyedAttribute;
-use syn::spanned::Spanned;
-
-pub fn filter_prefixed_attrs<'a, A>(attrs: A, prefix: &str) -> Vec<Ident>
-where
-    A: IntoIterator<Item = &'a KeyedAttribute> + Clone,
-{
-    attrs
-        .into_iter()
-        .filter_map(|attr| {
-            attr.key
-                .to_string()
-                .strip_prefix(prefix)
-                .map(|ident| format_ident!("{ident}", span = attr.key.span()))
-        })
-        .collect()
-}

leptos_server/Cargo.toml

@@ -19,7 +19,6 @@ tracing = { version = "0.1.40", optional = true }
 futures = "0.3.30"
 
 any_spawner = { workspace = true }
-or_poisoned = { workspace = true }
 tachys = { workspace = true, optional = true, features = ["reactive_graph"] }
 send_wrapper = "0.6"
 

leptos_server/src/lib.rs

@@ -8,8 +8,6 @@ mod local_resource;
 pub use local_resource::*;
 mod multi_action;
 pub use multi_action::*;
-mod once_resource;
-pub use once_resource::*;
 mod resource;
 pub use resource::*;
 mod shared;
@@ -190,18 +188,20 @@ mod view_implementations {
         html::attribute::Attribute,
         hydration::Cursor,
         reactive_graph::{RenderEffectState, Suspend, SuspendState},
+        renderer::Renderer,
         ssr::StreamBuilder,
         view::{
             add_attr::AddAnyAttr, Position, PositionState, Render, RenderHtml,
         },
     };
 
-    impl<T, Ser> Render for Resource<T, Ser>
+    impl<T, R, Ser> Render<R> for Resource<T, Ser>
     where
-        T: Render + Send + Sync + Clone,
+        T: Render<R> + Send + Sync + Clone,
         Ser: Send + 'static,
+        R: Renderer,
     {
-        type State = RenderEffectState<SuspendState<T>>;
+        type State = RenderEffectState<SuspendState<T, R>>;
 
         fn build(self) -> Self::State {
             (move || Suspend::new(async move { self.await })).build()
@@ -212,18 +212,19 @@ mod view_implementations {
         }
     }
 
-    impl<T, Ser> AddAnyAttr for Resource<T, Ser>
+    impl<T, R, Ser> AddAnyAttr<R> for Resource<T, Ser>
     where
-        T: RenderHtml + Send + Sync + Clone,
+        T: RenderHtml<R> + Send + Sync + Clone,
         Ser: Send + 'static,
+        R: Renderer,
     {
-        type Output<SomeNewAttr: Attribute> = Box<
+        type Output<SomeNewAttr: Attribute<R>> = Box<
             dyn FnMut() -> Suspend<
                     Pin<
                         Box<
                             dyn Future<
-                                    Output = <T as AddAnyAttr>::Output<
-                                        <SomeNewAttr::CloneableOwned as Attribute>::CloneableOwned,
+                                    Output = <T as AddAnyAttr<R>>::Output<
+                                        <SomeNewAttr::CloneableOwned as Attribute<R>>::CloneableOwned,
                                     >,
                                 > + Send,
                         >,
@@ -231,21 +232,22 @@ mod view_implementations {
                 > + Send,
         >;
 
-        fn add_any_attr<NewAttr: Attribute>(
+        fn add_any_attr<NewAttr: Attribute<R>>(
             self,
             attr: NewAttr,
         ) -> Self::Output<NewAttr>
         where
-            Self::Output<NewAttr>: RenderHtml,
+            Self::Output<NewAttr>: RenderHtml<R>,
         {
             (move || Suspend::new(async move { self.await })).add_any_attr(attr)
         }
     }
 
-    impl<T, Ser> RenderHtml for Resource<T, Ser>
+    impl<T, R, Ser> RenderHtml<R> for Resource<T, Ser>
     where
-        T: RenderHtml + Send + Sync + Clone,
+        T: RenderHtml<R> + Send + Sync + Clone,
         Ser: Send + 'static,
+        R: Renderer,
     {
         type AsyncOutput = Option<T>;
 
@@ -294,7 +296,7 @@ mod view_implementations {
 
         fn hydrate<const FROM_SERVER: bool>(
             self,
-            cursor: &Cursor,
+            cursor: &Cursor<R>,
             position: &PositionState,
         ) -> Self::State {
             (move || Suspend::new(async move { self.await }))

leptos_server/src/local_resource.rs

@@ -35,10 +35,10 @@ impl<T> Clone for ArcLocalResource<T> {
 
 impl<T> ArcLocalResource<T> {
     #[track_caller]
-    pub fn new<Fut>(fetcher: impl Fn() -> Fut + 'static) -> Self
+    pub fn new<Fut>(fetcher: impl Fn() -> Fut + Send + Sync + 'static) -> Self
     where
-        T: 'static,
-        Fut: Future<Output = T> + 'static,
+        T: Send + Sync + 'static,
+        Fut: Future<Output = T> + Send + 'static,
     {
         let fetcher = move || {
             let fut = fetcher();
@@ -60,7 +60,7 @@ impl<T> ArcLocalResource<T> {
             }
         };
         Self {
-            data: ArcAsyncDerived::new_unsync(fetcher),
+            data: ArcAsyncDerived::new(fetcher),
             #[cfg(debug_assertions)]
             defined_at: Location::caller(),
         }
@@ -103,7 +103,7 @@ impl<T> DefinedAt for ArcLocalResource<T> {
 
 impl<T> ReadUntracked for ArcLocalResource<T>
 where
-    T: 'static,
+    T: Send + Sync + 'static,
 {
     type Value = ReadGuard<Option<T>, AsyncPlain<Option<T>>>;
 
@@ -201,7 +201,7 @@ impl<T> LocalResource<T> {
     pub fn new<Fut>(fetcher: impl Fn() -> Fut + 'static) -> Self
     where
         T: 'static,
-        Fut: Future<Output = T> + 'static,
+        Fut: Future<Output = T> + Send + 'static,
     {
         let fetcher = move || {
             let fut = fetcher();
@@ -230,7 +230,7 @@ impl<T> LocalResource<T> {
                 let fetcher = SendWrapper::new(fetcher);
                 AsyncDerived::new(move || {
                     let fut = fetcher();
-                    SendWrapper::new(async move { SendWrapper::new(fut.await) })
+                    async move { SendWrapper::new(fut.await) }
                 })
             },
             #[cfg(debug_assertions)]
@@ -280,7 +280,7 @@ impl<T> DefinedAt for LocalResource<T> {
 
 impl<T> ReadUntracked for LocalResource<T>
 where
-    T: 'static,
+    T: Send + Sync + 'static,
 {
     type Value =
         ReadGuard<Option<SendWrapper<T>>, AsyncPlain<Option<SendWrapper<T>>>>;
@@ -307,7 +307,7 @@ impl<T: 'static> IsDisposed for LocalResource<T> {
 
 impl<T: 'static> ToAnySource for LocalResource<T>
 where
-    T: 'static,
+    T: Send + Sync + 'static,
 {
     fn to_any_source(&self) -> AnySource {
         self.data.to_any_source()
@@ -316,7 +316,7 @@ where
 
 impl<T: 'static> ToAnySubscriber for LocalResource<T>
 where
-    T: 'static,
+    T: Send + Sync + 'static,
 {
     fn to_any_subscriber(&self) -> AnySubscriber {
         self.data.to_any_subscriber()
@@ -325,7 +325,7 @@ where
 
 impl<T> Source for LocalResource<T>
 where
-    T: 'static,
+    T: Send + Sync + 'static,
 {
     fn add_subscriber(&self, subscriber: AnySubscriber) {
         self.data.add_subscriber(subscriber)
@@ -342,7 +342,7 @@ where
 
 impl<T> ReactiveNode for LocalResource<T>
 where
-    T: 'static,
+    T: Send + Sync + 'static,
 {
     fn mark_dirty(&self) {
         self.data.mark_dirty();
@@ -363,7 +363,7 @@ where
 
 impl<T> Subscriber for LocalResource<T>
 where
-    T: 'static,
+    T: Send + Sync + 'static,
 {
     fn add_source(&self, source: AnySource) {
         self.data.add_source(source);

leptos_server/src/once_resource.rs

@@ -1,700 +0,0 @@
-use crate::{
-    initial_value, FromEncodedStr, IntoEncodedString,
-    IS_SUPPRESSING_RESOURCE_LOAD,
-};
-#[cfg(feature = "rkyv")]
-use codee::binary::RkyvCodec;
-#[cfg(feature = "serde-wasm-bindgen")]
-use codee::string::JsonSerdeWasmCodec;
-#[cfg(feature = "miniserde")]
-use codee::string::MiniserdeCodec;
-#[cfg(feature = "serde-lite")]
-use codee::SerdeLite;
-use codee::{
-    string::{FromToStringCodec, JsonSerdeCodec},
-    Decoder, Encoder,
-};
-use core::{fmt::Debug, marker::PhantomData};
-use futures::Future;
-use or_poisoned::OrPoisoned;
-use reactive_graph::{
-    computed::{
-        suspense::SuspenseContext, AsyncDerivedReadyFuture, ScopedFuture,
-    },
-    diagnostics::{SpecialNonReactiveFuture, SpecialNonReactiveZone},
-    graph::{AnySource, ToAnySource},
-    owner::{use_context, ArenaItem, Owner},
-    prelude::*,
-    signal::{
-        guards::{Plain, ReadGuard},
-        ArcTrigger,
-    },
-    unwrap_signal,
-};
-use std::{
-    future::IntoFuture,
-    mem,
-    panic::Location,
-    pin::Pin,
-    sync::{
-        atomic::{AtomicBool, Ordering},
-        Arc, RwLock,
-    },
-    task::{Context, Poll, Waker},
-};
-
-#[derive(Debug)]
-pub struct ArcOnceResource<T, Ser = JsonSerdeCodec> {
-    trigger: ArcTrigger,
-    value: Arc<RwLock<Option<T>>>,
-    wakers: Arc<RwLock<Vec<Waker>>>,
-    suspenses: Arc<RwLock<Vec<SuspenseContext>>>,
-    loading: Arc<AtomicBool>,
-    ser: PhantomData<fn() -> Ser>,
-    #[cfg(debug_assertions)]
-    defined_at: &'static Location<'static>,
-}
-
-impl<T, Ser> Clone for ArcOnceResource<T, Ser> {
-    fn clone(&self) -> Self {
-        Self {
-            trigger: self.trigger.clone(),
-            value: self.value.clone(),
-            wakers: self.wakers.clone(),
-            suspenses: self.suspenses.clone(),
-            loading: self.loading.clone(),
-            ser: self.ser,
-            #[cfg(debug_assertions)]
-            defined_at: self.defined_at,
-        }
-    }
-}
-
-impl<T, Ser> ArcOnceResource<T, Ser>
-where
-    T: Send + Sync + 'static,
-    Ser: Encoder<T> + Decoder<T>,
-    <Ser as Encoder<T>>::Error: Debug,
-    <Ser as Decoder<T>>::Error: Debug,
-    <<Ser as Decoder<T>>::Encoded as FromEncodedStr>::DecodingError: Debug,
-    <Ser as Encoder<T>>::Encoded: IntoEncodedString,
-    <Ser as Decoder<T>>::Encoded: FromEncodedStr,
-{
-    #[track_caller]
-    pub fn new_with_options(
-        fut: impl Future<Output = T> + Send + 'static,
-        #[allow(unused)] // this is used with `feature = "ssr"`
-        blocking: bool,
-    ) -> Self {
-        let shared_context = Owner::current_shared_context();
-        let id = shared_context
-            .as_ref()
-            .map(|sc| sc.next_id())
-            .unwrap_or_default();
-
-        let initial = initial_value::<T, Ser>(&id, shared_context.as_ref());
-        let is_ready = initial.is_some();
-        let value = Arc::new(RwLock::new(initial));
-        let wakers = Arc::new(RwLock::new(Vec::<Waker>::new()));
-        let suspenses = Arc::new(RwLock::new(Vec::<SuspenseContext>::new()));
-        let loading = Arc::new(AtomicBool::new(!is_ready));
-        let trigger = ArcTrigger::new();
-
-        let fut = ScopedFuture::new(fut);
-
-        if !is_ready && !IS_SUPPRESSING_RESOURCE_LOAD.load(Ordering::Relaxed) {
-            let value = Arc::clone(&value);
-            let wakers = Arc::clone(&wakers);
-            let loading = Arc::clone(&loading);
-            let trigger = trigger.clone();
-            reactive_graph::spawn(async move {
-                let loaded = fut.await;
-                *value.write().or_poisoned() = Some(loaded);
-                loading.store(false, Ordering::Relaxed);
-                for waker in mem::take(&mut *wakers.write().or_poisoned()) {
-                    waker.wake();
-                }
-                trigger.notify();
-            });
-        }
-
-        let data = Self {
-            trigger,
-            value: value.clone(),
-            loading,
-            wakers,
-            suspenses,
-            ser: PhantomData,
-            #[cfg(debug_assertions)]
-            defined_at: Location::caller(),
-        };
-
-        #[cfg(feature = "ssr")]
-        if let Some(shared_context) = shared_context {
-            let value = Arc::clone(&value);
-            let ready_fut = data.ready();
-
-            if blocking {
-                shared_context.defer_stream(Box::pin(data.ready()));
-            }
-
-            if shared_context.get_is_hydrating() {
-                shared_context.write_async(
-                    id,
-                    Box::pin(async move {
-                        ready_fut.await;
-                        let value = value.read().or_poisoned();
-                        let value = value.as_ref().unwrap();
-                        Ser::encode(value).unwrap().into_encoded_string()
-                    }),
-                );
-            }
-        }
-
-        data
-    }
-}
-
-impl<T, Ser> ArcOnceResource<T, Ser> {
-    /// Returns a `Future` that is ready when this resource has next finished loading.
-    pub fn ready(&self) -> AsyncDerivedReadyFuture {
-        AsyncDerivedReadyFuture::new(
-            self.to_any_source(),
-            &self.loading,
-            &self.wakers,
-        )
-    }
-}
-
-impl<T, Ser> DefinedAt for ArcOnceResource<T, Ser> {
-    fn defined_at(&self) -> Option<&'static Location<'static>> {
-        #[cfg(not(debug_assertions))]
-        {
-            None
-        }
-        #[cfg(debug_assertions)]
-        {
-            Some(self.defined_at)
-        }
-    }
-}
-
-impl<T, Ser> IsDisposed for ArcOnceResource<T, Ser> {
-    #[inline(always)]
-    fn is_disposed(&self) -> bool {
-        false
-    }
-}
-
-impl<T, Ser> ToAnySource for ArcOnceResource<T, Ser> {
-    fn to_any_source(&self) -> AnySource {
-        self.trigger.to_any_source()
-    }
-}
-
-impl<T, Ser> Track for ArcOnceResource<T, Ser> {
-    fn track(&self) {
-        self.trigger.track();
-    }
-}
-
-impl<T, Ser> ReadUntracked for ArcOnceResource<T, Ser>
-where
-    T: 'static,
-{
-    type Value = ReadGuard<Option<T>, Plain<Option<T>>>;
-
-    fn try_read_untracked(&self) -> Option<Self::Value> {
-        if let Some(suspense_context) = use_context::<SuspenseContext>() {
-            if self.value.read().or_poisoned().is_none() {
-                let handle = suspense_context.task_id();
-                let ready = SpecialNonReactiveFuture::new(self.ready());
-                reactive_graph::spawn(async move {
-                    ready.await;
-                    drop(handle);
-                });
-                self.suspenses.write().or_poisoned().push(suspense_context);
-            }
-        }
-        Plain::try_new(Arc::clone(&self.value)).map(ReadGuard::new)
-    }
-}
-
-impl<T, Ser> IntoFuture for ArcOnceResource<T, Ser>
-where
-    T: Clone + 'static,
-{
-    type Output = T;
-    type IntoFuture = OnceResourceFuture<T>;
-
-    fn into_future(self) -> Self::IntoFuture {
-        OnceResourceFuture {
-            source: self.to_any_source(),
-            value: Arc::clone(&self.value),
-            loading: Arc::clone(&self.loading),
-            wakers: Arc::clone(&self.wakers),
-            suspenses: Arc::clone(&self.suspenses),
-        }
-    }
-}
-
-/// A [`Future`] that is ready when an [`ArcAsyncDerived`] is finished loading or reloading,
-/// and contains its value. `.await`ing this clones the value `T`.
-pub struct OnceResourceFuture<T> {
-    source: AnySource,
-    value: Arc<RwLock<Option<T>>>,
-    loading: Arc<AtomicBool>,
-    wakers: Arc<RwLock<Vec<Waker>>>,
-    suspenses: Arc<RwLock<Vec<SuspenseContext>>>,
-}
-
-impl<T> Future for OnceResourceFuture<T>
-where
-    T: Clone + 'static,
-{
-    type Output = T;
-
-    #[track_caller]
-    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
-        #[cfg(debug_assertions)]
-        let _guard = SpecialNonReactiveZone::enter();
-        let waker = cx.waker();
-        self.source.track();
-
-        if let Some(suspense_context) = use_context::<SuspenseContext>() {
-            self.suspenses.write().or_poisoned().push(suspense_context);
-        }
-
-        if self.loading.load(Ordering::Relaxed) {
-            self.wakers.write().or_poisoned().push(waker.clone());
-            Poll::Pending
-        } else {
-            Poll::Ready(
-                self.value.read().or_poisoned().as_ref().unwrap().clone(),
-            )
-        }
-    }
-}
-
-impl<T> ArcOnceResource<T, JsonSerdeCodec>
-where
-    T: Send + Sync + 'static,
-    JsonSerdeCodec: Encoder<T> + Decoder<T>,
-    <JsonSerdeCodec as Encoder<T>>::Error: Debug,
-    <JsonSerdeCodec as Decoder<T>>::Error: Debug,
-    <<JsonSerdeCodec as Decoder<T>>::Encoded as FromEncodedStr>::DecodingError:
-        Debug,
-    <JsonSerdeCodec as Encoder<T>>::Encoded: IntoEncodedString,
-    <JsonSerdeCodec as Decoder<T>>::Encoded: FromEncodedStr,
-{
-    #[track_caller]
-    pub fn new(fut: impl Future<Output = T> + Send + 'static) -> Self {
-        ArcOnceResource::new_with_options(fut, false)
-    }
-
-    #[track_caller]
-    pub fn new_blocking(fut: impl Future<Output = T> + Send + 'static) -> Self {
-        ArcOnceResource::new_with_options(fut, true)
-    }
-}
-
-impl<T> ArcOnceResource<T, FromToStringCodec>
-where
-T: Send + Sync + 'static,
-    FromToStringCodec: Encoder<T> + Decoder<T>,
-    <FromToStringCodec as Encoder<T>>::Error: Debug, <FromToStringCodec as Decoder<T>>::Error: Debug,
-    <<FromToStringCodec as Decoder<T>>::Encoded as FromEncodedStr>::DecodingError: Debug,
-    <FromToStringCodec as Encoder<T>>::Encoded: IntoEncodedString,
-    <FromToStringCodec as Decoder<T>>::Encoded: FromEncodedStr,
-{
-    pub fn new_str(
-        fut: impl Future<Output = T> + Send + 'static
-    ) -> Self
-    {
-        ArcOnceResource::new_with_options(fut, false)
-    }
-
-    pub fn new_str_blocking(
-        fut: impl Future<Output = T> + Send + 'static
-    ) -> Self
-    {
-        ArcOnceResource::new_with_options(fut, true)
-    }
-}
-
-#[cfg(feature = "serde-wasm-bindgen")]
-impl<T> ArcOnceResource<T, JsonSerdeWasmCodec>
-where
-T: Send + Sync + 'static,
-    JsonSerdeWasmCodec: Encoder<T> + Decoder<T>,
-    <JsonSerdeWasmCodec as Encoder<T>>::Error: Debug, <JsonSerdeWasmCodec as Decoder<T>>::Error: Debug,
-    <<JsonSerdeWasmCodec as Decoder<T>>::Encoded as FromEncodedStr>::DecodingError: Debug,
-    <JsonSerdeWasmCodec as Encoder<T>>::Encoded: IntoEncodedString,
-    <JsonSerdeWasmCodec as Decoder<T>>::Encoded: FromEncodedStr,
-{
-    #[track_caller]
-    pub fn new_serde_wb(
-fut: impl Future<Output = T> + Send + 'static
-    ) -> Self
-    {
-        ArcOnceResource::new_with_options(fut, false)
-    }
-
-    #[track_caller]
-    pub fn new_serde_wb_blocking(
-fut: impl Future<Output = T> + Send + 'static
-    ) -> Self
-    {
-        ArcOnceResource::new_with_options(fut, true)
-    }
-}
-#[cfg(feature = "miniserde")]
-impl<T> ArcOnceResource<T, MiniserdeCodec>
-where
-    T: Send + Sync + 'static,
-    MiniserdeCodec: Encoder<T> + Decoder<T>,
-    <MiniserdeCodec as Encoder<T>>::Error: Debug,
-    <MiniserdeCodec as Decoder<T>>::Error: Debug,
-    <<MiniserdeCodec as Decoder<T>>::Encoded as FromEncodedStr>::DecodingError:
-        Debug,
-    <MiniserdeCodec as Encoder<T>>::Encoded: IntoEncodedString,
-    <MiniserdeCodec as Decoder<T>>::Encoded: FromEncodedStr,
-{
-    #[track_caller]
-    pub fn new_miniserde(
-        fut: impl Future<Output = T> + Send + 'static,
-    ) -> Self {
-        ArcOnceResource::new_with_options(fut, false)
-    }
-
-    #[track_caller]
-    pub fn new_miniserde_blocking(
-        fut: impl Future<Output = T> + Send + 'static,
-    ) -> Self {
-        ArcOnceResource::new_with_options(fut, true)
-    }
-}
-
-#[cfg(feature = "serde-lite")]
-impl<T> ArcOnceResource<T, SerdeLite<JsonSerdeCodec>>
-where
-T: Send + Sync + 'static,
-    SerdeLite<JsonSerdeCodec>: Encoder<T> + Decoder<T>,
-    <SerdeLite<JsonSerdeCodec> as Encoder<T>>::Error: Debug, <SerdeLite<JsonSerdeCodec> as Decoder<T>>::Error: Debug,
-    <<SerdeLite<JsonSerdeCodec> as Decoder<T>>::Encoded as FromEncodedStr>::DecodingError: Debug,
-    <SerdeLite<JsonSerdeCodec> as Encoder<T>>::Encoded: IntoEncodedString,
-    <SerdeLite<JsonSerdeCodec> as Decoder<T>>::Encoded: FromEncodedStr,
-{
-    #[track_caller]
-    pub fn new_serde_lite(
-fut: impl Future<Output = T> + Send + 'static
-    ) -> Self
-    {
-        ArcOnceResource::new_with_options(fut, false)
-    }
-
-    #[track_caller]
-    pub fn new_serde_lite_blocking(
-fut: impl Future<Output = T> + Send + 'static
-    ) -> Self
-    {
-        ArcOnceResource::new_with_options(fut, true)
-    }
-}
-
-#[cfg(feature = "rkyv")]
-impl<T> ArcOnceResource<T, RkyvCodec>
-where
-    T: Send + Sync + 'static,
-    RkyvCodec: Encoder<T> + Decoder<T>,
-    <RkyvCodec as Encoder<T>>::Error: Debug,
-    <RkyvCodec as Decoder<T>>::Error: Debug,
-    <<RkyvCodec as Decoder<T>>::Encoded as FromEncodedStr>::DecodingError:
-        Debug,
-    <RkyvCodec as Encoder<T>>::Encoded: IntoEncodedString,
-    <RkyvCodec as Decoder<T>>::Encoded: FromEncodedStr,
-{
-    #[track_caller]
-    pub fn new_rkyv(fut: impl Future<Output = T> + Send + 'static) -> Self {
-        ArcOnceResource::new_with_options(fut, false)
-    }
-
-    #[track_caller]
-    pub fn new_rkyv_blocking(
-        fut: impl Future<Output = T> + Send + 'static,
-    ) -> Self {
-        ArcOnceResource::new_with_options(fut, true)
-    }
-}
-
-#[derive(Debug)]
-pub struct OnceResource<T, Ser = JsonSerdeCodec> {
-    inner: ArenaItem<ArcOnceResource<T, Ser>>,
-    #[cfg(debug_assertions)]
-    defined_at: &'static Location<'static>,
-}
-
-impl<T, Ser> OnceResource<T, Ser>
-where
-    T: Send + Sync + 'static,
-    Ser: Encoder<T> + Decoder<T>,
-    <Ser as Encoder<T>>::Error: Debug,
-    <Ser as Decoder<T>>::Error: Debug,
-    <<Ser as Decoder<T>>::Encoded as FromEncodedStr>::DecodingError: Debug,
-    <Ser as Encoder<T>>::Encoded: IntoEncodedString,
-    <Ser as Decoder<T>>::Encoded: FromEncodedStr,
-{
-    #[track_caller]
-    pub fn new_with_options(
-        fut: impl Future<Output = T> + Send + 'static,
-        blocking: bool,
-    ) -> Self {
-        #[cfg(debug_assertions)]
-        let defined_at = Location::caller();
-        Self {
-            inner: ArenaItem::new(ArcOnceResource::new_with_options(
-                fut, blocking,
-            )),
-            #[cfg(debug_assertions)]
-            defined_at,
-        }
-    }
-}
-
-impl<T, Ser> OnceResource<T, Ser>
-where
-    T: Send + Sync + 'static,
-    Ser: 'static,
-{
-    /// Returns a `Future` that is ready when this resource has next finished loading.
-    pub fn ready(&self) -> AsyncDerivedReadyFuture {
-        self.inner
-            .try_with_value(|inner| inner.ready())
-            .unwrap_or_else(unwrap_signal!(self))
-    }
-}
-
-impl<T, Ser> DefinedAt for OnceResource<T, Ser> {
-    fn defined_at(&self) -> Option<&'static Location<'static>> {
-        #[cfg(not(debug_assertions))]
-        {
-            None
-        }
-        #[cfg(debug_assertions)]
-        {
-            Some(self.defined_at)
-        }
-    }
-}
-
-impl<T, Ser> IsDisposed for OnceResource<T, Ser> {
-    #[inline(always)]
-    fn is_disposed(&self) -> bool {
-        false
-    }
-}
-
-impl<T, Ser> ToAnySource for OnceResource<T, Ser>
-where
-    T: Send + Sync + 'static,
-    Ser: 'static,
-{
-    fn to_any_source(&self) -> AnySource {
-        self.inner
-            .try_with_value(|inner| inner.to_any_source())
-            .unwrap_or_else(unwrap_signal!(self))
-    }
-}
-
-impl<T, Ser> Track for OnceResource<T, Ser>
-where
-    T: Send + Sync + 'static,
-    Ser: 'static,
-{
-    fn track(&self) {
-        if let Some(inner) = self.inner.try_get_value() {
-            inner.track();
-        }
-    }
-}
-
-impl<T, Ser> ReadUntracked for OnceResource<T, Ser>
-where
-    T: Send + Sync + 'static,
-    Ser: 'static,
-{
-    type Value = ReadGuard<Option<T>, Plain<Option<T>>>;
-
-    fn try_read_untracked(&self) -> Option<Self::Value> {
-        self.inner
-            .try_with_value(|inner| inner.try_read_untracked())
-            .flatten()
-    }
-}
-
-impl<T, Ser> IntoFuture for OnceResource<T, Ser>
-where
-    T: Clone + Send + Sync + 'static,
-    Ser: 'static,
-{
-    type Output = T;
-    type IntoFuture = OnceResourceFuture<T>;
-
-    fn into_future(self) -> Self::IntoFuture {
-        self.inner
-            .try_get_value()
-            .unwrap_or_else(unwrap_signal!(self))
-            .into_future()
-    }
-}
-
-impl<T> OnceResource<T, JsonSerdeCodec>
-where
-    T: Send + Sync + 'static,
-    JsonSerdeCodec: Encoder<T> + Decoder<T>,
-    <JsonSerdeCodec as Encoder<T>>::Error: Debug,
-    <JsonSerdeCodec as Decoder<T>>::Error: Debug,
-    <<JsonSerdeCodec as Decoder<T>>::Encoded as FromEncodedStr>::DecodingError:
-        Debug,
-    <JsonSerdeCodec as Encoder<T>>::Encoded: IntoEncodedString,
-    <JsonSerdeCodec as Decoder<T>>::Encoded: FromEncodedStr,
-{
-    #[track_caller]
-    pub fn new(fut: impl Future<Output = T> + Send + 'static) -> Self {
-        OnceResource::new_with_options(fut, false)
-    }
-
-    #[track_caller]
-    pub fn new_blocking(fut: impl Future<Output = T> + Send + 'static) -> Self {
-        OnceResource::new_with_options(fut, true)
-    }
-}
-
-impl<T> OnceResource<T, FromToStringCodec>
-where
-T: Send + Sync + 'static,
-    FromToStringCodec: Encoder<T> + Decoder<T>,
-    <FromToStringCodec as Encoder<T>>::Error: Debug, <FromToStringCodec as Decoder<T>>::Error: Debug,
-    <<FromToStringCodec as Decoder<T>>::Encoded as FromEncodedStr>::DecodingError: Debug,
-    <FromToStringCodec as Encoder<T>>::Encoded: IntoEncodedString,
-    <FromToStringCodec as Decoder<T>>::Encoded: FromEncodedStr,
-{
-    pub fn new_str(
-        fut: impl Future<Output = T> + Send + 'static
-    ) -> Self
-    {
-        OnceResource::new_with_options(fut, false)
-    }
-
-    pub fn new_str_blocking(
-        fut: impl Future<Output = T> + Send + 'static
-    ) -> Self
-    {
-        OnceResource::new_with_options(fut, true)
-    }
-}
-
-#[cfg(feature = "serde-wasm-bindgen")]
-impl<T> OnceResource<T, JsonSerdeWasmCodec>
-where
-T: Send + Sync + 'static,
-    JsonSerdeWasmCodec: Encoder<T> + Decoder<T>,
-    <JsonSerdeWasmCodec as Encoder<T>>::Error: Debug, <JsonSerdeWasmCodec as Decoder<T>>::Error: Debug,
-    <<JsonSerdeWasmCodec as Decoder<T>>::Encoded as FromEncodedStr>::DecodingError: Debug,
-    <JsonSerdeWasmCodec as Encoder<T>>::Encoded: IntoEncodedString,
-    <JsonSerdeWasmCodec as Decoder<T>>::Encoded: FromEncodedStr,
-{
-    #[track_caller]
-    pub fn new_serde_wb(
-fut: impl Future<Output = T> + Send + 'static
-    ) -> Self
-    {
-        OnceResource::new_with_options(fut, false)
-    }
-
-    #[track_caller]
-    pub fn new_serde_wb_blocking(
-fut: impl Future<Output = T> + Send + 'static
-    ) -> Self
-    {
-        OnceResource::new_with_options(fut, true)
-    }
-}
-#[cfg(feature = "miniserde")]
-impl<T> OnceResource<T, MiniserdeCodec>
-where
-    T: Send + Sync + 'static,
-    MiniserdeCodec: Encoder<T> + Decoder<T>,
-    <MiniserdeCodec as Encoder<T>>::Error: Debug,
-    <MiniserdeCodec as Decoder<T>>::Error: Debug,
-    <<MiniserdeCodec as Decoder<T>>::Encoded as FromEncodedStr>::DecodingError:
-        Debug,
-    <MiniserdeCodec as Encoder<T>>::Encoded: IntoEncodedString,
-    <MiniserdeCodec as Decoder<T>>::Encoded: FromEncodedStr,
-{
-    #[track_caller]
-    pub fn new_miniserde(
-        fut: impl Future<Output = T> + Send + 'static,
-    ) -> Self {
-        OnceResource::new_with_options(fut, false)
-    }
-
-    #[track_caller]
-    pub fn new_miniserde_blocking(
-        fut: impl Future<Output = T> + Send + 'static,
-    ) -> Self {
-        OnceResource::new_with_options(fut, true)
-    }
-}
-
-#[cfg(feature = "serde-lite")]
-impl<T> OnceResource<T, SerdeLite<JsonSerdeCodec>>
-where
-T: Send + Sync + 'static,
-    SerdeLite<JsonSerdeCodec>: Encoder<T> + Decoder<T>,
-    <SerdeLite<JsonSerdeCodec> as Encoder<T>>::Error: Debug, <SerdeLite<JsonSerdeCodec> as Decoder<T>>::Error: Debug,
-    <<SerdeLite<JsonSerdeCodec> as Decoder<T>>::Encoded as FromEncodedStr>::DecodingError: Debug,
-    <SerdeLite<JsonSerdeCodec> as Encoder<T>>::Encoded: IntoEncodedString,
-    <SerdeLite<JsonSerdeCodec> as Decoder<T>>::Encoded: FromEncodedStr,
-{
-    #[track_caller]
-    pub fn new_serde_lite(
-fut: impl Future<Output = T> + Send + 'static
-    ) -> Self
-    {
-        OnceResource::new_with_options(fut, false)
-    }
-
-    #[track_caller]
-    pub fn new_serde_lite_blocking(
-fut: impl Future<Output = T> + Send + 'static
-    ) -> Self
-    {
-        OnceResource::new_with_options(fut, true)
-    }
-}
-
-#[cfg(feature = "rkyv")]
-impl<T> OnceResource<T, RkyvCodec>
-where
-    T: Send + Sync + 'static,
-    RkyvCodec: Encoder<T> + Decoder<T>,
-    <RkyvCodec as Encoder<T>>::Error: Debug,
-    <RkyvCodec as Decoder<T>>::Error: Debug,
-    <<RkyvCodec as Decoder<T>>::Encoded as FromEncodedStr>::DecodingError:
-        Debug,
-    <RkyvCodec as Encoder<T>>::Encoded: IntoEncodedString,
-    <RkyvCodec as Decoder<T>>::Encoded: FromEncodedStr,
-{
-    #[track_caller]
-    pub fn new_rkyv(fut: impl Future<Output = T> + Send + 'static) -> Self {
-        OnceResource::new_with_options(fut, false)
-    }
-
-    #[track_caller]
-    pub fn new_rkyv_blocking(
-        fut: impl Future<Output = T> + Send + 'static,
-    ) -> Self {
-        OnceResource::new_with_options(fut, true)
-    }
-}

leptos_server/src/resource.rs

@@ -13,7 +13,7 @@ use codee::{
 };
 use core::{fmt::Debug, marker::PhantomData};
 use futures::Future;
-use hydration_context::{SerializedDataId, SharedContext};
+use hydration_context::SerializedDataId;
 use reactive_graph::{
     computed::{
         ArcAsyncDerived, ArcMemo, AsyncDerived, AsyncDerivedFuture,
@@ -24,39 +24,7 @@ use reactive_graph::{
     prelude::*,
     signal::{ArcRwSignal, RwSignal},
 };
-use std::{
-    future::{pending, IntoFuture},
-    ops::Deref,
-    panic::Location,
-    sync::{
-        atomic::{AtomicBool, Ordering},
-        Arc,
-    },
-};
-
-pub(crate) static IS_SUPPRESSING_RESOURCE_LOAD: AtomicBool =
-    AtomicBool::new(false);
-
-pub struct SuppressResourceLoad;
-
-impl SuppressResourceLoad {
-    pub fn new() -> Self {
-        IS_SUPPRESSING_RESOURCE_LOAD.store(true, Ordering::Relaxed);
-        Self
-    }
-}
-
-impl Default for SuppressResourceLoad {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl Drop for SuppressResourceLoad {
-    fn drop(&mut self) {
-        IS_SUPPRESSING_RESOURCE_LOAD.store(false, Ordering::Relaxed);
-    }
-}
+use std::{future::IntoFuture, ops::Deref, panic::Location};
 
 pub struct ArcResource<T, Ser = JsonSerdeCodec> {
     ser: PhantomData<Ser>,
@@ -109,49 +77,6 @@ impl<T, Ser> Deref for ArcResource<T, Ser> {
     }
 }
 
-impl<T, Ser> Track for ArcResource<T, Ser>
-where
-    T: 'static,
-{
-    fn track(&self) {
-        self.data.track();
-    }
-}
-
-impl<T, Ser> ReadUntracked for ArcResource<T, Ser>
-where
-    T: 'static,
-{
-    type Value = <ArcAsyncDerived<T> as ReadUntracked>::Value;
-
-    #[track_caller]
-    fn try_read_untracked(&self) -> Option<Self::Value> {
-        #[cfg(all(feature = "hydration", debug_assertions))]
-        {
-            use reactive_graph::{
-                computed::suspense::SuspenseContext, owner::use_context,
-            };
-            let suspense = use_context::<SuspenseContext>();
-            if suspense.is_none() {
-                let location = std::panic::Location::caller();
-                reactive_graph::log_warning(format_args!(
-                    "At {location}, you are reading a resource in `hydrate` \
-                     mode outside a <Suspense/> or <Transition/>. This can \
-                     cause hydration mismatch errors and loses out on a \
-                     significant performance optimization. To fix this issue, \
-                     you can either: \n1. Wrap the place where you read the \
-                     resource in a <Suspense/> or <Transition/> component, or \
-                     \n2. Switch to using ArcLocalResource::new(), which will \
-                     wait to load the resource until the app is hydrated on \
-                     the client side. (This will have worse performance in \
-                     most cases.)",
-                ));
-            }
-        }
-        self.data.try_read_untracked()
-    }
-}
-
 impl<T, Ser> ArcResource<T, Ser>
 where
     Ser: Encoder<T> + Decoder<T>,
@@ -179,7 +104,7 @@ where
             .map(|sc| sc.next_id())
             .unwrap_or_default();
 
-        let initial = initial_value::<T, Ser>(&id, shared_context.as_ref());
+        let initial = Self::initial_value(&id);
         let is_ready = initial.is_some();
 
         let refetch = ArcRwSignal::new(0);
@@ -191,14 +116,7 @@ where
             let source = source.clone();
             move || {
                 let (_, source) = source.get();
-                let fut = fetcher(source);
-                async move {
-                    if IS_SUPPRESSING_RESOURCE_LOAD.load(Ordering::Relaxed) {
-                        pending().await
-                    } else {
-                        fut.await
-                    }
-                }
+                fetcher(source)
             }
         };
 
@@ -257,53 +175,43 @@ where
     pub fn refetch(&self) {
         *self.refetch.write() += 1;
     }
-}
 
-#[inline(always)]
-#[allow(unused)]
-pub(crate) fn initial_value<T, Ser>(
-    id: &SerializedDataId,
-    shared_context: Option<&Arc<dyn SharedContext + Send + Sync>>,
-) -> Option<T>
-where
-    Ser: Encoder<T> + Decoder<T>,
-    <Ser as Encoder<T>>::Error: Debug,
-    <Ser as Decoder<T>>::Error: Debug,
-    <<Ser as Decoder<T>>::Encoded as FromEncodedStr>::DecodingError: Debug,
-    <Ser as Encoder<T>>::Encoded: IntoEncodedString,
-    <Ser as Decoder<T>>::Encoded: FromEncodedStr,
-{
-    #[cfg(feature = "hydration")]
-    {
-        use std::borrow::Borrow;
+    #[inline(always)]
+    #[allow(unused)]
+    fn initial_value(id: &SerializedDataId) -> Option<T> {
+        #[cfg(feature = "hydration")]
+        {
+            use std::borrow::Borrow;
 
-        let shared_context = Owner::current_shared_context();
-        if let Some(shared_context) = shared_context {
-            let value = shared_context.read_data(id);
-            if let Some(value) = value {
-                let encoded =
-                    match <Ser as Decoder<T>>::Encoded::from_encoded_str(&value)
-                    {
-                        Ok(value) => value,
+            let shared_context = Owner::current_shared_context();
+            if let Some(shared_context) = shared_context {
+                let value = shared_context.read_data(id);
+                if let Some(value) = value {
+                    let encoded =
+                        match <Ser as Decoder<T>>::Encoded::from_encoded_str(
+                            &value,
+                        ) {
+                            Ok(value) => value,
+                            Err(e) => {
+                                #[cfg(feature = "tracing")]
+                                tracing::error!("couldn't deserialize: {e:?}");
+                                return None;
+                            }
+                        };
+                    let encoded = encoded.borrow();
+                    match Ser::decode(encoded) {
+                        Ok(value) => return Some(value),
+                        #[allow(unused)]
                         Err(e) => {
                             #[cfg(feature = "tracing")]
                             tracing::error!("couldn't deserialize: {e:?}");
-                            return None;
                         }
-                    };
-                let encoded = encoded.borrow();
-                match Ser::decode(encoded) {
-                    Ok(value) => return Some(value),
-                    #[allow(unused)]
-                    Err(e) => {
-                        #[cfg(feature = "tracing")]
-                        tracing::error!("couldn't deserialize: {e:?}");
                     }
                 }
             }
         }
+        None
     }
-    None
 }
 
 impl<T, E, Ser> ArcResource<Result<T, E>, Ser>
@@ -621,49 +529,6 @@ where
     }
 }
 
-impl<T, Ser> Track for Resource<T, Ser>
-where
-    T: Send + Sync + 'static,
-{
-    fn track(&self) {
-        self.data.track();
-    }
-}
-
-impl<T, Ser> ReadUntracked for Resource<T, Ser>
-where
-    T: Send + Sync + 'static,
-{
-    type Value = <AsyncDerived<T> as ReadUntracked>::Value;
-
-    #[track_caller]
-    fn try_read_untracked(&self) -> Option<Self::Value> {
-        #[cfg(all(feature = "hydration", debug_assertions))]
-        {
-            use reactive_graph::{
-                computed::suspense::SuspenseContext, owner::use_context,
-            };
-            let suspense = use_context::<SuspenseContext>();
-            if suspense.is_none() {
-                let location = std::panic::Location::caller();
-                reactive_graph::log_warning(format_args!(
-                    "At {location}, you are reading a resource in `hydrate` \
-                     mode outside a <Suspense/> or <Transition/>. This can \
-                     cause hydration mismatch errors and loses out on a \
-                     significant performance optimization. To fix this issue, \
-                     you can either: \n1. Wrap the place where you read the \
-                     resource in a <Suspense/> or <Transition/> component, or \
-                     \n2. Switch to using LocalResource::new(), which will \
-                     wait to load the resource until the app is hydrated on \
-                     the client side. (This will have worse performance in \
-                     most cases.)",
-                ));
-            }
-        }
-        self.data.try_read_untracked()
-    }
-}
-
 impl<T> Resource<T, FromToStringCodec>
 where
     FromToStringCodec: Encoder<T> + Decoder<T>,

meta/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "leptos_meta"
-version = "0.7.0-gamma"
+version = "0.7.0-beta6"
 authors = ["Greg Johnston"]
 license = "MIT"
 repository = "https://github.com/leptos-rs/leptos"

meta/src/body.rs

@@ -2,11 +2,12 @@ use crate::ServerMetaContext;
 use leptos::{
     attr::NextAttribute,
     component, html,
-    reactive::owner::use_context,
+    reactive_graph::owner::use_context,
     tachys::{
         dom::document,
         html::attribute::Attribute,
         hydration::Cursor,
+        renderer::{dom::Dom, Renderer},
         view::{
             add_attr::AddAnyAttr, Mountable, Position, PositionState, Render,
             RenderHtml,
@@ -55,14 +56,14 @@ struct BodyView<At> {
 
 struct BodyViewState<At>
 where
-    At: Attribute,
+    At: Attribute<Dom>,
 {
     attributes: At::State,
 }
 
-impl<At> Render for BodyView<At>
+impl<At> Render<Dom> for BodyView<At>
 where
-    At: Attribute,
+    At: Attribute<Dom>,
 {
     type State = BodyViewState<At>;
 
@@ -78,19 +79,19 @@ where
     }
 }
 
-impl<At> AddAnyAttr for BodyView<At>
+impl<At> AddAnyAttr<Dom> for BodyView<At>
 where
-    At: Attribute,
+    At: Attribute<Dom>,
 {
-    type Output<SomeNewAttr: Attribute> =
-        BodyView<<At as NextAttribute>::Output<SomeNewAttr>>;
+    type Output<SomeNewAttr: Attribute<Dom>> =
+        BodyView<<At as NextAttribute<Dom>>::Output<SomeNewAttr>>;
 
-    fn add_any_attr<NewAttr: Attribute>(
+    fn add_any_attr<NewAttr: Attribute<Dom>>(
         self,
         attr: NewAttr,
     ) -> Self::Output<NewAttr>
     where
-        Self::Output<NewAttr>: RenderHtml,
+        Self::Output<NewAttr>: RenderHtml<Dom>,
     {
         BodyView {
             attributes: self.attributes.add_any_attr(attr),
@@ -98,9 +99,9 @@ where
     }
 }
 
-impl<At> RenderHtml for BodyView<At>
+impl<At> RenderHtml<Dom> for BodyView<At>
 where
-    At: Attribute,
+    At: Attribute<Dom>,
 {
     type AsyncOutput = BodyView<At::AsyncOutput>;
 
@@ -134,7 +135,7 @@ where
 
     fn hydrate<const FROM_SERVER: bool>(
         self,
-        _cursor: &Cursor,
+        _cursor: &Cursor<Dom>,
         _position: &PositionState,
     ) -> Self::State {
         let el = document().body().expect("there to be a <body> element");
@@ -144,20 +145,20 @@ where
     }
 }
 
-impl<At> Mountable for BodyViewState<At>
+impl<At> Mountable<Dom> for BodyViewState<At>
 where
-    At: Attribute,
+    At: Attribute<Dom>,
 {
     fn unmount(&mut self) {}
 
     fn mount(
         &mut self,
-        _parent: &leptos::tachys::renderer::types::Element,
-        _marker: Option<&leptos::tachys::renderer::types::Node>,
+        _parent: &<Dom as Renderer>::Element,
+        _marker: Option<&<Dom as Renderer>::Node>,
     ) {
     }
 
-    fn insert_before_this(&self, _child: &mut dyn Mountable) -> bool {
+    fn insert_before_this(&self, _child: &mut dyn Mountable<Dom>) -> bool {
         false
     }
 }

meta/src/html.rs

@@ -2,11 +2,12 @@ use crate::ServerMetaContext;
 use leptos::{
     attr::NextAttribute,
     component, html,
-    reactive::owner::use_context,
+    reactive_graph::owner::use_context,
     tachys::{
         dom::document,
         html::attribute::Attribute,
         hydration::Cursor,
+        renderer::{dom::Dom, Renderer},
         view::{
             add_attr::AddAnyAttr, Mountable, Position, PositionState, Render,
             RenderHtml,
@@ -52,14 +53,14 @@ struct HtmlView<At> {
 
 struct HtmlViewState<At>
 where
-    At: Attribute,
+    At: Attribute<Dom>,
 {
     attributes: At::State,
 }
 
-impl<At> Render for HtmlView<At>
+impl<At> Render<Dom> for HtmlView<At>
 where
-    At: Attribute,
+    At: Attribute<Dom>,
 {
     type State = HtmlViewState<At>;
 
@@ -78,19 +79,19 @@ where
     }
 }
 
-impl<At> AddAnyAttr for HtmlView<At>
+impl<At> AddAnyAttr<Dom> for HtmlView<At>
 where
-    At: Attribute,
+    At: Attribute<Dom>,
 {
-    type Output<SomeNewAttr: Attribute> =
-        HtmlView<<At as NextAttribute>::Output<SomeNewAttr>>;
+    type Output<SomeNewAttr: Attribute<Dom>> =
+        HtmlView<<At as NextAttribute<Dom>>::Output<SomeNewAttr>>;
 
-    fn add_any_attr<NewAttr: Attribute>(
+    fn add_any_attr<NewAttr: Attribute<Dom>>(
         self,
         attr: NewAttr,
     ) -> Self::Output<NewAttr>
     where
-        Self::Output<NewAttr>: RenderHtml,
+        Self::Output<NewAttr>: RenderHtml<Dom>,
     {
         HtmlView {
             attributes: self.attributes.add_any_attr(attr),
@@ -98,9 +99,9 @@ where
     }
 }
 
-impl<At> RenderHtml for HtmlView<At>
+impl<At> RenderHtml<Dom> for HtmlView<At>
 where
-    At: Attribute,
+    At: Attribute<Dom>,
 {
     type AsyncOutput = HtmlView<At::AsyncOutput>;
 
@@ -134,7 +135,7 @@ where
 
     fn hydrate<const FROM_SERVER: bool>(
         self,
-        _cursor: &Cursor,
+        _cursor: &Cursor<Dom>,
         _position: &PositionState,
     ) -> Self::State {
         let el = document()
@@ -147,22 +148,22 @@ where
     }
 }
 
-impl<At> Mountable for HtmlViewState<At>
+impl<At> Mountable<Dom> for HtmlViewState<At>
 where
-    At: Attribute,
+    At: Attribute<Dom>,
 {
     fn unmount(&mut self) {}
 
     fn mount(
         &mut self,
-        _parent: &leptos::tachys::renderer::types::Element,
-        _marker: Option<&leptos::tachys::renderer::types::Node>,
+        _parent: &<Dom as Renderer>::Element,
+        _marker: Option<&<Dom as Renderer>::Node>,
     ) {
         // <Html> only sets attributes
         // the <html> tag doesn't need to be mounted anywhere, of course
     }
 
-    fn insert_before_this(&self, _child: &mut dyn Mountable) -> bool {
+    fn insert_before_this(&self, _child: &mut dyn Mountable<Dom>) -> bool {
         false
     }
 }

meta/src/lib.rs

@@ -52,14 +52,15 @@ use leptos::{
     attr::NextAttribute,
     component,
     logging::debug_warn,
-    reactive::owner::{provide_context, use_context},
+    reactive_graph::owner::{provide_context, use_context},
     tachys::{
         dom::document,
         html::{
             attribute::Attribute,
-            element::{ElementType, HtmlElement},
+            element::{CreateElement, ElementType, HtmlElement},
         },
         hydration::Cursor,
+        renderer::{dom::Dom, Renderer},
         view::{
             add_attr::AddAnyAttr, Mountable, Position, PositionState, Render,
             RenderHtml,
@@ -105,7 +106,7 @@ pub struct MetaContext {
     /// Metadata associated with the `<title>` element.
     pub(crate) title: TitleContext,
     /// The hydration cursor for the location in the `<head>` for arbitrary tags will be rendered.
-    pub(crate) cursor: Arc<Lazy<SendWrapper<Cursor>>>,
+    pub(crate) cursor: Arc<Lazy<SendWrapper<Cursor<Dom>>>>,
 }
 
 impl MetaContext {
@@ -122,7 +123,7 @@ const COMMENT_NODE: u16 = 8;
 
 impl Default for MetaContext {
     fn default() -> Self {
-        let build_cursor: fn() -> SendWrapper<Cursor> = || {
+        let build_cursor: fn() -> SendWrapper<Cursor<Dom>> = || {
             let head = document().head().expect("missing <head> element");
             let mut cursor = None;
             let mut child = head.first_child();
@@ -322,10 +323,10 @@ pub fn use_head() -> MetaContext {
 }
 
 pub(crate) fn register<E, At, Ch>(
-    el: HtmlElement<E, At, Ch>,
+    el: HtmlElement<E, At, Ch, Dom>,
 ) -> RegisteredMetaTag<E, At, Ch>
 where
-    HtmlElement<E, At, Ch>: RenderHtml,
+    HtmlElement<E, At, Ch, Dom>: RenderHtml<Dom>,
 {
     #[allow(unused_mut)] // used for `ssr`
     let mut el = Some(el);
@@ -357,19 +358,19 @@ where
 struct RegisteredMetaTag<E, At, Ch> {
     // this is `None` if we've already taken it out to render to HTML on the server
     // we don't render it in place in RenderHtml, so it's fine
-    el: Option<HtmlElement<E, At, Ch>>,
+    el: Option<HtmlElement<E, At, Ch, Dom>>,
 }
 
 struct RegisteredMetaTagState<E, At, Ch>
 where
-    HtmlElement<E, At, Ch>: Render,
+    HtmlElement<E, At, Ch, Dom>: Render<Dom>,
 {
-    state: <HtmlElement<E, At, Ch> as Render>::State,
+    state: <HtmlElement<E, At, Ch, Dom> as Render<Dom>>::State,
 }
 
 impl<E, At, Ch> Drop for RegisteredMetaTagState<E, At, Ch>
 where
-    HtmlElement<E, At, Ch>: Render,
+    HtmlElement<E, At, Ch, Dom>: Render<Dom>,
 {
     fn drop(&mut self) {
         self.state.unmount();
@@ -386,11 +387,11 @@ fn document_head() -> HtmlHeadElement {
     })
 }
 
-impl<E, At, Ch> Render for RegisteredMetaTag<E, At, Ch>
+impl<E, At, Ch> Render<Dom> for RegisteredMetaTag<E, At, Ch>
 where
-    E: ElementType,
-    At: Attribute,
-    Ch: Render,
+    E: ElementType + CreateElement<Dom>,
+    At: Attribute<Dom>,
+    Ch: Render<Dom>,
 {
     type State = RegisteredMetaTagState<E, At, Ch>;
 
@@ -404,21 +405,24 @@ where
     }
 }
 
-impl<E, At, Ch> AddAnyAttr for RegisteredMetaTag<E, At, Ch>
+impl<E, At, Ch> AddAnyAttr<Dom> for RegisteredMetaTag<E, At, Ch>
 where
-    E: ElementType + Send,
-    At: Attribute + Send,
-    Ch: RenderHtml + Send,
+    E: ElementType + CreateElement<Dom> + Send,
+    At: Attribute<Dom> + Send,
+    Ch: RenderHtml<Dom> + Send,
 {
-    type Output<SomeNewAttr: Attribute> =
-        RegisteredMetaTag<E, <At as NextAttribute>::Output<SomeNewAttr>, Ch>;
+    type Output<SomeNewAttr: Attribute<Dom>> = RegisteredMetaTag<
+        E,
+        <At as NextAttribute<Dom>>::Output<SomeNewAttr>,
+        Ch,
+    >;
 
-    fn add_any_attr<NewAttr: Attribute>(
+    fn add_any_attr<NewAttr: Attribute<Dom>>(
         self,
         attr: NewAttr,
     ) -> Self::Output<NewAttr>
     where
-        Self::Output<NewAttr>: RenderHtml,
+        Self::Output<NewAttr>: RenderHtml<Dom>,
     {
         RegisteredMetaTag {
             el: self.el.map(|inner| inner.add_any_attr(attr)),
@@ -426,11 +430,11 @@ where
     }
 }
 
-impl<E, At, Ch> RenderHtml for RegisteredMetaTag<E, At, Ch>
+impl<E, At, Ch> RenderHtml<Dom> for RegisteredMetaTag<E, At, Ch>
 where
-    E: ElementType,
-    At: Attribute,
-    Ch: RenderHtml + Send,
+    E: ElementType + CreateElement<Dom>,
+    At: Attribute<Dom>,
+    Ch: RenderHtml<Dom> + Send,
 {
     type AsyncOutput = Self;
 
@@ -457,7 +461,7 @@ where
 
     fn hydrate<const FROM_SERVER: bool>(
         self,
-        _cursor: &Cursor,
+        _cursor: &Cursor<Dom>,
         _position: &PositionState,
     ) -> Self::State {
         let cursor = use_context::<MetaContext>()
@@ -467,18 +471,18 @@ where
             )
             .cursor;
         let state = self.el.unwrap().hydrate::<FROM_SERVER>(
-            &cursor,
+            &*cursor,
             &PositionState::new(Position::NextChild),
         );
         RegisteredMetaTagState { state }
     }
 }
 
-impl<E, At, Ch> Mountable for RegisteredMetaTagState<E, At, Ch>
+impl<E, At, Ch> Mountable<Dom> for RegisteredMetaTagState<E, At, Ch>
 where
-    E: ElementType,
-    At: Attribute,
-    Ch: Render,
+    E: ElementType + CreateElement<Dom>,
+    At: Attribute<Dom>,
+    Ch: Render<Dom>,
 {
     fn unmount(&mut self) {
         self.state.unmount();
@@ -486,8 +490,8 @@ where
 
     fn mount(
         &mut self,
-        _parent: &leptos::tachys::renderer::types::Element,
-        _marker: Option<&leptos::tachys::renderer::types::Node>,
+        _parent: &<Dom as Renderer>::Element,
+        _marker: Option<&<Dom as Renderer>::Node>,
     ) {
         // we always mount this to the <head>, which is the whole point
         // but this shouldn't warn about the parent being a regular element or being unused
@@ -496,7 +500,7 @@ where
         self.state.mount(&document_head(), None);
     }
 
-    fn insert_before_this(&self, _child: &mut dyn Mountable) -> bool {
+    fn insert_before_this(&self, _child: &mut dyn Mountable<Dom>) -> bool {
         // Registered meta tags will be mounted in the <head>, but *seem* to be mounted somewhere
         // else in the DOM. We should never tell the renderer that we have successfully mounted
         // something before this, because if e.g., a <Meta/> is the first item in an Either, then
@@ -521,7 +525,7 @@ struct MetaTagsView;
 // rendering HTML for all the tags that will be injected into the `<head>`
 //
 // client-side rendering is handled by the individual components
-impl Render for MetaTagsView {
+impl Render<Dom> for MetaTagsView {
     type State = ();
 
     fn build(self) -> Self::State {}
@@ -529,21 +533,21 @@ impl Render for MetaTagsView {
     fn rebuild(self, _state: &mut Self::State) {}
 }
 
-impl AddAnyAttr for MetaTagsView {
-    type Output<SomeNewAttr: Attribute> = MetaTagsView;
+impl AddAnyAttr<Dom> for MetaTagsView {
+    type Output<SomeNewAttr: Attribute<Dom>> = MetaTagsView;
 
-    fn add_any_attr<NewAttr: Attribute>(
+    fn add_any_attr<NewAttr: Attribute<Dom>>(
         self,
         _attr: NewAttr,
     ) -> Self::Output<NewAttr>
     where
-        Self::Output<NewAttr>: RenderHtml,
+        Self::Output<NewAttr>: RenderHtml<Dom>,
     {
         self
     }
 }
 
-impl RenderHtml for MetaTagsView {
+impl RenderHtml<Dom> for MetaTagsView {
     type AsyncOutput = Self;
 
     const MIN_LENGTH: usize = 0;
@@ -566,7 +570,7 @@ impl RenderHtml for MetaTagsView {
 
     fn hydrate<const FROM_SERVER: bool>(
         self,
-        _cursor: &Cursor,
+        _cursor: &Cursor<Dom>,
         _position: &PositionState,
     ) -> Self::State {
     }

meta/src/title.rs

@@ -3,13 +3,14 @@ use leptos::{
     attr::Attribute,
     component,
     oco::Oco,
-    reactive::{
+    reactive_graph::{
         effect::RenderEffect,
         owner::{use_context, Owner},
     },
     tachys::{
         dom::document,
         hydration::Cursor,
+        renderer::{dom::Dom, Renderer},
         view::{
             add_attr::AddAnyAttr, Mountable, Position, PositionState, Render,
             RenderHtml,
@@ -186,7 +187,7 @@ struct TitleViewState {
     effect: RenderEffect<Oco<'static, str>>,
 }
 
-impl Render for TitleView {
+impl Render<Dom> for TitleView {
     type State = TitleViewState;
 
     fn build(mut self) -> Self::State {
@@ -218,21 +219,21 @@ impl Render for TitleView {
     }
 }
 
-impl AddAnyAttr for TitleView {
-    type Output<SomeNewAttr: Attribute> = TitleView;
+impl AddAnyAttr<Dom> for TitleView {
+    type Output<SomeNewAttr: Attribute<Dom>> = TitleView;
 
-    fn add_any_attr<NewAttr: Attribute>(
+    fn add_any_attr<NewAttr: Attribute<Dom>>(
         self,
         _attr: NewAttr,
     ) -> Self::Output<NewAttr>
     where
-        Self::Output<NewAttr>: RenderHtml,
+        Self::Output<NewAttr>: RenderHtml<Dom>,
     {
         self
     }
 }
 
-impl RenderHtml for TitleView {
+impl RenderHtml<Dom> for TitleView {
     type AsyncOutput = Self;
 
     const MIN_LENGTH: usize = 0;
@@ -256,7 +257,7 @@ impl RenderHtml for TitleView {
 
     fn hydrate<const FROM_SERVER: bool>(
         mut self,
-        _cursor: &Cursor,
+        _cursor: &Cursor<Dom>,
         _position: &PositionState,
     ) -> Self::State {
         let el = self.el();
@@ -284,19 +285,19 @@ impl RenderHtml for TitleView {
     }
 }
 
-impl Mountable for TitleViewState {
+impl Mountable<Dom> for TitleViewState {
     fn unmount(&mut self) {}
 
     fn mount(
         &mut self,
-        _parent: &leptos::tachys::renderer::types::Element,
-        _marker: Option<&leptos::tachys::renderer::types::Node>,
+        _parent: &<Dom as Renderer>::Element,
+        _marker: Option<&<Dom as Renderer>::Node>,
     ) {
         // <title> doesn't need to be mounted
         // TitleView::el() guarantees that there is a <title> in the <head>
     }
 
-    fn insert_before_this(&self, _child: &mut dyn Mountable) -> bool {
+    fn insert_before_this(&self, _child: &mut dyn Mountable<Dom>) -> bool {
         false
     }
 }

next_tuple/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "next_tuple"
-version = "0.1.0-gamma"
+version = "0.1.0-beta6"
 authors = ["Greg Johnston"]
 license = "MIT"
 readme = "../README.md"

projects/session_auth_axum/Cargo.toml

@@ -30,21 +30,23 @@ sqlx = { version = "0.8.0", features = [
 ], optional = true }
 thiserror = "1.0"
 wasm-bindgen = "0.2.0"
-axum_session_auth = { version = "0.14.0", features = [], optional = true }
-axum_session = { version = "0.14.0", features = [], optional = true }
-axum_session_sqlx = { version = "0.3.0", features = [ "sqlite", "tls-rustls"], optional = true }
+axum_session_auth = { version = "0.14.0", features = [
+  "sqlite-rustls",
+], optional = true }
+axum_session = { version = "0.14.0", features = [
+  "sqlite-rustls",
+], optional = true }
 bcrypt = { version = "0.15.0", optional = true }
 async-trait = { version = "0.1.0", optional = true }
 
 [features]
 default = ["ssr"]
-hydrate = ["leptos/hydrate"]
+hydrate = ["leptos/hydrate", "leptos_meta/hydrate", "leptos_router/hydrate"]
 ssr = [
   "dep:axum",
   "dep:tower",
   "dep:tower-http",
   "dep:tokio",
-  "dep:axum_session_sqlx",
   "dep:axum_session_auth",
   "dep:axum_session",
   "dep:async-trait",

projects/session_auth_axum/src/auth.rs

@@ -28,8 +28,9 @@ impl Default for User {
 #[cfg(feature = "ssr")]
 pub mod ssr {
     pub use super::{User, UserPasshash};
-    pub use axum_session_auth::{Authentication, HasPermission};
-    use axum_session_sqlx::SessionSqlitePool;
+    pub use axum_session_auth::{
+        Authentication, HasPermission, SessionSqlitePool,
+    };
     pub use sqlx::SqlitePool;
     pub use std::collections::HashSet;
     pub type AuthSession = axum_session_auth::AuthSession<

projects/session_auth_axum/src/error_template.rs

@@ -8,10 +8,10 @@ use leptos_axum::ResponseOptions;
 #[component]
 pub fn ErrorTemplate(
     #[prop(optional)] outside_errors: Option<Errors>,
-    #[prop(optional)] errors: Option<ArcRwSignal<Errors>>,
+    #[prop(optional)] errors: Option<RwSignal<Errors>>,
 ) -> impl IntoView {
     let errors = match outside_errors {
-        Some(e) => ArcRwSignal::new(e),
+        Some(e) => RwSignal::new(e),
         None => match errors {
             Some(e) => e,
             None => panic!("No Errors found and we expected errors!"),

projects/session_auth_axum/src/fallback.rs

@@ -0,0 +1,50 @@
+use crate::{error_template::ErrorTemplate, errors::TodoAppError};
+use axum::{
+    body::Body,
+    extract::State,
+    http::{Request, Response, StatusCode, Uri},
+    response::{IntoResponse, Response as AxumResponse},
+};
+use leptos::{view, Errors, LeptosOptions};
+use tower::ServiceExt;
+use tower_http::services::ServeDir;
+
+pub async fn file_and_error_handler(
+    uri: Uri,
+    State(options): State<LeptosOptions>,
+    req: Request<Body>,
+) -> AxumResponse {
+    let root = options.site_root.clone();
+    let res = get_static_file(uri.clone(), &root).await.unwrap();
+
+    if res.status() == StatusCode::OK {
+        res.into_response()
+    } else {
+        let mut errors = Errors::default();
+        errors.insert_with_default_key(TodoAppError::NotFound);
+        let handler = leptos_axum::render_app_to_stream(
+            options.to_owned(),
+            move || view! {<ErrorTemplate outside_errors=errors.clone()/>},
+        );
+        handler(req).await.into_response()
+    }
+}
+
+async fn get_static_file(
+    uri: Uri,
+    root: &str,
+) -> Result<Response<Body>, (StatusCode, String)> {
+    let req = Request::builder()
+        .uri(uri.clone())
+        .body(Body::empty())
+        .unwrap();
+    // `ServeDir` implements `tower::Service` so we can call it with `tower::ServiceExt::oneshot`
+    // This path is relative to the cargo root
+    match ServeDir::new(root).oneshot(req).await {
+        Ok(res) => Ok(res.into_response()),
+        Err(err) => Err((
+            StatusCode::INTERNAL_SERVER_ERROR,
+            format!("Something went wrong: {err}"),
+        )),
+    }
+}

projects/session_auth_axum/src/lib.rs

@@ -2,6 +2,8 @@ pub mod auth;
 pub mod error_template;
 pub mod errors;
 #[cfg(feature = "ssr")]
+pub mod fallback;
+#[cfg(feature = "ssr")]
 pub mod state;
 pub mod todo;
 
@@ -12,5 +14,5 @@ pub fn hydrate() {
     _ = console_log::init_with_level(log::Level::Debug);
     console_error_panic_hook::set_once();
 
-    leptos::mount::hydrate_body(TodoApp);
+    leptos::mount_to_body(TodoApp);
 }

projects/session_auth_axum/src/main.rs

@@ -7,16 +7,14 @@ use axum::{
     Router,
 };
 use axum_session::{SessionConfig, SessionLayer, SessionStore};
-use axum_session_auth::{AuthConfig, AuthSessionLayer};
-use axum_session_sqlx::SessionSqlitePool;
-use leptos::{
-    config::get_configuration, logging::log, prelude::provide_context,
-};
+use axum_session_auth::{AuthConfig, AuthSessionLayer, SessionSqlitePool};
+use leptos::{get_configuration, logging::log, provide_context};
 use leptos_axum::{
     generate_route_list, handle_server_fns_with_context, LeptosRoutes,
 };
 use session_auth_axum::{
     auth::{ssr::AuthSession, User},
+    fallback::file_and_error_handler,
     state::AppState,
     todo::*,
 };
@@ -42,19 +40,19 @@ async fn server_fn_handler(
 
 async fn leptos_routes_handler(
     auth_session: AuthSession,
-    state: State<AppState>,
+    State(app_state): State<AppState>,
     req: Request<AxumBody>,
 ) -> Response {
-    let State(app_state) = state.clone();
     let handler = leptos_axum::render_route_with_context(
+        app_state.leptos_options.clone(),
         app_state.routes.clone(),
         move || {
             provide_context(auth_session.clone());
             provide_context(app_state.pool.clone());
         },
-        move || shell(app_state.leptos_options.clone()),
+        TodoApp,
     );
-    handler(state, req).await.into_response()
+    handler(req).await.into_response()
 }
 
 #[tokio::main]
@@ -113,7 +111,7 @@ async fn main() {
             get(server_fn_handler).post(server_fn_handler),
         )
         .leptos_routes_with_handler(routes, get(leptos_routes_handler))
-        .fallback(leptos_axum::file_and_error_handler::<AppState, _>(shell))
+        .fallback(file_and_error_handler)
         .layer(
             AuthSessionLayer::<User, i64, SessionSqlitePool, SqlitePool>::new(
                 Some(pool.clone()),

projects/session_auth_axum/src/state.rs

@@ -1,6 +1,6 @@
 use axum::extract::FromRef;
-use leptos::prelude::LeptosOptions;
-use leptos_axum::AxumRouteListing;
+use leptos::LeptosOptions;
+use leptos_router::RouteListing;
 use sqlx::SqlitePool;
 
 /// This takes advantage of Axum's SubStates feature by deriving FromRef. This is the only way to have more than one
@@ -9,5 +9,5 @@ use sqlx::SqlitePool;
 pub struct AppState {
     pub leptos_options: LeptosOptions,
     pub pool: SqlitePool,
-    pub routes: Vec<AxumRouteListing>,
+    pub routes: Vec<RouteListing>,
 }

projects/session_auth_axum/src/todo.rs

@@ -1,7 +1,7 @@
 use crate::{auth::*, error_template::ErrorTemplate};
 use leptos::prelude::*;
 use leptos_meta::*;
-use leptos_router::{components::*, *};
+use leptos_router::*;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
@@ -109,33 +109,13 @@ pub async fn delete_todo(id: u16) -> Result<(), ServerFnError> {
         .map(|_| ())?)
 }
 
-pub fn shell(options: LeptosOptions) -> impl IntoView {
-    view! {
-        <!DOCTYPE html>
-        <html lang="en">
-            <head>
-                <meta charset="utf-8"/>
-                <meta name="viewport" content="width=device-width, initial-scale=1"/>
-                <AutoReload options=options.clone() />
-                <HydrationScripts options/>
-                <link rel="stylesheet" id="leptos" href="/pkg/session_auth_axum.css"/>
-                <link rel="shortcut icon" type="image/ico" href="/favicon.ico"/>
-                <MetaTags/>
-            </head>
-            <body>
-                <TodoApp/>
-            </body>
-        </html>
-    }
-}
-
 #[component]
 pub fn TodoApp() -> impl IntoView {
-    let login = ServerAction::<Login>::new();
-    let logout = ServerAction::<Logout>::new();
-    let signup = ServerAction::<Signup>::new();
+    let login = create_server_action::<Login>();
+    let logout = create_server_action::<Logout>();
+    let signup = create_server_action::<Signup>();
 
-    let user = Resource::new(
+    let user = create_resource(
         move || {
             (
                 login.version().get(),
@@ -148,6 +128,8 @@ pub fn TodoApp() -> impl IntoView {
     provide_meta_context();
 
     view! {
+        <Link rel="shortcut icon" type_="image/ico" href="/favicon.ico"/>
+        <Stylesheet id="leptos" href="/pkg/session_auth_axum.css"/>
         <Router>
             <header>
                 <A href="/">
@@ -167,7 +149,7 @@ pub fn TodoApp() -> impl IntoView {
                                         ", "
                                         <span>{format!("Login error: {}", e)}</span>
                                     }
-                                        .into_any()
+                                        .into_view()
                                 }
                                 Ok(None) => {
                                     view! {
@@ -177,7 +159,7 @@ pub fn TodoApp() -> impl IntoView {
                                         ", "
                                         <span>"Logged out."</span>
                                     }
-                                        .into_any()
+                                        .into_view()
                                 }
                                 Ok(Some(user)) => {
                                     view! {
@@ -187,7 +169,7 @@ pub fn TodoApp() -> impl IntoView {
                                             {format!("Logged in as: {} ({})", user.username, user.id)}
                                         </span>
                                     }
-                                        .into_any()
+                                        .into_view()
                                 }
                             })
                     }}
@@ -196,15 +178,13 @@ pub fn TodoApp() -> impl IntoView {
             </header>
             <hr/>
             <main>
-                <FlatRoutes fallback=|| "Not found.">
+                <Routes>
                     // Route
-                    <Route path=path!("") view=Todos/>
-                    <Route path=path!("signup") view=move || view! { <Signup action=signup/> }/>
-                    <Route path=path!("login") view=move || view! { <Login action=login/> }/>
-                    <ProtectedRoute
-                        path=path!("settings")
-                        condition=move || user.get().map(|r| r.ok().flatten().is_some())
-                        redirect_path=|| "/"
+                    <Route path="" view=Todos/>
+                    <Route path="signup" view=move || view! { <Signup action=signup/> }/>
+                    <Route path="login" view=move || view! { <Login action=login/> }/>
+                    <Route
+                        path="settings"
                         view=move || {
                             view! {
                                 <h1>"Settings"</h1>
@@ -213,7 +193,7 @@ pub fn TodoApp() -> impl IntoView {
                         }
                     />
 
-                </FlatRoutes>
+                </Routes>
             </main>
         </Router>
     }
@@ -221,12 +201,12 @@ pub fn TodoApp() -> impl IntoView {
 
 #[component]
 pub fn Todos() -> impl IntoView {
-    let add_todo = ServerMultiAction::<AddTodo>::new();
-    let delete_todo = ServerAction::<DeleteTodo>::new();
+    let add_todo = create_server_multi_action::<AddTodo>();
+    let delete_todo = create_server_action::<DeleteTodo>();
     let submissions = add_todo.submissions();
 
     // list of todos is loaded from the server in reaction to changes
-    let todos = Resource::new(
+    let todos = create_resource(
         move || (add_todo.version().get(), delete_todo.version().get()),
         move |_| get_todos(),
     );
@@ -251,11 +231,11 @@ pub fn Todos() -> impl IntoView {
                                             view! {
                                                 <pre class="error">"Server Error: " {e.to_string()}</pre>
                                             }
-                                                .into_any()
+                                                .into_view()
                                         }
                                         Ok(todos) => {
                                             if todos.is_empty() {
-                                                view! { <p>"No tasks were found."</p> }.into_any()
+                                                view! { <p>"No tasks were found."</p> }.into_view()
                                             } else {
                                                 todos
                                                     .into_iter()
@@ -272,11 +252,10 @@ pub fn Todos() -> impl IntoView {
                                                         }
                                                     })
                                                     .collect_view()
-                                                    .into_any()
                                             }
                                         }
                                     })
-                                    .unwrap_or(().into_any())
+                                    .unwrap_or_default()
                             }
                         };
                         let pending_todos = move || {
@@ -287,7 +266,7 @@ pub fn Todos() -> impl IntoView {
                                 .map(|submission| {
                                     view! {
                                         <li class="pending">
-                                            {move || submission.input().get().map(|data| data.title)}
+                                            {move || submission.input.get().map(|data| data.title)}
                                         </li>
                                     }
                                 })
@@ -303,7 +282,9 @@ pub fn Todos() -> impl IntoView {
 }
 
 #[component]
-pub fn Login(action: ServerAction<Login>) -> impl IntoView {
+pub fn Login(
+    action: Action<Login, Result<(), ServerFnError>>,
+) -> impl IntoView {
     view! {
         <ActionForm action=action>
             <h1>"Log In"</h1>
@@ -336,7 +317,9 @@ pub fn Login(action: ServerAction<Login>) -> impl IntoView {
 }
 
 #[component]
-pub fn Signup(action: ServerAction<Signup>) -> impl IntoView {
+pub fn Signup(
+    action: Action<Signup, Result<(), ServerFnError>>,
+) -> impl IntoView {
     view! {
         <ActionForm action=action>
             <h1>"Sign Up"</h1>
@@ -379,7 +362,9 @@ pub fn Signup(action: ServerAction<Signup>) -> impl IntoView {
 }
 
 #[component]
-pub fn Logout(action: ServerAction<Logout>) -> impl IntoView {
+pub fn Logout(
+    action: Action<Logout, Result<(), ServerFnError>>,
+) -> impl IntoView {
     view! {
         <div id="loginbox">
             <ActionForm action=action>

reactive_graph/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "reactive_graph"
-version = "0.1.0-gamma"
+version = "0.1.0-beta6"
 authors = ["Greg Johnston"]
 license = "MIT"
 readme = "../README.md"

reactive_graph/src/actions/action.rs

@@ -24,7 +24,7 @@ use std::{future::Future, panic::Location, pin::Pin, sync::Arc};
 /// # use reactive_graph::actions::*;
 /// # use reactive_graph::prelude::*;
 /// # tokio_test::block_on(async move {
-/// # any_spawner::Executor::init_tokio(); let owner = reactive_graph::owner::Owner::new(); owner.set();
+/// # any_spawner::Executor::init_tokio();
 /// # let _guard = reactive_graph::diagnostics::SpecialNonReactiveZone::enter();
 /// async fn send_new_todo_to_api(task: String) -> usize {
 ///     // do something...
@@ -135,7 +135,7 @@ where
     /// # use reactive_graph::actions::*;
     /// # use reactive_graph::prelude::*;
     /// # tokio_test::block_on(async move {
-    /// # any_spawner::Executor::init_tokio(); let owner = reactive_graph::owner::Owner::new(); owner.set();
+    /// # any_spawner::Executor::init_tokio();
     /// # let _guard = reactive_graph::diagnostics::SpecialNonReactiveZone::enter();
     /// let act = ArcAction::new(|n: &u8| {
     ///     let n = n.to_owned();
@@ -367,7 +367,7 @@ impl<I, O> ArcAction<I, O> {
     /// # use reactive_graph::actions::*;
     /// # use reactive_graph::prelude::*;
     /// # tokio_test::block_on(async move {
-    /// # any_spawner::Executor::init_tokio(); let owner = reactive_graph::owner::Owner::new(); owner.set();
+    /// # any_spawner::Executor::init_tokio();
     /// # let _guard = reactive_graph::diagnostics::SpecialNonReactiveZone::enter();
     /// let act = ArcAction::new(|n: &u8| {
     ///     let n = n.to_owned();
@@ -395,7 +395,7 @@ impl<I, O> ArcAction<I, O> {
     /// # use reactive_graph::actions::*;
     /// # use reactive_graph::prelude::*;
     /// # tokio_test::block_on(async move {
-    /// # any_spawner::Executor::init_tokio(); let owner = reactive_graph::owner::Owner::new(); owner.set();
+    /// # any_spawner::Executor::init_tokio();
     /// # let _guard = reactive_graph::diagnostics::SpecialNonReactiveZone::enter();
     /// let act = ArcAction::new(|n: &u8| {
     ///     let n = n.to_owned();
@@ -425,7 +425,7 @@ impl<I, O> ArcAction<I, O> {
     /// # use reactive_graph::actions::*;
     /// # use reactive_graph::prelude::*;
     /// # tokio_test::block_on(async move {
-    /// # any_spawner::Executor::init_tokio(); let owner = reactive_graph::owner::Owner::new(); owner.set();
+    /// # any_spawner::Executor::init_tokio();
     /// # let _guard = reactive_graph::diagnostics::SpecialNonReactiveZone::enter();
     /// let act = ArcAction::new(|n: &u8| {
     ///     let n = n.to_owned();
@@ -456,7 +456,7 @@ impl<I, O> ArcAction<I, O> {
     /// # use reactive_graph::actions::*;
     /// # use reactive_graph::prelude::*;
     /// # tokio_test::block_on(async move {
-    /// # any_spawner::Executor::init_tokio(); let owner = reactive_graph::owner::Owner::new(); owner.set();
+    /// # any_spawner::Executor::init_tokio();
     /// # let _guard = reactive_graph::diagnostics::SpecialNonReactiveZone::enter();
     /// let act = ArcAction::new(|n: &u8| {
     ///     let n = n.to_owned();
@@ -510,7 +510,7 @@ where
 /// # use reactive_graph::actions::*;
 /// # use reactive_graph::prelude::*;
 /// # tokio_test::block_on(async move {
-/// # any_spawner::Executor::init_tokio(); let owner = reactive_graph::owner::Owner::new(); owner.set();
+/// # any_spawner::Executor::init_tokio();
 /// # let _guard = reactive_graph::diagnostics::SpecialNonReactiveZone::enter();
 /// async fn send_new_todo_to_api(task: String) -> usize {
 ///     // do something...
@@ -561,7 +561,7 @@ where
 /// function, because it is stored in [Action::input] as well.
 ///
 /// ```rust
-/// # use reactive_graph::actions::*; let owner = reactive_graph::owner::Owner::new(); owner.set();
+/// # use reactive_graph::actions::*;
 /// // if there's a single argument, just use that
 /// let action1 = Action::new(|input: &String| {
 ///     let input = input.clone();
@@ -607,7 +607,7 @@ where
     /// # use reactive_graph::actions::*;
     /// # use reactive_graph::prelude::*;
     /// # tokio_test::block_on(async move {
-    /// # any_spawner::Executor::init_tokio(); let owner = reactive_graph::owner::Owner::new(); owner.set();
+    /// # any_spawner::Executor::init_tokio();
     /// # let _guard = reactive_graph::diagnostics::SpecialNonReactiveZone::enter();
     /// let act = Action::new(|n: &u8| {
     ///     let n = n.to_owned();
@@ -721,7 +721,7 @@ where
     /// # use reactive_graph::actions::*;
     /// # use reactive_graph::prelude::*;
     /// # tokio_test::block_on(async move {
-    /// # any_spawner::Executor::init_tokio(); let owner = reactive_graph::owner::Owner::new(); owner.set();
+    /// # any_spawner::Executor::init_tokio();
     /// # let _guard = reactive_graph::diagnostics::SpecialNonReactiveZone::enter();
     /// let act = Action::new(|n: &u8| {
     ///     let n = n.to_owned();
@@ -752,7 +752,7 @@ where
     /// # use reactive_graph::actions::*;
     /// # use reactive_graph::prelude::*;
     /// # tokio_test::block_on(async move {
-    /// # any_spawner::Executor::init_tokio(); let owner = reactive_graph::owner::Owner::new(); owner.set();
+    /// # any_spawner::Executor::init_tokio();
     /// # let _guard = reactive_graph::diagnostics::SpecialNonReactiveZone::enter();
     /// let act = Action::new(|n: &u8| {
     ///     let n = n.to_owned();
@@ -791,7 +791,7 @@ where
     /// # use reactive_graph::actions::*;
     /// # use reactive_graph::prelude::*;
     /// # tokio_test::block_on(async move {
-    /// # any_spawner::Executor::init_tokio(); let owner = reactive_graph::owner::Owner::new(); owner.set();
+    /// # any_spawner::Executor::init_tokio();
     /// # let _guard = reactive_graph::diagnostics::SpecialNonReactiveZone::enter();
     /// let act = ArcAction::new(|n: &u8| {
     ///     let n = n.to_owned();
@@ -847,7 +847,7 @@ where
     /// # use reactive_graph::actions::*;
     /// # use reactive_graph::prelude::*;
     /// # tokio_test::block_on(async move {
-    /// # any_spawner::Executor::init_tokio(); let owner = reactive_graph::owner::Owner::new(); owner.set();
+    /// # any_spawner::Executor::init_tokio();
     /// # let _guard = reactive_graph::diagnostics::SpecialNonReactiveZone::enter();
     /// let act = Action::new(|n: &u8| {
     ///     let n = n.to_owned();
@@ -1009,7 +1009,7 @@ impl<I, O, S> Copy for Action<I, O, S> {}
 /// # use reactive_graph::actions::*;
 /// # use reactive_graph::prelude::*;
 /// # tokio_test::block_on(async move {
-/// # any_spawner::Executor::init_tokio(); let owner = reactive_graph::owner::Owner::new(); owner.set();
+/// # any_spawner::Executor::init_tokio();
 /// # let _guard = reactive_graph::diagnostics::SpecialNonReactiveZone::enter();
 /// let act = create_action(|n: &u8| {
 ///     let n = n.to_owned();

reactive_graph/src/actions/multi_action.rs

@@ -24,7 +24,7 @@ use std::{fmt::Debug, future::Future, panic::Location, pin::Pin, sync::Arc};
 /// # use reactive_graph::actions::*;
 /// # use reactive_graph::prelude::*;
 /// # tokio_test::block_on(async move {
-/// # any_spawner::Executor::init_tokio(); let owner = reactive_graph::owner::Owner::new(); owner.set();
+/// # any_spawner::Executor::init_tokio();
 /// # let _guard = reactive_graph::diagnostics::SpecialNonReactiveZone::enter();
 /// async fn send_new_todo_to_api(task: String) -> usize {
 ///   // do something...
@@ -105,7 +105,7 @@ where
     /// # use reactive_graph::actions::*;
     /// # use reactive_graph::prelude::*;
     /// # tokio_test::block_on(async move {
-    /// # any_spawner::Executor::init_tokio(); let owner = reactive_graph::owner::Owner::new(); owner.set();
+    /// # any_spawner::Executor::init_tokio();
     /// # let _guard = reactive_graph::diagnostics::SpecialNonReactiveZone::enter();
     /// // if there's a single argument, just use that
     /// let action1 = MultiAction::new(|input: &String| {
@@ -151,7 +151,7 @@ where
     /// # use reactive_graph::actions::*;
     /// # use reactive_graph::prelude::*;
     /// # tokio_test::block_on(async move {
-    /// # any_spawner::Executor::init_tokio(); let owner = reactive_graph::owner::Owner::new(); owner.set();
+    /// # any_spawner::Executor::init_tokio();
     /// # let _guard = reactive_graph::diagnostics::SpecialNonReactiveZone::enter();
     /// async fn send_new_todo_to_api(task: String) -> usize {
     ///   // do something...
@@ -202,7 +202,7 @@ where
     /// # use reactive_graph::actions::*;
     /// # use reactive_graph::prelude::*;
     /// # tokio_test::block_on(async move {
-    /// # any_spawner::Executor::init_tokio(); let owner = reactive_graph::owner::Owner::new(); owner.set();
+    /// # any_spawner::Executor::init_tokio();
     /// # let _guard = reactive_graph::diagnostics::SpecialNonReactiveZone::enter();
     /// async fn send_new_todo_to_api(task: String) -> usize {
     ///   // do something...
@@ -245,7 +245,7 @@ where
     /// # use reactive_graph::actions::*;
     /// # use reactive_graph::prelude::*;
     /// # tokio_test::block_on(async move {
-    /// # any_spawner::Executor::init_tokio(); let owner = reactive_graph::owner::Owner::new(); owner.set();
+    /// # any_spawner::Executor::init_tokio();
     /// # let _guard = reactive_graph::diagnostics::SpecialNonReactiveZone::enter();
     /// async fn send_new_todo_to_api(task: String) -> usize {
     ///   // do something...
@@ -286,7 +286,7 @@ where
     /// # use reactive_graph::actions::*;
     /// # use reactive_graph::prelude::*;
     /// # tokio_test::block_on(async move {
-    /// # any_spawner::Executor::init_tokio(); let owner = reactive_graph::owner::Owner::new(); owner.set();
+    /// # any_spawner::Executor::init_tokio();
     /// # let _guard = reactive_graph::diagnostics::SpecialNonReactiveZone::enter();
     /// async fn send_new_todo_to_api(task: String) -> usize {
     ///   // do something...
@@ -336,7 +336,7 @@ where
 /// # use reactive_graph::actions::*;
 /// # use reactive_graph::prelude::*;
 /// # tokio_test::block_on(async move {
-/// # any_spawner::Executor::init_tokio(); let owner = reactive_graph::owner::Owner::new(); owner.set();
+/// # any_spawner::Executor::init_tokio();
 /// # let _guard = reactive_graph::diagnostics::SpecialNonReactiveZone::enter();
 /// async fn send_new_todo_to_api(task: String) -> usize {
 ///   // do something...
@@ -403,7 +403,7 @@ impl<I, O> ArcMultiAction<I, O> {
     /// # use reactive_graph::actions::*;
     /// # use reactive_graph::prelude::*;
     /// # tokio_test::block_on(async move {
-    /// # any_spawner::Executor::init_tokio(); let owner = reactive_graph::owner::Owner::new(); owner.set();
+    /// # any_spawner::Executor::init_tokio();
     /// # let _guard = reactive_graph::diagnostics::SpecialNonReactiveZone::enter();
     /// // if there's a single argument, just use that
     /// let action1 = ArcMultiAction::new(|input: &String| {
@@ -452,7 +452,7 @@ where
     /// # use reactive_graph::actions::*;
     /// # use reactive_graph::prelude::*;
     /// # tokio_test::block_on(async move {
-    /// # any_spawner::Executor::init_tokio(); let owner = reactive_graph::owner::Owner::new(); owner.set();
+    /// # any_spawner::Executor::init_tokio();
     /// # let _guard = reactive_graph::diagnostics::SpecialNonReactiveZone::enter();
     /// async fn send_new_todo_to_api(task: String) -> usize {
     ///   // do something...
@@ -529,7 +529,7 @@ where
     /// # use reactive_graph::actions::*;
     /// # use reactive_graph::prelude::*;
     /// # tokio_test::block_on(async move {
-    /// # any_spawner::Executor::init_tokio(); let owner = reactive_graph::owner::Owner::new(); owner.set();
+    /// # any_spawner::Executor::init_tokio();
     /// # let _guard = reactive_graph::diagnostics::SpecialNonReactiveZone::enter();
     /// async fn send_new_todo_to_api(task: String) -> usize {
     ///   // do something...
@@ -579,7 +579,7 @@ impl<I, O> ArcMultiAction<I, O> {
     /// # use reactive_graph::actions::*;
     /// # use reactive_graph::prelude::*;
     /// # tokio_test::block_on(async move {
-    /// # any_spawner::Executor::init_tokio(); let owner = reactive_graph::owner::Owner::new(); owner.set();
+    /// # any_spawner::Executor::init_tokio();
     /// # let _guard = reactive_graph::diagnostics::SpecialNonReactiveZone::enter();
     /// async fn send_new_todo_to_api(task: String) -> usize {
     ///   // do something...
@@ -609,7 +609,7 @@ impl<I, O> ArcMultiAction<I, O> {
     /// # use reactive_graph::actions::*;
     /// # use reactive_graph::prelude::*;
     /// # tokio_test::block_on(async move {
-    /// # any_spawner::Executor::init_tokio(); let owner = reactive_graph::owner::Owner::new(); owner.set();
+    /// # any_spawner::Executor::init_tokio();
     /// # let _guard = reactive_graph::diagnostics::SpecialNonReactiveZone::enter();
     /// async fn send_new_todo_to_api(task: String) -> usize {
     ///   // do something...

reactive_graph/src/computed.rs

@@ -15,7 +15,6 @@ use crate::{
 };
 pub use arc_memo::*;
 pub use async_derived::*;
-pub(crate) use inner::MemoInner;
 pub use memo::*;
 pub use selector::*;
 
@@ -35,7 +34,7 @@ pub use selector::*;
 /// In the example below, setting an auth token will only trigger
 /// the token signal, but none of the other derived signals.
 /// ```
-/// # use reactive_graph::prelude::*; let owner = reactive_graph::owner::Owner::new(); owner.set();
+/// # use reactive_graph::prelude::*;
 /// # use reactive_graph::effect::Effect;
 /// # use reactive_graph::signal::RwSignal;
 /// # use reactive_graph::computed::*;

reactive_graph/src/computed/arc_memo.rs

@@ -40,7 +40,7 @@ use std::{
 ///
 /// ## Examples
 /// ```
-/// # use reactive_graph::prelude::*; let owner = reactive_graph::owner::Owner::new(); owner.set();
+/// # use reactive_graph::prelude::*;
 /// # use reactive_graph::computed::*;
 /// # use reactive_graph::signal::signal;
 /// # fn really_expensive_computation(value: i32) -> i32 { value };
@@ -132,7 +132,10 @@ where
     pub fn new_with_compare(
         fun: impl Fn(Option<&T>) -> T + Send + Sync + 'static,
         changed: fn(Option<&T>, Option<&T>) -> bool,
-    ) -> Self {
+    ) -> Self
+    where
+        T: PartialEq,
+    {
         Self::new_owning(move |prev: Option<T>| {
             let new_value = fun(prev.as_ref());
             let changed = changed(prev.as_ref(), Some(&new_value));
@@ -154,7 +157,10 @@ where
     )]
     pub fn new_owning(
         fun: impl Fn(Option<T>) -> (T, bool) + Send + Sync + 'static,
-    ) -> Self {
+    ) -> Self
+    where
+        T: PartialEq,
+    {
         let inner = Arc::new_cyclic(|weak| {
             let subscriber = AnySubscriber(
                 weak.as_ptr() as usize,

reactive_graph/src/computed/async_derived/arc_async_derived.rs

@@ -19,7 +19,7 @@ use crate::{
     },
     traits::{
         DefinedAt, IsDisposed, Notify, ReadUntracked, Track, UntrackableGuard,
-        Write,
+        Writeable,
     },
     transition::AsyncTransition,
 };
@@ -53,10 +53,10 @@ use std::{
 /// ## Examples
 /// ```rust
 /// # use reactive_graph::computed::*;
-/// # use reactive_graph::signal::*; let owner = reactive_graph::owner::Owner::new(); owner.set();
+/// # use reactive_graph::signal::*;
 /// # use reactive_graph::prelude::*;
 /// # tokio_test::block_on(async move {
-/// # any_spawner::Executor::init_tokio(); let owner = reactive_graph::owner::Owner::new(); owner.set();
+/// # any_spawner::Executor::init_tokio();
 /// # let _guard = reactive_graph::diagnostics::SpecialNonReactiveZone::enter();
 ///
 /// let signal1 = RwSignal::new(0);
@@ -534,11 +534,11 @@ impl<T: 'static> ArcAsyncDerived<T> {
 
     /// Returns a `Future` that is ready when this resource has next finished loading.
     pub fn ready(&self) -> AsyncDerivedReadyFuture {
-        AsyncDerivedReadyFuture::new(
-            self.to_any_source(),
-            &self.loading,
-            &self.wakers,
-        )
+        AsyncDerivedReadyFuture {
+            source: self.to_any_source(),
+            loading: Arc::clone(&self.loading),
+            wakers: Arc::clone(&self.wakers),
+        }
     }
 }
 
@@ -600,7 +600,7 @@ impl<T: 'static> Notify for ArcAsyncDerived<T> {
     }
 }
 
-impl<T: 'static> Write for ArcAsyncDerived<T> {
+impl<T: 'static> Writeable for ArcAsyncDerived<T> {
     type Value = Option<T>;
 
     fn try_write(&self) -> Option<impl UntrackableGuard<Target = Self::Value>> {

reactive_graph/src/computed/async_derived/async_derived.rs

@@ -8,7 +8,7 @@ use crate::{
     signal::guards::{AsyncPlain, ReadGuard, WriteGuard},
     traits::{
         DefinedAt, Dispose, IsDisposed, Notify, ReadUntracked,
-        UntrackableGuard, Write,
+        UntrackableGuard, Writeable,
     },
     unwrap_signal,
 };
@@ -29,10 +29,10 @@ use std::{future::Future, ops::DerefMut, panic::Location};
 /// ## Examples
 /// ```rust
 /// # use reactive_graph::computed::*;
-/// # use reactive_graph::signal::*; let owner = reactive_graph::owner::Owner::new(); owner.set();
+/// # use reactive_graph::signal::*;
 /// # use reactive_graph::prelude::*;
 /// # tokio_test::block_on(async move {
-/// # any_spawner::Executor::init_tokio(); let owner = reactive_graph::owner::Owner::new(); owner.set();
+/// # any_spawner::Executor::init_tokio();
 /// # let _guard = reactive_graph::diagnostics::SpecialNonReactiveZone::enter();
 ///
 /// let signal1 = RwSignal::new(0);
@@ -300,7 +300,7 @@ where
     }
 }
 
-impl<T, S> Write for AsyncDerived<T, S>
+impl<T, S> Writeable for AsyncDerived<T, S>
 where
     T: 'static,
     S: Storage<ArcAsyncDerived<T>>,

reactive_graph/src/computed/async_derived/future_impls.rs

@@ -34,21 +34,6 @@ pub struct AsyncDerivedReadyFuture {
     pub(crate) wakers: Arc<RwLock<Vec<Waker>>>,
 }
 
-impl AsyncDerivedReadyFuture {
-    /// Creates a new [`Future`] that will be ready when the given resource is ready.
-    pub fn new(
-        source: AnySource,
-        loading: &Arc<AtomicBool>,
-        wakers: &Arc<RwLock<Vec<Waker>>>,
-    ) -> Self {
-        AsyncDerivedReadyFuture {
-            source,
-            loading: Arc::clone(loading),
-            wakers: Arc::clone(wakers),
-        }
-    }
-}
-
 impl Future for AsyncDerivedReadyFuture {
     type Output = ();
 

reactive_graph/src/computed/async_derived/mod.rs

@@ -58,7 +58,7 @@ impl<Fut: Future> Future for ScopedFuture<Fut> {
 pub mod suspense {
     use crate::{
         signal::ArcRwSignal,
-        traits::{Update, Write},
+        traits::{Update, Writeable},
     };
     use futures::channel::oneshot::Sender;
     use or_poisoned::OrPoisoned;

reactive_graph/src/computed/memo.rs

@@ -36,7 +36,7 @@ use std::{fmt::Debug, hash::Hash, panic::Location};
 /// # use reactive_graph::effect::Effect;
 /// # use reactive_graph::signal::signal;
 /// # tokio_test::block_on(async move {
-/// # any_spawner::Executor::init_tokio(); let owner = reactive_graph::owner::Owner::new(); owner.set();
+/// # any_spawner::Executor::init_tokio();
 /// # tokio::task::LocalSet::new().run_until(async {
 /// # fn really_expensive_computation(value: i32) -> i32 { value };
 /// let (value, set_value) = signal(0);
@@ -161,7 +161,7 @@ where
     /// # use reactive_graph::effect::Effect;
     /// # use reactive_graph::signal::signal;
     /// # tokio_test::block_on(async move {
-    /// # any_spawner::Executor::init_tokio(); let owner = reactive_graph::owner::Owner::new(); owner.set();
+    /// # any_spawner::Executor::init_tokio();
     /// # fn really_expensive_computation(value: i32) -> i32 { value };
     /// let (value, set_value) = signal(0);
     ///
@@ -195,7 +195,10 @@ where
     pub fn new_with_compare(
         fun: impl Fn(Option<&T>) -> T + Send + Sync + 'static,
         changed: fn(Option<&T>, Option<&T>) -> bool,
-    ) -> Self {
+    ) -> Self
+    where
+        T: PartialEq,
+    {
         Self {
             #[cfg(debug_assertions)]
             defined_at: Location::caller(),
@@ -219,7 +222,10 @@ where
     )]
     pub fn new_owning(
         fun: impl Fn(Option<T>) -> (T, bool) + Send + Sync + 'static,
-    ) -> Self {
+    ) -> Self
+    where
+        T: PartialEq,
+    {
         Self {
             #[cfg(debug_assertions)]
             defined_at: Location::caller(),

reactive_graph/src/computed/selector.rs

@@ -19,13 +19,13 @@ use std::{
 ///
 /// ```
 /// # use reactive_graph::computed::*;
-/// # use reactive_graph::signal::*; let owner = reactive_graph::owner::Owner::new(); owner.set();
+/// # use reactive_graph::signal::*;
 /// # use reactive_graph::prelude::*;
 /// # use reactive_graph::effect::Effect;
-/// # use reactive_graph::owner::StoredValue; let owner = reactive_graph::owner::Owner::new(); owner.set();
+/// # use reactive_graph::owner::StoredValue;
 /// # tokio_test::block_on(async move {
 /// # tokio::task::LocalSet::new().run_until(async move {
-/// # any_spawner::Executor::init_tokio(); let owner = reactive_graph::owner::Owner::new(); owner.set();
+/// # any_spawner::Executor::init_tokio();
 /// # let _guard = reactive_graph::diagnostics::SpecialNonReactiveZone::enter();
 /// let a = RwSignal::new(0);
 /// let is_selected = Selector::new(move || a.get());

reactive_graph/src/diagnostics.rs

@@ -53,8 +53,7 @@ impl Drop for SpecialNonReactiveZoneGuard {
 }
 
 pin_project! {
-    #[doc(hidden)]
-    pub struct SpecialNonReactiveFuture<Fut> {
+    pub(crate) struct SpecialNonReactiveFuture<Fut> {
         #[pin]
         inner: Fut
     }

reactive_graph/src/effect/effect.rs

@@ -37,13 +37,13 @@ use std::{
 ///
 /// ```
 /// # use reactive_graph::computed::*;
-/// # use reactive_graph::signal::*; let owner = reactive_graph::owner::Owner::new(); owner.set();
+/// # use reactive_graph::signal::*;
 /// # use reactive_graph::prelude::*;
 /// # use reactive_graph::effect::Effect;
 /// # use reactive_graph::owner::ArenaItem;
 /// # tokio_test::block_on(async move {
 /// # tokio::task::LocalSet::new().run_until(async move {
-/// # any_spawner::Executor::init_tokio(); let owner = reactive_graph::owner::Owner::new(); owner.set();
+/// # any_spawner::Executor::init_tokio();
 /// let a = RwSignal::new(0);
 /// let b = RwSignal::new(0);
 ///
@@ -185,7 +185,7 @@ impl Effect<LocalStorage> {
     /// # use reactive_graph::signal::signal;
     /// # tokio_test::block_on(async move {
     /// # tokio::task::LocalSet::new().run_until(async move {
-    /// # any_spawner::Executor::init_tokio(); let owner = reactive_graph::owner::Owner::new(); owner.set();
+    /// # any_spawner::Executor::init_tokio();
     /// #
     /// let (num, set_num) = signal(0);
     ///
@@ -217,7 +217,7 @@ impl Effect<LocalStorage> {
     /// # use reactive_graph::signal::signal;
     /// # tokio_test::block_on(async move {
     /// # tokio::task::LocalSet::new().run_until(async move {
-    /// # any_spawner::Executor::init_tokio(); let owner = reactive_graph::owner::Owner::new(); owner.set();
+    /// # any_spawner::Executor::init_tokio();
     /// #
     /// let (num, set_num) = signal(0);
     /// let (cb_num, set_cb_num) = signal(0);
@@ -256,7 +256,7 @@ impl Effect<LocalStorage> {
     /// # use reactive_graph::signal::signal;
     /// # tokio_test::block_on(async move {
     /// # tokio::task::LocalSet::new().run_until(async move {
-    /// # any_spawner::Executor::init_tokio(); let owner = reactive_graph::owner::Owner::new(); owner.set();
+    /// # any_spawner::Executor::init_tokio();
     /// #
     /// let (num, set_num) = signal(0);
     ///

reactive_graph/src/graph/subscriber.rs

@@ -104,11 +104,11 @@ impl Observer {
 ///
 /// ```rust
 /// # use reactive_graph::computed::*;
-/// # use reactive_graph::signal::*; let owner = reactive_graph::owner::Owner::new(); owner.set();
+/// # use reactive_graph::signal::*;
 /// # use reactive_graph::prelude::*;
-/// # use reactive_graph::graph::untrack;
+/// # use reactive_graph::untrack;
 /// # tokio_test::block_on(async move {
-/// # any_spawner::Executor::init_tokio(); let owner = reactive_graph::owner::Owner::new(); owner.set();
+/// # any_spawner::Executor::init_tokio();
 /// let (a, set_a) = signal(0);
 /// let (b, set_b) = signal(0);
 /// let c = Memo::new(move |_| {

reactive_graph/src/lib.rs

@@ -14,7 +14,6 @@
 //!
 //! ```rust
 //! # any_spawner::Executor::init_futures_executor();
-//! # let owner = reactive_graph::owner::Owner::new(); owner.set();
 //! use reactive_graph::{
 //!     computed::ArcMemo,
 //!     effect::Effect,
@@ -88,7 +87,7 @@ pub mod traits;
 pub mod transition;
 pub mod wrappers;
 
-use computed::ScopedFuture;
+pub use graph::untrack;
 
 #[cfg(feature = "nightly")]
 mod nightly;
@@ -125,42 +124,9 @@ pub fn log_warning(text: Arguments) {
 
 /// Calls [`Executor::spawn`], but ensures that the task also runs in the current arena, if
 /// multithreaded arena sandboxing is enabled.
-pub fn spawn(task: impl Future<Output = ()> + Send + 'static) {
+pub(crate) fn spawn(task: impl Future<Output = ()> + Send + 'static) {
     #[cfg(feature = "sandboxed-arenas")]
     let task = owner::Sandboxed::new(task);
 
     any_spawner::Executor::spawn(task);
 }
-
-/// Calls [`Executor::spawn_local`], but ensures that the task runs under the current reactive [`Owner`]
-/// and [`Observed`]. Does not cancel the task if the owner is cleaned up.
-pub fn spawn_local_scoped(task: impl Future<Output = ()> + 'static) {
-    let task = ScopedFuture::new(task);
-
-    #[cfg(feature = "sandboxed-arenas")]
-    let task = owner::Sandboxed::new(task);
-
-    any_spawner::Executor::spawn_local(task);
-}
-
-/// Calls [`Executor::spawn_local`], but ensures that the task runs under the current reactive [`Owner`]
-/// and [`Observed`]. Cancels the task if the owner is cleaned up.
-pub fn spawn_local_scoped_with_cancellation(
-    task: impl Future<Output = ()> + 'static,
-) {
-    use crate::owner::on_cleanup;
-    use futures::future::{AbortHandle, Abortable};
-
-    let (abort_handle, abort_registration) = AbortHandle::new_pair();
-    on_cleanup(move || abort_handle.abort());
-
-    let task = Abortable::new(task, abort_registration);
-    let task = ScopedFuture::new(task);
-
-    #[cfg(feature = "sandboxed-arenas")]
-    let task = owner::Sandboxed::new(task);
-
-    any_spawner::Executor::spawn_local(async move {
-        _ = task.await;
-    });
-}

reactive_graph/src/owner.rs

@@ -12,18 +12,14 @@ use std::{
     sync::{Arc, RwLock, Weak},
 };
 
-mod arc_stored_value;
 mod arena;
 mod arena_item;
 mod context;
 mod storage;
 mod stored_value;
 use self::arena::Arena;
-pub use arc_stored_value::ArcStoredValue;
 #[cfg(feature = "sandboxed-arenas")]
 pub use arena::sandboxed::Sandboxed;
-#[cfg(feature = "sandboxed-arenas")]
-use arena::ArenaMap;
 use arena::NodeId;
 pub use arena_item::*;
 pub use context::*;
@@ -124,12 +120,6 @@ impl Owner {
                 contexts: Default::default(),
                 cleanups: Default::default(),
                 children: Default::default(),
-                #[cfg(feature = "sandboxed-arenas")]
-                arena: parent
-                    .as_ref()
-                    .and_then(|parent| parent.upgrade())
-                    .map(|parent| parent.read().or_poisoned().arena.clone())
-                    .unwrap_or_default(),
             })),
             #[cfg(feature = "hydration")]
             shared_context,
@@ -150,10 +140,11 @@ impl Owner {
     /// Only one `SharedContext` needs to be created per request, and will be automatically shared
     /// by any other `Owner`s created under this one.
     #[cfg(feature = "hydration")]
-    #[track_caller]
     pub fn new_root(
         shared_context: Option<Arc<dyn SharedContext + Send + Sync>>,
     ) -> Self {
+        Arena::enter_new();
+
         let this = Self {
             inner: Arc::new(RwLock::new(OwnerInner {
                 parent: None,
@@ -161,21 +152,17 @@ impl Owner {
                 contexts: Default::default(),
                 cleanups: Default::default(),
                 children: Default::default(),
-                #[cfg(feature = "sandboxed-arenas")]
-                arena: Default::default(),
             })),
             #[cfg(feature = "hydration")]
             shared_context,
         };
-        this.set();
+        OWNER.with_borrow_mut(|owner| *owner = Some(this.clone()));
         this
     }
 
     /// Creates a new `Owner` that is the child of the current `Owner`, if any.
     pub fn child(&self) -> Self {
         let parent = Some(Arc::downgrade(&self.inner));
-        #[cfg(feature = "sandboxed-arenas")]
-        let arena = self.inner.read().or_poisoned().arena.clone();
         let child = Self {
             inner: Arc::new(RwLock::new(OwnerInner {
                 parent,
@@ -183,8 +170,6 @@ impl Owner {
                 contexts: Default::default(),
                 cleanups: Default::default(),
                 children: Default::default(),
-                #[cfg(feature = "sandboxed-arenas")]
-                arena,
             })),
             #[cfg(feature = "hydration")]
             shared_context: self.shared_context.clone(),
@@ -200,8 +185,6 @@ impl Owner {
     /// Sets this as the current `Owner`.
     pub fn set(&self) {
         OWNER.with_borrow_mut(|owner| *owner = Some(self.clone()));
-        #[cfg(feature = "sandboxed-arenas")]
-        Arena::set(&self.inner.read().or_poisoned().arena);
     }
 
     /// Runs the given function with this as the current `Owner`.
@@ -211,8 +194,6 @@ impl Owner {
                 mem::replace(&mut *o.borrow_mut(), Some(self.clone()))
             })
         };
-        #[cfg(feature = "sandboxed-arenas")]
-        Arena::set(&self.inner.read().or_poisoned().arena);
         let val = fun();
         OWNER.with(|o| {
             *o.borrow_mut() = prev;
@@ -353,8 +334,6 @@ pub(crate) struct OwnerInner {
     pub contexts: FxHashMap<TypeId, Box<dyn Any + Send + Sync>>,
     pub cleanups: Vec<Box<dyn FnOnce() + Send + Sync>>,
     pub children: Vec<Weak<RwLock<OwnerInner>>>,
-    #[cfg(feature = "sandboxed-arenas")]
-    arena: Arc<RwLock<ArenaMap>>,
 }
 
 impl Debug for OwnerInner {
@@ -382,19 +361,11 @@ impl Drop for OwnerInner {
 
         let nodes = mem::take(&mut self.nodes);
         if !nodes.is_empty() {
-            #[cfg(not(feature = "sandboxed-arenas"))]
             Arena::with_mut(|arena| {
                 for node in nodes {
                     _ = arena.remove(node);
                 }
             });
-            #[cfg(feature = "sandboxed-arenas")]
-            {
-                let mut arena = self.arena.write().or_poisoned();
-                for node in nodes {
-                    _ = arena.remove(node);
-                }
-            }
         }
     }
 }
@@ -423,20 +394,11 @@ impl Cleanup for RwLock<OwnerInner> {
         }
 
         if !nodes.is_empty() {
-            #[cfg(not(feature = "sandboxed-arenas"))]
             Arena::with_mut(|arena| {
                 for node in nodes {
                     _ = arena.remove(node);
                 }
             });
-            #[cfg(feature = "sandboxed-arenas")]
-            {
-                let arena = self.read().or_poisoned().arena.clone();
-                let mut arena = arena.write().or_poisoned();
-                for node in nodes {
-                    _ = arena.remove(node);
-                }
-            }
         }
     }
 }

reactive_graph/src/owner/arc_stored_value.rs

@@ -1,126 +0,0 @@
-use crate::{
-    signal::guards::{Plain, ReadGuard, UntrackedWriteGuard},
-    traits::{DefinedAt, IsDisposed, ReadValue, WriteValue},
-};
-use std::{
-    fmt::{Debug, Formatter},
-    hash::Hash,
-    panic::Location,
-    sync::{Arc, RwLock},
-};
-
-/// A reference-counted getter for any value non-reactively.
-///
-/// This is a reference-counted value, which is `Clone` but not `Copy`.
-/// For arena-allocated `Copy` values, use [`StoredValue`](super::StoredValue).
-///
-/// This allows you to create a stable reference for any value by storing it within
-/// the reactive system. Unlike e.g. [`ArcRwSignal`](crate::signal::ArcRwSignal), it is not reactive;
-/// accessing it does not cause effects to subscribe, and
-/// updating it does not notify anything else.
-pub struct ArcStoredValue<T> {
-    #[cfg(debug_assertions)]
-    defined_at: &'static Location<'static>,
-    value: Arc<RwLock<T>>,
-}
-
-impl<T> Clone for ArcStoredValue<T> {
-    fn clone(&self) -> Self {
-        Self {
-            #[cfg(debug_assertions)]
-            defined_at: self.defined_at,
-            value: Arc::clone(&self.value),
-        }
-    }
-}
-
-impl<T> Debug for ArcStoredValue<T> {
-    fn fmt(&self, f: &mut Formatter<'_>) -> core::fmt::Result {
-        f.debug_struct("ArcStoredValue")
-            .field("type", &std::any::type_name::<T>())
-            .field("value", &Arc::as_ptr(&self.value))
-            .finish()
-    }
-}
-
-impl<T: Default> Default for ArcStoredValue<T> {
-    #[track_caller]
-    fn default() -> Self {
-        Self {
-            #[cfg(debug_assertions)]
-            defined_at: Location::caller(),
-            value: Arc::new(RwLock::new(T::default())),
-        }
-    }
-}
-
-impl<T> PartialEq for ArcStoredValue<T> {
-    fn eq(&self, other: &Self) -> bool {
-        Arc::ptr_eq(&self.value, &other.value)
-    }
-}
-
-impl<T> Eq for ArcStoredValue<T> {}
-
-impl<T> Hash for ArcStoredValue<T> {
-    fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
-        std::ptr::hash(&Arc::as_ptr(&self.value), state);
-    }
-}
-
-impl<T> DefinedAt for ArcStoredValue<T> {
-    fn defined_at(&self) -> Option<&'static Location<'static>> {
-        #[cfg(debug_assertions)]
-        {
-            Some(self.defined_at)
-        }
-        #[cfg(not(debug_assertions))]
-        {
-            None
-        }
-    }
-}
-
-impl<T> ArcStoredValue<T> {
-    /// Creates a new stored value, taking the initial value as its argument.
-    #[cfg_attr(
-        feature = "tracing",
-        tracing::instrument(level = "trace", skip_all)
-    )]
-    #[track_caller]
-    pub fn new(value: T) -> Self {
-        Self {
-            #[cfg(debug_assertions)]
-            defined_at: Location::caller(),
-            value: Arc::new(RwLock::new(value)),
-        }
-    }
-}
-
-impl<T> ReadValue for ArcStoredValue<T>
-where
-    T: 'static,
-{
-    type Value = ReadGuard<T, Plain<T>>;
-
-    fn try_read_value(&self) -> Option<ReadGuard<T, Plain<T>>> {
-        Plain::try_new(Arc::clone(&self.value)).map(ReadGuard::new)
-    }
-}
-
-impl<T> WriteValue for ArcStoredValue<T>
-where
-    T: 'static,
-{
-    type Value = T;
-
-    fn try_write_value(&self) -> Option<UntrackedWriteGuard<T>> {
-        UntrackedWriteGuard::try_new(self.value.clone())
-    }
-}
-
-impl<T> IsDisposed for ArcStoredValue<T> {
-    fn is_disposed(&self) -> bool {
-        false
-    }
-}

reactive_graph/src/owner/arena.rs

@@ -1,42 +1,38 @@
 use or_poisoned::OrPoisoned;
 use slotmap::{new_key_type, SlotMap};
-#[cfg(feature = "sandboxed-arenas")]
-use std::cell::RefCell;
 #[cfg(not(feature = "sandboxed-arenas"))]
 use std::sync::OnceLock;
+use std::{any::Any, hash::Hash, sync::RwLock};
 #[cfg(feature = "sandboxed-arenas")]
-use std::sync::Weak;
-use std::{
-    any::Any,
-    hash::Hash,
-    sync::{Arc, RwLock},
-};
+use std::{cell::RefCell, sync::Arc};
 
 new_key_type! {
     /// Unique identifier for an item stored in the arena.
     pub struct NodeId;
 }
 
-pub struct Arena;
+pub(crate) struct Arena;
 
-pub type ArenaMap = SlotMap<NodeId, Box<dyn Any + Send + Sync>>;
+type ArenaMap = SlotMap<NodeId, Box<dyn Any + Send + Sync>>;
 
 #[cfg(not(feature = "sandboxed-arenas"))]
 static MAP: OnceLock<RwLock<ArenaMap>> = OnceLock::new();
 #[cfg(feature = "sandboxed-arenas")]
 thread_local! {
-    pub(crate) static MAP: RefCell<Option<Weak<RwLock<ArenaMap>>>> = RefCell::new(Some(Default::default()));
+    pub(crate) static MAP: RefCell<Option<Arc<RwLock<ArenaMap>>>> = RefCell::new(Some(Default::default()));
 }
 
 impl Arena {
+    #[cfg(feature = "hydration")]
     #[inline(always)]
-    #[allow(unused)]
-    pub fn set(arena: &Arc<RwLock<ArenaMap>>) {
+    pub fn enter_new() {
         #[cfg(feature = "sandboxed-arenas")]
         {
-            let new_arena = Arc::downgrade(arena);
+            use std::sync::Arc;
             MAP.with_borrow_mut(|arena| {
-                *arena = Some(new_arena);
+                *arena = Some(Arc::new(RwLock::new(
+                    SlotMap::with_capacity_and_key(32),
+                )))
             })
         }
     }
@@ -52,7 +48,6 @@ impl Arena {
             MAP.with_borrow(|arena| {
                 fun(&arena
                     .as_ref()
-                    .and_then(Weak::upgrade)
                     .unwrap_or_else(|| {
                         panic!(
                             "at {}, the `sandboxed-arenas` feature is active, \
@@ -78,7 +73,6 @@ impl Arena {
             MAP.with_borrow(|arena| {
                 fun(&mut arena
                     .as_ref()
-                    .and_then(Weak::upgrade)
                     .unwrap_or_else(|| {
                         panic!(
                             "at {}, the `sandboxed-arenas` feature is active, \
@@ -100,11 +94,20 @@ pub mod sandboxed {
     use pin_project_lite::pin_project;
     use std::{
         future::Future,
+        mem,
         pin::Pin,
-        sync::{Arc, RwLock, Weak},
+        sync::{Arc, RwLock},
         task::{Context, Poll},
     };
 
+    impl Arena {
+        fn set(new_arena: Arc<RwLock<ArenaMap>>) -> UnsetArenaOnDrop {
+            MAP.with_borrow_mut(|arena| {
+                UnsetArenaOnDrop(mem::replace(arena, Some(new_arena)))
+            })
+        }
+    }
+
     pin_project! {
         /// A [`Future`] that restores its associated arena as the current arena whenever it is
         /// polled.
@@ -114,7 +117,7 @@ pub mod sandboxed {
         /// stored values. Wrapping a `Future` in `Sandboxed` ensures that it will always use the
         /// same arena that it was created under.
         pub struct Sandboxed<T> {
-            arena: Option<Arc<RwLock<ArenaMap>>>,
+            arena: Arc<RwLock<ArenaMap>>,
             #[pin]
             inner: T,
         }
@@ -124,7 +127,12 @@ pub mod sandboxed {
         /// Wraps the given [`Future`], ensuring that any [`ArenaItem`] created while it is being
         /// polled will be associated with the same arena that was active when this was called.
         pub fn new(inner: T) -> Self {
-            let arena = MAP.with_borrow(|n| n.as_ref().and_then(Weak::upgrade));
+            let arena = MAP.with_borrow(|current| {
+                Arc::clone(current.as_ref().expect(
+                    "the `sandboxed-arenas` feature is active, but no Arena \
+                     is active",
+                ))
+            });
             Self { arena, inner }
         }
     }
@@ -139,11 +147,11 @@ pub mod sandboxed {
             self: Pin<&mut Self>,
             cx: &mut Context<'_>,
         ) -> Poll<Self::Output> {
-            if let Some(arena) = self.arena.as_ref() {
-                Arena::set(arena);
-            }
+            let unset = Arena::set(Arc::clone(&self.arena));
             let this = self.project();
-            this.inner.poll(cx)
+            let res = this.inner.poll(cx);
+            drop(unset);
+            res
         }
     }
 
@@ -157,11 +165,22 @@ pub mod sandboxed {
             self: Pin<&mut Self>,
             cx: &mut Context<'_>,
         ) -> Poll<Option<Self::Item>> {
-            if let Some(arena) = self.arena.as_ref() {
-                Arena::set(arena);
-            }
+            let unset = Arena::set(Arc::clone(&self.arena));
             let this = self.project();
-            this.inner.poll_next(cx)
+            let res = this.inner.poll_next(cx);
+            drop(unset);
+            res
+        }
+    }
+
+    #[derive(Debug)]
+    struct UnsetArenaOnDrop(Option<Arc<RwLock<ArenaMap>>>);
+
+    impl Drop for UnsetArenaOnDrop {
+        fn drop(&mut self) {
+            if let Some(inner) = self.0.take() {
+                MAP.with_borrow_mut(|current_map| *current_map = Some(inner));
+            }
         }
     }
 }

reactive_graph/src/owner/context.rs

@@ -108,7 +108,6 @@ impl Owner {
 /// ```rust
 /// # use reactive_graph::prelude::*;
 /// # use reactive_graph::owner::*;
-/// # let owner = Owner::new(); owner.set();
 /// # use reactive_graph::effect::Effect;
 /// # futures::executor::block_on(async move {
 /// # any_spawner::Executor::init_futures_executor();
@@ -141,7 +140,6 @@ impl Owner {
 /// ```rust
 /// # use reactive_graph::prelude::*;
 /// # use reactive_graph::owner::*;
-/// # let owner = Owner::new(); owner.set();
 /// # use reactive_graph::effect::Effect;
 /// # futures::executor::block_on(async move {
 /// # any_spawner::Executor::init_futures_executor();
@@ -189,7 +187,6 @@ pub fn provide_context<T: Send + Sync + 'static>(value: T) {
 /// ```rust
 /// # use reactive_graph::prelude::*;
 /// # use reactive_graph::owner::*;
-/// # let owner = Owner::new(); owner.set();
 /// # use reactive_graph::effect::Effect;
 /// # futures::executor::block_on(async move {
 /// # any_spawner::Executor::init_futures_executor();
@@ -235,7 +232,6 @@ pub fn use_context<T: Clone + 'static>() -> Option<T> {
 /// ```rust
 /// # use reactive_graph::prelude::*;
 /// # use reactive_graph::owner::*;
-/// # let owner = Owner::new(); owner.set();
 /// # use reactive_graph::effect::Effect;
 /// # futures::executor::block_on(async move {
 /// # any_spawner::Executor::init_futures_executor();
@@ -290,7 +286,6 @@ pub fn expect_context<T: Clone + 'static>() -> T {
 /// ```rust
 /// # use reactive_graph::prelude::*;
 /// # use reactive_graph::owner::*;
-/// # let owner = Owner::new(); owner.set();
 /// # use reactive_graph::effect::Effect;
 /// # futures::executor::block_on(async move {
 /// # any_spawner::Executor::init_futures_executor();

reactive_graph/src/owner/stored_value.rs

@@ -1,16 +1,13 @@
-use super::{
-    arc_stored_value::ArcStoredValue, ArenaItem, LocalStorage, Storage,
-    SyncStorage,
-};
+use super::{ArenaItem, LocalStorage, Storage, SyncStorage};
 use crate::{
-    signal::guards::{Plain, ReadGuard, UntrackedWriteGuard},
-    traits::{DefinedAt, Dispose, IsDisposed, ReadValue, WriteValue},
+    traits::{DefinedAt, Dispose, IsDisposed},
     unwrap_signal,
 };
+use or_poisoned::OrPoisoned;
 use std::{
-    fmt::{Debug, Formatter},
     hash::Hash,
     panic::Location,
+    sync::{Arc, RwLock},
 };
 
 /// A **non-reactive**, `Copy` handle for any value.
@@ -20,8 +17,9 @@ use std::{
 /// and [`RwSignal`](crate::signal::RwSignal)), it is `Copy` and `'static`. Unlike the signal
 /// types, it is not reactive; accessing it does not cause effects to subscribe, and
 /// updating it does not notify anything else.
+#[derive(Debug)]
 pub struct StoredValue<T, S = SyncStorage> {
-    value: ArenaItem<ArcStoredValue<T>, S>,
+    value: ArenaItem<Arc<RwLock<T>>, S>,
     #[cfg(debug_assertions)]
     defined_at: &'static Location<'static>,
 }
@@ -34,18 +32,6 @@ impl<T, S> Clone for StoredValue<T, S> {
     }
 }
 
-impl<T, S> Debug for StoredValue<T, S>
-where
-    S: Debug,
-{
-    fn fmt(&self, f: &mut Formatter<'_>) -> core::fmt::Result {
-        f.debug_struct("StoredValue")
-            .field("type", &std::any::type_name::<T>())
-            .field("value", &self.value)
-            .finish()
-    }
-}
-
 impl<T, S> PartialEq for StoredValue<T, S> {
     fn eq(&self, other: &Self) -> bool {
         self.value == other.value
@@ -76,13 +62,13 @@ impl<T, S> DefinedAt for StoredValue<T, S> {
 impl<T, S> StoredValue<T, S>
 where
     T: 'static,
-    S: Storage<ArcStoredValue<T>>,
+    S: Storage<Arc<RwLock<T>>>,
 {
     /// Stores the given value in the arena allocator.
     #[track_caller]
     pub fn new_with_storage(value: T) -> Self {
         Self {
-            value: ArenaItem::new_with_storage(ArcStoredValue::new(value)),
+            value: ArenaItem::new_with_storage(Arc::new(RwLock::new(value))),
             #[cfg(debug_assertions)]
             defined_at: Location::caller(),
         }
@@ -92,7 +78,7 @@ where
 impl<T, S> Default for StoredValue<T, S>
 where
     T: Default + 'static,
-    S: Storage<ArcStoredValue<T>>,
+    S: Storage<Arc<RwLock<T>>>,
 {
     #[track_caller] // Default trait is not annotated with #[track_caller]
     fn default() -> Self {
@@ -122,31 +108,230 @@ where
     }
 }
 
-impl<T, S> ReadValue for StoredValue<T, S>
-where
-    T: 'static,
-    S: Storage<ArcStoredValue<T>>,
-{
-    type Value = ReadGuard<T, Plain<T>>;
-
-    fn try_read_value(&self) -> Option<ReadGuard<T, Plain<T>>> {
+impl<T, S: Storage<Arc<RwLock<T>>>> StoredValue<T, S> {
+    /// Returns an [`Option`] of applying a function to the value within the [`StoredValue`].
+    ///
+    /// If the owner of the reactive node has not been disposed [`Some`] is returned. Calling this
+    /// function after the owner has been disposed will always return [`None`].
+    ///
+    /// See [`StoredValue::with_value`] for a version that panics in the case of the owner being
+    /// disposed.
+    ///
+    /// # Examples
+    /// ```rust
+    /// # use reactive_graph::owner::StoredValue;
+    /// # use reactive_graph::traits::Dispose;
+    ///
+    /// // Does not implement Clone
+    /// struct Data {
+    ///     rows: Vec<u8>,
+    /// }
+    ///
+    /// let data = StoredValue::new(Data {
+    ///     rows: vec![0, 1, 2, 3, 4],
+    /// });
+    ///
+    /// // Easy to move into closures because StoredValue is Copy + 'static.
+    /// // *NOTE* this is not the same thing as a derived signal!
+    /// // *NOTE* this will not be automatically rerun as StoredValue is NOT reactive!
+    /// let length_fn = move || data.try_with_value(|inner| inner.rows.len());
+    ///
+    /// let sum = data.try_with_value(|inner| inner.rows.iter().sum::<u8>());
+    ///
+    /// assert_eq!(sum, Some(10));
+    /// assert_eq!(length_fn(), Some(5));
+    ///
+    /// // You should not call dispose yourself in normal user code.
+    /// // This is shown here for the sake of the example.
+    /// data.dispose();
+    ///
+    /// let last = data.try_with_value(|inner| inner.rows.last().cloned());
+    ///
+    /// assert_eq!(last, None);
+    /// assert_eq!(length_fn(), None);
+    /// ```
+    #[track_caller]
+    pub fn try_with_value<U>(&self, fun: impl FnOnce(&T) -> U) -> Option<U> {
         self.value
             .try_get_value()
-            .and_then(|inner| inner.try_read_value())
+            .map(|inner| fun(&*inner.read().or_poisoned()))
     }
-}
 
-impl<T, S> WriteValue for StoredValue<T, S>
-where
-    T: 'static,
-    S: Storage<ArcStoredValue<T>>,
-{
-    type Value = T;
+    /// Returns the output of applying a function to the value within the [`StoredValue`].
+    ///
+    /// # Panics
+    ///
+    /// This function panics when called after the owner of the reactive node has been disposed.
+    /// See [`StoredValue::try_with_value`] for a version without panic.
+    ///
+    /// # Examples
+    /// ```rust
+    /// # use reactive_graph::owner::StoredValue;
+    ///
+    /// // Does not implement Clone
+    /// struct Data {
+    ///     rows: Vec<u8>,
+    /// }
+    ///
+    /// let data = StoredValue::new(Data {
+    ///     rows: vec![1, 2, 3],
+    /// });
+    ///
+    /// // Easy to move into closures because StoredValue is Copy + 'static.
+    /// // *NOTE* this is not the same thing as a derived signal!
+    /// // *NOTE* this will not be automatically rerun as StoredValue is NOT reactive!
+    /// let length_fn = move || data.with_value(|inner| inner.rows.len());
+    ///
+    /// let sum = data.with_value(|inner| inner.rows.iter().sum::<u8>());
+    ///
+    /// assert_eq!(sum, 6);
+    /// assert_eq!(length_fn(), 3);
+    /// ```
+    #[track_caller]
+    pub fn with_value<U>(&self, fun: impl FnOnce(&T) -> U) -> U {
+        self.try_with_value(fun)
+            .unwrap_or_else(unwrap_signal!(self))
+    }
 
-    fn try_write_value(&self) -> Option<UntrackedWriteGuard<T>> {
+    /// Updates the current value by applying the given closure, returning the return value of the
+    /// closure, or `None` if the value has already been disposed.
+    pub fn try_update_value<U>(
+        &self,
+        fun: impl FnOnce(&mut T) -> U,
+    ) -> Option<U> {
         self.value
             .try_get_value()
-            .and_then(|inner| inner.try_write_value())
+            .map(|inner| fun(&mut *inner.write().or_poisoned()))
+    }
+
+    /// Updates the value within [`StoredValue`] by applying a function to it.
+    ///
+    /// # Panics
+    /// This function panics when called after the owner of the reactive node has been disposed.
+    /// See [`StoredValue::try_update_value`] for a version without panic.
+    ///
+    /// # Examples
+    /// ```rust
+    /// # use reactive_graph::owner::StoredValue;
+    ///
+    /// #[derive(Default)] // Does not implement Clone
+    /// struct Data {
+    ///     rows: Vec<u8>,
+    /// }
+    ///
+    /// let data = StoredValue::new(Data::default());
+    ///
+    /// // Easy to move into closures because StoredValue is Copy + 'static.
+    /// // *NOTE* this is not the same thing as a derived signal!
+    /// // *NOTE* this will not be automatically rerun as StoredValue is NOT reactive!
+    /// let push_next = move || {
+    ///     data.update_value(|inner| match inner.rows.last().as_deref() {
+    ///         Some(n) => inner.rows.push(n + 1),
+    ///         None => inner.rows.push(0),
+    ///     })
+    /// };
+    ///
+    /// data.update_value(|inner| inner.rows = vec![5, 6, 7]);
+    /// data.with_value(|inner| assert_eq!(inner.rows.last(), Some(&7)));
+    ///
+    /// push_next();
+    /// data.with_value(|inner| assert_eq!(inner.rows.last(), Some(&8)));
+    ///
+    /// data.update_value(|inner| {
+    ///     std::mem::take(inner) // sets Data back to default
+    /// });
+    /// data.with_value(|inner| assert!(inner.rows.is_empty()));
+    /// ```
+    pub fn update_value<U>(&self, fun: impl FnOnce(&mut T) -> U) {
+        self.try_update_value(fun);
+    }
+
+    /// Sets the value within [`StoredValue`].
+    ///
+    /// Returns [`Some`] containing the passed value if the owner of the reactive node has been
+    /// disposed.
+    ///
+    /// For types that do not implement [`Clone`], or in cases where allocating the entire object
+    /// would be too expensive, prefer [`StoredValue::try_update_value`].
+    ///
+    /// # Examples
+    /// ```rust
+    /// # use reactive_graph::owner::StoredValue;
+    /// # use reactive_graph::traits::Dispose;
+    ///
+    /// let data = StoredValue::new(String::default());
+    ///
+    /// // Easy to move into closures because StoredValue is Copy + 'static.
+    /// // *NOTE* this is not the same thing as a derived signal!
+    /// // *NOTE* this will not be automatically rerun as StoredValue is NOT reactive!
+    /// let say_hello = move || {
+    ///     // Note that using the `update` methods would be more efficient here.
+    ///     data.try_set_value("Hello, World!".into())
+    /// };
+    /// // *NOTE* this is not the same thing as a derived signal!
+    /// // *NOTE* this will not be automatically rerun as StoredValue is NOT reactive!
+    /// let reset = move || {
+    ///     // Note that using the `update` methods would be more efficient here.
+    ///     data.try_set_value(Default::default())
+    /// };
+    /// assert_eq!(data.get_value(), "");
+    ///
+    /// // None is returned because the value was able to be updated
+    /// assert_eq!(say_hello(), None);
+    ///
+    /// assert_eq!(data.get_value(), "Hello, World!");
+    ///
+    /// reset();
+    /// assert_eq!(data.get_value(), "");
+    ///
+    /// // You should not call dispose yourself in normal user code.
+    /// // This is shown here for the sake of the example.
+    /// data.dispose();
+    ///
+    /// // The reactive owner is disposed, so the value we intended to set is now
+    /// // returned as some.
+    /// assert_eq!(say_hello().as_deref(), Some("Hello, World!"));
+    /// assert_eq!(reset().as_deref(), Some(""));
+    /// ```
+    pub fn try_set_value(&self, value: T) -> Option<T> {
+        match self.value.try_get_value() {
+            Some(inner) => {
+                *inner.write().or_poisoned() = value;
+                None
+            }
+            None => Some(value),
+        }
+    }
+
+    /// Sets the value within [`StoredValue`].
+    ///
+    /// For types that do not implement [`Clone`], or in cases where allocating the entire object
+    /// would be too expensive, prefer [`StoredValue::update_value`].
+    ///
+    /// # Panics
+    /// This function panics when called after the owner of the reactive node has been disposed.
+    /// See [`StoredValue::try_set_value`] for a version without panic.
+    ///
+    /// # Examples
+    /// ```rust
+    /// # use reactive_graph::owner::StoredValue;
+    ///
+    /// let data = StoredValue::new(10);
+    ///
+    /// // Easy to move into closures because StoredValue is Copy + 'static.
+    /// // *NOTE* this is not the same thing as a derived signal!
+    /// // *NOTE* this will not be automatically rerun as StoredValue is NOT reactive!
+    /// let maxout = move || data.set_value(u8::MAX);
+    /// let zero = move || data.set_value(u8::MIN);
+    ///
+    /// maxout();
+    /// assert_eq!(data.get_value(), u8::MAX);
+    ///
+    /// zero();
+    /// assert_eq!(data.get_value(), u8::MIN);
+    /// ```
+    pub fn set_value(&self, value: T) {
+        self.update_value(|n| *n = value);
     }
 }
 
@@ -156,39 +341,90 @@ impl<T, S> IsDisposed for StoredValue<T, S> {
     }
 }
 
+impl<T, S: Storage<Arc<RwLock<T>>>> StoredValue<T, S>
+where
+    T: Clone + 'static,
+{
+    /// Returns the value within [`StoredValue`] by cloning.
+    ///
+    /// Returns [`Some`] containing the value if the owner of the reactive node has not been
+    /// disposed. When disposed, returns [`None`].
+    ///
+    /// See [`StoredValue::try_with_value`] for a version that avoids cloning. See
+    /// [`StoredValue::get_value`] for a version that clones, but panics if the node is disposed.
+    ///
+    /// # Examples
+    /// ```rust
+    /// # use reactive_graph::owner::StoredValue;
+    /// # use reactive_graph::traits::Dispose;
+    ///
+    /// // u8 is practically free to clone.
+    /// let data: StoredValue<u8> = StoredValue::new(10);
+    ///
+    /// // Larger data structures can become very expensive to clone.
+    /// // You may prefer to use StoredValue::try_with_value.
+    /// let _expensive: StoredValue<Vec<String>> = StoredValue::new(vec![]);
+    ///
+    /// // Easy to move into closures because StoredValue is Copy + 'static
+    /// let maxout = move || data.set_value(u8::MAX);
+    /// let zero = move || data.set_value(u8::MIN);
+    ///
+    /// maxout();
+    /// assert_eq!(data.try_get_value(), Some(u8::MAX));
+    ///
+    /// zero();
+    /// assert_eq!(data.try_get_value(), Some(u8::MIN));
+    ///
+    /// // You should not call dispose yourself in normal user code.
+    /// // This is shown here for the sake of the example.
+    /// data.dispose();
+    ///
+    /// assert_eq!(data.try_get_value(), None);
+    /// ```
+    pub fn try_get_value(&self) -> Option<T> {
+        self.try_with_value(T::clone)
+    }
+
+    /// Returns the value within [`StoredValue`] by cloning.
+    ///
+    /// See [`StoredValue::with_value`] for a version that avoids cloning.
+    ///
+    /// # Panics
+    /// This function panics when called after the owner of the reactive node has been disposed.
+    /// See [`StoredValue::try_get_value`] for a version without panic.
+    ///
+    /// # Examples
+    /// ```rust
+    /// # use reactive_graph::owner::StoredValue;
+    ///
+    /// // u8 is practically free to clone.
+    /// let data: StoredValue<u8> = StoredValue::new(10);
+    ///
+    /// // Larger data structures can become very expensive to clone.
+    /// // You may prefer to use StoredValue::try_with_value.
+    /// let _expensive: StoredValue<Vec<String>> = StoredValue::new(vec![]);
+    ///
+    /// // Easy to move into closures because StoredValue is Copy + 'static
+    /// let maxout = move || data.set_value(u8::MAX);
+    /// let zero = move || data.set_value(u8::MIN);
+    ///
+    /// maxout();
+    /// assert_eq!(data.get_value(), u8::MAX);
+    ///
+    /// zero();
+    /// assert_eq!(data.get_value(), u8::MIN);
+    /// ```
+    pub fn get_value(&self) -> T {
+        self.with_value(T::clone)
+    }
+}
+
 impl<T, S> Dispose for StoredValue<T, S> {
     fn dispose(self) {
         self.value.dispose();
     }
 }
 
-impl<T> From<ArcStoredValue<T>> for StoredValue<T>
-where
-    T: Send + Sync + 'static,
-{
-    #[track_caller]
-    fn from(value: ArcStoredValue<T>) -> Self {
-        StoredValue {
-            #[cfg(debug_assertions)]
-            defined_at: Location::caller(),
-            value: ArenaItem::new(value),
-        }
-    }
-}
-
-impl<T, S> From<StoredValue<T, S>> for ArcStoredValue<T>
-where
-    S: Storage<ArcStoredValue<T>>,
-{
-    #[track_caller]
-    fn from(value: StoredValue<T, S>) -> Self {
-        value
-            .value
-            .try_get_value()
-            .unwrap_or_else(unwrap_signal!(value))
-    }
-}
-
 /// Creates a new [`StoredValue`].
 #[inline(always)]
 #[track_caller]

reactive_graph/src/signal.rs

@@ -36,7 +36,7 @@ pub use write::*;
 ///
 /// ```
 /// # use reactive_graph::prelude::*;
-/// # use reactive_graph::signal::*; let owner = reactive_graph::owner::Owner::new(); owner.set();
+/// # use reactive_graph::signal::*;
 /// let (count, set_count) = arc_signal(0);
 ///
 /// // ✅ calling the getter clones and returns the value
@@ -82,7 +82,7 @@ pub fn arc_signal<T>(value: T) -> (ArcReadSignal<T>, ArcWriteSignal<T>) {
 /// as long as a reference to it is alive, see [`arc_signal`].
 /// ```
 /// # use reactive_graph::prelude::*;
-/// # use reactive_graph::signal::*; let owner = reactive_graph::owner::Owner::new(); owner.set();
+/// # use reactive_graph::signal::*;
 /// let (count, set_count) = signal(0);
 ///
 /// // ✅ calling the getter clones and returns the value
@@ -142,7 +142,7 @@ pub fn signal_local<T: 'static>(
 /// as long as a reference to it is alive, see [`arc_signal`].
 /// ```
 /// # use reactive_graph::prelude::*;
-/// # use reactive_graph::signal::*; let owner = reactive_graph::owner::Owner::new(); owner.set();
+/// # use reactive_graph::signal::*;
 /// let (count, set_count) = create_signal(0);
 ///
 /// // ✅ calling the getter clones and returns the value

reactive_graph/src/signal/arc_rw.rs

@@ -6,7 +6,7 @@ use super::{
 use crate::{
     graph::{ReactiveNode, SubscriberSet},
     prelude::{IsDisposed, Notify},
-    traits::{DefinedAt, ReadUntracked, UntrackableGuard, Write},
+    traits::{DefinedAt, ReadUntracked, UntrackableGuard, Writeable},
 };
 use core::fmt::{Debug, Formatter, Result};
 use std::{
@@ -50,7 +50,7 @@ use std::{
 /// - [`.set()`](crate::traits::Set) sets the signal to a new value.
 /// - [`.update()`](crate::traits::Update) updates the value of the signal by
 ///   applying a closure that takes a mutable reference.
-/// - [`.write()`](crate::traits::Write) returns a guard through which the signal
+/// - [`.write()`](crate::traits::Writeable) returns a guard through which the signal
 ///   can be mutated, and which notifies subscribers when it is dropped.
 ///
 /// > Each of these has a related `_untracked()` method, which updates the signal
@@ -63,7 +63,7 @@ use std::{
 ///
 /// ```
 /// # use reactive_graph::prelude::*;
-/// # use reactive_graph::signal::*; let owner = reactive_graph::owner::Owner::new(); owner.set();
+/// # use reactive_graph::signal::*;
 /// let count = ArcRwSignal::new(0);
 ///
 /// // ✅ calling the getter clones and returns the value
@@ -253,7 +253,7 @@ impl<T> Notify for ArcRwSignal<T> {
     }
 }
 
-impl<T: 'static> Write for ArcRwSignal<T> {
+impl<T: 'static> Writeable for ArcRwSignal<T> {
     type Value = T;
 
     fn try_write(&self) -> Option<impl UntrackableGuard<Target = Self::Value>> {

reactive_graph/src/signal/arc_write.rs

@@ -2,7 +2,7 @@ use super::guards::{UntrackedWriteGuard, WriteGuard};
 use crate::{
     graph::{ReactiveNode, SubscriberSet},
     prelude::{IsDisposed, Notify},
-    traits::{DefinedAt, UntrackableGuard, Write},
+    traits::{DefinedAt, UntrackableGuard, Writeable},
 };
 use core::fmt::{Debug, Formatter, Result};
 use std::{
@@ -23,7 +23,7 @@ use std::{
 /// - [`.set()`](crate::traits::Set) sets the signal to a new value.
 /// - [`.update()`](crate::traits::Update) updates the value of the signal by
 ///   applying a closure that takes a mutable reference.
-/// - [`.write()`](crate::traits::Write) returns a guard through which the signal
+/// - [`.write()`](crate::traits::Writeable) returns a guard through which the signal
 ///   can be mutated, and which notifies subscribers when it is dropped.
 ///
 /// > Each of these has a related `_untracked()` method, which updates the signal
@@ -122,7 +122,7 @@ impl<T> Notify for ArcWriteSignal<T> {
     }
 }
 
-impl<T: 'static> Write for ArcWriteSignal<T> {
+impl<T: 'static> Writeable for ArcWriteSignal<T> {
     type Value = T;
 
     fn try_write(&self) -> Option<impl UntrackableGuard<Target = Self::Value>> {

reactive_graph/src/signal/read.rs

@@ -49,7 +49,7 @@ use std::{
 ///
 /// ## Examples
 /// ```
-/// # use reactive_graph::prelude::*; use reactive_graph::signal::*;  let owner = reactive_graph::owner::Owner::new(); owner.set();
+/// # use reactive_graph::prelude::*; use reactive_graph::signal::*;
 /// let (count, set_count) = signal(0);
 ///
 /// // calling .get() clones and returns the value

reactive_graph/src/signal/rw.rs

@@ -9,7 +9,7 @@ use crate::{
     signal::guards::{UntrackedWriteGuard, WriteGuard},
     traits::{
         DefinedAt, Dispose, IsDisposed, Notify, ReadUntracked,
-        UntrackableGuard, Write,
+        UntrackableGuard, Writeable,
     },
     unwrap_signal,
 };
@@ -57,7 +57,7 @@ use std::{
 /// - [`.set()`](crate::traits::Set) sets the signal to a new value.
 /// - [`.update()`](crate::traits::Update) updates the value of the signal by
 ///   applying a closure that takes a mutable reference.
-/// - [`.write()`](crate::traits::Write) returns a guard through which the signal
+/// - [`.write()`](crate::traits::Writeable) returns a guard through which the signal
 ///   can be mutated, and which notifies subscribers when it is dropped.
 ///
 /// > Each of these has a related `_untracked()` method, which updates the signal
@@ -69,7 +69,7 @@ use std::{
 ///
 /// ```
 /// # use reactive_graph::prelude::*;
-/// # use reactive_graph::signal::*; let owner = reactive_graph::owner::Owner::new(); owner.set();
+/// # use reactive_graph::signal::*;
 /// let count = ArcRwSignal::new(0);
 ///
 /// // ✅ calling the getter clones and returns the value
@@ -349,7 +349,7 @@ where
     }
 }
 
-impl<T, S> Write for RwSignal<T, S>
+impl<T, S> Writeable for RwSignal<T, S>
 where
     T: 'static,
     S: Storage<ArcRwSignal<T>>,

reactive_graph/src/signal/write.rs

@@ -1,7 +1,9 @@
 use super::{guards::WriteGuard, ArcWriteSignal};
 use crate::{
     owner::{ArenaItem, Storage, SyncStorage},
-    traits::{DefinedAt, Dispose, IsDisposed, Notify, UntrackableGuard, Write},
+    traits::{
+        DefinedAt, Dispose, IsDisposed, Notify, UntrackableGuard, Writeable,
+    },
 };
 use core::fmt::Debug;
 use guardian::ArcRwLockWriteGuardian;
@@ -20,7 +22,7 @@ use std::{hash::Hash, ops::DerefMut, panic::Location, sync::Arc};
 /// - [`.set()`](crate::traits::Set) sets the signal to a new value.
 /// - [`.update()`](crate::traits::Update) updates the value of the signal by
 ///   applying a closure that takes a mutable reference.
-/// - [`.write()`](crate::traits::Write) returns a guard through which the signal
+/// - [`.write()`](crate::traits::Writeable) returns a guard through which the signal
 ///   can be mutated, and which notifies subscribers when it is dropped.
 ///
 /// > Each of these has a related `_untracked()` method, which updates the signal
@@ -30,7 +32,7 @@ use std::{hash::Hash, ops::DerefMut, panic::Location, sync::Arc};
 ///
 /// ## Examples
 /// ```
-/// # use reactive_graph::prelude::*; use reactive_graph::signal::*;  let owner = reactive_graph::owner::Owner::new(); owner.set();
+/// # use reactive_graph::prelude::*; use reactive_graph::signal::*;
 /// let (count, set_count) = signal(0);
 ///
 /// // ✅ calling the setter sets the value
@@ -126,7 +128,7 @@ where
     }
 }
 
-impl<T, S> Write for WriteSignal<T, S>
+impl<T, S> Writeable for WriteSignal<T, S>
 where
     T: 'static,
     S: Storage<ArcWriteSignal<T>>,

reactive_graph/src/traits.rs

@@ -18,7 +18,7 @@
 //! | [`Track`]         | —     | Tracks changes to this value, adding it as a source of the current reactive observer. |
 //! | [`Trigger`]       | —     | Notifies subscribers that this value has changed.                                     |
 //! | [`ReadUntracked`] | Guard | Gives immutable access to the value of this signal.                                   |
-//! | [`Write`]     | Guard | Gives mutable access to the value of this signal.
+//! | [`Writeable`]     | Guard | Gives mutable access to the value of this signal.
 //!
 //! ## Derived Traits
 //!
@@ -33,7 +33,7 @@
 //! ### Update
 //! | Trait               | Mode          | Composition                       | Description
 //! |---------------------|---------------|-----------------------------------|------------
-//! | [`UpdateUntracked`] | `fn(&mut T)`  | [`Write`]                     | Applies closure to the current value to update it, but doesn't notify subscribers.
+//! | [`UpdateUntracked`] | `fn(&mut T)`  | [`Writeable`]                     | Applies closure to the current value to update it, but doesn't notify subscribers.
 //! | [`Update`]          | `fn(&mut T)`  | [`UpdateUntracked`] + [`Trigger`] | Applies closure to the current value to update it, and notifies subscribers.
 //! | [`Set`]             | `T`           | [`Update`]                        | Sets the value to a new value, and notifies subscribers.
 //!
@@ -52,7 +52,7 @@ use crate::{
     effect::Effect,
     graph::{Observer, Source, Subscriber, ToAnySource},
     owner::Owner,
-    signal::{arc_signal, guards::UntrackedWriteGuard, ArcReadSignal},
+    signal::{arc_signal, ArcReadSignal},
 };
 use any_spawner::Executor;
 use futures::{Stream, StreamExt};
@@ -61,7 +61,6 @@ use std::{
     panic::Location,
 };
 
-#[doc(hidden)]
 /// Provides a sensible panic message for accessing disposed signals.
 #[macro_export]
 macro_rules! unwrap_signal {
@@ -214,7 +213,7 @@ pub trait UntrackableGuard: DerefMut {
 
 /// Gives mutable access to a signal's value through a guard type. When the guard is dropped, the
 /// signal's subscribers will be notified.
-pub trait Write: Sized + DefinedAt + Notify {
+pub trait Writeable: Sized + DefinedAt + Notify {
     /// The type of the signal's value.
     type Value: Sized + 'static;
 
@@ -422,9 +421,9 @@ pub trait UpdateUntracked: DefinedAt {
 
 impl<T> UpdateUntracked for T
 where
-    T: Write,
+    T: Writeable,
 {
-    type Value = <Self as Write>::Value;
+    type Value = <Self as Writeable>::Value;
 
     #[track_caller]
     fn try_update_untracked<U>(
@@ -479,9 +478,9 @@ pub trait Update {
 
 impl<T> Update for T
 where
-    T: Write,
+    T: Writeable,
 {
-    type Value = <Self as Write>::Value;
+    type Value = <Self as Writeable>::Value;
 
     #[track_caller]
     fn try_maybe_update<U>(
@@ -639,189 +638,3 @@ pub fn panic_getting_disposed_signal(
         )
     }
 }
-
-/// A variation of the [`Read`] trait that provides a signposted "always-non-reactive" API.
-/// E.g. for [`StoredValue`](`crate::owner::StoredValue`).
-pub trait ReadValue: Sized + DefinedAt {
-    /// The guard type that will be returned, which can be dereferenced to the value.
-    type Value: Deref;
-
-    /// Returns the non-reactive guard, or `None` if the value has already been disposed.
-    #[track_caller]
-    fn try_read_value(&self) -> Option<Self::Value>;
-
-    /// Returns the non-reactive guard.
-    ///
-    /// # Panics
-    /// Panics if you try to access a value that has been disposed.
-    #[track_caller]
-    fn read_value(&self) -> Self::Value {
-        self.try_read_value().unwrap_or_else(unwrap_signal!(self))
-    }
-}
-
-/// A variation of the [`With`] trait that provides a signposted "always-non-reactive" API.
-/// E.g. for [`StoredValue`](`crate::owner::StoredValue`).
-pub trait WithValue: DefinedAt {
-    /// The type of the value contained in the value.
-    type Value: ?Sized;
-
-    /// Applies the closure to the value, non-reactively, and returns the result,
-    /// or `None` if the value has already been disposed.
-    #[track_caller]
-    fn try_with_value<U>(
-        &self,
-        fun: impl FnOnce(&Self::Value) -> U,
-    ) -> Option<U>;
-
-    /// Applies the closure to the value, non-reactively, and returns the result.
-    ///
-    /// # Panics
-    /// Panics if you try to access a value that has been disposed.
-    #[track_caller]
-    fn with_value<U>(&self, fun: impl FnOnce(&Self::Value) -> U) -> U {
-        self.try_with_value(fun)
-            .unwrap_or_else(unwrap_signal!(self))
-    }
-}
-
-impl<T> WithValue for T
-where
-    T: DefinedAt + ReadValue,
-{
-    type Value = <<Self as ReadValue>::Value as Deref>::Target;
-
-    fn try_with_value<U>(
-        &self,
-        fun: impl FnOnce(&Self::Value) -> U,
-    ) -> Option<U> {
-        self.try_read_value().map(|value| fun(&value))
-    }
-}
-
-/// A variation of the [`Get`] trait that provides a signposted "always-non-reactive" API.
-/// E.g. for [`StoredValue`](`crate::owner::StoredValue`).
-pub trait GetValue: DefinedAt {
-    /// The type of the value contained in the value.
-    type Value: Clone;
-
-    /// Clones and returns the value of the value, non-reactively,
-    /// or `None` if the value has already been disposed.
-    #[track_caller]
-    fn try_get_value(&self) -> Option<Self::Value>;
-
-    /// Clones and returns the value of the value, non-reactively.
-    ///
-    /// # Panics
-    /// Panics if you try to access a value that has been disposed.
-    #[track_caller]
-    fn get_value(&self) -> Self::Value {
-        self.try_get_value().unwrap_or_else(unwrap_signal!(self))
-    }
-}
-
-impl<T> GetValue for T
-where
-    T: WithValue,
-    T::Value: Clone,
-{
-    type Value = <Self as WithValue>::Value;
-
-    fn try_get_value(&self) -> Option<Self::Value> {
-        self.try_with_value(Self::Value::clone)
-    }
-}
-
-/// A variation of the [`Write`] trait that provides a signposted "always-non-reactive" API.
-/// E.g. for [`StoredValue`](`crate::owner::StoredValue`).
-pub trait WriteValue: Sized + DefinedAt {
-    /// The type of the value's value.
-    type Value: Sized + 'static;
-
-    /// Returns a non-reactive write guard, or `None` if the value has already been disposed.
-    #[track_caller]
-    fn try_write_value(&self) -> Option<UntrackedWriteGuard<Self::Value>>;
-
-    /// Returns a non-reactive write guard.
-    ///
-    /// # Panics
-    /// Panics if you try to access a value that has been disposed.
-    #[track_caller]
-    fn write_value(&self) -> UntrackedWriteGuard<Self::Value> {
-        self.try_write_value().unwrap_or_else(unwrap_signal!(self))
-    }
-}
-
-/// A variation of the [`Update`] trait that provides a signposted "always-non-reactive" API.
-/// E.g. for [`StoredValue`](`crate::owner::StoredValue`).
-pub trait UpdateValue: DefinedAt {
-    /// The type of the value contained in the value.
-    type Value;
-
-    /// Updates the value, returning the value that is
-    /// returned by the update function, or `None` if the value has already been disposed.
-    #[track_caller]
-    fn try_update_value<U>(
-        &self,
-        fun: impl FnOnce(&mut Self::Value) -> U,
-    ) -> Option<U>;
-
-    /// Updates the value.
-    #[track_caller]
-    fn update_value(&self, fun: impl FnOnce(&mut Self::Value)) {
-        self.try_update_value(fun);
-    }
-}
-
-impl<T> UpdateValue for T
-where
-    T: WriteValue,
-{
-    type Value = <Self as WriteValue>::Value;
-
-    #[track_caller]
-    fn try_update_value<U>(
-        &self,
-        fun: impl FnOnce(&mut Self::Value) -> U,
-    ) -> Option<U> {
-        let mut guard = self.try_write_value()?;
-        Some(fun(&mut *guard))
-    }
-}
-
-/// A variation of the [`Set`] trait that provides a signposted "always-non-reactive" API.
-/// E.g. for [`StoredValue`](`crate::owner::StoredValue`).
-pub trait SetValue: DefinedAt {
-    /// The type of the value contained in the value.
-    type Value;
-
-    /// Updates the value by replacing it, non-reactively.
-    ///
-    /// If the value has already been disposed, returns `Some(value)` with the value that was
-    /// passed in. Otherwise, returns `None`.
-    #[track_caller]
-    fn try_set_value(&self, value: Self::Value) -> Option<Self::Value>;
-
-    /// Updates the value by replacing it, non-reactively.
-    #[track_caller]
-    fn set_value(&self, value: Self::Value) {
-        self.try_set_value(value);
-    }
-}
-
-impl<T> SetValue for T
-where
-    T: WriteValue,
-{
-    type Value = <Self as WriteValue>::Value;
-
-    fn try_set_value(&self, value: Self::Value) -> Option<Self::Value> {
-        // Unlike most other traits, for these None actually means success:
-        if let Some(mut guard) = self.try_write_value() {
-            *guard = value;
-            None
-        } else {
-            Some(value)
-        }
-    }
-}

reactive_graph/src/wrappers.rs

@@ -3,30 +3,14 @@
 /// Types that abstract over signals with values that can be read.
 pub mod read {
     use crate::{
-        computed::{ArcMemo, Memo, MemoInner},
-        graph::untrack,
-        owner::{
-            ArcStoredValue, ArenaItem, FromLocal, LocalStorage, Storage,
-            SyncStorage,
-        },
-        signal::{
-            guards::{Mapped, Plain, ReadGuard},
-            ArcReadSignal, ArcRwSignal, ReadSignal, RwSignal,
-        },
-        traits::{
-            DefinedAt, Dispose, Get, Read, ReadUntracked, ReadValue, Track,
-            With, WithValue,
-        },
-        unwrap_signal,
+        computed::{ArcMemo, Memo},
+        owner::{ArenaItem, FromLocal, LocalStorage, Storage, SyncStorage},
+        signal::{ArcReadSignal, ArcRwSignal, ReadSignal, RwSignal},
+        traits::{DefinedAt, Dispose, Get, With, WithUntracked},
+        untrack, unwrap_signal,
     };
     use send_wrapper::SendWrapper;
-    use std::{
-        borrow::Borrow,
-        fmt::Display,
-        ops::Deref,
-        panic::Location,
-        sync::{Arc, RwLock},
-    };
+    use std::{panic::Location, sync::Arc};
 
     /// Possibilities for the inner type of a [`Signal`].
     pub enum SignalTypes<T, S = SyncStorage>
@@ -39,8 +23,6 @@ pub mod read {
         Memo(ArcMemo<T, S>),
         /// A derived signal.
         DerivedSignal(Arc<dyn Fn() -> T + Send + Sync>),
-        /// A static, stored value.
-        Stored(ArcStoredValue<T>),
     }
 
     impl<T, S> Clone for SignalTypes<T, S>
@@ -52,7 +34,6 @@ pub mod read {
                 Self::ReadSignal(arg0) => Self::ReadSignal(arg0.clone()),
                 Self::Memo(arg0) => Self::Memo(arg0.clone()),
                 Self::DerivedSignal(arg0) => Self::DerivedSignal(arg0.clone()),
-                Self::Stored(arg0) => Self::Stored(arg0.clone()),
             }
         }
     }
@@ -70,9 +51,6 @@ pub mod read {
                 Self::DerivedSignal(_) => {
                     f.debug_tuple("DerivedSignal").finish()
                 }
-                Self::Stored(arg0) => {
-                    f.debug_tuple("Static").field(arg0).finish()
-                }
             }
         }
     }
@@ -153,7 +131,7 @@ pub mod read {
         /// Wraps a derived signal, i.e., any computation that accesses one or more
         /// reactive signals.
         /// ```rust
-        /// # use reactive_graph::signal::*; let owner = reactive_graph::owner::Owner::new(); owner.set();
+        /// # use reactive_graph::signal::*;
         /// # use reactive_graph::wrappers::read::ArcSignal;
         /// # use reactive_graph::prelude::*;
         /// let (count, set_count) = arc_signal(2);
@@ -189,39 +167,6 @@ pub mod read {
                 defined_at: std::panic::Location::caller(),
             }
         }
-
-        /// Moves a static, nonreactive value into a signal, backed by [`ArcStoredValue`].
-        #[track_caller]
-        pub fn stored(value: T) -> Self {
-            Self {
-                inner: SignalTypes::Stored(ArcStoredValue::new(value)),
-                #[cfg(debug_assertions)]
-                defined_at: std::panic::Location::caller(),
-            }
-        }
-    }
-
-    impl<T, S> ArcSignal<T, S>
-    where
-        S: Storage<T>,
-    {
-        /// Subscribes to this signal in the current reactive scope without doing anything with its value.
-        #[track_caller]
-        pub fn track(&self) {
-            match &self.inner {
-                SignalTypes::ReadSignal(i) => {
-                    i.track();
-                }
-                SignalTypes::Memo(i) => {
-                    i.track();
-                }
-                SignalTypes::DerivedSignal(i) => {
-                    i();
-                }
-                // Doesn't change.
-                SignalTypes::Stored(_) => {}
-            }
-        }
     }
 
     impl<T> Default for ArcSignal<T, SyncStorage>
@@ -229,7 +174,7 @@ pub mod read {
         T: Default + Send + Sync + 'static,
     {
         fn default() -> Self {
-            Self::stored(Default::default())
+            Self::derive(|| Default::default())
         }
     }
 
@@ -285,6 +230,24 @@ pub mod read {
         }
     }
 
+    impl<T, S> WithUntracked for ArcSignal<T, S>
+    where
+        S: Storage<T>,
+    {
+        type Value = T;
+
+        fn try_with_untracked<U>(
+            &self,
+            fun: impl FnOnce(&Self::Value) -> U,
+        ) -> Option<U> {
+            match &self.inner {
+                SignalTypes::ReadSignal(i) => i.try_with_untracked(fun),
+                SignalTypes::Memo(i) => i.try_with_untracked(fun),
+                SignalTypes::DerivedSignal(i) => Some(untrack(|| fun(&i()))),
+            }
+        }
+    }
+
     impl<T, S> With for ArcSignal<T, S>
     where
         S: Storage<T>,
@@ -300,63 +263,10 @@ pub mod read {
                 SignalTypes::ReadSignal(i) => i.try_with(fun),
                 SignalTypes::Memo(i) => i.try_with(fun),
                 SignalTypes::DerivedSignal(i) => Some(fun(&i())),
-                SignalTypes::Stored(i) => i.try_with_value(fun),
             }
         }
     }
 
-    impl<T, S> ReadUntracked for ArcSignal<T, S>
-    where
-        S: Storage<T>,
-    {
-        type Value = ReadGuard<T, SignalReadGuard<T, S>>;
-
-        fn try_read_untracked(&self) -> Option<Self::Value> {
-            match &self.inner {
-                SignalTypes::ReadSignal(i) => {
-                    i.try_read_untracked().map(SignalReadGuard::Read)
-                }
-                SignalTypes::Memo(i) => {
-                    i.try_read_untracked().map(SignalReadGuard::Memo)
-                }
-                SignalTypes::DerivedSignal(i) => {
-                    Some(SignalReadGuard::Owned(untrack(|| i())))
-                }
-                SignalTypes::Stored(i) => {
-                    i.try_read_value().map(SignalReadGuard::Read)
-                }
-            }
-            .map(ReadGuard::new)
-        }
-    }
-
-    impl<T, S> Read for ArcSignal<T, S>
-    where
-        S: Storage<T>,
-    {
-        type Value = ReadGuard<T, SignalReadGuard<T, S>>;
-
-        fn try_read(&self) -> Option<Self::Value> {
-            match &self.inner {
-                SignalTypes::ReadSignal(i) => {
-                    i.try_read().map(SignalReadGuard::Read)
-                }
-                SignalTypes::Memo(i) => i.try_read().map(SignalReadGuard::Memo),
-                SignalTypes::DerivedSignal(i) => {
-                    Some(SignalReadGuard::Owned(i()))
-                }
-                SignalTypes::Stored(i) => {
-                    i.try_read_value().map(SignalReadGuard::Read)
-                }
-            }
-            .map(ReadGuard::new)
-        }
-
-        fn read(&self) -> Self::Value {
-            self.try_read().unwrap_or_else(unwrap_signal!(self))
-        }
-    }
-
     /// A wrapper for any kind of arena-allocated reactive signal:
     /// an [`ReadSignal`], [`Memo`], [`RwSignal`], or derived signal closure.
     ///
@@ -432,6 +342,31 @@ pub mod read {
         }
     }
 
+    impl<T, S> WithUntracked for Signal<T, S>
+    where
+        T: 'static,
+        S: Storage<SignalTypes<T, S>> + Storage<T>,
+    {
+        type Value = T;
+
+        fn try_with_untracked<U>(
+            &self,
+            fun: impl FnOnce(&Self::Value) -> U,
+        ) -> Option<U> {
+            self.inner
+                // clone the inner Arc type and release the lock
+                // prevents deadlocking if the derived value includes taking a lock on the arena
+                .try_with_value(Clone::clone)
+                .and_then(|inner| match &inner {
+                    SignalTypes::ReadSignal(i) => i.try_with_untracked(fun),
+                    SignalTypes::Memo(i) => i.try_with_untracked(fun),
+                    SignalTypes::DerivedSignal(i) => {
+                        Some(untrack(|| fun(&i())))
+                    }
+                })
+        }
+    }
+
     impl<T, S> With for Signal<T, S>
     where
         T: 'static,
@@ -451,79 +386,10 @@ pub mod read {
                     SignalTypes::ReadSignal(i) => i.try_with(fun),
                     SignalTypes::Memo(i) => i.try_with(fun),
                     SignalTypes::DerivedSignal(i) => Some(fun(&i())),
-                    SignalTypes::Stored(i) => i.try_with_value(fun),
                 })
         }
     }
 
-    impl<T, S> ReadUntracked for Signal<T, S>
-    where
-        T: 'static,
-        S: Storage<SignalTypes<T, S>> + Storage<T>,
-    {
-        type Value = ReadGuard<T, SignalReadGuard<T, S>>;
-
-        fn try_read_untracked(&self) -> Option<Self::Value> {
-            self.inner
-                // clone the inner Arc type and release the lock
-                // prevents deadlocking if the derived value includes taking a lock on the arena
-                .try_with_value(Clone::clone)
-                .and_then(|inner| {
-                    match &inner {
-                        SignalTypes::ReadSignal(i) => {
-                            i.try_read_untracked().map(SignalReadGuard::Read)
-                        }
-                        SignalTypes::Memo(i) => {
-                            i.try_read_untracked().map(SignalReadGuard::Memo)
-                        }
-                        SignalTypes::DerivedSignal(i) => {
-                            Some(SignalReadGuard::Owned(untrack(|| i())))
-                        }
-                        SignalTypes::Stored(i) => {
-                            i.try_read_value().map(SignalReadGuard::Read)
-                        }
-                    }
-                    .map(ReadGuard::new)
-                })
-        }
-    }
-
-    impl<T, S> Read for Signal<T, S>
-    where
-        T: 'static,
-        S: Storage<SignalTypes<T, S>> + Storage<T>,
-    {
-        type Value = ReadGuard<T, SignalReadGuard<T, S>>;
-
-        fn try_read(&self) -> Option<Self::Value> {
-            self.inner
-                // clone the inner Arc type and release the lock
-                // prevents deadlocking if the derived value includes taking a lock on the arena
-                .try_with_value(Clone::clone)
-                .and_then(|inner| {
-                    match &inner {
-                        SignalTypes::ReadSignal(i) => {
-                            i.try_read().map(SignalReadGuard::Read)
-                        }
-                        SignalTypes::Memo(i) => {
-                            i.try_read().map(SignalReadGuard::Memo)
-                        }
-                        SignalTypes::DerivedSignal(i) => {
-                            Some(SignalReadGuard::Owned(i()))
-                        }
-                        SignalTypes::Stored(i) => {
-                            i.try_read_value().map(SignalReadGuard::Read)
-                        }
-                    }
-                    .map(ReadGuard::new)
-                })
-        }
-
-        fn read(&self) -> Self::Value {
-            self.try_read().unwrap_or_else(unwrap_signal!(self))
-        }
-    }
-
     impl<T> Signal<T>
     where
         T: Send + Sync + 'static,
@@ -531,7 +397,7 @@ pub mod read {
         /// Wraps a derived signal, i.e., any computation that accesses one or more
         /// reactive signals.
         /// ```rust
-        /// # use reactive_graph::signal::*; let owner = reactive_graph::owner::Owner::new(); owner.set();
+        /// # use reactive_graph::signal::*;
         /// # use reactive_graph::wrappers::read::Signal;
         /// # use reactive_graph::prelude::*;
         /// let (count, set_count) = signal(2);
@@ -566,18 +432,6 @@ pub mod read {
                 defined_at: std::panic::Location::caller(),
             }
         }
-
-        /// Moves a static, nonreactive value into a signal, backed by [`ArcStoredValue`].
-        #[track_caller]
-        pub fn stored(value: T) -> Self {
-            Self {
-                inner: ArenaItem::new_with_storage(SignalTypes::Stored(
-                    ArcStoredValue::new(value),
-                )),
-                #[cfg(debug_assertions)]
-                defined_at: std::panic::Location::caller(),
-            }
-        }
     }
 
     impl<T> Signal<T, LocalStorage>
@@ -605,49 +459,6 @@ pub mod read {
                 defined_at: std::panic::Location::caller(),
             }
         }
-
-        /// Moves a static, nonreactive value into a signal, backed by [`ArcStoredValue`].
-        /// Works like [`Signal::stored`] but uses [`LocalStorage`].
-        #[track_caller]
-        pub fn stored_local(value: T) -> Self {
-            Self {
-                inner: ArenaItem::new_local(SignalTypes::Stored(
-                    ArcStoredValue::new(value),
-                )),
-                #[cfg(debug_assertions)]
-                defined_at: std::panic::Location::caller(),
-            }
-        }
-    }
-
-    impl<T, S> Signal<T, S>
-    where
-        T: 'static,
-        S: Storage<SignalTypes<T, S>> + Storage<T>,
-    {
-        /// Subscribes to this signal in the current reactive scope without doing anything with its value.
-        #[track_caller]
-        pub fn track(&self) {
-            let inner = self
-                .inner
-                // clone the inner Arc type and release the lock
-                // prevents deadlocking if the derived value includes taking a lock on the arena
-                .try_with_value(Clone::clone)
-                .unwrap_or_else(unwrap_signal!(self));
-            match inner {
-                SignalTypes::ReadSignal(i) => {
-                    i.track();
-                }
-                SignalTypes::Memo(i) => {
-                    i.track();
-                }
-                SignalTypes::DerivedSignal(i) => {
-                    i();
-                }
-                // Doesn't change.
-                SignalTypes::Stored(_) => {}
-            }
-        }
     }
 
     impl<T> Default for Signal<T>
@@ -655,7 +466,7 @@ pub mod read {
         T: Send + Sync + Default + 'static,
     {
         fn default() -> Self {
-            Self::stored(Default::default())
+            Self::derive(|| Default::default())
         }
     }
 
@@ -664,34 +475,34 @@ pub mod read {
         T: Default + 'static,
     {
         fn default() -> Self {
-            Self::stored_local(Default::default())
+            Self::derive_local(|| Default::default())
         }
     }
 
-    impl<T: Send + Sync + 'static> From<T> for ArcSignal<T, SyncStorage> {
+    impl<T: Clone + Send + Sync + 'static> From<T> for ArcSignal<T, SyncStorage> {
         #[track_caller]
         fn from(value: T) -> Self {
-            ArcSignal::stored(value)
+            Self::derive(move || value.clone())
         }
     }
 
     impl<T> From<T> for Signal<T>
     where
-        T: Send + Sync + 'static,
+        T: Clone + Send + Sync + 'static,
     {
         #[track_caller]
         fn from(value: T) -> Self {
-            Self::stored(value)
+            Self::derive(move || value.clone())
         }
     }
 
     impl<T> From<T> for Signal<T, LocalStorage>
     where
-        T: 'static,
+        T: Clone + 'static,
     {
         #[track_caller]
         fn from(value: T) -> Self {
-            Self::stored_local(value)
+            Self::derive_local(move || value.clone())
         }
     }
 
@@ -836,7 +647,7 @@ pub mod read {
     /// of the same type. This is especially useful for component properties.
     ///
     /// ```
-    /// # use reactive_graph::signal::*; let owner = reactive_graph::owner::Owner::new(); owner.set();
+    /// # use reactive_graph::signal::*;
     /// # use reactive_graph::wrappers::read::MaybeSignal;
     /// # use reactive_graph::computed::Memo;
     /// # use reactive_graph::prelude::*;
@@ -903,6 +714,23 @@ pub mod read {
         }
     }
 
+    impl<T, S> WithUntracked for MaybeSignal<T, S>
+    where
+        S: Storage<SignalTypes<T, S>> + Storage<T>,
+    {
+        type Value = T;
+
+        fn try_with_untracked<U>(
+            &self,
+            fun: impl FnOnce(&Self::Value) -> U,
+        ) -> Option<U> {
+            match self {
+                Self::Static(t) => Some(fun(t)),
+                Self::Dynamic(s) => s.try_with_untracked(fun),
+            }
+        }
+    }
+
     impl<T, S> With for MaybeSignal<T, S>
     where
         T: Send + Sync + 'static,
@@ -921,44 +749,6 @@ pub mod read {
         }
     }
 
-    impl<T, S> ReadUntracked for MaybeSignal<T, S>
-    where
-        T: Clone,
-        S: Storage<SignalTypes<T, S>> + Storage<T>,
-    {
-        type Value = ReadGuard<T, SignalReadGuard<T, S>>;
-
-        fn try_read_untracked(&self) -> Option<Self::Value> {
-            match self {
-                Self::Static(t) => {
-                    Some(ReadGuard::new(SignalReadGuard::Owned(t.clone())))
-                }
-                Self::Dynamic(s) => s.try_read_untracked(),
-            }
-        }
-    }
-
-    impl<T, S> Read for MaybeSignal<T, S>
-    where
-        T: Clone,
-        S: Storage<SignalTypes<T, S>> + Storage<T>,
-    {
-        type Value = ReadGuard<T, SignalReadGuard<T, S>>;
-
-        fn try_read(&self) -> Option<Self::Value> {
-            match self {
-                Self::Static(t) => {
-                    Some(ReadGuard::new(SignalReadGuard::Owned(t.clone())))
-                }
-                Self::Dynamic(s) => s.try_read(),
-            }
-        }
-
-        fn read(&self) -> Self::Value {
-            self.try_read().unwrap_or_else(unwrap_signal!(self))
-        }
-    }
-
     impl<T> MaybeSignal<T>
     where
         T: Send + Sync,
@@ -980,21 +770,6 @@ pub mod read {
         }
     }
 
-    impl<T, S> MaybeSignal<T, S>
-    where
-        T: 'static,
-        S: Storage<SignalTypes<T, S>> + Storage<T>,
-    {
-        /// Subscribes to this signal in the current reactive scope without doing anything with its value.
-        #[track_caller]
-        pub fn track(&self) {
-            match self {
-                Self::Static(_) => {}
-                Self::Dynamic(signal) => signal.track(),
-            }
-        }
-    }
-
     impl<T> From<T> for MaybeSignal<T, SyncStorage>
     where
         SyncStorage: Storage<T>,
@@ -1117,7 +892,7 @@ pub mod read {
 
     impl<S> From<&str> for MaybeSignal<String, S>
     where
-        S: Storage<String> + Storage<Arc<RwLock<String>>>,
+        S: Storage<String>,
     {
         fn from(value: &str) -> Self {
             Self::Static(value.to_string())
@@ -1132,7 +907,7 @@ pub mod read {
     ///
     /// ## Examples
     /// ```rust
-    /// # use reactive_graph::signal::*; let owner = reactive_graph::owner::Owner::new(); owner.set();
+    /// # use reactive_graph::signal::*;
     /// # use reactive_graph::wrappers::read::MaybeProp;
     /// # use reactive_graph::computed::Memo;
     /// # use reactive_graph::prelude::*;
@@ -1192,6 +967,23 @@ pub mod read {
         }
     }
 
+    impl<T, S> WithUntracked for MaybeProp<T, S>
+    where
+        S: Storage<SignalTypes<Option<T>, S>> + Storage<Option<T>>,
+    {
+        type Value = Option<T>;
+
+        fn try_with_untracked<U>(
+            &self,
+            fun: impl FnOnce(&Self::Value) -> U,
+        ) -> Option<U> {
+            match &self.0 {
+                None => Some(fun(&None)),
+                Some(inner) => inner.try_with_untracked(fun),
+            }
+        }
+    }
+
     impl<T, S> With for MaybeProp<T, S>
     where
         T: Send + Sync + 'static,
@@ -1210,40 +1002,6 @@ pub mod read {
         }
     }
 
-    impl<T, S> ReadUntracked for MaybeProp<T, S>
-    where
-        T: Clone,
-        S: Storage<SignalTypes<Option<T>, S>> + Storage<Option<T>>,
-    {
-        type Value = ReadGuard<Option<T>, SignalReadGuard<Option<T>, S>>;
-
-        fn try_read_untracked(&self) -> Option<Self::Value> {
-            match &self.0 {
-                None => Some(ReadGuard::new(SignalReadGuard::Owned(None))),
-                Some(inner) => inner.try_read_untracked(),
-            }
-        }
-    }
-
-    impl<T, S> Read for MaybeProp<T, S>
-    where
-        T: Clone,
-        S: Storage<SignalTypes<Option<T>, S>> + Storage<Option<T>>,
-    {
-        type Value = ReadGuard<Option<T>, SignalReadGuard<Option<T>, S>>;
-
-        fn try_read(&self) -> Option<Self::Value> {
-            match &self.0 {
-                None => Some(ReadGuard::new(SignalReadGuard::Owned(None))),
-                Some(inner) => inner.try_read(),
-            }
-        }
-
-        fn read(&self) -> Self::Value {
-            self.try_read().unwrap_or_else(unwrap_signal!(self))
-        }
-    }
-
     impl<T> MaybeProp<T>
     where
         T: Send + Sync,
@@ -1257,21 +1015,6 @@ pub mod read {
         }
     }
 
-    impl<T, S> MaybeProp<T, S>
-    where
-        T: 'static,
-        S: Storage<SignalTypes<Option<T>, S>> + Storage<Option<T>>,
-    {
-        /// Subscribes to this signal in the current reactive scope without doing anything with its value.
-        #[track_caller]
-        pub fn track(&self) {
-            match &self.0 {
-                None => {}
-                Some(signal) => signal.track(),
-            }
-        }
-    }
-
     impl<T> From<T> for MaybeProp<T>
     where
         SyncStorage: Storage<Option<T>>,
@@ -1498,76 +1241,6 @@ pub mod read {
             Self(Some(MaybeSignal::from_local(Some(value.to_string()))))
         }
     }
-
-    /// The content of a [`Signal`] wrapper read guard, variable depending on the signal type.
-    #[derive(Debug)]
-    pub enum SignalReadGuard<T: 'static, S: Storage<T>> {
-        /// A read signal guard.
-        Read(ReadGuard<T, Plain<T>>),
-        /// A memo guard.
-        Memo(ReadGuard<T, Mapped<Plain<MemoInner<T, S>>, T>>),
-        /// A fake guard for derived signals, the content had to actually be cloned, so it's not a guard but we pretend it is.
-        Owned(T),
-    }
-
-    impl<T, S> Clone for SignalReadGuard<T, S>
-    where
-        S: Storage<T>,
-        T: Clone,
-        Plain<T>: Clone,
-        Mapped<Plain<MemoInner<T, S>>, T>: Clone,
-    {
-        fn clone(&self) -> Self {
-            match self {
-                SignalReadGuard::Read(i) => SignalReadGuard::Read(i.clone()),
-                SignalReadGuard::Memo(i) => SignalReadGuard::Memo(i.clone()),
-                SignalReadGuard::Owned(i) => SignalReadGuard::Owned(i.clone()),
-            }
-        }
-    }
-
-    impl<T, S> Deref for SignalReadGuard<T, S>
-    where
-        S: Storage<T>,
-    {
-        type Target = T;
-        fn deref(&self) -> &Self::Target {
-            match self {
-                SignalReadGuard::Read(i) => i,
-                SignalReadGuard::Memo(i) => i,
-                SignalReadGuard::Owned(i) => i,
-            }
-        }
-    }
-
-    impl<T, S> Borrow<T> for SignalReadGuard<T, S>
-    where
-        S: Storage<T>,
-    {
-        fn borrow(&self) -> &T {
-            self.deref()
-        }
-    }
-
-    impl<T, S> PartialEq<T> for SignalReadGuard<T, S>
-    where
-        S: Storage<T>,
-        T: PartialEq,
-    {
-        fn eq(&self, other: &T) -> bool {
-            self.deref() == other
-        }
-    }
-
-    impl<T, S> Display for SignalReadGuard<T, S>
-    where
-        S: Storage<T>,
-        T: Display,
-    {
-        fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-            Display::fmt(&**self, f)
-        }
-    }
 }
 
 /// Types that abstract over the ability to update a signal.
@@ -1609,7 +1282,7 @@ pub mod write {
     ///
     /// ## Examples
     /// ```rust
-    /// # use reactive_graph::prelude::*;  let owner = reactive_graph::owner::Owner::new(); owner.set();
+    /// # use reactive_graph::prelude::*;
     /// # use reactive_graph::wrappers::write::SignalSetter;
     /// # use reactive_graph::signal::signal;
     /// let (count, set_count) = signal(2);

reactive_graph/tests/async_derived.rs

@@ -1,7 +1,6 @@
 use any_spawner::Executor;
 use reactive_graph::{
     computed::{ArcAsyncDerived, AsyncDerived},
-    owner::Owner,
     signal::RwSignal,
     traits::{Get, Read, Set, With, WithUntracked},
 };
@@ -10,8 +9,6 @@ use std::future::pending;
 #[tokio::test]
 async fn arc_async_derived_calculates_eagerly() {
     _ = Executor::init_tokio();
-    let owner = Owner::new();
-    owner.set();
 
     let value = ArcAsyncDerived::new(|| async {
         Executor::tick().await;
@@ -24,8 +21,6 @@ async fn arc_async_derived_calculates_eagerly() {
 #[tokio::test]
 async fn arc_async_derived_tracks_signal_change() {
     _ = Executor::init_tokio();
-    let owner = Owner::new();
-    owner.set();
 
     let signal = RwSignal::new(10);
     let value = ArcAsyncDerived::new(move || async move {
@@ -45,8 +40,6 @@ async fn arc_async_derived_tracks_signal_change() {
 #[tokio::test]
 async fn async_derived_calculates_eagerly() {
     _ = Executor::init_tokio();
-    let owner = Owner::new();
-    owner.set();
 
     let value = AsyncDerived::new(|| async {
         Executor::tick().await;
@@ -59,8 +52,6 @@ async fn async_derived_calculates_eagerly() {
 #[tokio::test]
 async fn async_derived_tracks_signal_change() {
     _ = Executor::init_tokio();
-    let owner = Owner::new();
-    owner.set();
 
     let signal = RwSignal::new(10);
     let value = AsyncDerived::new(move || async move {
@@ -80,8 +71,6 @@ async fn async_derived_tracks_signal_change() {
 #[tokio::test]
 async fn read_signal_traits_on_arc() {
     _ = Executor::init_tokio();
-    let owner = Owner::new();
-    owner.set();
 
     let value = ArcAsyncDerived::new(pending::<()>);
     assert_eq!(value.read(), None);
@@ -93,8 +82,6 @@ async fn read_signal_traits_on_arc() {
 #[tokio::test]
 async fn read_signal_traits_on_arena() {
     _ = Executor::init_tokio();
-    let owner = Owner::new();
-    owner.set();
 
     let value = AsyncDerived::new(pending::<()>);
     println!("{:?}", value.read());
@@ -107,8 +94,6 @@ async fn read_signal_traits_on_arena() {
 #[tokio::test]
 async fn async_derived_with_initial() {
     _ = Executor::init_tokio();
-    let owner = Owner::new();
-    owner.set();
 
     let signal1 = RwSignal::new(0);
     let signal2 = RwSignal::new(0);

reactive_graph/tests/cleanup.rs

@@ -1,88 +0,0 @@
-use reactive_graph::{
-    computed::Memo,
-    owner::{on_cleanup, Owner},
-    signal::{RwSignal, Trigger},
-    traits::{Dispose, GetUntracked, Track},
-};
-use std::sync::Arc;
-
-#[test]
-fn cleanup_on_dispose() {
-    let owner = Owner::new();
-    owner.set();
-
-    struct ExecuteOnDrop(Option<Box<dyn FnOnce() + Send + Sync>>);
-
-    impl ExecuteOnDrop {
-        fn new(f: impl FnOnce() + Send + Sync + 'static) -> Self {
-            Self(Some(Box::new(f)))
-        }
-    }
-    impl Drop for ExecuteOnDrop {
-        fn drop(&mut self) {
-            self.0.take().unwrap()();
-        }
-    }
-
-    let trigger = Trigger::new();
-
-    println!("STARTING");
-
-    let memo = Memo::new(move |_| {
-        trigger.track();
-
-        // An example of why you might want to do this is that
-        // when something goes out of reactive scope you want it to be cleaned up.
-        // The cleaning up might have side effects, and those side effects might cause
-        // re-renders where new `on_cleanup` are registered.
-        let on_drop = ExecuteOnDrop::new(|| {
-            on_cleanup(|| println!("Nested cleanup in progress."))
-        });
-
-        on_cleanup(move || {
-            println!("Cleanup in progress.");
-            drop(on_drop)
-        });
-    });
-    println!("Memo 1: {:?}", memo);
-    memo.get_untracked(); // First cleanup registered.
-
-    memo.dispose(); // Cleanup not run here.
-
-    println!("Cleanup should have been executed.");
-
-    let memo = Memo::new(move |_| {
-        // New cleanup registered. It'll panic here.
-        on_cleanup(move || println!("Test passed."));
-    });
-    println!("Memo 2: {:?}", memo);
-    println!("^ Note how the memos have the same key (different versions).");
-    memo.get_untracked(); // First cleanup registered.
-
-    println!("Test passed.");
-
-    memo.dispose();
-}
-
-#[test]
-fn leak_on_dispose() {
-    let owner = Owner::new();
-    owner.set();
-
-    let trigger = Trigger::new();
-
-    let value = Arc::new(());
-    let weak = Arc::downgrade(&value);
-
-    let memo = Memo::new(move |_| {
-        trigger.track();
-
-        RwSignal::new(value.clone());
-    });
-
-    memo.get_untracked();
-
-    memo.dispose();
-
-    assert!(weak.upgrade().is_none()); // Should have been dropped.
-}