HTMLElementAttribute now conforms to HTMLInitializable

RandomHashTags · Dec 5, 2024 · 72bd29f · 72bd29f
1 parent 52092eb
commit 72bd29f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/Package.swift b/Package.swift
@@ -28,6 +28,7 @@ let package = Package(
                 .product(name: "SwiftSyntaxMacros", package: "swift-syntax")
             ]
         ),
+
         .target(
             name: "HTMLKitUtilities",
             dependencies: [
@@ -37,6 +38,7 @@ let package = Package(
                 .product(name: "SwiftSyntaxMacros", package: "swift-syntax")
             ]
         ),
+
         .macro(
             name: "HTMLKitMacros",
             dependencies: [

diff --git a/Sources/HTMLKitUtilities/ParseData.swift b/Sources/HTMLKitUtilities/ParseData.swift
@@ -158,7 +158,7 @@ public extension HTMLKitUtilities {
                     context.diagnose(Diagnostic(node: first_expression, message: DiagnosticMsg(id: "spacesNotAllowedInAttributeDeclaration", message: "Spaces are not allowed in attribute declaration.")))
                 } else if keys.contains(key) {
                     global_attribute_already_defined(context: context, attribute: key, node: first_expression)
-                } else if let attr:HTMLElementAttribute = HTMLElementAttribute(context: context, key: key, function) {
+                } else if let attr:HTMLElementAttribute = HTMLElementAttribute(context: context, key: key, arguments: function.arguments) {
                     attributes.append(attr)
                     key = attr.key
                     keys.insert(key)

diff --git a/Sources/HTMLKitUtilities/attributes/HTMLElementAttribute.swift b/Sources/HTMLKitUtilities/attributes/HTMLElementAttribute.swift
@@ -9,7 +9,7 @@ import SwiftSyntax
 import SwiftSyntaxMacros
 
 // MARK: HTMLElementAttribute
-public enum HTMLElementAttribute : Hashable {
+public enum HTMLElementAttribute : HTMLInitializable {
     case accesskey(String? = nil)
 
     case ariaattribute(Extra.ariaattribute? = nil)
@@ -60,11 +60,11 @@ public enum HTMLElementAttribute : Hashable {
     case event(Extra.event, _ value: String? = nil)
 
     // MARK: init rawValue
-    public init?(context: some MacroExpansionContext, key: String, _ function: FunctionCallExprSyntax) {
-        let expression:ExprSyntax = function.arguments.first!.expression
+    public init?(context: some MacroExpansionContext, key: String, arguments: LabeledExprListSyntax) {
+        let expression:ExprSyntax = arguments.first!.expression
         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 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) }
         switch key {
@@ -76,7 +76,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.string(context: context, key: key) else {
+                guard let id:String = string(), let value:String = arguments.last?.expression.string(context: context, key: key) else {
                     return nil
                 }
                 if key == "data" {
@@ -113,7 +113,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.string(context: context, key: key) else {
+                guard let event:HTMLElementAttribute.Extra.event = enumeration(), let value:String = arguments.last?.expression.string(context: context, key: key) else {
                     return nil
                 }
                 self = .event(event, value)

diff --git a/...ces/HTMLKitUtilities/attributes/CSS.swift → Sources/HTMLKitUtilities/css/CSS.swift b/...ces/HTMLKitUtilities/attributes/CSS.swift → Sources/HTMLKitUtilities/css/CSS.swift