improve some api and examples

Author: kaikalii

.gitignore

@@ -1 +1,2 @@
-.vscode/
+.vscode/
+main.ua

examples/todo.ua

@@ -1,42 +1,34 @@
 # Experimental!
-~ "../lib.ua"
-  ~ ! A B Body Br Button Div Em Form Head Html H₁ H₂ H₃ H₄ H₅ H₆ I Li Meta Ol P Script Span Strong Style Table Title Ul
-  ~ HXGet HXSwap HXTarget NotFound ResHTML Response Serve!
+Html ~ "../lib.ua" ~ HtmlResp NotFound Serve!
 
-Item ← Div {
-  ⊓(
-  | Button {HXSwap "outerHTML" HXTarget "closest div" ⊃(HXGet $"/item-tog/_"|$"Item: _")}
-  | Br {}
-    Br {}
-  )
-}
+Item ← Html!(
+  Div{⊓(
+      Button {HXSwap "outerHTML" HXTarget "closest div" ⊃(HXGet $"/item-tog/_"|$"Item: _")}
+    | Br {}
+    )}
+)
 
-Index ← (
+Index ← Html!(
   Html {
     Head {
       Title "Webua"
+      Meta {!charset "utf-8"}
       Script {!src "https://unpkg.com/[email protected]"}
     }
     Body {
       H₁ "Webua Example"
-      P "This is a simple example of Webua templating."
+      P "This is a simple example of Webua templating with HTMX!"
       Item "a"
       Item "b"
       Item "c"
     }
   }
-  ResHTML
-)
-
-RespondItem ← (
-  Item
-  ResHTML
 )
 
 Route ← ⍣(
-  ⍩Index°"/"
-| ⍩RespondItem¯ ?°$"/item-tog/_"
+  ⍩(HtmlResp Index) °"/"
+| ⍩(HtmlResp Item) ¯ °$"/item-tog/_"
 | NotFound
 )
 
-Serve!(Route)
+Serve!Route 8080

lib.ua

@@ -1,43 +1,48 @@
 Xml ~ "xml" ~ ! Tags!
 ~ "xml" ~ ! Tags!
 
-Listener ← &tcpl "0.0.0.0:8080"
-
 HXGet    ← $$ hx-get="_"
 HXPost   ← $$ hx-post="_"
 HXSwap   ← $$ hx-swap="_"
 HXTarget ← $$ hx-target="_"
 
-# ? Status Mime Bytes
+# Construct an HTTP response
+# ResponseBytes ? Status Mime Bytes
 Response ← (
-  ⊙⊙(⧻.)
+  ⊙⊙⊸⧻
   $$ HTTP/1.1 _
   $$ Content-Type: _
   $$ Content-Length: _
   $$ 
   $$ 
   ⊂ utf₈
 )
+# Construct a simple text HTTP response
+TextResp ← Response "200 OK" "text/html" utf₈
+# A simple not found HTTP response
+NotFound ← (Response "404 Not Found" "text/plain" utf₈"Not Found")
+# Construct a simple HTML HTTP response
+HtmlResp ← Response "200 OK" "text/html" utf₈
 
-ResHTML ← (Response "200 OK" "text/html" utf₈)
-
-Respond! ← ◌pool(
-  &p $"Request from _" &tcpaddr.
-  # Extract path from request
-  °□⊡1 ⊜□≠@\s . &ru "\r\n\r\n".
-  &p $"Request:\n_".
-
-  ^0
-  &p⊸($"Response: _ bytes" ⧻)
-
-  # Send response
-  ⊃⋅&cl&w
+Respond! ← (
+  &w⊸(
+    ⟜(&p $"Request from _" &tcpaddr)
+    °□⊡1 ⊜□⊸≠@\s &ru "\r\n\r\n"
+    ⟜(&p $"Request:\n_")
+    ^0
+    ⟜(&p $"Response: _ bytes" ⧻)
+  )
 )
 
-Serve! ← ⍢(⍣Respond!(^0)⋅&p &tcpa Listener)1
+Sig! ↚^ ⋅⊢
 
-NotFound ← (
-  Response "404 Not Found" "text/plain" utf₈"Not Found"
+# Start a server on the given port.
+# The function will be called on the TCP socket for each incoming connection.
+# ? Port
+Serve! ← (
+  &tcpl $"0.0.0.0:_"
+  ⟜(&p $"Server started on _" &tcpaddr)
+  ⍢(⍜&tcpa(⍣Respond!^0⋅&p))1
 )
 
 Tags!(

readme.md

@@ -9,9 +9,9 @@ Templating is done with tag functions. A tag function is passed a list of attrib
 The `!` macro makes it easy to define attributes.
 
 ```uiua
-~ "git: github.com/uiua-lang/webua" ~ ! Html Head Body P Br H₁ Title Meta Style
+Html ~ "git: github.com/uiua-lang/webua"
 
-Html {
+Html!(Html {
   Head {
     Title "Example"
     Meta {!charset "utf-8"}
@@ -22,19 +22,19 @@ Html {
     P "This is a simple example of Webua templating."
     Br {}
   }
-}
+})
 ```
 
 You can use normal Uiua primitives to fill out data.
 
 ```uiua
-~ "git: github.com/uiua-lang/webua" ~ Div H₁ Ul Li
+~ "git: github.com/uiua-lang/webua"
 
 $Users {"Alice" "Bob" "Carol"}
-Div {
+Html!(Div {
   H₁ "Users"
   Ul ⍚Li
-}
+})
 ## "<div><h1>Users</h1><ul><li>Alice</li><li>Bob</li><li>Carol</li></ul></div>"
 ```