swagger-client 3.9.3 → 3.9.4

package/dist/index.js

@@ -155,31 +155,31 @@ module.exports = require("@babel/runtime-corejs2/core-js/object/define-propertie
 /* 11 */
 /***/ (function(module, exports) {
 
-module.exports = require("url");
+module.exports = require("@babel/runtime-corejs2/core-js/json/stringify");
 
 /***/ }),
 /* 12 */
 /***/ (function(module, exports) {
 
-module.exports = require("@babel/runtime-corejs2/helpers/toConsumableArray");
+module.exports = require("url");
 
 /***/ }),
 /* 13 */
 /***/ (function(module, exports) {
 
-module.exports = require("@babel/runtime-corejs2/core-js/promise");
+module.exports = require("@babel/runtime-corejs2/helpers/toConsumableArray");
 
 /***/ }),
 /* 14 */
 /***/ (function(module, exports) {
 
-module.exports = require("lodash/assign");
+module.exports = require("@babel/runtime-corejs2/core-js/promise");
 
 /***/ }),
 /* 15 */
 /***/ (function(module, exports) {
 
-module.exports = require("@babel/runtime-corejs2/core-js/json/stringify");
+module.exports = require("lodash/assign");
 
 /***/ }),
 /* 16 */
@@ -392,6 +392,12 @@ module.exports = require("encode-3986");
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
+var oas3_parameter_builders_namespaceObject = {};
+__webpack_require__.r(oas3_parameter_builders_namespaceObject);
+__webpack_require__.d(oas3_parameter_builders_namespaceObject, "path", function() { return parameter_builders_path; });
+__webpack_require__.d(oas3_parameter_builders_namespaceObject, "query", function() { return parameter_builders_query; });
+__webpack_require__.d(oas3_parameter_builders_namespaceObject, "header", function() { return parameter_builders_header; });
+__webpack_require__.d(oas3_parameter_builders_namespaceObject, "cookie", function() { return cookie; });
 
 // EXTERNAL MODULE: external "@babel/runtime-corejs2/core-js/object/define-property"
 var define_property_ = __webpack_require__(9);
@@ -425,7 +431,7 @@ var defineProperty_default = /*#__PURE__*/__webpack_require__.n(defineProperty_)
 var cloneDeep_ = __webpack_require__(46);
 
 // EXTERNAL MODULE: external "lodash/assign"
-var assign_ = __webpack_require__(14);
+var assign_ = __webpack_require__(15);
 var assign_default = /*#__PURE__*/__webpack_require__.n(assign_);
 
 // EXTERNAL MODULE: external "lodash/startsWith"
@@ -433,7 +439,7 @@ var startsWith_ = __webpack_require__(20);
 var startsWith_default = /*#__PURE__*/__webpack_require__.n(startsWith_);
 
 // EXTERNAL MODULE: external "url"
-var external_url_ = __webpack_require__(11);
+var external_url_ = __webpack_require__(12);
 var external_url_default = /*#__PURE__*/__webpack_require__.n(external_url_);
 
 // EXTERNAL MODULE: external "@babel/runtime-corejs2/regenerator"
@@ -445,7 +451,7 @@ var slicedToArray_ = __webpack_require__(22);
 var slicedToArray_default = /*#__PURE__*/__webpack_require__.n(slicedToArray_);
 
 // EXTERNAL MODULE: external "@babel/runtime-corejs2/core-js/json/stringify"
-var stringify_ = __webpack_require__(15);
+var stringify_ = __webpack_require__(11);
 var stringify_default = /*#__PURE__*/__webpack_require__.n(stringify_);
 
 // EXTERNAL MODULE: external "@babel/runtime-corejs2/helpers/typeof"
@@ -526,6 +532,22 @@ var http_self = {
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -547,17 +569,17 @@ var http_self = {
 function _http() {_http = asyncToGenerator_default()( /*#__PURE__*/regenerator_default.a.mark(function _callee(url) {var request,contentType,res,error,_error,_args = arguments;return regenerator_default.a.wrap(function _callee$(_context) {while (1) {switch (_context.prev = _context.next) {case 0:request = _args.length > 1 && _args[1] !== undefined ? _args[1] : {};if (typeof_default()(url) === 'object') {request = url;url = request.url;}request.headers = request.headers || {}; // Serializes query, for convenience
             // Should be the last thing we do, as its hard to mutate the URL with
             // the search string, but much easier to manipulate the req.query object
-            http_self.mergeInQueryOrForm(request);if (!request.requestInterceptor) {_context.next = 11;break;}_context.next = 7;return request.requestInterceptor(request);case 7:_context.t0 = _context.sent;if (_context.t0) {_context.next = 10;break;}_context.t0 = request;case 10:request = _context.t0;case 11: // for content-type=multipart\/form-data remove content-type from request before fetch
+            http_self.mergeInQueryOrForm(request); // Newlines in header values cause weird error messages from `window.fetch`,
+            // so let's massage them out.
+            // Context: https://stackoverflow.com/a/50709178
+            if (request.headers) {keys_default()(request.headers).forEach(function (headerName) {var value = request.headers[headerName];if (typeof value === 'string') {request.headers[headerName] = value.replace(/\n+/g, ' ');}});} // Wait for the request interceptor, if it was provided
+            // WARNING: don't put anything between this and the request firing unless
+            // you have a good reason!
+            if (!request.requestInterceptor) {_context.next = 12;break;}_context.next = 8;return request.requestInterceptor(request);case 8:_context.t0 = _context.sent;if (_context.t0) {_context.next = 11;break;}_context.t0 = request;case 11:request = _context.t0;case 12: // for content-type=multipart\/form-data remove content-type from request before fetch
             // so that correct one with `boundary` is set
             contentType = request.headers['content-type'] || request.headers['Content-Type'];if (/multipart\/form-data/i.test(contentType)) {delete request.headers['content-type'];delete request.headers['Content-Type'];} // eslint-disable-next-line no-undef
-            _context.prev = 13;_context.next = 16;return (request.userFetch || fetch)(request.url, request);case 16:res = _context.sent;_context.next = 19;return http_self.serializeRes(res, url, request);case 19:res = _context.sent;if (!request.responseInterceptor) {_context.next = 27;break;}_context.next = 23;return request.responseInterceptor(res);case 23:_context.t1 = _context.sent;if (_context.t1) {_context.next = 26;break;}_context.t1 = res;case 26:res = _context.t1;case 27:_context.next = 37;break;case 29:_context.prev = 29;_context.t2 = _context["catch"](13);if (res) {_context.next = 33;break;}throw _context.t2;case 33:error = new Error(res.statusText);error.statusCode = error.status = res.status;error.responseError = _context.t2;throw error;case 37:if (res.ok) {_context.next = 42;break;}_error = new Error(res.statusText);_error.statusCode = _error.status = res.status;_error.response = res;throw _error;case 42:return _context.abrupt("return", res);case 43:case "end":return _context.stop();}}}, _callee, null, [[13, 29]]);}));return _http.apply(this, arguments);}var shouldDownloadAsText = function shouldDownloadAsText() {var contentType = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';return /(json|xml|yaml|text)\b/.test(contentType);};function parseBody(body, contentType) {if (contentType && (contentType.indexOf('application/json') === 0 || contentType.indexOf('+json') > 0)) {return JSON.parse(body);}return external_js_yaml_default.a.safeLoad(body);
-}
-
-// Serialize the response, returns a promise with headers and the body part of the hash
-function serializeRes(oriRes, url) {var _ref = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},_ref$loadSpec = _ref.loadSpec,loadSpec = _ref$loadSpec === void 0 ? false : _ref$loadSpec;
-  var res = {
-    ok: oriRes.ok,
-    url: oriRes.url || url,
+            _context.prev = 14;_context.next = 17;return (request.userFetch || fetch)(request.url, request);case 17:res = _context.sent;_context.next = 20;return http_self.serializeRes(res, url, request);case 20:res = _context.sent;if (!request.responseInterceptor) {_context.next = 28;break;}_context.next = 24;return request.responseInterceptor(res);case 24:_context.t1 = _context.sent;if (_context.t1) {_context.next = 27;break;}_context.t1 = res;case 27:res = _context.t1;case 28:_context.next = 38;break;case 30:_context.prev = 30;_context.t2 = _context["catch"](14);if (res) {_context.next = 34;break;}throw _context.t2;case 34:error = new Error(res.statusText);error.statusCode = error.status = res.status;error.responseError = _context.t2;throw error;case 38:if (res.ok) {_context.next = 43;break;}_error = new Error(res.statusText);_error.statusCode = _error.status = res.status;_error.response = res;throw _error;case 43:return _context.abrupt("return", res);case 44:case "end":return _context.stop();}}}, _callee, null, [[14, 30]]);}));return _http.apply(this, arguments);}var shouldDownloadAsText = function shouldDownloadAsText() {var contentType = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';return /(json|xml|yaml|text)\b/.test(contentType);};function parseBody(body, contentType) {if (contentType && (contentType.indexOf('application/json') === 0 || contentType.indexOf('+json') > 0)) {return JSON.parse(body);}return external_js_yaml_default.a.safeLoad(body);} // Serialize the response, returns a promise with headers and the body part of the hash
+function serializeRes(oriRes, url) {var _ref = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},_ref$loadSpec = _ref.loadSpec,loadSpec = _ref$loadSpec === void 0 ? false : _ref$loadSpec;var res = { ok: oriRes.ok, url: oriRes.url || url,
     status: oriRes.status,
     statusText: oriRes.statusText,
     headers: serializeHeaders(oriRes.headers) };
@@ -759,7 +781,7 @@ function makeHttp(httpFn, preFetch, postFetch) {
   };
 }
 // EXTERNAL MODULE: external "@babel/runtime-corejs2/core-js/promise"
-var promise_ = __webpack_require__(13);
+var promise_ = __webpack_require__(14);
 var promise_default = /*#__PURE__*/__webpack_require__.n(promise_);
 
 // EXTERNAL MODULE: external "@babel/runtime-corejs2/core-js/get-iterator"
@@ -787,7 +809,7 @@ var find_ = __webpack_require__(32);
 var find_default = /*#__PURE__*/__webpack_require__.n(find_);
 
 // EXTERNAL MODULE: external "@babel/runtime-corejs2/helpers/toConsumableArray"
-var toConsumableArray_ = __webpack_require__(12);
+var toConsumableArray_ = __webpack_require__(13);
 var toConsumableArray_default = /*#__PURE__*/__webpack_require__.n(toConsumableArray_);
 
 // EXTERNAL MODULE: external "fast-json-patch"
@@ -3052,7 +3074,7 @@ function encodeDisallowedCharacters(str) {var _ref = arguments.length > 1 && arg
   }).join('');
 }
 
-/* harmony default export */ var style_serializer = (function (config) {var
+function stylize(config) {var
   value = config.value;
 
   if (is_array_default()(value)) {
@@ -3062,7 +3084,7 @@ function encodeDisallowedCharacters(str) {var _ref = arguments.length > 1 && arg
     return encodeObject(config);
   }
   return encodePrimitive(config);
-});
+}
 
 function encodeArray(_ref2) {var key = _ref2.key,value = _ref2.value,style = _ref2.style,explode = _ref2.explode,escape = _ref2.escape;
   var valueEncoder = function valueEncoder(str) {return encodeDisallowedCharacters(str, {
@@ -3184,19 +3206,43 @@ function encodePrimitive(_ref4) {var key = _ref4.key,value = _ref4.value,style =
     return valueEncoder(value, {}, true);
   }
 }
-// CONCATENATED MODULE: ./src/execute/oas3/parameter-builders.js
+// CONCATENATED MODULE: ./src/execute/oas3/content-serializer.js
+ /*
+                                                                               Serializer that serializes according to a media type instead of OpenAPI's
+                                                                               `style` + `explode` constructs.
+                                                                             */
+
+function serialize(value, mediaType) {
+  if (mediaType.includes('application/json')) {
+    if (typeof value === 'string') {
+      // Assume the user has a JSON string
+      return value;
+    }
+    return stringify_default()(value);
+  }
 
+  return value.toString();
+}
+// CONCATENATED MODULE: ./src/execute/oas3/parameter-builders.js
 
-/* harmony default export */ var oas3_parameter_builders = ({
-  path: parameter_builders_path,
-  query: parameter_builders_query,
-  header: parameter_builders_header,
-  cookie: cookie });
 
 
 function parameter_builders_path(_ref) {var req = _ref.req,value = _ref.value,parameter = _ref.parameter;var
-  name = parameter.name,style = parameter.style,explode = parameter.explode;
-  var styledValue = style_serializer({
+  name = parameter.name,style = parameter.style,explode = parameter.explode,content = parameter.content;
+
+  if (content) {
+    var effectiveMediaType = keys_default()(content)[0];
+
+    req.url = req.url.split("{".concat(name, "}")).join(
+    encodeDisallowedCharacters(
+    serialize(value, effectiveMediaType),
+    { escape: true }));
+
+
+    return;
+  }
+
+  var styledValue = stylize({
     key: parameter.name,
     value: value,
     style: style || 'simple',
@@ -3210,6 +3256,13 @@ function parameter_builders_path(_ref) {var req = _ref.req,value = _ref.value,pa
 function parameter_builders_query(_ref2) {var req = _ref2.req,value = _ref2.value,parameter = _ref2.parameter;
   req.query = req.query || {};
 
+  if (parameter.content) {
+    var effectiveMediaType = keys_default()(parameter.content)[0];
+
+    req.query[parameter.name] = serialize(value, effectiveMediaType);
+    return;
+  }
+
   if (value === false) {
     value = 'false';
   }
@@ -3226,7 +3279,7 @@ function parameter_builders_query(_ref2) {var req = _ref2.req,value = _ref2.valu
       valueKeys.forEach(function (k) {
         var v = value[k];
         req.query["".concat(parameter.name, "[").concat(k, "]")] = {
-          value: style_serializer({
+          value: stylize({
             key: k,
             value: v,
             style: 'deepObject',
@@ -3249,7 +3302,7 @@ function parameter_builders_query(_ref2) {var req = _ref2.req,value = _ref2.valu
       _valueKeys.forEach(function (k) {
         var v = value[k];
         req.query[k] = {
-          value: style_serializer({
+          value: stylize({
             key: k,
             value: v,
             style: parameter.style || 'form',
@@ -3261,7 +3314,7 @@ function parameter_builders_query(_ref2) {var req = _ref2.req,value = _ref2.valu
     } else
     {
       req.query[parameter.name] = {
-        value: style_serializer({
+        value: stylize({
           key: parameter.name,
           value: value,
           style: parameter.style || 'form',
@@ -3292,8 +3345,15 @@ function parameter_builders_header(_ref3) {var req = _ref3.req,parameter = _ref3
     return;
   }
 
+  if (parameter.content) {
+    var effectiveMediaType = keys_default()(parameter.content)[0];
+
+    req.headers[parameter.name] = serialize(value, effectiveMediaType);
+    return;
+  }
+
   if (typeof value !== 'undefined') {
-    req.headers[parameter.name] = style_serializer({
+    req.headers[parameter.name] = stylize({
       key: parameter.name,
       value: value,
       style: parameter.style || 'simple',
@@ -3307,6 +3367,13 @@ function cookie(_ref4) {var req = _ref4.req,parameter = _ref4.parameter,value =
   req.headers = req.headers || {};
   var type = typeof_default()(value);
 
+  if (parameter.content) {
+    var effectiveMediaType = keys_default()(parameter.content)[0];
+
+    req.headers.Cookie = "".concat(parameter.name, "=").concat(serialize(value, effectiveMediaType));
+    return;
+  }
+
   if (type !== 'undefined') {
     var prefix =
     type === 'object' &&
@@ -3314,7 +3381,7 @@ function cookie(_ref4) {var req = _ref4.req,parameter = _ref4.parameter,value =
     parameter.explode ?
     '' : "".concat(parameter.name, "=");
 
-    req.headers.Cookie = prefix + style_serializer({
+    req.headers.Cookie = prefix + stylize({
       key: parameter.name,
       value: value,
       escape: false,
@@ -3720,7 +3787,7 @@ function buildRequest(options) {var
   if (!parameterBuilders) {
     // user did not provide custom parameter builders
     if (specIsOAS3) {
-      parameterBuilders = oas3_parameter_builders;
+      parameterBuilders = oas3_parameter_builders_namespaceObject;
     } else
     {
       parameterBuilders = parameter_builders;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "swagger-client",
-  "version": "3.9.3",
+  "version": "3.9.4",
   "description": "SwaggerJS - a collection of interfaces for OAI specs",
   "main": "dist/index.js",
   "unpkg": "browser/index.js",