#html macro now accepts CustomStringConvertible variadic parameters (was HTMLElement)

RandomHashTags · RandomHashTags · commit 1ea483d83705 · 2024-11-24T03:37:43.000-06:00
- also removed `HTMLElementType` from `HTMLElements.swift`
diff --git a/README.md b/README.md
@@ -38,7 +38,7 @@ Use the `#html(encoding:attributes:innerHTML:)` macro. All parameters, for the m
   encoding: HTMLEncoding = .string,
   attributes: [<global attribute>] = [],
   <element specific attribute>: <element specific attribute value>? = nil,
-  _ innerHTML: HTMLElement...
+  _ innerHTML: CustomStringConvertible...
 )
 
 ```
@@ -54,7 +54,7 @@ The default initializer for creating an HTML Element follows this syntax:
 <html element name>(
   attributes: [<global attribute>] = [],
   <element specific attribute>: <value>? = nil,
-  _ innerHTML: HTMLElement...
+  _ innerHTML: CustomStringConvertible...
 )
 
 ```
diff --git a/Sources/HTMLKit/HTMLKit.swift b/Sources/HTMLKit/HTMLKit.swift
@@ -26,5 +26,5 @@ public macro escapeHTML(_ innerHTML: CustomStringConvertible...) -> String = #ex
 public macro html<T: CustomStringConvertible>(
     encoding: HTMLEncoding = .string,
     lookupFiles: [StaticString] = [],
-    _ innerHTML: HTMLElement...
+    _ innerHTML: CustomStringConvertible...
 ) -> T = #externalMacro(module: "HTMLKitMacros", type: "HTMLElementMacro")
diff --git a/Sources/HTMLKitMacros/HTMLElement.swift b/Sources/HTMLKitMacros/HTMLElement.swift
@@ -53,18 +53,10 @@ enum HTMLElementMacro : ExpressionMacro {
 private extension HTMLElementMacro {
     // MARK: Expand Macro
     static func expand_macro(context: some MacroExpansionContext, macro: MacroExpansionExprSyntax) -> (String, HTMLEncoding) {
-        guard let elementType:HTMLElementType = HTMLElementType(rawValue: macro.macroName.text) else {
+        guard macro.macroName.text == "html" else {
             return ("\(macro)", .string)
         }
-        let children:SyntaxChildren = macro.arguments.children(viewMode: .all)
-        /*if elementType == .escapeHTML {
-            let array:[CustomStringConvertible] = children.compactMap({
-                guard let child:LabeledExprSyntax = $0.labeled else { return nil }
-                return HTMLKitUtilities.parseInnerHTML(context: context, child: child, lookupFiles: [])
-            })
-            return array.map({ String(describing: $0) }).joined()
-        }*/
-        let data:HTMLKitUtilities.ElementData = HTMLKitUtilities.parseArguments(context: context, children: children)
+        let data:HTMLKitUtilities.ElementData = HTMLKitUtilities.parseArguments(context: context, children: macro.arguments.children(viewMode: .all))
         return (data.innerHTML.map({ String(describing: $0) }).joined(), data.encoding)
     }
 }
diff --git a/Sources/HTMLKitUtilityMacros/HTMLElements.swift b/Sources/HTMLKitUtilityMacros/HTMLElements.swift
@@ -27,9 +27,13 @@ enum HTMLElements : DeclarationMacro {
             }
         }
 
+        let void_elements:Set<String> = [
+            "area", "base", "br", "col", "embed", "hr", "img", "input", "link", "meta", "source", "track", "wbr"
+        ]
+
         for item in dictionary {
             var element:String = item.key.as(MemberAccessExprSyntax.self)!.declName.baseName.text
-            let is_void:Bool = HTMLElementType(rawValue: element)!.isVoid
+            let is_void:Bool = void_elements.contains(element)
             if element == "var" {
                 element = "`var`"
             }
@@ -249,150 +253,4 @@ indirect enum HTMLElementValueType {
     case otherAttribute(String)
     case cssUnit
     case array(of: HTMLElementValueType)
-}
-
-
-// MARK: HTMLElementType
-package enum HTMLElementType : String, CaseIterable {
-    case html
-
-    case a
-    case abbr
-    case address
-    case area
-    case article
-    case aside
-    case audio
-
-    case b
-    case base
-    case bdi
-    case bdo
-    case blockquote
-    case body
-    case br
-    case button
-
-    case canvas
-    case caption
-    case cite
-    case code
-    case col
-    case colgroup
-
-    case data
-    case datalist
-    case dd
-    case del
-    case details
-    case dfn
-    case dialog
-    case div
-    case dl
-    case dt
-
-    case em
-    case embed
-
-    case fencedframe
-    case fieldset
-    case figcaption
-    case figure
-    case footer
-    case form
-    case frame
-    case frameset
-
-    case h1, h2, h3, h4, h5, h6
-    case head
-    case header
-    case hgroup
-    case hr
-    
-    case i
-    case iframe
-    case img
-    case input
-    case ins
-
-    case kbd
-
-    case label
-    case legend
-    case li
-    case link
-
-    case main
-    case map
-    case mark
-    case menu
-    case meta
-    case meter
-
-    case nav
-    case noscript
-
-    case object
-    case ol
-    case optgroup
-    case option
-    case output
-
-    case p
-    case picture
-    case portal
-    case pre
-    case progress
-
-    case q
-
-    case rp
-    case rt
-    case ruby
-    
-    case s
-    case samp
-    case script
-    case search
-    case section
-    case select
-    case slot
-    case small
-    case source
-    case span
-    case strong
-    case style
-    case sub
-    case summary
-    case sup
-
-    case table
-    case tbody
-    case td
-    case template
-    case textarea
-    case tfoot
-    case th
-    case thead
-    case time
-    case title
-    case tr
-    case track
-
-    case u
-    case ul
-
-    case `var`
-    case video
-
-    case wbr
-
-    package var isVoid : Bool {
-        switch self {
-        case .area, .base, .br, .col, .embed, .hr, .img, .input, .link, .meta, .source, .track, .wbr:
-            return true
-        default:
-            return false
-        }
-    }
 }
