fixed headers & sync HTMX attribute behaviors

- all htmx attributes should now be supported

Author: RandomHashTags

Sources/HTMLKitMacros/HTMLElement.swift

@@ -188,7 +188,7 @@ private extension HTMLElement {
                                 let htmlValue:String = htmx.htmlValue
                                 var delimiter:String = "\\\""
                                 switch htmx {
-                                    case .request(_, _, _, _):
+                                    case .request(_, _, _, _), .headers(_, _):
                                         delimiter = "'"
                                         break
                                     case .ws(let value):

Sources/HTMLKitUtilities/HTMX.swift

@@ -71,7 +71,27 @@ public extension HTMLElementAttribute {
                 case "disinherit": self = .disinherit(string())
                 case "encoding": self = .encoding(string())
                 case "ext": self = .ext(string())
-                //case "headers": self = .headers(js: Bool, [String : String]) // TODO: fix
+                case "headers":
+                    let values:[Substring] = rawValue.split(separator: ",")
+                    let js:Bool = values[0].hasSuffix("true")
+                    var headers_string:Substring = rawValue[rawValue.firstIndex(of: "[")!...]
+                    headers_string.removeLast() // )
+                    let regex:Regex = try! Regex("(\"[^\"]+\")")
+                    let matches:[Range<Substring.Index>] = headers_string.ranges(of: regex)
+                    var headers:[String:String] = [:]
+                    var header_key:Substring = ""
+                    for i in 0..<matches.count {
+                        var value:Substring = headers_string[matches[i]]
+                        value.removeFirst() // "
+                        value.removeLast() // "
+                        if i % 2 == 0 {
+                            header_key = value
+                        } else {
+                            headers[String(header_key)] = String(value)
+                        }
+                    }
+                    self = .headers(js: js, headers)
+                    break
                 case "history": self = .history(enumeration())
                 case "historyElt": self = .historyElt(boolean())
                 case "include": self = .include(string())
@@ -117,7 +137,21 @@ public extension HTMLElementAttribute {
                     }
                     self = .request(js: javascript, timeout: timeout, credentials: credentials, noHeaders: noHeaders)
                     break
-                //case "sync": self = .sync(String, strategy: SyncStrategy?) // TODO: fix
+                case "sync":
+                    let string:String = literal()
+                    let values:[Substring] = string.split(separator: ",")
+                    var key:Substring = values[0]
+                    key.removeLast() // "
+                    var strategy:SyncStrategy? = nil
+                    var strategy_string:Substring = values[1].split(separator: ":")[1]
+                    if !strategy_string.hasSuffix("nil") {
+                        while (strategy_string.first?.isWhitespace ?? false) || strategy_string.first == "." {
+                            strategy_string.removeFirst()
+                        }
+                        strategy = SyncStrategy(rawValue: String(strategy_string))
+                    }
+                    self = .sync(String(key), strategy: strategy)
+                    break
                 case "validate": self = .validate(enumeration())
 
                 case "get": self = .get(string())
@@ -364,10 +398,6 @@ public extension HTMLElementAttribute.HTMX {
         }
     }
 
-    // MARK: Modifiers
-    enum Modifier {
-    }
-
     // MARK: Params
     enum Params {
         case all
@@ -418,6 +448,21 @@ public extension HTMLElementAttribute.HTMX {
         case drop, abort, replace
         case queue(Queue)
 
+        public init?(rawValue: String) {
+            let values:[Substring] = rawValue.split(separator: "(")
+            switch values[0] {
+                case "drop":    self = .drop
+                case "abort":   self = .abort
+                case "replace": self = .replace
+                case "queue":
+                    guard let value_index:Substring.Index = values[1].firstIndex(where: { $0.isLetter }) else { return nil }
+                    let value:Substring = rawValue[value_index..<values[1].index(before: values[1].endIndex)]
+                    self = .queue(Queue(rawValue: String(value))!)
+                    break
+                default:        return nil
+            }
+        }
+
         public enum Queue : String {
             case first, last, all
         }
@@ -427,7 +472,7 @@ public extension HTMLElementAttribute.HTMX {
                 case .drop:             return "drop"
                 case .abort:            return "abort"
                 case .replace:          return "replace"
-                case .queue(let queue): return queue.rawValue
+                case .queue(let queue): return "queue " + queue.rawValue
             }
         }
     }

Tests/HTMLKitTests/HTMXTests.swift

@@ -23,6 +23,49 @@ struct HTMXTests {
         #expect(string == "<div hx-get=\"/test\"></div>")
     }
 
+    // MARK: headers
+    @Test func headers() {
+        let set:Set<String> = dictionary_json_results(tag: "div", closingTag: true, attribute: "hx-headers", delimiter: "'", ["womp":"womp", "ding dong":"d1tched", "EASY":"C,L.a;P!"])
+        let string:StaticString = #div(attributes: [.htmx(.headers(js: false, ["womp":"womp", "ding dong":"d1tched", "EASY":"C,L.a;P!"]))])
+        #expect(set.contains(string.description), Comment(rawValue: "string=\(string)\nset=\(set)"))
+    }
+    func dictionary_json_results(
+        tag: String,
+        closingTag: Bool,
+        attribute: String,
+        delimiter: String,
+        _ dictionary: [String:String]
+    ) -> Set<String> { // TODO: fix (doesn't check all available values)
+        var set:Set<String> = []
+        let prefix:String = "<" + tag + " " + attribute + "=" + delimiter
+        let suffix:String = delimiter + ">" + (closingTag ? "</" + tag + ">" : "")
+        set.reserveCapacity(dictionary.count*dictionary.count)
+        for (key1, value1) in dictionary {
+            let string:String = prefix + "{\"" + key1 + "\":\"" + value1 + "\","
+
+            var string1:String = string
+            for (key2, value2) in dictionary {
+                if key1 != key2 {
+                    string1 += "\"" + key2 + "\":\"" + value2 + "\","
+                }
+            }
+            string1.removeLast()
+            string1 += "}" + suffix
+            set.insert(string1)
+
+            var string2:String = string
+            for (key2, value2) in dictionary.reversed() {
+                if key1 != key2 {
+                    string2 += "\"" + key2 + "\":\"" + value2 + "\","
+                }
+            }
+            string2.removeLast()
+            string2 += "}" + suffix
+            set.insert(string2)
+        }
+        return set
+    }
+
     // MARK: on
     @Test func on() {
         var string:StaticString = #div(attributes: [.htmx(.on(.abort, "bruh"))])
@@ -71,6 +114,15 @@ struct HTMXTests {
         #expect(string == "<div hx-request='{\"noHeaders\":true}'></div>")
     }
 
+    // MARK: sync
+    @Test func sync() {
+        var string:StaticString = #div(attributes: [.htmx(.sync("closest form", strategy: .abort))])
+        #expect(string == "<div hx-sync=\"closest form:abort\"></div>")
+
+        string = #div(attributes: [.htmx(.sync("#submit-button", strategy: .queue(.first)))])
+        #expect(string == "<div hx-sync=\"#submit-button:queue first\"></div>")
+    }
+
     // MARK: ws
     @Test func ws() {
         var string:StaticString = #div(attributes: [.htmx(.ws(.connect("https://paradigm-app.com")))])