- Fixed formatting of models (comma vs semicolumn)

- Fixed issue ferdikoomen#867 where nullable prop would not have correct type

Author: ferdikoomen

src/openApi/v3/parser/getModelProperties.ts

@@ -29,7 +29,7 @@ export function getModelProperties(openApi: OpenApi, definition: OpenApiSchema,
                     isDefinition: false,
                     isReadOnly: property.readOnly === true,
                     isRequired: propertyRequired,
-                    isNullable: property.nullable === true,
+                    isNullable: model.isNullable || property.nullable === true,
                     format: property.format,
                     maximum: property.maximum,
                     exclusiveMaximum: property.exclusiveMaximum,
@@ -62,7 +62,7 @@ export function getModelProperties(openApi: OpenApi, definition: OpenApiSchema,
                     isDefinition: false,
                     isReadOnly: property.readOnly === true,
                     isRequired: propertyRequired,
-                    isNullable: property.nullable === true,
+                    isNullable: model.isNullable || property.nullable === true,
                     format: property.format,
                     maximum: property.maximum,
                     exclusiveMaximum: property.exclusiveMaximum,

src/templates/partials/typeInterface.hbs

@@ -7,9 +7,9 @@
  */
 {{/if}}
 {{#if ../parent}}
-{{>isReadOnly}}{{{name}}}{{>isRequired}}: {{>type parent=../parent}},
+{{>isReadOnly}}{{{name}}}{{>isRequired}}: {{>type parent=../parent}};
 {{else}}
-{{>isReadOnly}}{{{name}}}{{>isRequired}}: {{>type}},
+{{>isReadOnly}}{{{name}}}{{>isRequired}}: {{>type}};
 {{/if}}
 {{/each}}
 }{{>isNullable}}