Optimize compile-time

kateinoigakukun · kateinoigakukun · commit 6bf418e82174 · 2025-03-16T12:38:07.000Z
diff --git a/Plugins/PackageToJS/Sources/PackageToJS.swift b/Plugins/PackageToJS/Sources/PackageToJS.swift
@@ -87,7 +87,7 @@ struct PackageToJS {
             try PackageToJS.runSingleTestingLibrary(
                 testRunner: testRunner, currentDirectoryURL: currentDirectoryURL,
                 extraArguments: extraArguments,
-                testParser: testOptions.verbose ? nil : FancyTestsParser(),
+                testParser: testOptions.verbose ? nil : FancyTestsParser(write: { print($0, terminator: "") }),
                 testOptions: testOptions
             )
         }
@@ -122,7 +122,7 @@ struct PackageToJS {
         testRunner: URL,
         currentDirectoryURL: URL,
         extraArguments: [String],
-        testParser: (any TestsParser)? = nil,
+        testParser: FancyTestsParser? = nil,
         testOptions: TestOptions
     ) throws {
         let node = try which("node")
@@ -136,15 +136,8 @@ struct PackageToJS {
 
         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)
+                testParser.onLine(line)
             }
             let stdoutPipe = Pipe()
             stdoutPipe.fileHandleForReading.readabilityHandler = { handle in
@@ -156,7 +149,7 @@ struct PackageToJS {
                     stdoutBuffer.append(data)
                 }
                 stdoutBuffer.flush()
-                testParser.finalize(writer)
+                testParser.finalize()
             }
         }
 
diff --git a/Plugins/PackageToJS/Sources/TestsParser.swift b/Plugins/PackageToJS/Sources/TestsParser.swift
@@ -4,27 +4,21 @@
 import Foundation
 import RegexBuilder
 
-protocol InteractiveWriter {
-    func write(_ string: String)
-}
-
-protocol TestsParser {
-    /// Parse the output of a test process, format it, then output in the `InteractiveWriter`.
-    func onLine(_ line: String, _ terminal: InteractiveWriter)
-    func finalize(_ terminal: InteractiveWriter)
-}
-
 extension String.StringInterpolation {
     /// Display `value` with the specified ANSI-escaped `color` values, then apply the reset.
     fileprivate mutating func appendInterpolation<T>(_ value: T, color: String...) {
         appendInterpolation("\(color.map { "\u{001B}\($0)" }.joined())\(value)\u{001B}[0m")
     }
 }
 
-class FancyTestsParser: TestsParser {
-    init() {}
+class FancyTestsParser {
+    let write: (String) -> Void
 
-    enum Status: Equatable {
+    init(write: @escaping (String) -> Void) {
+        self.write = write
+    }
+
+    private enum Status: Equatable {
         case passed, failed, skipped
         case unknown(String.SubSequence?)
 
@@ -45,7 +39,7 @@ class FancyTestsParser: TestsParser {
         }
     }
 
-    struct Suite {
+    private struct Suite {
         let name: String.SubSequence
         var status: Status = .unknown(nil)
 
@@ -76,19 +70,19 @@ class FancyTestsParser: TestsParser {
         }
     }
 
-    var suites = [Suite]()
+    private var suites = [Suite]()
 
-    let swiftIdentifier = #/[_\p{L}\p{Nl}][_\p{L}\p{Nl}\p{Mn}\p{Nd}\p{Pc}]*/#
-    let timestamp = #/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d{3}/#
-    lazy var suiteStarted = Regex {
+    private let swiftIdentifier = #/[_\p{L}\p{Nl}][_\p{L}\p{Nl}\p{Mn}\p{Nd}\p{Pc}]*/#
+    private let timestamp = #/\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d{3}/#
+    private lazy var suiteStarted = Regex {
         "Test Suite '"
         Capture {
             OneOrMore(CharacterClass.anyOf("'").inverted)
         }
         "' started at "
         Capture { self.timestamp }
     }
-    lazy var suiteStatus = Regex {
+    private lazy var suiteStatus = Regex {
         "Test Suite '"
         Capture { OneOrMore(CharacterClass.anyOf("'").inverted) }
         "' "
@@ -101,14 +95,14 @@ class FancyTestsParser: TestsParser {
         " at "
         Capture { self.timestamp }
     }
-    lazy var testCaseStarted = Regex {
+    private lazy var testCaseStarted = Regex {
         "Test Case '"
         Capture { self.swiftIdentifier }
         "."
         Capture { self.swiftIdentifier }
         "' started"
     }
-    lazy var testCaseStatus = Regex {
+    private lazy var testCaseStatus = Regex {
         "Test Case '"
         Capture { self.swiftIdentifier }
         "."
@@ -130,10 +124,10 @@ class FancyTestsParser: TestsParser {
         " seconds)"
     }
 
-    let testSummary =
+    private let testSummary =
         #/Executed \d+ (test|tests), with (?:\d+ (?:test|tests) skipped and )?\d+ (failure|failures) \((?<unexpected>\d+) unexpected\) in (?<duration>\d+\.\d+) \(\d+\.\d+\) seconds/#
 
-    func onLine(_ line: String, _ terminal: InteractiveWriter) {
+    func onLine(_ line: String) {
         if let match = line.firstMatch(
             of: suiteStarted
         ) {
@@ -145,7 +139,7 @@ class FancyTestsParser: TestsParser {
             let (_, suite, status, _) = match.output
             if let suiteIdx = suites.firstIndex(where: { $0.name == suite }) {
                 suites[suiteIdx].status = Status(rawValue: status)
-                flushSingleSuite(suites[suiteIdx], terminal)
+                flushSingleSuite(suites[suiteIdx])
             }
         } else if let match = line.firstMatch(
             of: testCaseStarted
@@ -172,86 +166,87 @@ class FancyTestsParser: TestsParser {
             // do nothing
         } else {
             if !line.isEmpty {
-                terminal.write(line + "\n")
+                write(line + "\n")
             }
         }
     }
 
-    func finalize(_ terminal: InteractiveWriter) {
-        terminal.write("\n")
-        flushSummary(of: suites, terminal)
-    }
-
-    private func flushSingleSuite(_ suite: Suite, _ terminal: InteractiveWriter) {
-        terminal.write(suite.statusLabel)
-        terminal.write(" \(suite.name)\n")
+    private func flushSingleSuite(_ suite: Suite) {
+        write(suite.statusLabel)
+        write(" \(suite.name)\n")
         for testCase in suite.cases {
-            terminal.write("  \(testCase.statusMark) ")
+            write("  \(testCase.statusMark) ")
             if let duration = testCase.duration {
-                terminal
-                    .write(
+                write(
                         "\(testCase.name) \("(\(Int(Double(duration)! * 1000))ms)", color: "[90m")\n"
                     )  // gray
             }
         }
     }
 
-    private func flushSummary(of suites: [Suite], _ terminal: InteractiveWriter) {
-        let suitesWithCases = suites.filter { $0.cases.count > 0 }
-
-        terminal.write("Test Suites: ")
-        let suitesPassed = suitesWithCases.filter { $0.status == .passed }.count
-        if suitesPassed > 0 {
-            terminal.write("\("\(suitesPassed) passed", color: "[32m"), ")
-        }
-        let suitesSkipped = suitesWithCases.filter { $0.status == .skipped }.count
-        if suitesSkipped > 0 {
-            terminal.write("\("\(suitesSkipped) skipped", color: "[97m"), ")
-        }
-        let suitesFailed = suitesWithCases.filter { $0.status == .failed }.count
-        if suitesFailed > 0 {
-            terminal.write("\("\(suitesFailed) failed", color: "[31m"), ")
-        }
-        let suitesUnknown = suitesWithCases.filter { $0.status == .unknown(nil) }.count
-        if suitesUnknown > 0 {
-            terminal.write("\("\(suitesUnknown) unknown", color: "[31m"), ")
+    func finalize() {
+        write("\n")
+
+        func formatCategory(
+            label: String, statuses: [Status]
+        ) -> String {
+            var passed = 0
+            var skipped = 0
+            var failed = 0
+            var unknown = 0
+            for status in statuses {
+                switch status {
+                case .passed: passed += 1
+                case .skipped: skipped += 1
+                case .failed: failed += 1
+                case .unknown: unknown += 1
+                }
+            }
+            var result = "\(label) "
+            if passed > 0 {
+                result += "\u{001B}[32m\(passed) passed\u{001B}[0m, "
+            }
+            if skipped > 0 {
+                result += "\u{001B}[97m\(skipped) skipped\u{001B}[0m, "
+            }
+            if failed > 0 {
+                result += "\u{001B}[31m\(failed) failed\u{001B}[0m, "
+            }
+            if unknown > 0 {
+                result += "\u{001B}[31m\(unknown) unknown\u{001B}[0m, "
+            }
+            result += "\u{001B}[0m\(statuses.count) total\n"
+            return result
         }
-        terminal.write("\(suitesWithCases.count) total\n")
 
-        terminal.write("Tests:       ")
-        let allTests = suitesWithCases.map(\.cases).reduce([], +)
-        let testsPassed = allTests.filter { $0.status == .passed }.count
-        if testsPassed > 0 {
-            terminal.write("\("\(testsPassed) passed", color: "[32m"), ")
-        }
-        let testsSkipped = allTests.filter { $0.status == .skipped }.count
-        if testsSkipped > 0 {
-            terminal.write("\("\(testsSkipped) skipped", color: "[97m"), ")
-        }
-        let testsFailed = allTests.filter { $0.status == .failed }.count
-        if testsFailed > 0 {
-            terminal.write("\("\(testsFailed) failed", color: "[31m"), ")
-        }
-        let testsUnknown = allTests.filter { $0.status == .unknown(nil) }.count
-        if testsUnknown > 0 {
-            terminal.write("\("\(testsUnknown) unknown", color: "[31m"), ")
+        let suitesWithCases = suites.filter { $0.cases.count > 0 }
+        write(
+            formatCategory(
+                label: "Test Suites:", statuses: suitesWithCases.map(\.status)
+            )
+        )
+        let allCaseStatuses = suitesWithCases.flatMap {
+            $0.cases.map { $0.status }
         }
-        terminal.write("\(allTests.count) total\n")
+        write(
+            formatCategory(
+                label: "Tests:      ", statuses: allCaseStatuses
+            )
+        )
 
         if suites.contains(where: { $0.name == "All tests" }) {
-            terminal.write("\("Ran all test suites.", color: "[90m")\n")  // gray
+            write("\("Ran all test suites.", color: "[90m")\n")  // gray
         }
 
         if suites.contains(where: { $0.status.isNegative }) {
-            print(suites.filter({ $0.status.isNegative }))
-            terminal.write("\n\("Failed test cases:", color: "[31m")\n")
+            write("\n\("Failed test cases:", color: "[31m")\n")
             for suite in suites.filter({ $0.status.isNegative }) {
                 for testCase in suite.cases.filter({ $0.status.isNegative }) {
-                    terminal.write("  \(testCase.statusMark) \(suite.name).\(testCase.name)\n")
+                    write("  \(testCase.statusMark) \(suite.name).\(testCase.name)\n")
                 }
             }
 
-            terminal.write(
+            write(
                 "\n\("Some tests failed. Use --verbose for raw test output.", color: "[33m")\n"
             )
         }
diff --git a/Plugins/PackageToJS/Tests/TestsParserTests.swift b/Plugins/PackageToJS/Tests/TestsParserTests.swift
@@ -3,30 +3,23 @@ import Testing
 
 @testable import PackageToJS
 
-@Suite struct TestParserTests {
+@Suite struct TestsParserTests {
     func assertFancyFormatSnapshot(
         _ input: String,
         filePath: String = #filePath, function: String = #function,
         sourceLocation: SourceLocation = #_sourceLocation
     ) throws {
-        let parser = FancyTestsParser()
+        var output = ""
+        let parser = FancyTestsParser(write: { output += $0 })
         let lines = input.split(separator: "\n", omittingEmptySubsequences: false)
 
-        class Writer: InteractiveWriter {
-            var output = ""
-            func write(_ string: String) {
-                output += string
-            }
-        }
-
-        let writer = Writer()
         for line in lines {
-            parser.onLine(String(line), writer)
+            parser.onLine(String(line))
         }
-        parser.finalize(writer)
+        parser.finalize()
         try assertSnapshot(
             filePath: filePath, function: function, sourceLocation: sourceLocation,
-            input: Data(writer.output.utf8), fileExtension: "txt",
+            input: Data(output.utf8), fileExtension: "txt",
         )
     }
 
diff --git a/Plugins/PackageToJS/Tests/__Snapshots__/TestParserTests/testAllPassed.txt b/Plugins/PackageToJS/Tests/__Snapshots__/TestParserTests/testAllPassed.txt
@@ -4,6 +4,6 @@
 [1m[97m[42m PASSED [0m /.xctest
 [1m[97m[42m PASSED [0m All tests
 
-Test Suites: [32m1 passed[0m, 1 total
-Tests:       [32m2 passed[0m, 2 total
+Test Suites: [32m1 passed[0m, [0m1 total
+Tests:       [32m2 passed[0m, [0m2 total
 [90mRan all test suites.[0m
diff --git a/Plugins/PackageToJS/Tests/__Snapshots__/TestParserTests/testAssertFailure.txt b/Plugins/PackageToJS/Tests/__Snapshots__/TestParserTests/testAssertFailure.txt
@@ -4,8 +4,8 @@
 [1m[97m[101m FAILED [0m /.xctest
 [1m[97m[101m FAILED [0m All tests
 
-Test Suites: [31m1 failed[0m, 1 total
-Tests:       [31m1 failed[0m, 1 total
+Test Suites: [31m1 failed[0m, [0m1 total
+Tests:       [31m1 failed[0m, [0m1 total
 [90mRan all test suites.[0m
 
 [31mFailed test cases:[0m
diff --git a/Plugins/PackageToJS/Tests/__Snapshots__/TestParserTests/testCrash.txt b/Plugins/PackageToJS/Tests/__Snapshots__/TestParserTests/testCrash.txt
@@ -12,8 +12,8 @@ RuntimeError: unreachable
     at CounterPackageTests.xctest.$s19JavaScriptEventLoopAAC6create33_F9DB15AFB1FFBEDBFE9D13500E01F3F2LLAByFZyyyccfU0_0aB3Kit20ConvertibleToJSValue_pAE0Q0OcfU_ (wasm://wasm/CounterPackageTests.xctest-0ef3150a:wasm-function[1541]:0x9de13)
     at CounterPackageTests.xctest.$s19JavaScriptEventLoopAAC6create33_F9DB15AFB1FFBEDBFE9D13500E01F3F2LLAByFZyyyccfU0_0aB3Kit20ConvertibleToJSValue_pAE0Q0OcfU_TA (wasm://wasm/CounterPackageTests.xctest-0ef3150a:wasm-function[1540]:0x9dd8d)
 
-Test Suites: [31m1 unknown[0m, 1 total
-Tests:       [31m1 unknown[0m, 1 total
+Test Suites: [31m1 unknown[0m, [0m1 total
+Tests:       [31m1 unknown[0m, [0m1 total
 [90mRan all test suites.[0m
 
 [31mFailed test cases:[0m
diff --git a/Plugins/PackageToJS/Tests/__Snapshots__/TestParserTests/testSkipped.txt b/Plugins/PackageToJS/Tests/__Snapshots__/TestParserTests/testSkipped.txt
@@ -5,6 +5,6 @@
 [1m[97m[42m PASSED [0m /.xctest
 [1m[97m[42m PASSED [0m All tests
 
-Test Suites: [32m1 passed[0m, 1 total
-Tests:       [32m1 passed[0m, [97m1 skipped[0m, 2 total
+Test Suites: [32m1 passed[0m, [0m1 total
+Tests:       [32m1 passed[0m, [97m1 skipped[0m, [0m2 total
 [90mRan all test suites.[0m
diff --git a/Plugins/PackageToJS/Tests/__Snapshots__/TestParserTests/testThrowFailure.txt b/Plugins/PackageToJS/Tests/__Snapshots__/TestParserTests/testThrowFailure.txt
@@ -4,8 +4,8 @@
 [1m[97m[101m FAILED [0m /.xctest
 [1m[97m[101m FAILED [0m All tests
 
-Test Suites: [31m1 failed[0m, 1 total
-Tests:       [31m1 failed[0m, 1 total
+Test Suites: [31m1 failed[0m, [0m1 total
+Tests:       [31m1 failed[0m, [0m1 total
 [90mRan all test suites.[0m
 
 [31mFailed test cases:[0m

-Original file line number
+Diff line change
 [1m[97m[42m PASSED [0m /.xctest
 [1m[97m[42m PASSED [0m All tests
 -Test Suites: [32m1 passed[0m, 1 total
 -Tests:       [32m2 passed[0m, 2 total
 +Test Suites: [32m1 passed[0m, [0m1 total
 +Tests:       [32m2 passed[0m, [0m2 total
 [90mRan all test suites.[0m
-Original file line number
+Diff line change
 [1m[97m[101m FAILED [0m /.xctest
 [1m[97m[101m FAILED [0m All tests
 -Test Suites: [31m1 failed[0m, 1 total
 -Tests:       [31m1 failed[0m, 1 total
 +Test Suites: [31m1 failed[0m, [0m1 total
 +Tests:       [31m1 failed[0m, [0m1 total
 [90mRan all test suites.[0m
 [31mFailed test cases:[0m