BridgeJS: Split out core functionality into BridgeJSCore

To import them from the Web playground

Author: kateinoigakukun

Plugins/BridgeJS/Sources/BridgeJSCore/BridgeJSCoreError.swift

@@ -0,0 +1,7 @@
+struct BridgeJSCoreError: Swift.Error, CustomStringConvertible {
+    let description: String
+
+    init(_ message: String) {
+        self.description = message
+    }
+}

Plugins/BridgeJS/Sources/BridgeJSTool/BridgeJSSkeleton renamed to Plugins/BridgeJS/Sources/BridgeJSCore/BridgeJSSkeleton

@@ -1,7 +1,6 @@
 import SwiftBasicFormat
 import SwiftSyntax
 import SwiftSyntaxBuilder
-import class Foundation.FileManager
 
 /// Exports Swift functions and classes to JavaScript
 ///
@@ -34,7 +33,7 @@ class ExportSwift {
 
         let errors = try parseSingleFile(sourceFile)
         if errors.count > 0 {
-            throw BridgeJSToolError(
+            throw BridgeJSCoreError(
                 errors.map { $0.formattedDescription(fileName: inputFilePath) }
                     .joined(separator: "\n")
             )

Plugins/BridgeJS/Sources/BridgeJSTool/DiagnosticError.swift renamed to Plugins/BridgeJS/Sources/BridgeJSCore/DiagnosticError.swift

@@ -1,7 +1,6 @@
 import SwiftBasicFormat
 import SwiftSyntax
 import SwiftSyntaxBuilder
-import Foundation
 
 /// Imports TypeScript declarations and generates Swift bridge code
 ///
@@ -28,46 +27,6 @@ struct ImportTS {
         self.skeleton.children.append(skeleton)
     }
 
-    /// Processes a TypeScript definition file and extracts its API information
-    mutating func addSourceFile(_ sourceFile: String, tsconfigPath: String) throws {
-        let nodePath = try which("node")
-        let ts2skeletonPath = URL(fileURLWithPath: #filePath)
-            .deletingLastPathComponent()
-            .deletingLastPathComponent()
-            .appendingPathComponent("JavaScript")
-            .appendingPathComponent("bin")
-            .appendingPathComponent("ts2skeleton.js")
-        let arguments = [ts2skeletonPath.path, sourceFile, "--project", tsconfigPath]
-
-        progress.print("Running ts2skeleton...")
-        progress.print("  \(([nodePath.path] + arguments).joined(separator: " "))")
-
-        let process = Process()
-        let stdoutPipe = Pipe()
-        nonisolated(unsafe) var stdoutData = Data()
-
-        process.executableURL = nodePath
-        process.arguments = arguments
-        process.standardOutput = stdoutPipe
-
-        stdoutPipe.fileHandleForReading.readabilityHandler = { handle in
-            let data = handle.availableData
-            if data.count > 0 {
-                stdoutData.append(data)
-            }
-        }
-        try process.forwardTerminationSignals {
-            try process.run()
-            process.waitUntilExit()
-        }
-
-        if process.terminationStatus != 0 {
-            throw BridgeJSToolError("ts2skeleton returned \(process.terminationStatus)")
-        }
-        let skeleton = try JSONDecoder().decode(ImportedFileSkeleton.self, from: stdoutData)
-        self.addSkeleton(skeleton)
-    }
-
     /// Finalizes the import process and generates Swift code
     func finalize() throws -> String? {
         var decls: [DeclSyntax] = []
@@ -178,7 +137,7 @@ struct ImportTS {
                 )
                 abiParameterSignatures.append((param.name, .i32))
             case .swiftHeapObject(_):
-                throw BridgeJSToolError("swiftHeapObject is not supported in imported signatures")
+                throw BridgeJSCoreError("swiftHeapObject is not supported in imported signatures")
             case .void:
                 break
             }
@@ -226,7 +185,7 @@ struct ImportTS {
                     body.append("return JSObject(id: UInt32(bitPattern: ret))")
                 }
             case .swiftHeapObject(_):
-                throw BridgeJSToolError("swiftHeapObject is not supported in imported signatures")
+                throw BridgeJSCoreError("swiftHeapObject is not supported in imported signatures")
             case .void:
                 break
             }
@@ -529,29 +488,3 @@ struct ImportTS {
         return Trivia(pieces: lines.flatMap { [TriviaPiece.docLineComment("/// \($0)"), .newlines(1)] })
     }
 }
-
-extension Foundation.Process {
-    // Monitor termination/interrruption signals to forward them to child process
-    func setSignalForwarding(_ signalNo: Int32) -> DispatchSourceSignal {
-        let signalSource = DispatchSource.makeSignalSource(signal: signalNo)
-        signalSource.setEventHandler { [self] in
-            signalSource.cancel()
-            kill(processIdentifier, signalNo)
-        }
-        signalSource.resume()
-        return signalSource
-    }
-
-    func forwardTerminationSignals(_ body: () throws -> Void) rethrows {
-        let sources = [
-            setSignalForwarding(SIGINT),
-            setSignalForwarding(SIGTERM),
-        ]
-        defer {
-            for source in sources {
-                source.cancel()
-            }
-        }
-        try body()
-    }
-}

Plugins/BridgeJS/Sources/BridgeJSTool/ExportSwift.swift renamed to Plugins/BridgeJS/Sources/BridgeJSCore/ExportSwift.swift

@@ -0,0 +1,19 @@
+struct ProgressReporting {
+    let print: (String) -> Void
+
+    init(verbose: Bool) {
+        self.init(print: verbose ? { Swift.print($0) } : { _ in })
+    }
+
+    private init(print: @escaping (String) -> Void) {
+        self.print = print
+    }
+
+    static var silent: ProgressReporting {
+        return ProgressReporting(print: { _ in })
+    }
+
+    func print(_ message: String) {
+        self.print(message)
+    }
+}

Plugins/BridgeJS/Sources/BridgeJSTool/ImportTS.swift renamed to Plugins/BridgeJS/Sources/BridgeJSCore/ImportTS.swift

@@ -1,4 +1,5 @@
-import Foundation
+import class Foundation.JSONDecoder
+import struct Foundation.Data
 
 struct BridgeJSLink {
     /// The exported skeletons

Plugins/BridgeJS/Sources/BridgeJSCore/ProgressReporting.swift

@@ -0,0 +1 @@
+../BridgeJSCore

Plugins/BridgeJS/Sources/BridgeJSTool/TypeDeclResolver.swift renamed to Plugins/BridgeJS/Sources/BridgeJSCore/TypeDeclResolver.swift

@@ -1,12 +1,19 @@
 @preconcurrency import func Foundation.exit
 @preconcurrency import func Foundation.fputs
+@preconcurrency import func Foundation.kill
 @preconcurrency import var Foundation.stderr
+@preconcurrency import var Foundation.SIGINT
+@preconcurrency import var Foundation.SIGTERM
 @preconcurrency import struct Foundation.URL
 @preconcurrency import struct Foundation.Data
 @preconcurrency import class Foundation.JSONEncoder
 @preconcurrency import class Foundation.FileManager
 @preconcurrency import class Foundation.JSONDecoder
 @preconcurrency import class Foundation.ProcessInfo
+@preconcurrency import class Foundation.Process
+@preconcurrency import class Foundation.Pipe
+import protocol Dispatch.DispatchSourceSignal
+import class Dispatch.DispatchSource
 import SwiftParser
 
 /// BridgeJS Tool
@@ -247,38 +254,86 @@ internal func which(_ executable: String) throws -> URL {
     throw BridgeJSToolError("Executable \(executable) not found in PATH")
 }
 
-struct BridgeJSToolError: Swift.Error, CustomStringConvertible {
-    let description: String
+extension ImportTS {
+    /// Processes a TypeScript definition file and extracts its API information
+    mutating func addSourceFile(_ sourceFile: String, tsconfigPath: String) throws {
+        let nodePath = try which("node")
+        let ts2skeletonPath = URL(fileURLWithPath: #filePath)
+            .deletingLastPathComponent()
+            .deletingLastPathComponent()
+            .appendingPathComponent("JavaScript")
+            .appendingPathComponent("bin")
+            .appendingPathComponent("ts2skeleton.js")
+        let arguments = [ts2skeletonPath.path, sourceFile, "--project", tsconfigPath]
+
+        progress.print("Running ts2skeleton...")
+        progress.print("  \(([nodePath.path] + arguments).joined(separator: " "))")
+
+        let process = Process()
+        let stdoutPipe = Pipe()
+        nonisolated(unsafe) var stdoutData = Data()
+
+        process.executableURL = nodePath
+        process.arguments = arguments
+        process.standardOutput = stdoutPipe
+
+        stdoutPipe.fileHandleForReading.readabilityHandler = { handle in
+            let data = handle.availableData
+            if data.count > 0 {
+                stdoutData.append(data)
+            }
+        }
+        try process.forwardTerminationSignals {
+            try process.run()
+            process.waitUntilExit()
+        }
 
-    init(_ message: String) {
-        self.description = message
+        if process.terminationStatus != 0 {
+            throw BridgeJSCoreError("ts2skeleton returned \(process.terminationStatus)")
+        }
+        let skeleton = try JSONDecoder().decode(ImportedFileSkeleton.self, from: stdoutData)
+        self.addSkeleton(skeleton)
     }
 }
 
-private func printStderr(_ message: String) {
-    fputs(message + "\n", stderr)
-}
-
-struct ProgressReporting {
-    let print: (String) -> Void
-
-    init(verbose: Bool) {
-        self.init(print: verbose ? { Swift.print($0) } : { _ in })
+extension Foundation.Process {
+    // Monitor termination/interrruption signals to forward them to child process
+    func setSignalForwarding(_ signalNo: Int32) -> DispatchSourceSignal {
+        let signalSource = DispatchSource.makeSignalSource(signal: signalNo)
+        signalSource.setEventHandler { [self] in
+            signalSource.cancel()
+            kill(processIdentifier, signalNo)
+        }
+        signalSource.resume()
+        return signalSource
     }
 
-    private init(print: @escaping (String) -> Void) {
-        self.print = print
+    func forwardTerminationSignals(_ body: () throws -> Void) rethrows {
+        let sources = [
+            setSignalForwarding(SIGINT),
+            setSignalForwarding(SIGTERM),
+        ]
+        defer {
+            for source in sources {
+                source.cancel()
+            }
+        }
+        try body()
     }
+}
 
-    static var silent: ProgressReporting {
-        return ProgressReporting(print: { _ in })
-    }
+struct BridgeJSToolError: Swift.Error, CustomStringConvertible {
+    let description: String
 
-    func print(_ message: String) {
-        self.print(message)
+    init(_ message: String) {
+        self.description = message
     }
 }
 
+private func printStderr(_ message: String) {
+    fputs(message + "\n", stderr)
+}
+
 // MARK: - Minimal Argument Parsing
 
 struct OptionRule {