Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 8 additions & 7 deletions Benchmarks/Sources/Generated/BridgeJS.swift
Original file line number Diff line number Diff line change
Expand Up @@ -1750,20 +1750,21 @@ func _$benchmarkHelperNoopWithNumber(_ n: Double) throws(JSException) -> Void {

#if arch(wasm32)
@_extern(wasm, module: "Benchmarks", name: "bjs_benchmarkRunner")
fileprivate func bjs_benchmarkRunner_extern(_ name: Int32, _ body: Int32) -> Void
fileprivate func bjs_benchmarkRunner_extern(_ nameBytes: Int32, _ nameLength: Int32, _ body: Int32) -> Void
#else
fileprivate func bjs_benchmarkRunner_extern(_ name: Int32, _ body: Int32) -> Void {
fileprivate func bjs_benchmarkRunner_extern(_ nameBytes: Int32, _ nameLength: Int32, _ body: Int32) -> Void {
fatalError("Only available on WebAssembly")
}
#endif
@inline(never) fileprivate func bjs_benchmarkRunner(_ name: Int32, _ body: Int32) -> Void {
return bjs_benchmarkRunner_extern(name, body)
@inline(never) fileprivate func bjs_benchmarkRunner(_ nameBytes: Int32, _ nameLength: Int32, _ body: Int32) -> Void {
return bjs_benchmarkRunner_extern(nameBytes, nameLength, body)
}

func _$benchmarkRunner(_ name: String, _ body: JSObject) throws(JSException) -> Void {
let nameValue = name.bridgeJSLowerParameter()
let bodyValue = body.bridgeJSLowerParameter()
bjs_benchmarkRunner(nameValue, bodyValue)
name.bridgeJSWithLoweredParameter { (nameBytes, nameLength) in
let bodyValue = body.bridgeJSLowerParameter()
bjs_benchmarkRunner(nameBytes, nameLength, bodyValue)
}
if let error = _swift_js_take_exception() {
throw error
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -249,20 +249,23 @@ func _$createTS2Swift() throws(JSException) -> TS2Swift {

#if arch(wasm32)
@_extern(wasm, module: "PlayBridgeJS", name: "bjs_TS2Swift_convert")
fileprivate func bjs_TS2Swift_convert_extern(_ self: Int32, _ ts: Int32) -> Int32
fileprivate func bjs_TS2Swift_convert_extern(_ self: Int32, _ tsBytes: Int32, _ tsLength: Int32) -> Int32
#else
fileprivate func bjs_TS2Swift_convert_extern(_ self: Int32, _ ts: Int32) -> Int32 {
fileprivate func bjs_TS2Swift_convert_extern(_ self: Int32, _ tsBytes: Int32, _ tsLength: Int32) -> Int32 {
fatalError("Only available on WebAssembly")
}
#endif
@inline(never) fileprivate func bjs_TS2Swift_convert(_ self: Int32, _ ts: Int32) -> Int32 {
return bjs_TS2Swift_convert_extern(self, ts)
@inline(never) fileprivate func bjs_TS2Swift_convert(_ self: Int32, _ tsBytes: Int32, _ tsLength: Int32) -> Int32 {
return bjs_TS2Swift_convert_extern(self, tsBytes, tsLength)
}

func _$TS2Swift_convert(_ self: JSObject, _ ts: String) throws(JSException) -> String {
let selfValue = self.bridgeJSLowerParameter()
let tsValue = ts.bridgeJSLowerParameter()
let ret = bjs_TS2Swift_convert(selfValue, tsValue)
let ret0 = ts.bridgeJSWithLoweredParameter { (tsBytes, tsLength) in
let ret = bjs_TS2Swift_convert(selfValue, tsBytes, tsLength)
return ret
}
let ret = ret0
if let error = _swift_js_take_exception() {
throw error
}
Expand Down
7 changes: 4 additions & 3 deletions Plugins/BridgeJS/Sources/BridgeJSCore/ClosureCodegen.swift
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,10 @@ public struct ClosureCodegen {
let externName = "invoke_js_callback_\(signature.moduleName)_\(mangledName)"

// Use CallJSEmission to generate the callback invocation
let builder = ImportTS.CallJSEmission(
let builder = try ImportTS.CallJSEmission(
moduleName: "bjs",
abiName: externName,
returnType: signature.returnType,
context: .exportSwift
)

Expand All @@ -41,8 +42,8 @@ public struct ClosureCodegen {
}

// Generate the call and return value lifting
try builder.call(returnType: signature.returnType)
try builder.liftReturnValue(returnType: signature.returnType)
try builder.call()
try builder.liftReturnValue()

// Generate extern declaration using CallJSEmission
let externDecl = builder.renderImportDecl()
Expand Down
19 changes: 11 additions & 8 deletions Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift
Original file line number Diff line number Diff line change
Expand Up @@ -1166,17 +1166,18 @@ struct ProtocolCodegen {
var externDecls: [DeclSyntax] = []

for method in proto.methods {
let builder = ImportTS.CallJSEmission(
let builder = try ImportTS.CallJSEmission(
moduleName: moduleName,
abiName: "_extern_\(method.name)",
returnType: method.returnType,
context: .exportSwift
)
try builder.lowerParameter(param: Parameter(label: nil, name: "jsObject", type: .jsObject(nil)))
for param in method.parameters {
try builder.lowerParameter(param: param)
}
try builder.call(returnType: method.returnType)
try builder.liftReturnValue(returnType: method.returnType)
try builder.call()
try builder.liftReturnValue()

// Build function signature using SwiftSignatureBuilder
let signature = SwiftSignatureBuilder.buildFunctionSignature(
Expand Down Expand Up @@ -1264,14 +1265,15 @@ struct ProtocolCodegen {
className: protocolName
)

let getterBuilder = ImportTS.CallJSEmission(
let getterBuilder = try ImportTS.CallJSEmission(
moduleName: moduleName,
abiName: getterAbiName,
returnType: property.type,
context: .exportSwift
)
try getterBuilder.lowerParameter(param: Parameter(label: nil, name: "jsObject", type: .jsObject(nil)))
try getterBuilder.call(returnType: property.type)
try getterBuilder.liftReturnValue(returnType: property.type)
try getterBuilder.call()
try getterBuilder.liftReturnValue()

// Build getter extern declaration using helper function
let getterExternDeclPrinter = CodeFragmentPrinter()
Expand All @@ -1296,14 +1298,15 @@ struct ProtocolCodegen {

if property.isReadonly { return }

let setterBuilder = ImportTS.CallJSEmission(
let setterBuilder = try ImportTS.CallJSEmission(
moduleName: moduleName,
abiName: setterAbiName,
returnType: .void,
context: .exportSwift
)
try setterBuilder.lowerParameter(param: Parameter(label: nil, name: "jsObject", type: .jsObject(nil)))
try setterBuilder.lowerParameter(param: Parameter(label: nil, name: "newValue", type: property.type))
try setterBuilder.call(returnType: .void)
try setterBuilder.call()

// Build setter extern declaration using helper function
let setterExternDeclPrinter = CodeFragmentPrinter()
Expand Down
Loading