BridgeJS: Allow executing TS2SwiftVitestTests on Xcode

Author: kateinoigakukun

Plugins/BridgeJS/Sources/TS2Swift/TS2Swift.swift

@@ -20,6 +20,12 @@ import BridgeJSCore
 import BridgeJSSkeleton
 #endif
 
+#if os(Windows)
+let PATH_SEPARATOR: Character = ";"
+#else
+let PATH_SEPARATOR: Character = ":"
+#endif
+
 internal func which(
     _ executable: String,
     environment: [String: String] = ProcessInfo.processInfo.environment
@@ -39,13 +45,8 @@ internal func which(
             }
         }
     }
-    let pathSeparator: Character
-    #if os(Windows)
-    pathSeparator = ";"
-    #else
-    pathSeparator = ":"
-    #endif
-    let paths = environment["PATH"]?.split(separator: pathSeparator) ?? []
+
+    let paths = environment["PATH"]?.split(separator: PATH_SEPARATOR) ?? []
     for path in paths {
         let url = URL(fileURLWithPath: String(path)).appendingPathComponent(executable)
         if checkCandidate(url) {

Plugins/BridgeJS/Tests/BridgeJSToolTests/TS2SwiftVitestTests.swift

@@ -1,5 +1,6 @@
 import Foundation
 import Testing
+@testable import TS2Swift
 
 /// Runs the TS2Swift JavaScript test suite (Vitest) so that `swift test --package-path ./Plugins/BridgeJS`
 /// validates both the TypeScript ts2swift output and the Swift codegen. For fast iteration on ts2swift,
@@ -17,8 +18,16 @@ import Testing
             .appendingPathComponent("TS2Swift")
             .appendingPathComponent("JavaScript")
         let process = Process()
-        process.executableURL = URL(fileURLWithPath: "/usr/bin/env")
-        var arguments = ["npm", "run", "test"]
+        guard let npmExecutable = which("npm"), let nodeExecutable = which("node") else {
+            Issue.record("No \"npm\" command found in your system")
+            return
+        }
+        process.executableURL = npmExecutable
+        var environment = ProcessInfo.processInfo.environment
+        environment["PATH"] =
+            "\(nodeExecutable.deletingLastPathComponent().path)\(PATH_SEPARATOR) \(environment["PATH"] ?? "")"
+        process.environment = environment
+        var arguments = ["run", "test"]
         if ProcessInfo.processInfo.environment["UPDATE_SNAPSHOTS"] != nil {
             arguments.append(contentsOf: ["--", "--update"])
         }