experimental: possible option 1) for better API for UUID usage through exports and namespaces

Author: krodak

Plugins/BridgeJS/Tests/BridgeJSToolTests/Inputs/Namespaces.swift

@@ -1,6 +1,3 @@
-@JS("__Swift.Foundation.UUID") func create() -> String { UUID().uuidString }
-@JS("__Swift.Foundation.UUID") func validate(uuid: String) -> Bool { true }
-
 @JS func plainFunction() -> String { "plain" }
 
 @JS("__Swift.Foundation") class Greeter {
@@ -26,3 +23,11 @@
         return String(value)
     }
 }
+
+@JS("__Swift.Foundation")
+class UUID {
+    @JS("__Swift.Foundation")
+    @JS func uuidString() -> String {
+         Foundation.UUID().uuidString
+    }
+}

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

@@ -22,13 +22,8 @@ declare global {
                 greet(): string;
                 changeName(name: string): void;
             }
-        }
-    }
-    namespace __Swift {
-        namespace Foundation {
-            namespace UUID {
-                function create(): string;
-                function validate(uuid: string): boolean;
+            class UUID {
+                uuidString(): string;
             }
         }
     }
@@ -48,15 +43,18 @@ export interface Greeter extends SwiftHeapObject {
 export interface Converter extends SwiftHeapObject {
     toString(value: number): string;
 }
+export interface UUID extends SwiftHeapObject {
+    uuidString(): string;
+}
 export type Exports = {
     Greeter: {
         new(name: string): Greeter;
     }
     Converter: {
         new(): Converter;
     }
-    create(): string;
-    validate(uuid: string): boolean;
+    UUID: {
+    }
     plainFunction(): string;
 }
 export type Imports = {

Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/BridgeJSLinkTests/Namespaces.Export.js

@@ -108,22 +108,18 @@ export async function createInstantiator(options, swift) {
                     return ret;
                 }
             }
-            const exports = {
-                Greeter,
-                Converter,
-                create: function bjs_create() {
-                    instance.exports.bjs_create();
+            class UUID extends SwiftHeapObject {
+                uuidString() {
+                    instance.exports.bjs_UUID_uuidString(this.pointer);
                     const ret = tmpRetString;
                     tmpRetString = undefined;
                     return ret;
-                },
-                validate: function bjs_validate(uuid) {
-                    const uuidBytes = textEncoder.encode(uuid);
-                    const uuidId = swift.memory.retain(uuidBytes);
-                    const ret = instance.exports.bjs_validate(uuidId, uuidBytes.length) !== 0;
-                    swift.memory.release(uuidId);
-                    return ret;
-                },
+                }
+            }
+            const exports = {
+                Greeter,
+                Converter,
+                UUID,
                 plainFunction: function bjs_plainFunction() {
                     instance.exports.bjs_plainFunction();
                     const ret = tmpRetString;
@@ -144,13 +140,9 @@ export async function createInstantiator(options, swift) {
             if (typeof globalThis.__Swift.Foundation === 'undefined') {
                 globalThis.__Swift.Foundation = {};
             }
-            if (typeof globalThis.__Swift.Foundation.UUID === 'undefined') {
-                globalThis.__Swift.Foundation.UUID = {};
-            }
             globalThis.__Swift.Foundation.Greeter = exports.Greeter;
             globalThis.Utils.Converters.Converter = exports.Converter;
-            globalThis.__Swift.Foundation.UUID.create = exports.create;
-            globalThis.__Swift.Foundation.UUID.validate = exports.validate;
+            globalThis.__Swift.Foundation.UUID = exports.UUID;
 
             return exports;
         },

Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Namespaces.json

@@ -121,59 +121,38 @@
         "Utils",
         "Converters"
       ]
-    }
-  ],
-  "functions" : [
-    {
-      "abiName" : "bjs_create",
-      "effects" : {
-        "isAsync" : false,
-        "isThrows" : false
-      },
-      "name" : "create",
-      "namespace" : [
-        "__Swift",
-        "Foundation",
-        "UUID"
-      ],
-      "parameters" : [
-
-      ],
-      "returnType" : {
-        "string" : {
-
-        }
-      }
     },
     {
-      "abiName" : "bjs_validate",
-      "effects" : {
-        "isAsync" : false,
-        "isThrows" : false
-      },
-      "name" : "validate",
-      "namespace" : [
-        "__Swift",
-        "Foundation",
-        "UUID"
-      ],
-      "parameters" : [
+      "methods" : [
         {
-          "label" : "uuid",
-          "name" : "uuid",
-          "type" : {
+          "abiName" : "bjs_UUID_uuidString",
+          "effects" : {
+            "isAsync" : false,
+            "isThrows" : false
+          },
+          "name" : "uuidString",
+          "namespace" : [
+            "__Swift",
+            "Foundation"
+          ],
+          "parameters" : [
+
+          ],
+          "returnType" : {
             "string" : {
 
             }
           }
         }
       ],
-      "returnType" : {
-        "bool" : {
-
-        }
-      }
-    },
+      "name" : "UUID",
+      "namespace" : [
+        "__Swift",
+        "Foundation"
+      ]
+    }
+  ],
+  "functions" : [
     {
       "abiName" : "bjs_plainFunction",
       "effects" : {

Plugins/BridgeJS/Tests/BridgeJSToolTests/__Snapshots__/ExportSwiftTests/Namespaces.swift

@@ -6,34 +6,6 @@
 
 @_spi(BridgeJS) import JavaScriptKit
 
-@_expose(wasm, "bjs_create")
-@_cdecl("bjs_create")
-public func _bjs_create() -> Void {
-    #if arch(wasm32)
-    var ret = create()
-    return ret.withUTF8 { ptr in
-        _swift_js_return_string(ptr.baseAddress, Int32(ptr.count))
-    }
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
-}
-
-@_expose(wasm, "bjs_validate")
-@_cdecl("bjs_validate")
-public func _bjs_validate(uuidBytes: Int32, uuidLen: Int32) -> Int32 {
-    #if arch(wasm32)
-    let uuid = String(unsafeUninitializedCapacity: Int(uuidLen)) { b in
-        _swift_js_init_memory(uuidBytes, b.baseAddress.unsafelyUnwrapped)
-        return Int(uuidLen)
-    }
-    let ret = validate(uuid: uuid)
-    return Int32(ret ? 1 : 0)
-    #else
-    fatalError("Only available on WebAssembly")
-    #endif
-}
-
 @_expose(wasm, "bjs_plainFunction")
 @_cdecl("bjs_plainFunction")
 public func _bjs_plainFunction() -> Void {
@@ -123,4 +95,23 @@ public func _bjs_Converter_toString(_self: UnsafeMutableRawPointer, value: Int32
 @_cdecl("bjs_Converter_deinit")
 public func _bjs_Converter_deinit(pointer: UnsafeMutableRawPointer) {
     Unmanaged<Converter>.fromOpaque(pointer).release()
+}
+
+@_expose(wasm, "bjs_UUID_uuidString")
+@_cdecl("bjs_UUID_uuidString")
+public func _bjs_UUID_uuidString(_self: UnsafeMutableRawPointer) -> Void {
+    #if arch(wasm32)
+    var ret = Unmanaged<UUID>.fromOpaque(_self).takeUnretainedValue().uuidString()
+    return ret.withUTF8 { ptr in
+        _swift_js_return_string(ptr.baseAddress, Int32(ptr.count))
+    }
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_UUID_deinit")
+@_cdecl("bjs_UUID_deinit")
+public func _bjs_UUID_deinit(pointer: UnsafeMutableRawPointer) {
+    Unmanaged<UUID>.fromOpaque(pointer).release()
 }