successfully avoided bad pointer dereference when using closures

Author: RandomHashTags

Sources/HTMLKitMacros/EscapeHTML.swift

@@ -14,7 +14,7 @@ enum EscapeHTML : ExpressionMacro {
     static func expansion(of node: some FreestandingMacroExpansionSyntax, in context: some MacroExpansionContext) throws -> ExprSyntax {
         var c = HTMLExpansionContext(
             context: context,
-            expansion: node.as(ExprSyntax.self)!.macroExpansion!,
+            expansion: node,
             ignoresCompilerWarnings: false,
             encoding: .string,
             key: "",

Sources/HTMLKitMacros/HTMLElement.swift

@@ -14,6 +14,6 @@ import SwiftSyntaxMacros
 enum HTMLElementMacro : ExpressionMacro {
     static func expansion(of node: some FreestandingMacroExpansionSyntax, in context: some MacroExpansionContext) throws -> ExprSyntax {
         let ignoresCompilerWarnings:Bool = node.macroName.text == "uncheckedHTML"
-        return try HTMLKitUtilities.expandHTMLMacro(context: HTMLExpansionContext(context: context, expansion: node.as(ExprSyntax.self)!.macroExpansion!, ignoresCompilerWarnings: ignoresCompilerWarnings, encoding: .string, key: "", arguments: node.arguments))
+        return try HTMLKitUtilities.expandHTMLMacro(context: HTMLExpansionContext(context: context, expansion: node, ignoresCompilerWarnings: ignoresCompilerWarnings, encoding: .string, key: "", arguments: node.arguments))
     }
 }

Sources/HTMLKitMacros/RawHTML.swift

@@ -14,7 +14,7 @@ enum RawHTML : ExpressionMacro {
     static func expansion(of node: some FreestandingMacroExpansionSyntax, in context: some MacroExpansionContext) throws -> ExprSyntax {
         var c = HTMLExpansionContext(
             context: context,
-            expansion: node.as(ExprSyntax.self)!.macroExpansion!,
+            expansion: node,
             ignoresCompilerWarnings: false,
             encoding: .string,
             key: "",

Sources/HTMLKitParse/ParseData.swift

@@ -64,7 +64,7 @@ extension HTMLKitUtilities {
         let (string, encoding):(String, HTMLEncoding) = expandMacro(context: context)
         return "\(raw: encodingResult(context: context, node: context.expansion, string: string, for: encoding))"
     }
-    private static func encodingResult(context: HTMLExpansionContext, node: MacroExpansionExprSyntax, string: String, for encoding: HTMLEncoding) -> String {
+    private static func encodingResult(context: HTMLExpansionContext, node: FreestandingMacroExpansionSyntax, string: String, for encoding: HTMLEncoding) -> String {
         func hasNoInterpolation() -> Bool {
             let hasInterpolation:Bool = !string.ranges(of: try! Regex("\\((.*)\\)")).isEmpty
             guard !hasInterpolation else {
@@ -152,10 +152,12 @@ extension HTMLKitUtilities {
             }
         }
         if let statements = context.expansion.trailingClosure?.statements {
+            var c = context
+            c.expansion.trailingClosure = nil
             for statement in statements {
                 switch statement.item {
                 case .expr(let expr):
-                    if let inner_html = parseInnerHTML(context: context, expr: expr) {
+                    if let inner_html = parseInnerHTML(context: c, expr: expr) {
                         innerHTML.append(inner_html)
                     }
                 default:

Sources/HTMLKitParse/extensions/HTMLElementValueType.swift

@@ -19,16 +19,19 @@ extension HTMLElementValueType {
         context: HTMLExpansionContext,
         _ function: FunctionCallExprSyntax
     ) -> HTMLElement? {
-        var c = context
         let calledExpression = function.calledExpression
         let key:String
-        if let member = calledExpression.memberAccess, member.base?.declRef?.baseName.text == "HTMLKit" {
+        switch calledExpression.kind {
+        case .memberAccessExpr:
+            let member = calledExpression.memberAccess!
+            guard member.base?.declRef?.baseName.text == "HTMLKit" else { return nil }
             key = member.declName.baseName.text
-        } else if let ref = calledExpression.declRef {
-            key = ref.baseName.text
-        } else {
+        case .declReferenceExpr:
+            key = calledExpression.declRef!.baseName.text
+        default:
             return nil
         }
+        var c = context
         c.arguments = function.arguments
         switch key {
         case "a": return get(c, a.self)

Sources/HTMLKitUtilities/HTMLExpansionContext.swift

@@ -14,7 +14,7 @@ import SwiftSyntaxMacros
 public struct HTMLExpansionContext : @unchecked Sendable {
     #if canImport(SwiftSyntax) && canImport(SwiftSyntaxMacros)
     public let context:MacroExpansionContext
-    public let expansion:MacroExpansionExprSyntax
+    public package(set) var expansion:FreestandingMacroExpansionSyntax
     public var arguments:LabeledExprListSyntax
     #endif
 
@@ -35,7 +35,7 @@ public struct HTMLExpansionContext : @unchecked Sendable {
 
     public init(
         context: MacroExpansionContext,
-        expansion: MacroExpansionExprSyntax,
+        expansion: FreestandingMacroExpansionSyntax,
         ignoresCompilerWarnings: Bool,
         encoding: HTMLEncoding,
         key: String,

Tests/HTMLKitTests/ElementTests.swift

@@ -14,17 +14,17 @@ struct ElementTests {
     // MARK: html
     @Test func elementHTML() {
         var expected:String = "<!DOCTYPE html><html></html>"
-        var string:StaticString = #html(html())
+        var string:String = #html(html())
         #expect(string == expected)
 
         expected = "<!DOCTYPE html><html xmlns=\"test\"></html>"
         string = #html(html(xmlns: "test"))
         #expect(string == expected)
 
-        /*string = #html {
+        string = #html {
             html(xmlns: "test")
         }
-        #expect(string == expected)*/
+        #expect(string == expected)
     }
 
     // MARK: HTMLKit.<element>