Updated from kateinoigakukun/JavaScriptKit

Author: colemancda

.github/workflows/test.yml

@@ -8,7 +8,7 @@ jobs:
         os: [macOS-10.15]
         include:
           - os: macOS-10.15
-            toolchain: https://github.com/swiftwasm/swift/releases/download/swift-wasm-DEVELOPMENT-SNAPSHOT-2020-05-10-a/swift-wasm-DEVELOPMENT-SNAPSHOT-2020-05-10-a-osx.tar.gz
+            toolchain: https://github.com/swiftwasm/swift/releases/download/swift-wasm-DEVELOPMENT-SNAPSHOT-2020-06-03-a/swift-wasm-DEVELOPMENT-SNAPSHOT-2020-06-03-a-osx.tar.gz
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout

.swift-version

@@ -1 +1 @@
-wasm-DEVELOPMENT-SNAPSHOT-2020-05-10-a
+wasm-DEVELOPMENT-SNAPSHOT-2020-06-03-a

IntegrationTests/JavaScriptKitExec/Sources/JavaScriptKitExec/main.swift

@@ -184,7 +184,7 @@ Host_Function_Registration: do {
     let prop_6Ref = try expectObject(prop_6)
 
     var isHostFunc1Called = false
-    let hostFunc1 = JSFunctionRef.from { (arguments) -> JSValue in
+    let hostFunc1 = JSClosure { (arguments) -> JSValue in
         isHostFunc1Called = true
         return .number(1)
     }
@@ -196,7 +196,9 @@ Host_Function_Registration: do {
     try expectEqual(call_host_1Func(), .number(1))
     try expectEqual(isHostFunc1Called, true)
 
-    let hostFunc2 = JSFunctionRef.from { (arguments) -> JSValue in
+    hostFunc1.release()
+
+    let hostFunc2 = JSClosure { (arguments) -> JSValue in
         do {
             let input = try expectNumber(arguments[0])
             return .number(input * 2)
@@ -207,7 +209,7 @@ Host_Function_Registration: do {
 
     try expectEqual(hostFunc2(3), .number(6))
     _ = try expectString(hostFunc2(true))
-
+    hostFunc2.release()
 } catch {
     print(error)
 }

README.md

@@ -13,7 +13,7 @@ The toolchains can be installed via [`swiftenv`](https://github.com/kylef/swifte
 e.g.
 ```sh
 
-$ swiftenv install https://github.com/swiftwasm/swift/releases/download/swift-wasm-DEVELOPMENT-SNAPSHOT-2020-05-10-a/swift-wasm-DEVELOPMENT-SNAPSHOT-2020-05-10-a-osx.tar.gz
+$ swiftenv install https://github.com/swiftwasm/swift/releases/download/swift-wasm-DEVELOPMENT-SNAPSHOT-2020-06-03-a/swift-wasm-DEVELOPMENT-SNAPSHOT-2020-06-03-a-osx.tar.gz
 $ swift --version
 Swift version 5.3-dev (LLVM 47c28180d7, Swift 5f96d487e0)
 Target: x86_64-apple-darwin19.3.0
@@ -65,7 +65,7 @@ struct Pet: Codable {
 }
 
 let jsPet = JSObjectRef.global.pet
-let swiftPet: Pet = JSValueDecoder().decode(from: jsPet)
+let swiftPet: Pet = try JSValueDecoder().decode(from: jsPet)
 
 alert("Swift is running on browser!")
 ```

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,16 +56,10 @@ 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 {
-        let id = JavaScriptHostFuncRef(sharedFunctions.count)
-        sharedFunctions.append(body)
-        var funcRef: JavaScriptObjectRef = 0
-        _create_function(id, &funcRef)
-
-        return JSFunctionRef(id: funcRef)
+        fatalError("unavailable")
     }
 
     // MARK: - JSValueConvertible
@@ -75,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 {
@@ -93,7 +109,9 @@ internal func _call_host_function(
     _ hostFuncRef: JavaScriptHostFuncRef,
     _ argv: UnsafePointer<RawJSValue>, _ argc: Int32,
     _ callbackFuncRef: JavaScriptObjectRef) {
-    let hostFunc = JSFunctionRef.sharedFunctions[Int(hostFuncRef)]
+    guard let hostFunc = JSClosure.sharedFunctions[hostFuncRef] else {
+        fatalError("The function was already released")
+    }
     let args = UnsafeBufferPointer(start: argv, count: Int(argc)).map {
         $0.jsValue()
     }

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
 

Sources/JavaScriptKit/JSValue.swift

@@ -56,7 +56,7 @@ public extension JSValue {
 
 extension JSValue {
     public static func function(_ body: @escaping ([JSValue]) -> JSValue) -> JSValue {
-        .function(JSFunctionRef.from(body))
+        .function(JSClosure(body))
     }
 }