- Fixed ferdikoomen#632

Author: ferdikoomen

package.json

@@ -1,6 +1,6 @@
 {
  "name": "openapi-typescript-codegen",
- "version": "0.9.3",
+ "version": "0.9.4",
  "description": "Library that generates Typescript clients based on the OpenAPI specification.",
  "author": "Ferdi Koomen",
  "homepage": "https://github.com/ferdikoomen/openapi-typescript-codegen",

src/openApi/v2/parser/getModelComposition.ts

@@ -31,6 +31,11 @@ export function getModelComposition(openApi: OpenApi, definition: OpenApiSchema,
  });
 
  if (definition.properties) {
+ const properties = getModelProperties(openApi, definition, getModel);
+ properties.forEach(property => {
+ composition.imports.push(...property.imports);
+ composition.enums.push(...property.enums);
+ });
  composition.properties.push({
  name: 'properties',
  export: 'interface',
@@ -46,7 +51,7 @@ export function getModelComposition(openApi: OpenApi, definition: OpenApiSchema,
  imports: [],
  enum: [],
  enums: [],
- properties: [...getModelProperties(openApi, definition, getModel)],
+ properties,
  });
  }
  return composition;

src/openApi/v3/parser/getModelComposition.ts

@@ -31,6 +31,11 @@ export function getModelComposition(openApi: OpenApi, definition: OpenApiSchema,
  });
 
  if (definition.properties) {
+ const properties = getModelProperties(openApi, definition, getModel);
+ properties.forEach(property => {
+ composition.imports.push(...property.imports);
+ composition.enums.push(...property.enums);
+ });
  composition.properties.push({
  name: 'properties',
  export: 'interface',
@@ -46,7 +51,7 @@ export function getModelComposition(openApi: OpenApi, definition: OpenApiSchema,
  imports: [],
  enum: [],
  enums: [],
- properties: [...getModelProperties(openApi, definition, getModel)],
+ properties,
  });
  }
 

src/templates/partials/typeIntersection.hbs

@@ -1 +1 @@
-({{#intersection properties parent}}{{this}}{{/intersection}}){{>isNullable}}
+{{#intersection properties parent}}{{this}}{{/intersection}}{{>isNullable}}

src/templates/partials/typeUnion.hbs

@@ -1 +1 @@
-({{#union properties parent}}{{this}}{{/union}}){{>isNullable}}
+{{#union properties parent}}{{this}}{{/union}}{{>isNullable}}

src/utils/registerHandlebarHelpers.ts

@@ -21,13 +21,23 @@ export function registerHandlebarHelpers(root: { httpClient: HttpClient; useOpti
  Handlebars.registerHelper('union', function (this: any, properties: Model[], parent: string | undefined, options: Handlebars.HelperOptions) {
  const type = Handlebars.partials['type'];
  const types = properties.map(property => type({ ...root, ...property, parent }));
- return options.fn(types.filter(unique).join(' | '));
+ const uniqueTypes = types.filter(unique);
+ let uniqueTypesString = uniqueTypes.join(' | ');
+ if (uniqueTypes.length > 1) {
+ uniqueTypesString = `(${uniqueTypesString})`;
+ }
+ return options.fn(uniqueTypesString);
  });
 
  Handlebars.registerHelper('intersection', function (this: any, properties: Model[], parent: string | undefined, options: Handlebars.HelperOptions) {
  const type = Handlebars.partials['type'];
  const types = properties.map(property => type({ ...root, ...property, parent }));
- return options.fn(types.filter(unique).join(' & '));
+ const uniqueTypes = types.filter(unique);
+ let uniqueTypesString = uniqueTypes.join(' & ');
+ if (uniqueTypes.length > 1) {
+ uniqueTypesString = `(${uniqueTypesString})`;
+ }
+ return options.fn(uniqueTypesString);
  });
 
  Handlebars.registerHelper('enumerator', function (this: any, enumerators: Enum[], parent: string | undefined, name: string | undefined, options: Handlebars.HelperOptions) {

test/__snapshots__/index.spec.js.snap

@@ -594,12 +594,18 @@ export enum EnumWithNumbers {
  '_1' = 1,
  '_2' = 2,
  '_3' = 3,
+ '_1.1' = 1.1,
+ '_1.2' = 1.2,
+ '_1.3' = 1.3,
  '_100' = 100,
  '_200' = 200,
  '_300' = 300,
  '_-100' = -100,
  '_-200' = -200,
  '_-300' = -300,
+ '_-1.1' = -1.1,
+ '_-1.2' = -1.2,
+ '_-1.3' = -1.3,
 }"
 `;
 
@@ -3068,12 +3074,18 @@ export enum EnumWithNumbers {
  '_1' = 1,
  '_2' = 2,
  '_3' = 3,
+ '_1.1' = 1.1,
+ '_1.2' = 1.2,
+ '_1.3' = 1.3,
  '_100' = 100,
  '_200' = 200,
  '_300' = 300,
  '_-100' = -100,
  '_-200' = -200,
  '_-300' = -300,
+ '_-1.1' = -1.1,
+ '_-1.2' = -1.2,
+ '_-1.3' = -1.3,
 }"
 `;
 

test/spec/v2.json

@@ -816,12 +816,18 @@
  1,
  2,
  3,
+ 1.1,
+ 1.20,
+ 1.300,
  100,
  200,
  300,
  -100,
  -200,
- -300
+ -300,
+ -1.1,
+ -1.20,
+ -1.300
  ]
  },
  "EnumFromDescription": {

test/spec/v3.json

@@ -1315,12 +1315,18 @@
  1,
  2,
  3,
+ 1.1,
+ 1.20,
+ 1.300,
  100,
  200,
  300,
  -100,
  -200,
- -300
+ -300,
+ -1.1,
+ -1.20,
+ -1.300
  ]
  },
  "EnumFromDescription": {