Merge pull request #12226 from HEYGUL/remove-querystring

[Javascript] Remove deprecated `querystring` dependency.
swagger-api · Feb 11, 2024 · 0f7dea0 · 0f7dea0
2 parents 67a018a + 7aaf80d
commit 0f7dea0
Show file tree

Hide file tree

Showing 99 changed files with 113 additions and 112 deletions.
diff --git a/modules/swagger-codegen/src/main/resources/Javascript/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/Javascript/ApiClient.mustache
@@ -2,18 +2,18 @@
 (function(root, factory) {
   if (typeof define === 'function' && define.amd) {
     // AMD. Register as an anonymous module.
-    define(['superagent', 'querystring'], factory);
+    define(['superagent'], factory);
   } else if (typeof module === 'object' && module.exports) {
     // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('superagent'), require('querystring'));
+    module.exports = factory(require('superagent'));
   } else {
     // Browser globals (root is window)
     if (!root.{{moduleName}}) {
       root.{{moduleName}} = {};
     }
-    root.{{moduleName}}.ApiClient = factory(root.superagent, root.querystring);
+    root.{{moduleName}}.ApiClient = factory(root.superagent);
   }
-}(this, function(superagent, querystring) {
+}(this, function(superagent) {
   'use strict';
 
 {{#emitJSDoc}}  /**
@@ -432,7 +432,8 @@
     }
 
     if (contentType === 'application/x-www-form-urlencoded') {
-      request.send(querystring.stringify(this.normalizeParams(formParams)));
+        const searchParams = new URLSearchParams(this.normalizeParams(formParams));
+        request.send(searchParams.toString());
     } else if (contentType == 'multipart/form-data') {
       var _formParams = this.normalizeParams(formParams);
       for (var key in _formParams) {

diff --git a/modules/swagger-codegen/src/main/resources/Javascript/es6/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/Javascript/es6/ApiClient.mustache
@@ -1,6 +1,5 @@
 {{>licenseInfo}}
 import superagent from "superagent";
-import querystring from "querystring";
 
 {{#emitJSDoc}}/**
 * @module {{#invokerPackage}}{{invokerPackage}}/{{/invokerPackage}}ApiClient
@@ -420,7 +419,8 @@ export class ApiClient {
         }
 
         if (contentType === 'application/x-www-form-urlencoded') {
-            request.send(querystring.stringify(this.normalizeParams(formParams)));
+            const searchParams = new URLSearchParams(this.normalizeParams(formParams));
+            request.send(searchParams.toString());
         } else if (contentType == 'multipart/form-data') {
             var _formParams = this.normalizeParams(formParams);
             for (var key in _formParams) {

diff --git a/modules/swagger-codegen/src/main/resources/Javascript/package.mustache b/modules/swagger-codegen/src/main/resources/Javascript/package.mustache
@@ -11,8 +11,7 @@
     "fs": false
   },
   "dependencies": {
-    "superagent": "3.7.0",
-    "querystring": "0.2.0"
+    "superagent": "3.7.0"
   },
   "devDependencies": {
     "mocha": "~2.3.4",

diff --git a/samples/client/petstore/javascript-es6/.swagger-codegen/VERSION b/samples/client/petstore/javascript-es6/.swagger-codegen/VERSION
@@ -1 +1 @@
-2.4.19-SNAPSHOT
+2.4.33-SNAPSHOT
diff --git a/samples/client/petstore/javascript-es6/src/ApiClient.js b/samples/client/petstore/javascript-es6/src/ApiClient.js
@@ -8,14 +8,13 @@
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
  *
- * Swagger Codegen version: 2.4.19-SNAPSHOT
+ * Swagger Codegen version: 2.4.33-SNAPSHOT
  *
  * Do not edit the class manually.
  *
  */
 
 import superagent from "superagent";
-import querystring from "querystring";
 
 /**
 * @module ApiClient
@@ -425,7 +424,8 @@ export class ApiClient {
         }
 
         if (contentType === 'application/x-www-form-urlencoded') {
-            request.send(querystring.stringify(this.normalizeParams(formParams)));
+            const searchParams = new URLSearchParams(this.normalizeParams(formParams));
+            request.send(searchParams.toString());
         } else if (contentType == 'multipart/form-data') {
             var _formParams = this.normalizeParams(formParams);
             for (var key in _formParams) {

diff --git a/samples/client/petstore/javascript-es6/src/api/AnotherFakeApi.js b/samples/client/petstore/javascript-es6/src/api/AnotherFakeApi.js
@@ -8,7 +8,7 @@
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
  *
- * Swagger Codegen version: 2.4.19-SNAPSHOT
+ * Swagger Codegen version: 2.4.33-SNAPSHOT
  *
  * Do not edit the class manually.
  *

diff --git a/samples/client/petstore/javascript-es6/src/api/FakeApi.js b/samples/client/petstore/javascript-es6/src/api/FakeApi.js
@@ -8,7 +8,7 @@
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
  *
- * Swagger Codegen version: 2.4.19-SNAPSHOT
+ * Swagger Codegen version: 2.4.33-SNAPSHOT
  *
  * Do not edit the class manually.
  *

diff --git a/samples/client/petstore/javascript-es6/src/api/FakeClassnameTags123Api.js b/samples/client/petstore/javascript-es6/src/api/FakeClassnameTags123Api.js
@@ -8,7 +8,7 @@
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
  *
- * Swagger Codegen version: 2.4.19-SNAPSHOT
+ * Swagger Codegen version: 2.4.33-SNAPSHOT
  *
  * Do not edit the class manually.
  *

diff --git a/samples/client/petstore/javascript-es6/src/api/PetApi.js b/samples/client/petstore/javascript-es6/src/api/PetApi.js
@@ -8,7 +8,7 @@
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
  *
- * Swagger Codegen version: 2.4.19-SNAPSHOT
+ * Swagger Codegen version: 2.4.33-SNAPSHOT
  *
  * Do not edit the class manually.
  *

diff --git a/samples/client/petstore/javascript-es6/src/api/StoreApi.js b/samples/client/petstore/javascript-es6/src/api/StoreApi.js
@@ -8,7 +8,7 @@
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
  *
- * Swagger Codegen version: 2.4.19-SNAPSHOT
+ * Swagger Codegen version: 2.4.33-SNAPSHOT
  *
  * Do not edit the class manually.
  *

diff --git a/samples/client/petstore/javascript-es6/src/api/UserApi.js b/samples/client/petstore/javascript-es6/src/api/UserApi.js
@@ -8,7 +8,7 @@
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
  *
- * Swagger Codegen version: 2.4.19-SNAPSHOT
+ * Swagger Codegen version: 2.4.33-SNAPSHOT
  *
  * Do not edit the class manually.
  *

diff --git a/samples/client/petstore/javascript-es6/src/index.js b/samples/client/petstore/javascript-es6/src/index.js
@@ -8,7 +8,7 @@
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
  *
- * Swagger Codegen version: 2.4.19-SNAPSHOT
+ * Swagger Codegen version: 2.4.33-SNAPSHOT
  *
  * Do not edit the class manually.
  *

diff --git a/samples/client/petstore/javascript-es6/src/model/AdditionalPropertiesClass.js b/samples/client/petstore/javascript-es6/src/model/AdditionalPropertiesClass.js
@@ -8,7 +8,7 @@
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
  *
- * Swagger Codegen version: 2.4.19-SNAPSHOT
+ * Swagger Codegen version: 2.4.33-SNAPSHOT
  *
  * Do not edit the class manually.
  *

diff --git a/samples/client/petstore/javascript-es6/src/model/Animal.js b/samples/client/petstore/javascript-es6/src/model/Animal.js
@@ -8,7 +8,7 @@
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
  *
- * Swagger Codegen version: 2.4.19-SNAPSHOT
+ * Swagger Codegen version: 2.4.33-SNAPSHOT
  *
  * Do not edit the class manually.
  *

diff --git a/samples/client/petstore/javascript-es6/src/model/AnimalFarm.js b/samples/client/petstore/javascript-es6/src/model/AnimalFarm.js
@@ -8,7 +8,7 @@
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
  *
- * Swagger Codegen version: 2.4.19-SNAPSHOT
+ * Swagger Codegen version: 2.4.33-SNAPSHOT
  *
  * Do not edit the class manually.
  *

diff --git a/samples/client/petstore/javascript-es6/src/model/ApiResponse.js b/samples/client/petstore/javascript-es6/src/model/ApiResponse.js
@@ -8,7 +8,7 @@
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
  *
- * Swagger Codegen version: 2.4.19-SNAPSHOT
+ * Swagger Codegen version: 2.4.33-SNAPSHOT
  *
  * Do not edit the class manually.
  *

diff --git a/samples/client/petstore/javascript-es6/src/model/ArrayOfArrayOfNumberOnly.js b/samples/client/petstore/javascript-es6/src/model/ArrayOfArrayOfNumberOnly.js
@@ -8,7 +8,7 @@
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
  *
- * Swagger Codegen version: 2.4.19-SNAPSHOT
+ * Swagger Codegen version: 2.4.33-SNAPSHOT
  *
  * Do not edit the class manually.
  *

diff --git a/samples/client/petstore/javascript-es6/src/model/ArrayOfNumberOnly.js b/samples/client/petstore/javascript-es6/src/model/ArrayOfNumberOnly.js
@@ -8,7 +8,7 @@
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
  *
- * Swagger Codegen version: 2.4.19-SNAPSHOT
+ * Swagger Codegen version: 2.4.33-SNAPSHOT
  *
  * Do not edit the class manually.
  *

diff --git a/samples/client/petstore/javascript-es6/src/model/ArrayTest.js b/samples/client/petstore/javascript-es6/src/model/ArrayTest.js
@@ -8,7 +8,7 @@
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
  *
- * Swagger Codegen version: 2.4.19-SNAPSHOT
+ * Swagger Codegen version: 2.4.33-SNAPSHOT
  *
  * Do not edit the class manually.
  *

diff --git a/samples/client/petstore/javascript-es6/src/model/Capitalization.js b/samples/client/petstore/javascript-es6/src/model/Capitalization.js
@@ -8,7 +8,7 @@
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
  *
- * Swagger Codegen version: 2.4.19-SNAPSHOT
+ * Swagger Codegen version: 2.4.33-SNAPSHOT
  *
  * Do not edit the class manually.
  *

diff --git a/samples/client/petstore/javascript-es6/src/model/Cat.js b/samples/client/petstore/javascript-es6/src/model/Cat.js
@@ -8,7 +8,7 @@
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
  *
- * Swagger Codegen version: 2.4.19-SNAPSHOT
+ * Swagger Codegen version: 2.4.33-SNAPSHOT
  *
  * Do not edit the class manually.
  *

diff --git a/samples/client/petstore/javascript-es6/src/model/Category.js b/samples/client/petstore/javascript-es6/src/model/Category.js
@@ -8,7 +8,7 @@
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
  *
- * Swagger Codegen version: 2.4.19-SNAPSHOT
+ * Swagger Codegen version: 2.4.33-SNAPSHOT
  *
  * Do not edit the class manually.
  *

diff --git a/samples/client/petstore/javascript-es6/src/model/ClassModel.js b/samples/client/petstore/javascript-es6/src/model/ClassModel.js
@@ -8,7 +8,7 @@
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
  *
- * Swagger Codegen version: 2.4.19-SNAPSHOT
+ * Swagger Codegen version: 2.4.33-SNAPSHOT
  *
  * Do not edit the class manually.
  *

diff --git a/samples/client/petstore/javascript-es6/src/model/Client.js b/samples/client/petstore/javascript-es6/src/model/Client.js
@@ -8,7 +8,7 @@
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
  *
- * Swagger Codegen version: 2.4.19-SNAPSHOT
+ * Swagger Codegen version: 2.4.33-SNAPSHOT
  *
  * Do not edit the class manually.
  *

diff --git a/samples/client/petstore/javascript-es6/src/model/Dog.js b/samples/client/petstore/javascript-es6/src/model/Dog.js
@@ -8,7 +8,7 @@
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
  *
- * Swagger Codegen version: 2.4.19-SNAPSHOT
+ * Swagger Codegen version: 2.4.33-SNAPSHOT
  *
  * Do not edit the class manually.
  *

diff --git a/samples/client/petstore/javascript-es6/src/model/EnumArrays.js b/samples/client/petstore/javascript-es6/src/model/EnumArrays.js
@@ -8,7 +8,7 @@
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
  *
- * Swagger Codegen version: 2.4.19-SNAPSHOT
+ * Swagger Codegen version: 2.4.33-SNAPSHOT
  *
  * Do not edit the class manually.
  *

diff --git a/samples/client/petstore/javascript-es6/src/model/EnumClass.js b/samples/client/petstore/javascript-es6/src/model/EnumClass.js
@@ -8,7 +8,7 @@
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
  *
- * Swagger Codegen version: 2.4.19-SNAPSHOT
+ * Swagger Codegen version: 2.4.33-SNAPSHOT
  *
  * Do not edit the class manually.
  *

diff --git a/samples/client/petstore/javascript-es6/src/model/EnumTest.js b/samples/client/petstore/javascript-es6/src/model/EnumTest.js
@@ -8,7 +8,7 @@
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
  *
- * Swagger Codegen version: 2.4.19-SNAPSHOT
+ * Swagger Codegen version: 2.4.33-SNAPSHOT
  *
  * Do not edit the class manually.
  *

diff --git a/samples/client/petstore/javascript-es6/src/model/FormatTest.js b/samples/client/petstore/javascript-es6/src/model/FormatTest.js
@@ -8,7 +8,7 @@
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
  *
- * Swagger Codegen version: 2.4.19-SNAPSHOT
+ * Swagger Codegen version: 2.4.33-SNAPSHOT
  *
  * Do not edit the class manually.
  *

diff --git a/samples/client/petstore/javascript-es6/src/model/HasOnlyReadOnly.js b/samples/client/petstore/javascript-es6/src/model/HasOnlyReadOnly.js
@@ -8,7 +8,7 @@
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
  *
- * Swagger Codegen version: 2.4.19-SNAPSHOT
+ * Swagger Codegen version: 2.4.33-SNAPSHOT
  *
  * Do not edit the class manually.
  *

diff --git a/samples/client/petstore/javascript-es6/src/model/Ints.js b/samples/client/petstore/javascript-es6/src/model/Ints.js
@@ -8,7 +8,7 @@
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
  *
- * Swagger Codegen version: 2.4.19-SNAPSHOT
+ * Swagger Codegen version: 2.4.33-SNAPSHOT
  *
  * Do not edit the class manually.
  *

diff --git a/samples/client/petstore/javascript-es6/src/model/List.js b/samples/client/petstore/javascript-es6/src/model/List.js
@@ -8,7 +8,7 @@
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
  *
- * Swagger Codegen version: 2.4.19-SNAPSHOT
+ * Swagger Codegen version: 2.4.33-SNAPSHOT
  *
  * Do not edit the class manually.
  *

diff --git a/samples/client/petstore/javascript-es6/src/model/MapTest.js b/samples/client/petstore/javascript-es6/src/model/MapTest.js
@@ -8,7 +8,7 @@
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
  *
- * Swagger Codegen version: 2.4.19-SNAPSHOT
+ * Swagger Codegen version: 2.4.33-SNAPSHOT
  *
  * Do not edit the class manually.
  *

diff --git a/...s/client/petstore/javascript-es6/src/model/MixedPropertiesAndAdditionalPropertiesClass.js b/...s/client/petstore/javascript-es6/src/model/MixedPropertiesAndAdditionalPropertiesClass.js
@@ -8,7 +8,7 @@
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
  *
- * Swagger Codegen version: 2.4.19-SNAPSHOT
+ * Swagger Codegen version: 2.4.33-SNAPSHOT
  *
  * Do not edit the class manually.
  *

diff --git a/samples/client/petstore/javascript-es6/src/model/Model200Response.js b/samples/client/petstore/javascript-es6/src/model/Model200Response.js
@@ -8,7 +8,7 @@
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
  *
- * Swagger Codegen version: 2.4.19-SNAPSHOT
+ * Swagger Codegen version: 2.4.33-SNAPSHOT
  *
  * Do not edit the class manually.
  *

diff --git a/samples/client/petstore/javascript-es6/src/model/ModelBoolean.js b/samples/client/petstore/javascript-es6/src/model/ModelBoolean.js
@@ -8,7 +8,7 @@
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
  *
- * Swagger Codegen version: 2.4.19-SNAPSHOT
+ * Swagger Codegen version: 2.4.33-SNAPSHOT
  *
  * Do not edit the class manually.
  *

diff --git a/samples/client/petstore/javascript-es6/src/model/ModelReturn.js b/samples/client/petstore/javascript-es6/src/model/ModelReturn.js
@@ -8,7 +8,7 @@
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
  *
- * Swagger Codegen version: 2.4.19-SNAPSHOT
+ * Swagger Codegen version: 2.4.33-SNAPSHOT
  *
  * Do not edit the class manually.
  *

diff --git a/samples/client/petstore/javascript-es6/src/model/Name.js b/samples/client/petstore/javascript-es6/src/model/Name.js
@@ -8,7 +8,7 @@
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
  *
- * Swagger Codegen version: 2.4.19-SNAPSHOT
+ * Swagger Codegen version: 2.4.33-SNAPSHOT
  *
  * Do not edit the class manually.
  *

diff --git a/samples/client/petstore/javascript-es6/src/model/NumberOnly.js b/samples/client/petstore/javascript-es6/src/model/NumberOnly.js
@@ -8,7 +8,7 @@
  * NOTE: This class is auto generated by the swagger code generator program.
  * https://github.com/swagger-api/swagger-codegen.git
  *
- * Swagger Codegen version: 2.4.19-SNAPSHOT
+ * Swagger Codegen version: 2.4.33-SNAPSHOT
  *
  * Do not edit the class manually.
  *