Async JSOneshotClosure

j-f1 · j-f1 · commit 059de7ca37aa · 2022-01-28T13:52:51.000-05:00
diff --git a/Sources/JavaScriptKit/FundamentalObjects/JSClosure.swift b/Sources/JavaScriptKit/FundamentalObjects/JSClosure.swift
@@ -30,6 +30,12 @@ public class JSOneshotClosure: JSObject, JSClosureProtocol {
         })
     }
 
+    #if compiler(>=5.5)
+    static func async(_ body: @escaping ([JSValue]) async throws -> JSValue) -> JSOneshotClosure {
+        JSOneshotClosure(makeAsyncClosure(body))
+    }
+    #endif
+
     /// Release this function resource.
     /// After calling `release`, calling this function from JavaScript will fail.
     public func release() {
@@ -86,22 +92,7 @@ public class JSClosure: JSObject, JSClosureProtocol {
 
     #if compiler(>=5.5)
     static func async(_ body: @escaping ([JSValue]) async throws -> JSValue) -> JSClosure {
-        JSClosure { arguments in
-            JSPromise { resolver in
-                Task {
-                    do {
-                        let result = try await body(arguments)
-                        resolver(.success(result))
-                    } catch {
-                        if let jsError = error as? JSError {
-                            resolver(.failure(jsError.jsValue()))
-                        } else {
-                            resolver(.failure(JSError(message: String(describing: error)).jsValue()))
-                        }
-                    }
-                }
-            }.jsValue()
-        }
+        JSClosure(makeAsyncClosure(body))
     }
     #endif
 
@@ -114,6 +105,25 @@ public class JSClosure: JSObject, JSClosureProtocol {
     #endif
 }
 
+private func makeAsyncClosure(_ body: @escaping ([JSValue]) async throws -> JSValue) -> (([JSValue]) -> JSValue) {
+    { arguments in
+        JSPromise { resolver in
+            Task {
+                do {
+                    let result = try await body(arguments)
+                    resolver(.success(result))
+                } catch {
+                    if let jsError = error as? JSError {
+                        resolver(.failure(jsError.jsValue()))
+                    } else {
+                        resolver(.failure(JSError(message: String(describing: error)).jsValue()))
+                    }
+                }
+            }
+        }.jsValue()
+    }
+}
+
 
 // MARK: - `JSClosure` mechanism note
 //
