Merge pull request #693 from PassiveLogic/kr/fix-declare-global-class-stubs

BridgeJS: Include properties and release() in declare global class stubs

Author: krodak

Plugins/BridgeJS/Sources/BridgeJSLink/BridgeJSLink.swift

@@ -2948,6 +2948,16 @@ extension BridgeJSLink {
                                         "\(method.name)\(renderTSSignatureCallback(method.parameters, method.returnType, method.effects));"
                                     printer.write(methodSignature)
                                 }
+
+                                let sortedProperties = klass.properties.filter { !$0.isStatic }.sorted {
+                                    $0.name < $1.name
+                                }
+                                for property in sortedProperties {
+                                    let readonly = property.isReadonly ? "readonly " : ""
+                                    printer.write("\(readonly)\(property.name): \(property.type.tsType);")
+                                }
+
+                                printer.write("release(): void;")
                             }
                             printer.write("}")
                         }

Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/EnumNamespace.Global.d.ts

@@ -34,13 +34,15 @@ declare global {
         class Converter {
             constructor();
             format(value: number): string;
+            release(): void;
         }
     }
     namespace Networking {
         namespace API {
             class HTTPServer {
                 constructor();
                 call(method: Networking.API.MethodTag): void;
+                release(): void;
             }
             const MethodValues: {
                 readonly Get: 0;
@@ -55,6 +57,7 @@ declare global {
                 class TestServer {
                     constructor();
                     call(method: Networking.APIV2.Internal.SupportedMethodTag): void;
+                    release(): void;
                 }
                 const SupportedMethodValues: {
                     readonly Get: 0;
@@ -77,6 +80,8 @@ declare global {
         class Converter {
             constructor();
             toString(value: number): string;
+            precision: number;
+            release(): void;
         }
     }
 }

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

@@ -11,6 +11,7 @@ declare global {
         class GlobalClass {
             constructor();
             greet(): string;
+            release(): void;
         }
         function globalFunction(): string;
     }

Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Global.d.ts

@@ -12,6 +12,7 @@ declare global {
             constructor();
             addItem(item: Greeter): void;
             getItems(): Greeter[];
+            release(): void;
         }
     }
     namespace MyModule {
@@ -24,6 +25,7 @@ declare global {
             class Converter {
                 constructor();
                 toString(value: number): string;
+                release(): void;
             }
         }
     }
@@ -32,9 +34,11 @@ declare global {
             class Greeter {
                 constructor(name: string);
                 greet(): string;
+                release(): void;
             }
             class UUID {
                 uuidString(): string;
+                release(): void;
             }
         }
     }

Tests/BridgeJSGlobalTests/Generated/BridgeJS.swift

@@ -296,6 +296,27 @@ public func _bjs_GlobalUtils_PublicConverter_toString(_ _self: UnsafeMutableRawP
     #endif
 }
 
+@_expose(wasm, "bjs_GlobalUtils_PublicConverter_precision_get")
+@_cdecl("bjs_GlobalUtils_PublicConverter_precision_get")
+public func _bjs_GlobalUtils_PublicConverter_precision_get(_ _self: UnsafeMutableRawPointer) -> Int32 {
+    #if arch(wasm32)
+    let ret = GlobalUtils.PublicConverter.bridgeJSLiftParameter(_self).precision
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_GlobalUtils_PublicConverter_precision_set")
+@_cdecl("bjs_GlobalUtils_PublicConverter_precision_set")
+public func _bjs_GlobalUtils_PublicConverter_precision_set(_ _self: UnsafeMutableRawPointer, _ value: Int32) -> Void {
+    #if arch(wasm32)
+    GlobalUtils.PublicConverter.bridgeJSLiftParameter(_self).precision = Int.bridgeJSLiftParameter(value)
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
 @_expose(wasm, "bjs_GlobalUtils_PublicConverter_deinit")
 @_cdecl("bjs_GlobalUtils_PublicConverter_deinit")
 public func _bjs_GlobalUtils_PublicConverter_deinit(_ pointer: UnsafeMutableRawPointer) -> Void {

Tests/BridgeJSGlobalTests/Generated/JavaScript/BridgeJS.json

@@ -156,7 +156,19 @@
           "GlobalUtils"
         ],
         "properties" : [
+          {
+            "isReadonly" : false,
+            "isStatic" : false,
+            "name" : "precision",
+            "namespace" : [
+              "GlobalUtils"
+            ],
+            "type" : {
+              "int" : {
 
+              }
+            }
+          }
         ],
         "swiftCallName" : "GlobalUtils.PublicConverter"
       }

Tests/BridgeJSGlobalTests/GlobalAPITests.swift

@@ -63,6 +63,8 @@ enum Internal {
 
 @JS enum GlobalUtils {
     @JS class PublicConverter {
+        @JS var precision: Int = 2
+
         @JS init() {}
 
         @JS func toString(value: Int) -> String {

Tests/prelude.mjs

@@ -1010,6 +1010,9 @@ function BridgeJSGlobalTests_runJsWorksGlobal() {
 
     const globalConverter = new globalThis.GlobalUtils.PublicConverter();
     assert.equal(globalConverter.toString(99), "99");
+    assert.equal(globalConverter.precision, 2);
+    globalConverter.precision = 5;
+    assert.equal(globalConverter.precision, 5);
     globalConverter.release();
 
     const globalHttpServer = new globalThis.GlobalNetworking.API.TestHTTPServer();