|
|
@ -1587,8 +1587,12 @@ TypeResult resolveType( |
|
|
|
} |
|
|
|
} |
|
|
|
case 'object': |
|
|
|
case 'object': |
|
|
|
if (schema.properties == null) { |
|
|
|
if (schema.properties == null) { |
|
|
|
if (schema.additionalProperties != null) { |
|
|
|
if (schema.additionalProperties == null) { |
|
|
|
if (schema.additionalProperties is EmptySchema) { |
|
|
|
result = TypeResultBase( |
|
|
|
|
|
|
|
'JsonObject', |
|
|
|
|
|
|
|
nullable: nullable, |
|
|
|
|
|
|
|
); |
|
|
|
|
|
|
|
} else if (schema.additionalProperties is EmptySchema) { |
|
|
|
result = TypeResultMap( |
|
|
|
result = TypeResultMap( |
|
|
|
'BuiltMap', |
|
|
|
'BuiltMap', |
|
|
|
TypeResultBase('JsonObject'), |
|
|
|
TypeResultBase('JsonObject'), |
|
|
@ -1608,23 +1612,13 @@ TypeResult resolveType( |
|
|
|
nullable: nullable, |
|
|
|
nullable: nullable, |
|
|
|
); |
|
|
|
); |
|
|
|
} |
|
|
|
} |
|
|
|
break; |
|
|
|
} else if (schema.properties!.isEmpty) { |
|
|
|
} |
|
|
|
|
|
|
|
result = TypeResultBase( |
|
|
|
|
|
|
|
'JsonObject', |
|
|
|
|
|
|
|
nullable: nullable, |
|
|
|
|
|
|
|
); |
|
|
|
|
|
|
|
break; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
if (schema.properties!.isEmpty) { |
|
|
|
|
|
|
|
result = TypeResultMap( |
|
|
|
result = TypeResultMap( |
|
|
|
'BuiltMap', |
|
|
|
'BuiltMap', |
|
|
|
TypeResultBase('JsonObject'), |
|
|
|
TypeResultBase('JsonObject'), |
|
|
|
nullable: nullable, |
|
|
|
nullable: nullable, |
|
|
|
); |
|
|
|
); |
|
|
|
break; |
|
|
|
} else { |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
result = resolveObject( |
|
|
|
result = resolveObject( |
|
|
|
spec, |
|
|
|
spec, |
|
|
|
variablePrefix, |
|
|
|
variablePrefix, |
|
|
@ -1635,6 +1629,7 @@ TypeResult resolveType( |
|
|
|
); |
|
|
|
); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if (result != null) { |
|
|
|
if (result != null) { |
|
|
|
if (!ignoreEnum && schema.enum_ != null) { |
|
|
|
if (!ignoreEnum && schema.enum_ != null) { |
|
|
|