Add create_isomorphic_resource

packages/sycamore-web/src/resource.rs

@@ -43,30 +43,28 @@ impl<T: 'static> Resource<T> {
         }
     }
 
-    /// Attach handlers to call the refetch function on the client side.
-    fn fetch_on_client(self) -> Self {
-        if is_not_ssr!() {
-            create_effect(move || {
-                self.is_loading.set(true);
-                // Take all the scopes and create a new guard.
-                for scope in self.scopes.take() {
-                    let guard = SuspenseTaskGuard::from_scope(scope);
-                    self.guards.update(|guards| guards.push(guard));
-                }
+    /// Attach handlers to always call the refetch function to get the latest value.
+    fn always_refetch(self) -> Self {
+        create_effect(move || {
+            self.is_loading.set(true);
+            // Take all the scopes and create a new guard.
+            for scope in self.scopes.take() {
+                let guard = SuspenseTaskGuard::from_scope(scope);
+                self.guards.update(|guards| guards.push(guard));
+            }
 
-                let fut = self.refetch.update_silent(|f| f());
+            let fut = self.refetch.update_silent(|f| f());
 
-                sycamore_futures::create_suspense_task(async move {
-                    let value = fut.await;
-                    batch(move || {
-                        self.value.set(Some(value));
-                        self.is_loading.set(false);
-                        // Now, drop all the guards to resolve suspense.
-                        self.guards.update(|guards| guards.clear());
-                    });
+            sycamore_futures::create_suspense_task(async move {
+                let value = fut.await;
+                batch(move || {
+                    self.value.set(Some(value));
+                    self.is_loading.set(false);
+                    // Now, drop all the guards to resolve suspense.
+                    self.guards.update(|guards| guards.clear());
                 });
-            })
-        }
+            });
+        });
 
         self
     }
@@ -95,18 +93,37 @@ impl<T: 'static> Deref for Resource<T> {
     }
 }
 
-/// Create a resrouce that will only be resolved on the client side.
+/// Create a resource value that is fetched on both client and server.
 ///
 /// If the resource has any dependencies, it is recommended to use [`on`] to make them explicit.
 /// This will ensure that the dependencies are tracked since reactive variables inside async
 /// contexts are not tracked automatically.
+pub fn create_isomorphic_resource<F, Fut, T>(f: F) -> Resource<T>
+where
+    F: FnMut() -> Fut + 'static,
+    Fut: Future<Output = T> + 'static,
+    T: 'static,
+{
+    Resource::new(f).always_refetch()
+}
+
+/// Create a resource value that is fetched only on the client.
+///
+/// On the server, the resource will forever be in the loading state.
 ///
-/// On the server, the resource will always be marked as loading.
+/// If the resource has any dependencies, it is recommended to use [`on`] to make them explicit.
+/// This will ensure that the dependencies are tracked since reactive variables inside async
+/// contexts are not tracked automatically.
 pub fn create_client_resource<F, Fut, T>(f: F) -> Resource<T>
 where
     F: FnMut() -> Fut + 'static,
     Fut: Future<Output = T> + 'static,
     T: 'static,
 {
-    Resource::new(f).fetch_on_client()
+    let resource = Resource::new(f);
+    if is_not_ssr!() {
+        resource.always_refetch()
+    } else {
+        resource
+    }
 }