Support Object interpolation

Author: kateinoigakukun

src/swift/Sources/JavaScriptKit/JSValue.swift

@@ -19,6 +19,7 @@ public class JSRef: Equatable {
 public enum JSValue: Equatable {
     case boolean(Bool)
     case string(String)
+    case object(JSRef)
 }
 
 protocol JSValueConvertible {
@@ -48,6 +49,8 @@ public func getJSValue(this: JSRef, name: String) -> JSValue {
         _load_string(payload1 as JavaScriptValueId, buffer)
         let string = String(decodingCString: UnsafePointer(buffer), as: UTF8.self)
         return .string(string)
+    case JavaScriptValueKind_Object:
+        return .object(JSRef(id: payload1))
     default:
         fatalError("unreachable")
     }
@@ -73,6 +76,10 @@ public func setJSValue(this: JSRef, name: String, value: JSValue) {
             )
         }
         return
+    case let .object(ref):
+        kind = JavaScriptValueKind_Object
+        payload1 = ref.id
+        payload2 = 0
     }
     _set_js_value(this.id, name, Int32(name.count), kind, payload1, payload2)
 }

src/web/src/index.ts

@@ -96,6 +96,7 @@ export class SwiftRuntime {
                     return readString(payload1, payload2)
                 }
                 case JavaScriptValueKind.Object: {
+                    return this._heapValues[payload1]
                 }
                 default:
                     throw new Error(`Type kind "${kind}" is not supported`)
@@ -117,6 +118,13 @@ export class SwiftRuntime {
                         payload2: value.length,
                     }
                 }
+                case "object": {
+                    return {
+                        kind: JavaScriptValueKind.Object,
+                        payload1: allocValue(value),
+                        payload2: 0,
+                    }
+                }
                 default:
                     throw new Error(`Type "${typeof value}" is not supported yet`)
             }

test/JavaScriptKitExec/Sources/JavaScriptKitExec/main.swift

@@ -1,13 +1,36 @@
 import JavaScriptKit
 
-func expectEqual<T: Equatable>(_ lhs: T, _ rhs: T) {
+struct MessageError: Error {
+    let message: String
+    init(_ message: String) {
+        self.message = message
+    }
+}
+
+func expectEqual<T: Equatable>(_ lhs: T, _ rhs: T) throws {
     if lhs != rhs {
-        print("[ERROR] Expect to be equal \"\(lhs)\" and \"\(rhs)\"")
+        throw MessageError("Expect to be equal \"\(lhs)\" and \"\(rhs)\"")
+    }
+}
+
+func expectObject(_ value: JSValue) throws -> JSRef {
+    switch value {
+    case .object(let ref): return ref
+    default:
+        throw MessageError("Type of \(value) should be \"object\"")
     }
 }
 
-let global = JSRef.global()
-do {
+func expectBoolean(_ value: JSValue) throws -> Bool {
+    switch value {
+    case .boolean(let bool): return bool
+    default:
+        throw MessageError("Type of \(value) should be \"boolean\"")
+    }
+}
+
+Literal_Conversion: do {
+    let global = JSRef.global()
     let inputs: [JSValue] = [
         .boolean(true),
         .boolean(false),
@@ -17,6 +40,31 @@ do {
         let prop = "prop_\(index)"
         setJSValue(this: global, name: prop, value: input)
         let got = getJSValue(this: global, name: prop)
-        expectEqual(input, got)
+        try expectEqual(input, got)
     }
+} catch {
+    print(error)
+}
+
+Object_Conversion: do {
+    // Notes: globalObject1 is defined in JavaScript environment
+    //
+    // ```js
+    // global.globalObject1 = {
+    //   "prop_1": {
+    //     "nested_prop": 1,
+    //   },
+    //   "prop_2": 2,
+    //   "prop_3": true,
+    // }
+    // ```
+    //
+
+    let globalObject1 = getJSValue(this: .global(), name: "globalObject1")
+    let globalObject1Ref = try expectObject(globalObject1)
+    _ = try expectObject(getJSValue(this: globalObject1Ref, name: "prop_1"))
+    let prop_3 = getJSValue(this: globalObject1Ref, name: "prop_3")
+    try expectEqual(prop_3, .boolean(true))
+} catch {
+    print(error)
 }

test/index.js

@@ -18,6 +18,14 @@ let wasi = new WASI({
   }
 });
 
+global.globalObject1 = {
+  "prop_1": {
+    "nested_prop": 1,
+  },
+  "prop_2": 2,
+  "prop_3": true,
+}
+
 const startWasiTask = async () => {
   // Fetch our Wasm File
   const wasmBinary = await readFile("./dist/JavaScriptKitExec.wasm");