Merge pull request #446 from swiftwasm/yt/unify-js-function-object

Unify JSFunction with JSObject

Author: kateinoigakukun

Examples/ActorOnWebWorker/Sources/MyApp.swift

@@ -30,7 +30,7 @@ actor SearchService {
 
     // Utility function for fetch
     func fetch(_ url: String) -> JSPromise {
-        let jsFetch = JSObject.global.fetch.function!
+        let jsFetch = JSObject.global.fetch.object!
         return JSPromise(jsFetch(url).object!)!
     }
 
@@ -117,7 +117,7 @@ struct SearchResult {
 @MainActor
 final class App {
     private let document = JSObject.global.document
-    private let alert = JSObject.global.alert.function!
+    private let alert = JSObject.global.alert.object!
 
     // UI elements
     private let container: JSValue

Examples/Basic/Sources/main.swift

@@ -1,7 +1,7 @@
 import JavaScriptEventLoop
 import JavaScriptKit
 
-let alert = JSObject.global.alert.function!
+let alert = JSObject.global.alert.object!
 let document = JSObject.global.document
 
 let divElement = document.createElement("div")
@@ -19,7 +19,7 @@ buttonElement.onclick = .object(
 
 _ = document.body.appendChild(buttonElement)
 
-private let jsFetch = JSObject.global.fetch.function!
+private let jsFetch = JSObject.global.fetch.object!
 func fetch(_ url: String) -> JSPromise {
     JSPromise(jsFetch(url).object!)!
 }

Examples/Embedded/Sources/EmbeddedApp/main.swift

@@ -1,6 +1,6 @@
 import JavaScriptKit
 
-let alert = JSObject.global.alert.function!
+let alert = JSObject.global.alert.object!
 let document = JSObject.global.document
 
 print("Hello from WASM, document title: \(document.title.string ?? "")")
@@ -28,8 +28,8 @@ textInputElement.type = "text"
 textInputElement.placeholder = "Enter text to encode to UTF-8"
 textInputElement.oninput = JSValue.object(
     JSClosure { _ in
-        let textEncoder = JSObject.global.TextEncoder.function!.new()
-        let encode = textEncoder.encode.function!
+        let textEncoder = JSObject.global.TextEncoder.object!.new()
+        let encode = textEncoder.encode.object!
         let encodedData = JSTypedArray<UInt8>(
             unsafelyWrapping: encode(this: textEncoder, textInputElement.value).object!
         )

Plugins/PackageToJS/Templates/runtime.mjs

@@ -34,7 +34,6 @@ const decode = (kind, payload1, payload2, objectSpace) => {
             return payload2;
         case 1 /* Kind.String */:
         case 3 /* Kind.Object */:
-        case 6 /* Kind.Function */:
         case 7 /* Kind.Symbol */:
         case 8 /* Kind.BigInt */:
             return objectSpace.getObject(payload1);
@@ -100,7 +99,7 @@ const writeAndReturnKindBits = (value, payload1_ptr, payload2_ptr, is_exception,
             return writeRef(3 /* Kind.Object */);
         }
         case "function": {
-            return writeRef(6 /* Kind.Function */);
+            return writeRef(3 /* Kind.Object */);
         }
         case "symbol": {
             return writeRef(7 /* Kind.Symbol */);

Runtime/src/js-value.ts

@@ -8,7 +8,6 @@ export const enum Kind {
     Object = 3,
     Null = 4,
     Undefined = 5,
-    Function = 6,
     Symbol = 7,
     BigInt = 8,
 }
@@ -32,7 +31,6 @@ export const decode = (
 
         case Kind.String:
         case Kind.Object:
-        case Kind.Function:
         case Kind.Symbol:
         case Kind.BigInt:
             return objectSpace.getObject(payload1);
@@ -129,7 +127,7 @@ export const writeAndReturnKindBits = (
             return writeRef(Kind.Object);
         }
         case "function": {
-            return writeRef(Kind.Function);
+            return writeRef(Kind.Object);
         }
         case "symbol": {
             return writeRef(Kind.Symbol);

Sources/JavaScriptBigIntSupport/Int64+I64.swift

@@ -1,13 +1,13 @@
 import JavaScriptKit
 
 extension UInt64: JavaScriptKit.ConvertibleToJSValue, JavaScriptKit.TypedArrayElement {
-    public static var typedArrayClass: JSFunction { JSObject.global.BigUint64Array.function! }
+    public static var typedArrayClass: JSObject { JSObject.global.BigUint64Array.object! }
 
     public var jsValue: JSValue { .bigInt(JSBigInt(unsigned: self)) }
 }
 
 extension Int64: JavaScriptKit.ConvertibleToJSValue, JavaScriptKit.TypedArrayElement {
-    public static var typedArrayClass: JSFunction { JSObject.global.BigInt64Array.function! }
+    public static var typedArrayClass: JSObject { JSObject.global.BigInt64Array.object! }
 
     public var jsValue: JSValue { .bigInt(JSBigInt(self)) }
 }

Sources/JavaScriptEventLoop/JSSending.swift

@@ -23,7 +23,7 @@ import Synchronization
 ///
 /// ```swift
 /// // Transfer an object to another thread
-/// let buffer = JSObject.global.Uint8Array.function!.new(100).buffer.object!
+/// let buffer = JSObject.global.Uint8Array.object!.new(100).buffer.object!
 /// let transferring = JSSending.transfer(buffer)
 ///
 /// // Receive the object on a worker thread
@@ -34,7 +34,7 @@ import Synchronization
 /// }
 ///
 /// // Clone an object for use in another thread
-/// let object = JSObject.global.Object.function!.new()
+/// let object = JSObject.global.Object.object!.new()
 /// object["test"] = "Hello, World!"
 /// let cloning = JSSending(object)
 ///
@@ -136,7 +136,7 @@ extension JSSending where T == JSObject {
     /// ## Example
     ///
     /// ```swift
-    /// let buffer = JSObject.global.Uint8Array.function!.new(100).buffer.object!
+    /// let buffer = JSObject.global.Uint8Array.object!.new(100).buffer.object!
     /// let transferring = JSSending.transfer(buffer)
     ///
     /// // After transfer, the original buffer is neutered
@@ -167,7 +167,7 @@ extension JSSending where T == JSObject {
     /// ## Example
     ///
     /// ```swift
-    /// let object = JSObject.global.Object.function!.new()
+    /// let object = JSObject.global.Object.object!.new()
     /// object["test"] = "Hello, World!"
     /// let cloning = JSSending(object)
     ///
@@ -212,7 +212,7 @@ extension JSSending {
     /// ## Example - Cloning
     ///
     /// ```swift
-    /// let data = JSObject.global.Object.function!.new()
+    /// let data = JSObject.global.Object.object!.new()
     /// data["value"] = 42
     /// let cloning = JSSending(data)
     ///

Sources/JavaScriptEventLoop/JavaScriptEventLoop.swift

@@ -82,7 +82,7 @@ public final class JavaScriptEventLoop: SerialExecutor, @unchecked Sendable {
         let promise = JSPromise(resolver: { resolver -> Void in
             resolver(.success(.undefined))
         })
-        let setTimeout = JSObject.global.setTimeout.function!
+        let setTimeout = JSObject.global.setTimeout.object!
         let eventLoop = JavaScriptEventLoop(
             queueTask: { job in
                 // TODO(katei): Should prefer `queueMicrotask` if available?

Sources/JavaScriptEventLoop/WebWorkerTaskExecutor.swift

@@ -34,7 +34,7 @@ import WASILibc
 ///
 /// ```swift
 /// // Create and transfer an object to a worker thread
-/// let buffer = JSObject.global.ArrayBuffer.function!.new(1024).object!
+/// let buffer = JSObject.global.ArrayBuffer.object!.new(1024).object!
 /// let transferring = JSSending.transfer(buffer)
 ///
 /// let task = Task(executorPreference: executor) {

Sources/JavaScriptKit/BasicObjects/JSArray.swift

@@ -2,8 +2,8 @@
 /// class](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)
 /// that exposes its properties in a type-safe and Swifty way.
 public class JSArray: JSBridgedClass {
-    public static var constructor: JSFunction? { _constructor.wrappedValue }
-    private static let _constructor = LazyThreadLocal(initialize: { JSObject.global.Array.function })
+    public static var constructor: JSObject? { _constructor.wrappedValue }
+    private static let _constructor = LazyThreadLocal(initialize: { JSObject.global.Array.object })
 
     static func isArray(_ object: JSObject) -> Bool {
         constructor!.isArray!(object).boolean!