Add WASM Mime. Init Complex Query example

system · system · commit 32acc8e35a66 · 2026-02-02T03:48:28.000+01:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -18,6 +18,6 @@ members = [
     "examples/request-tracking",
     "examples/engine",
     "rwf-admin",
-    "examples/files", "examples/users", "examples/openapi", "examples/oidc", "examples/callbacks", "examples/cursor",
+    "examples/files", "examples/users", "examples/openapi", "examples/oidc", "examples/callbacks", "examples/cursor", "examples/complex-queries",
 ]
 exclude = ["examples/rails", "rwf-ruby", "examples/django", "rwf-fuzz"]
diff --git a/examples/complex-queries/Cargo.toml b/examples/complex-queries/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "complex-queries"
+version = "0.1.0"
+edition = "2024"
+
+[dependencies]
+rwf = {path = "../../rwf"}
diff --git a/examples/complex-queries/README.md b/examples/complex-queries/README.md
@@ -0,0 +1,22 @@
+# Complex Query
+Rwf implements a wide range of postgres query features. 
+So it is possible to use other queries defined in a WITH statement as well as COMBINED queries (UNION, EXCEPT, INTERSECT). 
+
+## Example
+
+```rust
+use rwf::prelude;
+use rwf::model::prelude::*;
+#[derive(Clone, macros::Model, Serialize, Deserialize)]
+struct User {
+    id: Option<i64>,
+    name: String,
+    mail: String
+}
+#[tokio::main]
+async fn main() -> Result<(), rwf::model::Error> {
+    let query = User::all().except
+    
+    Ok(())
+}
+```
diff --git a/examples/complex-queries/src/main.rs b/examples/complex-queries/src/main.rs
@@ -0,0 +1,36 @@
+use rwf::model::Join;
+use rwf::model::select::Op;
+use rwf::prelude::*;
+
+#[derive(Debug, Serialize, Deserialize, macros::Model, Clone, PartialEq, Eq)]
+#[has_many(Order)]
+pub struct User {
+    id: Option<i64>,
+    username: String,
+    email: String,
+}
+
+#[derive(Debug, Serialize, Deserialize, macros::Model, Clone, PartialEq, Eq)]
+#[belongs_to(User)]
+pub struct Order {
+    id: Option<i64>,
+    user_id: i64,
+    expensive: bool,
+}
+impl Order {
+    pub fn latest_user_order_id() -> Scope<Self> {
+        Self::all()
+            .group_by(&["user_id"])
+            .select_aggregated(&[("id", "MAX", Some("id"))])
+    }
+    pub fn latest_user_order() -> Scope<Self> {
+        Self::all()
+            .with(Order::latest_user_order_id(), "latest_id")
+            .add_join(Join::new(Self::table_name(), "latet_id", "id", "id"))
+    }
+}
+
+#[tokio::main]
+async fn main() -> Result<(), rwf::model::Error> {
+    Ok(())
+}
diff --git a/examples/cursor/src/main.rs b/examples/cursor/src/main.rs
@@ -101,9 +101,9 @@ async fn main() -> Result<(), rwf::http::Error> {
 #[cfg(test)]
 mod tests {
     use super::AppLog;
-    use rwf::model::prelude::*;
-    use tokio_stream::{Stream, StreamExt};
     use rwf::model::migrate;
+    use rwf::model::prelude::*;
+    use tokio_stream::StreamExt;
 
     #[tokio::test]
     async fn test_cur_eq_query() {
diff --git a/rwf-tests/static/index.html b/rwf-tests/static/index.html
@@ -0,0 +1,20 @@
+<!doctype html>
+<html lang="en-US">
+  <head>
+    <meta charset="utf-8" />
+    <title>hello-wasm example</title>
+  </head>
+  <body>
+    <script type="module">
+      import init, { greet, sum } from "./pkg/wasm.js";
+
+      init().then(() => {
+        greet("WebAssembly");
+	window.rswasm = {
+		sum: sum,
+		greet: greet
+	}
+      });
+    </script>
+  </body>
+</html>
diff --git a/rwf/src/http/body.rs b/rwf/src/http/body.rs
@@ -204,6 +204,7 @@ impl Body {
                     "ttf" => "font/ttf",
                     "txt" => "text/plain",
                     "vsd" => "application/vnd.visio",
+                    "wasm" => "application/wasm",
                     "wav" => "audio/wav",
                     "weba" => "audio/webm",
                     "webm" => "video/webm",

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,6 @@ members = [`
`18`	`18`	`"examples/request-tracking",`
`19`	`19`	`"examples/engine",`
`20`	`20`	`"rwf-admin",`
`21`		`- "examples/files", "examples/users", "examples/openapi", "examples/oidc", "examples/callbacks", "examples/cursor",`
	`21`	`+ "examples/files", "examples/users", "examples/openapi", "examples/oidc", "examples/callbacks", "examples/cursor", "examples/complex-queries",`
`22`	`22`	`]`
`23`	`23`	`exclude = ["examples/rails", "rwf-ruby", "examples/django", "rwf-fuzz"]`