lowered required Swift version to 5.9; input bug fix

RandomHashTags · RandomHashTags · commit 7b2b989d1b86 · 2024-09-17T14:14:59.000-05:00
diff --git a/Package.swift b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:5.10
+// swift-tools-version:5.9
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
diff --git a/Sources/HTMLKitMacros/HTMLElement.swift b/Sources/HTMLKitMacros/HTMLElement.swift
@@ -21,14 +21,14 @@ extension HTMLElement {
     static func parse_element(node: some FreestandingMacroExpansionSyntax, context: some MacroExpansionContext) -> String {
         let macroName:String = node.macroName.text
         let type:HTMLElementType = HTMLElementType(rawValue: macroName) ?? HTMLElementType.a
-        let data:ElementData = parse_arguments(arguments: node.arguments)
+        let data:ElementData = parse_arguments(elementType: type, arguments: node.arguments)
         var string:String = (type == .html ? "<!DOCTYPE html>" : "") + "<" + type.rawValue + data.attributes + ">" + data.innerHTML
         if !type.isVoid {
             string += "</" + type.rawValue + ">"
         }
         return "\"" + string + "\""
     }
-    static func parse_arguments(arguments: LabeledExprListSyntax) -> ElementData {
+    static func parse_arguments(elementType: HTMLElementType, arguments: LabeledExprListSyntax) -> ElementData {
         var attributes:[String] = []
         var innerHTML:[String] = []
         for element in arguments.children(viewMode: .all) {
@@ -42,7 +42,7 @@ extension HTMLElement {
                             innerHTML = parse_inner_html(child: child)
                             break
                         default: // extra attribute
-                            if let string:String = parse_extra_attribute(child: child) {
+                        if let string:String = parse_extra_attribute(elementType: elementType, child: child) {
                                 attributes.append(string)
                             }
                             break
@@ -54,7 +54,7 @@ extension HTMLElement {
     }
     static func parse_element_macro(expression: MacroExpansionExprSyntax) -> String {
         guard let elementType:HTMLElementType = HTMLElementType(rawValue: expression.macroName.text) else { return "\(expression)" }
-        let data:ElementData = parse_arguments(arguments: expression.arguments)
+        let data:ElementData = parse_arguments(elementType: elementType, arguments: expression.arguments)
         return "<" + elementType.rawValue + data.attributes + ">" + data.innerHTML + (elementType.isVoid ? "" : "</" + elementType.rawValue + ">")
     }
     static func parse_inner_html(child: LabeledExprSyntax) -> [String] {
@@ -170,7 +170,7 @@ private extension HTMLElement {
         return function.arguments.first!.expression.as(ArrayExprSyntax.self)!.elements.map({ $0.expression.as(StringLiteralExprSyntax.self)!.string })
     }
 
-    static func parse_extra_attribute(child: LabeledExprSyntax) -> String? {
+    static func parse_extra_attribute(elementType: HTMLElementType, child: LabeledExprSyntax) -> String? {
         let key:String = child.label!.text
         func yup(_ value: String) -> String {
             return key + "=\\\"" + value + "\\\""
@@ -183,7 +183,13 @@ private extension HTMLElement {
             return yup(string)
         }
         if let member:String = expression.as(MemberAccessExprSyntax.self)?.declName.baseName.text {
-            return yup("\\(HTMLElementAttribute." + key[key.startIndex].uppercased() + key[key.index(after: key.startIndex)...] + "." + member + ")")
+            let inner:String
+            if elementType == .input && key == "type" {
+                inner = "InputMode"
+            } else {
+                inner = key[key.startIndex].uppercased() + key[key.index(after: key.startIndex)...]
+            }
+            return yup("\\(HTMLElementAttribute." + inner + "." + member + ")")
         }
         if let _:NilLiteralExprSyntax = expression.as(NilLiteralExprSyntax.self) {
             return nil
diff --git a/Tests/HTMLKitTests/HTMLKitTests.swift b/Tests/HTMLKitTests/HTMLKitTests.swift
@@ -14,10 +14,14 @@ final class HTMLKitTests : XCTestCase {
 }
 
 extension HTMLKitTests {
-    func test_macro_html() {
+    func test_element_html() {
         XCTAssertEqual(#html(innerHTML: []), "<!DOCTYPE html><html></html>")
         XCTAssertEqual(#html(xmlns: "test", innerHTML: []), "<!DOCTYPE html><html xmlns=\"test\"></html>")
     }
+    func test_element_input() {
+        let string:String = #input(type: .text)
+        XCTAssertEqual(string, "<input type=\"text\">")
+    }
 }
 
 extension HTMLKitTests {
@@ -29,6 +33,10 @@ extension HTMLKitTests {
         ])
         XCTAssertEqual(string, "<div><div></div><div><div></div><div></div><div></div></div><div></div></div>")
     }
+    func test_void() {
+        let string:String = #area(innerHTML: [#base(), #br(), #col(), #embed(), #hr(), #img(), #input(), #link(), #meta(), #source(), #track(), #wbr()])
+        XCTAssertEqual(string, "<area><base><br><col><embed><hr><img><input><link><meta><source><track><wbr>")
+    }
 }
 
 extension HTMLKitTests {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// swift-tools-version:5.10`
	`1`	`+// swift-tools-version:5.9`
`2`	`2`	`// The swift-tools-version declares the minimum version of Swift required to build this package.`
`3`	`3`
`4`	`4`	`import PackageDescription`
Original file line number	Diff line number	Diff line change
`@@ -14,10 +14,14 @@ final class HTMLKitTests : XCTestCase {`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`extension HTMLKitTests {`
`17`		`- func test_macro_html() {`
	`17`	`+ func test_element_html() {`
`18`	`18`	`XCTAssertEqual(#html(innerHTML: []), "<!DOCTYPE html><html></html>")`
`19`	`19`	`XCTAssertEqual(#html(xmlns: "test", innerHTML: []), "<!DOCTYPE html><html xmlns=\"test\"></html>")`
`20`	`20`	`}`
	`21`	`+ func test_element_input() {`
	`22`	`+ let string:String = #input(type: .text)`
	`23`	`+ XCTAssertEqual(string, "<input type=\"text\">")`
	`24`	`+ }`
`21`	`25`	`}`
`22`	`26`
`23`	`27`	`extension HTMLKitTests {`
`@@ -29,6 +33,10 @@ extension HTMLKitTests {`
`29`	`33`	`])`
`30`	`34`	`XCTAssertEqual(string, "<div><div></div><div><div></div><div></div><div></div></div><div></div></div>")`
`31`	`35`	`}`
	`36`	`+ func test_void() {`
	`37`	`+ let string:String = #area(innerHTML: [#base(), #br(), #col(), #embed(), #hr(), #img(), #input(), #link(), #meta(), #source(), #track(), #wbr()])`
	`38`	`+ XCTAssertEqual(string, "<area><base><br><col><embed><hr><img><input><link><meta><source><track><wbr>")`
	`39`	`+ }`
`32`	`40`	`}`
`33`	`41`
`34`	`42`	`extension HTMLKitTests {`