BridgeJS: Lift struct method arguments before self

Author: krodak

Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift

@@ -325,8 +325,8 @@ public class ExportSwift {
         }
 
         func callMethod(methodName: String, returnType: BridgeType) {
-            let (_, selfExpr) = removeFirstLiftedParameter()
-            generateParameterLifting()
+            let (selfParam, selfExpr) = removeFirstLiftedParameter()
+            generateParameterLifting(selfUsesStack: selfParam.type.isStackUsingParameter)
             let item = renderCallStatement(
                 callee: "\(raw: selfExpr).\(raw: methodName)",
                 returnType: returnType
@@ -335,7 +335,7 @@ public class ExportSwift {
         }
 
         /// Generates intermediate variables for stack-using parameters if needed for LIFO compatibility
-        private func generateParameterLifting() {
+        private func generateParameterLifting(selfUsesStack: Bool = false) {
             let stackParamIndices = parameters.enumerated().compactMap { index, param -> Int? in
                 param.type.isStackUsingParameter ? index : nil
             }
@@ -356,7 +356,7 @@ public class ExportSwift {
                 return
             }
 
-            guard stackParamIndices.count > 1 else { return }
+            guard selfUsesStack || stackParamIndices.count > 1 else { return }
 
             for index in stackParamIndices.reversed() {
                 let param = parameters[index]

Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/MacroSwift/SwiftStruct.swift

@@ -78,6 +78,10 @@ extension Vector2D {
     @JS func describe() -> String {
         return "Vector2D(\(dx), \(dy))"
     }
+
+    @JS func dot(_ components: [Double]) -> Double {
+        return zip([dx, dy], components).map(*).reduce(0, +)
+    }
 }
 
 extension DataPoint {

Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStruct.json

@@ -701,6 +701,35 @@
             "returnType" : {
               "string" : {
 
+              }
+            }
+          },
+          {
+            "abiName" : "bjs_Vector2D_dot",
+            "effects" : {
+              "isAsync" : false,
+              "isStatic" : false,
+              "isThrows" : false
+            },
+            "name" : "dot",
+            "parameters" : [
+              {
+                "label" : "_",
+                "name" : "components",
+                "type" : {
+                  "array" : {
+                    "_0" : {
+                      "double" : {
+
+                      }
+                    }
+                  }
+                }
+              }
+            ],
+            "returnType" : {
+              "double" : {
+
               }
             }
           }

Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSCodegenTests/SwiftStruct.swift

@@ -536,6 +536,18 @@ public func _bjs_Vector2D_describe() -> Void {
     #endif
 }
 
+@_expose(wasm, "bjs_Vector2D_dot")
+@_cdecl("bjs_Vector2D_dot")
+public func _bjs_Vector2D_dot() -> Float64 {
+    #if arch(wasm32)
+    let _tmp_components = [Double].bridgeJSStackPop()
+    let ret = Vector2D.bridgeJSLiftParameter().dot(_: _tmp_components)
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
 @_expose(wasm, "bjs_roundtrip")
 @_cdecl("bjs_roundtrip")
 public func _bjs_roundtrip() -> Void {

Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.d.ts

@@ -49,6 +49,7 @@ export interface Vector2D {
     magnitude(): number;
     scaled(factor: number): Vector2D;
     describe(): string;
+    dot(components: number[]): number;
 }
 export type PrecisionObject = typeof PrecisionValues;
 

Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/SwiftStruct.js

@@ -385,6 +385,7 @@ export async function createInstantiator(options, swift) {
         },
     };
     const __bjs_codec_Optional_JSObject = __bjs_optionalCodec(__bjs_codec_JSObject);
+    const __bjs_codec_Array_Double = __bjs_arrayCodec(__bjs_primitiveCodecs.Double);
 
     const __bjs_createStructHelpers_M10TestModuleT9DataPoint = () => ({
         lower: (value) => {
@@ -526,6 +527,12 @@ export async function createInstantiator(options, swift) {
                 tmpRetString = undefined;
                 return ret3;
             }.bind(instance1);
+            instance1.dot = function(components) {
+                structHelpers.M10TestModuleT8Vector2D.lower(this);
+                __bjs_codec_Array_Double.lower(components);
+                const ret4 = instance.exports.bjs_Vector2D_dot();
+                return ret4;
+            }.bind(instance1);
             return instance1;
         }
     });

Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift

@@ -8385,7 +8385,8 @@ fileprivate func _bjs_struct_lift_ArrayMembers_extern() -> Int32 {
 @_cdecl("bjs_ArrayMembers_sumValues")
 public func _bjs_ArrayMembers_sumValues() -> Int32 {
     #if arch(wasm32)
-    let ret = ArrayMembers.bridgeJSLiftParameter().sumValues(_: [Int].bridgeJSStackPop())
+    let _tmp_values = [Int].bridgeJSStackPop()
+    let ret = ArrayMembers.bridgeJSLiftParameter().sumValues(_: _tmp_values)
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")
@@ -8396,7 +8397,8 @@ public func _bjs_ArrayMembers_sumValues() -> Int32 {
 @_cdecl("bjs_ArrayMembers_firstString")
 public func _bjs_ArrayMembers_firstString() -> Void {
     #if arch(wasm32)
-    let ret = ArrayMembers.bridgeJSLiftParameter().firstString(_: [String].bridgeJSStackPop())
+    let _tmp_values = [String].bridgeJSStackPop()
+    let ret = ArrayMembers.bridgeJSLiftParameter().firstString(_: _tmp_values)
     return ret.bridgeJSLowerReturn()
     #else
     fatalError("Only available on WebAssembly")

Tests/prelude.mjs

@@ -301,6 +301,8 @@ function BridgeJSRuntimeTests_runJsWorks(instance, exports) {
     assert.deepEqual(arrayStructRoundTrip.optStrings, ["a", "b"]);
     assert.equal(exports.arrayMembersSum(arrayStruct, [10, 20]), 30);
     assert.equal(exports.arrayMembersFirst(arrayStruct, ["x", "y"]), "x");
+    assert.equal(arrayStructRoundTrip.sumValues([10, 20]), 30);
+    assert.equal(arrayStructRoundTrip.firstString(["x", "y"]), "x");
     const jsValueArray = [true, 42, "ok", { nested: 1 }, null, undefined];
     assert.deepEqual(exports.roundTripOptionalJSValueArray(jsValueArray), jsValueArray);
     assert.equal(exports.roundTripOptionalJSValueArray(null), null);