Will now include all mandatory args that are missing instead of first…

… only (#7)

Co-authored-by: Itay Porezky <itay@email>

clap/args.go

@@ -114,9 +114,12 @@ func argsToFields(args []string, fieldDescs map[string]*fieldDescription, cfg an
 				name = desc.ShortName
 			}
 			results.Mandatory = append(results.Mandatory, name)
-			return results, fmt.Errorf("mandatory argument '%s' not found: %w", name, ErrMandatoryArgument)
 		}
 	}
+	if len(results.Mandatory) != 0 {
+		return results, fmt.Errorf("mandatory argument/s: '%v' not found: %w", strings.Join(results.Mandatory, ","), ErrMandatoryArgument)
+	}
+
 	return results, nil
 }
 

clap/clap_test.go

@@ -75,6 +75,31 @@ func TestMandatoryNotFound(t *testing.T) {
 	t.Logf("t: %v\n", results)
 }
 
+func TestMultipleMandatoryNotFound(t *testing.T) {
+	type config struct {
+		Image int `clap:"--image,mandatory"`
+		Num   int `clap:"--number,mandatory"`
+	}
+	wanted := []string{"image", "number"}
+
+	cfg := &config{}
+	var err error
+	var results *clap.Results
+
+	if results, err = clap.Parse([]string{"-i", "photo.png"}, cfg); err != nil {
+		if !errors.Is(err, clap.ErrMandatoryArgument) {
+			t.Errorf("parsing error: %s", err)
+			return
+		}
+		if !reflect.DeepEqual(results.Mandatory, wanted) {
+			t.Errorf("wanted: '%v', got '%v'", wanted, results.Mandatory)
+			return
+		}
+		t.Logf("t: %v\n", err)
+	}
+	t.Logf("t: %v\n", results)
+}
+
 func TestInvalidTag(t *testing.T) {
 	type config struct {
 		Test string `clap:"--test,-wrongtag"`