Support null and undefined interpolation

Author: kateinoigakukun

src/swift/Sources/JavaScriptKit/JSValue.swift

@@ -21,6 +21,8 @@ public enum JSValue: Equatable {
     case string(String)
     case number(Int32)
     case object(JSObjectRef)
+    case null
+    case undefined
 }
 
 protocol JSValueConvertible {
@@ -60,6 +62,10 @@ extension RawJSValue: JSValueConvertible {
             return .string(string)
         case JavaScriptValueKind_Object:
             return .object(JSObjectRef(id: payload1))
+        case JavaScriptValueKind_Null:
+            return .null
+        case JavaScriptValueKind_Undefined:
+            return .undefined
         default:
             fatalError("unreachable")
         }
@@ -91,6 +97,14 @@ extension JSValue {
             kind = JavaScriptValueKind_Object
             payload1 = ref.id
             payload2 = 0
+        case .null:
+            kind = JavaScriptValueKind_Null
+            payload1 = 0
+            payload2 = 0
+        case .undefined:
+            kind = JavaScriptValueKind_Undefined
+            payload1 = 0
+            payload2 = 0
         }
         let rawValue = RawJSValue(kind: kind, payload1: payload1, payload2: payload2)
         return body(rawValue)

src/swift/Sources/_CJavaScriptKit/include/_CJavaScriptKit.h

@@ -6,13 +6,14 @@
 typedef unsigned int JavaScriptValueId;
 
 typedef enum {
-    JavaScriptValueKind_Invalid  = -1,
-    JavaScriptValueKind_Boolean  = 0,
-    JavaScriptValueKind_String   = 1,
-    JavaScriptValueKind_Number   = 2,
-    JavaScriptValueKind_Object   = 3,
-    JavaScriptValueKind_Null     = 4,
-    JavaScriptValueKind_Function = 5,
+    JavaScriptValueKind_Invalid   = -1,
+    JavaScriptValueKind_Boolean   = 0,
+    JavaScriptValueKind_String    = 1,
+    JavaScriptValueKind_Number    = 2,
+    JavaScriptValueKind_Object    = 3,
+    JavaScriptValueKind_Null      = 4,
+    JavaScriptValueKind_Undefined = 5,
+    JavaScriptValueKind_Function  = 6,
 } JavaScriptValueKind;
 
 typedef unsigned JavaScriptPayload;

src/web/src/index.ts

@@ -16,8 +16,8 @@ enum JavaScriptValueKind {
     String = 1,
     Number = 2,
     Object = 3,
-    Array = 4,
-    Null = 5,
+    Null = 4,
+    Undefined = 5,
     Function = 6,
 }
 
@@ -101,12 +101,25 @@ export class SwiftRuntime {
                 case JavaScriptValueKind.Object: {
                     return this._heapValues[payload1]
                 }
+                case JavaScriptValueKind.Null: {
+                    return null
+                }
+                case JavaScriptValueKind.Undefined: {
+                    return undefined
+                }
                 default:
                     throw new Error(`Type kind "${kind}" is not supported`)
             }
         }
 
         const encodeValue = (value: any) => {
+            if (value === null) {
+                return {
+                    kind: JavaScriptValueKind.Null,
+                    payload1: 0,
+                    payload2: 0,
+                }
+            }
             switch (typeof value) {
                 case "boolean": {
                     return {
@@ -129,6 +142,13 @@ export class SwiftRuntime {
                         payload2: value.length,
                     }
                 }
+                case "undefined": {
+                    return {
+                        kind: JavaScriptValueKind.Undefined,
+                        payload1: 0,
+                        payload2: 0,
+                    }
+                }
                 case "object": {
                     return {
                         kind: JavaScriptValueKind.Object,

test/JavaScriptKitExec/Sources/JavaScriptKitExec/main.swift

@@ -9,12 +9,14 @@ Literal_Conversion: do {
         .number(0),
         .number(.max),
         .number(.min),
+        .null,
+        .undefined,
     ]
     for (index, input) in inputs.enumerated() {
         let prop = "prop_\(index)"
         setJSValue(this: global, name: prop, value: input)
         let got = getJSValue(this: global, name: prop)
-        try expectEqual(input, got)
+        try expectEqual(got, input)
     }
 } catch {
     print(error)