feat: allow dereferencing LocalResource to an AsyncDerived (see #4063)

Cargo.lock

@@ -1780,8 +1780,6 @@ dependencies = [
  "tachys",
  "thiserror 2.0.12",
  "throw_error",
- "tokio",
- "tokio-test",
  "tracing",
  "typed-builder",
  "typed-builder-macro",

examples/suspense_tests/e2e/features/check_instrumented_issue_3719.feature

@@ -52,7 +52,7 @@ Feature: Using instrumented counters to test regression from #3502.
             | list_items         | 1 |
             | get_item           | 1 |
             | inspect_item_root  | 0 |
-            | inspect_item_field | 3 |
+            | inspect_item_field | 4 |
 
     Scenario: Follow paths ordinarily down to a target
         Given I select the following links

examples/suspense_tests/src/instrumented.rs

@@ -477,8 +477,6 @@ fn ItemInspect() -> impl IntoView {
         move || params.get().map(|p| p.path),
         move |p| async move {
             // leptos::logging::log!("res_inspect: res_overview.await");
-            // Note: this resource is untracked here, though `params` changing
-            // will nonetheless results in the "expected" tracked updates.
             let overview = res_overview.await;
             // leptos::logging::log!("res_inspect: resolved res_overview.await");
             // let result =

leptos/Cargo.toml

@@ -101,11 +101,6 @@ trace-component-props = [
 delegation = ["tachys/delegation"]
 islands-router = ["tachys/mark_branches"]
 
-[dev-dependencies]
-tokio = { features = ["rt-multi-thread", "macros"] , workspace = true, default-features = true }
-tokio-test = { workspace = true, default-features = true }
-any_spawner = { workspace = true, features = ["futures-executor", "tokio"] }
-
 [build-dependencies]
 rustc_version = { workspace = true, default-features = true }
 

leptos/tests/pr_4061.rs

@@ -1,79 +0,0 @@
-#[cfg(feature = "ssr")]
-mod imports {
-    pub use any_spawner::Executor;
-    pub use futures::StreamExt;
-    pub use leptos::prelude::*;
-}
-
-#[cfg(feature = "ssr")]
-#[tokio::test]
-async fn chain_await_resource() {
-    use imports::*;
-
-    _ = Executor::init_tokio();
-    let owner = Owner::new();
-    owner.set();
-
-    let (rs, ws) = signal(0);
-    let source = Resource::new(
-        || (),
-        move |_| async move {
-            #[cfg(feature = "ssr")]
-            tokio::time::sleep(std::time::Duration::from_millis(1)).await;
-            1
-        },
-    );
-    let consuming = Resource::new(
-        || (),
-        move |_| async move {
-            let result = source.await;
-            ws.update(|s| *s += 1);
-            result
-        },
-    );
-    let app = view! {
-        <Suspense>{
-            move || {
-                Suspend::new(async move {
-                    consuming.await;
-                    rs.get()
-                })
-            }
-        }</Suspense>
-    };
-
-    assert_eq!(app.to_html_stream_in_order().collect::<String>().await, "1");
-}
-
-#[cfg(feature = "ssr")]
-#[tokio::test]
-async fn chain_no_await_resource() {
-    use imports::*;
-
-    _ = Executor::init_tokio();
-    let owner = Owner::new();
-    owner.set();
-
-    let (rs, ws) = signal(0);
-    let source = Resource::new(|| (), move |_| async move { 1 });
-    let consuming = Resource::new(
-        || (),
-        move |_| async move {
-            let result = source.await;
-            ws.update(|s| *s += 1);
-            result
-        },
-    );
-    let app = view! {
-        <Suspense>{
-            move || {
-                Suspend::new(async move {
-                    consuming.await;
-                    rs.get()
-                })
-            }
-        }</Suspense>
-    };
-
-    assert_eq!(app.to_html_stream_in_order().collect::<String>().await, "1");
-}

leptos_server/src/local_resource.rs

@@ -20,7 +20,7 @@ use reactive_graph::{
 };
 use std::{
     future::{pending, Future, IntoFuture},
-    ops::DerefMut,
+    ops::{Deref, DerefMut},
     panic::Location,
 };
 
@@ -43,6 +43,14 @@ impl<T> Clone for ArcLocalResource<T> {
     }
 }
 
+impl<T> Deref for ArcLocalResource<T> {
+    type Target = ArcAsyncDerived<T>;
+
+    fn deref(&self) -> &Self::Target {
+        &self.data
+    }
+}
+
 impl<T> ArcLocalResource<T> {
     /// Creates the resource.
     ///
@@ -269,6 +277,14 @@ pub struct LocalResource<T> {
     defined_at: &'static Location<'static>,
 }
 
+impl<T> Deref for LocalResource<T> {
+    type Target = AsyncDerived<T>;
+
+    fn deref(&self) -> &Self::Target {
+        &self.data
+    }
+}
+
 impl<T> Clone for LocalResource<T> {
     fn clone(&self) -> Self {
         *self

reactive_graph/src/computed/async_derived/arc_async_derived.rs

@@ -484,10 +484,7 @@ impl<T: 'static> ArcAsyncDerived<T> {
     {
         let fun = move || {
             let fut = fun();
-            let fut = async move { SendOption::new(Some(fut.await)) };
-            #[cfg(feature = "sandboxed-arenas")]
-            let fut = Sandboxed::new(fut);
-            fut
+            async move { SendOption::new(Some(fut.await)) }
         };
         let initial_value = SendOption::new(initial_value);
         let (this, _) = spawn_derived!(
@@ -521,12 +518,9 @@ impl<T: 'static> ArcAsyncDerived<T> {
     {
         let fun = move || {
             let fut = fun();
-            let fut = ScopedFuture::new_untracked(async move {
+            ScopedFuture::new_untracked(async move {
                 SendOption::new(Some(fut.await))
-            });
-            #[cfg(feature = "sandboxed-arenas")]
-            let fut = Sandboxed::new(fut);
-            fut
+            })
         };
         let initial_value = SendOption::new(initial_value);
         let (this, _) = spawn_derived!(
@@ -568,10 +562,7 @@ impl<T: 'static> ArcAsyncDerived<T> {
     {
         let fun = move || {
             let fut = fun();
-            let fut = async move { SendOption::new_local(Some(fut.await)) };
-            #[cfg(feature = "sandboxed-arenas")]
-            let fut = Sandboxed::new(fut);
-            fut
+            async move { SendOption::new_local(Some(fut.await)) }
         };
         let initial_value = SendOption::new_local(initial_value);
         let (this, _) = spawn_derived!(
@@ -607,10 +598,7 @@ impl<T: 'static> ArcAsyncDerived<T> {
         let initial = SendOption::new_local(None::<T>);
         let fun = move || {
             let fut = fun();
-            let fut = async move { SendOption::new_local(Some(fut.await)) };
-            #[cfg(feature = "sandboxed-arenas")]
-            let fut = Sandboxed::new(fut);
-            fut
+            async move { SendOption::new_local(Some(fut.await)) }
         };
         let (this, _) = spawn_derived!(
             crate::spawn_local,

reactive_graph/src/owner.rs

@@ -291,18 +291,12 @@ impl Owner {
     /// fill the same need as an "on unmount" function in other UI approaches, etc.
     pub fn on_cleanup(fun: impl FnOnce() + Send + Sync + 'static) {
         if let Some(owner) = Owner::current() {
-            let mut inner = owner.inner.write().or_poisoned();
-
-            #[cfg(feature = "sandboxed-arenas")]
-            let fun = {
-                let arena = Arc::clone(&inner.arena);
-                move || {
-                    Arena::set(&arena);
-                    fun()
-                }
-            };
-
-            inner.cleanups.push(Box::new(fun));
+            owner
+                .inner
+                .write()
+                .or_poisoned()
+                .cleanups
+                .push(Box::new(fun));
         }
     }
 
@@ -464,7 +458,7 @@ pub(crate) struct OwnerInner {
     #[cfg(feature = "sandboxed-arenas")]
     arena: Arc<RwLock<ArenaMap>>,
     paused: bool,
-    joined_owners: Vec<WeakOwner>,
+    joined_owners: Vec<Owner>,
 }
 
 impl Debug for OwnerInner {

reactive_graph/src/owner/context.rs

@@ -3,6 +3,7 @@ use or_poisoned::OrPoisoned;
 use std::{
     any::{Any, TypeId},
     collections::VecDeque,
+    sync::Arc,
 };
 
 impl Owner {
@@ -12,7 +13,7 @@ impl Owner {
             .write()
             .or_poisoned()
             .joined_owners
-            .push(other.downgrade());
+            .push(other.clone());
     }
 
     fn provide_context<T: Send + Sync + 'static>(&self, value: T) {
@@ -38,7 +39,7 @@ impl Owner {
             let joined = inner
                 .joined_owners
                 .iter()
-                .flat_map(|owner| owner.upgrade().map(|owner| owner.inner));
+                .map(|owner| Arc::clone(&owner.inner));
             for parent in parent.into_iter().chain(joined) {
                 let mut parent = Some(parent);
                 while let Some(ref this_parent) = parent.clone() {
@@ -75,7 +76,7 @@ impl Owner {
             let joined = inner
                 .joined_owners
                 .iter()
-                .flat_map(|owner| owner.upgrade().map(|owner| owner.inner));
+                .map(|owner| Arc::clone(&owner.inner));
             for parent in parent.into_iter().chain(joined) {
                 let mut parent = Some(parent);
                 while let Some(ref this_parent) = parent.clone() {
@@ -113,7 +114,7 @@ impl Owner {
             let joined = inner
                 .joined_owners
                 .iter()
-                .flat_map(|owner| owner.upgrade().map(|owner| owner.inner));
+                .map(|owner| Arc::clone(&owner.inner));
             for parent in parent.into_iter().chain(joined) {
                 let mut parent = Some(parent);
                 while let Some(ref this_parent) = parent.clone() {