Fix optional dictionary bridging and add JSValue dictionary support

Author: kateinoigakukun

Plugins/BridgeJS/Sources/BridgeJSLink/JSGlueGen.swift

@@ -968,6 +968,23 @@ struct IntrinsicJSFragment: Sendable {
                         printer.write("\(resultVar) = \(absenceLiteral);")
                     }
                     printer.write("}")
+                case .dictionary(let valueType):
+                    let isSomeVar = scope.variable("isSome")
+                    printer.write("const \(isSomeVar) = \(JSGlueVariableScope.reservedTmpRetInts).pop();")
+                    printer.write("let \(resultVar);")
+                    printer.write("if (\(isSomeVar)) {")
+                    printer.indent {
+                        let dictLiftFragment = try! dictionaryLift(valueType: valueType)
+                        let liftResults = dictLiftFragment.printCode([], scope, printer, cleanupCode)
+                        if let liftResult = liftResults.first {
+                            printer.write("\(resultVar) = \(liftResult);")
+                        }
+                    }
+                    printer.write("} else {")
+                    printer.indent {
+                        printer.write("\(resultVar) = \(absenceLiteral);")
+                    }
+                    printer.write("}")
                 case .jsValue:
                     let isSomeVar = scope.variable("isSome")
                     printer.write("const \(isSomeVar) = \(JSGlueVariableScope.reservedTmpRetInts).pop();")

Sources/JavaScriptKit/BridgeJSIntrinsics.swift

@@ -2399,6 +2399,27 @@ extension Optional where Wrapped: _BridgedSwiftDictionaryStackType {
         }
     }
 
+    @_spi(BridgeJS) public consuming func bridgeJSLowerReturn() {
+        switch consume self {
+        case .none:
+            _swift_js_push_i32(0)
+        case .some(let dict):
+            dict.bridgeJSLowerReturn()
+            _swift_js_push_i32(1)
+        }
+    }
+
+    @_spi(BridgeJS) public static func bridgeJSLiftParameter(_ isSome: Int32) -> [String: Wrapped.DictionaryValue]? {
+        if isSome == 0 {
+            return nil
+        }
+        return Dictionary<String, Wrapped.DictionaryValue>.bridgeJSLiftParameter()
+    }
+
+    @_spi(BridgeJS) public static func bridgeJSLiftParameter() -> [String: Wrapped.DictionaryValue]? {
+        bridgeJSLiftParameter(_swift_js_pop_i32())
+    }
+
     @_spi(BridgeJS) public static func bridgeJSLiftReturn() -> [String: Wrapped.DictionaryValue]? {
         let isSome = _swift_js_pop_i32()
         if isSome == 0 {

Tests/BridgeJSRuntimeTests/ExportAPITests.swift

@@ -52,6 +52,14 @@ func runJsWorks() -> Void
     return v
 }
 
+@JS func roundTripDictionaryExport(v: [String: Int]) -> [String: Int] {
+    return v
+}
+
+@JS func roundTripOptionalDictionaryExport(v: [String: String]?) -> [String: String]? {
+    return v
+}
+
 @JS func roundTripJSValue(v: JSValue) -> JSValue {
     return v
 }

Tests/BridgeJSRuntimeTests/Generated/BridgeJS.swift

@@ -3810,6 +3810,28 @@ public func _bjs_roundTripJSObject(_ v: Int32) -> Int32 {
     #endif
 }
 
+@_expose(wasm, "bjs_roundTripDictionaryExport")
+@_cdecl("bjs_roundTripDictionaryExport")
+public func _bjs_roundTripDictionaryExport() -> Void {
+    #if arch(wasm32)
+    let ret = roundTripDictionaryExport(v: [String: Int].bridgeJSLiftParameter())
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
+@_expose(wasm, "bjs_roundTripOptionalDictionaryExport")
+@_cdecl("bjs_roundTripOptionalDictionaryExport")
+public func _bjs_roundTripOptionalDictionaryExport(_ v: Int32) -> Void {
+    #if arch(wasm32)
+    let ret = roundTripOptionalDictionaryExport(v: Optional<[String: String]>.bridgeJSLiftParameter(v))
+    return ret.bridgeJSLowerReturn()
+    #else
+    fatalError("Only available on WebAssembly")
+    #endif
+}
+
 @_expose(wasm, "bjs_roundTripJSValue")
 @_cdecl("bjs_roundTripJSValue")
 public func _bjs_roundTripJSValue(_ vKind: Int32, _ vPayload1: Int32, _ vPayload2: Float64) -> Void {

Tests/BridgeJSRuntimeTests/Generated/JavaScript/BridgeJS.json

@@ -5577,6 +5577,82 @@
           }
         }
       },
+      {
+        "abiName" : "bjs_roundTripDictionaryExport",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "roundTripDictionaryExport",
+        "parameters" : [
+          {
+            "label" : "v",
+            "name" : "v",
+            "type" : {
+              "dictionary" : {
+                "_0" : {
+                  "int" : {
+
+                  }
+                }
+              }
+            }
+          }
+        ],
+        "returnType" : {
+          "dictionary" : {
+            "_0" : {
+              "int" : {
+
+              }
+            }
+          }
+        }
+      },
+      {
+        "abiName" : "bjs_roundTripOptionalDictionaryExport",
+        "effects" : {
+          "isAsync" : false,
+          "isStatic" : false,
+          "isThrows" : false
+        },
+        "name" : "roundTripOptionalDictionaryExport",
+        "parameters" : [
+          {
+            "label" : "v",
+            "name" : "v",
+            "type" : {
+              "nullable" : {
+                "_0" : {
+                  "dictionary" : {
+                    "_0" : {
+                      "string" : {
+
+                      }
+                    }
+                  }
+                },
+                "_1" : "null"
+              }
+            }
+          }
+        ],
+        "returnType" : {
+          "nullable" : {
+            "_0" : {
+              "dictionary" : {
+                "_0" : {
+                  "string" : {
+
+                  }
+                }
+              }
+            },
+            "_1" : "null"
+          }
+        }
+      },
       {
         "abiName" : "bjs_roundTripJSValue",
         "effects" : {

Tests/prelude.mjs

@@ -291,6 +291,11 @@ function BridgeJSRuntimeTests_runJsWorks(instance, exports) {
     ]) {
         assert.equal(exports.roundTripString(v), v);
     }
+    const dict = { a: 1, b: 2 };
+    assert.deepEqual(exports.roundTripDictionaryExport(dict), dict);
+    const optDict = { hello: "world" };
+    assert.deepEqual(exports.roundTripOptionalDictionaryExport(optDict), optDict);
+    assert.equal(exports.roundTripOptionalDictionaryExport(null), null);
     const arrayStruct = { ints: [1, 2, 3], optStrings: ["a", "b"] };
     const arrayStructRoundTrip = exports.roundTripArrayMembers(arrayStruct);
     assert.deepEqual(arrayStructRoundTrip.ints, [1, 2, 3]);