JS Client: Allow dot in path parameter name (#6116)

nitoqq · berdoc · web-flow · commit 25c7ccf30c1a · 2020-12-04T12:27:44.000+08:00
* JS Client: Allow dot in path parameter name

* JS Client: Allow dot in path parameter name

* Delete ApiClient.js

* Delete ApiClient.js

Co-authored-by: Nikolai Konovalov &lt;konovalov.nikolai@gmail.com&gt;
diff --git a/modules/openapi-generator/src/main/resources/Javascript/ApiClient.mustache b/modules/openapi-generator/src/main/resources/Javascript/ApiClient.mustache
@@ -163,7 +163,7 @@
     }
 
     var _this = this;
-    url = url.replace(/\{([\w-]+)\}/g, function(fullMatch, key) {
+    url = url.replace(/\{([\w-\.]+)\}/g, function(fullMatch, key) {
       var value;
       if (pathParams.hasOwnProperty(key)) {
         value = _this.paramToString(pathParams[key]);
diff --git a/modules/openapi-generator/src/main/resources/Javascript/es6/ApiClient.mustache b/modules/openapi-generator/src/main/resources/Javascript/es6/ApiClient.mustache
@@ -153,7 +153,7 @@ class ApiClient {
             url = apiBasePath + path;
         }
 
-        url = url.replace(/\{([\w-]+)\}/g, (fullMatch, key) => {
+        url = url.replace(/\{([\w-\.]+)\}/g, (fullMatch, key) => {
             var value;
             if (pathParams.hasOwnProperty(key)) {
                 value = this.paramToString(pathParams[key]);
diff --git a/samples/client/petstore/javascript-es6/src/ApiClient.js b/samples/client/petstore/javascript-es6/src/ApiClient.js
@@ -152,7 +152,7 @@ class ApiClient {
             url = apiBasePath + path;
         }
 
-        url = url.replace(/\{([\w-]+)\}/g, (fullMatch, key) => {
+        url = url.replace(/\{([\w-\.]+)\}/g, (fullMatch, key) => {
             var value;
             if (pathParams.hasOwnProperty(key)) {
                 value = this.paramToString(pathParams[key]);
diff --git a/samples/client/petstore/javascript-promise-es6/src/ApiClient.js b/samples/client/petstore/javascript-promise-es6/src/ApiClient.js
@@ -152,7 +152,7 @@ class ApiClient {
             url = apiBasePath + path;
         }
 
-        url = url.replace(/\{([\w-]+)\}/g, (fullMatch, key) => {
+        url = url.replace(/\{([\w-\.]+)\}/g, (fullMatch, key) => {
             var value;
             if (pathParams.hasOwnProperty(key)) {
                 value = this.paramToString(pathParams[key]);

Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@`
`163`	`163`	`}`
`164`	`164`
`165`	`165`	`var _this = this;`
`166`		`- url = url.replace(/\{([\w-]+)\}/g, function(fullMatch, key) {`
	`166`	`+ url = url.replace(/\{([\w-\.]+)\}/g, function(fullMatch, key) {`
`167`	`167`	`var value;`
`168`	`168`	`if (pathParams.hasOwnProperty(key)) {`
`169`	`169`	`value = _this.paramToString(pathParams[key]);`
Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ class ApiClient {`
`153`	`153`	`url = apiBasePath + path;`
`154`	`154`	`}`
`155`	`155`
`156`		`- url = url.replace(/\{([\w-]+)\}/g, (fullMatch, key) => {`
	`156`	`+ url = url.replace(/\{([\w-\.]+)\}/g, (fullMatch, key) => {`
`157`	`157`	`var value;`
`158`	`158`	`if (pathParams.hasOwnProperty(key)) {`
`159`	`159`	`value = this.paramToString(pathParams[key]);`
Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ class ApiClient {`
`152`	`152`	`url = apiBasePath + path;`
`153`	`153`	`}`
`154`	`154`
`155`		`- url = url.replace(/\{([\w-]+)\}/g, (fullMatch, key) => {`
	`155`	`+ url = url.replace(/\{([\w-\.]+)\}/g, (fullMatch, key) => {`
`156`	`156`	`var value;`
`157`	`157`	`if (pathParams.hasOwnProperty(key)) {`
`158`	`158`	`value = this.paramToString(pathParams[key]);`