BridgeJS: Move whole push into Intrinsic fragment

Author: krodak

Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift

@@ -700,36 +700,14 @@ struct BridgeJSLink {
                 } else {
                     let scope = JSGlueVariableScope()
                     let cleanup = CodeFragmentPrinter()
-                    cleanup.indent()
-                    cleanup.indent()
-                    cleanup.indent()
-                    cleanup.indent()
-                    cleanup.indent()
-                    cleanup.indent()
                     let printer = CodeFragmentPrinter()
+                    cleanup.indent()
 
-                    let reversedValues = enumCase.associatedValues.enumerated().reversed()
-
-                    for (associatedValueIndex, associatedValue) in reversedValues {
-                        let prop = associatedValue.label ?? "param\(associatedValueIndex)"
-                        let fragment = IntrinsicJSFragment.associatedValuePushPayload(type: associatedValue.type)
-
-                        _ = fragment.printCode(["value.\(prop)"], scope, printer, cleanup)
-                    }
+                    let fragment = IntrinsicJSFragment.associatedValuePushPayload(enumCase: enumCase)
+                    _ = fragment.printCode(["value", enumDefinition.name, caseName], scope, printer, cleanup)
 
                     jsLines.append("case \(enumDefinition.name).Tag.\(caseName): {".indent(count: 16))
                     jsLines.append(contentsOf: printer.lines.map { $0.indent(count: 20) })
-                    if cleanup.lines.isEmpty {
-                        jsLines.append("const cleanup = undefined;".indent(count: 20))
-                    } else {
-                        jsLines.append("const cleanup = () => {".indent(count: 20))
-                        jsLines.append(contentsOf: cleanup.lines)
-                        jsLines.append("};".indent(count: 20))
-                    }
-                    jsLines.append(
-                        "return { caseId: \(enumDefinition.name).Tag.\(caseName), cleanup };"
-                            .indent(count: 20)
-                    )
                     jsLines.append("}".indent(count: 16))
                 }
             }

Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift

@@ -241,6 +241,45 @@ struct IntrinsicJSFragment: Sendable {
 
     // MARK: - Associated Value Payload Fragments
 
+    /// Fragment for pushing all associated value payloads for an entire enum case during enum lowering
+    static func associatedValuePushPayload(enumCase: EnumCase) -> IntrinsicJSFragment {
+        return IntrinsicJSFragment(
+            parameters: ["value", "enumName", "caseName"],
+            printCode: { arguments, scope, printer, cleanup in
+                let enumName = arguments[1]
+                let caseName = arguments[2]
+                
+                // If no associated values, return early
+                if enumCase.associatedValues.isEmpty {
+                    printer.write("const cleanup = undefined;")
+                    printer.write("return { caseId: \(enumName).Tag.\(caseName), cleanup };")
+                    return []
+                }
+                
+                // Process associated values in reverse order (to match the order they'll be popped)
+                let reversedValues = enumCase.associatedValues.enumerated().reversed()
+                
+                for (associatedValueIndex, associatedValue) in reversedValues {
+                    let prop = associatedValue.label ?? "param\(associatedValueIndex)"
+                    let fragment = IntrinsicJSFragment.associatedValuePushPayload(type: associatedValue.type)
+                    
+                    _ = fragment.printCode(["value.\(prop)"], scope, printer, cleanup)
+                }
+                
+                if cleanup.lines.isEmpty {
+                    printer.write("const cleanup = undefined;")
+                } else {
+                    printer.write("const cleanup = () => {")
+                    printer.write(contentsOf: cleanup)
+                    printer.write("};")
+                }
+                printer.write("return { caseId: \(enumName).Tag.\(caseName), cleanup };")
+                
+                return []
+            }
+        )
+    }
+    
     /// Fragment for pushing associated value payloads during enum lowering
     static func associatedValuePushPayload(type: BridgeType) -> IntrinsicJSFragment {
         switch type {
@@ -292,11 +331,9 @@ struct IntrinsicJSFragment: Sendable {
                 }
             )
         default:
-            // For unsupported types, push a default value
             return IntrinsicJSFragment(
-                parameters: ["value"],
+                parameters: [],
                 printCode: { arguments, scope, printer, cleanup in
-                    printer.write("\(JSGlueVariableScope.reservedTmpParamInts).push(0);")
                     return []
                 }
             )

Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift

@@ -2,7 +2,7 @@
 
 // MARK: - Types
 
-public enum BridgeType: Codable, Equatable {
+public enum BridgeType: Codable, Equatable, Sendable {
     case int, float, double, string, bool, jsObject(String?), swiftHeapObject(String), void
     case caseEnum(String)
     case rawValueEnum(String, SwiftEnumRawType)
@@ -14,7 +14,7 @@ public enum WasmCoreType: String, Codable, Sendable {
     case i32, i64, f32, f64, pointer
 }
 
-public enum SwiftEnumRawType: String, CaseIterable, Codable {
+public enum SwiftEnumRawType: String, CaseIterable, Codable, Sendable {
     case string = "String"
     case bool = "Bool"
     case int = "Int"
@@ -70,7 +70,7 @@ public struct Effects: Codable {
 
 // MARK: - Enum Skeleton
 
-public struct AssociatedValue: Codable, Equatable {
+public struct AssociatedValue: Codable, Equatable, Sendable {
     public let label: String?
     public let type: BridgeType
 
@@ -80,16 +80,15 @@ public struct AssociatedValue: Codable, Equatable {
     }
 }
 
-public struct EnumCase: Codable, Equatable {
+public struct EnumCase: Codable, Equatable, Sendable {
     public let name: String
     public let rawValue: String?
     public let associatedValues: [AssociatedValue]
 
     public var isSimple: Bool {
         associatedValues.isEmpty
     }
-
-    public init(name: String, rawValue: String?, associatedValues: [AssociatedValue]) {
+    public init(name: String, rawValue: String?, associatedValues: [AssociatedValue] = []) {
         self.name = name
         self.rawValue = rawValue
         self.associatedValues = associatedValues