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.

Sign up for GitHub

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
+186 −31
Merged

Add async closure support #159

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
9c04949
Update JSPromise docs
j-f1 Jan 28, 2022
34f22bf
Add a JSClosure.async {} initializer
j-f1 Jan 28, 2022
e813499
spelling fix
j-f1 Jan 28, 2022
86ab355
Async JSOneshotClosure
j-f1 Jan 28, 2022
e060302
async JSPromise callbacks
j-f1 Jan 28, 2022
2ca262a
require compiler v5.5 for async code
j-f1 Feb 3, 2022
3e5408e
Add async JSClosure test
j-f1 Apr 1, 2022
3ca829a
Add availability annotations
j-f1 Apr 1, 2022
bf7b52a
fix availability annotations
j-f1 Apr 1, 2022
ce61808
Drop jsValue() parens
j-f1 Apr 30, 2022
9b95b98
Mark JS[Oneshot]Closure.async as public
j-f1 Apr 30, 2022
f63fe7b
Merge branch 'main' into jed/async-closure
j-f1 Jun 4, 2022
77584a3
Allow JSPromise chained async callbacks to throw
j-f1 Jun 4, 2022
7d67669
Add expectGTE helper function
j-f1 Jun 4, 2022
2305f7e
Add remaining tests
j-f1 Jun 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Async JSOneshotClosure
  • Loading branch information
@j-f1
j-f1 committed Jan 28, 2022
commit 86ab3551f696b710bacb15c95d7e48413eb55953
42 changes: 26 additions & 16 deletions Sources/JavaScriptKit/FundamentalObjects/JSClosure.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down Expand Up @@ -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

Expand All @@ -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
//
Expand Down