BridgeJS: Delete dead code and fix nullable descriptor transparency in catch blocks

Author: krodak

Plugins/BridgeJS/Sources/BridgeJSCore/ClosureCodegen.swift

@@ -148,7 +148,7 @@ public struct ClosureCodegen {
         let abiReturnWasmType: WasmCoreType?
         if signature.returnType == .void {
             abiReturnWasmType = nil
-        } else if let wasmType = try signature.returnType.loweringReturnInfo().returnType {
+        } else if let wasmType = try signature.returnType.loweringReturnInfo() {
             abiReturnWasmType = wasmType
         } else {
             abiReturnWasmType = nil

Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift

@@ -339,8 +339,7 @@ public class ExportSwift {
         }
 
         private func _lowerReturnValue(returnType: BridgeType) throws {
-            let loweringInfo = try returnType.loweringReturnInfo()
-            abiReturnType = loweringInfo.returnType
+            abiReturnType = try returnType.loweringReturnInfo()
             if returnType == .void {
                 return
             }
@@ -1682,20 +1681,7 @@ extension BridgeType {
     struct LiftingIntrinsicInfo: Sendable {
         let parameters: [(name: String, type: WasmCoreType)]
 
-        static let bool = LiftingIntrinsicInfo(parameters: [("value", .i32)])
-        static let int = LiftingIntrinsicInfo(parameters: [("value", .i32)])
-        static let float = LiftingIntrinsicInfo(parameters: [("value", .f32)])
-        static let double = LiftingIntrinsicInfo(parameters: [("value", .f64)])
-        static let string = LiftingIntrinsicInfo(parameters: [("bytes", .i32), ("length", .i32)])
-        static let jsObject = LiftingIntrinsicInfo(parameters: [("value", .i32)])
-        static let jsValue = LiftingIntrinsicInfo(parameters: [("kind", .i32), ("payload1", .i32), ("payload2", .f64)])
-        static let swiftHeapObject = LiftingIntrinsicInfo(parameters: [("value", .pointer)])
-        static let unsafePointer = LiftingIntrinsicInfo(parameters: [("pointer", .pointer)])
-        static let void = LiftingIntrinsicInfo(parameters: [])
-        static let caseEnum = LiftingIntrinsicInfo(parameters: [("value", .i32)])
-        static let associatedValueEnum = LiftingIntrinsicInfo(parameters: [
-            ("caseId", .i32)
-        ])
+
     }
 
     func liftParameterInfo() throws -> LiftingIntrinsicInfo {
@@ -1715,18 +1701,14 @@ extension BridgeType {
         }
     }
 
-    struct LoweringIntrinsicInfo: Sendable {
-        let returnType: WasmCoreType?
-    }
-
-    func loweringReturnInfo() throws -> LoweringIntrinsicInfo {
+    func loweringReturnInfo() throws -> WasmCoreType? {
         switch self {
         case .nullable:
-            return LoweringIntrinsicInfo(returnType: nil)
+            return nil
         case .namespaceEnum:
             throw BridgeJSCoreError("Namespace enums are not supported to pass as parameters")
         default:
-            return LoweringIntrinsicInfo(returnType: descriptor.wasmReturnType)
+            return descriptor.wasmReturnType
         }
     }
 }

Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift

@@ -1543,7 +1543,7 @@ public struct BridgeJSLink {
                 throw BridgeJSLinkError(message: "Raw value enum \(enumDefinition.name) is missing rawType")
             }
 
-            let fragment = IntrinsicJSFragment.rawValueEnumHelper(enumDefinition: enumDefinition)
+            let fragment = IntrinsicJSFragment.simpleEnumHelper(enumDefinition: enumDefinition)
             _ = try fragment.printCode([enumValuesName], context)
             jsTopLevelLines.append(contentsOf: printer.lines)
         case .associatedValue:
@@ -2172,7 +2172,7 @@ extension BridgeJSLink {
                 printer.write("} catch (error) {")
                 printer.indent {
                     printer.write("setException(error);")
-                    if let abiReturnType = returnType.abiReturnType {
+                    if !returnType.isOptional, let abiReturnType = returnType.descriptor.wasmReturnType {
                         printer.write("return \(abiReturnType.placeholderValue)")
                     }
                 }

Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift

@@ -109,17 +109,7 @@ extension JSGlueVariableScope {
         printer.write("\(JSGlueVariableScope.reservedPointerStack).push(\(value));")
     }
 
-    // MARK: Return
-
-    func emitPushI32Return(_ value: String, printer: CodeFragmentPrinter) {
-        printer.write("\(JSGlueVariableScope.reservedI32Stack).push(\(value));")
-    }
-    func emitPushF64Return(_ value: String, printer: CodeFragmentPrinter) {
-        printer.write("\(JSGlueVariableScope.reservedF64Stack).push(\(value));")
-    }
-    func emitPushPointerReturn(_ value: String, printer: CodeFragmentPrinter) {
-        printer.write("\(JSGlueVariableScope.reservedPointerStack).push(\(value));")
-    }
+    // MARK: Pop
     func popString() -> String {
         return "\(JSGlueVariableScope.reservedStringStack).pop()"
     }
@@ -204,37 +194,6 @@ struct IntrinsicJSFragment: Sendable {
         }
     )
 
-    /// NOTE: JavaScript engine itself converts booleans to integers when passing them to
-    /// Wasm functions, so we don't need to do anything here
-    static let boolLowerParameter = identity
-    static let boolLiftReturn = IntrinsicJSFragment(
-        parameters: ["value"],
-        printCode: { arguments, _ in
-            return ["\(arguments[0]) !== 0"]
-        }
-    )
-    static let boolLiftParameter = IntrinsicJSFragment(
-        parameters: ["value"],
-        printCode: { arguments, _ in
-            return ["\(arguments[0]) !== 0"]
-        }
-    )
-    static let boolLowerReturn = IntrinsicJSFragment(
-        parameters: ["value"],
-        printCode: { arguments, _ in
-            return ["\(arguments[0]) ? 1 : 0"]
-        }
-    )
-
-    /// Convert signed Int32 to unsigned for UInt values
-    static let uintLiftReturn = IntrinsicJSFragment(
-        parameters: ["value"],
-        printCode: { arguments, _ in
-            return ["\(arguments[0]) >>> 0"]
-        }
-    )
-    static let uintLiftParameter = uintLiftReturn
-
     static let stringLowerParameter = IntrinsicJSFragment(
         parameters: ["value"],
         printCode: { arguments, context in
@@ -529,45 +488,20 @@ struct IntrinsicJSFragment: Sendable {
     }
 
     static func jsValueLowerReturn(context: BridgeContext) -> IntrinsicJSFragment {
-        switch context {
-        case .importTS:
-            // Return values from imported JS functions should be delivered to the Swift side
-            // via the parameter stacks that `_swift_js_pop_*` read from.
-            return IntrinsicJSFragment(
-                parameters: ["value"],
-                printCode: { arguments, context in
-                    let (scope, printer) = (context.scope, context.printer)
-                    let lowered = try jsValueLower.printCode(arguments, context)
-                    let kindVar = lowered[0]
-                    let payload1Var = lowered[1]
-                    let payload2Var = lowered[2]
-                    scope.emitPushI32Parameter(kindVar, printer: printer)
-                    scope.emitPushI32Parameter(payload1Var, printer: printer)
-                    scope.emitPushF64Parameter(payload2Var, printer: printer)
-                    return []
-                }
-            )
-        case .exportSwift:
-            // Kept for symmetry, though JSValue return for export currently relies on Swift pushing
-            // to tmpRet stacks directly.
-            return IntrinsicJSFragment(
-                parameters: ["value"],
-                printCode: { arguments, context in
-                    let (scope, printer) = (context.scope, context.printer)
-                    let lowered = try jsValueLower.printCode(
-                        arguments,
-                        context
-                    )
-                    let kindVar = lowered[0]
-                    let payload1Var = lowered[1]
-                    let payload2Var = lowered[2]
-                    scope.emitPushI32Parameter(kindVar, printer: printer)
-                    scope.emitPushI32Parameter(payload1Var, printer: printer)
-                    scope.emitPushF64Parameter(payload2Var, printer: printer)
-                    return []
-                }
-            )
-        }
+        return IntrinsicJSFragment(
+            parameters: ["value"],
+            printCode: { arguments, context in
+                let (scope, printer) = (context.scope, context.printer)
+                let lowered = try jsValueLower.printCode(arguments, context)
+                let kindVar = lowered[0]
+                let payload1Var = lowered[1]
+                let payload2Var = lowered[2]
+                scope.emitPushI32Parameter(kindVar, printer: printer)
+                scope.emitPushI32Parameter(payload1Var, printer: printer)
+                scope.emitPushF64Parameter(payload2Var, printer: printer)
+                return []
+            }
+        )
     }
 
     static let jsValueLift = IntrinsicJSFragment(
@@ -1814,30 +1748,7 @@ struct IntrinsicJSFragment: Sendable {
         )
     }
 
-    static func rawValueEnumHelper(enumDefinition: ExportedEnum) -> IntrinsicJSFragment {
-        return IntrinsicJSFragment(
-            parameters: ["enumName"],
-            printCode: { arguments, context in
-                let printer = context.printer
-                let enumName = arguments[0]
-                printer.write("const \(enumName) = {")
-                printer.indent {
-                    for (index, enumCase) in enumDefinition.cases.enumerated() {
-                        let caseName = enumCase.name.capitalizedFirstLetter
-                        let value = enumCase.jsValue(
-                            rawType: enumDefinition.rawType,
-                            index: index
-                        )
-                        printer.write("\(caseName): \(value),")
-                    }
-                }
-                printer.write("};")
-                printer.nextLine()
 
-                return []
-            }
-        )
-    }
 
     private static func associatedValuePushPayload(enumCase: EnumCase) -> IntrinsicJSFragment {
         return IntrinsicJSFragment(

Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift

@@ -1415,49 +1415,6 @@ extension BridgeType {
         }
     }
 
-    public var abiReturnType: WasmCoreType? {
-        switch self {
-        case .void: return nil
-        case .bool: return .i32
-        case .int, .uint: return .i32
-        case .float: return .f32
-        case .double: return .f64
-        case .string: return nil
-        case .jsObject: return .i32
-        case .jsValue: return nil
-        case .swiftHeapObject:
-            // UnsafeMutableRawPointer is returned as an i32 pointer
-            return .pointer
-        case .unsafePointer:
-            return .pointer
-        case .nullable:
-            return nil
-        case .caseEnum:
-            return .i32
-        case .rawValueEnum(_, let rawType):
-            return rawType.wasmCoreType
-        case .associatedValueEnum:
-            return nil
-        case .namespaceEnum:
-            return nil
-        case .swiftProtocol:
-            // Protocols pass JSObject IDs as Int32
-            return .i32
-        case .swiftStruct:
-            // Structs use stack-based return (no direct WASM return type)
-            return nil
-        case .closure:
-            // Closures pass callback ID as Int32
-            return .i32
-        case .array:
-            // Arrays use stack-based return with length prefix (no direct WASM return type)
-            return nil
-        case .dictionary:
-            // Dictionaries use stack-based return with entry count (no direct WASM return type)
-            return nil
-        }
-    }
-
     /// Returns true if this type is optional (nullable with null or undefined).
     public var isOptional: Bool {
         if case .nullable = self { return true }