Prepared States dependency should be Reference Counted (#2769)

* Makes Prepared States to be Rc'ed. * Update example. * Make prepared states work on none runtime as well. * Remove more feature flags. * Users always have to manually construct dependency into Rc. * Import Rc. * Revert "Users always have to manually construct dependency into Rc." This reverts commit 9eee1da. * Revert "Import Rc." This reverts commit d6bb90d.
yewstack · Jul 19, 2022 · 9d94f24 · 9d94f24
1 parent 6f53a4e
commit 9d94f24
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 31 deletions.
diff --git a/packages/yew-macro/src/use_prepared_state.rs b/packages/yew-macro/src/use_prepared_state.rs
@@ -61,14 +61,19 @@ impl PreparedState {
     // Async closure is not stable, so we rewrite it to closure + async block
     #[cfg(not(feature = "nightly"))]
     pub fn rewrite_to_closure_with_async_block(&self) -> ExprClosure {
+        use proc_macro2::Span;
         use syn::parse_quote;
 
         let async_token = match &self.closure.asyncness {
             Some(m) => m,
             None => return self.closure.clone(),
         };
 
-        let move_token = &self.closure.capture;
+        // The async block always need to be move so input can be moved into it.
+        let move_token = self
+            .closure
+            .capture
+            .unwrap_or_else(|| Token![move](Span::call_site()));
         let body = &self.closure.body;
 
         let inner = parse_quote! {

diff --git a/packages/yew/src/functional/hooks/use_prepared_state/feat_hydration_ssr.rs b/packages/yew/src/functional/hooks/use_prepared_state/feat_hydration_ssr.rs
@@ -19,13 +19,13 @@ pub fn use_prepared_state<T, D, F>(
 where
     D: Serialize + DeserializeOwned + PartialEq + 'static,
     T: Serialize + DeserializeOwned + 'static,
-    F: FnOnce(&D) -> T,
+    F: FnOnce(Rc<D>) -> T,
 {
     struct HookProvider<T, D, F>
     where
         D: Serialize + DeserializeOwned + PartialEq + 'static,
         T: Serialize + DeserializeOwned + 'static,
-        F: FnOnce(&D) -> T,
+        F: FnOnce(Rc<D>) -> T,
     {
         deps: D,
         f: F,
@@ -35,7 +35,7 @@ where
     where
         D: Serialize + DeserializeOwned + PartialEq + 'static,
         T: Serialize + DeserializeOwned + 'static,
-        F: FnOnce(&D) -> T,
+        F: FnOnce(Rc<D>) -> T,
     {
         type Output = SuspensionResult<Option<Rc<T>>>;
 
@@ -58,14 +58,14 @@ pub fn use_prepared_state_with_suspension<T, D, F, U>(
 where
     D: Serialize + DeserializeOwned + PartialEq + 'static,
     T: Serialize + DeserializeOwned + 'static,
-    F: FnOnce(&D) -> U,
+    F: FnOnce(Rc<D>) -> U,
     U: 'static + Future<Output = T>,
 {
     struct HookProvider<T, D, F, U>
     where
         D: Serialize + DeserializeOwned + PartialEq + 'static,
         T: Serialize + DeserializeOwned + 'static,
-        F: FnOnce(&D) -> U,
+        F: FnOnce(Rc<D>) -> U,
         U: 'static + Future<Output = T>,
     {
         deps: D,
@@ -76,7 +76,7 @@ where
     where
         D: Serialize + DeserializeOwned + PartialEq + 'static,
         T: Serialize + DeserializeOwned + 'static,
-        F: FnOnce(&D) -> U,
+        F: FnOnce(Rc<D>) -> U,
         U: 'static + Future<Output = T>,
     {
         type Output = SuspensionResult<Option<Rc<T>>>;

diff --git a/packages/yew/src/functional/hooks/use_prepared_state/feat_ssr.rs b/packages/yew/src/functional/hooks/use_prepared_state/feat_ssr.rs
@@ -20,13 +20,13 @@ pub fn use_prepared_state<T, D, F>(
 where
     D: Serialize + DeserializeOwned + PartialEq + 'static,
     T: Serialize + DeserializeOwned + 'static,
-    F: FnOnce(&D) -> T,
+    F: FnOnce(Rc<D>) -> T,
 {
     struct HookProvider<T, D, F>
     where
         D: Serialize + DeserializeOwned + PartialEq + 'static,
         T: Serialize + DeserializeOwned + 'static,
-        F: FnOnce(&D) -> T,
+        F: FnOnce(Rc<D>) -> T,
     {
         deps: D,
         f: F,
@@ -36,7 +36,7 @@ where
     where
         D: Serialize + DeserializeOwned + PartialEq + 'static,
         T: Serialize + DeserializeOwned + 'static,
-        F: FnOnce(&D) -> T,
+        F: FnOnce(Rc<D>) -> T,
     {
         type Output = SuspensionResult<Option<Rc<T>>>;
 
@@ -46,7 +46,7 @@ where
 
             let state = {
                 let deps = deps.clone();
-                use_memo(move |_| f(&deps), ()).run(ctx)
+                use_memo(move |_| f(deps), ()).run(ctx)
             };
 
             let state = PreparedStateBase {
@@ -75,14 +75,14 @@ pub fn use_prepared_state_with_suspension<T, D, F, U>(
 where
     D: Serialize + DeserializeOwned + PartialEq + 'static,
     T: Serialize + DeserializeOwned + 'static,
-    F: FnOnce(&D) -> U,
+    F: FnOnce(Rc<D>) -> U,
     U: 'static + Future<Output = T>,
 {
     struct HookProvider<T, D, F, U>
     where
         D: Serialize + DeserializeOwned + PartialEq + 'static,
         T: Serialize + DeserializeOwned + 'static,
-        F: FnOnce(&D) -> U,
+        F: FnOnce(Rc<D>) -> U,
         U: 'static + Future<Output = T>,
     {
         deps: D,
@@ -93,7 +93,7 @@ where
     where
         D: Serialize + DeserializeOwned + PartialEq + 'static,
         T: Serialize + DeserializeOwned + 'static,
-        F: FnOnce(&D) -> U,
+        F: FnOnce(Rc<D>) -> U,
         U: 'static + Future<Output = T>,
     {
         type Output = SuspensionResult<Option<Rc<T>>>;
@@ -112,7 +112,7 @@ where
                 let deps = deps.clone();
                 let result = result.clone();
                 use_state(move || {
-                    let state_f = f(&deps);
+                    let state_f = f(deps.clone());
 
                     spawn_local(async move {
                         let state = state_f.await;

diff --git a/packages/yew/src/functional/hooks/use_prepared_state/mod.rs b/packages/yew/src/functional/hooks/use_prepared_state/mod.rs
@@ -43,7 +43,7 @@ pub use feat_ssr::*;
 /// where
 ///     D: Serialize + DeserializeOwned + PartialEq + 'static,
 ///     T: Serialize + DeserializeOwned + 'static,
-///     F: FnOnce(&D) -> T,
+///     F: FnOnce(Rc<D>) -> T,
 /// # { todo!() }
 /// ```
 ///
@@ -69,7 +69,7 @@ pub use feat_ssr::*;
 ///     where
 ///         D: Serialize + DeserializeOwned + PartialEq + 'static,
 ///         T: Serialize + DeserializeOwned + 'static,
-///         F: FnOnce(&D) -> U,
+///         F: FnOnce(Rc<D>) -> U,
 ///         U: 'static + Future<Output = T>,
 /// # { todo!() }
 /// ```

diff --git a/packages/yew/src/functional/hooks/use_transitive_state/feat_hydration_ssr.rs b/packages/yew/src/functional/hooks/use_transitive_state/feat_hydration_ssr.rs
@@ -18,13 +18,13 @@ pub fn use_transitive_state<T, D, F>(
 where
     D: Serialize + DeserializeOwned + PartialEq + 'static,
     T: Serialize + DeserializeOwned + 'static,
-    F: 'static + FnOnce(&D) -> T,
+    F: 'static + FnOnce(Rc<D>) -> T,
 {
     struct HookProvider<T, D, F>
     where
         D: Serialize + DeserializeOwned + PartialEq + 'static,
         T: Serialize + DeserializeOwned + 'static,
-        F: 'static + FnOnce(&D) -> T,
+        F: 'static + FnOnce(Rc<D>) -> T,
     {
         deps: D,
         f: F,
@@ -34,7 +34,7 @@ where
     where
         D: Serialize + DeserializeOwned + PartialEq + 'static,
         T: Serialize + DeserializeOwned + 'static,
-        F: 'static + FnOnce(&D) -> T,
+        F: 'static + FnOnce(Rc<D>) -> T,
     {
         type Output = SuspensionResult<Option<Rc<T>>>;
 

diff --git a/packages/yew/src/functional/hooks/use_transitive_state/feat_ssr.rs b/packages/yew/src/functional/hooks/use_transitive_state/feat_ssr.rs
@@ -14,24 +14,24 @@ pub(super) struct TransitiveStateBase<T, D, F>
 where
     D: Serialize + DeserializeOwned + PartialEq + 'static,
     T: Serialize + DeserializeOwned + 'static,
-    F: 'static + FnOnce(&D) -> T,
+    F: 'static + FnOnce(Rc<D>) -> T,
 {
     pub state_fn: RefCell<Option<F>>,
-    pub deps: D,
+    pub deps: Rc<D>,
 }
 
 impl<T, D, F> PreparedState for TransitiveStateBase<T, D, F>
 where
     D: Serialize + DeserializeOwned + PartialEq + 'static,
     T: Serialize + DeserializeOwned + 'static,
-    F: 'static + FnOnce(&D) -> T,
+    F: 'static + FnOnce(Rc<D>) -> T,
 {
     fn prepare(&self) -> String {
         let f = self.state_fn.borrow_mut().take().unwrap();
-        let state = f(&self.deps);
+        let state = f(self.deps.clone());
 
-        let state =
-            bincode::serialize(&(Some(&state), Some(&self.deps))).expect("failed to prepare state");
+        let state = bincode::serialize(&(Some(&state), Some(&*self.deps)))
+            .expect("failed to prepare state");
 
         Base64::encode_string(&state)
     }
@@ -45,13 +45,13 @@ pub fn use_transitive_state<T, D, F>(
 where
     D: Serialize + DeserializeOwned + PartialEq + 'static,
     T: Serialize + DeserializeOwned + 'static,
-    F: 'static + FnOnce(&D) -> T,
+    F: 'static + FnOnce(Rc<D>) -> T,
 {
     struct HookProvider<T, D, F>
     where
         D: Serialize + DeserializeOwned + PartialEq + 'static,
         T: Serialize + DeserializeOwned + 'static,
-        F: 'static + FnOnce(&D) -> T,
+        F: 'static + FnOnce(Rc<D>) -> T,
     {
         deps: D,
         f: F,
@@ -61,7 +61,7 @@ where
     where
         D: Serialize + DeserializeOwned + PartialEq + 'static,
         T: Serialize + DeserializeOwned + 'static,
-        F: 'static + FnOnce(&D) -> T,
+        F: 'static + FnOnce(Rc<D>) -> T,
     {
         type Output = SuspensionResult<Option<Rc<T>>>;
 
@@ -71,7 +71,7 @@ where
             ctx.next_prepared_state(move |_re_render, _| -> TransitiveStateBase<T, D, F> {
                 TransitiveStateBase {
                     state_fn: Some(f).into(),
-                    deps: self.deps,
+                    deps: self.deps.into(),
                 }
             });
 

diff --git a/packages/yew/src/functional/hooks/use_transitive_state/mod.rs b/packages/yew/src/functional/hooks/use_transitive_state/mod.rs
@@ -43,7 +43,7 @@ pub use feat_ssr::*;
 /// where
 ///     D: Serialize + DeserializeOwned + PartialEq + 'static,
 ///     T: Serialize + DeserializeOwned + 'static,
-///     F: 'static + FnOnce(&D) -> T,
+///     F: 'static + FnOnce(Rc<D>) -> T,
 /// # { todo!() }
 /// ```
 ///