Skip to content

BridgeJS: Unify closure JS glue lift/lower #610

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
krodak merged 1 commit into from
Feb 9, 2026
+251 −1,019
Merged

BridgeJS: Unify closure JS glue lift/lower #610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
122 changes: 29 additions & 93 deletions Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -716,71 +716,25 @@ public struct BridgeJSLink {
signature: ClosureSignature,
functionName: String
) throws -> [String] {
let printer = CodeFragmentPrinter()
let context = IntrinsicJSFragment.PrintCodeContext(
scope: JSGlueVariableScope(intrinsicRegistry: intrinsicRegistry),
printer: printer,
cleanupCode: CodeFragmentPrinter()
)
let thunkBuilder = ImportedThunkBuilder(context: .exportSwift, intrinsicRegistry: intrinsicRegistry)
thunkBuilder.parameterNames.append("callbackId")
thunkBuilder.body.write("const callback = \(JSGlueVariableScope.reservedSwift).memory.getObject(callbackId);")

// Build parameter list for invoke function
var invokeParams: [String] = ["callbackId"]
for (index, paramType) in signature.parameters.enumerated() {
if case .nullable = paramType {
invokeParams.append("param\(index)IsSome")
invokeParams.append("param\(index)Value")
} else {
invokeParams.append("param\(index)Id")
}
let paramName = "param\(index)"
try thunkBuilder.liftParameter(param: Parameter(label: nil, name: paramName, type: paramType))
}

printer.nextLine()
printer.write("bjs[\"\(functionName)\"] = function(\(invokeParams.joined(separator: ", "))) {")
try printer.indent {
printer.write("try {")
try printer.indent {
printer.write("const callback = \(JSGlueVariableScope.reservedSwift).memory.getObject(callbackId);")
let returnExpr = try thunkBuilder.call(calleeExpr: "callback", returnType: signature.returnType)

for (index, paramType) in signature.parameters.enumerated() {
let fragment = try IntrinsicJSFragment.closureLiftParameter(type: paramType)
let args: [String]
if case .nullable = paramType {
args = ["param\(index)IsSome", "param\(index)Value", "param\(index)"]
} else {
args = ["param\(index)Id", "param\(index)"]
}
_ = try fragment.printCode(args, context)
}

let callbackParams = signature.parameters.indices.map { "param\($0)" }.joined(separator: ", ")
printer.write("const result = callback(\(callbackParams));")

// Type check if needed (for example, formatName requires string return)
switch signature.returnType {
case .string:
printer.write("if (typeof result !== \"string\") {")
printer.indent {
printer.write("throw new TypeError(\"Callback must return a string\");")
}
printer.write("}")
default:
break
}

let returnFragment = try IntrinsicJSFragment.closureLowerReturn(type: signature.returnType)
_ = try returnFragment.printCode(["result"], context)
}
printer.write("} catch (error) {")
try printer.indent {
printer.write("\(JSGlueVariableScope.reservedSetException)?.(error);")
let errorFragment = IntrinsicJSFragment.closureErrorReturn(type: signature.returnType)
_ = try errorFragment.printCode([], context)
}
printer.write("}")
}
printer.write("};")
var functionLines = thunkBuilder.renderFunction(
name: nil,
returnExpr: returnExpr,
returnType: signature.returnType
)
functionLines[0] = "bjs[\"\(functionName)\"] = " + functionLines[0]

return printer.lines
return functionLines
}

/// Generates a lower_closure_* function that wraps a Swift closure for JavaScript
Expand All @@ -789,46 +743,27 @@ public struct BridgeJSLink {
functionName: String
) throws -> [String] {
let printer = CodeFragmentPrinter()
let context = IntrinsicJSFragment.PrintCodeContext(
scope: JSGlueVariableScope(intrinsicRegistry: intrinsicRegistry),
printer: printer,
cleanupCode: CodeFragmentPrinter()
let builder = ExportedThunkBuilder(
effects: Effects(isAsync: false, isThrows: true),
hasDirectAccessToSwiftClass: false,
intrinsicRegistry: intrinsicRegistry
)
builder.parameterForwardings.append("boxPtr")

printer.write(
"const \(functionName) = function(\(signature.parameters.indices.map { "param\($0)" }.joined(separator: ", "))) {"
)
try printer.indent {
var invokeArgs: [String] = ["boxPtr"]

// Lower parameters using shared thunk builder
for (index, paramType) in signature.parameters.enumerated() {
let paramName = "param\(index)"
let fragment = try IntrinsicJSFragment.lowerParameter(type: paramType)
let lowered = try fragment.printCode([paramName], context)
invokeArgs.append(contentsOf: lowered)
try builder.lowerParameter(param: Parameter(label: nil, name: paramName, type: paramType))
}

// Call the Swift invoke function
let invokeCall =
"\(JSGlueVariableScope.reservedInstance).exports.invoke_swift_closure_\(signature.moduleName)_\(signature.mangleName)(\(invokeArgs.joined(separator: ", ")))"
let invokeResultName = "invokeResult"
printer.write("const \(invokeResultName) = \(invokeCall);")

printer.write("if (\(JSGlueVariableScope.reservedStorageToReturnException)) {")
printer.indent {
printer.write(
"const error = \(JSGlueVariableScope.reservedSwift).memory.getObject(\(JSGlueVariableScope.reservedStorageToReturnException));"
)
printer.write(
"\(JSGlueVariableScope.reservedSwift).memory.release(\(JSGlueVariableScope.reservedStorageToReturnException));"
)
printer.write("\(JSGlueVariableScope.reservedStorageToReturnException) = undefined;")
printer.write("throw error;")
}
printer.write("}")

let returnFragment = try IntrinsicJSFragment.closureLiftReturn(type: signature.returnType)
_ = try returnFragment.printCode([invokeResultName], context)
"invoke_swift_closure_\(signature.moduleName)_\(signature.mangleName)"
let returnExpr = try builder.call(abiName: invokeCall, returnType: signature.returnType)
builder.renderFunctionBody(into: printer, returnExpr: returnExpr)
}
printer.write("};")

Expand Down Expand Up @@ -1291,15 +1226,16 @@ public struct BridgeJSLink {
let scope: JSGlueVariableScope
let context: IntrinsicJSFragment.PrintCodeContext

init(effects: Effects, intrinsicRegistry: JSIntrinsicRegistry) {
init(effects: Effects, hasDirectAccessToSwiftClass: Bool = true, intrinsicRegistry: JSIntrinsicRegistry) {
self.effects = effects
self.scope = JSGlueVariableScope(intrinsicRegistry: intrinsicRegistry)
self.body = CodeFragmentPrinter()
self.cleanupCode = CodeFragmentPrinter()
self.context = IntrinsicJSFragment.PrintCodeContext(
scope: scope,
printer: body,
cleanupCode: cleanupCode
cleanupCode: cleanupCode,
hasDirectAccessToSwiftClass: hasDirectAccessToSwiftClass
)
}

Expand Down Expand Up @@ -2221,13 +2157,13 @@ extension BridgeJSLink {
}

func renderFunction(
name: String,
name: String?,
returnExpr: String?,
returnType: BridgeType
) -> [String] {
let printer = CodeFragmentPrinter()

printer.write("function \(name)(\(parameterNames.joined(separator: ", "))) {")
printer.write("function\(name.map { " \($0)" } ?? "")(\(parameterNames.joined(separator: ", "))) {")
printer.indent {
printer.write("try {")
printer.indent {
Expand Down Expand Up @@ -2259,7 +2195,7 @@ extension BridgeJSLink {
return try call(name: name, fromObjectExpr: "imports", returnType: returnType)
}

private func call(calleeExpr: String, returnType: BridgeType) throws -> String? {
func call(calleeExpr: String, returnType: BridgeType) throws -> String? {
let callExpr = "\(calleeExpr)(\(parameterForwardings.joined(separator: ", ")))"
return try self.call(callExpr: callExpr, returnType: returnType)
}
Expand Down
Loading