now accepts strings containing interpolation; bug fix for data attribute

RandomHashTags · RandomHashTags · commit cf488dcc41b4 · 2024-09-17T13:05:59.000-05:00
diff --git a/Sources/HTMLKitMacros/HTMLElement.swift b/Sources/HTMLKitMacros/HTMLElement.swift
@@ -89,7 +89,7 @@ private extension HTMLElement {
         var attributes:[String] = []
         for attribute in elements {
             let function:FunctionCallExprSyntax = attribute.expression.as(FunctionCallExprSyntax.self)!
-            let functionName:String = function.calledExpression.as(MemberAccessExprSyntax.self)!.declName.baseName.text
+            var functionName:String = function.calledExpression.as(MemberAccessExprSyntax.self)!.declName.baseName.text
             var string:String = ""
             switch functionName {
                 case "accesskey",
@@ -126,6 +126,10 @@ private extension HTMLElement {
                     break
                 case "tabIndex": // TODO: fix
                     break
+                case "data":
+                    functionName = "data-" + function.arguments.first!.expression.as(StringLiteralExprSyntax.self)!.string
+                    string = function.arguments.last!.expression.as(StringLiteralExprSyntax.self)!.string
+                    break
                 default:
                     break
             }
@@ -340,7 +344,5 @@ public enum HTMLElementType : String, CaseIterable {
 }
 
 extension StringLiteralExprSyntax {
-    var string : String {
-        segments.children(viewMode: .sourceAccurate).first!.as(StringSegmentSyntax.self)!.content.text
-    }
-}
+    var string : String { "\(segments)" }
+}
diff --git a/Tests/HTMLKitTests/HTMLKitTests.swift b/Tests/HTMLKitTests/HTMLKitTests.swift
@@ -31,6 +31,14 @@ extension HTMLKitTests {
     }
 }
 
+extension HTMLKitTests {
+    func test_attribute_data() {
+        let bro:Int = 0
+        let string:String = #div(attributes: [.data(id: "id", "\(bro)")])
+        XCTAssertEqual(string, "<div data-id=\"\(bro)\"></div>")
+    }
+}
+
 extension HTMLKitTests {
     func testExample1() {
         let test:String = #html(innerHTML: [
@@ -56,4 +64,4 @@ extension HTMLKitTests {
         ])
         XCTAssertEqual(test, "<!DOCTYPE html><html><body><div class=\"bing bong\" title=\"just seeing what blow's\" draggable=\"false\" inputmode=\"email\" hidden=\"hidden\">poggies<div></div><a><div><abbr></abbr></div><address></address></a><div></div><button disabled></button><video autoplay preload=\"auto\" src=\"ezclap\" width=\"5\"></video></div></body></html>")
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,14 @@ extension HTMLKitTests {`
`31`	`31`	`}`
`32`	`32`	`}`
`33`	`33`
	`34`	`+extension HTMLKitTests {`
	`35`	`+ func test_attribute_data() {`
	`36`	`+ let bro:Int = 0`
	`37`	`+ let string:String = #div(attributes: [.data(id: "id", "\(bro)")])`
	`38`	`+ XCTAssertEqual(string, "<div data-id=\"\(bro)\"></div>")`
	`39`	`+ }`
	`40`	`+}`
	`41`	`+`
`34`	`42`	`extension HTMLKitTests {`
`35`	`43`	`func testExample1() {`
`36`	`44`	`let test:String = #html(innerHTML: [`
`@@ -56,4 +64,4 @@ extension HTMLKitTests {`
`56`	`64`	`])`
`57`	`65`	`XCTAssertEqual(test, "<!DOCTYPE html><html><body><div class=\"bing bong\" title=\"just seeing what blow's\" draggable=\"false\" inputmode=\"email\" hidden=\"hidden\">poggies<div></div><a><div><abbr></abbr></div><address></address></a><div></div><button disabled></button><video autoplay preload=\"auto\" src=\"ezclap\" width=\"5\"></video></div></body></html>")`
`58`	`66`	`}`
`59`		`-}`
	`67`	`+}`