Updated from kateinoigakukun/JavaScriptKit

Sources/JavaScriptKit/JS Types/JSPromise.swift

@@ -29,7 +29,7 @@ public final class JSPromise<Success>: JSType where Success: JSValueConvertible,
      - parameter executor: A function to be executed by the Promise.  The executor is custom code that ties an outcome to a promise. You, the programmer, write the executor.
      */
     public init(executor block: @escaping ((Success) -> (), (JSError) -> ()) -> ()) {
-        let executor = JSFunctionRef.from { (arguments) in
+        let executor = JSClosure { (arguments) in
             let resolutionFunc = arguments[0].function
             let rejectionFunc = arguments[1].function
             block({ resolutionFunc?($0.jsValue()) }, { rejectionFunc?($0.jsValue()) })
@@ -96,7 +96,7 @@ public final class JSPromise<Success>: JSType where Success: JSValueConvertible,
         guard let function = jsObject.then.function
             else { fatalError("Invalid function \(#function)") }
 
-        let success = JSFunctionRef.from { (arguments) in
+        let success = JSClosure { (arguments) in
             if let value = arguments.first.flatMap({ Success.construct(from: $0) }) {
                 return onFulfilled(value)
             } else {
@@ -105,7 +105,7 @@ public final class JSPromise<Success>: JSType where Success: JSValueConvertible,
             }
         }
 
-        let errorFunction = JSFunctionRef.from { (arguments) in
+        let errorFunction = JSClosure { (arguments) in
             if let value = arguments.first.flatMap({ JSError.construct(from: $0) }) {
                 onRejected(value)
             } else {
@@ -123,7 +123,7 @@ public final class JSPromise<Success>: JSType where Success: JSValueConvertible,
         guard let function = jsObject.then.function
             else { fatalError("Invalid function \(#function)") }
 
-        let success = JSFunctionRef.from { (arguments) in
+        let success = JSClosure { (arguments) in
             if let value = arguments.first.flatMap({ Success.construct(from: $0) }) {
                 return onFulfilled(value)
             } else {
@@ -248,7 +248,7 @@ public final class JSPromise<Success>: JSType where Success: JSValueConvertible,
     public func `catch`(_ completion: @escaping (JSError) -> ()) {
         guard let function = jsObject.catch.function
             else { fatalError("Invalid function \(#function)") }
-        let errorFunction = JSFunctionRef.from { (arguments) in
+        let errorFunction = JSClosure { (arguments) in
             if let value = arguments.first.flatMap({ JSError.construct(from: $0) }) {
                 completion(value)
             } else {

Sources/JavaScriptKit/JSFunctionRef.swift

@@ -56,9 +56,8 @@ public class JSFunctionRef: JSObjectRef {
             }
         }
     }
-
-    static var sharedFunctions: [([JSValue]) -> JSValue] = []
 
+    @available(*, unavailable, message: "Please use JSClosure instead")
     public static func from(_ body: @escaping ([JSValue]) -> JSValue) -> JSFunctionRef {
         fatalError("unavailable")
     }
@@ -70,7 +69,29 @@ public class JSFunctionRef: JSObjectRef {
     }
 }
 
-// MARK: - C Functions
+public class JSClosure: JSFunctionRef {
+
+    static var sharedFunctions: [JavaScriptHostFuncRef: ([JSValue]) -> JSValue] = [:]
+
+    private var hostFuncRef: JavaScriptHostFuncRef = 0
+
+    public init(_ body: @escaping ([JSValue]) -> JSValue) {
+        super.init(id: 0)
+        let objectId = ObjectIdentifier(self)
+        let funcRef = JavaScriptHostFuncRef(bitPattern: Int32(objectId.hashValue))
+        Self.sharedFunctions[funcRef] = body
+
+        var objectRef: JavaScriptObjectRef = 0
+        _create_function(funcRef, &objectRef)
+
+        self.hostFuncRef = funcRef
+        self.id = objectRef
+    }
+
+    public func release() {
+        Self.sharedFunctions[hostFuncRef] = nil
+    }
+}
 
 @_cdecl("swjs_prepare_host_function_call")
 internal func _prepare_host_function_call(_ argc: Int32) -> UnsafeMutableRawPointer {

Sources/JavaScriptKit/JSObjectRef.swift

@@ -7,7 +7,7 @@ public class JSObjectRef {
 
     // MARK: - Properties
 
-    public let id: ID
+    public internal(set) var id: ID
 
     // MARK: - Initialization