- Aligned with latest development

ferdikoomen · ferdikoomen · commit 403e71170f49 · 2020-11-18T23:41:37.000+01:00
diff --git a/src/openApi/v3/parser/getModel.ts b/src/openApi/v3/parser/getModel.ts
@@ -103,7 +103,7 @@ export function getModel(openApi: OpenApi, definition: OpenApiSchema, isDefiniti
         }
     }
 
-    if (definition.type === 'object' && typeof definition.additionalProperties === 'object') {
+    if (definition.type === 'object' && definition.additionalProperties && typeof definition.additionalProperties === 'object') {
         if (definition.additionalProperties.$ref) {
             const additionalProperties = getType(definition.additionalProperties.$ref);
             model.export = 'dictionary';
diff --git a/src/templates/partials/schemaComposition.hbs b/src/templates/partials/schemaComposition.hbs
@@ -1,6 +1,5 @@
 {
     type: '{{export}}',
-
     contains: [{{#each properties}}{{>schema}}, {{/each}}]
 {{#if isReadOnly}}
     isReadOnly: {{{isReadOnly}}},
diff --git a/src/templates/partials/typeIntersection.hbs b/src/templates/partials/typeIntersection.hbs
@@ -1 +1 @@
-({{#each properties}}{{#unless @first}} & {{/unless}}{{>type}}{{/each}}){{>isNullable}}
+({{#each properties}}{{>type}}{{#unless @last}} & {{/unless}}{{/each}}){{>isNullable}}
diff --git a/src/templates/partials/typeUnion.hbs b/src/templates/partials/typeUnion.hbs
@@ -1 +1 @@
-({{#each properties}}{{#unless @first}} | {{/unless}}{{>type}}{{/each}}){{>isNullable}}
+({{#each properties}}{{>type}}{{#unless @last}} | {{/unless}}{{/each}}){{>isNullable}}
diff --git a/test/__snapshots__/index.spec.js.snap b/test/__snapshots__/index.spec.js.snap
diff --git a/test/spec/v3.json b/test/spec/v3.json

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ export function getModel(openApi: OpenApi, definition: OpenApiSchema, isDefiniti`
`103`	`103`	`}`
`104`	`104`	`}`
`105`	`105`
`106`		`- if (definition.type === 'object' && typeof definition.additionalProperties === 'object') {`
	`106`	`+ if (definition.type === 'object' && definition.additionalProperties && typeof definition.additionalProperties === 'object') {`
`107`	`107`	`if (definition.additionalProperties.$ref) {`
`108`	`108`	`const additionalProperties = getType(definition.additionalProperties.$ref);`
`109`	`109`	`model.export = 'dictionary';`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`type: '{{export}}',`
`3`		`-`
`4`	`3`	`contains: [{{#each properties}}{{>schema}}, {{/each}}]`
`5`	`4`	`{{#if isReadOnly}}`
`6`	`5`	`isReadOnly: {{{isReadOnly}}},`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-({{#each properties}}{{#unless @first}} & {{/unless}}{{>type}}{{/each}}){{>isNullable}}`
	`1`	`+({{#each properties}}{{>type}}{{#unless @last}} & {{/unless}}{{/each}}){{>isNullable}}`