feat!: reorganize features of frender-html

Author: EqualMa

Cargo.lock

@@ -0,0 +1,11 @@
+[package]
+name = "frender-csr"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+frender-html = { version = "0.1.0", path = "../frender-html", default-features = false, features = [
+    "csr",
+] }
+
+[features]

packages/frender-csr/Cargo.toml

@@ -0,0 +1 @@
+pub use frender_html::csr::*;

packages/frender-csr/src/lib.rs

@@ -0,0 +1,9 @@
+[package]
+name = "frender-html-components"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+frender-html = { version = "0.1.0", path = "../frender-html", default-features = false, features = [
+    "components",
+] }

packages/frender-html-components/Cargo.toml

@@ -0,0 +1 @@
+pub use frender_html::html::components::*;

packages/frender-html-components/src/lib.rs

@@ -40,7 +40,11 @@ fn test_is_special_attribute() {
 }
 
 fn expand_and_write(src_root: &Path) -> io::Result<()> {
-    let items = utils::cargo_expand_html("frender-html", "html")?;
+    let items = utils::cargo_expand_html(
+        "frender-html",
+        "html",
+        "macros_not_expanded,csr,ssr,components",
+    )?;
 
     let parent_folder = src_root.join("html");
 
@@ -76,6 +80,8 @@ fn expand_and_write(src_root: &Path) -> io::Result<()> {
             continue;
         }
 
+        eprintln!("Expand mod {ident}");
+
         assert!(unsafety.is_none());
         assert!(semi.is_none());
 

packages/frender-html-expand/src/main.rs

@@ -11,15 +11,31 @@ pub fn format_item(item: syn::Item) -> String {
     })
 }
 
-pub fn cargo_expand_html(pkg_name: &str, mod_name: &str) -> io::Result<Vec<syn::Item>> {
-    let output = std::process::Command::new("cargo")
+pub fn cargo_expand_html(
+    pkg_name: &str,
+    mod_name: &str,
+    features: &str,
+) -> io::Result<Vec<syn::Item>> {
+    let mut command = std::process::Command::new("cargo");
+    command
         .arg("expand")
         .arg("-p")
         .arg(pkg_name)
         .arg("--features")
-        .arg("macros_not_expanded")
-        .arg("--ugly")
-        .output()?;
+        .arg(features)
+        .arg("--ugly");
+
+    eprintln!(
+        "Run: {} {}",
+        command.get_program().to_string_lossy(),
+        command
+            .get_args()
+            .map(|a| a.to_string_lossy())
+            .collect::<Vec<_>>()
+            .join(" ")
+    );
+
+    let output = command.output()?;
 
     if !output.status.success() {
         io::stdout().write_all(&output.stdout)?;

packages/frender-html-expand/src/utils.rs

@@ -13,7 +13,7 @@ frender-common = { version = "0.1.0", path = "../frender-common" }
 # stack_dst = "0.8.1"
 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" }
+frender-ssr = { version = "0.1.0", path = "../frender-ssr", optional = true }
 frender-dom = { version = "0.1.0", path = "../frender-dom" }
 async-str-iter = { version = "0.1.0", path = "../async-str-iter" }
 either = { version = "1.9.0", default-features = false, optional = true }
@@ -105,8 +105,10 @@ features = [
 ]
 
 [features]
-# default = ["components", "macros_not_expanded"] # TODO: remove
-default = ["components"] # TODO: remove
+macros_not_expanded = []
+components = []
+csr = []
+ssr = ["dep:frender-ssr"]
 web = [
     "frender-style/web",
     "frender-dom/web",
@@ -116,14 +118,17 @@ web = [
     "dep:web-sys",
     "dep:wasm-bindgen",
 ]
-macros_not_expanded = []
+# impl CsrElement for either::Either
+# Also requires csr
 either = [
     "dep:either",
     "frender-ssr/either",
     "frender-dom/either",
     "frender-form-control/either",
 ]
 ElementProxyAttrs = ["dep:ref-cast"]
-components = []
+# Enables frender-form-control/chrono
+# Also requires ssr
 chrono = ["frender-form-control/chrono"]
+# Also requires csr
 experimental = []