swagger-client 3.26.5 → 3.26.7

package/dist/swagger-client.browser.js

@@ -658,16 +658,14 @@ function path({
   if (value === undefined) return;
   if (content) {
     const effectiveMediaType = Object.keys(content)[0];
-    req.url = req.url.split(`{${name}}`).join((0,_style_serializer_js__WEBPACK_IMPORTED_MODULE_0__.encodeDisallowedCharacters)((0,_content_serializer_js__WEBPACK_IMPORTED_MODULE_1__["default"])(value, effectiveMediaType), {
-      escape: true
-    }));
+    req.url = req.url.split(`{${name}}`).join((0,_style_serializer_js__WEBPACK_IMPORTED_MODULE_0__.encodeCharacters)((0,_content_serializer_js__WEBPACK_IMPORTED_MODULE_1__["default"])(value, effectiveMediaType)));
   } else {
     const styledValue = (0,_style_serializer_js__WEBPACK_IMPORTED_MODULE_0__["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);
   }
@@ -774,37 +772,23 @@ function cookie({
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "default": () => (/* binding */ stylize),
-/* harmony export */   encodeDisallowedCharacters: () => (/* binding */ encodeDisallowedCharacters)
+/* harmony export */   encodeCharacters: () => (/* binding */ encodeCharacters),
+/* harmony export */   valueEncoder: () => (/* binding */ valueEncoder)
 /* harmony export */ });
 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();
@@ -824,6 +808,17 @@ function stylize(config) {
   }
   return encodePrimitive(config);
 }
+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 value;
+}
 function encodeArray({
   key,
   value,
@@ -831,17 +826,14 @@ function encodeArray({
   explode,
   escape
 }) {
-  const valueEncoder = str => encodeDisallowedCharacters(str, {
-    escape
-  });
   if (style === 'simple') {
-    return value.map(val => valueEncoder(val)).join(',');
+    return value.map(val => valueEncoder(val, escape)).join(',');
   }
   if (style === 'label') {
-    return `.${value.map(val => valueEncoder(val)).join('.')}`;
+    return `.${value.map(val => valueEncoder(val, escape)).join('.')}`;
   }
   if (style === 'matrix') {
-    return value.map(val => valueEncoder(val)).reduce((prev, curr) => {
+    return value.map(val => valueEncoder(val, escape)).reduce((prev, curr) => {
       if (!prev || explode) {
         return `${prev || ''};${key}=${curr}`;
       }
@@ -850,15 +842,15 @@ function encodeArray({
   }
   if (style === 'form') {
     const after = explode ? `&${key}=` : ',';
-    return value.map(val => valueEncoder(val)).join(after);
+    return value.map(val => valueEncoder(val, escape)).join(after);
   }
   if (style === 'spaceDelimited') {
     const after = explode ? `${key}=` : '';
-    return value.map(val => valueEncoder(val)).join(` ${after}`);
+    return value.map(val => valueEncoder(val, escape)).join(` ${after}`);
   }
   if (style === 'pipeDelimited') {
     const after = explode ? `${key}=` : '';
-    return value.map(val => valueEncoder(val)).join(`|${after}`);
+    return value.map(val => valueEncoder(val, escape)).join(`|${after}`);
   }
   return undefined;
 }
@@ -869,13 +861,10 @@ function encodeObject({
   explode,
   escape
 }) {
-  const valueEncoder = str => encodeDisallowedCharacters(str, {
-    escape
-  });
   const valueKeys = Object.keys(value);
   if (style === 'simple') {
     return valueKeys.reduce((prev, curr) => {
-      const val = valueEncoder(value[curr]);
+      const val = valueEncoder(value[curr], escape);
       const middleChar = explode ? '=' : ',';
       const prefix = prev ? `${prev},` : '';
       return `${prefix}${curr}${middleChar}${val}`;
@@ -883,7 +872,7 @@ function encodeObject({
   }
   if (style === 'label') {
     return valueKeys.reduce((prev, curr) => {
-      const val = valueEncoder(value[curr]);
+      const val = valueEncoder(value[curr], escape);
       const middleChar = explode ? '=' : '.';
       const prefix = prev ? `${prev}.` : '.';
       return `${prefix}${curr}${middleChar}${val}`;
@@ -891,7 +880,7 @@ function encodeObject({
   }
   if (style === 'matrix' && explode) {
     return valueKeys.reduce((prev, curr) => {
-      const val = valueEncoder(value[curr]);
+      const val = valueEncoder(value[curr], escape);
       const prefix = prev ? `${prev};` : ';';
       return `${prefix}${curr}=${val}`;
     }, '');
@@ -899,14 +888,14 @@ function encodeObject({
   if (style === 'matrix') {
     // no explode
     return valueKeys.reduce((prev, curr) => {
-      const val = valueEncoder(value[curr]);
+      const val = valueEncoder(value[curr], escape);
       const prefix = prev ? `${prev},` : `;${key}=`;
       return `${prefix}${curr},${val}`;
     }, '');
   }
   if (style === 'form') {
     return valueKeys.reduce((prev, curr) => {
-      const val = valueEncoder(value[curr]);
+      const val = valueEncoder(value[curr], escape);
       const prefix = prev ? `${prev}${explode ? '&' : ','}` : '';
       const separator = explode ? '=' : ',';
       return `${prefix}${curr}${separator}${val}`;
@@ -920,23 +909,20 @@ function encodePrimitive({
   style,
   escape
 }) {
-  const valueEncoder = str => encodeDisallowedCharacters(str, {
-    escape
-  });
   if (style === 'simple') {
-    return valueEncoder(value);
+    return valueEncoder(value, escape);
   }
   if (style === 'label') {
-    return `.${valueEncoder(value)}`;
+    return `.${valueEncoder(value, escape)}`;
   }
   if (style === 'matrix') {
-    return `;${key}=${valueEncoder(value)}`;
+    return `;${key}=${valueEncoder(value, escape)}`;
   }
   if (style === 'form') {
-    return valueEncoder(value);
+    return valueEncoder(value, escape);
   }
   if (style === 'deepObject') {
-    return valueEncoder(value, {}, true);
+    return valueEncoder(value, escape);
   }
   return undefined;
 }
@@ -1857,12 +1843,8 @@ function formatKeyValueBySerializationOption(key, value, skipEncoding, serializa
   const explode = typeof serializationOption.explode === 'undefined' ? style === 'form' : serializationOption.explode;
   // eslint-disable-next-line no-nested-ternary
   const escape = skipEncoding ? false : serializationOption && serializationOption.allowReserved ? 'unsafe' : 'reserved';
-  const encodeFn = v => (0,_execute_oas3_style_serializer_js__WEBPACK_IMPORTED_MODULE_2__.encodeDisallowedCharacters)(v, {
-    escape
-  });
-  const encodeKeyFn = skipEncoding ? k => k : k => (0,_execute_oas3_style_serializer_js__WEBPACK_IMPORTED_MODULE_2__.encodeDisallowedCharacters)(k, {
-    escape
-  });
+  const encodeFn = v => (0,_execute_oas3_style_serializer_js__WEBPACK_IMPORTED_MODULE_2__.valueEncoder)(v, escape);
+  const encodeKeyFn = skipEncoding ? k => k : k => encodeFn(k);
 
   // Primitive
   if (typeof value !== 'object') {
@@ -20654,6 +20636,14 @@ const mergeAll = (visitors, {
           const visitFn = visitFnGetter(visitors[i], nodeTypeGetter(currentNode), false);
           if (typeof visitFn === 'function') {
             const result = visitFn.call(visitors[i], currentNode, ...rest);
+
+            // check if the visitor is async
+            if (typeof (result === null || result === void 0 ? void 0 : result.then) === 'function') {
+              throw new _swagger_api_apidom_error__WEBPACK_IMPORTED_MODULE_0__["default"]('Async visitor not supported in sync mode', {
+                visitor: visitors[i],
+                visitFn
+              });
+            }
             if (result === skipVisitingNodeSymbol) {
               skipping[i] = node;
             } else if (result === breakSymbol) {
@@ -20679,6 +20669,14 @@ const mergeAll = (visitors, {
           const visitFn = visitFnGetter(visitors[i], nodeTypeGetter(node), true);
           if (typeof visitFn === 'function') {
             const result = visitFn.call(visitors[i], node, ...rest);
+
+            // check if the visitor is async
+            if (typeof (result === null || result === void 0 ? void 0 : result.then) === 'function') {
+              throw new _swagger_api_apidom_error__WEBPACK_IMPORTED_MODULE_0__["default"]('Async visitor not supported in sync mode', {
+                visitor: visitors[i],
+                visitFn
+              });
+            }
             if (result === breakSymbol) {
               skipping[i] = breakSymbol;
             } else if (result !== undefined && result !== skipVisitingNodeSymbol) {
@@ -20922,6 +20920,7 @@ visitor, {
     }
     let result;
     if (!Array.isArray(node)) {
+      var _result;
       if (!nodePredicate(node)) {
         throw new _swagger_api_apidom_error__WEBPACK_IMPORTED_MODULE_0__["default"](`Invalid AST Node:  ${String(node)}`, {
           node
@@ -20943,6 +20942,14 @@ visitor, {
         // retrieve result
         result = visitFn.call(visitor, node, key, parent, path, ancestors);
       }
+
+      // check if the visitor is async
+      if (typeof ((_result = result) === null || _result === void 0 ? void 0 : _result.then) === 'function') {
+        throw new _swagger_api_apidom_error__WEBPACK_IMPORTED_MODULE_0__["default"]('Async visitor not supported in sync mode', {
+          visitor,
+          visitFn
+        });
+      }
       if (result === breakSymbol) {
         break;
       }