Add multiple servers support to JS API client

bin/openapi3/javascript-es6-petstore.sh

@@ -0,0 +1,34 @@
+#!/bin/sh
+
+SCRIPT="$0"
+echo "# START SCRIPT: $SCRIPT"
+
+while [ -h "$SCRIPT" ] ; do
+  ls=`ls -ld "$SCRIPT"`
+  link=`expr "$ls" : '.*-> \(.*\)$'`
+  if expr "$link" : '/.*' > /dev/null; then
+    SCRIPT="$link"
+  else
+    SCRIPT=`dirname "$SCRIPT"`/"$link"
+  fi
+done
+
+if [ ! -d "${APP_DIR}" ]; then
+  APP_DIR=`dirname "$SCRIPT"`/..
+  APP_DIR=`cd "${APP_DIR}"; pwd`
+fi
+
+executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
+
+if [ ! -f "$executable" ]
+then
+  mvn -B clean package
+fi
+
+# if you've executed sbt assembly previously it will use that instead.
+export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
+ags="generate -t modules/openapi-generator/src/main/resources/Javascript/es6 \
+-i modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml -g javascript \
+-o samples/openapi3/client/petstore/javascript-es6 $@"
+
+java -DappName=PetstoreClient $JAVA_OPTS -jar $executable $ags

modules/openapi-generator/src/main/resources/Javascript/ApiClient.mustache

@@ -594,6 +594,71 @@
     }
   };
 
+    {{#emitJSDoc}}
+  /**
+    * Gets an array of host settings
+    * @returns An array of host settings
+    */
+    {{/emitJSDoc}}
+    exports.hostSettings = function() {
+        return [
+            {{#servers}}
+            {
+              'url': "{{{url}}}",
+              'description': "{{{description}}}{{^description}}No description provided{{/description}}",
+              {{#variables}}
+              {{#-first}}
+              'variables': {
+              {{/-first}}
+                {{{name}}}: {
+                    'description': "{{{description}}}{{^description}}No description provided{{/description}}",
+                    'default_value': "{{{defaultValue}}}",
+                    {{#enumValues}}
+                    {{#-first}}
+                    'enum_values': [
+                    {{/-first}}
+                      "{{{.}}}"{{^-last}},{{/-last}}
+                    {{#-last}}
+                    ]
+                    {{/-last}}
+                    {{/enumValues}}
+                  }{{^-last}},{{/-last}}
+                {{#-last}}
+                }
+                {{/-last}}
+              {{/variables}}
+            }{{^-last}},{{/-last}}
+            {{/servers}}
+      ];
+    };
+
+    exports.getBasePathFromSettings = function(index, variables={}) {
+        var servers = this.hostSettings();
+
+        // check array index out of bound
+        if (index < 0 || index >= servers.length) {
+            throw new Error("Invalid index " + index + " when selecting the host settings. Must be less than " + servers.length);
+        }
+
+        var server = servers[index];
+        var url = server['url'];
+
+        // go through variable and assign a value
+        for (var variable_name in server['variables']) {
+            if (variable_name in variables) {
+                if (server['variables'][variable_name]['enum_values'].includes(variables[variable_name])) {
+                    url = url.replace("{" + variable_name + "}", variables[variable_name]);
+                } else {
+                    throw new Error("The variable `" + variable_name + "` in the host URL has invalid value " + variables[variable_name] + ". Must be " + server['variables'][variable_name]['enum_values'] + ".");
+                }
+            } else {
+                // use default value
+                url = url.replace("{" + variable_name + "}", server['variables'][variable_name]['default_value'])
+            }
+        }
+        return url;
+    };
+
 {{#emitJSDoc}}  /**
    * Constructs a new map or array model from REST data.
    * @param data {Object|Array} The REST data.

modules/openapi-generator/src/main/resources/Javascript/es6/ApiClient.mustache

@@ -560,6 +560,71 @@ class ApiClient {
         }
     }
 
+    {{#emitJSDoc}}
+  /**
+    * Gets an array of host settings
+    * @returns An array of host settings
+    */
+    {{/emitJSDoc}}
+    hostSettings() {
+        return [
+            {{#servers}}
+            {
+              'url': "{{{url}}}",
+              'description': "{{{description}}}{{^description}}No description provided{{/description}}",
+              {{#variables}}
+              {{#-first}}
+              'variables': {
+              {{/-first}}
+                {{{name}}}: {
+                    'description': "{{{description}}}{{^description}}No description provided{{/description}}",
+                    'default_value': "{{{defaultValue}}}",
+                    {{#enumValues}}
+                    {{#-first}}
+                    'enum_values': [
+                    {{/-first}}
+                      "{{{.}}}"{{^-last}},{{/-last}}
+                    {{#-last}}
+                    ]
+                    {{/-last}}
+                    {{/enumValues}}
+                  }{{^-last}},{{/-last}}
+                {{#-last}}
+                }
+                {{/-last}}
+              {{/variables}}
+            }{{^-last}},{{/-last}}
+            {{/servers}}
+      ];
+    }
+
+    getBasePathFromSettings(index, variables={}) {
+        var servers = this.hostSettings();
+
+        // check array index out of bound
+        if (index < 0 || index >= servers.length) {
+            throw new Error("Invalid index " + index + " when selecting the host settings. Must be less than " + servers.length);
+        }
+
+        var server = servers[index];
+        var url = server['url'];
+
+        // go through variable and assign a value
+        for (var variable_name in server['variables']) {
+            if (variable_name in variables) {
+                if (server['variables'][variable_name]['enum_values'].includes(variables[variable_name])) {
+                    url = url.replace("{" + variable_name + "}", variables[variable_name]);
+                } else {
+                    throw new Error("The variable `" + variable_name + "` in the host URL has invalid value " + variables[variable_name] + ". Must be " + server['variables'][variable_name]['enum_values'] + ".");
+                }
+            } else {
+                // use default value
+                url = url.replace("{" + variable_name + "}", server['variables'][variable_name]['default_value'])
+            }
+        }
+        return url;
+    }
+
     {{#emitJSDoc}}/**
     * Constructs a new map or array model from REST data.
     * @param data {Object|Array} The REST data.

pom.xml

@@ -1034,6 +1034,7 @@
                 <module>samples/server/petstore/php-slim</module>
                 <module>samples/client/petstore/javascript</module>
                 <module>samples/client/petstore/javascript-es6</module>
+                <module>samples/openapi3/client/petstore/javascript-es6</module>
                 <module>samples/client/petstore/javascript-promise</module>
                 <module>samples/client/petstore/javascript-promise-es6</module>
                 <module>samples/client/petstore/javascript-flowtyped</module>

samples/client/petstore/javascript-es6/README.md

@@ -162,6 +162,8 @@ Class | Method | HTTP request | Description
  - [OpenApiPetstore.ReadOnlyFirst](docs/ReadOnlyFirst.md)
  - [OpenApiPetstore.SpecialModelName](docs/SpecialModelName.md)
  - [OpenApiPetstore.Tag](docs/Tag.md)
+ - [OpenApiPetstore.TypeHolderDefault](docs/TypeHolderDefault.md)
+ - [OpenApiPetstore.TypeHolderExample](docs/TypeHolderExample.md)
  - [OpenApiPetstore.User](docs/User.md)
 
 

samples/client/petstore/javascript-es6/docs/TypeHolderDefault.md

@@ -0,0 +1,12 @@
+# OpenApiPetstore.TypeHolderDefault
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**stringItem** | **String** |  | [default to 'what']
+**numberItem** | **Number** |  | 
+**integerItem** | **Number** |  | 
+**boolItem** | **Boolean** |  | [default to true]
+**arrayItem** | **[Number]** |  | 
+
+

samples/client/petstore/javascript-es6/docs/TypeHolderExample.md

@@ -0,0 +1,12 @@
+# OpenApiPetstore.TypeHolderExample
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**stringItem** | **String** |  | 
+**numberItem** | **Number** |  | 
+**integerItem** | **Number** |  | 
+**boolItem** | **Boolean** |  | 
+**arrayItem** | **[Number]** |  | 
+
+