Skip to content

BridgeJS: Support for multiple associated values in enums using binary buffer format #436

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
merged 4 commits into from
Aug 29, 2025
Merged

BridgeJS: Support for multiple associated values in enums using binary buffer format #436

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5b177a5
BridgeJS: Support for multiple associated values in enums using binar…
krodak Aug 22, 2025
08dce16
BridgeJS: Fix build error on CI
krodak Aug 28, 2025
e89dfc0
BridgeJS: Migrate to stack based solution for storing / passing value…
krodak Aug 29, 2025
4489d91
BridgeJS: Add enum and string benchmarks
krodak Aug 29, 2025
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
Prev Previous commit
Next Next commit
BridgeJS: Migrate to stack based solution for storing / passing value… 
… types
  • Loading branch information
@krodak
krodak committed Aug 29, 2025
commit e89dfc0a7e4921b7862275fa7ae772d68eea6f15
67 changes: 27 additions & 40 deletions Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1042,17 +1042,10 @@ public class ExportSwift {
let typeName = enumDef.swiftCallName
return """
private extension \(raw: typeName) {
static func bridgeJSLiftParameter(_ caseId: Int32, _ paramsId: Int32, _ paramsLen: Int32) -> \(raw: typeName) {
let params: [UInt8] = .init(unsafeUninitializedCapacity: Int(paramsLen)) { buf, initializedCount in
_swift_js_init_memory(paramsId, buf.baseAddress.unsafelyUnwrapped)
initializedCount = Int(paramsLen)
}
return params.withUnsafeBytes { raw in
var reader = _BJSBinaryReader(raw: raw)
switch caseId {
\(raw: generateBinaryLiftSwitchCases(enumDef: enumDef).joined(separator: "\n"))
default: fatalError("Unknown \(raw: typeName) case ID: \\(caseId)")
}
static func bridgeJSLiftParameter(_ caseId: Int32) -> \(raw: typeName) {
switch caseId {
\(raw: generateStackLiftSwitchCases(enumDef: enumDef).joined(separator: "\n"))
default: fatalError("Unknown \(raw: typeName) case ID: \\(caseId)")
}
}

Expand All @@ -1065,43 +1058,37 @@ public class ExportSwift {
"""
}

private func generateBinaryLiftSwitchCases(enumDef: ExportedEnum) -> [String] {
private func generateStackLiftSwitchCases(enumDef: ExportedEnum) -> [String] {
var cases: [String] = []
for (caseIndex, enumCase) in enumDef.cases.enumerated() {
if enumCase.associatedValues.isEmpty {
cases.append("case \(caseIndex): return .\(enumCase.name)")
} else {
var lines: [String] = []
lines.append("case \(caseIndex):")
lines.append("reader.readParamCount(expected: \(enumCase.associatedValues.count))")
var argList: [String] = []

for (paramIndex, associatedValue) in enumCase.associatedValues.enumerated() {
let paramName = associatedValue.label ?? "param\(paramIndex)"
argList.append(paramName)

let argList = enumCase.associatedValues.map { associatedValue in
let paramName: String
if let label = associatedValue.label {
paramName = "\(label): "
} else {
paramName = ""
}
switch associatedValue.type {
case .string:
lines.append("reader.expectTag(.string)")
lines.append("let \(paramName) = reader.readString()")
return
"\(paramName)String.bridgeJSLiftParameter(_swift_js_pop_param_int32(), _swift_js_pop_param_int32())"
case .int:
lines.append("reader.expectTag(.int32)")
lines.append("let \(paramName) = Int(reader.readInt32())")
return "\(paramName)Int.bridgeJSLiftParameter(_swift_js_pop_param_int32())"
case .bool:
lines.append("reader.expectTag(.bool)")
lines.append("let \(paramName) = Int32(reader.readUInt8()) != 0")
return "\(paramName)Bool.bridgeJSLiftParameter(_swift_js_pop_param_int32())"
case .float:
lines.append("reader.expectTag(.float32)")
lines.append("let \(paramName) = reader.readFloat32()")
return "\(paramName)Float.bridgeJSLiftParameter(_swift_js_pop_param_f32())"
case .double:
lines.append("reader.expectTag(.float64)")
lines.append("let \(paramName) = reader.readFloat64()")
return "\(paramName)Double.bridgeJSLiftParameter(_swift_js_pop_param_f64())"
default:
lines.append("reader.expectTag(.int32)")
lines.append("let \(paramName) = reader.readInt32()")
return "\(paramName)Int.bridgeJSLiftParameter(_swift_js_pop_param_int32())"
}
}

lines.append("return .\(enumCase.name)(\(argList.joined(separator: ", ")))")
cases.append(lines.joined(separator: "\n"))
}
Expand All @@ -1114,26 +1101,26 @@ public class ExportSwift {
for (caseIndex, enumCase) in enumDef.cases.enumerated() {
if enumCase.associatedValues.isEmpty {
cases.append("case .\(enumCase.name):")
cases.append("_swift_js_return_tag(Int32(\(caseIndex)))")
cases.append("_swift_js_push_tag(Int32(\(caseIndex)))")
} else {
var bodyLines: [String] = []
bodyLines.append("_swift_js_return_tag(Int32(\(caseIndex)))")
bodyLines.append("_swift_js_push_tag(Int32(\(caseIndex)))")
for (index, associatedValue) in enumCase.associatedValues.enumerated() {
let paramName = associatedValue.label ?? "param\(index)"
switch associatedValue.type {
case .string:
bodyLines.append("var __bjs_\(paramName) = \(paramName)")
bodyLines.append("__bjs_\(paramName).withUTF8 { ptr in")
bodyLines.append("_swift_js_return_string(ptr.baseAddress, Int32(ptr.count))")
bodyLines.append("_swift_js_push_string(ptr.baseAddress, Int32(ptr.count))")
bodyLines.append("}")
case .int:
bodyLines.append("_swift_js_return_int(Int32(\(paramName)))")
bodyLines.append("_swift_js_push_int(Int32(\(paramName)))")
case .bool:
bodyLines.append("_swift_js_return_bool(\(paramName) ? 1 : 0)")
bodyLines.append("_swift_js_push_int(\(paramName) ? 1 : 0)")
case .float:
bodyLines.append("_swift_js_return_f32(\(paramName))")
bodyLines.append("_swift_js_push_f32(\(paramName))")
case .double:
bodyLines.append("_swift_js_return_f64(\(paramName))")
bodyLines.append("_swift_js_push_f64(\(paramName))")
default:
bodyLines.append(
"preconditionFailure(\"BridgeJS: unsupported associated value type in generated code\")"
Expand Down Expand Up @@ -1410,7 +1397,7 @@ extension BridgeType {
static let void = LiftingIntrinsicInfo(parameters: [])
static let caseEnum = LiftingIntrinsicInfo(parameters: [("value", .i32)])
static let associatedValueEnum = LiftingIntrinsicInfo(parameters: [
("caseId", .i32), ("paramsId", .i32), ("paramsLen", .i32),
("caseId", .i32)
])
}

Expand Down
Loading