fix: repeated treat as optional

pubg · Sep 18, 2023 · 1695fd3 · 1695fd3
1 parent c096734
commit 1695fd3
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 36 deletions.
diff --git a/pkg/modules/1_middleend_generator.go b/pkg/modules/1_middleend_generator.go
@@ -34,7 +34,7 @@ func buildFromMessage(pluginOptions *proto.PluginOptions, message pgs.Message, m
 			}}
 		}
 
-		if !field.InRealOneOf() && !field.HasOptionalKeyword() {
+		if !field.InRealOneOf() && !field.HasOptionalKeyword() && !field.Type().IsRepeated() {
 			// If field is not a member of oneOf
 			schema.Required = append(schema.Required, propName)
 		}

diff --git a/testdata/cases/jsonschema-array/test.schema.json b/testdata/cases/jsonschema-array/test.schema.json
@@ -41,16 +41,7 @@
           "$ref": "#/$defs/.tests.Values.enum"
         }
       },
-      "type": "object",
-      "required": [
-        "val1",
-        "val2",
-        "optioned1",
-        "optioned2",
-        "optioned3",
-        "message",
-        "enum"
-      ]
+      "type": "object"
     },
     ".tests.Values.val1": {
       "items": {
@@ -115,11 +106,7 @@
           "$ref": "#/$defs/.tests.MyMessage.val2"
         }
       },
-      "type": "object",
-      "required": [
-        "val1",
-        "val2"
-      ]
+      "type": "object"
     },
     ".tests.MyMessage.val1": {
       "items": {

diff --git a/testdata/cases/jsonschema-nullable/test.schema.json b/testdata/cases/jsonschema-nullable/test.schema.json
@@ -75,11 +75,7 @@
           "$ref": "#/$defs/.tests.MyMessage.val2"
         }
       },
-      "type": "object",
-      "required": [
-        "val1",
-        "val2"
-      ]
+      "type": "object"
     },
     ".tests.MyMessage.val1": {
       "items": {

diff --git a/testdata/cases/jsonschema-object/test.schema.json b/testdata/cases/jsonschema-object/test.schema.json
@@ -35,8 +35,7 @@
       "additionalProperties": {},
       "type": "object",
       "required": [
-        "val1",
-        "val2"
+        "val1"
       ],
       "title": "MyMessage"
     },
@@ -63,8 +62,7 @@
       "maxProperties": 10,
       "minProperties": 0,
       "required": [
-        "val1",
-        "val2"
+        "val1"
       ],
       "title": "MyMessage"
     },

diff --git a/testdata/cases/plugin-output-yaml/test.schema.yaml b/testdata/cases/plugin-output-yaml/test.schema.yaml
@@ -11,9 +11,6 @@ $defs:
         $ref: '#/$defs/.tests.MyMessage.val1'
       val2:
         $ref: '#/$defs/.tests.MyMessage.val2'
-    required:
-    - val1
-    - val2
     type: object
   .tests.MyMessage.val1:
     items:
@@ -41,14 +38,6 @@ $defs:
         oneOf:
         - type: "null"
         - $ref: '#/$defs/.tests.Values.val2'
-    required:
-    - val1
-    - val2
-    - optioned1
-    - optioned2
-    - optioned3
-    - message
-    - enum
     type: object
   .tests.Values.enum:
     items: