Generalize lowering parameters with borrowing scope

Author: kateinoigakukun

Benchmarks/Sources/Generated/BridgeJS.swift

@@ -1761,8 +1761,8 @@ fileprivate func bjs_benchmarkRunner_extern(_ nameBytes: Int32, _ nameLength: In
 }
 
 func _$benchmarkRunner(_ name: String, _ body: JSObject) throws(JSException) -> Void {
-    let bodyValue = body.bridgeJSLowerParameter()
-    _swift_js_with_borrowed_utf8(name) { nameBytes, nameLength in
+    name.bridgeJSWithLoweredParameter { (nameBytes, nameLength) in
+        let bodyValue = body.bridgeJSLowerParameter()
         bjs_benchmarkRunner(nameBytes, nameLength, bodyValue)
     }
     if let error = _swift_js_take_exception() {

Examples/PlayBridgeJS/Sources/PlayBridgeJS/Generated/BridgeJS.swift

@@ -261,9 +261,11 @@ fileprivate func bjs_TS2Swift_convert_extern(_ self: Int32, _ tsBytes: Int32, _
 
 func _$TS2Swift_convert(_ self: JSObject, _ ts: String) throws(JSException) -> String {
     let selfValue = self.bridgeJSLowerParameter()
-    let ret = _swift_js_with_borrowed_utf8(ts) { tsBytes, tsLength in
-        bjs_TS2Swift_convert(selfValue, tsBytes, tsLength)
+    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
     }

Plugins/BridgeJS/Sources/BridgeJSCore/ClosureCodegen.swift

@@ -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
         )
 
@@ -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()

Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift

@@ -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(
@@ -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()
@@ -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()