[typescript-fetch] global configuration

Author: David

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptFetchClientCodegen.java

@@ -51,7 +51,6 @@ public void processOpts() {
         supportingFiles.add(new SupportingFile("index.mustache", "", "index.ts"));
         supportingFiles.add(new SupportingFile("api.mustache", "", "api.ts"));
         supportingFiles.add(new SupportingFile("configuration.mustache", "", "configuration.ts"));
-        supportingFiles.add(new SupportingFile("globalConfiguration.mustache", "", "globalConfiguration.ts"));
         supportingFiles.add(new SupportingFile("custom.d.mustache", "", "custom.d.ts"));
         supportingFiles.add(new SupportingFile("git_push.sh.mustache", "", "git_push.sh"));
         supportingFiles.add(new SupportingFile("gitignore", "", ".gitignore"));

modules/swagger-codegen/src/main/resources/typescript-fetch/api.mustache

@@ -5,7 +5,6 @@
 import * as url from "url";
 import * as portableFetch from "portable-fetch";
 import { Configuration } from "./configuration";
-import { GlobalConfiguration } from "./globalConfiguration";
 
 /**
  *
@@ -45,10 +44,10 @@ export interface FetchArgs {
 export class BaseAPI {
     protected configuration: Configuration;
 
-    constructor(configuration?: Configuration, protected basePath: string = GlobalConfiguration.basePath, protected fetch: FetchAPI = portableFetch) {
+    constructor(configuration: Configuration = Configuration.DEFAULT_INSTANCE, protected basePath: string = Configuration.DEFAULT_INSTANCE.basePath, protected fetch: FetchAPI = portableFetch) {
         if (configuration) {
             this.configuration = configuration;
-            this.basePath = configuration.basePath || this.basePath;
+            this.basePath = configuration.basePath || this.basePath || '';
         }
     }
 };
@@ -261,7 +260,7 @@ export const {{classname}}Fp = function(configuration?: Configuration) {
          */
         {{nickname}}({{#allParams}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}, {{/allParams}}options?: any): (fetch?: FetchAPI, basePath?: string) => Promise<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Response{{/returnType}}> {
             const localVarFetchArgs = {{classname}}FetchParamCreator(configuration).{{nickname}}({{#allParams}}{{paramName}}, {{/allParams}}options);
-            return (fetch: FetchAPI = portableFetch, basePath: string = GlobalConfiguration.basePath) => {
+            return (fetch: FetchAPI = portableFetch, basePath: string = Configuration.DEFAULT_INSTANCE.basePath) => {
                 return fetch(basePath + localVarFetchArgs.url, localVarFetchArgs.options).then((response) => {
                     if (response.status >= 200 && response.status < 300) {
                         return response{{#returnType}}.json(){{/returnType}};

modules/swagger-codegen/src/main/resources/typescript-fetch/configuration.mustache

@@ -10,6 +10,10 @@ export interface ConfigurationParameters {
 }
 
 export class Configuration {
+    /**
+     * object for default configurations
+     */
+    static DEFAULT_INSTANCE = new Configuration({basePath: "{{{basePath}}}".replace(/\/+$/, "")});
     /**
      * parameter for apiKey security
      * @param name security name

modules/swagger-codegen/src/main/resources/typescript-fetch/globalConfiguration.mustache

@@ -3,4 +3,3 @@
 
 export * from "./api";
 export * from "./configuration";
-export * from "./globalConfiguration";

modules/swagger-codegen/src/main/resources/typescript-fetch/index.mustache

@@ -21,6 +21,10 @@ export interface ConfigurationParameters {
 }
 
 export class Configuration {
+    /**
+     * object for default configurations
+     */
+    static DEFAULT_INSTANCE = new Configuration({basePath: "http://petstore.swagger.io/v2".replace(/\/+$/, "")});
     /**
      * parameter for apiKey security
      * @param name security name

samples/client/petstore/typescript-fetch/builds/default/api.ts

@@ -14,4 +14,3 @@
 
 export * from "./api";
 export * from "./configuration";
-export * from "./globalConfiguration";

samples/client/petstore/typescript-fetch/builds/default/configuration.ts

@@ -21,6 +21,10 @@ export interface ConfigurationParameters {
 }
 
 export class Configuration {
+    /**
+     * object for default configurations
+     */
+    static DEFAULT_INSTANCE = new Configuration({basePath: "http://petstore.swagger.io/v2".replace(/\/+$/, "")});
     /**
      * parameter for apiKey security
      * @param name security name

samples/client/petstore/typescript-fetch/builds/default/globalConfiguration.ts

@@ -14,4 +14,3 @@
 
 export * from "./api";
 export * from "./configuration";
-export * from "./globalConfiguration";