wip

Author: ktoso

Plugins/JExtractSwiftCommandPlugin/JExtractSwiftCommandPlugin.swift

@@ -79,6 +79,7 @@ final class JExtractSwiftCommandPlugin: SwiftJavaPluginProtocol, BuildToolPlugin
     }
 
     var arguments: [String] = [
+      "jextract",
       "--swift-module", sourceModule.name,
       "--package-name", javaPackage,
       "--output-directory-java", context.outputDirectoryJava.path(percentEncoded: false),

Plugins/JExtractSwiftPlugin/JExtractSwiftPlugin.swift

@@ -54,6 +54,7 @@ struct JExtractSwiftBuildToolPlugin: SwiftJavaPluginProtocol, BuildToolPlugin {
     let outputDirectorySwift = context.outputDirectorySwift
 
     var arguments: [String] = [
+      "jextract",
       "--swift-module", sourceModule.name,
       "--package-name", javaPackage,
       "--output-directory-java", outputDirectoryJava.path(percentEncoded: false),

Sources/JExtractSwift/Swift2Java.swift

@@ -20,11 +20,14 @@ import JavaKitShared
 
 /// Command-line utility, similar to `jextract` to export Swift types to Java.
 public struct SwiftToJava: ParsableCommand {
-  public init() {}
+  public static var _commandName: String { "jextract" }
+
+  public static var configuration = CommandConfiguration(
+          commandName: Self._commandName,
+          abstract: "Generate Java wrappers for Swift code.")
 
-  public static var _commandName: String {
-    "jextract-swift"
-  }
+
+  public init() {}
 
   @Option(help: "The package the generated Java code should be emitted into.")
   var packageName: String
@@ -49,18 +52,23 @@ public struct SwiftToJava: ParsableCommand {
   var input: [String]
 
   public func run() throws {
-    let inputPaths = self.input.dropFirst().map { URL(string: $0)! }
+    let inputPaths = self.input.map { URL(string: $0)! }
 
     let translator = Swift2JavaTranslator(
       javaPackage: packageName,
       swiftModuleName: swiftModule
     )
     translator.log.logLevel = logLevel
-
+    
     var allFiles: [URL] = []
     let fileManager = FileManager.default
     let log = translator.log
-    
+
+    guard !inputPaths.isEmpty else {
+      log.warning("Input paths are empty!")
+      return
+    }
+
     for path in inputPaths {
       log.debug("Input path: \(path)")
       if isDirectory(url: path) {
@@ -74,6 +82,8 @@ public struct SwiftToJava: ParsableCommand {
       }
     }
 
+    log.trace("Input file: \(allFiles)")
+
     for file in allFiles where canExtract(from: file) {
       translator.log.debug("Importing module '\(swiftModule)', file: \(file)")
 

Sources/SwiftJavaTool/JavaToSwift.swift

@@ -24,9 +24,12 @@ import SwiftSyntaxBuilder
 import JavaKitConfigurationShared
 import JavaKitShared
 
-@main
 struct JavaToSwift: AsyncParsableCommand {
-  static var _commandName: String { "swift-java" }
+  static var _commandName: String { "java2swift" }
+
+  static var configuration = CommandConfiguration(
+          commandName: Self._commandName,
+          abstract: "Generate Swift wrappers for Java code.")
 
   @Option(help: "The name of the Swift module into which the resulting Swift types will be generated.")
   var moduleName: String?
@@ -61,10 +64,10 @@ struct JavaToSwift: AsyncParsableCommand {
   @Option(name: .shortAndLong, help: "The directory in which to output the generated Swift files or the swift-java configuration file.")
   var outputDirectory: String? = nil
 
-  
+
   @Option(name: .shortAndLong, help: "Directory where to write cached values (e.g. swift-java.classpath files)")
   var cacheDirectory: String? = nil
-  
+
   var effectiveCacheDirectory: String? {
     if let cacheDirectory {
       return cacheDirectory
@@ -74,7 +77,7 @@ struct JavaToSwift: AsyncParsableCommand {
       return nil
     }
   }
-  
+
   @Option(name: .shortAndLong, help: "How to handle an existing swift-java.config; by default 'overwrite' by can be changed to amending a configuration")
   var existingConfig: ExistingConfigFileMode = .overwrite
   public enum ExistingConfigFileMode: String, ExpressibleByArgument, Codable {
@@ -168,7 +171,7 @@ struct JavaToSwift: AsyncParsableCommand {
     print("[info][swift-java] Run: \(CommandLine.arguments.joined(separator: " "))")
     do {
       let config: Configuration
-      
+
       // Determine the mode in which we'll execute.
       let toolMode: ToolMode
       if jar {
@@ -217,14 +220,14 @@ struct JavaToSwift: AsyncParsableCommand {
       let classpathFromEnv = ProcessInfo.processInfo.environment["CLASSPATH"]?.split(separator: ":").map(String.init) ?? []
       let classpathFromConfig: [String] = config.classpath?.split(separator: ":").map(String.init) ?? []
       print("[debug][swift-java] Base classpath from config: \(classpathFromConfig)")
-      
+
       var classpathEntries: [String] = classpathFromConfig
-      
+
       let swiftJavaCachedModuleClasspath = findSwiftJavaClasspaths(
         in: self.effectiveCacheDirectory ?? FileManager.default.currentDirectoryPath)
       print("[debug][swift-java] Classpath from *.swift-java.classpath files: \(swiftJavaCachedModuleClasspath)")
       classpathEntries += swiftJavaCachedModuleClasspath
-      
+
       if !classpathOptionEntries.isEmpty {
         print("[debug][swift-java] Classpath from options: \(classpathOptionEntries)")
         classpathEntries += classpathOptionEntries

Sources/SwiftJavaTool/SwiftJavaMain.swift

@@ -0,0 +1,41 @@
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2024 Apple Inc. and the Swift.org project authors
+// Licensed under Apache License v2.0
+//
+// See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of Swift.org project authors
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+//===----------------------------------------------------------------------===//
+
+import ArgumentParser
+import Foundation
+import Java2SwiftLib
+import JExtractSwift
+import JavaKit
+import JavaKitJar
+import JavaKitNetwork
+import JavaKitReflection
+import SwiftSyntax
+import SwiftSyntaxBuilder
+import JavaKitConfigurationShared
+import JavaKitShared
+
+@main
+struct SwiftJavaMain: AsyncParsableCommand {
+  static var _commandName: String { "swift-java" }
+
+    static var configuration = CommandConfiguration(
+        abstract: "A utility for Swift and Java interoperability.",
+        subcommands: [
+          JavaToSwift.self,
+          SwiftToJava.self,
+         ],
+        defaultSubcommand: JavaToSwift.self
+    )
+}
+