PackageToJS: Bring XCTest output formatter from carton

Author: kateinoigakukun

Examples/Testing/Package.swift

@@ -18,7 +18,11 @@ let package = Package(
             ]),
         .testTarget(
             name: "CounterTests",
-            dependencies: ["Counter"]
+            dependencies: [
+                "Counter",
+                // This is needed to run the tests in the JavaScript event loop
+                .product(name: "JavaScriptEventLoopTestSupport", package: "JavaScriptKit")
+            ]
         ),
     ]
 )

Examples/Testing/Tests/CounterTests/CounterTests.swift

@@ -21,8 +21,9 @@ import Testing
 import XCTest
 
 class CounterTests: XCTestCase {
-    func testIncrement() async {
+    func testIncrement() async throws {
         var counter = Counter()
+        print("Incrementing")
         counter.increment()
         XCTAssertEqual(counter.count, 1)
     }

Plugins/PackageToJS/Sources/PackageToJS.swift

@@ -40,6 +40,8 @@ struct PackageToJS {
         var inspect: Bool
         /// The extra arguments to pass to node
         var extraNodeArguments: [String]
+        /// Whether to print verbose output
+        var verbose: Bool
         /// The options for packaging
         var packageOptions: PackageOptions
     }
@@ -85,6 +87,7 @@ struct PackageToJS {
             try PackageToJS.runSingleTestingLibrary(
                 testRunner: testRunner, currentDirectoryURL: currentDirectoryURL,
                 extraArguments: extraArguments,
+                testParser: testOptions.verbose ? nil : FancyTestsParser(),
                 testOptions: testOptions
             )
         }
@@ -119,6 +122,7 @@ struct PackageToJS {
         testRunner: URL,
         currentDirectoryURL: URL,
         extraArguments: [String],
+        testParser: (any TestsParser)? = nil,
         testOptions: TestOptions
     ) throws {
         let node = try which("node")
@@ -129,11 +133,39 @@ struct PackageToJS {
         let task = Process()
         task.executableURL = node
         task.arguments = arguments
+
+        var finalize: () -> Void = {}
+        if let testParser = testParser {
+            class Writer: InteractiveWriter {
+                func write(_ string: String) {
+                    print(string, terminator: "")
+                }
+            }
+
+            let writer = Writer()
+            let stdoutBuffer = LineBuffer { line in
+                testParser.onLine(line, writer)
+            }
+            let stdoutPipe = Pipe()
+            stdoutPipe.fileHandleForReading.readabilityHandler = { handle in
+                stdoutBuffer.append(handle.availableData)
+            }
+            task.standardOutput = stdoutPipe
+            finalize = {
+                if let data = try? stdoutPipe.fileHandleForReading.readToEnd() {
+                    stdoutBuffer.append(data)
+                }
+                stdoutBuffer.flush()
+                testParser.finalize(writer)
+            }
+        }
+
         task.currentDirectoryURL = currentDirectoryURL
         try task.forwardTerminationSignals {
             try task.run()
             task.waitUntilExit()
         }
+        finalize()
         // swift-testing returns EX_UNAVAILABLE (which is 69 in wasi-libc) for "no tests found"
         guard task.terminationStatus == 0 || task.terminationStatus == 69 else {
             throw PackageToJSError("Test failed with status \(task.terminationStatus)")
@@ -151,6 +183,39 @@ struct PackageToJS {
             print("Saved profile data to \(mergedCoverageFile.path)")
         }
     }
+
+    class LineBuffer: @unchecked Sendable {
+        let lock = NSLock()
+        var buffer = ""
+        let handler: (String) -> Void
+
+        init(handler: @escaping (String) -> Void) {
+            self.handler = handler
+        }
+
+        func append(_ data: Data) {
+            let string = String(data: data, encoding: .utf8) ?? ""
+            append(string)
+        }
+
+        func append(_ data: String) {
+            lock.lock()
+            defer { lock.unlock() }
+            buffer += data
+            let lines = buffer.split(separator: "\n", omittingEmptySubsequences: false)
+            for line in lines.dropLast() {
+                handler(String(line))
+            }
+            buffer = String(lines.last ?? "")
+        }
+
+        func flush() {
+            lock.lock()
+            defer { lock.unlock() }
+            handler(buffer)
+            buffer = ""
+        }
+    }
 }
 
 struct PackageToJSError: Swift.Error, CustomStringConvertible {

Plugins/PackageToJS/Sources/PackageToJSPlugin.swift

@@ -340,12 +340,14 @@ extension PackageToJS.TestOptions {
         let prelude = extractor.extractOption(named: "prelude").last
         let environment = extractor.extractOption(named: "environment").last
         let inspect = extractor.extractFlag(named: "inspect")
+        let verbose = extractor.extractFlag(named: "verbose")
         let extraNodeArguments = extractor.extractSingleDashOption(named: "Xnode")
         let packageOptions = PackageToJS.PackageOptions.parse(from: &extractor)
         var options = PackageToJS.TestOptions(
             buildOnly: buildOnly != 0, listTests: listTests != 0,
             filter: filter, prelude: prelude, environment: environment, inspect: inspect != 0,
             extraNodeArguments: extraNodeArguments,
+            verbose: verbose != 0,
             packageOptions: packageOptions
         )
 
@@ -369,6 +371,8 @@ extension PackageToJS.TestOptions {
               --inspect              Whether to run tests in the browser with inspector enabled
               --use-cdn              Whether to use CDN for dependency packages (default: false)
               --enable-code-coverage Whether to enable code coverage collection (default: false)
+              --verbose              Whether to print verbose output (default: false)
+              -Xnode <args>          Extra arguments to pass to Node.js
 
             EXAMPLES:
               $ swift package --swift-sdk wasm32-unknown-wasi plugin js test