rewrite

ModProg · Jul 2, 2024 · e69afcd · e69afcd
1 parent 513f91a
commit e69afcd
Show file tree

Hide file tree

Showing 25 changed files with 1,510 additions and 781 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -14,8 +14,7 @@ repository = "https://github.com/ModProg/htmx"
 documentation = "https://docs.rs/htmx"
 
 [features]
-default = ["axum", "actix-web"]
-sorted_attributes = []
+# default = ["axum", "actix-web"]
 axum = ["dep:axum-core"]
 
 [dependencies]
@@ -30,13 +29,10 @@ serde = "1.0.188"
 serde_json = "1.0.107"
 typed-builder = {git = "https://github.com/ModProg/rust-typed-builder", branch = "mutators"}
 chrono = "0.4.31"
+ghost = "0.1.17"
 
 [dev-dependencies]
 insta = "1.31.0"
-# Enables `sorted_attributes` for tests, to make assertions stable.
-htmx = { path = ".", default-features = false, features = [
-    "sorted_attributes",
-] }
 serde = { version = "1.0.188", features = ["derive"] }
 
 [profile.dev.package.insta]

diff --git a/example/Cargo.toml b/example/Cargo.toml
@@ -11,7 +11,7 @@ repository = "https://github.com/ModProg/htmx"
 documentation = "https://docs.rs/htmx"
 
 [features]
-default = ["axum"]
+default = ["axum", "tauri", "actix"]
 axum = ["htmx/axum", "dep:tokio", "dep:axum"]
 tauri = ["dep:tauri-runtime", "dep:tauri-runtime-wry", "dep:url"]
 actix = ["htmx/actix-web", "dep:actix-web"]

diff --git a/example/axum.rs b/example/axum.rs
@@ -8,18 +8,17 @@ use std::error::Error;
 use axum::response::IntoResponse;
 use axum::routing::{get, post};
 use axum::{Form, Router};
-use htmx::{html, HtmxSrc};
+use htmx::{html, HtmlPage, HtmxSrc};
 
 async fn index() -> impl IntoResponse {
     html! {
-        <head>
-            <HtmxSrc/>
-        </head>
-        <h1>"Axum Demo"</h1>
-        <form hx::post="/greet" hx::swap="outerHTML">
-            <input name="name" placeholder="Name"/>
-            <button> "Greet me" </button>
-        </form>
+        <HtmlPage mobile title="Axum Demo" scripts=["htmx"]>
+            <h1>"Axum Demo"</h1>
+            <form hx::post="/greet" hx::swap="outerHTML">
+                <input name="name" placeholder="Name"/>
+                <button> "Greet me" </button>
+            </form>
+        </_>
     }
 }
 
@@ -39,6 +38,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
             Router::new()
                 .route("/", get(index))
                 .route("/greet", post(greet))
+                .route("/htmx", get(HtmxSrc))
                 .into_make_service(),
         )
         .await

diff --git a/example/tauri.rs b/example/tauri.rs
@@ -8,15 +8,15 @@ use std::borrow::Cow;
 use std::error::Error;
 use std::fmt::Display;
 
-use htmx::{html, Html, HtmxSrc};
+use htmx::{html, HtmxSrc};
 use tauri_runtime::http::ResponseBuilder;
 use tauri_runtime::webview::{WebviewAttributes, WindowBuilder};
 use tauri_runtime::window::PendingWindow;
 use tauri_runtime::Runtime;
 use tauri_runtime_wry::Wry;
 use url::Url;
 
-fn index() -> Html {
+fn index() -> String {
     html! {
         <head><HtmxSrc/></head>
         <h1>"Tauri Demo"</h1>
@@ -25,14 +25,16 @@ fn index() -> Html {
             <button> "Greet me" </button>
         </form>
     }
+    .into_string()
 }
 
-fn greet(name: impl Display) -> Html {
+fn greet(name: impl Display) -> String {
     html! {
         "Hello "
         {format!("{name}! ")}
         <a href="/"> ":D" </a>
     }
+    .into_string()
 }
 
 fn get_param<'a>(key: &str, url: &'a Url) -> Result<Cow<'a, str>, String> {
@@ -61,7 +63,6 @@ fn main() -> Result<(), Box<dyn Error>> {
                     "/greet" => greet(get_param("name", &url)?),
                     path => return Err(format!("Unknown path `{path}`").into()),
                 }
-                .to_string()
                 .into_bytes(),
             )
             .unwrap())

diff --git a/htmx-macros/Cargo.toml b/htmx-macros/Cargo.toml
@@ -19,7 +19,9 @@ proc-macro = true
 attribute-derive.path = "../../../Rust/attribute-derive"
 derive_more = { version = "1.0.0-beta.6", features = ["display"] }
 forr = "0.2.2"
+html-escape = "0.2.13"
 htmx-script = { version = "0.1.0", path = "../htmx-script" }
+ident_case = "1.0.1"
 manyhow = "0.9"
 proc-macro-utils = "0.10"
 proc-macro2 = "1.0.66"