Test passing Swift heap object to exported function

Author: kateinoigakukun

Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift

@@ -212,8 +212,11 @@ struct BridgeJSLink {
         var cleanupLines: [String] = []
         var parameterForwardings: [String] = []
 
-        func liftParameter(param: Parameter) {
+        func lowerParameter(param: Parameter) {
             switch param.type {
+            case .void: return
+            case .int, .float, .double, .bool:
+                parameterForwardings.append(param.name)
             case .string:
                 let bytesLabel = "\(param.name)Bytes"
                 let bytesIdLabel = "\(param.name)Id"
@@ -222,12 +225,14 @@ struct BridgeJSLink {
                 cleanupLines.append("swift.memory.release(\(bytesIdLabel));")
                 parameterForwardings.append(bytesIdLabel)
                 parameterForwardings.append("\(bytesLabel).length")
-            default:
-                parameterForwardings.append(param.name)
+            case .jsObject:
+                parameterForwardings.append("swift.memory.retain(\(param.name))")
+            case .swiftHeapObject:
+                parameterForwardings.append("\(param.name).pointer")
             }
         }
 
-        func liftSelf() {
+        func lowerSelf() {
             parameterForwardings.append("this.pointer")
         }
 
@@ -294,7 +299,7 @@ struct BridgeJSLink {
     func renderExportedFunction(function: ExportedFunction) -> (js: [String], dts: [String]) {
         let thunkBuilder = ExportedThunkBuilder()
         for param in function.parameters {
-            thunkBuilder.liftParameter(param: param)
+            thunkBuilder.lowerParameter(param: param)
         }
         let returnExpr = thunkBuilder.call(abiName: function.abiName, returnType: function.returnType)
         let funcLines = thunkBuilder.renderFunction(
@@ -324,7 +329,7 @@ struct BridgeJSLink {
         if let constructor: ExportedConstructor = klass.constructor {
             let thunkBuilder = ExportedThunkBuilder()
             for param in constructor.parameters {
-                thunkBuilder.liftParameter(param: param)
+                thunkBuilder.lowerParameter(param: param)
             }
             let returnExpr = thunkBuilder.callConstructor(abiName: constructor.abiName)
             var funcLines: [String] = []
@@ -343,9 +348,9 @@ struct BridgeJSLink {
 
         for method in klass.methods {
             let thunkBuilder = ExportedThunkBuilder()
-            thunkBuilder.liftSelf()
+            thunkBuilder.lowerSelf()
             for param in method.parameters {
-                thunkBuilder.liftParameter(param: param)
+                thunkBuilder.lowerParameter(param: param)
             }
             let returnExpr = thunkBuilder.call(abiName: method.abiName, returnType: method.returnType)
             jsLines.append(

Tests/BridgeJSRuntimeTests/ExportAPITests.swift

@@ -42,9 +42,9 @@ func runJsWorks() -> Void
     }
 }
 
-// @JS func takeGreeter(g: Greeter) {
-//     g.changeName(name: "World")
-// }
+@JS func takeGreeter(g: Greeter, name: String) {
+    g.changeName(name: name)
+}
 
 class ExportAPITests: XCTestCase {
     func testAll() {

Tests/BridgeJSRuntimeTests/Generated/ExportSwift.swift

@@ -44,6 +44,16 @@ public func _bjs_roundTripString(vBytes: Int32, vLen: Int32) -> Void {
     }
 }
 
+@_expose(wasm, "bjs_takeGreeter")
+@_cdecl("bjs_takeGreeter")
+public func _bjs_takeGreeter(g: UnsafeMutableRawPointer, nameBytes: Int32, nameLen: Int32) -> Void {
+    let name = String(unsafeUninitializedCapacity: Int(nameLen)) { b in
+        _init_memory(nameBytes, b.baseAddress.unsafelyUnwrapped)
+        return Int(nameLen)
+    }
+    takeGreeter(g: Unmanaged<Greeter>.fromOpaque(g).takeUnretainedValue(), name: name)
+}
+
 @_expose(wasm, "bjs_Greeter_init")
 @_cdecl("bjs_Greeter_init")
 public func _bjs_Greeter_init(nameBytes: Int32, nameLen: Int32) -> UnsafeMutableRawPointer {

Tests/BridgeJSRuntimeTests/Generated/JavaScript/ExportSwift.json

@@ -150,6 +150,35 @@
       "returnType" : {
         "string" : {
 
+        }
+      }
+    },
+    {
+      "abiName" : "bjs_takeGreeter",
+      "name" : "takeGreeter",
+      "parameters" : [
+        {
+          "label" : "g",
+          "name" : "g",
+          "type" : {
+            "swiftHeapObject" : {
+              "_0" : "Greeter"
+            }
+          }
+        },
+        {
+          "label" : "name",
+          "name" : "name",
+          "type" : {
+            "string" : {
+
+            }
+          }
+        }
+      ],
+      "returnType" : {
+        "void" : {
+
         }
       }
     }

Tests/prelude.mjs

@@ -61,6 +61,8 @@ function BridgeJSRuntimeTests_runJsWorks(instance, exports) {
     assert.equal(g.greet(), "Hello, John!");
     g.changeName("Jane");
     assert.equal(g.greet(), "Hello, Jane!");
+    exports.takeGreeter(g, "Jay");
+    assert.equal(g.greet(), "Hello, Jay!");
     g.release();
 }