Some fixes to json schema

Author: aopoltorzhicky

cmd/dipdup-gen/types.go

@@ -108,7 +108,7 @@ func generateTypes(name, postfix string, schema *js.JSONSchema, types map[string
 		resultType.Type = StringType
 	case schema.Type == "object":
 		var props map[string]js.JSONSchema
-		if schema != nil && schema.ObjectItem != nil {
+		if schema != nil && schema.Type == js.ItemTypeObject {
 			props = schema.Properties
 		}
 
@@ -174,7 +174,7 @@ func generateField(title string, prop *js.JSONSchema, types map[string]goType) f
 func generateArrayItem(name string, prop *js.JSONSchema, types map[string]goType) goType {
 	name = buildName(name, "Item")
 
-	if prop.ArrayItem != nil {
+	if prop.ArrayItem.Items != nil {
 		switch len(prop.Items) {
 		case 0:
 			return goType{

pkg/contract/evm.go

@@ -61,7 +61,7 @@ func (vm *EVM) createEntrypointsSchema(contractABI abi.ABI) (map[string]js.Type,
 			return nil, err
 		}
 		if inputsBody != nil {
-			typ.Inputs.ObjectItem = inputsBody
+			typ.Inputs.ObjectItem = *inputsBody
 		}
 
 		result[event.Name] = typ
@@ -88,15 +88,15 @@ func (vm *EVM) createEntrypointsSchema(contractABI abi.ABI) (map[string]js.Type,
 			return nil, err
 		}
 		if inputsBody != nil {
-			typ.Inputs.ObjectItem = inputsBody
+			typ.Inputs.ObjectItem = *inputsBody
 		}
 
 		outputsBody, err := getBodyByArgs(method.Outputs)
 		if err != nil {
 			return nil, err
 		}
 		if outputsBody != nil {
-			typ.Outputs.ObjectItem = outputsBody
+			typ.Outputs.ObjectItem = *outputsBody
 		}
 
 		result[method.Name] = typ
@@ -155,7 +155,7 @@ func createSchemaItem(name string, idx int, typ *abi.Type) (js.JSONSchema, error
 			return elem, err
 		}
 
-		schema.ArrayItem = &js.ArrayItem{
+		schema.ArrayItem = js.ArrayItem{
 			Items: []js.JSONSchema{
 				elem,
 			},
@@ -167,7 +167,7 @@ func createSchemaItem(name string, idx int, typ *abi.Type) (js.JSONSchema, error
 		schema := js.JSONSchema{
 			Type:  js.ItemTypeObject,
 			Title: name,
-			ObjectItem: &js.ObjectItem{
+			ObjectItem: js.ObjectItem{
 				Properties: make(map[string]js.JSONSchema),
 				Required:   make([]string, 0),
 			},

pkg/jsonschema/json_schema.go

@@ -21,14 +21,14 @@ type JSONSchema struct {
 	Examples    []any  `json:"examples,omitempty"`
 	Enum        []any  `json:"enum,omitempty"`
 
-	InternalType string `json:"internal_type"`
+	InternalType string `json:"internal_type,omitempty"`
 	Index        int    `json:"index,omitempty"`
 
-	Type        ItemType `json:"type"`
-	*StringItem `json:",omitempty"`
-	*NumberItem `json:",omitempty"`
-	*ObjectItem `json:",omitempty"`
-	*ArrayItem  `json:",omitempty"`
+	Type ItemType `json:"type"`
+	StringItem
+	NumberItem
+	ObjectItem
+	ArrayItem
 }
 
 // ItemType -
@@ -109,5 +109,5 @@ type ArrayItem struct {
 	MaxContains int64        `json:"maxContains,omitempty"`
 	MinItems    int64        `json:"minItems,omitempty"`
 	MaxItems    int64        `json:"maxItems,omitempty"`
-	UniqueItems bool         `json:"uniqueItems"`
+	UniqueItems bool         `json:"uniqueItems,omitempty"`
 }