Support additionalProperties in root types (a-h#48)

* Run gofmt

* Support additionalProperties in root types

generator.go

@@ -58,7 +58,7 @@ func (g *Generator) CreateTypes() (structs map[string]Struct, aliases map[string
  for _, typeKey := range getOrderedKeyNamesFromSchemaMap(types) {
  v := types[typeKey]
 
- if v.TypeValue == "object" || v.TypeValue == nil {
+ if (v.TypeValue == "object" || v.TypeValue == nil) && len(v.Properties) > 0 {
  s, errtype := createStruct(typeKey, v, types)
  if errtype != nil {
  errs = append(errs, errtype...)

generator_test.go

@@ -219,6 +219,9 @@ func TestEmptyNestedStructGeneration(t *testing.T) {
  root.Properties = map[string]*jsonschema.Schema{
  "property1": {
  TypeValue: "object",
+ Properties: map[string]*jsonschema.Schema{
+ "nestedproperty1": {TypeValue: "string"},
+ },
  },
  }
 
@@ -714,6 +717,9 @@ func TestTypeAliases(t *testing.T) {
  Items: &jsonschema.Schema{
  TypeValue: "object",
  Title: "foo",
+ Properties: map[string]*jsonschema.Schema{
+ "nestedproperty": {TypeValue: "string"},
+ },
  }},
  structs: 1,
  aliases: 1,
@@ -724,6 +730,24 @@ func TestTypeAliases(t *testing.T) {
  structs: 0,
  aliases: 1,
  },
+ {
+ gotype: "map[string]string",
+ input: &jsonschema.Schema{
+ TypeValue: "object",
+ AdditionalProperties: []*jsonschema.Schema{{TypeValue: "string"}},
+ },
+ structs: 0,
+ aliases: 1,
+ },
+ {
+ gotype: "map[string]interface{}",
+ input: &jsonschema.Schema{
+ TypeValue: "object",
+ AdditionalProperties: []*jsonschema.Schema{{TypeValue: []interface{}{"string", "integer"}}},
+ },
+ structs: 0,
+ aliases: 1,
+ },
  }
 
  for _, test := range tests {

jsonschema/jsonschema.go

@@ -33,13 +33,13 @@ type Schema struct {
  // Properties, Required and AdditionalProperties describe an object's child instances.
  // http:https://json-schema.org/draft-07/json-schema-validation.html#rfc.section.6.5
  Properties map[string]*Schema
-
- // Default value is applicable to a single sub-instance
- // http:https://json-schema.org/draft-07/json-schema-validation.html#rfc.section.10.2
- Default interface{} `json:"default"`
  Required []string
  AdditionalProperties AdditionalProperties
 
+ // Default can be used to supply a default JSON value associated with a particular schema.
+ // http:https://json-schema.org/draft-07/json-schema-validation.html#rfc.section.10.2
+ Default interface{}
+
  // Reference is a URI reference to a schema.
  // http:https://json-schema.org/draft-07/json-schema-core.html#rfc.section.8
  Reference string `json:"$ref"`
@@ -130,6 +130,13 @@ func addTypeAndChildrenToMap(path string, name string, s *Schema, types map[stri
  return
  }
 
+ // Add root schemas composed of an object type without property.
+ // The resulting type depends on the presence of additionalProperties.
+ if (t == "object" || t == "") && len(s.Properties) == 0 && path == "#" {
+ types[path] = s
+ return
+ }
+
  // Add root schemas composed only of a simple type
  if !(t == "object" || t == "") && path == "#" {
  types[path] = s