Add types for ApiError, fix error for babel

Author: CodeLenny

src/client/interfaces/Operation.d.ts

@@ -12,5 +12,6 @@ export interface Operation extends OperationParameters {
     path: string;
     errors: OperationError[];
     results: OperationResponse[];
+    errorResults: OperationResponse[];
     responseHeader: string | null;
 }

src/openApi/v2/parser/getOperation.ts

@@ -7,7 +7,7 @@ import { getOperationName } from './getOperationName';
 import { getOperationParameters } from './getOperationParameters';
 import { getOperationResponseHeader } from './getOperationResponseHeader';
 import { getOperationResponses } from './getOperationResponses';
-import { getOperationResults } from './getOperationResults';
+import { getOperationErrorResults, getOperationResults } from './getOperationResults';
 import { getServiceName } from './getServiceName';
 import { sortByRequired } from './sortByRequired';
 
@@ -41,6 +41,7 @@ export const getOperation = (
         imports: [],
         errors: [],
         results: [],
+        errorResults: [],
         responseHeader: null,
     };
 
@@ -61,13 +62,19 @@ export const getOperation = (
     if (op.responses) {
         const operationResponses = getOperationResponses(openApi, op.responses);
         const operationResults = getOperationResults(operationResponses);
+        const operationErrorResults = getOperationErrorResults(operationResponses);
         operation.errors = getOperationErrors(operationResponses);
         operation.responseHeader = getOperationResponseHeader(operationResults);
 
         operationResults.forEach(operationResult => {
             operation.results.push(operationResult);
             operation.imports.push(...operationResult.imports);
         });
+
+        operationErrorResults.forEach(operationResult => {
+            operation.errorResults.push(operationResult);
+            operation.imports.push(...operationResult.imports);
+        });
     }
 
     operation.parameters = operation.parameters.sort(sortByRequired);

src/openApi/v2/parser/getOperationResults.ts

@@ -9,6 +9,41 @@ const areEqual = (a: Model, b: Model): boolean => {
     return equal;
 };
 
+export const getOperationErrorResults = (operationResponses: OperationResponse[]): OperationResponse[] => {
+    const operationResults: OperationResponse[] = [];
+
+    operationResponses.forEach(operationResponse => {
+        const { code } = operationResponse;
+        if (code && (code === 204 || code < 200 || code >= 300)) {
+            operationResults.push(operationResponse);
+        }
+    });
+
+    if (!operationResults.length) {
+        operationResults.push({
+            in: 'response',
+            name: '',
+            code: 0,
+            description: '',
+            export: 'generic',
+            type: 'any',
+            base: 'any',
+            template: null,
+            link: null,
+            isDefinition: false,
+            isReadOnly: false,
+            isRequired: false,
+            isNullable: false,
+            imports: [],
+            enum: [],
+            enums: [],
+            properties: [],
+        });
+    }
+
+    return operationResults;
+};
+
 export const getOperationResults = (operationResponses: OperationResponse[]): OperationResponse[] => {
     const operationResults: OperationResponse[] = [];
 

src/openApi/v3/parser/getOperation.ts

@@ -44,6 +44,7 @@ export const getOperation = (
         imports: [],
         errors: [],
         results: [],
+        errorResults: [],
         responseHeader: null,
     };
 

src/templates/exportService.hbs

@@ -25,14 +25,14 @@ import type { CancelablePromise } from '../core/CancelablePromise';
 import { BaseHttpRequest } from '../core/BaseHttpRequest';
 {{else}}
 import type { BaseHttpRequest } from '../core/BaseHttpRequest';
-import { Left, Right, Either } from '../core/ApiResult';
-import { ApiError } from '../core/ApiError';
+import type { Left, Right, Either } from '../core/ApiResult';
+import type { ApiError } from '../core/ApiError';
 {{/equals}}
 {{else}}
 import { OpenAPI } from '../core/OpenAPI';
 import { request as __request } from '../core/request';
-import { Left, Right, Either } from '../core/ApiResult';
-import { ApiError } from '../core/ApiError';
+import type { Left, Right, Either } from '../core/ApiResult';
+import type { ApiError } from '../core/ApiError';
 {{/if}}
 
 {{#equals @root.httpClient 'angular'}}
@@ -180,7 +180,7 @@ export class {{{name}}}{{{@root.postfix}}} {
 		try {
 			const result: ({{>result}}) = await this.httpRequest.request({
 	{{else}}
-	public async {{{name}}}Either({{>parameters}}): Promise<Either<ApiError, {{>result}}>> {
+	public async {{{name}}}Either({{>parameters}}): Promise<Either<{{>errorResult}}, {{>result}}>> {
 		try {
 			const result: ({{>result}}) = await this.httpRequest.request({
 	{{/equals}}
@@ -190,7 +190,7 @@ export class {{{name}}}{{{@root.postfix}}} {
 		try {
 			const result: ({{>result}}) = await __request(OpenAPI, this.http, {
 	{{else}}
-	public static async {{{name}}}Either({{>parameters}}): Promise<Either<ApiError, {{>result}}>> {
+	public static async {{{name}}}Either({{>parameters}}): Promise<Either<{{>errorResult}}, {{>result}}>> {
 		try {
 			const result: ({{>result}}) = await __request(OpenAPI, {
 	{{/equals}}
@@ -262,9 +262,9 @@ export class {{{name}}}{{{@root.postfix}}} {
 
 			return right;
 		} catch (e) {
-			const left: Left<ApiError> = {
+			const left: Left<{{>errorResult}}> = {
 				_tag: 'Left',
-				left: e as ApiError,
+				left: e as ({{>errorResult}}),
 			};
 
 			return left;

src/templates/partials/errorResult.hbs

@@ -0,0 +1,8 @@
+{{~#if errorResults~}}
+{{#each results}}ApiError<
+	{{#equals code 0}}number{{else}}{{{code}}}{{/equals}},
+	{{type}}
+>{{#unless @last}} | {{/unless}}{{/each}}
+{{~else~}}
+ApiError<number, any>
+{{~/if~}}

src/utils/registerHandlebarTemplates.ts

@@ -57,6 +57,7 @@ import templateExportSchema from '../templates/exportSchema.hbs';
 import templateExportService from '../templates/exportService.hbs';
 import templateIndex from '../templates/index.hbs';
 import partialBase from '../templates/partials/base.hbs';
+import partialErrorResult from '../templates/partials/errorResult.hbs';
 import partialExportComposition from '../templates/partials/exportComposition.hbs';
 import partialExportEnum from '../templates/partials/exportEnum.hbs';
 import partialExportInterface from '../templates/partials/exportInterface.hbs';
@@ -148,6 +149,7 @@ export const registerHandlebarTemplates = (root: {
     Handlebars.registerPartial('isRequired', Handlebars.template(partialIsRequired));
     Handlebars.registerPartial('parameters', Handlebars.template(partialParameters));
     Handlebars.registerPartial('result', Handlebars.template(partialResult));
+    Handlebars.registerPartial('errorResult', Handlebars.template(partialErrorResult));
     Handlebars.registerPartial('schema', Handlebars.template(partialSchema));
     Handlebars.registerPartial('schemaArray', Handlebars.template(partialSchemaArray));
     Handlebars.registerPartial('schemaDictionary', Handlebars.template(partialSchemaDictionary));