BridgeJS: Fixed support for UnsafePointer<T> and UnsafeMutablePointer<T>

Author: krodak

Sources/JavaScriptKit/BridgeJSIntrinsics.swift

@@ -901,7 +901,7 @@ extension OpaquePointer: _BridgedSwiftStackType {
     }
 }
 
-extension UnsafePointer {
+extension UnsafePointer: _BridgedSwiftStackType {
     // MARK: ImportTS
     @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> UnsafeMutableRawPointer {
         UnsafeMutableRawPointer(mutating: UnsafeRawPointer(self))
@@ -933,7 +933,7 @@ extension UnsafePointer {
     }
 }
 
-extension UnsafeMutablePointer {
+extension UnsafeMutablePointer: _BridgedSwiftStackType {
     // MARK: ImportTS
     @_spi(BridgeJS) @_transparent public consuming func bridgeJSLowerParameter() -> UnsafeMutableRawPointer {
         UnsafeMutableRawPointer(self)

Tests/BridgeJSRuntimeTests/ExportAPITests.swift

@@ -1407,6 +1407,12 @@ enum APIOptionalResult {
 @JS func roundTripOpaquePointerArray(_ values: [OpaquePointer]) -> [OpaquePointer] {
     return values
 }
+@JS func roundTripUnsafePointerArray(_ values: [UnsafePointer<UInt8>]) -> [UnsafePointer<UInt8>] {
+    return values
+}
+@JS func roundTripUnsafeMutablePointerArray(_ values: [UnsafeMutablePointer<UInt8>]) -> [UnsafeMutablePointer<UInt8>] {
+    return values
+}
 
 @JS func consumeDataProcessorArrayType(_ processors: [DataProcessor]) -> Int {
     return processors.count

Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift

@@ -4990,6 +4990,28 @@ public func _bjs_roundTripOpaquePointerArray() -> Void {
     #endif
 }
 
+@_expose(wasm, "bjs_roundTripUnsafePointerArray")
+@_cdecl("bjs_roundTripUnsafePointerArray")
+public func _bjs_roundTripUnsafePointerArray() -> Void {
+    #if arch(wasm32)
+    let ret = roundTripUnsafePointerArray(_: [UnsafePointer<UInt8>].bridgeJSLiftParameter())
+    ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_roundTripUnsafeMutablePointerArray")
+@_cdecl("bjs_roundTripUnsafeMutablePointerArray")
+public func _bjs_roundTripUnsafeMutablePointerArray() -> Void {
+    #if arch(wasm32)
+    let ret = roundTripUnsafeMutablePointerArray(_: [UnsafeMutablePointer<UInt8>].bridgeJSLiftParameter())
+    ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
 @_expose(wasm, "bjs_consumeDataProcessorArrayType")
 @_cdecl("bjs_consumeDataProcessorArrayType")
 public func _bjs_consumeDataProcessorArrayType() -> Int32 {

Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json

@@ -9137,6 +9137,84 @@
           }
         }
       },
+      {
+        "abiName" : "bjs_roundTripUnsafePointerArray",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "roundTripUnsafePointerArray",
+        "parameters" : [
+          {
+            "label" : "_",
+            "name" : "values",
+            "type" : {
+              "array" : {
+                "_0" : {
+                  "unsafePointer" : {
+                    "_0" : {
+                      "kind" : "unsafePointer",
+                      "pointee" : "UInt8"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        ],
+        "returnType" : {
+          "array" : {
+            "_0" : {
+              "unsafePointer" : {
+                "_0" : {
+                  "kind" : "unsafePointer",
+                  "pointee" : "UInt8"
+                }
+              }
+            }
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_roundTripUnsafeMutablePointerArray",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "roundTripUnsafeMutablePointerArray",
+        "parameters" : [
+          {
+            "label" : "_",
+            "name" : "values",
+            "type" : {
+              "array" : {
+                "_0" : {
+                  "unsafePointer" : {
+                    "_0" : {
+                      "kind" : "unsafeMutablePointer",
+                      "pointee" : "UInt8"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        ],
+        "returnType" : {
+          "array" : {
+            "_0" : {
+              "unsafePointer" : {
+                "_0" : {
+                  "kind" : "unsafeMutablePointer",
+                  "pointee" : "UInt8"
+                }
+              }
+            }
+          }
+        }
+      },
       {
         "abiName" : "bjs_consumeDataProcessorArrayType",
         "effects" : {

Tests/prelude.mjs

@@ -1385,6 +1385,8 @@ function testArraySupport(exports) {
     assert.deepEqual(exports.roundTripUnsafeRawPointerArray(pointerValues), pointerValues);
     assert.deepEqual(exports.roundTripUnsafeMutableRawPointerArray(pointerValues), pointerValues);
     assert.deepEqual(exports.roundTripOpaquePointerArray(pointerValues), pointerValues);
+    assert.deepEqual(exports.roundTripUnsafePointerArray(pointerValues), pointerValues);
+    assert.deepEqual(exports.roundTripUnsafeMutablePointerArray(pointerValues), pointerValues);
     assert.deepEqual(exports.roundTripUnsafeRawPointerArray([]), []);
 
     // Default values