only the function call is now warned for unsafe interpolation instead of the whole function (which was visually noisy)

Author: RandomHashTags

Sources/GenerateElements/main.swift

@@ -7,7 +7,9 @@
 
 // generate the html element files using the following command:
 /*
-  swiftc main.swift ../HTMLKitUtilities/HTMLEncoding.swift \
+  swiftc main.swift \
+  ../HTMLKitUtilities/HTMLElementType.swift \
+  ../HTMLKitUtilities/HTMLEncoding.swift \
   ../HTMLKitUtilities/attributes/HTMLElementAttribute.swift \
   ../HTMLKitUtilities/attributes/HTMLElementAttributeExtra.swift \
   ../HTMLKitUtilities/attributes/HTMX.swift \
@@ -18,7 +20,7 @@
 #if canImport(Foundation) && GENERATE_ELEMENTS
 
 // Why do we do it this way?
-// - The documentation doesn't link correctly if we generate from a macro
+// - The documentation doesn't link correctly (or at all) if we generate from a macro
 
 import Foundation
 

Sources/HTMLKitUtilities/HTMLEncoding.swift

@@ -8,6 +8,7 @@
 /// The value type the data should be encoded to when returned from the macro.
 /// 
 /// ### Interpolation Promotion
+/// 
 /// Swift HTMLKit tries to [promote](https://github.com/RandomHashTags/swift-htmlkit/blob/94793984763308ef5275dd9f71ea0b5e83fea417/Sources/HTMLKitMacros/HTMLElement.swift#L423) known interpolation at compile time with an equivalent string literal for the best performance, regardless of encoding.
 /// It is currently limited due to macro expansions being sandboxed and lexical contexts/AST not being available for the macro argument types.
 /// This means referencing content in an html macro won't get promoted to its expected value.
@@ -26,7 +27,7 @@
 /// ```swift
 /// let string:StaticString = "Test"
 /// let _:StaticString = #html(div(string)) // ❌ promotion cannot be applied; StaticString not allowed
-/// let _:String = #html(div(string)) // ⚠️ promotion cannot be applied; compiles to "<div>\(string)</div>"
+/// let _:String = #html(div(string)) // ⚠️ promotion cannot be applied; compiles to "<div>" + String(describing: string) + "</div>"`
 /// ```
 /// 
 public enum HTMLEncoding {

Sources/HTMLKitUtilities/HTMLKitUtilities.swift

@@ -11,11 +11,11 @@ import SwiftSyntaxMacros
 // MARK: HTMLKitUtilities
 public enum HTMLKitUtilities {
     public struct ElementData {
-        public let trailingSlash:Bool
         public let encoding:HTMLEncoding
         public let globalAttributes:[HTMLElementAttribute]
         public let attributes:[String:Any]
         public let innerHTML:[CustomStringConvertible]
+        public let trailingSlash:Bool
 
         init(
             _ encoding: HTMLEncoding,
@@ -35,18 +35,21 @@ public enum HTMLKitUtilities {
 
 // MARK: Escape HTML
 public extension String {
-    /// Escapes all occurrences of source-breaking HTML characters
+    /// Escapes all occurrences of source-breaking HTML characters.
+    /// 
     /// - Parameters:
-    ///   - escapeAttributes: Whether or not to escape source-breaking HTML attribute characters
-    /// - Returns: A new `String` escaping source-breaking HTML
+    ///   - escapeAttributes: Whether or not to escape source-breaking HTML attribute characters.
+    /// - Returns: A new `String` escaping source-breaking HTML.
     func escapingHTML(escapeAttributes: Bool) -> String {
         var string:String = self
         string.escapeHTML(escapeAttributes: escapeAttributes)
         return string
     }
-    /// Escapes all occurrences of source-breaking HTML characters
+
+    /// Escapes all occurrences of source-breaking HTML characters.
+    /// 
     /// - Parameters:
-    ///   - escapeAttributes: Whether or not to escape source-breaking HTML attribute characters
+    ///   - escapeAttributes: Whether or not to escape source-breaking HTML attribute characters.
     mutating func escapeHTML(escapeAttributes: Bool) {
         self.replace("&", with: "&")
         self.replace("<", with: "&lt;")
@@ -55,14 +58,17 @@ public extension String {
             self.escapeHTMLAttributes()
         }
     }
-    /// Escapes all occurrences of source-breaking HTML attribute characters
-    /// - Returns: A new `String` escaping source-breaking HTML attribute characters
+
+    /// Escapes all occurrences of source-breaking HTML attribute characters.
+    /// 
+    /// - Returns: A new `String` escaping source-breaking HTML attribute characters.
     func escapingHTMLAttributes() -> String {
         var string:String = self
         string.escapeHTMLAttributes()
         return string
     }
-    /// Escapes all occurrences of source-breaking HTML attribute characters
+
+    /// Escapes all occurrences of source-breaking HTML attribute characters.
     mutating func escapeHTMLAttributes() {
         self.replace("\\\"", with: "&quot;")
         self.replace("\"", with: "&quot;")

Sources/HTMLKitUtilities/interpolation/ParseLiteral.swift

@@ -57,7 +57,11 @@ extension HTMLKitUtilities {
             }
             string = segments.map({ "\($0)" }).joined()
         } else {
-            warn_interpolation(context: context, node: expression)
+            if let function:FunctionCallExprSyntax = expression.functionCall {
+                warn_interpolation(context: context, node: function.calledExpression)
+            } else {
+                warn_interpolation(context: context, node: expression)
+            }
             if let member:MemberAccessExprSyntax = expression.memberAccess {
                 string = "\\(" + member.singleLineDescription + ")"
             } else {

Tests/HTMLKitTests/HTMLKitTests.swift

@@ -18,19 +18,16 @@ import struct Foundation.Data
 struct HTMLKitTests {
     @Test
     func memoryLayout() {
-        //print("before=\((MemoryLayout<a>.alignment, MemoryLayout<a>.size, MemoryLayout<a>.stride))")
+        //print("before=\((MemoryLayout<HTMLKitUtilities.ElementData>.alignment, MemoryLayout<HTMLKitUtilities.ElementData>.size, MemoryLayout<HTMLKitUtilities.ElementData>.stride))")
         //print("after=\((MemoryLayout<Brother>.alignment, MemoryLayout<Brother>.size, MemoryLayout<Brother>.stride))")
     }
 
     struct Brother {
-        public let tag:String
-        public var attributes:[HTMLElementAttribute]
-        public var innerHTML:[CustomStringConvertible]
-        private var encoding:HTMLEncoding = .string
-        public var isVoid:Bool
-        public var trailingSlash:Bool
-        public var escaped:Bool = false
-        private var fromMacro:Bool = false
+        public let encoding:HTMLEncoding
+        public let globalAttributes:[HTMLElementAttribute]
+        public let attributes:[String:Any]
+        public let innerHTML:[CustomStringConvertible]
+        public let trailingSlash:Bool
     }
 
     @Test