Support Swift 6.1 (#47)

* Update to Swift 6.1

* Bump min SwiftSyntax

* More cleanup

Author: kabiroberai

Package.resolved

@@ -1,15 +1,11 @@
-// swift-tools-version:5.9
+// swift-tools-version:6.0
 
 import PackageDescription
 import CompilerPluginSupport
 import Foundation
 
 let buildDynamic = ProcessInfo.processInfo.environment["NODE_SWIFT_BUILD_DYNAMIC"] == "1"
 
-let baseSwiftSettings: [SwiftSetting] = [
-    .enableExperimentalFeature("StrictConcurrency"),
-]
-
 let package = Package(
     name: "node-swift",
     platforms: [
@@ -31,8 +27,8 @@ let package = Package(
         ),
     ],
     dependencies: [
-        .package(url: "https://github.com/apple/swift-syntax.git", "509.0.0"..<"601.0.0"),
-        .package(url: "https://github.com/pointfreeco/swift-macro-testing.git", .upToNextMinor(from: "0.4.2")),
+        .package(url: "https://github.com/swiftlang/swift-syntax.git", "600.0.0"..<"602.0.0"),
+        .package(url: "https://github.com/pointfreeco/swift-macro-testing.git", .upToNextMinor(from: "0.6.2")),
     ],
     targets: [
         .systemLibrary(name: "CNodeAPI"),
@@ -55,13 +51,11 @@ let package = Package(
             dependencies: [
                 .product(name: "SwiftSyntaxMacros", package: "swift-syntax"),
                 .product(name: "SwiftCompilerPlugin", package: "swift-syntax"),
-            ],
-            swiftSettings: baseSwiftSettings
+            ]
         ),
         .target(
             name: "NodeAPI",
-            dependencies: ["CNodeAPI", "CNodeAPISupport", "NodeAPIMacros"],
-            swiftSettings: baseSwiftSettings
+            dependencies: ["CNodeAPI", "CNodeAPISupport", "NodeAPIMacros"]
         ),
         .target(
             name: "NodeModuleSupport",
@@ -79,5 +73,6 @@ let package = Package(
             ]
         ),
     ],
+    swiftLanguageModes: [.v5, .v6],
     cxxLanguageStandard: .cxx17
 )

Package.swift

@@ -2717,7 +2717,10 @@ static napi_status bigint_to_string(napi_env env, napi_value value, std::string
   JSString js_string{ToJSString(env, value, &exception)};
   CHECK_JSC(env, exception);
 
+  #pragma clang diagnostic push
+  #pragma clang diagnostic ignored "-Wvla"
   char buf[js_string.LengthUTF8()];
+  #pragma clang diagnostic pop
   js_string.CopyToUTF8(buf, sizeof(buf), nullptr);
   string = std::string { buf };
   return napi_ok;

Package@swift-6.0.swift

@@ -1,4 +1,4 @@
-@_implementationOnly import CNodeAPI
+internal import CNodeAPI
 
 public struct NodeAPIError: Error {
     public enum Code: Sendable {

Sources/CNodeAPISupport/include/task_reflection.h

@@ -1,6 +1,5 @@
 import Foundation
-import CNodeAPISupport
-@_implementationOnly import CNodeAPI
+internal import CNodeAPI
 
 extension NodeContext {
     // if we're on a node thread, run `action` on it
@@ -10,21 +9,6 @@ extension NodeContext {
     }
 }
 
-@available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *)
-extension UnownedJob {
-    func asCurrent<T>(work: () -> T) -> T {
-        withoutActuallyEscaping(work) { work in
-            var result: T!
-            node_swift_as_current_task(unsafeBitCast(self, to: OpaquePointer.self), { ctx in
-                Unmanaged<Box<() -> Void>>.fromOpaque(ctx).takeRetainedValue().value()
-            }, Unmanaged.passRetained(Box<() -> Void> {
-                result = work()
-            }).toOpaque())
-            return result
-        }
-    }
-}
-
 @available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *)
 private final class NodeExecutor: SerialExecutor {
     private let schedulerQueue = DispatchQueue(label: "NodeExecutorScheduler")
@@ -46,29 +30,7 @@ private final class NodeExecutor: SerialExecutor {
         // NodeExecutor.enqueue is invoked with the same isolation as the caller,
         // which means we can simply read out the TaskLocal value to obtain
         // this.
-        let target: NodeAsyncQueue.Handle?
-        #if compiler(>=6.0)
-        target = NodeActor.target
-        #else
-        // It's a bit trickier in Swift <= 5.10 as Swift first makes a hop to the
-        // global executor before invoking this method. So instead we have to use
-        // some runtime spelunking to read the TaskLocal value from `job`.
-        // To do so, we temporarily swap ResumeTask for our own function.
-        // Then, swift_job_run is called, which sets the active task to
-        // the receiver and invokes its ResumeTask. We then execute the
-        // given closure, allowing us to grab task-local values. Finally,
-        // we "suspend" the task and return ResumeTask to its old value.
-        //
-        // on Darwin we can instead replace the "current task" thread-local
-        // (key 103) temporarily, but that isn't portable.
-        //
-        // This is sort of like inserting a "work(); await Task.yield()" block
-        // at the top of the task, since when a Task awaits it similarly changes
-        // the Resume function and suspends. Note that we can assume that this
-        // is a Task and not a basic Job, because Executor.enqueue is only
-        // called from swift_task_enqueue.
-        target = job.asCurrent { NodeActor.target }
-        #endif
+        let target = NodeActor.target
 
         guard let q = target?.queue else {
             nodeFatalError("There is no target NodeAsyncQueue associated with this Task")

Sources/CNodeAPISupport/task_reflection.cpp

@@ -1,4 +1,4 @@
-@_implementationOnly import CNodeAPI
+internal import CNodeAPI
 
 public final class NodeArray: NodeObject {
 

Sources/CNodeJSC/js_native_api_javascriptcore.cc

@@ -1,5 +1,5 @@
 import Foundation
-@_implementationOnly import CNodeAPI
+internal import CNodeAPI
 
 public struct NodeDataDeallocator: Sendable {
     let action: @Sendable @NodeActor (UnsafeMutableRawBufferPointer) -> Void