Restructured model.mustache

Author: ksvirkou-hubspot

modules/openapi-generator/src/main/resources/typescript/model/model.mustache

@@ -1,29 +1,22 @@
 {{>licenseInfo}}
 {{#models}}
 {{#model}}
-{{#tsImports}}
-import { {{classname}} } from '{{filename}}{{importFileExtension}}';
-{{/tsImports}}
 {{#oneOf}}
-    {{#-first}}
-import { findMatchingType } from '../models/TypeMatcher{{importFileExtension}}';
-    {{/-first}}
+{{#-first}}{{>model/modelOneOf}}{{/-first}}
 {{/oneOf}}
 {{^oneOf}}
+{{#tsImports}}
+import { {{classname}} } from '{{filename}}{{importFileExtension}}';
+{{/tsImports}}
 import { AttributeTypeMapEntry } from '../models/ModelTypes{{importFileExtension}}';
 import { HttpFile } from '../http/http{{importFileExtension}}';
-{{/oneOf}}
 
 {{#description}}
 /**
 * {{{.}}}
 */
 {{/description}}
 {{^isEnum}}
-{{#oneOf}}
-{{#-first}}{{>model/modelOneOf}}{{/-first}}
-{{/oneOf}}
-{{^oneOf}}
 export class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{
 {{#vars}}
 {{#description}}
@@ -106,7 +99,6 @@ export enum {{classname}}{{enumName}} {
 {{/vars}}
 
 {{/hasEnums}}
-{{/oneOf}}
 {{/isEnum}}
 {{#isEnum}}
 export enum {{classname}} {
@@ -117,5 +109,6 @@ export enum {{classname}} {
     {{/allowableValues}}
 }
 {{/isEnum}}
+{{/oneOf}}
 {{/model}}
 {{/models}}

modules/openapi-generator/src/main/resources/typescript/model/modelOneOf.mustache

@@ -1,3 +1,8 @@
+{{#tsImports}}
+import { {{classname}} } from '{{filename}}{{importFileExtension}}';
+{{/tsImports}}
+import { findMatchingType } from '../models/TypeMatcher{{importFileExtension}}';
+
 /**
  * @type {{classname}}
  * Type