swagger-client 3.18.0 → 3.18.4

package/es/helpers.js

@@ -171,7 +171,7 @@ export function normalizeSwagger(parsedSpec) {
 
       var operation = path[method];
 
-      if (path == null || !_includesInstanceProperty(_context6 = ['object', 'function']).call(_context6, _typeof(path))) {
+      if (operation == null || !_includesInstanceProperty(_context6 = ['object', 'function']).call(_context6, _typeof(operation))) {
         return "continue"; // eslint-disable-line no-continue
       }
 

package/es/specmap/lib/all-of.js

@@ -77,15 +77,24 @@ export default {
       });
       patches.push.apply(patches, _toConsumableArray(absoluteRefPatches));
       return undefined;
-    }); // Merge back the values from the original definition
+    }); // If there was an example in the original definition,
+    // keep it instead of merging with examples from other schema
+
+    if (originalDefinitionObj.example) {
+      var _context2;
+
+      // Delete other schema examples
+      patches.push(specmap.remove(_concatInstanceProperty(_context2 = []).call(_context2, parent, 'example')));
+    } // Merge back the values from the original definition
+
 
     patches.push(specmap.mergeDeep(parent, originalDefinitionObj)); // If there was not an original $$ref value, make sure to remove
     // any $$ref value that may exist from the result of `allOf` merges
 
     if (!originalDefinitionObj.$$ref) {
-      var _context2;
+      var _context3;
 
-      patches.push(specmap.remove(_concatInstanceProperty(_context2 = []).call(_context2, parent, '$$ref')));
+      patches.push(specmap.remove(_concatInstanceProperty(_context3 = []).call(_context3, parent, '$$ref')));
     }
 
     return patches;

package/es/specmap/lib/index.js

@@ -1,15 +1,13 @@
 import _typeof from "@babel/runtime-corejs3/helpers/typeof";
 import _toConsumableArray from "@babel/runtime-corejs3/helpers/toConsumableArray";
-import _defineProperty from "@babel/runtime-corejs3/helpers/defineProperty";
 import _objectSpread from "@babel/runtime-corejs3/helpers/objectSpread2";
 import _Object$assign from "@babel/runtime-corejs3/core-js-stable/object/assign";
-import _concatInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/concat";
 import _Object$keys from "@babel/runtime-corejs3/core-js-stable/object/keys";
 import _mapInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/map";
 import _filterInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/filter";
+import _concatInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/concat";
 import * as jsonPatch from 'fast-json-patch';
-import deepExtend from 'deep-extend';
-import cloneDeep from 'lodash/cloneDeep';
+import deepmerge from 'deepmerge';
 export default {
   add: add,
   replace: replace,
@@ -50,45 +48,11 @@ function applyPatch(obj, patch, opts) {
 
     jsonPatch.applyPatch(obj, [replace(patch.path, newValue)]);
   } else if (patch.op === 'mergeDeep') {
-    var currentValue = getInByJsonPath(obj, patch.path); // Iterate the properties of the patch
-    // eslint-disable-next-line no-restricted-syntax, guard-for-in
-
-    for (var prop in patch.value) {
-      var propVal = patch.value[prop];
-      var isArray = Array.isArray(propVal);
-
-      if (isArray) {
-        // deepExtend doesn't merge arrays, so we will do it manually
-        var existing = currentValue[prop] || [];
-        currentValue[prop] = _concatInstanceProperty(existing).call(existing, propVal);
-      } else if (isObject(propVal) && !isArray) {
-        // If it's an object, iterate it's keys and merge
-        // if there are conflicting keys, merge deep, otherwise shallow merge
-        var currentObj = _objectSpread({}, currentValue[prop]); // eslint-disable-next-line no-restricted-syntax
-
-
-        for (var key in propVal) {
-          if (Object.prototype.hasOwnProperty.call(currentObj, key)) {
-            // if there is a single conflicting key, just deepExtend the entire value
-            // and break from the loop (since all future keys are also merged)
-            // We do this because we can't deepExtend two primitives
-            // (currentObj[key] & propVal[key] may be primitives).
-            //
-            // we also deeply assign here, since we aren't in control of
-            // how deepExtend affects existing nested objects
-            currentObj = deepExtend(cloneDeep(currentObj), propVal);
-            break;
-          } else {
-            _Object$assign(currentObj, _defineProperty({}, key, propVal[key]));
-          }
-        }
-
-        currentValue[prop] = currentObj;
-      } else {
-        // It's a primitive, just replace existing
-        currentValue[prop] = propVal;
-      }
-    }
+    var currentValue = getInByJsonPath(obj, patch.path);
+
+    var _newValue = deepmerge(currentValue, patch.value);
+
+    obj = jsonPatch.applyPatch(obj, [replace(patch.path, _newValue)]).newDocument;
   } else if (patch.op === 'add' && patch.path === '' && isObject(patch.value)) {
     // { op: 'add', path: '', value: { a: 1, b: 2 }}
     // has no effect: json patch refuses to do anything.
@@ -119,9 +83,9 @@ function applyPatch(obj, patch, opts) {
     if (opts.allowMetaPatches && patch.meta && isAdditiveMutation(patch) && (Array.isArray(patch.value) || isObject(patch.value))) {
       var _currentValue = getInByJsonPath(obj, patch.path);
 
-      var _newValue = _objectSpread(_objectSpread({}, _currentValue), patch.meta);
+      var _newValue2 = _objectSpread(_objectSpread({}, _currentValue), patch.meta);
 
-      jsonPatch.applyPatch(obj, [replace(patch.path, _newValue)]);
+      jsonPatch.applyPatch(obj, [replace(patch.path, _newValue2)]);
     }
   }
 

package/lib/helpers.js

@@ -171,7 +171,7 @@ function normalizeSwagger(parsedSpec) {
     for (const method in path) {
       const operation = path[method];
 
-      if (path == null || !['object', 'function'].includes(typeof path)) {
+      if (operation == null || !['object', 'function'].includes(typeof operation)) {
         continue; // eslint-disable-line no-continue
       }
 

package/lib/specmap/lib/all-of.js

@@ -77,7 +77,14 @@ var _default = {
       });
       patches.push(...absoluteRefPatches);
       return undefined;
-    }); // Merge back the values from the original definition
+    }); // If there was an example in the original definition,
+    // keep it instead of merging with examples from other schema
+
+    if (originalDefinitionObj.example) {
+      // Delete other schema examples
+      patches.push(specmap.remove([].concat(parent, 'example')));
+    } // Merge back the values from the original definition
+
 
     patches.push(specmap.mergeDeep(parent, originalDefinitionObj)); // If there was not an original $$ref value, make sure to remove
     // any $$ref value that may exist from the result of `allOf` merges

package/lib/specmap/lib/index.js

@@ -5,9 +5,7 @@ exports.default = void 0;
 
 var jsonPatch = _interopRequireWildcard(require("fast-json-patch"));
 
-var _deepExtend = _interopRequireDefault(require("deep-extend"));
-
-var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
+var _deepmerge = _interopRequireDefault(require("deepmerge"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -60,47 +58,9 @@ function applyPatch(obj, patch, opts) {
     Object.assign(newValue, patch.value);
     jsonPatch.applyPatch(obj, [replace(patch.path, newValue)]);
   } else if (patch.op === 'mergeDeep') {
-    const currentValue = getInByJsonPath(obj, patch.path); // Iterate the properties of the patch
-    // eslint-disable-next-line no-restricted-syntax, guard-for-in
-
-    for (const prop in patch.value) {
-      const propVal = patch.value[prop];
-      const isArray = Array.isArray(propVal);
-
-      if (isArray) {
-        // deepExtend doesn't merge arrays, so we will do it manually
-        const existing = currentValue[prop] || [];
-        currentValue[prop] = existing.concat(propVal);
-      } else if (isObject(propVal) && !isArray) {
-        // If it's an object, iterate it's keys and merge
-        // if there are conflicting keys, merge deep, otherwise shallow merge
-        let currentObj = _objectSpread({}, currentValue[prop]); // eslint-disable-next-line no-restricted-syntax
-
-
-        for (const key in propVal) {
-          if (Object.prototype.hasOwnProperty.call(currentObj, key)) {
-            // if there is a single conflicting key, just deepExtend the entire value
-            // and break from the loop (since all future keys are also merged)
-            // We do this because we can't deepExtend two primitives
-            // (currentObj[key] & propVal[key] may be primitives).
-            //
-            // we also deeply assign here, since we aren't in control of
-            // how deepExtend affects existing nested objects
-            currentObj = (0, _deepExtend.default)((0, _cloneDeep.default)(currentObj), propVal);
-            break;
-          } else {
-            Object.assign(currentObj, {
-              [key]: propVal[key]
-            });
-          }
-        }
-
-        currentValue[prop] = currentObj;
-      } else {
-        // It's a primitive, just replace existing
-        currentValue[prop] = propVal;
-      }
-    }
+    const currentValue = getInByJsonPath(obj, patch.path);
+    const newValue = (0, _deepmerge.default)(currentValue, patch.value);
+    obj = jsonPatch.applyPatch(obj, [replace(patch.path, newValue)]).newDocument;
   } else if (patch.op === 'add' && patch.path === '' && isObject(patch.value)) {
     // { op: 'add', path: '', value: { a: 1, b: 2 }}
     // has no effect: json patch refuses to do anything.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "swagger-client",
-  "version": "3.18.0",
+  "version": "3.18.4",
   "description": "SwaggerJS - a collection of interfaces for OAI specs",
   "browser": {
     "./src/http/fold-formdata-to-request.node.js": "./src/http/fold-formdata-to-request.browser.js",
@@ -63,15 +63,15 @@
   ],
   "license": "Apache-2.0",
   "devDependencies": {
-    "@babel/cli": "=7.16.0",
-    "@babel/core": "=7.16.5",
-    "@babel/plugin-proposal-class-properties": "=7.16.5",
-    "@babel/plugin-proposal-object-rest-spread": "=7.16.5",
-    "@babel/plugin-transform-runtime": "=7.16.5",
-    "@babel/preset-env": "=7.16.5",
-    "@babel/register": "=7.16.5",
-    "@commitlint/cli": "^15.0.0",
-    "@commitlint/config-conventional": "^15.0.0",
+    "@babel/cli": "=7.16.8",
+    "@babel/core": "=7.16.12",
+    "@babel/plugin-proposal-class-properties": "=7.16.7",
+    "@babel/plugin-proposal-object-rest-spread": "=7.16.7",
+    "@babel/plugin-transform-runtime": "=7.16.10",
+    "@babel/preset-env": "=7.16.11",
+    "@babel/register": "=7.16.9",
+    "@commitlint/cli": "^16.0.1",
+    "@commitlint/config-conventional": "^16.0.0",
     "abort-controller": "^3.0.0",
     "babel-loader": "=8.2.3",
     "babel-plugin-lodash": "=3.3.4",
@@ -79,9 +79,9 @@
     "eslint": "^8.2.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-config-prettier": "=8.3.0",
-    "eslint-plugin-import": "=2.25.3",
+    "eslint-plugin-import": "=2.25.4",
     "eslint-plugin-prettier": "=4.0.0",
-    "expect": "=27.4.2",
+    "expect": "=27.4.6",
     "fetch-mock": "=9.11.0",
     "glob": "=7.2.0",
     "husky": "^7.0.1",
@@ -90,17 +90,17 @@
     "jest": "^27.0.1",
     "json-loader": "=0.5.7",
     "license-checker": "=25.0.1",
-    "lint-staged": "=12.1.3",
+    "lint-staged": "=12.3.3",
     "lodash-webpack-plugin": "=0.11.6",
-    "nock": "=13.2.1",
-    "node-fetch": "=2.6.1",
+    "nock": "=13.2.2",
+    "node-fetch": "^2.6.7",
     "npm-run-all": "=4.1.5",
     "prettier": "^2.3.0",
     "rimraf": "=3.0.2",
     "terser-webpack-plugin": "^5.0.3",
-    "webpack": "=5.65.0",
+    "webpack": "=5.68.0",
     "webpack-bundle-size-analyzer": "=3.1.0",
-    "webpack-cli": "=4.9.1",
+    "webpack-cli": "=4.9.2",
     "webpack-stats-plugin": "=1.0.3",
     "xmock": "=0.3.0"
   },
@@ -108,8 +108,8 @@
     "@babel/runtime-corejs3": "^7.11.2",
     "btoa": "^1.2.1",
     "cookie": "~0.4.1",
-    "cross-fetch": "^3.1.4",
-    "deep-extend": "~0.6.0",
+    "cross-fetch": "^3.1.5",
+    "deepmerge": "~4.2.2",
     "fast-json-patch": "^3.0.0-1",
     "form-data-encoder": "^1.4.3",
     "formdata-node": "^4.0.0",