Skip to content

Fix JavaScriptEventLoop not building with Embedded Swift #354

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

Merged
merged 8 commits into from
May 1, 2025
+34 −29
Merged

Fix JavaScriptEventLoop not building with Embedded Swift #354

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
dc1f09b
Fix `JavaScriptEventLoop` not building with Embedded Swift
MaxDesiatov May 1, 2025
6bd0492
Unify Embedded and non-Embedded code paths for `didInstallGlobalExecu…
kateinoigakukun May 1, 2025
12f6fb6
Fix test case compilation where `then` block returns nothing
kateinoigakukun May 1, 2025
7a6fdd9
./Utilities/format.swift
kateinoigakukun May 1, 2025
84af891
Avoid using `Synchronization` in the JavaScriptEventLoop
kateinoigakukun May 1, 2025
5eed2c6
Use `JSValue` instead for `JSPromise`'s closure return types
kateinoigakukun May 1, 2025
5b40703
Fix test case compilation for `then` returning String
kateinoigakukun May 1, 2025
697f06b
Use _Concurrency module only if non-Embedded or Embedded on WASI
kateinoigakukun May 1, 2025
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
Use _Concurrency module only if non-Embedded or Embedded on WASI
  • Loading branch information
@kateinoigakukun
kateinoigakukun committed May 1, 2025
commit 697f06bdf820460867b577c66eef29c31b05b70d
6 changes: 3 additions & 3 deletions Sources/JavaScriptKit/BasicObjects/JSPromise.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ public final class JSPromise: JSBridgedClass {
return JSPromise(unsafelyWrapping: jsObject.then!(closure).object!)
}

#if compiler(>=5.5)
#if compiler(>=5.5) && (!hasFeature(Embedded) || os(WASI))
/// Schedules the `success` closure to be invoked on successful completion of `self`.
@available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *)
@discardableResult
Expand Down Expand Up @@ -122,7 +122,7 @@ public final class JSPromise: JSBridgedClass {
return JSPromise(unsafelyWrapping: jsObject.then!(successClosure, failureClosure).object!)
}

#if compiler(>=5.5)
#if compiler(>=5.5) && (!hasFeature(Embedded) || os(WASI))
/// Schedules the `success` closure to be invoked on successful completion of `self`.
@available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *)
@discardableResult
Expand Down Expand Up @@ -153,7 +153,7 @@ public final class JSPromise: JSBridgedClass {
return .init(unsafelyWrapping: jsObject.catch!(closure).object!)
}

#if compiler(>=5.5)
#if compiler(>=5.5) && (!hasFeature(Embedded) || os(WASI))
/// Schedules the `failure` closure to be invoked on rejected completion of `self`.
@available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *)
@discardableResult
Expand Down
8 changes: 5 additions & 3 deletions Sources/JavaScriptKit/FundamentalObjects/JSClosure.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import _CJavaScriptKit
#if hasFeature(Embedded) && os(WASI)
import _Concurrency
#endif

/// `JSClosureProtocol` wraps Swift closure objects for use in JavaScript. Conforming types
/// are responsible for managing the lifetime of the closure they wrap, but can delegate that
Expand Down Expand Up @@ -41,7 +43,7 @@ public class JSOneshotClosure: JSObject, JSClosureProtocol {
fatalError("JSOneshotClosure does not support dictionary literal initialization")
}

#if compiler(>=5.5)
#if compiler(>=5.5) && (!hasFeature(Embedded) || os(WASI))
@available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *)
public static func async(_ body: sending @escaping (sending [JSValue]) async throws -> JSValue) -> JSOneshotClosure
{
Expand Down Expand Up @@ -133,7 +135,7 @@ public class JSClosure: JSFunction, JSClosureProtocol {
fatalError("JSClosure does not support dictionary literal initialization")
}

#if compiler(>=5.5) && !hasFeature(Embedded)
#if compiler(>=5.5) && (!hasFeature(Embedded) || os(WASI))
@available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *)
public static func async(_ body: @Sendable @escaping (sending [JSValue]) async throws -> JSValue) -> JSClosure {
JSClosure(makeAsyncClosure(body))
Expand All @@ -149,7 +151,7 @@ public class JSClosure: JSFunction, JSClosureProtocol {
#endif
}

#if compiler(>=5.5) && !hasFeature(Embedded)
#if compiler(>=5.5) && (!hasFeature(Embedded) || os(WASI))
@available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *)
private func makeAsyncClosure(
_ body: sending @escaping (sending [JSValue]) async throws -> JSValue
Expand Down