Skip to content

feat!: add more integers and unsigned integers #2094

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
dearchap merged 2 commits into from
Apr 19, 2025
Merged

feat!: add more integers and unsigned integers #2094

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e908328
feat!: add more integers and unsigned integers
somebadcode Apr 15, 2025
9bb00e2
fix(extFlag): extFlag doesn't set default value prior to parsing
somebadcode Apr 19, 2025
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: 10 additions & 2 deletions args.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,9 +152,17 @@ func (a *ArgumentBase[T, C, VC]) Parse(s []string) ([]string, error) {

type (
FloatArg = ArgumentBase[float64, NoConfig, floatValue]
IntArg = ArgumentBase[int64, IntegerConfig, intValue]
IntArg = ArgumentBase[int, IntegerConfig, intValue[int]]
Comment thread
somebadcode marked this conversation as resolved.
Int8Arg = ArgumentBase[int8, IntegerConfig, intValue[int8]]
Int16Arg = ArgumentBase[int16, IntegerConfig, intValue[int16]]
Int32Arg = ArgumentBase[int32, IntegerConfig, intValue[int32]]
Int64Arg = ArgumentBase[int64, IntegerConfig, intValue[int64]]
StringArg = ArgumentBase[string, StringConfig, stringValue]
StringMapArg = ArgumentBase[map[string]string, StringConfig, StringMap]
TimestampArg = ArgumentBase[time.Time, TimestampConfig, timestampValue]
UintArg = ArgumentBase[uint64, IntegerConfig, uintValue]
UintArg = ArgumentBase[uint, IntegerConfig, uintValue[uint]]
Uint8Arg = ArgumentBase[uint8, IntegerConfig, uintValue[uint8]]
Uint16Arg = ArgumentBase[uint16, IntegerConfig, uintValue[uint16]]
Uint32Arg = ArgumentBase[uint32, IntegerConfig, uintValue[uint32]]
Uint64Arg = ArgumentBase[uint64, IntegerConfig, uintValue[uint64]]
)
8 changes: 4 additions & 4 deletions args_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ func TestArgumentsRootCommand(t *testing.T) {
var fval float64
var fvals []float64
cmd.Arguments = []Argument{
&IntArg{
&Int64Arg{
Name: "ia",
Min: 1,
Max: 1,
Expand Down Expand Up @@ -49,7 +49,7 @@ func TestArgumentsRootCommand(t *testing.T) {
&StringArg{
Name: "sa",
},
&UintArg{
&Uint64Arg{
Name: "ua",
Min: 2,
Max: 1, // max is less than min
Expand All @@ -68,7 +68,7 @@ func TestArgumentsSubcommand(t *testing.T) {
{
Name: "subcmd",
Flags: []Flag{
&IntFlag{
&Int64Flag{
Name: "foo",
Value: 10,
Destination: &ifval,
Expand Down Expand Up @@ -114,7 +114,7 @@ func TestArgumentsSubcommand(t *testing.T) {
}

func TestArgsUsage(t *testing.T) {
arg := &IntArg{
arg := &Int64Arg{
Name: "ia",
Min: 0,
Max: 1,
Expand Down
84 changes: 42 additions & 42 deletions command_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ func TestCommand_OnUsageError_hasCommandContext(t *testing.T) {
cmd := &Command{
Name: "bar",
Flags: []Flag{
&IntFlag{Name: "flag"},
&Int64Flag{Name: "flag"},
},
OnUsageError: func(_ context.Context, cmd *Command, err error, _ bool) error {
return fmt.Errorf("intercepted in %s: %s", cmd.Name, err.Error())
Expand All @@ -370,7 +370,7 @@ func TestCommand_OnUsageError_WithWrongFlagValue(t *testing.T) {
cmd := &Command{
Name: "bar",
Flags: []Flag{
&IntFlag{Name: "flag"},
&Int64Flag{Name: "flag"},
},
OnUsageError: func(_ context.Context, _ *Command, err error, _ bool) error {
assert.ErrorContains(t, err, "strconv.ParseInt: parsing \"wrong\"")
Expand All @@ -391,7 +391,7 @@ func TestCommand_OnUsageError_WithSubcommand(t *testing.T) {
},
},
Flags: []Flag{
&IntFlag{Name: "flag"},
&Int64Flag{Name: "flag"},
},
OnUsageError: func(_ context.Context, _ *Command, err error, _ bool) error {
assert.ErrorContains(t, err, "parsing \"wrong\": invalid syntax")
Expand Down Expand Up @@ -478,7 +478,7 @@ func TestCommand_Run_CustomShellCompleteAcceptsMalformedFlags(t *testing.T) {
Name: "bar",
Usage: "this is for testing",
Flags: []Flag{
&IntFlag{
&Int64Flag{
Name: "number",
Usage: "A number to parse",
},
Expand Down Expand Up @@ -558,7 +558,7 @@ func TestCommand_VisibleFlagCategories(t *testing.T) {
Name: "strd1", // no category set and also hidden
Hidden: true,
},
&IntFlag{
&Int64Flag{
Name: "intd",
Aliases: []string{"altd1", "altd2"},
Category: "cat1",
Expand Down Expand Up @@ -1253,11 +1253,11 @@ func TestCommand_ParseSliceFlags(t *testing.T) {
{
Name: "cmd",
Flags: []Flag{
&IntSliceFlag{Name: "p", Value: []int64{}, Usage: "set one or more ip addr"},
Comment thread
somebadcode marked this conversation as resolved.
&Int64SliceFlag{Name: "p", Value: []int64{}, Usage: "set one or more ip addr"},
&StringSliceFlag{Name: "ip", Value: []string{}, Usage: "set one or more ports to open"},
},
Action: func(_ context.Context, cmd *Command) error {
parsedIntSlice = cmd.IntSlice("p")
parsedIntSlice = cmd.Int64Slice("p")
parsedStringSlice = cmd.StringSlice("ip")
return nil
},
Expand All @@ -1281,11 +1281,11 @@ func TestCommand_ParseSliceFlagsWithMissingValue(t *testing.T) {
{
Name: "cmd",
Flags: []Flag{
&IntSliceFlag{Name: "a", Usage: "set numbers"},
&Int64SliceFlag{Name: "a", Usage: "set numbers"},
&StringSliceFlag{Name: "str", Usage: "set strings"},
},
Action: func(_ context.Context, cmd *Command) error {
parsedIntSlice = cmd.IntSlice("a")
parsedIntSlice = cmd.Int64Slice("a")
parsedStringSlice = cmd.StringSlice("str")
return nil
},
Expand Down Expand Up @@ -2301,7 +2301,7 @@ func TestCommand_Run_SubcommandDoesNotOverwriteErrorFromBefore(t *testing.T) {
func TestCommand_OnUsageError_WithWrongFlagValue_ForSubcommand(t *testing.T) {
cmd := &Command{
Flags: []Flag{
&IntFlag{Name: "flag"},
&Int64Flag{Name: "flag"},
},
OnUsageError: func(_ context.Context, _ *Command, err error, isSubcommand bool) error {
assert.False(t, isSubcommand, "Expect subcommand")
Expand Down Expand Up @@ -2455,7 +2455,7 @@ func TestHandleExitCoder_Custom(t *testing.T) {
func TestShellCompletionForIncompleteFlags(t *testing.T) {
cmd := &Command{
Flags: []Flag{
&IntFlag{
&Int64Flag{
Name: "test-completion",
},
},
Expand Down Expand Up @@ -2808,7 +2808,7 @@ func TestFlagAction(t *testing.T) {
return err
},
},
&IntFlag{
&Int64Flag{
Name: "f_int",
Local: true,
Action: func(_ context.Context, cmd *Command, v int64) error {
Expand All @@ -2819,7 +2819,7 @@ func TestFlagAction(t *testing.T) {
return err
},
},
&IntSliceFlag{
&Int64SliceFlag{
Name: "f_int_slice",
Local: true,
Action: func(_ context.Context, cmd *Command, v []int64) error {
Expand All @@ -2846,7 +2846,7 @@ func TestFlagAction(t *testing.T) {
return err
},
},
&UintFlag{
&Uint64Flag{
Name: "f_uint",
Local: true,
Action: func(_ context.Context, cmd *Command, v uint64) error {
Expand Down Expand Up @@ -2906,15 +2906,15 @@ func TestPersistentFlag(t *testing.T) {
return nil
},
},
&IntSliceFlag{
&Int64SliceFlag{
Name: "persistentCommandSliceFlag",
Destination: &persistentCommandSliceInt,
},
&FloatSliceFlag{
Name: "persistentCommandFloatSliceFlag",
Value: []float64{11.3, 12.5},
},
&IntFlag{
&Int64Flag{
Name: "persistentCommandOverrideFlag",
Destination: &appOverrideInt,
},
Expand All @@ -2928,16 +2928,16 @@ func TestPersistentFlag(t *testing.T) {
{
Name: "cmd",
Flags: []Flag{
&IntFlag{
&Int64Flag{
Name: "cmdFlag",
Destination: &topInt,
Local: true,
},
&IntFlag{
&Int64Flag{
Name: "cmdPersistentFlag",
Destination: &topPersistentInt,
},
&IntFlag{
&Int64Flag{
Name: "paof",
Aliases: []string{"persistentCommandOverrideFlag"},
Destination: &appOverrideCmdInt,
Expand All @@ -2948,7 +2948,7 @@ func TestPersistentFlag(t *testing.T) {
{
Name: "subcmd",
Flags: []Flag{
&IntFlag{
&Int64Flag{
Name: "cmdFlag",
Destination: &subCommandInt,
Local: true,
Expand Down Expand Up @@ -3080,7 +3080,7 @@ func TestRequiredFlagDelayed(t *testing.T) {
{
Name: "sub",
Flags: []Flag{
&IntFlag{
&Int64Flag{
Name: "if",
Required: true,
},
Expand Down Expand Up @@ -3169,7 +3169,7 @@ func TestFlagDuplicates(t *testing.T) {
Name: "sflag",
OnlyOnce: true,
},
&IntSliceFlag{
&Int64SliceFlag{
Name: "isflag",
},
&FloatSliceFlag{
Expand All @@ -3180,7 +3180,7 @@ func TestFlagDuplicates(t *testing.T) {
Name: "bifflag",
OnlyOnce: true,
},
&IntFlag{
&Int64Flag{
Name: "iflag",
},
},
Expand Down Expand Up @@ -3261,47 +3261,47 @@ func TestShorthandCommand(t *testing.T) {
func TestCommand_Int(t *testing.T) {
pCmd := &Command{
Flags: []Flag{
&IntFlag{
&Int64Flag{
Name: "myflag",
Value: 12,
},
},
}
cmd := &Command{
Flags: []Flag{
&IntFlag{
&Int64Flag{
Name: "top-flag",
Value: 13,
},
},
parent: pCmd,
}

require.Equal(t, int64(12), cmd.Int("myflag"))
require.Equal(t, int64(13), cmd.Int("top-flag"))
require.Equal(t, int64(12), cmd.Int64("myflag"))
require.Equal(t, int64(13), cmd.Int64("top-flag"))
}

func TestCommand_Uint(t *testing.T) {
pCmd := &Command{
Flags: []Flag{
&UintFlag{
&Uint64Flag{
Name: "myflagUint",
Value: 13,
},
},
}
cmd := &Command{
Flags: []Flag{
&UintFlag{
&Uint64Flag{
Name: "top-flag",
Value: 14,
},
},
parent: pCmd,
}

require.Equal(t, uint64(13), cmd.Uint("myflagUint"))
require.Equal(t, uint64(14), cmd.Uint("top-flag"))
require.Equal(t, uint64(13), cmd.Uint64("myflagUint"))
require.Equal(t, uint64(14), cmd.Uint64("top-flag"))
}

func TestCommand_Float64(t *testing.T) {
Expand Down Expand Up @@ -3442,7 +3442,7 @@ func TestCommand_Value(t *testing.T) {
subCmd := &Command{
Name: "test",
Flags: []Flag{
&IntFlag{
&Int64Flag{
Name: "myflag",
Usage: "doc",
Aliases: []string{"m", "mf"},
Expand All @@ -3455,7 +3455,7 @@ func TestCommand_Value(t *testing.T) {

cmd := &Command{
Flags: []Flag{
&IntFlag{
&Int64Flag{
Name: "top-flag",
Usage: "doc",
Aliases: []string{"t", "tf"},
Expand Down Expand Up @@ -3675,7 +3675,7 @@ func TestCommand_NumFlags(t *testing.T) {
func TestCommand_Set(t *testing.T) {
cmd := &Command{
Flags: []Flag{
&IntFlag{
&Int64Flag{
Name: "int",
Value: 5,
},
Expand All @@ -3685,7 +3685,7 @@ func TestCommand_Set(t *testing.T) {

r.False(cmd.IsSet("int"))
r.NoError(cmd.Set("int", "1"))
r.Equal(int64(1), cmd.Int("int"))
r.Equal(int64(1), cmd.Int64("int"))
r.True(cmd.IsSet("int"))
}

Expand Down Expand Up @@ -4151,7 +4151,7 @@ func TestCommandReadArgsFromStdIn(t *testing.T) {
cmd.Reader, err = os.Open(fp.Name())
r.NoError(err)
cmd.Flags = []Flag{
&IntFlag{
&Int64Flag{
Name: "if",
},
&FloatFlag{
Expand All @@ -4164,7 +4164,7 @@ func TestCommandReadArgsFromStdIn(t *testing.T) {

actionCalled := false
cmd.Action = func(ctx context.Context, c *Command) error {
r.Equal(tst.expectedInt, c.Int("if"))
r.Equal(tst.expectedInt, c.Int64("if"))
r.Equal(tst.expectedFloat, c.Float("ff"))
r.Equal(tst.expectedSlice, c.StringSlice("ssf"))
actionCalled = true
Expand All @@ -4189,15 +4189,15 @@ func TestZeroValueCommand(t *testing.T) {

func TestCommandInvalidName(t *testing.T) {
var cmd Command
assert.Equal(t, int64(0), cmd.Int("foo"))
assert.Equal(t, uint64(0), cmd.Uint("foo"))
assert.Equal(t, int64(0), cmd.Int64("foo"))
assert.Equal(t, uint64(0), cmd.Uint64("foo"))
assert.Equal(t, float64(0), cmd.Float("foo"))
assert.Equal(t, "", cmd.String("foo"))
assert.Equal(t, time.Time{}, cmd.Timestamp("foo"))
assert.Equal(t, time.Duration(0), cmd.Duration("foo"))

assert.Equal(t, []int64(nil), cmd.IntSlice("foo"))
assert.Equal(t, []uint64(nil), cmd.UintSlice("foo"))
assert.Equal(t, []int64(nil), cmd.Int64Slice("foo"))
assert.Equal(t, []uint64(nil), cmd.Uint64Slice("foo"))
assert.Equal(t, []float64(nil), cmd.FloatSlice("foo"))
assert.Equal(t, []string(nil), cmd.StringSlice("foo"))
}
Expand Down Expand Up @@ -4501,7 +4501,7 @@ func TestSliceStringFlagParsing(t *testing.T) {
func TestJSONExportCommand(t *testing.T) {
cmd := buildExtendedTestCommand()
cmd.Arguments = []Argument{
&IntArg{
&Int64Arg{
Name: "fooi",
},
}
Expand Down
Loading