- Not exporting unused exports

package.json

@@ -1,6 +1,6 @@
 {
     "name": "openapi-typescript-codegen",
-    "version": "0.4.1",
+    "version": "0.4.4",
     "description": "NodeJS library that generates Typescript or Javascript clients based on the OpenAPI specification.",
     "author": "Ferdi Koomen",
     "homepage": "https://github.com/ferdikoomen/openapi-typescript-codegen",

src/templates/exportService.hbs

@@ -8,9 +8,15 @@
 import { {{{this}}} } from '../models/{{{this}}}';
 {{/each}}
 {{/if}}
+{{#if hasApiErrors}}
 import { ApiError, catchGenericError } from '../core/ApiError';
+{{else}}
+import { catchGenericError } from '../core/ApiError';
+{{/if}}
 import { request as __request } from '../core/request';
+{{#if hasApiVersion}}
 import { OpenAPI } from '../core/OpenAPI';
+{{/if}}
 
 export class {{{name}}} {
 

src/utils/writeClientServices.ts

@@ -5,6 +5,8 @@ import { writeFile } from './fileSystem';
 import { format } from './format';
 import { Templates } from './registerHandlebarTemplates';
 
+const VERSION_TEMPLATE_STRING = 'OpenAPI.VERSION';
+
 /**
  * Generate Services using the Handlebar template and write to disk.
  * @param services Array of Services to write.
@@ -15,8 +17,12 @@ import { Templates } from './registerHandlebarTemplates';
 export async function writeClientServices(services: Service[], templates: Templates, outputPath: string, useOptions: boolean): Promise<void> {
     for (const service of services) {
         const file = path.resolve(outputPath, `${service.name}.ts`);
+        const hasApiErrors = service.operations.some(operation => operation.errors.length);
+        const hasApiVersion = service.operations.some(operation => operation.path.includes(VERSION_TEMPLATE_STRING));
         const templateResult = templates.service({
             ...service,
+            hasApiErrors,
+            hasApiVersion,
             useOptions,
         });
         await writeFile(file, format(templateResult));

test/__snapshots__/index.spec.js.snap

@@ -2024,7 +2024,7 @@ exports[`v2 should generate: ./test/result/v2/services/DefaultsService.ts 1`] =
 import { ModelThatExtends } from '../models/ModelThatExtends';
 import { ModelThatExtendsExtends } from '../models/ModelThatExtendsExtends';
 import { ModelWithString } from '../models/ModelWithString';
-import { ApiError, catchGenericError } from '../core/ApiError';
+import { catchGenericError } from '../core/ApiError';
 import { request as __request } from '../core/request';
 import { OpenAPI } from '../core/OpenAPI';
 
@@ -2164,7 +2164,7 @@ exports[`v2 should generate: ./test/result/v2/services/DuplicateService.ts 1`] =
 /* eslint-disable */
 /* prettier-ignore */
 
-import { ApiError, catchGenericError } from '../core/ApiError';
+import { catchGenericError } from '../core/ApiError';
 import { request as __request } from '../core/request';
 import { OpenAPI } from '../core/OpenAPI';
 
@@ -2278,7 +2278,7 @@ exports[`v2 should generate: ./test/result/v2/services/ParametersService.ts 1`]
 /* eslint-disable */
 /* prettier-ignore */
 
-import { ApiError, catchGenericError } from '../core/ApiError';
+import { catchGenericError } from '../core/ApiError';
 import { request as __request } from '../core/request';
 import { OpenAPI } from '../core/OpenAPI';
 
@@ -2464,7 +2464,7 @@ exports[`v2 should generate: ./test/result/v2/services/SimpleService.ts 1`] = `
 /* eslint-disable */
 /* prettier-ignore */
 
-import { ApiError, catchGenericError } from '../core/ApiError';
+import { catchGenericError } from '../core/ApiError';
 import { request as __request } from '../core/request';
 import { OpenAPI } from '../core/OpenAPI';
 
@@ -2585,7 +2585,7 @@ exports[`v2 should generate: ./test/result/v2/services/TypesService.ts 1`] = `
 /* prettier-ignore */
 
 import { Dictionary } from '../models/Dictionary';
-import { ApiError, catchGenericError } from '../core/ApiError';
+import { catchGenericError } from '../core/ApiError';
 import { request as __request } from '../core/request';
 import { OpenAPI } from '../core/OpenAPI';
 
@@ -4801,7 +4801,7 @@ exports[`v3 should generate: ./test/result/v3/services/DefaultsService.ts 1`] =
 import { ModelThatExtends } from '../models/ModelThatExtends';
 import { ModelThatExtendsExtends } from '../models/ModelThatExtendsExtends';
 import { ModelWithString } from '../models/ModelWithString';
-import { ApiError, catchGenericError } from '../core/ApiError';
+import { catchGenericError } from '../core/ApiError';
 import { request as __request } from '../core/request';
 import { OpenAPI } from '../core/OpenAPI';
 
@@ -4941,7 +4941,7 @@ exports[`v3 should generate: ./test/result/v3/services/DuplicateService.ts 1`] =
 /* eslint-disable */
 /* prettier-ignore */
 
-import { ApiError, catchGenericError } from '../core/ApiError';
+import { catchGenericError } from '../core/ApiError';
 import { request as __request } from '../core/request';
 import { OpenAPI } from '../core/OpenAPI';
 
@@ -5055,7 +5055,7 @@ exports[`v3 should generate: ./test/result/v3/services/MultipartService.ts 1`] =
 /* eslint-disable */
 /* prettier-ignore */
 
-import { ApiError, catchGenericError } from '../core/ApiError';
+import { catchGenericError } from '../core/ApiError';
 import { request as __request } from '../core/request';
 import { OpenAPI } from '../core/OpenAPI';
 
@@ -5095,7 +5095,7 @@ exports[`v3 should generate: ./test/result/v3/services/ParametersService.ts 1`]
 import { ModelThatExtends } from '../models/ModelThatExtends';
 import { ModelThatExtendsExtends } from '../models/ModelThatExtendsExtends';
 import { ModelWithString } from '../models/ModelWithString';
-import { ApiError, catchGenericError } from '../core/ApiError';
+import { catchGenericError } from '../core/ApiError';
 import { request as __request } from '../core/request';
 import { OpenAPI } from '../core/OpenAPI';
 
@@ -5347,7 +5347,7 @@ exports[`v3 should generate: ./test/result/v3/services/SimpleService.ts 1`] = `
 /* eslint-disable */
 /* prettier-ignore */
 
-import { ApiError, catchGenericError } from '../core/ApiError';
+import { catchGenericError } from '../core/ApiError';
 import { request as __request } from '../core/request';
 import { OpenAPI } from '../core/OpenAPI';
 
@@ -5467,7 +5467,7 @@ exports[`v3 should generate: ./test/result/v3/services/TypesService.ts 1`] = `
 /* eslint-disable */
 /* prettier-ignore */
 
-import { ApiError, catchGenericError } from '../core/ApiError';
+import { catchGenericError } from '../core/ApiError';
 import { request as __request } from '../core/request';
 import { OpenAPI } from '../core/OpenAPI';
 
@@ -5536,7 +5536,7 @@ exports[`v3 should generate: ./test/result/v3/services/UploadService.ts 1`] = `
 /* eslint-disable */
 /* prettier-ignore */
 
-import { ApiError, catchGenericError } from '../core/ApiError';
+import { catchGenericError } from '../core/ApiError';
 import { request as __request } from '../core/request';
 import { OpenAPI } from '../core/OpenAPI';