wip!: refactor frender-html

Author: EqualMa

packages/frender-common/src/reactive_value/non_reactive.rs

@@ -90,11 +90,29 @@ pub trait CachedNonReactiveValue<VK: ?Sized + ValueKind> {
 
     fn into_cache_and_render_init(self) -> (Self::Cache, Self::RenderInit);
 
+    /// Always render
     fn update_into_cache_and_render<Out>(
         self,
         renderer: impl FnOnce(VK::Value<'_>) -> Out,
         cache: &mut Self::Cache,
     ) -> Out;
+
+    /// Doesn't render if self matches cache
+    #[must_use]
+    fn maybe_update_into_cache_and_render<Out>(
+        self,
+        renderer: impl FnOnce(VK::Value<'_>) -> Out,
+        cache: &mut Self::Cache,
+    ) -> Option<Out>
+    where
+        Self: Sized,
+    {
+        if Self::match_cache(&self, cache) {
+            None
+        } else {
+            Some(self.update_into_cache_and_render(renderer, cache))
+        }
+    }
 }
 
 pub trait CachedNonReactiveValueRenderInit<VK: ?Sized + ValueKind, Cache> {

packages/frender-common/src/reactive_value/non_reactive/cached.rs

@@ -36,10 +36,6 @@ impl<T: CachedNonReactiveValue<VK>, VK: ?Sized + ValueKind> ReactiveValue<VK> fo
         renderer: impl FnOnce(VK::Value<'_>) -> Out,
         super::State(::core::marker::PhantomData, cache): &mut Self::PinnedState,
     ) -> Option<Out> {
-        if T::match_cache(&self, cache) {
-            None
-        } else {
-            Some(self.update_into_cache_and_render(renderer, cache))
-        }
+        T::maybe_update_into_cache_and_render(self, renderer, cache)
     }
 }

packages/frender-dom/src/script.rs

@@ -1,9 +1,15 @@
 #[cfg(feature = "csr")]
-mod csr;
-#[cfg(feature = "csr")]
 pub use csr::{CsrScriptContent, ScriptInnerTextCsrOnly};
+#[cfg(feature = "ssr")]
+pub use ssr::{ScriptInnerTextWronglyEncoded, SsrScriptContent};
+
+use frender_common::Empty;
 
+#[cfg(feature = "csr")]
+mod csr;
 #[cfg(feature = "ssr")]
 mod ssr;
-#[cfg(feature = "ssr")]
-pub use ssr::{ScriptInnerTextWronglyEncoded, SsrScriptContent};
+
+pub trait ScriptContent {}
+
+impl ScriptContent for Empty {}

packages/frender-dom/src/script/csr.rs

@@ -2,9 +2,11 @@ use frender_common::reactive_value::ReactiveValueWithKind;
 
 use crate::{csr::render_from::str::ValueKindForStr, Empty};
 
+use super::ScriptContent;
+
 mod no_inner_text;
 
-pub trait CsrScriptContent {
+pub trait CsrScriptContent: ScriptContent {
     type IntoScriptInnerText: ReactiveValueWithKind<ReactiveValueKind: ValueKindForStr>;
     fn into_script_inner_text(this: Self) -> Self::IntoScriptInnerText;
 }
@@ -22,6 +24,11 @@ pub struct ScriptInnerTextCsrOnly<S: ReactiveValueWithKind<ReactiveValueKind: Va
     pub S,
 );
 
+impl<S: ReactiveValueWithKind<ReactiveValueKind: ValueKindForStr>> ScriptContent
+    for ScriptInnerTextCsrOnly<S>
+{
+}
+
 impl<S: ReactiveValueWithKind<ReactiveValueKind: ValueKindForStr>> CsrScriptContent
     for ScriptInnerTextCsrOnly<S>
 {

packages/frender-dom/src/script/ssr.rs

@@ -2,7 +2,9 @@ use async_str_iter::any_str::IterAnyStr;
 use frender_common::{strings::SsrStr, IntoStaticStr};
 use frender_ssr::html::assert;
 
-pub trait SsrScriptContent {
+use super::ScriptContent;
+
+pub trait SsrScriptContent: ScriptContent {
     type IntoScriptContent: assert::ScriptContent;
     fn into_script_content(this: Self) -> Self::IntoScriptContent;
 }
@@ -19,6 +21,8 @@ impl SsrScriptContent for crate::Empty {
 /// Use [`ScriptInnerTextCsrOnly`](super::ScriptInnerTextCsrOnly) for just csr.
 pub struct ScriptInnerTextWronglyEncoded<S: SsrStr>(pub S);
 
+impl<S: SsrStr> ScriptContent for ScriptInnerTextWronglyEncoded<S> {}
+
 impl<S: SsrStr> SsrScriptContent for ScriptInnerTextWronglyEncoded<S> {
     type IntoScriptContent =
         frender_ssr::html::script::IterScriptInnerTextWronglyEncoded<IterAnyStr<S::StaticStr>>;

packages/frender-form-control/src/input.rs

@@ -1,5 +1,9 @@
 mod value_kind;
 pub use value_kind::InputValueKind;
+#[cfg(feature = "csr")]
+pub use value_kind::InputValueKindCsr;
+#[cfg(feature = "ssr")]
+pub use value_kind::InputValueKindSsr;
 
 mod checked;
 mod r#type;

packages/frender-form-control/src/lib.rs

@@ -4,14 +4,17 @@ pub mod textarea;
 mod known_str;
 
 mod value;
-pub use value::FormControlValueKind;
+pub use value::{FormControlValueKind, KindOfChecked, KindOfValue, KindOfValueAsNumber};
 
 pub mod values;
 
 #[cfg(feature = "csr")]
 pub mod csr {
     pub(crate) mod element;
+    pub use element::FormControlElement;
+
     pub(crate) mod value;
+    pub use value::{FormControlValue, FormControlValueStateKind, HandleFormControlValue};
 }
 
 #[cfg(feature = "ssr")]

packages/frender-html/Cargo.toml

@@ -107,8 +107,8 @@ features = [
 [features]
 macros_not_expanded = []
 components = []
-csr = []
-ssr = ["dep:frender-ssr"]
+csr = ["frender-dom/csr", "frender-form-control/csr"]
+ssr = ["dep:frender-ssr", "frender-dom/ssr", "frender-form-control/ssr"]
 web = [
     "frender-style/web",
     "frender-dom/web",
@@ -128,7 +128,7 @@ either = [
 ]
 ElementProxyAttrs = ["dep:ref-cast"]
 # Enables frender-form-control/chrono
-# Also requires ssr
+# Also requires ssr or csr
 chrono = ["frender-form-control/chrono"]
 # Also requires csr
 experimental = []