swagger-client 3.26.6 → 3.26.8

package/es/execute/oas3/content-serializer.js

@@ -9,7 +9,16 @@ export default function serialize(value, mediaType) {
       // Assume the user has a JSON string
       return value;
     }
+    if (Array.isArray(value)) {
+      value = value.map(v => {
+        try {
+          return JSON.parse(v);
+        } catch (e) {
+          return v;
+        }
+      });
+    }
     return JSON.stringify(value);
   }
-  return value.toString();
+  return String(value);
 }

package/es/execute/oas3/parameter-builders.js

@@ -1,4 +1,4 @@
-import stylize, { encodeDisallowedCharacters } from './style-serializer.js';
+import stylize, { encodeCharacters } from './style-serializer.js';
 import serialize from './content-serializer.js';
 export function path({
   req,
@@ -14,16 +14,14 @@ export function path({
   if (value === undefined) return;
   if (content) {
     const effectiveMediaType = Object.keys(content)[0];
-    req.url = req.url.split(`{${name}}`).join(encodeDisallowedCharacters(serialize(value, effectiveMediaType), {
-      escape: true
-    }));
+    req.url = req.url.split(`{${name}}`).join(encodeCharacters(serialize(value, effectiveMediaType)));
   } else {
     const styledValue = stylize({
       key: parameter.name,
       value,
       style: style || 'simple',
       explode: explode || false,
-      escape: true
+      escape: 'reserved'
     });
     req.url = req.url.replace(new RegExp(`{${name}}`, 'g'), styledValue);
   }

package/es/execute/oas3/style-serializer.js

@@ -1,32 +1,17 @@
 const isRfc3986Reserved = char => ":/?#[]@!$&'()*+,;=".indexOf(char) > -1;
-const isRrc3986Unreserved = char => /^[a-z0-9\-._~]+$/i.test(char);
+const isRfc3986Unreserved = char => /^[a-z0-9\-._~]+$/i.test(char);
 
 // eslint-disable-next-line default-param-last
-export function encodeDisallowedCharacters(str, {
-  escape
-} = {}, parse) {
-  if (typeof str === 'number') {
-    str = str.toString();
-  }
-  if (typeof str !== 'string' || !str.length) {
-    return str;
-  }
-  if (!escape) {
-    return str;
-  }
-  if (parse) {
-    return JSON.parse(str);
-  }
-
+export function encodeCharacters(str, characterSet = 'reserved') {
   // In ES6 you can do this quite easily by using the new ... spread operator.
   // This causes the string iterator (another new ES6 feature) to be used internally,
   // and because that iterator is designed to deal with
   // code points rather than UCS-2/UTF-16 code units.
   return [...str].map(char => {
-    if (isRrc3986Unreserved(char)) {
+    if (isRfc3986Unreserved(char)) {
       return char;
     }
-    if (isRfc3986Reserved(char) && escape === 'unsafe') {
+    if (isRfc3986Reserved(char) && characterSet === 'unsafe') {
       return char;
     }
     const encoder = new TextEncoder();
@@ -46,13 +31,16 @@ export default function stylize(config) {
   }
   return encodePrimitive(config);
 }
-export function valueEncoder(value, escape) {
+export function valueEncoder(value, escape = false) {
   if (Array.isArray(value) || value !== null && typeof value === 'object') {
     value = JSON.stringify(value);
+  } else if (typeof value === 'number' || typeof value === 'boolean') {
+    value = String(value);
+  }
+  if (escape && value.length > 0) {
+    return encodeCharacters(value, escape);
   }
-  return encodeDisallowedCharacters(value, {
-    escape
-  });
+  return value;
 }
 function encodeArray({
   key,

package/lib/execute/oas3/content-serializer.js

@@ -13,7 +13,16 @@ function serialize(value, mediaType) {
       // Assume the user has a JSON string
       return value;
     }
+    if (Array.isArray(value)) {
+      value = value.map(v => {
+        try {
+          return JSON.parse(v);
+        } catch (e) {
+          return v;
+        }
+      });
+    }
     return JSON.stringify(value);
   }
-  return value.toString();
+  return String(value);
 }

package/lib/execute/oas3/parameter-builders.js

@@ -23,16 +23,14 @@ function path({
   if (value === undefined) return;
   if (content) {
     const effectiveMediaType = Object.keys(content)[0];
-    req.url = req.url.split(`{${name}}`).join((0, _styleSerializer.encodeDisallowedCharacters)((0, _contentSerializer.default)(value, effectiveMediaType), {
-      escape: true
-    }));
+    req.url = req.url.split(`{${name}}`).join((0, _styleSerializer.encodeCharacters)((0, _contentSerializer.default)(value, effectiveMediaType)));
   } else {
     const styledValue = (0, _styleSerializer.default)({
       key: parameter.name,
       value,
       style: style || 'simple',
       explode: explode || false,
-      escape: true
+      escape: 'reserved'
     });
     req.url = req.url.replace(new RegExp(`{${name}}`, 'g'), styledValue);
   }

package/lib/execute/oas3/style-serializer.js

@@ -2,37 +2,22 @@
 
 exports.__esModule = true;
 exports.default = stylize;
-exports.encodeDisallowedCharacters = encodeDisallowedCharacters;
+exports.encodeCharacters = encodeCharacters;
 exports.valueEncoder = valueEncoder;
 const isRfc3986Reserved = char => ":/?#[]@!$&'()*+,;=".indexOf(char) > -1;
-const isRrc3986Unreserved = char => /^[a-z0-9\-._~]+$/i.test(char);
+const isRfc3986Unreserved = char => /^[a-z0-9\-._~]+$/i.test(char);
 
 // eslint-disable-next-line default-param-last
-function encodeDisallowedCharacters(str, {
-  escape
-} = {}, parse) {
-  if (typeof str === 'number') {
-    str = str.toString();
-  }
-  if (typeof str !== 'string' || !str.length) {
-    return str;
-  }
-  if (!escape) {
-    return str;
-  }
-  if (parse) {
-    return JSON.parse(str);
-  }
-
+function encodeCharacters(str, characterSet = 'reserved') {
   // In ES6 you can do this quite easily by using the new ... spread operator.
   // This causes the string iterator (another new ES6 feature) to be used internally,
   // and because that iterator is designed to deal with
   // code points rather than UCS-2/UTF-16 code units.
   return [...str].map(char => {
-    if (isRrc3986Unreserved(char)) {
+    if (isRfc3986Unreserved(char)) {
       return char;
     }
-    if (isRfc3986Reserved(char) && escape === 'unsafe') {
+    if (isRfc3986Reserved(char) && characterSet === 'unsafe') {
       return char;
     }
     const encoder = new TextEncoder();
@@ -52,13 +37,16 @@ function stylize(config) {
   }
   return encodePrimitive(config);
 }
-function valueEncoder(value, escape) {
+function valueEncoder(value, escape = false) {
   if (Array.isArray(value) || value !== null && typeof value === 'object') {
     value = JSON.stringify(value);
+  } else if (typeof value === 'number' || typeof value === 'boolean') {
+    value = String(value);
+  }
+  if (escape && value.length > 0) {
+    return encodeCharacters(value, escape);
   }
-  return encodeDisallowedCharacters(value, {
-    escape
-  });
+  return value;
 }
 function encodeArray({
   key,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "swagger-client",
-  "version": "3.26.6",
+  "version": "3.26.8",
   "description": "SwaggerJS - a collection of interfaces for OAI specs",
   "browser": {
     "./src/helpers/btoa.node.js": "./src/helpers/btoa.browser.js",