swagger-client 3.29.0 → 3.29.1

package/es/http/serializers/request/index.js

@@ -1,4 +1,3 @@
-import qs from 'qs';
 import formatKeyValue from './format.js';
 import { isFile, isArrayOfFile, FileWithData } from './file.js';
 function buildFormData(reqForm) {
@@ -37,6 +36,27 @@ function buildFormData(reqForm) {
     return formData;
   }, new FormData());
 }
+export const stringifyQuery = (queryObject, {
+  encode = true
+} = {}) => {
+  const buildNestedParams = (params, key, value) => {
+    if (value == null) {
+      params.append(key, '');
+    } else if (Array.isArray(value)) {
+      value.reduce((acc, v) => buildNestedParams(params, key, v), params);
+    } else if (value instanceof Date) {
+      params.append(key, value.toISOString());
+    } else if (typeof value === 'object') {
+      Object.entries(value).reduce((acc, [k, v]) => buildNestedParams(params, `${key}[${k}]`, v), params);
+    } else {
+      params.append(key, value);
+    }
+    return params;
+  };
+  const params = Object.entries(queryObject).reduce((acc, [key, value]) => buildNestedParams(acc, key, value), new URLSearchParams());
+  const queryString = String(params);
+  return encode ? queryString : decodeURIComponent(queryString);
+};
 
 // Encodes an object using appropriate serializer.
 export function encodeFormOrQuery(data) {
@@ -46,7 +66,7 @@ export function encodeFormOrQuery(data) {
    * @param {string} parameterName - Parameter name
    * @return {object} encoded parameter names and values
    */
-  const encodedQuery = Object.keys(data).reduce((result, parameterName) => {
+  const encodedQueryObj = Object.keys(data).reduce((result, parameterName) => {
     // eslint-disable-next-line no-restricted-syntax
     for (const [key, value] of formatKeyValue(parameterName, data[parameterName])) {
       if (value instanceof FileWithData) {
@@ -57,10 +77,9 @@ export function encodeFormOrQuery(data) {
     }
     return result;
   }, {});
-  return qs.stringify(encodedQuery, {
-    encode: false,
-    indices: false
-  }) || '';
+  return stringifyQuery(encodedQueryObj, {
+    encode: false
+  });
 }
 
 // If the request has a `query` object, merge it into the request.url, and delete the object
@@ -96,12 +115,10 @@ export function serializeRequest(req = {}) {
     const [baseUrl, oriSearch] = url.split('?');
     let newStr = '';
     if (oriSearch) {
-      const oriQuery = qs.parse(oriSearch);
+      const oriQuery = new URLSearchParams(oriSearch);
       const keysToRemove = Object.keys(query);
-      keysToRemove.forEach(key => delete oriQuery[key]);
-      newStr = qs.stringify(oriQuery, {
-        encode: true
-      });
+      keysToRemove.forEach(key => oriQuery.delete(key));
+      newStr = String(oriQuery);
     }
     const finalStr = joinSearch(newStr, encodeFormOrQuery(query));
     req.url = baseUrl + finalStr;

package/lib/http/serializers/request/index.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequ
 exports.__esModule = true;
 exports.encodeFormOrQuery = encodeFormOrQuery;
 exports.serializeRequest = serializeRequest;
-var _qs = _interopRequireDefault(require("qs"));
+exports.stringifyQuery = void 0;
 var _format = _interopRequireDefault(require("./format.js"));
 var _file = require("./file.js");
 function buildFormData(reqForm) {
@@ -43,8 +43,30 @@ function buildFormData(reqForm) {
     return formData;
   }, new FormData());
 }
+const stringifyQuery = (queryObject, {
+  encode = true
+} = {}) => {
+  const buildNestedParams = (params, key, value) => {
+    if (value == null) {
+      params.append(key, '');
+    } else if (Array.isArray(value)) {
+      value.reduce((acc, v) => buildNestedParams(params, key, v), params);
+    } else if (value instanceof Date) {
+      params.append(key, value.toISOString());
+    } else if (typeof value === 'object') {
+      Object.entries(value).reduce((acc, [k, v]) => buildNestedParams(params, `${key}[${k}]`, v), params);
+    } else {
+      params.append(key, value);
+    }
+    return params;
+  };
+  const params = Object.entries(queryObject).reduce((acc, [key, value]) => buildNestedParams(acc, key, value), new URLSearchParams());
+  const queryString = String(params);
+  return encode ? queryString : decodeURIComponent(queryString);
+};
 
 // Encodes an object using appropriate serializer.
+exports.stringifyQuery = stringifyQuery;
 function encodeFormOrQuery(data) {
   /**
    * Encode parameter names and values
@@ -52,7 +74,7 @@ function encodeFormOrQuery(data) {
    * @param {string} parameterName - Parameter name
    * @return {object} encoded parameter names and values
    */
-  const encodedQuery = Object.keys(data).reduce((result, parameterName) => {
+  const encodedQueryObj = Object.keys(data).reduce((result, parameterName) => {
     // eslint-disable-next-line no-restricted-syntax
     for (const [key, value] of (0, _format.default)(parameterName, data[parameterName])) {
       if (value instanceof _file.FileWithData) {
@@ -63,10 +85,9 @@ function encodeFormOrQuery(data) {
     }
     return result;
   }, {});
-  return _qs.default.stringify(encodedQuery, {
-    encode: false,
-    indices: false
-  }) || '';
+  return stringifyQuery(encodedQueryObj, {
+    encode: false
+  });
 }
 
 // If the request has a `query` object, merge it into the request.url, and delete the object
@@ -102,12 +123,10 @@ function serializeRequest(req = {}) {
     const [baseUrl, oriSearch] = url.split('?');
     let newStr = '';
     if (oriSearch) {
-      const oriQuery = _qs.default.parse(oriSearch);
+      const oriQuery = new URLSearchParams(oriSearch);
       const keysToRemove = Object.keys(query);
-      keysToRemove.forEach(key => delete oriQuery[key]);
-      newStr = _qs.default.stringify(oriQuery, {
-        encode: true
-      });
+      keysToRemove.forEach(key => oriQuery.delete(key));
+      newStr = String(oriQuery);
     }
     const finalStr = joinSearch(newStr, encodeFormOrQuery(query));
     req.url = baseUrl + finalStr;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "swagger-client",
-  "version": "3.29.0",
+  "version": "3.29.1",
   "description": "SwaggerJS - a collection of interfaces for OAI specs",
   "browser": {
     "./src/helpers/btoa.node.js": "./src/helpers/btoa.browser.js",
@@ -86,9 +86,8 @@
     "node-fetch-commonjs": "^3.3.2",
     "openapi-path-templating": "^1.5.1",
     "openapi-server-url-templating": "^1.0.0",
-    "qs": "^6.10.2",
     "ramda-adjunct": "^5.0.0",
-    "neotraverse": "=0.6.15"
+    "neotraverse": "=0.6.18"
   },
   "devDependencies": {
     "@babel/cli": "^7.21.0",