Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add async closure support #159

Merged
merged 15 commits into from
Jun 5, 2022
Prev Previous commit
Next Next commit
Drop jsValue() parens
j-f1 committed Apr 30, 2022
commit ce61808485d34869466bf812a20a2a1021cac7d6
Original file line number Diff line number Diff line change
@@ -104,7 +104,7 @@ func entrypoint() async throws {
return JSValue.number(3)
}
let delayObject = JSObject.global.Object.function!.new()
delayObject.closure = delayClosure.jsValue()
delayObject.closure = delayClosure.jsValue

let start = time(nil)
let promise = JSPromise(from: delayObject.closure!())
8 changes: 4 additions & 4 deletions Sources/JavaScriptKit/BasicObjects/JSPromise.swift
Original file line number Diff line number Diff line change
@@ -81,7 +81,7 @@ public final class JSPromise: JSBridgedClass {
@discardableResult
public func then(success: @escaping (JSValue) async -> ConvertibleToJSValue) -> JSPromise {
let closure = JSOneshotClosure.async {
return await success($0[0]).jsValue()
return await success($0[0]).jsValue
}
return JSPromise(unsafelyWrapping: jsObject.then!(closure).object!)
}
@@ -107,10 +107,10 @@ public final class JSPromise: JSBridgedClass {
public func then(success: @escaping (JSValue) async -> ConvertibleToJSValue,
failure: @escaping (JSValue) async -> ConvertibleToJSValue) -> JSPromise {
let successClosure = JSOneshotClosure.async {
return await success($0[0]).jsValue()
return await success($0[0]).jsValue
}
let failureClosure = JSOneshotClosure.async {
return await failure($0[0]).jsValue()
return await failure($0[0]).jsValue
}
return JSPromise(unsafelyWrapping: jsObject.then!(successClosure, failureClosure).object!)
}
@@ -131,7 +131,7 @@ public final class JSPromise: JSBridgedClass {
@discardableResult
public func `catch`(failure: @escaping (JSValue) async -> ConvertibleToJSValue) -> JSPromise {
let closure = JSOneshotClosure.async {
return await failure($0[0]).jsValue()
return await failure($0[0]).jsValue
}
return .init(unsafelyWrapping: jsObject.catch!(closure).object!)
}
4 changes: 2 additions & 2 deletions Sources/JavaScriptKit/FundamentalObjects/JSClosure.swift
Original file line number Diff line number Diff line change
@@ -118,9 +118,9 @@ private func makeAsyncClosure(_ body: @escaping ([JSValue]) async throws -> JSVa
resolver(.success(result))
} catch {
if let jsError = error as? JSError {
resolver(.failure(jsError.jsValue()))
resolver(.failure(jsError.jsValue))
} else {
resolver(.failure(JSError(message: String(describing: error)).jsValue()))
resolver(.failure(JSError(message: String(describing: error)).jsValue))
}
}
}