feature: add customApiConfiguration flag

fllstx · Sep 26, 2022 · e651ed3 · e651ed3
1 parent 1148af3
commit e651ed3
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 1 deletion.
diff --git a/lib/globals.ts b/lib/globals.ts
@@ -20,6 +20,7 @@ export class Globals {
   modelIndexFile?: string;
   serviceIndexFile?: string;
   rootUrl?: string;
+  customApiConfiguration?: string;
 
   constructor(options: Options) {
     this.configurationClass = options.configuration || 'ApiConfiguration';
@@ -42,6 +43,10 @@ export class Globals {
     if (options.modelIndex !== false && options.modelIndex !== '') {
       this.modelIndexFile = options.modelIndex === true || options.modelIndex == undefined ? 'models' : options.modelIndex;
     }
+    if (options.customApiConfiguration) {
+      this.customApiConfiguration = options.customApiConfiguration;
+      this.configurationFile = this.customApiConfiguration;
+    }
   }
 
 }
diff --git a/lib/ng-openapi-gen.ts b/lib/ng-openapi-gen.ts
@@ -90,7 +90,9 @@ export class NgOpenApiGen {
       };
 
       // Generate the general files
-      this.write('configuration', general, this.globals.configurationFile);
+      if (!this.globals.customApiConfiguration) {
+        this.write('configuration', general, this.globals.configurationFile);
+      }
       this.write('response', general, this.globals.responseFile);
       this.write('requestBuilder', general, this.globals.requestBuilderFile);
       this.write('baseService', general, this.globals.baseServiceFile);

diff --git a/lib/options.ts b/lib/options.ts
@@ -105,4 +105,7 @@ export interface Options {
 
   /** When specified, will create temporary files in system temporary folder instead of next to output folder. */
   useTempDir?: boolean;
+
+  /** When set, the ApiConfiguration file not be generated and only a custom import will be used */
+  customApiConfiguration?: string;
 }
diff --git a/ng-openapi-gen-schema.json b/ng-openapi-gen-schema.json
@@ -196,6 +196,11 @@
       "description": "When specified, will create temporary files in system temporary folder instead of output folder",
       "default": false,
       "type": "boolean"
+    },
+    "customApiConfiguration": {
+      "description": "When set, the ApiConfiguration file not be generated and only a custom import will be used",
+      "default": "",
+      "type": "string"
     }
   }
 }
diff --git a/templates/baseService.handlebars b/templates/baseService.handlebars
@@ -2,7 +2,11 @@
 /* eslint-disable */
 import { Injectable } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
+{{#if customApiConfiguration}}
+import { {{configurationClass}} } from '{{configurationFile}}';
+{{else}}
 import { {{configurationClass}} } from './{{configurationFile}}';
+{{/if}}
 
 /**
  * Base class for services

diff --git a/templates/index.handlebars b/templates/index.handlebars
@@ -1,4 +1,9 @@
+
+{{#if customApiConfiguration}}
+export { {{configurationClass}} } from '{{{configurationFile}}}';
+{{else}}
 export { {{configurationClass}} } from './{{{configurationFile}}}';
+{{/if}}
 export { {{baseServiceClass}} } from './{{{baseServiceFile}}}';
 export { {{requestBuilderClass}} } from './{{{requestBuilderFile}}}';
 export { {{responseClass}} } from './{{{responseFile}}}';

diff --git a/templates/module.handlebars b/templates/module.handlebars
@@ -2,7 +2,11 @@
 /* eslint-disable */
 import { NgModule, ModuleWithProviders, SkipSelf, Optional } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
+{{#if customApiConfiguration}}
+import { {{configurationClass}}, {{configurationParams}} } from '{{configurationFile}}';
+{{else}}
 import { {{configurationClass}}, {{configurationParams}} } from './{{configurationFile}}';
+{{/if}}
 
 {{#services}}import { {{typeName}} } from './services/{{fileName}}';
 {{/services}}

diff --git a/templates/service.handlebars b/templates/service.handlebars
@@ -3,7 +3,11 @@
 import { Injectable } from '@angular/core';
 import { HttpClient, HttpResponse, HttpContext } from '@angular/common/http';
 import { {{baseServiceClass}} } from '../{{baseServiceFile}}';
+{{#if customApiConfiguration}}
+import { {{configurationClass}} } from '{{configurationFile}}';
+{{else}}
 import { {{configurationClass}} } from '../{{configurationFile}}';
+{{/if}}
 import { {{responseClass}} } from '../{{responseFile}}';
 import { {{requestBuilderClass}} } from '../{{requestBuilderFile}}';
 import { Observable } from 'rxjs';

diff --git a/test/templates/service.handlebars b/test/templates/service.handlebars
@@ -2,7 +2,11 @@
 import { Injectable } from '@angular/core';
 import { HttpClient, HttpResponse } from '@angular/common/http';
 import { {{baseServiceClass}} } from '../{{baseServiceFile}}';
+{{#if customApiConfiguration}}
+import { {{configurationClass}} } from '{{configurationFile}}';
+{{else}}
 import { {{configurationClass}} } from '../{{configurationFile}}';
+{{/if}}
 import { {{responseClass}} } from '../{{responseFile}}';
 import { {{requestBuilderClass}} } from '../{{requestBuilderFile}}';
 import { Observable } from 'rxjs';