BridgeJS: Support properties in TypeScript classes

Author: kateinoigakukun

Plugins/BridgeJS/Sources/JavaScript/src/processor.js

@@ -238,7 +238,8 @@ export class TypeProcessor {
 
         for (const member of node.members) {
             if (ts.isPropertyDeclaration(member)) {
-                // TODO
+                const property = this.visitPropertyDecl(member);
+                if (property) properties.push(property);
             } else if (ts.isMethodDeclaration(member)) {
                 const decl = this.visitFunctionLikeDecl(member);
                 if (decl) methods.push(decl);

Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/TypeScriptClass.d.ts

@@ -1,4 +1,6 @@
 export class Greeter {
+    name: string;
+    readonly age: number;
     constructor(name: string);
     greet(): string;
     changeName(name: string): void;

Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/TypeScriptClass.Import.js

@@ -42,6 +42,20 @@ export async function createInstantiator(options, swift) {
                 let ret = new options.imports.Greeter(nameObject);
                 return swift.memory.retain(ret);
             }
+            TestModule["bjs_Greeter_name_get"] = function bjs_Greeter_name_get(self) {
+                let ret = swift.memory.getObject(self).name;
+                tmpRetBytes = textEncoder.encode(ret);
+                return tmpRetBytes.length;
+            }
+            TestModule["bjs_Greeter_name_set"] = function bjs_Greeter_name_set(self, newValue) {
+                const newValueObject = swift.memory.getObject(newValue);
+                swift.memory.release(newValue);
+                swift.memory.getObject(self).name = newValueObject;
+            }
+            TestModule["bjs_Greeter_age_get"] = function bjs_Greeter_age_get(self) {
+                let ret = swift.memory.getObject(self).age;
+                return ret;
+            }
             TestModule["bjs_Greeter_greet"] = function bjs_Greeter_greet(self) {
                 let ret = swift.memory.getObject(self).greet();
                 tmpRetBytes = textEncoder.encode(ret);

Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ImportTSTests/TypeScriptClass.swift

@@ -37,6 +37,36 @@ struct Greeter {
         self.this = JSObject(id: UInt32(bitPattern: ret))
     }
 
+    var name: String {
+        get {
+            @_extern(wasm, module: "Check", name: "bjs_Greeter_name_get")
+            func bjs_Greeter_name_get(_ self: Int32) -> Int32
+            let ret = bjs_Greeter_name_get(Int32(bitPattern: self.this.id))
+            return String(unsafeUninitializedCapacity: Int(ret)) { b in
+                _init_memory_with_result(b.baseAddress.unsafelyUnwrapped, Int32(ret))
+                return Int(ret)
+            }
+        }
+        nonmutating set {
+            @_extern(wasm, module: "Check", name: "bjs_Greeter_name_set")
+            func bjs_Greeter_name_set(_ self: Int32, _ newValue: Int32) -> Void
+            var newValue = newValue
+            let newValueId = newValue.withUTF8 { b in
+                _make_jsstring(b.baseAddress.unsafelyUnwrapped, Int32(b.count))
+            }
+            bjs_Greeter_name_set(Int32(bitPattern: self.this.id), newValueId)
+        }
+    }
+
+    var age: Double {
+        get {
+            @_extern(wasm, module: "Check", name: "bjs_Greeter_age_get")
+            func bjs_Greeter_age_get(_ self: Int32) -> Float64
+            let ret = bjs_Greeter_age_get(Int32(bitPattern: self.this.id))
+            return Double(ret)
+        }
+    }
+
     func greet() -> String {
         @_extern(wasm, module: "Check", name: "bjs_Greeter_greet")
         func bjs_Greeter_greet(_ self: Int32) -> Int32

Tests/BridgeJSRuntimeTests/Generated/ImportTS.swift

@@ -60,17 +60,54 @@ struct JsGreeter {
         self.this = JSObject(id: UInt32(bitPattern: this))
     }
 
-    init(_ name: String) {
+    init(_ name: String, _ prefix: String) {
         @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_JsGreeter_init")
-        func bjs_JsGreeter_init(_ name: Int32) -> Int32
+        func bjs_JsGreeter_init(_ name: Int32, _ prefix: 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)
+        var prefix = prefix
+        let prefixId = prefix.withUTF8 { b in
+            _make_jsstring(b.baseAddress.unsafelyUnwrapped, Int32(b.count))
+        }
+        let ret = bjs_JsGreeter_init(nameId, prefixId)
         self.this = JSObject(id: UInt32(bitPattern: ret))
     }
 
+    var name: String {
+        get {
+            @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_JsGreeter_name_get")
+            func bjs_JsGreeter_name_get(_ self: Int32) -> Int32
+            let ret = bjs_JsGreeter_name_get(Int32(bitPattern: self.this.id))
+            return String(unsafeUninitializedCapacity: Int(ret)) { b in
+                _init_memory_with_result(b.baseAddress.unsafelyUnwrapped, Int32(ret))
+                return Int(ret)
+            }
+        }
+        nonmutating set {
+            @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_JsGreeter_name_set")
+            func bjs_JsGreeter_name_set(_ self: Int32, _ newValue: Int32) -> Void
+            var newValue = newValue
+            let newValueId = newValue.withUTF8 { b in
+                _make_jsstring(b.baseAddress.unsafelyUnwrapped, Int32(b.count))
+            }
+            bjs_JsGreeter_name_set(Int32(bitPattern: self.this.id), newValueId)
+        }
+    }
+
+    var prefix: String {
+        get {
+            @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_JsGreeter_prefix_get")
+            func bjs_JsGreeter_prefix_get(_ self: Int32) -> Int32
+            let ret = bjs_JsGreeter_prefix_get(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 greet() -> String {
         @_extern(wasm, module: "BridgeJSRuntimeTests", name: "bjs_JsGreeter_greet")
         func bjs_JsGreeter_greet(_ self: Int32) -> Int32

Tests/BridgeJSRuntimeTests/Generated/JavaScript/ImportTS.json

@@ -77,6 +77,14 @@
                 "type" : {
                   "string" : {
 
+                  }
+                }
+              },
+              {
+                "name" : "prefix",
+                "type" : {
+                  "string" : {
+
                   }
                 }
               }
@@ -115,7 +123,24 @@
           ],
           "name" : "JsGreeter",
           "properties" : [
+            {
+              "isReadonly" : false,
+              "name" : "name",
+              "type" : {
+                "string" : {
 
+                }
+              }
+            },
+            {
+              "isReadonly" : true,
+              "name" : "prefix",
+              "type" : {
+                "string" : {
+
+                }
+              }
+            }
           ]
         }
       ]

Tests/BridgeJSRuntimeTests/ImportAPITests.swift

@@ -36,9 +36,15 @@ class ImportAPITests: XCTestCase {
     }
 
     func testClass() {
-        let greeter = JsGreeter("Alice")
+        let greeter = JsGreeter("Alice", "Hello")
         XCTAssertEqual(greeter.greet(), "Hello, Alice!")
         greeter.changeName("Bob")
         XCTAssertEqual(greeter.greet(), "Hello, Bob!")
+
+        greeter.name = "Charlie"
+        XCTAssertEqual(greeter.greet(), "Hello, Charlie!")
+        XCTAssertEqual(greeter.name, "Charlie")
+
+        XCTAssertEqual(greeter.prefix, "Hello")
     }
 }

Tests/BridgeJSRuntimeTests/bridge-js.d.ts

@@ -4,7 +4,9 @@ export function jsRoundTripBool(v: boolean): boolean
 export function jsRoundTripString(v: string): string
 
 export class JsGreeter {
-    constructor(name: string);
+    name: string;
+    readonly prefix: string;
+    constructor(name: string, prefix: string);
     greet(): string;
     changeName(name: string): void;
 }

Tests/prelude.mjs

@@ -20,12 +20,16 @@ export async function setupOptions(options, context) {
                 return v;
             },
             JsGreeter: class {
-                /** @param {string} name */
-                constructor(name) {
+                /**
+                 * @param {string} name
+                 * @param {string} prefix
+                 */
+                constructor(name, prefix) {
                     this.name = name;
+                    this.prefix = prefix;
                 }
                 greet() {
-                    return `Hello, ${this.name}!`;
+                    return `${this.prefix}, ${this.name}!`;
                 }
                 /** @param {string} name */
                 changeName(name) {