Skip to content

Updated arity #29

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
JordanMarr merged 1 commit into from
Aug 7, 2025
Merged

Updated arity #29

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
34 changes: 29 additions & 5 deletions src/FSharp.SystemCommandLine/Inputs.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,30 @@ type ActionInput<'T>(inputType: ActionInputSource) =
| ParsedArgument a -> a :?> Argument<'T> |> parseResult.GetValue
| Context -> parseResult |> unbox<'T>

type Arity =
| ArgumentArity of min: int * max: int
| ExactlyOne
| MaximumNumberOfValues of max: int
| MinimumNumberOfValues of min: int
| OneOrMore
| Zero
| ZeroOrMore
| ZeroOrOne

module Arity =

let toArgumentArity (arity: Arity) =
match arity with
| ArgumentArity (min, max) -> (min, max)
| ExactlyOne -> (1, 1)
| MaximumNumberOfValues max -> (0, max)
| MinimumNumberOfValues min -> (min, 100_000)
| OneOrMore -> (1, 100_000)
| Zero -> (0, 0)
| ZeroOrMore -> (0, 100_000)
| ZeroOrOne -> (0, 1)
|> System.CommandLine.ArgumentArity

module Input =

/// Injects an `ActionContext` into the action which contains the `ParseResult` and a cancellation token.
Expand Down Expand Up @@ -134,7 +158,7 @@ module Input =
| [ token ] -> MaybeParser.parseTokenValue token.Value
| _ :: _ -> failwith "F# Option can only be used with a single argument."
)
o.Arity <- ArgumentArity(0, 1)
o.Arity <- ArgumentArity (0, 1) |> Arity.toArgumentArity
o.DefaultValueFactory <- (fun _ -> None)
ActionInput.OfOption<'T option> o

Expand Down Expand Up @@ -233,10 +257,10 @@ module Input =
)

/// Sets the arity of an option or argument.
let arity (arity: ArgumentArity) (input: ActionInput<'T>) =
input
|> editOption (fun o -> o.Arity <- arity)
|> editArgument (fun a -> a.Arity <- arity)
let arity (arity: Arity) (input: ActionInput<'T>) =
input
|> editOption (fun o -> o.Arity <- arity |> Arity.toArgumentArity)
|> editArgument (fun a -> a.Arity <- arity |> Arity.toArgumentArity)

/// Sets a value that indicates whether multiple arguments are allowed for each option identifier token. (Defaults to 'false'.)
let allowMultipleArgumentsPerToken (input: ActionInput<'T>) =
Expand Down