Skip to content

command: fix argument parser usage, remove workaround for bool? opts #487

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ktoso merged 1 commit into from
Dec 9, 2025
Merged

command: fix argument parser usage, remove workaround for bool? opts #487

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions Sources/SwiftJavaTool/Commands/JExtractCommand.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ extension SwiftJava {
@Option(help: "The directory where generated Java files should be written. Generally used with jextract mode.")
var outputJava: String

@Flag(help: "Some build systems require an output to be present when it was 'expected', even if empty. This is used by the JExtractSwiftPlugin build plugin, but otherwise should not be necessary.")
var writeEmptyFiles: Bool = false
@Flag(inversion: .prefixedNo, help: "Some build systems require an output to be present when it was 'expected', even if empty. This is used by the JExtractSwiftPlugin build plugin, but otherwise should not be necessary.")
var writeEmptyFiles: Bool?

@Option(help: "The mode of generation to use for the output files. Used with jextract mode. By default, unsigned Swift types are imported as their bit-width compatible signed Java counterparts, and annotated using the '@Unsigned' annotation. You may choose the 'wrapGuava' mode in order to import types as class wrapper types (`UnsignedInteger` et al) defined by the Google Guava library's `com.google.common.primitives' package. that ensure complete type-safety with regards to unsigned values, however they incur an allocation and performance overhead.")
var unsignedNumbersMode: JExtractUnsignedIntegerMode?
Expand All @@ -82,8 +82,8 @@ extension SwiftJava {
@Option(help: "The mode to use for extracting asynchronous Swift functions. By default async methods are extracted as Java functions returning CompletableFuture.")
var asyncFuncMode: JExtractAsyncFuncMode?

@Flag(help: "By enabling this mode, JExtract will generate Java code that allows you to implement Swift protocols using Java classes. This feature requires disabling the sandbox mode in SwiftPM. This only works in the 'jni' mode.")
var enableJavaCallbacks: Bool = false
@Flag(inversion: .prefixedNo, help: "By enabling this mode, JExtract will generate Java code that allows you to implement Swift protocols using Java classes. This feature requires disabling the SwiftPM Sandbox (!). This feature is onl supported in 'jni' mode.")
var enableJavaCallbacks: Bool?

@Option(help: "If specified, JExtract will output to this file a list of paths to all generated Java source files")
var generatedJavaSourcesListFileOutput: String?
Expand All @@ -98,11 +98,7 @@ extension SwiftJava.JExtractCommand {
config.outputJavaDirectory = outputJava
config.outputSwiftDirectory = outputSwift

// @Flag does not support optional, so we check ourself if it is passed
let writeEmptyFiles = CommandLine.arguments.contains("--write-empty-files") ? true : nil
configure(&config.writeEmptyFiles, overrideWith: writeEmptyFiles)

let enableJavaCallbacks = CommandLine.arguments.contains("--enable-java-callbacks") ? true : nil
configure(&config.enableJavaCallbacks, overrideWith: enableJavaCallbacks)

configure(&config.unsignedNumbersMode, overrideWith: self.unsignedNumbersMode)
Expand Down
Loading