BridgeJS: Add runtime tests for importing TypeScript classes

Author: kateinoigakukun

Plugins/PackageToJS/Templates/bin/test.js

@@ -65,7 +65,7 @@ const harnesses = {
             if (preludeScript) {
                 const prelude = await import(preludeScript)
                 if (prelude.setupOptions) {
-                    options = prelude.setupOptions(options, { isMainThread: true })
+                    options = await prelude.setupOptions(options, { isMainThread: true })
                 }
             }
             process.on("beforeExit", () => {

Plugins/PackageToJS/Templates/platforms/node.js

@@ -59,7 +59,7 @@ export function createDefaultWorkerFactory(preludeScript) {
                 if (preludeScript) {
                     const prelude = await import(preludeScript);
                     if (prelude.setupOptions) {
-                        options = prelude.setupOptions(options, { isMainThread: false })
+                        options = await prelude.setupOptions(options, { isMainThread: false })
                     }
                 }
                 await instantiateForThread(tid, startArg, {

Tests/BridgeJSRuntimeTests/Generated/ImportTS.swift

@@ -47,4 +47,48 @@ func jsRoundTripString(_ v: String) -> String {
         _init_memory_with_result(b.baseAddress.unsafelyUnwrapped, Int32(ret))
         return Int(ret)
     }
+}
+
+struct JsGreeter {
+    let this: JSObject
+
+    init(this: JSObject) {
+        self.this = this
+    }
+
+    init(takingThis this: Int32) {
+        self.this = JSObject(id: UInt32(bitPattern: this))
+    }
+
+    init(_ name: String) {
+        @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_JsGreeter_init")
+        func bjs_JsGreeter_init(_ name: Int32) -> Int32
+        var name = name
+        let nameId = name.withUTF8 { b in
+            _make_jsstring(b.baseAddress.unsafelyUnwrapped, Int32(b.count))
+        }
+        let ret = bjs_JsGreeter_init(nameId)
+        self.this = JSObject(id: UInt32(bitPattern: ret))
+    }
+
+    func greet() -> String {
+        @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_JsGreeter_greet")
+        func bjs_JsGreeter_greet(_ self: Int32) -> Int32
+        let ret = bjs_JsGreeter_greet(Int32(bitPattern: self.this.id))
+        return String(unsafeUninitializedCapacity: Int(ret)) { b in
+            _init_memory_with_result(b.baseAddress.unsafelyUnwrapped, Int32(ret))
+            return Int(ret)
+        }
+    }
+
+    func changeName(_ name: String) -> Void {
+        @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_JsGreeter_changeName")
+        func bjs_JsGreeter_changeName(_ self: Int32, _ name: Int32) -> Void
+        var name = name
+        let nameId = name.withUTF8 { b in
+            _make_jsstring(b.baseAddress.unsafelyUnwrapped, Int32(b.count))
+        }
+        bjs_JsGreeter_changeName(Int32(bitPattern: self.this.id), nameId)
+    }
+
 }

Tests/BridgeJSRuntimeTests/Generated/JavaScript/ImportTS.json

@@ -69,7 +69,55 @@
         }
       ],
       "types" : [
+        {
+          "constructor" : {
+            "parameters" : [
+              {
+                "name" : "name",
+                "type" : {
+                  "string" : {
+
+                  }
+                }
+              }
+            ]
+          },
+          "methods" : [
+            {
+              "name" : "greet",
+              "parameters" : [
 
+              ],
+              "returnType" : {
+                "string" : {
+
+                }
+              }
+            },
+            {
+              "name" : "changeName",
+              "parameters" : [
+                {
+                  "name" : "name",
+                  "type" : {
+                    "string" : {
+
+                    }
+                  }
+                }
+              ],
+              "returnType" : {
+                "void" : {
+
+                }
+              }
+            }
+          ],
+          "name" : "JsGreeter",
+          "properties" : [
+
+          ]
+        }
       ]
     }
   ],

Tests/BridgeJSRuntimeTests/ImportAPITests.swift

@@ -34,4 +34,11 @@ class ImportAPITests: XCTestCase {
             XCTAssertEqual(jsRoundTripString(v), v)
         }
     }
+
+    func testClass() {
+        let greeter = JsGreeter("Alice")
+        XCTAssertEqual(greeter.greet(), "Hello, Alice!")
+        greeter.changeName("Bob")
+        XCTAssertEqual(greeter.greet(), "Hello, Bob!")
+    }
 }

Tests/BridgeJSRuntimeTests/bridge-js.d.ts

@@ -2,3 +2,9 @@ export function jsRoundTripVoid(): void
 export function jsRoundTripNumber(v: number): number
 export function jsRoundTripBool(v: boolean): boolean
 export function jsRoundTripString(v: string): string
+
+export class JsGreeter {
+    constructor(name: string);
+    greet(): string;
+    changeName(name: string): void;
+}

Tests/prelude.mjs

@@ -19,6 +19,19 @@ export async function setupOptions(options, context) {
             "jsRoundTripString": (v) => {
                 return v;
             },
+            JsGreeter: class {
+                /** @param {string} name */
+                constructor(name) {
+                    this.name = name;
+                }
+                greet() {
+                    return `Hello, ${this.name}!`;
+                }
+                /** @param {string} name */
+                changeName(name) {
+                    this.name = name;
+                }
+            }
         },
         addToCoreImports(importObject, importsContext) {
             const { getInstance, getExports } = importsContext;