fix(methods): recognizing return type if TS primitive or complex type

Author: vmasek

src/helper.ts

@@ -2,7 +2,7 @@ import { Reference } from 'swagger-schema-official';
 import { FileInfix } from './types';
 
 export const BASIC_TS_TYPE_REGEX = /\b(?:string|number|integer|boolean)\b/;
-const BUILD_IN_TS_TYPE_REGEX = /^(?:string|number|integer|boolean|null|undefined|any|Object|Date|File|Blob)\b/;
+const BUILD_IN_TS_TYPE_REGEX = /^(?:string|number|integer|boolean|null|undefined|any|Object|Date|File|Blob)\b/i;
 
 export function toCamelCase(text: string = '', lowerFirst: boolean = true): string {
   text = removeDuplicateWords(text);
@@ -74,7 +74,11 @@ export function toTypescriptType(type: string | undefined): string {
 }
 
 export function typeName(name: string = 'any', isArray: boolean = false): string {
-  const type = BUILD_IN_TS_TYPE_REGEX.test(name) ? name : toCamelCase(name, false);
+  const type = BASIC_TS_TYPE_REGEX.test(name)
+    ? /\binteger\b/.test(name)
+      ? 'number'
+      : name
+    : toCamelCase(name, false);
 
   return `${type}${isArray ? '[]' : ''}`;
 }

src/parser.ts

@@ -15,7 +15,6 @@ import {
   Property,
   Render,
   RenderFileName,
-  ResponseType
 } from './types';
 import {
   BASIC_TS_TYPE_REGEX,
@@ -320,21 +319,27 @@ function defineInterface(schema: Schema, definitionKey: string): Definition {
   };
 }
 
-function determineResponseType(response: Response): ResponseType {
+function determineResponseType(response: Response): {
+  readonly type: string;
+  readonly name?: string;
+} {
   if (response == null) { // TODO: check non-200 response codes
     logWarn('200 or 201 response not specified; `any` will be used');
     return {name: 'any', type: 'any'};
   }
 
   const {schema} = response;
+
   if (schema == null) {
     logWarn('200 or 201 response schema not specified; `any` will be used');
     return {name: 'any', type: 'any'};
   }
 
   const nullable = (schema as Schema & { 'x-nullable'?: boolean })['x-nullable'] || false;
+
   if (schema.type === 'array') {
     const {items} = schema;
+
     if (items == null) {
       logWarn('`items` field not present; `any[]` will be used');
       return {name: 'any', type: 'any[]'};
@@ -356,6 +361,11 @@ function determineResponseType(response: Response): ResponseType {
     return {name, type};
   }
 
+  if (schema.type != null) {
+    const type = nullable ? `${typeName(schema.type)} | null` : typeName(schema.type);
+    return {name: type, type};
+  }
+
   return {name: 'any', type: 'any'};
 }
 

src/types.ts

@@ -70,11 +70,6 @@ export interface Method {
   readonly responseTypeName?: string; // method return type without prefix
 }
 
-export interface ResponseType {
-  readonly type: string;
-  readonly name?: string;
-}
-
 /**
  * Options for generator
  */

tests/custom/api/api-client.interface.ts

@@ -20,7 +20,7 @@ export interface APIClientInterface {
       page: number,  // page number
     },
     requestHttpOptions?: HttpOptions
-  ): Observable<any>;
+  ): Observable<Object>;
 
   getPetsId(
     args: {

tests/custom/api/api-client.service.ts

@@ -66,7 +66,7 @@ export class APIClient implements APIClientInterface {
       page: number,  // page number
     },
     requestHttpOptions?: HttpOptions
-  ): Observable<any> {
+  ): Observable<Object> {
     const path = `/itemModels`;
     const options: APIHttpOptions = {...this.options, ...requestHttpOptions};
 
@@ -76,7 +76,7 @@ export class APIClient implements APIClientInterface {
     if ('page' in args) {
       options.params = options.params.set('page', String(args.page));
     }
-    return this.sendRequest<any>('GET', path, options);
+    return this.sendRequest<Object>('GET', path, options);
   }
 
   getPetsId(

tests/esquare/api/api-client.interface.ts

@@ -11,32 +11,32 @@ export interface APIClientInterface {
       body: models.AuthForm,  // Structure entity object that needs to be added
     },
     requestHttpOptions?: HttpOptions
-  ): Observable<any>;
+  ): Observable<Object>;
 
   authRef(
     requestHttpOptions?: HttpOptions
-  ): Observable<any>;
+  ): Observable<Object>;
 
   passwordRestoreRequest(
     args: {
       body: models.RestoreForm,  // Structure entity object that needs to be added
     },
     requestHttpOptions?: HttpOptions
-  ): Observable<any>;
+  ): Observable<Object>;
 
   passwordRestoreEmailRequest(
     args: {
       body: models.RestoreRequestForm,  // Structure entity object that needs to be added
     },
     requestHttpOptions?: HttpOptions
-  ): Observable<any>;
+  ): Observable<Object>;
 
   passwordRestoreCheckRestoreGuid(
     args: {
       restoreGuid: string,  // RestoreGuid for check
     },
     requestHttpOptions?: HttpOptions
-  ): Observable<any>;
+  ): Observable<Object>;
 
   getAclList(
     requestHttpOptions?: HttpOptions
@@ -81,7 +81,7 @@ export interface APIClientInterface {
       order?: models.Order,  // (optional) - asc - desc 
     },
     requestHttpOptions?: HttpOptions
-  ): Observable<any>;
+  ): Observable<Object>;
 
   /**
    * [Screenshot from design](http://prntscr.com/hywkd5)
@@ -107,7 +107,7 @@ export interface APIClientInterface {
       order?: models.Order,  // (optional) - asc - desc 
     },
     requestHttpOptions?: HttpOptions
-  ): Observable<any>;
+  ): Observable<Object>;
 
   /**
    * [Screenshot from design](http://prntscr.com/i3ym4j)
@@ -130,7 +130,7 @@ export interface APIClientInterface {
       file: File,  // file to upload
     },
     requestHttpOptions?: HttpOptions
-  ): Observable<any>;
+  ): Observable<number>;
 
   /**
    * [Screenshot from design](http://prntscr.com/hy52hi)
@@ -187,7 +187,7 @@ export interface APIClientInterface {
       all?: boolean,  // (optional) Indicator of downloading data(all or errors only)
     },
     requestHttpOptions?: HttpOptions
-  ): Observable<any>;
+  ): Observable<File>;
 
   /**
    * [Screenshot from design](http://prntscr.com/hy57nj)
@@ -209,7 +209,7 @@ export interface APIClientInterface {
       id: number,  // Id of current import
     },
     requestHttpOptions?: HttpOptions
-  ): Observable<any>;
+  ): Observable<File>;
 
   /**
    * [Screenshot from design](http://prntscr.com/hy5ae7)
@@ -220,7 +220,7 @@ export interface APIClientInterface {
       id: number,  // Id of current import
     },
     requestHttpOptions?: HttpOptions
-  ): Observable<any>;
+  ): Observable<File>;
 
   /**
    * [Screenshot from design](http://prntscr.com/hy5aqq)
@@ -271,7 +271,7 @@ export interface APIClientInterface {
       order?: models.Order,  // (optional) - asc - desc 
     },
     requestHttpOptions?: HttpOptions
-  ): Observable<any>;
+  ): Observable<Object>;
 
   /**
    * [Screenshot from design](http://prntscr.com/i4byyx)
@@ -287,7 +287,7 @@ export interface APIClientInterface {
       order?: models.Order,  // (optional) - asc - desc 
     },
     requestHttpOptions?: HttpOptions
-  ): Observable<any>;
+  ): Observable<Object>;
 
   getUsersList(
     args: {
@@ -301,7 +301,7 @@ export interface APIClientInterface {
       unassignedFromRole?: number,  // (optional) role id | [Screenshot from design](http://prntscr.com/ib9z16)
     },
     requestHttpOptions?: HttpOptions
-  ): Observable<any>;
+  ): Observable<Object>;
 
   createUser(
     args: {
@@ -408,7 +408,7 @@ export interface APIClientInterface {
       order?: models.Order,  // (optional) - asc - desc 
     },
     requestHttpOptions?: HttpOptions
-  ): Observable<any>;
+  ): Observable<Object>;
 
   /**
    * [Screenshot from design](http://prntscr.com/ibac47) |
@@ -440,7 +440,7 @@ export interface APIClientInterface {
       order?: models.Order,  // (optional) - asc - desc 
     },
     requestHttpOptions?: HttpOptions
-  ): Observable<any>;
+  ): Observable<Object>;
 
   enableNotification(
     args: {
@@ -476,7 +476,7 @@ export interface APIClientInterface {
       body?: models.NotificationEditable,
     },
     requestHttpOptions?: HttpOptions
-  ): Observable<any>;
+  ): Observable<number>;
 
   /**
    * [Screenshot from design](http://prntscr.com/ijzt2b)