go.mod: appended /v2 to the module path

README.md

@@ -60,6 +60,8 @@ func main() {
 
 Refer to the unit test for a realistic example: [`cli_test.go`](cli_test.go).
 
+## Usage
+
 ## API Reference
 
 Key types and methods:

cli.go

@@ -14,10 +14,11 @@ type cliParser interface {
 	getCliArgs(startIndex, endIndex int) (args []string)
 	PrintVersion(specs []string)
 	PrintUsage()
+	FlagIsSet(flag int16) bool
 }
 
 type cliOptionParser interface {
-	parse(parser cliParser, argIndex int, valuePtr *string) (skipNextArg bool, err error)
+	parse(parser cliParser, argIndex int, valuePtr *string) (skipNextArg bool, optValue string, err error)
 	getTemplate() string
 	getDefaultValue() string
 	getBase() *cliOptionBase
@@ -25,6 +26,7 @@ type cliOptionParser interface {
 	isSet() bool
 	isHidden() bool
 	requiresValue() bool
+	finalCheck() (err error)
 }
 
 type OptManager interface {
@@ -32,26 +34,38 @@ type OptManager interface {
 }
 
 type SpecialValueFunc func(manager OptManager, cliValue string, currentValue any) (value any, err error)
+type FinalCheckFunc func(currentValue any) (err error)
 
 type OptReference interface {
 	AddSpecialValue(cliValue string, specialFunc SpecialValueFunc)
+	OnFinalCheck(checkFunc FinalCheckFunc)
 	SetHidden(hidden bool)
 }
 
+const (
+	ResetOnEqualSign = int16(1 << iota) // for some option types, like arrays, the equal signs reset to empty the accumulator of values
+)
+
 type CliParser struct {
 	description string
 	version     string
 	options     []cliOptionParser
 	argSpecs    []argSpec
 	cliArgs     []string
+	flags       int16
 }
 
-func (cli *CliParser) Init(argv []string, version string, description string) {
+func (cli *CliParser) Init(version string, description string, flags ...int16) {
 	cli.version = version
 	cli.description = description
-	cli.cliArgs = argv
+	for _, flag := range flags {
+		cli.flags |= flag
+	}
 }
 
+func (cli *CliParser) FlagIsSet(flag int16) bool {
+	return (cli.flags & flag) == flag
+}
 func (cli *CliParser) GetOption(name string) (ref OptReference) {
 	var opt cliOptionParser
 	if strings.HasPrefix(name, "-") {
@@ -155,16 +169,12 @@ func (cli *CliParser) addHelpAndVersion() {
 
 }
 
-func (cli *CliParser) Parse() (err error) {
-	var arg string
-	var i int
-	var args []string
+func (cli *CliParser) parseOptions() (commandArgs []string, err error) {
+	// var commandArgs []string
 	var optionsAllowed bool = true
 
-	cli.addHelpAndVersion()
-
 	skipNext := false
-	for i, arg = range cli.cliArgs[1:] {
+	for i, arg := range cli.cliArgs[1:] {
 		if skipNext {
 			skipNext = false
 		} else {
@@ -178,40 +188,81 @@ func (cli *CliParser) Parse() (err error) {
 					break
 				}
 			} else {
-				args = append(args, arg)
+				commandArgs = append(commandArgs, arg)
 			}
 		}
 	}
-	if err == nil {
-		var argSpec argSpec
-		var n, specIndex int
-		i = 0
+	return
+}
 
-		for specIndex, argSpec = range cli.argSpecs {
-			if n, err = argSpec.parse(cli, specIndex, args, i); err != nil {
+func (cli *CliParser) checkOptionValues() (err error) {
+	for _, opt := range cli.options {
+		if err = opt.finalCheck(); err != nil {
+			break
+		}
+	}
+	return
+}
+
+func (cli *CliParser) parseCommandArgs(commandArgs []string) (err error) {
+	var n int
+
+	i := 0
+	// acquire arguments as required by the argSpecs
+	specIndex := -1
+	for index, argSpec := range cli.argSpecs {
+		specIndex = index
+		if n, err = argSpec.parse(cli, specIndex, commandArgs, i); err != nil {
 			break
 		}
 		i += n
-			if i >= len(args) {
+		if i >= len(commandArgs) {
 			break
 		}
 	}
+
+	// check if there are remaining arg-specs that require a value
 	if err == nil {
-			if i < len(args) {
+		if i < len(commandArgs) {
 			err = fmt.Errorf("too many arguments: %d allowed", i)
 		} else {
 			specIndex++
+			if specIndex < len(cli.argSpecs) {
+				// skip all non required args
 				for _, spec := range cli.argSpecs[specIndex:] {
 					if !spec.getBase().required {
 						specIndex++
 					}
 				}
+			}
+			// return error if there are remaining arg-specs that require a value
 			if specIndex < len(cli.argSpecs) {
 				err = errTooFewArguments(len(cli.argSpecs))
 			}
 		}
 	}
+	return
 }
+
+func (cli *CliParser) Parse(argv []string) (err error) {
+	var commandArgs []string
+
+	cli.cliArgs = argv
+
+	cli.addHelpAndVersion()
+
+	// first parse options and collect command arguments in the args array
+	if commandArgs, err = cli.parseOptions(); err != nil {
+		return
+	}
+
+	// do final checks
+	if err = cli.checkOptionValues(); err != nil {
+		return
+	}
+
+	// then parse collected arguments
+	err = cli.parseCommandArgs(commandArgs)
 	return
 }
 

cli_test.go

@@ -6,7 +6,7 @@ import (
 	"testing"
 )
 
-const version = `$VER:ddt-ocr,1.0.1,2025-11-23,celestino.amoroso@gmail.com:$`
+const version = `$VER:ddt-ocr,2.0.0,2026-03-19,celestino.amoroso@gmail.com:$`
 
 type GlobalData struct {
 	config    string
@@ -33,7 +33,7 @@ func TestVerbose(t *testing.T) {
 		t.Error(err)
 		return
 	}
-	if err := cli.Parse(); err != nil {
+	if err := cli.Parse(commonArgs()); err != nil {
 		t.Error(err)
 	} else if gd.verbose != 3 {
 		t.Errorf("Expected verbose level 3, got %d", gd.verbose)
@@ -85,13 +85,14 @@ where:
   <dest>  Output destination file
   <report>  Optional report file
   <options>
+    -V, --verbose                   Print verbose output (default: "0")
     -o, --print-ocr                 Print the OCR output to stderr
     -s, --save-clip                 Save the image clips as PNG files (alias: save-clips)
     -t, --trace                     Enable trace mode for detailed logging
     -p, --page(s) <num>["," ...]    Process only the specified pages (comma-separated list)
     -c, --config <file>             Alternate configuration file
     -l, --log(s) <string>["," ...]  Logging options (comma-separated list)
-    -V, --var(s) <key=value>["," ...]  Define one or more comma separated variables for the actions context (multiple allowed)
+    --var(s) <key=value>["," ...]   Define one or more comma separated variables for the actions context (multiple allowed)
     -n, --input-name <string>       Input file name when source comes from stdin
     -d, --work-dir <dir>            Work directory
     --attempts <num>                Attempts for retrying failed operations (default: "1")
@@ -109,7 +110,8 @@ where:
 	}
 }
 func TestParser(t *testing.T) {
-	const expectedOutput = `Option: print-ocr, Type: bool, Value: true
+	const expectedOutput = `Option: verbose, Type: num, Value: 3
+Option: print-ocr, Type: bool, Value: true
 Option: save-clip, Type: bool, Value: false
 Option: trace, Type: bool, Value: true
 Option: page, Type: num-array, Value: [17 18]
@@ -132,18 +134,18 @@ Option: version, Type: n/a, Value: <nil>
 		return
 	}
 	tracer := NewSimpleOptionTracer(&sb)
-	if err := cli.Parse(); err == nil {
+	if err := cli.Parse(commonArgs()); err == nil {
 		cli.TraceOptions(tracer)
 		if sb.String() != expectedOutput {
-			t.Errorf("Parsed options do not match expected.\nGot:\n%q\nExpected:\n%q", sb.String(), expectedOutput)
+			t.Errorf("Parsed options do not match expected list.\nGot:\n%q\nExpected:\n%q", sb.String(), expectedOutput)
 		}
 	} else {
 		t.Error(err)
 	}
 }
 
-func initCli(cli *CliParser, gd *GlobalData) (err error) {
-	args := []string{
+func commonArgs() []string {
+	return []string{
 		"ddt-ocr",
 		"--log", "all",
 		"-t",
@@ -155,7 +157,10 @@ func initCli(cli *CliParser, gd *GlobalData) (err error) {
 		"--input-name=my-scan.pdf",
 		"scan1.pdf", "scan2.pdf", "result.txt", "report.txt",
 	}
-	cli.Init(args, version, "cli-test")
+}
+
+func initCli(cli *CliParser, gd *GlobalData) (err error) {
+	cli.Init(version, "cli-test")
 	err = gd.addOptions(cli)
 	return
 }
@@ -166,8 +171,8 @@ func TestOptErrorUnknownOption(t *testing.T) {
 	var cli CliParser
 	var gd GlobalData
 
-	if err := initCliUnknownOption(&cli, &gd, unknownOption); err == nil {
-		if err = cli.Parse(); err != nil {
+	if err := initCliUnknownOption(&cli, &gd); err == nil {
+		if err = cli.Parse(commonBadArgs(unknownOption)); err != nil {
 			if err.Error() != expectedErr.Error() {
 				t.Errorf("Invalid error message.\nGot:\n%v\nExpected:\n%v", err, expectedErr)
 			}
@@ -180,13 +185,15 @@ func TestOptErrorUnknownOption(t *testing.T) {
 	}
 }
 
-func initCliUnknownOption(cli *CliParser, gd *GlobalData, option string) (err error) {
-	args := []string{
+func commonBadArgs(option string) []string {
+	return []string{
 		"ddt-ocr",
 		option,
 		"scan1.pdf", "scan2.pdf", "result.txt", "report.txt",
 	}
-	cli.Init(args, version, "cli-test")
+}
+func initCliUnknownOption(cli *CliParser, gd *GlobalData) (err error) {
+	cli.Init(version, "cli-test")
 	err = gd.addOptions(cli)
 	return
 }
@@ -197,8 +204,8 @@ func TestOptErrorMissingOptionValue(t *testing.T) {
 	var cli CliParser
 	var gd GlobalData
 
-	if err := initCliMissingOptionValue(&cli, &gd, missingValueOption); err == nil {
-		if err = cli.Parse(); err != nil {
+	if err := initCliMissingOptionValue(&cli, &gd); err == nil {
+		if err = cli.Parse(commonBadArgs(missingValueOption)); err != nil {
 			if err.Error() != expectedErr.Error() {
 				t.Errorf("Invalid error message.\nGot:\n%v\nExpected:\n%v", err, expectedErr)
 			}
@@ -211,25 +218,20 @@ func TestOptErrorMissingOptionValue(t *testing.T) {
 	}
 }
 
-func initCliMissingOptionValue(cli *CliParser, gd *GlobalData, option string) (err error) {
-	args := []string{
-		"ddt-ocr",
-		option,
-		"scan1.pdf", "scan2.pdf", "result.txt", "report.txt",
-	}
-	cli.Init(args, version, "cli-test")
+func initCliMissingOptionValue(cli *CliParser, gd *GlobalData) (err error) {
+	cli.Init(version, "cli-test")
 	err = gd.addOptions(cli)
 	return
 }
 
 func TestOptErrorInvalidOptionValue(t *testing.T) {
 	const missingInvalidValueOption = "--page"
-	var expectedErr = errInvalidOptionValue("page", "some", "num-array")
+	var expectedErr = errInvalidOptionValue("page", "scan1.pdf", "num-array")
 	var cli CliParser
 	var gd GlobalData
 
-	if err := initCliInvalidOptionValue(&cli, &gd, missingInvalidValueOption); err == nil {
-		if err = cli.Parse(); err != nil {
+	if err := initCliInvalidOptionValue(&cli, &gd); err == nil {
+		if err = cli.Parse(commonBadArgs(missingInvalidValueOption)); err != nil {
 			if err.Error() != expectedErr.Error() {
 				t.Errorf("Invalid error message.\nGot:\n%v\nExpected:\n%v", err, expectedErr)
 			}
@@ -242,13 +244,8 @@ func TestOptErrorInvalidOptionValue(t *testing.T) {
 	}
 }
 
-func initCliInvalidOptionValue(cli *CliParser, gd *GlobalData, option string) (err error) {
-	args := []string{
-		"ddt-ocr",
-		option, "some",
-		"scan1.pdf", "scan2.pdf", "result.txt", "report.txt",
-	}
-	cli.Init(args, version, "cli-test")
+func initCliInvalidOptionValue(cli *CliParser, gd *GlobalData) (err error) {
+	cli.Init(version, "cli-test")
 	err = gd.addOptions(cli)
 	return
 }
@@ -260,7 +257,7 @@ func TestArgErrorMissingRequired(t *testing.T) {
 	var gd GlobalData
 
 	if err := initCliMissingRequiredArg(&cli, &gd); err == nil {
-		if err = cli.Parse(); err != nil {
+		if err = cli.Parse([]string{"ddt-ocr"}); err != nil {
 			if err.Error() != expectedErr.Error() {
 				t.Errorf("Invalid error message.\nGot:\n%v\nExpected:\n%v", err, expectedErr)
 			}
@@ -274,15 +271,12 @@ func TestArgErrorMissingRequired(t *testing.T) {
 }
 
 func initCliMissingRequiredArg(cli *CliParser, gd *GlobalData) (err error) {
-	args := []string{
-		"ddt-ocr",
-	}
-	cli.Init(args, version, "cli-test")
+	cli.Init(version, "cli-test")
 	err = gd.addOptions(cli)
 	return
 }
 
-func TestArgErrorRepeat(t *testing.T) {
+func TestArgErrorRepeatProperty(t *testing.T) {
 	var expectedErr = fmt.Errorf(`repeat property already set for arg <other>`)
 	var cli CliParser
 	var gd GlobalData
@@ -297,17 +291,14 @@ func TestArgErrorRepeat(t *testing.T) {
 }
 
 func initCliRepeatArg(cli *CliParser, gd *GlobalData) (err error) {
-	args := []string{
-		"ddt-ocr",
-		"scan1.pdf", "scan2.pdf", "result.txt", "report.txt",
-	}
-	cli.Init(args, version, "cli-test")
+	cli.Init(version, "cli-test")
 	if err = gd.addOptions(cli); err == nil {
 		defer func() {
 			if r := recover(); r != nil {
 				err = r.(error)
 			}
 		}()
+		// This will raise error because we can't declare two args array
 		cli.AddStringArrayArg("other", true, nil, "other args")
 		cli.AddStringArrayArg("other2", true, nil, "other args 2")
 	}
@@ -322,12 +313,13 @@ where:
   <dest>  Output destination file
   <report>  Optional report file
   <options>
+    -V, --verbose                   Print verbose output (default: "0")
     -o, --print-ocr                 Print the OCR output to stderr
     -t, --trace                     Enable trace mode for detailed logging
     -p, --page(s) <num>["," ...]    Process only the specified pages (comma-separated list)
     -c, --config <file>             Alternate configuration file
     -l, --log(s) <string>["," ...]  Logging options (comma-separated list)
-    -V, --var(s) <key=value>["," ...]  Define one or more comma separated variables for the actions context (multiple allowed)
+    --var(s) <key=value>["," ...]   Define one or more comma separated variables for the actions context (multiple allowed)
     -n, --input-name <string>       Input file name when source comes from stdin
     -d, --work-dir <dir>            Work directory
     --attempts <num>                Attempts for retrying failed operations (default: "1")
@@ -341,7 +333,7 @@ where:
 	}
 	usage := cli.Usage()
 	if usage != expectedUsage {
-		t.Errorf("Usage output does not match expected.\nGot:\n%s\nExpected:\n%s", usage, expectedUsage)
+		t.Errorf("Usage output does not match expected text.\nGot:\n%s\nExpected:\n%s", usage, expectedUsage)
 	}
 }
 

go.mod

@@ -1,3 +1,3 @@
-module git.portale-stac.it/go-pkg/cli
+module git.portale-stac.it/go-pkg/cli/v2
 
 go 1.25.4

opt-base.go

@@ -13,7 +13,9 @@ type cliOptionBase struct {
 	description      string
 	isArray          bool
 	hidden           bool
+	alreadySeen      bool
 	specialValues    map[string]SpecialValueFunc
+	finalCheckFunc   FinalCheckFunc
 	incompatibleWith []string
 }
 
@@ -40,6 +42,10 @@ func (opt *cliOptionBase) SetHidden(hidden bool) {
 	opt.hidden = hidden
 }
 
+func (opt *cliOptionBase) OnFinalCheck(checkFunc FinalCheckFunc) {
+	opt.finalCheckFunc = checkFunc
+}
+
 func (opt *cliOptionBase) AddSpecialValue(cliValue string, specialFunc SpecialValueFunc) {
 	if opt.specialValues == nil {
 		opt.specialValues = make(map[string]SpecialValueFunc)
@@ -66,8 +72,9 @@ func (opt *cliOptionBase) addIncompatibleOption(names ...string) {
 	opt.incompatibleWith = append(opt.incompatibleWith, names...)
 }
 
-func (opt *cliOptionBase) parse(parser cliParser, valuePtr *string) (err error) {
-	return fmt.Errorf("unhandled option %q", opt.name)
+func (opt *cliOptionBase) parse(parser cliParser, argIndex int, valuePtr *string) (skipNextArg bool, value string, err error) {
+	err = fmt.Errorf("unhandled option %q", opt.name)
+	return
 }
 
 func (opt *cliOptionBase) getDefaultValue() string {
@@ -145,3 +152,14 @@ func (opt *cliOptionBase) fetchOptionValue(parser cliParser, argIndex int, value
 	}
 	return
 }
+
+func (opt *cliOptionBase) finalCheck() (err error) {
+	return
+}
+
+func (opt *cliOptionBase) checkValue(value any) (err error) {
+	if opt.finalCheckFunc != nil {
+		err = opt.finalCheckFunc(value)
+	}
+	return
+}

opt-bool.go

@@ -47,11 +47,11 @@ func (opt *cliOptionBool) getTemplate() (templ string) {
 	return
 }
 
-func (opt *cliOptionBool) parse(parser cliParser, argIndex int, valuePtr *string) (skipNextArg bool, err error) {
+func (opt *cliOptionBool) parse(parser cliParser, argIndex int, valuePtr *string) (skipNextArg bool, optValue string, err error) {
 	var boxedValue any
-	value := "true"
+	optValue = "true"
 
-	if boxedValue, err = opt.getSpecialValue(parser, value, opt.targetVar); err == nil {
+	if boxedValue, err = opt.getSpecialValue(parser, optValue, opt.targetVar); err == nil {
 		if opt.targetVar != nil {
 			if boxedValue != nil {
 				if val, ok := boxedValue.(bool); ok {
@@ -67,6 +67,11 @@ func (opt *cliOptionBool) parse(parser cliParser, argIndex int, valuePtr *string
 	return
 }
 
+func (opt *cliOptionBool) finalCheck() (err error) {
+	currentValue, _ := opt.getTargetVar()
+	return opt.getBase().checkValue(currentValue)
+}
+
 func (cli *CliParser) AddBoolOpt(name, short string, targetVar *bool, description string, aliases ...string) OptReference {
 	if cli.optionExists(name, short, aliases) {
 		panic(errOptionAlreadyDefined(name))

opt-help.go

@@ -23,7 +23,7 @@ func (opt *cliOptionHelp) getTemplate() string {
 	return opt.makeOptSimpleTemplate(false, false, "")
 }
 
-func (opt *cliOptionHelp) parse(parser cliParser, argIndex int, valuePtr *string) (skipNextArg bool, err error) {
+func (opt *cliOptionHelp) parse(parser cliParser, argIndex int, valuePtr *string) (skipNextArg bool, value string, err error) {
 	parser.PrintUsage()
 	err = io.EOF
 	return

opt-int-array.go

@@ -63,8 +63,7 @@ func parseIntRange(value string) (min int, max int, err error) {
 	return
 }
 
-func (opt *cliOptionIntArray) parse(parser cliParser, argIndex int, valuePtr *string) (skipNextArg bool, err error) {
-	var optValue string
+func (opt *cliOptionIntArray) parse(parser cliParser, argIndex int, valuePtr *string) (skipNextArg bool, optValue string, err error) {
 	if optValue, skipNextArg, err = opt.fetchOptionValue(parser, argIndex, valuePtr); err == nil {
 		var boxedValue any
 		if boxedValue, err = opt.getSpecialValue(parser, optValue, opt.targetVar); err == nil {
@@ -76,6 +75,10 @@ func (opt *cliOptionIntArray) parse(parser cliParser, argIndex int, valuePtr *st
 						err = errInvalidOptionValue(opt.name, boxedValue, "num-array")
 					}
 				} else {
+					if !opt.alreadySeen || (valuePtr != nil && parser.FlagIsSet(ResetOnEqualSign)) {
+						*opt.targetVar = []int{}
+						opt.alreadySeen = true
+					}
 					for value := range strings.SplitSeq(optValue, ",") {
 						var minRange, maxRange int
 						if minRange, maxRange, err = parseIntRange(value); err == nil {
@@ -94,6 +97,11 @@ func (opt *cliOptionIntArray) parse(parser cliParser, argIndex int, valuePtr *st
 	return
 }
 
+func (opt *cliOptionIntArray) finalCheck() (err error) {
+	currentValue, _ := opt.getTargetVar()
+	return opt.getBase().checkValue(currentValue)
+}
+
 func (cli *CliParser) AddIntArrayOpt(name, short string, targetVar *[]int, defaultValue []int, description string, aliases ...string) OptReference {
 	aliases = cli.checkAlreadyUsedNames(name, short, aliases)
 	opt := &cliOptionIntArray{

opt-int.go

@@ -38,11 +38,10 @@ func (opt *cliOptionInt) getTemplate() string {
 	return opt.makeOptTemplate(false, intTypeName)
 }
 
-func (opt *cliOptionInt) parse(parser cliParser, argIndex int, valuePtr *string) (skipNextArg bool, err error) {
-	var value string
-	if value, skipNextArg, err = opt.fetchOptionValue(parser, argIndex, valuePtr); err == nil {
+func (opt *cliOptionInt) parse(parser cliParser, argIndex int, valuePtr *string) (skipNextArg bool, optValue string, err error) {
+	if optValue, skipNextArg, err = opt.fetchOptionValue(parser, argIndex, valuePtr); err == nil {
 		var boxedValue any
-		if boxedValue, err = opt.getSpecialValue(parser, value, opt.targetVar); err == nil {
+		if boxedValue, err = opt.getSpecialValue(parser, optValue, opt.targetVar); err == nil {
 			if opt.targetVar != nil {
 				if boxedValue != nil {
 					if val, ok := boxedValue.(string); ok {
@@ -51,13 +50,17 @@ func (opt *cliOptionInt) parse(parser cliParser, argIndex int, valuePtr *string)
 						err = errInvalidOptionValue(opt.name, boxedValue, "int")
 					}
 				} else {
-					*opt.targetVar, err = strconv.Atoi(value)
+					*opt.targetVar, err = strconv.Atoi(optValue)
 				}
 			}
 		}
 	}
 	return
 }
+func (opt *cliOptionInt) finalCheck() (err error) {
+	currentValue, _ := opt.getTargetVar()
+	return opt.getBase().checkValue(currentValue)
+}
 
 func (cli *CliParser) AddIntOpt(name, short string, targetVar *int, defaultValue int, description string, aliases ...string) OptReference {
 	if cli.optionExists(name, short, aliases) {

opt-manager.go

@@ -2,7 +2,7 @@ package cli
 
 func (cli *CliParser) SetOptionValue(name string, value string) (err error) {
 	if opt := cli.findOptionByArg(name); opt != nil {
-		_, err = opt.parse(cli, -1, &value)
+		_, _, err = opt.parse(cli, -1, &value)
 	} else {
 		err = errOptionNotFound(name)
 	}

opt-multi.go

@@ -46,12 +46,17 @@ func (opt *cliOptionMulti) getTemplate() (templ string) {
 	return
 }
 
-func (opt *cliOptionMulti) parse(parser cliParser, argIndex int, valuePtr *string) (skipNextArg bool, err error) {
+func (opt *cliOptionMulti) parse(parser cliParser, argIndex int, valuePtr *string) (skipNextArg bool, value string, err error) {
 	if opt.targetVar != nil {
 		*opt.targetVar++
 	}
+	value = "true"
 	return
 }
+func (opt *cliOptionMulti) finalCheck() (err error) {
+	currentValue, _ := opt.getTargetVar()
+	return opt.getBase().checkValue(currentValue)
+}
 
 func (cli *CliParser) AddMultiOpt(name, short string, targetVar *int, defaultValue int, description string, aliases ...string) OptReference {
 	if cli.optionExists(name, short, aliases) {

opt-string-array.go

@@ -43,8 +43,7 @@ func (opt *cliOptionStringArray) getTemplate() string {
 
 // parse retrieves the option value from the parser and updates the target variable.
 // It handles comma-separated values and special values if configured.
-func (opt *cliOptionStringArray) parse(parser cliParser, argIndex int, valuePtr *string) (skipNextArg bool, err error) {
-	var value string
+func (opt *cliOptionStringArray) parse(parser cliParser, argIndex int, valuePtr *string) (skipNextArg bool, value string, err error) {
 	if value, skipNextArg, err = opt.fetchOptionValue(parser, argIndex, valuePtr); err == nil {
 		var boxedValue any
 		if boxedValue, err = opt.getSpecialValue(parser, value, opt.targetVar); err == nil {
@@ -55,6 +54,8 @@ func (opt *cliOptionStringArray) parse(parser cliParser, argIndex int, valuePtr
 					} else {
 						err = errInvalidOptionValue(opt.name, boxedValue, "array of string")
 					}
+				} else if opt.alreadySeen {
+					*opt.targetVar = append(*opt.targetVar, strings.Split(value, ",")...)
 				} else {
 					*opt.targetVar = strings.Split(value, ",")
 				}
@@ -83,3 +84,8 @@ func (cli *CliParser) AddStringArrayOpt(name, short string, targetVar *[]string,
 	cli.options = append(cli.options, opt)
 	return opt
 }
+
+func (opt *cliOptionStringArray) finalCheck() (err error) {
+	currentValue, _ := opt.getTargetVar()
+	return opt.getBase().checkValue(currentValue)
+}

opt-string-map.go

@@ -57,8 +57,7 @@ func (opt *cliOptionStringMap) getTemplate() string {
 	return opt.makeOptTemplate(true, "key=value")
 }
 
-func (opt *cliOptionStringMap) parse(parser cliParser, argIndex int, valuePtr *string) (skipNextArg bool, err error) {
-	var value string
+func (opt *cliOptionStringMap) parse(parser cliParser, argIndex int, valuePtr *string) (skipNextArg bool, value string, err error) {
 	if value, skipNextArg, err = opt.fetchOptionValue(parser, argIndex, valuePtr); err == nil {
 		var boxedValue any
 		if boxedValue, err = opt.getSpecialValue(parser, value, opt.targetVar); err == nil {
@@ -71,7 +70,7 @@ func (opt *cliOptionStringMap) parse(parser cliParser, argIndex int, valuePtr *s
 						err = errInvalidOptionValue(opt.name, boxedValue, "map of string")
 					}
 				} else {
-					if dict == nil {
+					if dict == nil || !opt.alreadySeen {
 						dict = make(map[string]string)
 					}
 					for value := range strings.SplitSeq(value, ",") {
@@ -90,6 +89,11 @@ func (opt *cliOptionStringMap) parse(parser cliParser, argIndex int, valuePtr *s
 	return
 }
 
+func (opt *cliOptionStringMap) finalCheck() (err error) {
+	currentValue, _ := opt.getTargetVar()
+	return opt.getBase().checkValue(currentValue)
+}
+
 func (cli *CliParser) AddStringMapOpt(name, short string, targetVar *map[string]string, defaultValue map[string]string, description string, aliases ...string) OptReference {
 	aliases = cli.checkAlreadyUsedNames(name, short, aliases)
 	opt := &cliOptionStringMap{

opt-string.go

@@ -36,8 +36,7 @@ func (opt *cliOptionString) getTemplate() string {
 	return opt.makeOptTemplate(false, stringTypeName)
 }
 
-func (opt *cliOptionString) parse(parser cliParser, argIndex int, valuePtr *string) (skipNextArg bool, err error) {
-	var value string
+func (opt *cliOptionString) parse(parser cliParser, argIndex int, valuePtr *string) (skipNextArg bool, value string, err error) {
 	if value, skipNextArg, err = opt.fetchOptionValue(parser, argIndex, valuePtr); err == nil {
 		var boxedValue any
 		if boxedValue, err = opt.getSpecialValue(parser, value, opt.targetVar); err == nil {
@@ -56,6 +55,10 @@ func (opt *cliOptionString) parse(parser cliParser, argIndex int, valuePtr *stri
 	}
 	return
 }
+func (opt *cliOptionString) finalCheck() (err error) {
+	currentValue, _ := opt.getTargetVar()
+	return opt.getBase().checkValue(currentValue)
+}
 
 func (cli *CliParser) AddStringOpt(name, short string, targetVar *string, defaultValue string, description string, aliases ...string) OptReference {
 	if cli.optionExists(name, short, aliases) {

opt-version.go

@@ -23,7 +23,7 @@ func (opt *cliOptionVersion) getTemplate() string {
 	return opt.makeOptSimpleTemplate(false, true, "section")
 }
 
-func (opt *cliOptionVersion) parse(parser cliParser, argIndex int, valuePtr *string) (skipNextArg bool, err error) {
+func (opt *cliOptionVersion) parse(parser cliParser, argIndex int, valuePtr *string) (skipNextArg bool, value string, err error) {
 	var args []string
 	if valuePtr != nil {
 		args = []string{*valuePtr}

opt_test.go

@@ -0,0 +1,143 @@
+package cli
+
+import (
+	"fmt"
+	"testing"
+)
+
+func TestOneOptWithEqual(t *testing.T) {
+	var cli CliParser
+	var color string
+	// Always recover from panic to return error before adding options
+	defer func() {
+		if r := recover(); r != nil {
+			if err := r.(error); err != nil {
+				t.Error(err)
+			}
+
+		}
+	}()
+
+	// Define options
+	cli.AddStringOpt("color", "c", &color, "white", "Set color")
+
+	args := []string{
+		"TestOneOptWithEqual",
+		"--color=blue",
+	}
+
+	cli.Init("1.0.0", "TestOneOptWithEqual description")
+	if err := cli.Parse(args); err != nil {
+		t.Error(err)
+	} else if color != "blue" {
+		t.Errorf("Expected color blue, got %q", color)
+	}
+}
+
+func addBoxOption(cli *CliParser, boxPtr *[]int) {
+	// Define options
+	optRef := cli.AddIntArrayOpt("box", "b", boxPtr, []int{1, 2, 3, 4}, "Box spec: Left,Width,Top,Height; provide 4 int values")
+	optRef.OnFinalCheck(func(currentValue any) (err error) {
+		if array, ok := currentValue.([]int); ok {
+			if len(array) != 4 {
+				err = fmt.Errorf("--box option requires exactly 4 items, %d provided", len(array))
+			}
+		} else {
+			err = fmt.Errorf("wrong datatype for --box option value")
+		}
+		return
+	})
+}
+
+func testIntArrayOptOk(t *testing.T, n int, args []string, flags ...int16) {
+	var box []int
+	var cli CliParser
+	t.Logf("Arg set n. %d", n)
+	addBoxOption(&cli, &box)
+	cli.Init("1.0.0", "TestIntArrayOpt description", flags...)
+	if err := cli.Parse(args); err != nil {
+		t.Error(err)
+	} else if len(box) != 4 {
+		t.Errorf(`Expected 4 items, got %d`, len(box))
+	}
+}
+
+func testIntArrayOptKo(t *testing.T, n int, args []string, msg string, flags ...int16) {
+	var box []int
+	var cli CliParser
+	t.Logf("Arg set n. %d", n)
+	addBoxOption(&cli, &box)
+	cli.Init("1.0.0", "TestIntArrayOpt description", flags...)
+	if err := cli.Parse(args); err == nil {
+		t.Errorf("Expected error, got nil")
+	} else if err.Error() != msg {
+		t.Errorf(`Invalid error: %q; expected: %q`, err.Error(), msg)
+	}
+}
+
+func TestIntArrayOpt(t *testing.T) {
+	var args []string
+	// Always recover from panic to return error before adding options
+	defer func() {
+		if r := recover(); r != nil {
+			if err := r.(error); err != nil {
+				t.Error(err)
+			}
+
+		}
+	}()
+
+	n := 0
+
+	n++
+	args = []string{
+		"TestIntArrayOpt",
+		"--box=100,200,150,450",
+	}
+	testIntArrayOptOk(t, n, args)
+
+	n++
+	args = []string{
+		"TestIntArrayOpt",
+		"--box=100,200,150",
+	}
+	testIntArrayOptKo(t, n, args, "--box option requires exactly 4 items, 3 provided")
+
+	n++
+	args = []string{
+		"TestIntArrayOpt",
+		"--box", "100,200,150,450",
+	}
+	testIntArrayOptOk(t, n, args)
+
+	n++
+	args = []string{
+		"TestIntArrayOpt",
+		"--box",
+	}
+	testIntArrayOptKo(t, n, args, `option "box" requires a value`)
+
+	n++
+	args = []string{
+		"TestIntArrayOpt",
+		"--box", "100,200,150",
+		"--box", "450",
+	}
+	testIntArrayOptOk(t, n, args)
+
+	n++
+	args = []string{
+		"TestIntArrayOpt",
+		"--box", "100,200,150",
+		"--box", "450,12",
+	}
+	testIntArrayOptKo(t, n, args, "--box option requires exactly 4 items, 5 provided")
+
+	n++
+	args = []string{
+		"TestIntArrayOpt",
+		"--box", "100,200,150",
+		"--box=100,200,150,450",
+	}
+	testIntArrayOptOk(t, n, args, ResetOnEqualSign)
+}

parser.go

@@ -105,11 +105,11 @@ func (cli *CliParser) parseArg(arg string, index int) (skipNextArg bool, err err
 	for i, optName := range opts {
 		if opt := cli.findOptionByArg(dashes + optName); opt != nil {
 			if equalPresent && i == len(opts)-1 {
-				_, err = opt.parse(cli, index, &value)
+				_, _, err = opt.parse(cli, index, &value)
 			} else if i < len(opts)-1 && opt.requiresValue() {
 				err = errMissingOptionValue(dashes + optName)
 			} else {
-				skipNextArg, err = opt.parse(cli, index, nil)
+				skipNextArg, _, err = opt.parse(cli, index, nil)
 			}
 		} else {
 			err = errUnknownOption(dashes + optName)