BridgeJS: Closure support review comments

Author: krodak

Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift

@@ -1354,6 +1354,7 @@ public class ExportSwift {
                 ClosureSignature(
                     parameters: parameters,
                     returnType: returnType,
+                    moduleName: moduleName,
                     isAsync: isAsync,
                     isThrows: isThrows
                 )
@@ -1859,7 +1860,7 @@ public class ExportSwift {
             let closureType = "(\(closureParams))\(swiftEffects) -> \(swiftReturnType)"
 
             var invokeParams: [(name: String, type: String)] = [("_", "Int32")]
-            var invokeCallArgs: [String] = ["owner.callbackId"]
+            var invokeCallArgs: [String] = ["callback.bridgeJSLowerParameter()"]
 
             for (index, paramType) in signature.parameters.enumerated() {
                 let paramName = "param\(index)"
@@ -1920,7 +1921,7 @@ public class ExportSwift {
                     """
             }
 
-            let externName = "invoke_js_callback_\(mangledName.lowercased())"
+            let externName = "invoke_js_callback_\(moduleName)_\(mangledName)"
             let optionalLoweringCode = try generateOptionalParameterLowering(signature: signature)
 
             return """
@@ -1938,8 +1939,8 @@ public class ExportSwift {
                     }
 
                     static func bridgeJSLift(_ callbackId: Int32) -> \(raw: closureType) {
-                            let owner = _JSCallbackOwner(callbackId: callbackId)
-                            return { [owner] \(raw: signature.parameters.indices.map { "param\($0)" }.joined(separator: ", ")) in
+                            let callback = JSObject.bridgeJSLiftParameter(callbackId)
+                            return { [callback] \(raw: signature.parameters.indices.map { "param\($0)" }.joined(separator: ", ")) in
                                 #if arch(wasm32)
                                 @_extern(wasm, module: "bjs", name: "\(raw: externName)")
                                 func _invoke(\(raw: invokeSignature)) -> \(raw: invokeReturnType)
@@ -1955,7 +1956,7 @@ public class ExportSwift {
 
         func renderClosureInvokeHandler(signature: ClosureSignature) throws -> DeclSyntax {
             let boxClassName = "_BJS_ClosureBox_\(signature.mangleName)"
-            let abiName = "invoke_swift_closure_\(signature.mangleName.lowercased())"
+            let abiName = "invoke_swift_closure_\(moduleName)_\(signature.mangleName)"
 
             var abiParams: [(name: String, type: String)] = [("boxPtr", "UnsafeMutableRawPointer")]
             var liftedParams: [String] = []

Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift

@@ -696,53 +696,29 @@ struct BridgeJSLink {
                 }
                 printer.write("}")
 
-                var closureSignatures: Set<ClosureSignature> = []
                 for skeleton in exportedSkeletons {
+                    var closureSignatures: Set<ClosureSignature> = []
                     collectClosureSignatures(from: skeleton, into: &closureSignatures)
-                }
 
-                var classToModule: [String: String] = [:]
-                for skeleton in exportedSkeletons {
-                    for klass in skeleton.classes {
-                        classToModule[klass.name] = skeleton.moduleName
-                    }
-                }
+                    guard !closureSignatures.isEmpty else { continue }
 
-                for signature in closureSignatures.sorted(by: { $0.mangleName < $1.mangleName }) {
-                    let invokeFuncName = "invoke_js_callback_\(signature.mangleName.lowercased())"
-                    printer.write(
-                        lines: generateInvokeFunction(
-                            signature: signature,
-                            functionName: invokeFuncName,
-                            classToModule: classToModule
+                    for signature in closureSignatures.sorted(by: { $0.mangleName < $1.mangleName }) {
+                        let invokeFuncName = "invoke_js_callback_\(skeleton.moduleName)_\(signature.mangleName)"
+                        printer.write(
+                            lines: generateInvokeFunction(
+                                signature: signature,
+                                functionName: invokeFuncName
+                            )
                         )
-                    )
 
-                    let lowerFuncName = "lower_closure_\(signature.mangleName.lowercased())"
-                    printer.write(
-                        lines: generateLowerClosureFunction(
-                            signature: signature,
-                            functionName: lowerFuncName
-                        )
-                    )
-                }
-
-                if !closureSignatures.isEmpty {
-                    printer.nextLine()
-                    printer.write("bjs[\"release_js_callback\"] = function(id) {")
-                    printer.indent {
-                        printer.write("\(JSGlueVariableScope.reservedSwift).memory.release(id);")
-                    }
-                    printer.write("};")
-
-                    printer.nextLine()
-                    printer.write("bjs[\"release_swift_closure\"] = function(boxPtr) {")
-                    printer.indent {
+                        let lowerFuncName = "lower_closure_\(skeleton.moduleName)_\(signature.mangleName)"
                         printer.write(
-                            "\(JSGlueVariableScope.reservedInstance).exports._release_swift_closure(boxPtr);"
+                            lines: generateLowerClosureFunction(
+                                signature: signature,
+                                functionName: lowerFuncName
+                            )
                         )
                     }
-                    printer.write("};")
                 }
             }
         }
@@ -793,8 +769,7 @@ struct BridgeJSLink {
 
     private func generateInvokeFunction(
         signature: ClosureSignature,
-        functionName: String,
-        classToModule: [String: String]
+        functionName: String
     ) -> [String] {
         let printer = CodeFragmentPrinter()
         let scope = JSGlueVariableScope()
@@ -889,7 +864,7 @@ struct BridgeJSLink {
 
                     // Call the Swift invoke function
                     let invokeCall =
-                        "\(JSGlueVariableScope.reservedInstance).exports.invoke_swift_closure_\(signature.mangleName.lowercased())(\(invokeArgs.joined(separator: ", ")))"
+                        "\(JSGlueVariableScope.reservedInstance).exports.invoke_swift_closure_\(signature.moduleName)_\(signature.mangleName)(\(invokeArgs.joined(separator: ", ")))"
 
                     let returnFragment = try! IntrinsicJSFragment.closureLiftReturn(type: signature.returnType)
                     _ = returnFragment.printCode([invokeCall], scope, printer, cleanupCode)

Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift

@@ -1298,14 +1298,13 @@ struct IntrinsicJSFragment: Sendable {
             let base = fullName.components(separatedBy: ".").last ?? fullName
             return .associatedEnumLiftReturn(enumBase: base)
         case .closure(let signature):
+            let lowerFuncName = "lower_closure_\(signature.moduleName)_\(signature.mangleName)"
             return IntrinsicJSFragment(
-                parameters: ["closurePtr"],
+                parameters: ["boxPtr"],
                 printCode: { arguments, scope, printer, cleanupCode in
-                    let closurePtr = arguments[0]
-                    let lowerFuncName = "lower_closure_\(signature.mangleName.lowercased())"
-                    let resultVar = scope.variable("closure")
-                    printer.write("const \(resultVar) = bjs[\"\(lowerFuncName)\"](\(closurePtr));")
-                    return [resultVar]
+                    let boxPtr = arguments[0]
+                    printer.write("return bjs[\"\(lowerFuncName)\"](\(boxPtr));")
+                    return []
                 }
             )
         case .namespaceEnum(let string):

Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift

@@ -76,22 +76,34 @@ public enum BridgeContext: Sendable {
 public struct ClosureSignature: Codable, Equatable, Hashable, Sendable {
     public let parameters: [BridgeType]
     public let returnType: BridgeType
+    /// Simplified Swift ABI-style mangling with module prefix
+    // <moduleLength><module> + params + _ + return
+    // Examples:
+    //   - 4MainSS_Si (Main module, String->Int)
+    //   - 6MyAppSiSi_y (MyApp module, Int,Int->Void)
+    public let mangleName: String
     public let isAsync: Bool
     public let isThrows: Bool
-    public let mangleName: String
+    public let moduleName: String
 
-    public init(parameters: [BridgeType], returnType: BridgeType, isAsync: Bool = false, isThrows: Bool = false) {
+    public init(
+        parameters: [BridgeType],
+        returnType: BridgeType,
+        moduleName: String,
+        isAsync: Bool = false,
+        isThrows: Bool = false
+    ) {
         self.parameters = parameters
         self.returnType = returnType
+        self.moduleName = moduleName
         self.isAsync = isAsync
         self.isThrows = isThrows
-
         let paramPart =
             parameters.isEmpty
-            ? "Void"
-            : parameters.map { $0.mangleTypeName }.joined(separator: "_")
-        let returnPart = returnType.mangleTypeName
-        self.mangleName = "\(paramPart)_To_\(returnPart)"
+            ? "y"
+            : parameters.map { $0.mangleTypeName }.joined()
+        let signaturePart = "\(paramPart)_\(returnType.mangleTypeName)"
+        self.mangleName = "\(moduleName.count)\(moduleName)\(signaturePart)"
     }
 }
 
@@ -602,31 +614,36 @@ extension BridgeType {
         return false
     }
 
-    /// Generates a mangled name for use in closure type names
-    /// Examples: "String", "Int", "MyClass", "Bool"
+    /// Simplified Swift ABI-style mangled name
+    /// https://github.com/swiftlang/swift/blob/main/docs/ABI/Mangling.rst#types
     public var mangleTypeName: String {
         switch self {
-        case .int: return "Int"
-        case .float: return "Float"
-        case .double: return "Double"
-        case .string: return "String"
-        case .bool: return "Bool"
-        case .void: return "Void"
+        case .int: return "Si"
+        case .float: return "Sf"
+        case .double: return "Sd"
+        case .string: return "SS"
+        case .bool: return "Sb"
+        case .void: return "y"
         case .jsObject(let name):
-            return name ?? "JSObject"
+            let typeName = name ?? "JSObject"
+            return "\(typeName.count)\(typeName)C"
         case .swiftHeapObject(let name):
-            return name
+            return "\(name.count)\(name)C"
         case .optional(let wrapped):
-            return "Optional\(wrapped.mangleTypeName)"
+            return "Sq\(wrapped.mangleTypeName)"
         case .caseEnum(let name),
             .rawValueEnum(let name, _),
             .associatedValueEnum(let name),
             .namespaceEnum(let name):
-            return name
+            return "\(name.count)\(name)O"
         case .swiftProtocol(let name):
-            return name
+            return "\(name.count)\(name)P"
         case .closure(let signature):
-            return "Closure_\(signature.mangleName)"
+            let params =
+                signature.parameters.isEmpty
+                ? "y"
+                : signature.parameters.map { $0.mangleTypeName }.joined()
+            return "K\(params)_\(signature.returnType.mangleTypeName)"
         }
     }