Only perform minItems validation when field is provided

omissis · Sep 28, 2023 · 8c546e6 · 8c546e6
1 parent 0f951fd
commit 8c546e6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/pkg/generator/validator.go b/pkg/generator/validator.go
@@ -182,7 +182,7 @@ func (v *arrayValidator) generate(out *codegen.Emitter) {
 	}
 
 	if v.minItems != 0 {
-		out.Printlnf(`if len(%s) < %d {`, value, v.minItems)
+		out.Printlnf(`if %s != nil && len(%s) < %d {`, value, value, v.minItems)
 		out.Indent(1)
 		out.Printlnf(`return fmt.Errorf("field %%s length: must be >= %%d", %s, %d)`, fieldName, v.minItems)
 		out.Indent(-1)

diff --git a/tests/data/validation/5.11_minItems.go.output b/tests/data/validation/5.11_minItems.go.output
@@ -24,15 +24,15 @@ func (j *A511MinItems) UnmarshalJSON(b []byte) error {
 	if err := json.Unmarshal(b, &plain); err != nil {
 		return err
 	}
-	if len(plain.MyNestedArray) < 5 {
+	if plain.MyNestedArray != nil && len(plain.MyNestedArray) < 5 {
 		return fmt.Errorf("field %s length: must be >= %d", "myNestedArray", 5)
 	}
 	for i1 := range plain.MyNestedArray {
-		if len(plain.MyNestedArray[i1]) < 5 {
+		if plain.MyNestedArray[i1] != nil && len(plain.MyNestedArray[i1]) < 5 {
 			return fmt.Errorf("field %s length: must be >= %d", fmt.Sprintf("myNestedArray[%d]", i1), 5)
 		}
 	}
-	if len(plain.MyStringArray) < 5 {
+	if plain.MyStringArray != nil && len(plain.MyStringArray) < 5 {
 		return fmt.Errorf("field %s length: must be >= %d", "myStringArray", 5)
 	}
 	*j = A511MinItems(plain)

diff --git a/tests/data/validation/5.1x_minMaxItems.go.output b/tests/data/validation/5.1x_minMaxItems.go.output
@@ -24,21 +24,21 @@ func (j *A51XMinMaxItems) UnmarshalJSON(b []byte) error {
 	if err := json.Unmarshal(b, &plain); err != nil {
 		return err
 	}
-	if len(plain.MyNestedArray) < 1 {
+	if plain.MyNestedArray != nil && len(plain.MyNestedArray) < 1 {
 		return fmt.Errorf("field %s length: must be >= %d", "myNestedArray", 1)
 	}
 	if len(plain.MyNestedArray) > 5 {
 		return fmt.Errorf("field %s length: must be <= %d", "myNestedArray", 5)
 	}
 	for i1 := range plain.MyNestedArray {
-		if len(plain.MyNestedArray[i1]) < 1 {
+		if plain.MyNestedArray[i1] != nil && len(plain.MyNestedArray[i1]) < 1 {
 			return fmt.Errorf("field %s length: must be >= %d", fmt.Sprintf("myNestedArray[%d]", i1), 1)
 		}
 		if len(plain.MyNestedArray[i1]) > 5 {
 			return fmt.Errorf("field %s length: must be <= %d", fmt.Sprintf("myNestedArray[%d]", i1), 5)
 		}
 	}
-	if len(plain.MyStringArray) < 1 {
+	if plain.MyStringArray != nil && len(plain.MyStringArray) < 1 {
 		return fmt.Errorf("field %s length: must be >= %d", "myStringArray", 1)
 	}
 	if len(plain.MyStringArray) > 3 {