fix(schema): Fix JSON Schema generation commas for InclusivePrimitive…

…ItemTypes
trinnylondon · Apr 26, 2022 · 28db940 · 28db940
1 parent 512508f
commit 28db940
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/generate/templates/schema-property.template b/generate/templates/schema-property.template
@@ -19,8 +19,8 @@
                     "anyOf": [
                         {{$length := len .Property.InclusivePrimitiveItemTypes}}{{$rc := counter $length}}{{range $index, $primitiveType := .Property.InclusivePrimitiveItemTypes}}
                             {
-                                "type": "{{convertToJSONType $primitiveType}}"{{if call $rc}},{{end}}
-                            }{{if $.Property.InclusiveItemTypes}},{{end}}
+                                "type": "{{convertToJSONType $primitiveType}}"
+                            }{{if (or $.Property.InclusiveItemTypes (call $rc))}},{{end}}
                         {{end}}
                         {{$length := len .Property.InclusiveItemTypes}}{{$rc := counter $length}}{{range $index, $itemType := .Property.InclusiveItemTypes}}
                             {
@@ -29,7 +29,7 @@
                         {{end}}
                     ]
                 }
-            }{{if (or $.Property.InclusivePrimitiveItemTypes $.Property.InclusiveItemTypes)}},{{end}}
+            }{{if (or $.Property.PrimitiveItemTypes (or $.Property.Types $.Property.ItemTypes))}},{{end}}
         {{end}}
 
         {{if .Property.PrimitiveItemTypes}}