BridgeJS: Generic bridging infrastructure

Author: krodak

Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift

@@ -35,6 +35,8 @@ final class JSGlueVariableScope {
     static let reservedSwiftClosureRegistry = "swiftClosureRegistry"
     static let reservedMakeSwiftClosure = "makeClosure"
     static let reservedTaStack = "taStack"
+    static let reservedCodecs = "__bjs_codecs"
+    static let reservedCodecsById = "__bjs_codecsById"
 
     private let intrinsicRegistry: JSIntrinsicRegistry
 
@@ -65,6 +67,8 @@ final class JSGlueVariableScope {
         reservedSwiftClosureRegistry,
         reservedMakeSwiftClosure,
         reservedTaStack,
+        reservedCodecs,
+        reservedCodecsById,
     ]
 
     init(intrinsicRegistry: JSIntrinsicRegistry) {
@@ -365,11 +369,12 @@ struct IntrinsicJSFragment: Sendable {
             helperPrinter.write("function \(jsValueLiftHelperName)(kind, payload1, payload2) {")
             helperPrinter.indent {
                 let helperScope = scope.makeChildScope()
-                let resultVar = emitJSValueConstruction(
+                let resultVar = helperScope.variable("jsValue")
+                emitJSValueConstruction(
                     kind: "kind",
                     payload1: "payload1",
                     payload2: "payload2",
-                    scope: helperScope,
+                    resultVar: resultVar,
                     printer: helperPrinter
                 )
                 helperPrinter.write("return \(resultVar);")
@@ -465,10 +470,9 @@ struct IntrinsicJSFragment: Sendable {
         kind: String,
         payload1: String,
         payload2: String,
-        scope: JSGlueVariableScope,
+        resultVar: String,
         printer: CodeFragmentPrinter
-    ) -> String {
-        let resultVar = scope.variable("jsValue")
+    ) {
         printer.write("let \(resultVar);")
         printer.write("switch (\(kind)) {")
         printer.indent {
@@ -526,7 +530,6 @@ struct IntrinsicJSFragment: Sendable {
             }
         }
         printer.write("}")
-        return resultVar
     }
 
     static func jsValueLowerReturn(context: BridgeContext) -> IntrinsicJSFragment {
@@ -1940,7 +1943,7 @@ struct IntrinsicJSFragment: Sendable {
         )
     }
 
-    private static func stackLiftFragment(elementType: BridgeType) throws -> IntrinsicJSFragment {
+    static func stackLiftFragment(elementType: BridgeType) throws -> IntrinsicJSFragment {
         if case .nullable(let wrappedType, let kind) = elementType {
             return try optionalElementRaiseFragment(wrappedType: wrappedType, kind: kind)
         }
@@ -2067,7 +2070,7 @@ struct IntrinsicJSFragment: Sendable {
         }
     }
 
-    private static func stackLowerFragment(elementType: BridgeType) throws -> IntrinsicJSFragment {
+    static func stackLowerFragment(elementType: BridgeType) throws -> IntrinsicJSFragment {
         if case .nullable(let wrappedType, let kind) = elementType {
             return try optionalElementLowerFragment(wrappedType: wrappedType, kind: kind)
         }
@@ -2676,7 +2679,7 @@ private extension BridgeType {
             return .inlineFlag
         case .closure:
             return .inlineFlag
-        case .swiftStruct, .array, .dictionary, .void, .namespaceEnum:
+        case .swiftStruct, .array, .dictionary, .void, .namespaceEnum, .generic:
             return .stackABI
         case .nullable(let wrapped, _):
             return wrapped.optionalConvention
@@ -2772,7 +2775,7 @@ private extension BridgeType {
             return [("caseId", .i32)]
         case .closure:
             return [("funcRef", .i32)]
-        case .void, .namespaceEnum, .swiftStruct, .array, .dictionary:
+        case .void, .namespaceEnum, .swiftStruct, .array, .dictionary, .generic:
             return []
         case .nullable(let wrapped, _):
             return wrapped.wasmParams
@@ -2806,10 +2809,15 @@ private extension BridgeType {
         switch self {
         case .bool, .rawValueEnum(_, .bool): return "$0 !== 0"
         case .integer(let t) where !t.is64Bit && !t.isSigned: return "$0 >>> 0"
+        case .integer(let t) where t.is64Bit && !t.isSigned: return "BigInt.asUintN(64, $0)"
         case .rawValueEnum(_, let rawType)
         where rawType.integerType?.is64Bit == false
             && rawType.integerType?.isSigned == false:
             return "$0 >>> 0"
+        case .rawValueEnum(_, let rawType)
+        where rawType.integerType?.is64Bit == true
+            && rawType.integerType?.isSigned == false:
+            return "BigInt.asUintN(64, $0)"
         default: return nil
         }
     }

Plugins/BridgeJS/Sources/BridgeJSSkeleton/BridgeJSSkeleton.swift

@@ -273,9 +273,24 @@ public enum BridgeType: Codable, Equatable, Hashable, Sendable {
     case namespaceEnum(String)
     case swiftProtocol(String)
     case swiftStruct(String)
+    case generic(String)
     indirect case closure(ClosureSignature, useJSTypedClosure: Bool)
 }
 
+extension BridgeType {
+    public var referencedGenericName: String? {
+        switch self {
+        case .generic(let name): return name
+        case .array(.generic(let name)): return name
+        case .nullable(.generic(let name), _): return name
+        case .dictionary(.generic(let name)): return name
+        default: return nil
+        }
+    }
+
+    public var usesBareGeneric: Bool { referencedGenericName != nil }
+}
+
 public enum WasmCoreType: String, Codable, Sendable {
     case i32, i64, f32, f64, pointer
 }
@@ -854,6 +869,8 @@ public struct ExportedFunction: Codable, Equatable, Sendable {
     public var effects: Effects
     public var namespace: [String]?
     public var staticContext: StaticContext?
+    public var genericParameters: [String]?
+    public var genericParameterNames: [String] { genericParameters ?? [] }
 
     public init(
         name: String,
@@ -862,7 +879,8 @@ public struct ExportedFunction: Codable, Equatable, Sendable {
         returnType: BridgeType,
         effects: Effects,
         namespace: [String]? = nil,
-        staticContext: StaticContext? = nil
+        staticContext: StaticContext? = nil,
+        genericParameters: [String]? = nil
     ) {
         self.name = name
         self.abiName = abiName
@@ -871,6 +889,7 @@ public struct ExportedFunction: Codable, Equatable, Sendable {
         self.effects = effects
         self.namespace = namespace
         self.staticContext = staticContext
+        self.genericParameters = genericParameters
     }
 }
 
@@ -883,6 +902,7 @@ public struct ExportedClass: Codable, NamespacedExportedType {
     public var properties: [ExportedProperty]
     public var namespace: [String]?
     public var identityMode: Bool?  // nil = use config default, true/false = override
+    public var isFinal: Bool?
 
     public init(
         name: String,
@@ -892,7 +912,8 @@ public struct ExportedClass: Codable, NamespacedExportedType {
         methods: [ExportedFunction],
         properties: [ExportedProperty] = [],
         namespace: [String]? = nil,
-        identityMode: Bool? = nil
+        identityMode: Bool? = nil,
+        isFinal: Bool? = nil
     ) {
         self.name = name
         self.swiftCallName = swiftCallName
@@ -902,6 +923,7 @@ public struct ExportedClass: Codable, NamespacedExportedType {
         self.properties = properties
         self.namespace = namespace
         self.identityMode = identityMode
+        self.isFinal = isFinal
     }
 }
 
@@ -1100,6 +1122,8 @@ public struct ImportedFunctionSkeleton: Codable {
     /// determine the access level of bridge-generated helpers (e.g. typed
     /// closure inits) that surface through this function's signature.
     public let accessLevel: BridgeJSAccessLevel
+    public let genericParameters: [String]?
+    public var genericParameterNames: [String] { genericParameters ?? [] }
 
     public init(
         name: String,
@@ -1109,7 +1133,8 @@ public struct ImportedFunctionSkeleton: Codable {
         returnType: BridgeType,
         effects: Effects = Effects(isAsync: false, isThrows: true),
         documentation: String? = nil,
-        accessLevel: BridgeJSAccessLevel = .internal
+        accessLevel: BridgeJSAccessLevel = .internal,
+        genericParameters: [String]? = nil
     ) {
         self.name = name
         self.jsName = jsName
@@ -1119,10 +1144,11 @@ public struct ImportedFunctionSkeleton: Codable {
         self.effects = effects
         self.documentation = documentation
         self.accessLevel = accessLevel
+        self.genericParameters = genericParameters
     }
 
     private enum CodingKeys: String, CodingKey {
-        case name, jsName, from, parameters, returnType, effects, documentation, accessLevel
+        case name, jsName, from, parameters, returnType, effects, documentation, accessLevel, genericParameters
     }
 
     public init(from decoder: any Decoder) throws {
@@ -1135,6 +1161,7 @@ public struct ImportedFunctionSkeleton: Codable {
         self.effects = try container.decode(Effects.self, forKey: .effects)
         self.documentation = try container.decodeIfPresent(String.self, forKey: .documentation)
         self.accessLevel = try container.decodeIfPresent(BridgeJSAccessLevel.self, forKey: .accessLevel) ?? .internal
+        self.genericParameters = try container.decodeIfPresent([String].self, forKey: .genericParameters)
     }
 
     public func abiName(context: ImportedTypeSkeleton?) -> String {
@@ -1622,6 +1649,8 @@ extension BridgeType {
         case .dictionary:
             // Dictionaries use stack-based return with entry count (no direct WASM return type)
             return nil
+        case .generic:
+            return nil
         }
     }
 
@@ -1709,6 +1738,8 @@ extension BridgeType {
         case .dictionary(let valueType):
             // Dictionary mangling: "SD" prefix followed by value type (key is always String)
             return "SD\(valueType.mangleTypeName)"
+        case .generic(let name):
+            return "\(name.count)\(name)T"
         }
     }