swagger-client 3.13.1 → 3.13.2

package/es/specmap/lib/refs.js

@@ -1,15 +1,12 @@
-import _reduceInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/reduce";
-import _indexOfInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/index-of";
-import _mapInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/map";
 import _typeof from "@babel/runtime-corejs3/helpers/typeof";
-import _Object$keys from "@babel/runtime-corejs3/core-js-stable/object/keys";
-import _forEachInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/for-each";
-import _Promise from "@babel/runtime-corejs3/core-js-stable/promise";
-import _concatInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/concat";
-import _sliceInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/slice";
-import _someInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/some";
-import _WeakMap from "@babel/runtime-corejs3/core-js-stable/weak-map";
 import _Object$assign from "@babel/runtime-corejs3/core-js-stable/object/assign";
+import _WeakMap from "@babel/runtime-corejs3/core-js-stable/weak-map";
+import _sliceInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/slice";
+import _concatInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/concat";
+import _Promise from "@babel/runtime-corejs3/core-js-stable/promise";
+import _Object$keys from "@babel/runtime-corejs3/core-js-stable/object/keys";
+import _mapInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/map";
+import _reduceInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/reduce";
 import { fetch } from 'cross-fetch';
 import jsYaml from 'js-yaml';
 import qs from 'querystring-browser';
@@ -85,7 +82,7 @@ function (path) {
 }];
 
 var shouldSkipResolution = function shouldSkipResolution(path) {
-  return _someInstanceProperty(skipResolutionTestFns).call(skipResolutionTestFns, function (fn) {
+  return skipResolutionTestFns.some(function (fn) {
     return fn(path);
   });
 }; // =========================
@@ -350,9 +347,7 @@ function clearCache(item) {
   if (typeof item !== 'undefined') {
     delete docCache[item];
   } else {
-    var _context3;
-
-    _forEachInstanceProperty(_context3 = _Object$keys(docCache)).call(_context3, function (key) {
+    _Object$keys(docCache).forEach(function (key) {
       delete docCache[key];
     });
   }
@@ -433,7 +428,7 @@ function extract(pointer, obj) {
 
 
 function jsonPointerToArray(pointer) {
-  var _context4;
+  var _context3;
 
   if (typeof pointer !== 'string') {
     throw new TypeError("Expected a string, got a ".concat(_typeof(pointer)));
@@ -447,7 +442,7 @@ function jsonPointerToArray(pointer) {
     return [];
   }
 
-  return _mapInstanceProperty(_context4 = pointer.split('/')).call(_context4, unescapeJsonPointerToken);
+  return _mapInstanceProperty(_context3 = pointer.split('/')).call(_context3, unescapeJsonPointerToken);
 }
 /**
  * Unescapes a JSON pointer.
@@ -494,7 +489,7 @@ function pointerIsAParent(pointer, parentPointer) {
 
   var lastParentChar = _sliceInstanceProperty(parentPointer).call(parentPointer, -1);
 
-  return _indexOfInstanceProperty(pointer).call(pointer, parentPointer) === 0 && (!nextChar || nextChar === '/' || nextChar === '#') && lastParentChar !== '#';
+  return pointer.indexOf(parentPointer) === 0 && (!nextChar || nextChar === '/' || nextChar === '#') && lastParentChar !== '#';
 } // =========================
 // Private
 // =========================
@@ -505,7 +500,7 @@ function pointerIsAParent(pointer, parentPointer) {
 
 
 function pointerAlreadyInPath(pointer, basePath, parent, specmap) {
-  var _context5, _context8;
+  var _context4, _context6;
 
   var refs = specmapRefs.get(specmap);
 
@@ -518,7 +513,7 @@ function pointerAlreadyInPath(pointer, basePath, parent, specmap) {
 
   var parentPointer = arrayToJsonPointer(parent);
 
-  var fullyQualifiedPointer = _concatInstanceProperty(_context5 = "".concat(basePath || '<specmap-base>', "#")).call(_context5, pointer); // dirty hack to strip `allof/[index]` from the path, in order to avoid cases
+  var fullyQualifiedPointer = _concatInstanceProperty(_context4 = "".concat(basePath || '<specmap-base>', "#")).call(_context4, pointer); // dirty hack to strip `allof/[index]` from the path, in order to avoid cases
   // where we get false negatives because:
   // - we resolve a path, then
   // - allOf plugin collapsed `allOf/[index]` out of the path, then
@@ -547,12 +542,11 @@ function pointerAlreadyInPath(pointer, basePath, parent, specmap) {
 
 
   var currPath = '';
+  var hasIndirectCycle = parent.some(function (token) {
+    var _context5;
 
-  var hasIndirectCycle = _someInstanceProperty(parent).call(parent, function (token) {
-    var _context6, _context7;
-
-    currPath = _concatInstanceProperty(_context6 = "".concat(currPath, "/")).call(_context6, escapeJsonPointerToken(token));
-    return refs[currPath] && _someInstanceProperty(_context7 = refs[currPath]).call(_context7, function (ref) {
+    currPath = _concatInstanceProperty(_context5 = "".concat(currPath, "/")).call(_context5, escapeJsonPointerToken(token));
+    return refs[currPath] && refs[currPath].some(function (ref) {
       return pointerIsAParent(ref, fullyQualifiedPointer) || pointerIsAParent(fullyQualifiedPointer, ref);
     });
   });
@@ -563,7 +557,7 @@ function pointerAlreadyInPath(pointer, basePath, parent, specmap) {
   // No need to store if has cycle, as parent path is a dead-end and won't be checked again.
 
 
-  refs[safeParentPointer] = _concatInstanceProperty(_context8 = refs[safeParentPointer] || []).call(_context8, fullyQualifiedPointer);
+  refs[safeParentPointer] = _concatInstanceProperty(_context6 = refs[safeParentPointer] || []).call(_context6, fullyQualifiedPointer);
   return undefined;
 }
 /**
@@ -572,11 +566,11 @@ function pointerAlreadyInPath(pointer, basePath, parent, specmap) {
 
 
 function patchValueAlreadyInPath(root, patch) {
-  var _context9;
+  var _context7;
 
   var ancestors = [root];
 
-  _reduceInstanceProperty(_context9 = patch.path).call(_context9, function (parent, p) {
+  _reduceInstanceProperty(_context7 = patch.path).call(_context7, function (parent, p) {
     ancestors.push(parent[p]);
     return parent[p];
   }, root);
@@ -584,9 +578,7 @@ function patchValueAlreadyInPath(root, patch) {
   return pointToAncestor(patch.value);
 
   function pointToAncestor(obj) {
-    var _context10;
-
-    return lib.isObject(obj) && (_indexOfInstanceProperty(ancestors).call(ancestors, obj) >= 0 || _someInstanceProperty(_context10 = _Object$keys(obj)).call(_context10, function (k) {
+    return lib.isObject(obj) && (ancestors.indexOf(obj) >= 0 || _Object$keys(obj).some(function (k) {
       return pointToAncestor(obj[k]);
     }));
   }

package/es/subtree-resolver/index.js

@@ -1,7 +1,6 @@
-import _regeneratorRuntime from "@babel/runtime-corejs3/regenerator";
-import _Array$isArray from "@babel/runtime-corejs3/core-js-stable/array/is-array";
 import _objectSpread from "@babel/runtime-corejs3/helpers/objectSpread2";
 import _asyncToGenerator from "@babel/runtime-corejs3/helpers/asyncToGenerator";
+import _regeneratorRuntime from "@babel/runtime-corejs3/regenerator";
 // The subtree resolver is a higher-level interface that allows you to
 // get the same result that you would from `Swagger.resolve`, but focuses on
 // a subtree of your object.
@@ -75,7 +74,7 @@ function _resolveSubtree() {
           case 6:
             result = _context.sent;
 
-            if (!returnEntireTree && _Array$isArray(path) && path.length) {
+            if (!returnEntireTree && Array.isArray(path) && path.length) {
               result.spec = get(result.spec, path) || null;
             }
 

package/lib/execute/oas3/build-request.js

@@ -8,6 +8,8 @@ var _assign = _interopRequireDefault(require("lodash/assign"));
 
 var _get = _interopRequireDefault(require("lodash/get"));
 
+var _isPlainObject = _interopRequireDefault(require("lodash/isPlainObject"));
+
 var _btoa = _interopRequireDefault(require("btoa"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -49,6 +51,17 @@ function buildRequest(options, req) {
     }
   } else if (requestContentType && isExplicitContentTypeValid) {
     req.headers['Content-Type'] = requestContentType;
+  }
+
+  if (!options.responseContentType && operation.responses) {
+    const mediaTypes = Object.entries(operation.responses).filter(([key, value]) => {
+      const code = parseInt(key, 10);
+      return code >= 200 && code < 300 && (0, _isPlainObject.default)(value.content);
+    }).reduce((acc, [, value]) => acc.concat(Object.keys(value.content)), []);
+
+    if (mediaTypes.length > 0) {
+      req.headers.accept = mediaTypes.join(', ');
+    }
   } // for OAS3: add requestBody to request
 
 

package/lib/execute/swagger2/build-request.js

@@ -18,6 +18,7 @@ function buildRequest(options, req) {
     operation,
     securities,
     requestContentType,
+    responseContentType,
     attachContentTypeForEmptyPayload
   } = options; // Add securities, which are applicable
 
@@ -50,6 +51,10 @@ function buildRequest(options, req) {
     }
   }
 
+  if (!responseContentType && Array.isArray(operation.produces) && operation.produces.length > 0) {
+    req.headers.accept = operation.produces.join(', ');
+  }
+
   return req;
 } // Add security values, to operations - that declare their need on them
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "swagger-client",
-  "version": "3.13.1",
+  "version": "3.13.2",
   "description": "SwaggerJS - a collection of interfaces for OAI specs",
   "main": "lib/commonjs.js",
   "module": "es/index.js",
@@ -60,46 +60,46 @@
   ],
   "license": "Apache-2.0",
   "devDependencies": {
-    "@babel/cli": "=7.12.13",
-    "@babel/core": "=7.12.13",
-    "@babel/plugin-proposal-class-properties": "=7.12.13",
-    "@babel/plugin-proposal-object-rest-spread": "=7.12.13",
-    "@babel/plugin-transform-runtime": "=7.12.15",
-    "@babel/preset-env": "=7.12.13",
-    "@babel/register": "=7.12.13",
+    "@babel/cli": "=7.13.14",
+    "@babel/core": "=7.13.14",
+    "@babel/plugin-proposal-class-properties": "=7.13.0",
+    "@babel/plugin-proposal-object-rest-spread": "=7.13.8",
+    "@babel/plugin-transform-runtime": "=7.13.10",
+    "@babel/preset-env": "=7.13.12",
+    "@babel/register": "=7.13.14",
     "@char0n/npm-audit": "gist:2964395223d7943c10396f59df9a8ea0",
-    "@commitlint/cli": "^11.0.0",
-    "@commitlint/config-conventional": "^11.0.0",
+    "@commitlint/cli": "^12.0.0",
+    "@commitlint/config-conventional": "^12.0.0",
     "@release-it/conventional-changelog": "^1.1.4",
     "babel-loader": "=8.2.2",
     "babel-plugin-lodash": "=3.3.4",
     "cross-env": "=7.0.3",
-    "eslint": "=7.19.0",
+    "eslint": "=7.23.0",
     "eslint-config-airbnb-base": "=14.2.1",
-    "eslint-config-prettier": "=7.2.0",
+    "eslint-config-prettier": "=8.1.0",
     "eslint-plugin-import": "=2.22.1",
     "eslint-plugin-prettier": "=3.3.1",
     "expect": "=26.6.2",
     "fetch-mock": "=9.11.0",
     "glob": "=7.1.6",
-    "husky": "=5.0.9",
-    "inspectpack": "=4.6.1",
+    "husky": "=6.0.0",
+    "inspectpack": "=4.7.1",
     "install": "=0.13.0",
     "jest": "=26.6.3",
     "json-loader": "=0.5.7",
     "license-checker": "=25.0.1",
     "lint-staged": "=10.5.4",
     "lodash-webpack-plugin": "=0.11.6",
-    "nock": "=13.0.7",
+    "nock": "=13.0.11",
     "node-fetch": "=2.6.1",
     "npm-run-all": "=4.1.5",
     "prettier": "=2.2.1",
     "release-it": "=12.4.3",
     "rimraf": "=3.0.2",
     "terser-webpack-plugin": "^5.0.3",
-    "webpack": "=5.21.2",
+    "webpack": "=5.28.0",
     "webpack-bundle-size-analyzer": "=3.1.0",
-    "webpack-cli": "=4.5.0",
+    "webpack-cli": "=4.6.0",
     "webpack-stats-plugin": "=1.0.3",
     "xmock": "=0.3.0"
   },