connected interpolation promotion logic; some fixes

RandomHashTags · RandomHashTags · commit a774d89ff28f · 2024-11-22T04:43:55.000-06:00
diff --git a/Sources/HTMLKitUtilities/HTMLElementAttribute.swift b/Sources/HTMLKitUtilities/HTMLElementAttribute.swift
@@ -6,6 +6,7 @@
 //
 
 import SwiftSyntax
+import SwiftSyntaxMacros
 
 public enum HTMLElementAttribute : Hashable {
     case accesskey(String? = nil)
@@ -58,28 +59,13 @@ public enum HTMLElementAttribute : Hashable {
     case event(Extra.event, _ value: String? = nil)
 
     // MARK: init rawValue
-    public init?(key: String, _ function: FunctionCallExprSyntax) {
+    public init?(context: some MacroExpansionContext, key: String, _ function: FunctionCallExprSyntax) {
         let expression:ExprSyntax = function.arguments.first!.expression
-        func string() -> String?        { expression.stringLiteral?.string }
-        func boolean() -> Bool?         { expression.booleanLiteral?.literal.text == "true" }
-        func enumeration<T : HTMLInitializable>() -> T? {
-            if let function:FunctionCallExprSyntax = expression.functionCall, let member:MemberAccessExprSyntax = function.calledExpression.memberAccess {
-                return T(key: member.declName.baseName.text, arguments: function.arguments)
-            }
-            if let member:MemberAccessExprSyntax = expression.memberAccess {
-                return T(key: member.declName.baseName.text, arguments: function.arguments)
-            }
-            return nil
-        }
-        func int() -> Int? {
-            guard let s:String = expression.integerLiteral?.literal.text else { return nil }
-            return Int(s)
-        }
-        func array_string() -> [String] { expression.array?.elements.compactMap({ $0.expression.stringLiteral?.string }) ?? [] }
-        func float() -> Float? {
-            guard let s:String = expression.integerLiteral?.literal.text ?? expression.floatLiteral?.literal.text else { return nil }
-            return Float(s)
-        }
+        func string() -> String?        { expression.string(context: context, key: key) }
+        func boolean() -> Bool?         { expression.boolean(context: context, key: key) }
+        func enumeration<T : HTMLInitializable>() -> T? { expression.enumeration(context: context, key: key, arguments: function.arguments) }
+        func int() -> Int? { expression.int(context: context, key: key) }
+        func array_string() -> [String] { expression.array_string(context: context, key: key) }
         switch key {
             case "accesskey":             self = .accesskey(string())
             case "ariaattribute":         self = .ariaattribute(enumeration())
@@ -89,7 +75,7 @@ public enum HTMLElementAttribute : Hashable {
             case "class":                 self = .class(array_string())
             case "contenteditable":       self = .contenteditable(enumeration())
             case "data", "custom":
-                guard let id:String = string(), let value:String = function.arguments.last?.expression.stringLiteral?.string else {
+                guard let id:String = string(), let value:String = function.arguments.last?.expression.string(context: context, key: key) else {
                     return nil
                 }
                 if key == "data" {
@@ -126,7 +112,7 @@ public enum HTMLElementAttribute : Hashable {
             case "trailingSlash":         self = .trailingSlash
             case "htmx":                  self = .htmx(enumeration())
             case "event":
-                guard let event:HTMLElementAttribute.Extra.event = enumeration(), let value:String = function.arguments.last?.expression.stringLiteral?.string else {
+                guard let event:HTMLElementAttribute.Extra.event = enumeration(), let value:String = function.arguments.last?.expression.string(context: context, key: key) else {
                     return nil
                 }
                 self = .event(event, value)
diff --git a/Sources/HTMLKitUtilities/HTMLElementAttributeExtra.swift b/Sources/HTMLKitUtilities/HTMLElementAttributeExtra.swift
@@ -6,10 +6,11 @@
 //
 
 import SwiftSyntax
+import SwiftSyntaxMacros
 
 // MARK: HTMLInitializable
 public protocol HTMLInitializable : Hashable {
-    init?(key: String, arguments: LabeledExprListSyntax)
+    init?(context: some MacroExpansionContext, key: String, arguments: LabeledExprListSyntax)
 
     var key : String { get }
     var htmlValue : String? { get }
@@ -18,7 +19,7 @@ public extension HTMLInitializable where Self: RawRepresentable, RawValue == Str
     var key : String { rawValue }
     var htmlValue : String? { rawValue }
 
-    init?(key: String, arguments: LabeledExprListSyntax) {
+    init?(context: some MacroExpansionContext, key: String, arguments: LabeledExprListSyntax) {
         guard let value:Self = .init(rawValue: key) else { return nil }
         self = value
     }
@@ -28,7 +29,7 @@ public extension HTMLInitializable where Self: RawRepresentable, RawValue == Str
 extension HTMLElementAttribute {
     public enum Extra {
 
-        public static func parse(key: String, expr: ExprSyntax) -> (any HTMLInitializable)? {
+        public static func parse(context: some MacroExpansionContext, key: String, expr: ExprSyntax) -> (any HTMLInitializable)? {
             func get<T : HTMLInitializable>(_ type: T.Type) -> T? {
                 let inner_key:String, arguments:LabeledExprListSyntax
                 if let function:FunctionCallExprSyntax = expr.functionCall {
@@ -40,7 +41,7 @@ extension HTMLElementAttribute {
                 } else {
                     return nil
                 }
-                return T(key: inner_key, arguments: arguments)
+                return T(context: context, key: inner_key, arguments: arguments)
             }
             switch key {
                 case "as": return get(`as`.self)
@@ -175,28 +176,14 @@ public extension HTMLElementAttribute.Extra {
         case valuenow(Float?)
         case valuetext(String?)
 
-        public init?(key: String, arguments: LabeledExprListSyntax) {
+        public init?(context: some MacroExpansionContext, key: String, arguments: LabeledExprListSyntax) {
             let expression:ExprSyntax = arguments.first!.expression
-            func string() -> String?        { expression.stringLiteral?.string }
-            func boolean() -> Bool?         { expression.booleanLiteral?.literal.text == "true" }
-            func enumeration<T : HTMLInitializable>() -> T? {
-                if let function:FunctionCallExprSyntax = expression.functionCall, let member:MemberAccessExprSyntax = function.calledExpression.memberAccess {
-                    return T(key: member.declName.baseName.text, arguments: function.arguments)
-                }
-                if let member:MemberAccessExprSyntax = expression.memberAccess {
-                    return T(key: member.declName.baseName.text, arguments: arguments)
-                }
-                return nil
-            }
-            func int() -> Int? {
-                guard let s:String = expression.integerLiteral?.literal.text else { return nil }
-                return Int(s)
-            }
-            func array_string() -> [String] { expression.array?.elements.compactMap({ $0.expression.stringLiteral?.string }) ?? [] }
-            func float() -> Float? {
-                guard let s:String = expression.integerLiteral?.literal.text ?? expression.floatLiteral?.literal.text else { return nil }
-                return Float(s)
-            }
+            func string() -> String?        { expression.string(context: context, key: key) }
+            func boolean() -> Bool?         { expression.boolean(context: context, key: key) }
+            func enumeration<T : HTMLInitializable>() -> T? { expression.enumeration(context: context, key: key, arguments: arguments) }
+            func int() -> Int? { expression.int(context: context, key: key) }
+            func array_string() -> [String] { expression.array_string(context: context, key: key) }
+            func float() -> Float? { expression.float(context: context, key: key) }
             switch key {
                 case "activedescendant":       self = .activedescendant(string())
                 case "atomic":                 self = .atomic(boolean())
@@ -582,7 +569,7 @@ public extension HTMLElementAttribute.Extra {
         case togglePopover
         case custom(String)
 
-        public init?(key: String, arguments: LabeledExprListSyntax) {
+        public init?(context: some MacroExpansionContext, key: String, arguments: LabeledExprListSyntax) {
             switch key {
                 case "showModal":     self = .showModal
                 case "close":         self = .close
@@ -673,7 +660,7 @@ public extension HTMLElementAttribute.Extra {
         case empty
         case filename(String)
 
-        public init?(key: String, arguments: LabeledExprListSyntax) {
+        public init?(context: some MacroExpansionContext, key: String, arguments: LabeledExprListSyntax) {
             switch key {
                 case "empty":    self = .empty
                 case "filename": self = .filename(arguments.first!.expression.stringLiteral!.string)
diff --git a/Sources/HTMLKitUtilities/HTMLKitUtilities.swift b/Sources/HTMLKitUtilities/HTMLKitUtilities.swift
@@ -6,6 +6,7 @@
 //
 
 import SwiftSyntax
+import SwiftSyntaxMacros
 
 // MARK: HTMLKitUtilities
 public enum HTMLKitUtilities {
@@ -103,7 +104,7 @@ public extension HTMLElementAttribute {
         /// Relative to the parent element
         case percent(_ value: Float?)
 
-        public init?(key: String, arguments: LabeledExprListSyntax) {
+        public init?(context: some MacroExpansionContext, key: String, arguments: LabeledExprListSyntax) {
             let expression:ExprSyntax = arguments.first!.expression
             func float() -> Float? {
                 guard let s:String = expression.integerLiteral?.literal.text ?? expression.floatLiteral?.literal.text else { return nil }
diff --git a/Sources/HTMLKitUtilities/HTMX.swift b/Sources/HTMLKitUtilities/HTMX.swift
@@ -6,6 +6,7 @@
 //
 
 import SwiftSyntax
+import SwiftSyntaxMacros
 
 public extension HTMLElementAttribute {
     enum HTMX : HTMLInitializable {
@@ -50,28 +51,11 @@ public extension HTMLElementAttribute {
         case ws(WebSocket?)
 
         // MARK: init
-        public init?(key: String, arguments: LabeledExprListSyntax) {
+        public init?(context: some MacroExpansionContext, key: String, arguments: LabeledExprListSyntax) {
             let expression:ExprSyntax = arguments.first!.expression
-            func string() -> String?        { expression.stringLiteral?.string }
-            func boolean() -> Bool?         { expression.booleanLiteral?.literal.text == "true" }
-            func enumeration<T : HTMLInitializable>() -> T? {
-                if let function:FunctionCallExprSyntax = expression.functionCall, let member:MemberAccessExprSyntax = function.calledExpression.memberAccess {
-                    return T(key: member.declName.baseName.text, arguments: function.arguments)
-                }
-                if let member:MemberAccessExprSyntax = expression.memberAccess {
-                    return T(key: member.declName.baseName.text, arguments: arguments)
-                }
-                return nil
-            }
-            func int() -> Int? {
-                guard let s:String = expression.integerLiteral?.literal.text else { return nil }
-                return Int(s)
-            }
-            func array_string() -> [String] { expression.array?.elements.compactMap({ $0.expression.stringLiteral?.string }) ?? [] }
-            func float() -> Float? {
-                guard let s:String = expression.integerLiteral?.literal.text ?? expression.floatLiteral?.literal.text else { return nil }
-                return Float(s)
-            }
+            func string() -> String?        { expression.string(context: context, key: key) }
+            func boolean() -> Bool?         { expression.boolean(context: context, key: key) }
+            func enumeration<T : HTMLInitializable>() -> T? { expression.enumeration(context: context, key: key, arguments: arguments) }
             switch key {
                 case "boost": self = .boost(enumeration())
                 case "confirm": self = .confirm(string())
diff --git a/Sources/HTMLKitUtilities/HTMXAttributes.swift b/Sources/HTMLKitUtilities/HTMXAttributes.swift
@@ -6,6 +6,7 @@
 //
 
 import SwiftSyntax
+import SwiftSyntaxMacros
 
 public extension HTMLElementAttribute.HTMX {
     // MARK: TrueOrFalse
@@ -121,9 +122,9 @@ public extension HTMLElementAttribute.HTMX {
         case not([String])
         case list([String])
 
-        public init?(key: String, arguments: LabeledExprListSyntax) {
+        public init?(context: some MacroExpansionContext, key: String, arguments: LabeledExprListSyntax) {
             let expression:ExprSyntax = arguments.first!.expression
-            func array_string() -> [String] { expression.array?.elements.compactMap({ $0.expression.stringLiteral?.string }) ?? [] }
+            func array_string() -> [String] { expression.array_string(context: context, key: key) }
             switch key {
                 case "all":  self = .all
                 case "none": self = .none
@@ -166,22 +167,14 @@ public extension HTMLElementAttribute.HTMX {
         case drop, abort, replace
         case queue(Queue?)
 
-        public init?(key: String, arguments: LabeledExprListSyntax) {
+        public init?(context: some MacroExpansionContext, key: String, arguments: LabeledExprListSyntax) {
             switch key {
                 case "drop":    self = .drop
                 case "abort":   self = .abort
                 case "replace": self = .replace
                 case "queue":
                     let expression:ExprSyntax = arguments.first!.expression
-                    func enumeration<T : HTMLInitializable>() -> T? {
-                        if let function:FunctionCallExprSyntax = expression.functionCall, let member:MemberAccessExprSyntax = function.calledExpression.memberAccess {
-                            return T(key: member.declName.baseName.text, arguments: function.arguments)
-                        }
-                        if let member:MemberAccessExprSyntax = expression.memberAccess {
-                            return T(key: member.declName.baseName.text, arguments: arguments)
-                        }
-                        return nil
-                    }
+                    func enumeration<T : HTMLInitializable>() -> T? { expression.enumeration(context: context, key: key, arguments: arguments) }
                     self = .queue(enumeration())
                 default:        return nil
             }
@@ -215,7 +208,7 @@ public extension HTMLElementAttribute.HTMX {
         case `true`, `false`
         case url(String)
 
-        public init?(key: String, arguments: LabeledExprListSyntax) {
+        public init?(context: some MacroExpansionContext, key: String, arguments: LabeledExprListSyntax) {
             switch key {
                 case "true": self = .true
                 case "false": self = .false
@@ -245,12 +238,12 @@ public extension HTMLElementAttribute.HTMX {
 // MARK: Server Sent Events
 public extension HTMLElementAttribute.HTMX {
     enum ServerSentEvents : HTMLInitializable {
-        case connect(String)
-        case swap(String)
-        case close(String)
+        case connect(String?)
+        case swap(String?)
+        case close(String?)
 
-        public init?(key: String, arguments: LabeledExprListSyntax) {
-            func string() -> String { arguments.first!.expression.stringLiteral!.string }
+        public init?(context: some MacroExpansionContext, key: String, arguments: LabeledExprListSyntax) {
+            func string() -> String?        { arguments.first!.expression.string(context: context, key: key) }
             switch key {
                 case "connect": self = .connect(string())
                 case "swap": self = .swap(string())
@@ -281,13 +274,13 @@ public extension HTMLElementAttribute.HTMX {
 // MARK: WebSocket
 public extension HTMLElementAttribute.HTMX {
     enum WebSocket : HTMLInitializable {
-        case connect(String)
-        case send(Bool)
+        case connect(String?)
+        case send(Bool?)
 
-        public init?(key: String, arguments: LabeledExprListSyntax) {
+        public init?(context: some MacroExpansionContext, key: String, arguments: LabeledExprListSyntax) {
             let expression:ExprSyntax = arguments.first!.expression
-            func string() -> String { expression.stringLiteral!.string }
-            func boolean() -> Bool  { expression.booleanLiteral!.literal.text == "true" }
+            func string() -> String?        { expression.string(context: context, key: key) }
+            func boolean() -> Bool?         { expression.boolean(context: context, key: key) }
             switch key {
                 case "connect": self = .connect(string())
                 case "send": self = .send(boolean())
@@ -305,7 +298,7 @@ public extension HTMLElementAttribute.HTMX {
         public var htmlValue : String? {
             switch self {
                 case .connect(let value): return value
-                case .send(_): return ""
+                case .send(let value): return value ?? false ? "" : nil
             }
         }
 
diff --git a/Sources/HTMLKitUtilities/ParseData.swift b/Sources/HTMLKitUtilities/ParseData.swift
diff --git a/Tests/HTMLKitTests/ElementTests.swift b/Tests/HTMLKitTests/ElementTests.swift
