feat: move Attrs to frender-dom

Author: EqualMa

Cargo.lock

@@ -1,5 +1,6 @@
 pub use frender_dom::{
     //
+    attrs::Attrs,
     special::DangerousInnerHtml,
     string_element::StringElement,
     Empty,

packages/frender-dom-values/src/lib.rs

@@ -14,6 +14,9 @@ frender-dom-tokens = { version = "0.1.0", path = "../frender-dom-tokens", featur
     "experimental",
 ] }
 frender-attr-value = { version = "0.1.0", path = "../frender-attr-value" }
+frender-attrs = { version = "0.1.0", path = "../frender-attrs", features = [
+    "experimental",
+] }
 
 # ssr
 frender-ssr = { version = "0.1.0", path = "../frender-ssr", optional = true }
@@ -59,8 +62,9 @@ ssr = [
     "dep:async-str-iter",
     "frender-reactive-value/ssr",
     "frender-dom-tokens/ssr",
+    "frender-attrs/ssr",
 ]
-csr = ["dep:frender-csr-core", "frender-dom-tokens/csr"]
+csr = ["dep:frender-csr-core", "frender-dom-tokens/csr", "frender-attrs/csr"]
 web = [
     "dep:web-sys",
     "dep:wasm-bindgen",
@@ -73,6 +77,7 @@ web = [
 either = [
     "frender-ssr?/either",
     "frender-attr-value/either",
+    "frender-attrs/either",
     "frender-dom-tokens/either",
     "frender-style/either",
 ]

packages/frender-dom/Cargo.toml

@@ -3,6 +3,8 @@ use frender_attrs::IntoAttributes;
 pub struct Attrs<A: IntoAttributes>(pub A);
 
 #[cfg(feature = "csr")]
+#[cfg(feature = "experimental")]
 mod csr;
+
 #[cfg(feature = "ssr")]
 mod ssr;

packages/frender-html/src/attrs.rs packages/frender-dom/src/attrs.rspackages/frender-html/src/attrs.rs renamed to packages/frender-dom/src/attrs.rs

@@ -0,0 +1,42 @@
+use frender_attrs::{
+    experimental::csr::{CsrAttributes, RenderAttributes},
+    IntoAttributes,
+};
+
+use crate::csr::behaviors::Element;
+
+use super::Attrs;
+
+impl<T: IntoAttributes> Attrs<T> {
+    pub fn csr_render_init<R: ?Sized>(
+        self,
+        renderer: &mut R,
+        element: &mut (impl ?Sized + Element<R>),
+    ) -> <T::IntoAttributes as CsrAttributes>::State {
+        T::into_attributes(self.0).render_init(&mut Render { renderer, element })
+    }
+
+    pub fn csr_render_update<R: ?Sized>(
+        self,
+        renderer: &mut R,
+        element: &mut (impl ?Sized + Element<R>),
+        state: &mut <T::IntoAttributes as CsrAttributes>::State,
+    ) {
+        T::into_attributes(self.0).render_update(&mut Render { renderer, element }, state)
+    }
+}
+
+struct Render<'a, R: ?Sized, E: ?Sized> {
+    renderer: &'a mut R,
+    element: &'a mut E,
+}
+
+impl<R: ?Sized, E: ?Sized + Element<R>> RenderAttributes for Render<'_, R, E> {
+    fn set_attribute(&mut self, name: &str, value: &str) {
+        self.element.set_attribute(self.renderer, name, value)
+    }
+
+    fn remove_attribute(&mut self, name: &str) {
+        self.element.remove_attribute(self.renderer, name)
+    }
+}

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

@@ -1,5 +1,6 @@
 use frender_attrs::{experimental::ssr::SsrAttributes, IntoAttributes};
-use frender_dom::ssr::IntoSpaceAndHtmlAttributesOrEmpty;
+
+use crate::ssr::IntoSpaceAndHtmlAttributesOrEmpty;
 
 use super::Attrs;
 

packages/frender-html/src/attrs/ssr.rs packages/frender-dom/src/attrs/ssr.rspackages/frender-html/src/attrs/ssr.rs renamed to packages/frender-dom/src/attrs/ssr.rs

@@ -28,5 +28,7 @@ pub mod node_ref;
 
 pub mod string_element;
 
+pub mod attrs;
+
 #[cfg(feature = "web")]
 mod shims;

packages/frender-dom/src/lib.rs

@@ -14,7 +14,9 @@ frender-common = { version = "0.1.0", path = "../frender-common" }
 gloo-events = { version = "0.2.0", optional = true }
 js-sys = { version = "0.3.64", optional = true }
 frender-ssr = { version = "0.1.0", path = "../frender-ssr", optional = true }
-frender-dom = { version = "0.1.0", path = "../frender-dom" }
+frender-dom = { version = "0.1.0", path = "../frender-dom", features = [
+    "experimental",
+] }
 async-str-iter = { version = "0.1.0", path = "../async-str-iter" }
 either = { version = "1.9.0", default-features = false, optional = true }
 frender-style = { version = "0.1.0", path = "../frender-style", features = [

packages/frender-html/Cargo.toml

@@ -1,18 +1,14 @@
 use std::marker::PhantomData;
 
-use frender_attrs::{
-    experimental::csr::{CsrAttributes, RenderAttributes},
-    IntoAttributes,
-};
+use frender_attrs::{experimental::csr::CsrAttributes, IntoAttributes};
 use frender_common::convert::FromMut as _;
-use frender_dom::csr::behaviors;
 
 use crate::{
     csr::behavior_type::{BehaviorType, UnpinnedNonReactiveRenderStateKind, UnpinnedRenderWithBehavior},
     html::{behavior_type_traits, RenderHtml},
 };
 
-use super::Attrs;
+use frender_dom_values::Attrs;
 
 enum Never {}
 pub struct StateKind<S>(Never, PhantomData<S>);
@@ -35,10 +31,7 @@ impl<
         renderer: &mut R,
         b: &mut <BT as BehaviorType>::OfBehaviorType<R>,
     ) -> <Self::UnpinnedRenderStateKind as crate::csr::behavior_type::UnpinnedNonReactiveRenderStateKind>::UnpinnedNonReactiveState<R> {
-        T::into_attributes(this.0).render_init(&mut Render {
-            renderer,
-            element: BT::Element::from_mut(b),
-        })
+        this.csr_render_init(renderer, BT::Element::from_mut(b))
     }
 
     fn unpinned_render_update_with_behavior<R: ?Sized + RenderHtml>(
@@ -48,27 +41,6 @@ impl<
         b: &mut <BT as BehaviorType>::OfBehaviorType<R>,
         state: &mut <Self::UnpinnedRenderStateKind as crate::csr::behavior_type::UnpinnedNonReactiveRenderStateKind>::UnpinnedNonReactiveState<R>,
     ) {
-        T::into_attributes(this.0).render_update(
-            &mut Render {
-                renderer,
-                element: BT::Element::from_mut(b),
-            },
-            state,
-        )
-    }
-}
-
-struct Render<'a, R: ?Sized, E: ?Sized> {
-    renderer: &'a mut R,
-    element: &'a mut E,
-}
-
-impl<R: ?Sized, E: ?Sized + behaviors::Element<R>> RenderAttributes for Render<'_, R, E> {
-    fn set_attribute(&mut self, name: &str, value: &str) {
-        self.element.set_attribute(self.renderer, name, value)
-    }
-
-    fn remove_attribute(&mut self, name: &str) {
-        self.element.remove_attribute(self.renderer, name)
+        this.csr_render_update(renderer, BT::Element::from_mut(b), state)
     }
 }

packages/frender-html/src/attrs/csr.rs packages/frender-html/src/csr/attrs.rspackages/frender-html/src/attrs/csr.rs renamed to packages/frender-html/src/csr/attrs.rs

@@ -38,7 +38,6 @@ pub mod __private {
 mod special;
 
 mod attr_value;
-mod attrs;
 mod dom_tokens;
 mod event_listener;
 mod style;
@@ -68,6 +67,8 @@ pub mod csr {
 
     pub(crate) mod kinds;
 
+    mod attrs;
+
     #[cfg(feature = "experimental")]
     pub mod experimental;