Remove SendWrapper from the external interface of LocalResource, by internalising a MaybeSendWrapper inside ArcAsyncDerived

leptos_server/src/local_resource.rs

@@ -7,16 +7,16 @@ use reactive_graph::{
         AnySource, AnySubscriber, ReactiveNode, Source, Subscriber,
         ToAnySource, ToAnySubscriber,
     },
-    owner::use_context,
+    maybe_send_wrapper::MaybeSendWrapper,
+    owner::{use_context, LocalStorage},
     signal::{
-        guards::{AsyncPlain, ReadGuard},
+        guards::{AsyncPlain, Mapped, ReadGuard},
         ArcRwSignal, RwSignal,
     },
     traits::{
         DefinedAt, IsDisposed, ReadUntracked, Track, Update, With, Write,
     },
 };
-use send_wrapper::SendWrapper;
 use std::{
     future::{pending, Future, IntoFuture},
     panic::Location,
@@ -24,7 +24,7 @@ use std::{
 
 /// A reference-counted resource that only loads its data locally on the client.
 pub struct ArcLocalResource<T> {
-    data: ArcAsyncDerived<SendWrapper<T>>,
+    data: ArcAsyncDerived<T>,
     refetch: ArcRwSignal<usize>,
     #[cfg(any(debug_assertions, leptos_debuginfo))]
     defined_at: &'static Location<'static>,
@@ -71,14 +71,12 @@ impl<T> ArcLocalResource<T> {
                 }
             }
         };
-        let fetcher = SendWrapper::new(fetcher);
         let refetch = ArcRwSignal::new(0);
         let data = {
             let refetch = refetch.clone();
-            ArcAsyncDerived::new(move || {
+            ArcAsyncDerived::new_unsync(move || {
                 refetch.track();
-                let fut = fetcher();
-                SendWrapper::new(async move { SendWrapper::new(fut.await) })
+                fetcher()
             })
         };
         Self {
@@ -97,7 +95,7 @@ impl<T> ArcLocalResource<T> {
     /// Synchronously, reactively reads the current value of the resource and applies the function
     /// `f` to its value if it is `Some(_)`.
     #[track_caller]
-    pub fn map<U>(&self, f: impl FnOnce(&SendWrapper<T>) -> U) -> Option<U>
+    pub fn map<U>(&self, f: impl FnOnce(&T) -> U) -> Option<U>
     where
         T: 'static,
     {
@@ -128,14 +126,9 @@ where
     T: Clone + 'static,
 {
     type Output = T;
-    type IntoFuture = futures::future::Map<
-        AsyncDerivedFuture<SendWrapper<T>>,
-        fn(SendWrapper<T>) -> T,
-    >;
+    type IntoFuture = AsyncDerivedFuture<T>;
 
     fn into_future(self) -> Self::IntoFuture {
-        use futures::FutureExt;
-
         if let Some(mut notifier) = use_context::<LocalResourceNotifier>() {
             notifier.notify();
         } else if cfg!(feature = "ssr") {
@@ -145,7 +138,7 @@ where
                  always pending on the server."
             );
         }
-        self.data.into_future().map(|value| (*value).clone())
+        self.data.into_future()
     }
 }
 
@@ -166,8 +159,10 @@ impl<T> ReadUntracked for ArcLocalResource<T>
 where
     T: 'static,
 {
-    type Value =
-        ReadGuard<Option<SendWrapper<T>>, AsyncPlain<Option<SendWrapper<T>>>>;
+    type Value = ReadGuard<
+        Option<T>,
+        Mapped<AsyncPlain<MaybeSendWrapper<Option<T>>>, Option<T>>,
+    >;
 
     fn try_read_untracked(&self) -> Option<Self::Value> {
         if let Some(mut notifier) = use_context::<LocalResourceNotifier>() {
@@ -240,7 +235,7 @@ impl<T> Subscriber for ArcLocalResource<T> {
 
 /// A resource that only loads its data locally on the client.
 pub struct LocalResource<T> {
-    data: AsyncDerived<SendWrapper<T>>,
+    data: AsyncDerived<T, LocalStorage>,
     refetch: RwSignal<usize>,
     #[cfg(any(debug_assertions, leptos_debuginfo))]
     defined_at: &'static Location<'static>,
@@ -290,11 +285,9 @@ impl<T> LocalResource<T> {
             data: if cfg!(feature = "ssr") {
                 AsyncDerived::new_mock(fetcher)
             } else {
-                let fetcher = SendWrapper::new(fetcher);
-                AsyncDerived::new(move || {
+                AsyncDerived::new_unsync(move || {
                     refetch.track();
-                    let fut = fetcher();
-                    SendWrapper::new(async move { SendWrapper::new(fut.await) })
+                    fetcher()
                 })
             },
             refetch,
@@ -314,14 +307,9 @@ where
     T: Clone + 'static,
 {
     type Output = T;
-    type IntoFuture = futures::future::Map<
-        AsyncDerivedFuture<SendWrapper<T>>,
-        fn(SendWrapper<T>) -> T,
-    >;
+    type IntoFuture = AsyncDerivedFuture<T>;
 
     fn into_future(self) -> Self::IntoFuture {
-        use futures::FutureExt;
-
         if let Some(mut notifier) = use_context::<LocalResourceNotifier>() {
             notifier.notify();
         } else if cfg!(feature = "ssr") {
@@ -331,7 +319,7 @@ where
                  always pending on the server."
             );
         }
-        self.data.into_future().map(|value| (*value).clone())
+        self.data.into_future()
     }
 }
 
@@ -352,8 +340,10 @@ impl<T> ReadUntracked for LocalResource<T>
 where
     T: 'static,
 {
-    type Value =
-        ReadGuard<Option<SendWrapper<T>>, AsyncPlain<Option<SendWrapper<T>>>>;
+    type Value = ReadGuard<
+        Option<T>,
+        Mapped<AsyncPlain<MaybeSendWrapper<Option<T>>>, Option<T>>,
+    >;
 
     fn try_read_untracked(&self) -> Option<Self::Value> {
         if let Some(mut notifier) = use_context::<LocalResourceNotifier>() {