swagger-client 3.18.2 → 3.18.5

package/es/execute/index.js

@@ -19,7 +19,7 @@ import SWAGGER2_PARAMETER_BUILDERS from './swagger2/parameter-builders.js';
 import * as OAS3_PARAMETER_BUILDERS from './oas3/parameter-builders.js';
 import oas3BuildRequest from './oas3/build-request.js';
 import swagger2BuildRequest from './swagger2/build-request.js';
-import { getOperationRaw, legacyIdFromPathMethod, isOAS3 } from '../helpers.js';
+import { getOperationRaw, legacyIdFromPathMethod, isOAS3 } from '../helpers/index.js';
 
 var arrayOrEmpty = function arrayOrEmpty(ar) {
   return Array.isArray(ar) ? ar : [];

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

@@ -9,7 +9,7 @@ import _concatInstanceProperty from "@babel/runtime-corejs3/core-js-stable/insta
 // `src/execute/index.js#buildRequest`
 import { isPlainObject } from 'is-plain-object';
 import get from 'lodash/get';
-import btoa from 'btoa';
+import btoa from '../../helpers/btoa.node.js';
 export default function buildRequest(options, req) {
   var operation = options.operation,
       requestBody = options.requestBody,

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

@@ -3,7 +3,7 @@ import _slicedToArray from "@babel/runtime-corejs3/helpers/slicedToArray";
 import _filterInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/filter";
 import _Object$keys from "@babel/runtime-corejs3/core-js-stable/object/keys";
 import _concatInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/concat";
-import btoa from 'btoa'; // This function runs after the common function,
+import btoa from '../../helpers/btoa.node.js'; // This function runs after the common function,
 // `src/execute/index.js#buildRequest`
 
 export default function buildRequest(options, req) {

package/es/helpers/btoa.browser.js

@@ -0,0 +1,19 @@
+import _globalThis from "@babel/runtime-corejs3/core-js/global-this";
+
+/* eslint-disable no-undef, no-restricted-globals */
+var globalObject = function () {
+  // new standardized access to the global object
+  if (typeof _globalThis !== 'undefined') {
+    return _globalThis;
+  } // WebWorker specific access
+
+
+  if (typeof self !== 'undefined') {
+    return self;
+  }
+
+  return window;
+}();
+
+var btoa = globalObject.btoa;
+export default btoa;

package/es/helpers/btoa.node.js

@@ -0,0 +1,15 @@
+import { Buffer } from 'buffer';
+
+var btoa = function btoa(val) {
+  var buffer;
+
+  if (val instanceof Buffer) {
+    buffer = val;
+  } else {
+    buffer = Buffer.from(val.toString(), 'binary');
+  }
+
+  return buffer.toString('base64');
+};
+
+export default btoa;

package/es/index.js

@@ -7,7 +7,7 @@ import Resolver, { clearCache } from './resolver.js';
 import resolveSubtree from './subtree-resolver/index.js';
 import { makeApisTagOperation } from './interfaces.js';
 import { execute, buildRequest, baseUrl } from './execute/index.js';
-import { opId } from './helpers.js';
+import { opId } from './helpers/index.js';
 Swagger.http = Http;
 Swagger.makeHttp = makeHttp.bind(null, Swagger.http);
 Swagger.resolve = Resolver;

package/es/interfaces.js

@@ -1,6 +1,6 @@
 import _objectSpread from "@babel/runtime-corejs3/helpers/objectSpread2";
 import _concatInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/concat";
-import { eachOperation, opId } from './helpers.js';
+import { eachOperation, opId } from './helpers/index.js';
 
 var nullFn = function nullFn() {
   return null;

package/es/resolver.js

@@ -2,7 +2,7 @@ import _asyncToGenerator from "@babel/runtime-corejs3/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime-corejs3/regenerator";
 import Http from './http/index.js';
 import mapSpec, { plugins } from './specmap/index.js';
-import { normalizeSwagger } from './helpers.js';
+import { normalizeSwagger } from './helpers/index.js';
 import { ACCEPT_HEADER_VALUE_FOR_DOCUMENTS } from './constants.js';
 export function makeFetchJSON(http) {
   var opts = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};

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/subtree-resolver/index.js

@@ -25,7 +25,7 @@ import _regeneratorRuntime from "@babel/runtime-corejs3/regenerator";
 // TODO: move the remarks above into project documentation
 import get from 'lodash/get';
 import resolve from '../resolver.js';
-import { normalizeSwagger } from '../helpers.js';
+import { normalizeSwagger } from '../helpers/index.js';
 export default function resolveSubtree(_x, _x2) {
   return _resolveSubtree.apply(this, arguments);
 }

package/lib/execute/index.js

@@ -26,7 +26,7 @@ var _buildRequest = _interopRequireDefault(require("./oas3/build-request.js"));
 
 var _buildRequest2 = _interopRequireDefault(require("./swagger2/build-request.js"));
 
-var _helpers = require("../helpers.js");
+var _index2 = require("../helpers/index.js");
 
 const _excluded = ["http", "fetch", "spec", "operationId", "pathName", "method", "parameters", "securities"];
 
@@ -100,7 +100,7 @@ function execute(_ref) {
   const http = userHttp || fetch || _index.default; // Default to _our_ http
 
   if (pathName && method && !operationId) {
-    operationId = (0, _helpers.legacyIdFromPathMethod)(pathName, method);
+    operationId = (0, _index2.legacyIdFromPathMethod)(pathName, method);
   }
 
   const request = self.buildRequest(_objectSpread({
@@ -139,7 +139,7 @@ function buildRequest(options) {
     parameters,
     parameterBuilders
   } = options;
-  const specIsOAS3 = (0, _helpers.isOAS3)(spec);
+  const specIsOAS3 = (0, _index2.isOAS3)(spec);
 
   if (!parameterBuilders) {
     // user did not provide custom parameter builders
@@ -176,7 +176,7 @@ function buildRequest(options) {
     req.userFetch = userFetch;
   }
 
-  const operationRaw = (0, _helpers.getOperationRaw)(spec, operationId);
+  const operationRaw = (0, _index2.getOperationRaw)(spec, operationId);
 
   if (!operationRaw) {
     throw new OperationNotFoundError(`Operation ${operationId} not found`);
@@ -315,7 +315,7 @@ const stripNonAlpha = str => str ? str.replace(/\W/g, '') : null; // be careful
 
 
 function baseUrl(obj) {
-  const specIsOAS3 = (0, _helpers.isOAS3)(obj.spec);
+  const specIsOAS3 = (0, _index2.isOAS3)(obj.spec);
   return specIsOAS3 ? oas3BaseUrl(obj) : swagger2BaseUrl(obj);
 }
 

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

@@ -8,7 +8,7 @@ var _isPlainObject = require("is-plain-object");
 
 var _get = _interopRequireDefault(require("lodash/get"));
 
-var _btoa = _interopRequireDefault(require("btoa"));
+var _btoaNode = _interopRequireDefault(require("../../helpers/btoa.node.js"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -151,7 +151,7 @@ function applySecurities({
           if (/^basic$/i.test(schema.scheme)) {
             const username = value.username || '';
             const password = value.password || '';
-            const encoded = (0, _btoa.default)(`${username}:${password}`);
+            const encoded = (0, _btoaNode.default)(`${username}:${password}`);
             result.headers.Authorization = `Basic ${encoded}`;
           }
 

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

@@ -4,7 +4,7 @@ exports.__esModule = true;
 exports.applySecurities = applySecurities;
 exports.default = buildRequest;
 
-var _btoa = _interopRequireDefault(require("btoa"));
+var _btoaNode = _interopRequireDefault(require("../../helpers/btoa.node.js"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -116,7 +116,7 @@ function applySecurities({
           } else {
             const username = value.username || '';
             const password = value.password || '';
-            value.base64 = (0, _btoa.default)(`${username}:${password}`);
+            value.base64 = (0, _btoaNode.default)(`${username}:${password}`);
             result.headers.authorization = `Basic ${value.base64}`;
           }
         } else if (type === 'oauth2' && oauthToken) {

package/lib/helpers/btoa.browser.js

@@ -0,0 +1,25 @@
+"use strict";
+
+exports.__esModule = true;
+exports.default = void 0;
+
+/* eslint-disable no-undef, no-restricted-globals */
+const globalObject = (() => {
+  // new standardized access to the global object
+  if (typeof globalThis !== 'undefined') {
+    return globalThis;
+  } // WebWorker specific access
+
+
+  if (typeof self !== 'undefined') {
+    return self;
+  }
+
+  return window;
+})();
+
+const {
+  btoa
+} = globalObject;
+var _default = btoa;
+exports.default = _default;

package/lib/helpers/btoa.node.js

@@ -0,0 +1,21 @@
+"use strict";
+
+exports.__esModule = true;
+exports.default = void 0;
+
+var _buffer = require("buffer");
+
+const btoa = val => {
+  let buffer;
+
+  if (val instanceof _buffer.Buffer) {
+    buffer = val;
+  } else {
+    buffer = _buffer.Buffer.from(val.toString(), 'binary');
+  }
+
+  return buffer.toString('base64');
+};
+
+var _default = btoa;
+exports.default = _default;

package/lib/index.js

@@ -15,7 +15,7 @@ var _interfaces = require("./interfaces.js");
 
 var _index3 = require("./execute/index.js");
 
-var _helpers = require("./helpers.js");
+var _index4 = require("./helpers/index.js");
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
@@ -40,7 +40,7 @@ Swagger.clearCache = _resolver.clearCache;
 Swagger.makeApisTagOperation = _interfaces.makeApisTagOperation;
 Swagger.buildRequest = _index3.buildRequest;
 Swagger.helpers = {
-  opId: _helpers.opId
+  opId: _index4.opId
 };
 Swagger.getBaseUrl = _index3.baseUrl;
 

package/lib/interfaces.js

@@ -7,7 +7,7 @@ exports.makeExecute = makeExecute;
 exports.mapTagOperations = mapTagOperations;
 exports.self = void 0;
 
-var _helpers = require("./helpers.js");
+var _index = require("./helpers/index.js");
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
@@ -113,7 +113,7 @@ function mapTagOperations({
   const operationIdCounter = {};
   const tagOperations = {}; // Will house all tags + operations
 
-  (0, _helpers.eachOperation)(spec, ({
+  (0, _index.eachOperation)(spec, ({
     pathName,
     method,
     operation
@@ -126,7 +126,7 @@ function mapTagOperations({
 
       tagOperations[tag] = tagOperations[tag] || {};
       const tagObj = tagOperations[tag];
-      const id = (0, _helpers.opId)(operation, pathName, method, {
+      const id = (0, _index.opId)(operation, pathName, method, {
         v2OperationIdCompatibilityMode
       });
       const cbResult = cb({

package/lib/resolver.js

@@ -9,7 +9,7 @@ var _index = _interopRequireDefault(require("./http/index.js"));
 
 var _index2 = _interopRequireWildcard(require("./specmap/index.js"));
 
-var _helpers = require("./helpers.js");
+var _index3 = require("./helpers/index.js");
 
 var _constants = require("./constants.js");
 
@@ -116,6 +116,6 @@ function resolve(obj) {
       parameterMacro,
       modelPropertyMacro,
       useCircularStructures
-    }).then(skipNormalization ? async a => a : _helpers.normalizeSwagger);
+    }).then(skipNormalization ? async a => a : _index3.normalizeSwagger);
   }
 }

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/subtree-resolver/index.js

@@ -7,7 +7,7 @@ var _get = _interopRequireDefault(require("lodash/get"));
 
 var _resolver = _interopRequireDefault(require("../resolver.js"));
 
-var _helpers = require("../helpers.js");
+var _index = require("../helpers/index.js");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -38,7 +38,7 @@ async function resolveSubtree(obj, path, opts = {}) {
   };
   const {
     spec: normalized
-  } = (0, _helpers.normalizeSwagger)({
+  } = (0, _index.normalizeSwagger)({
     spec: obj
   });
   const result = await (0, _resolver.default)(_objectSpread(_objectSpread({}, resolveOptions), {}, {

package/package.json

@@ -1,11 +1,14 @@
 {
   "name": "swagger-client",
-  "version": "3.18.2",
+  "version": "3.18.5",
   "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",
     "./lib/http/fold-formdata-to-request.node.js": "./lib/http/fold-formdata-to-request.browser.js",
-    "./es/http/fold-formdata-to-request.node.js": "./es/http/fold-formdata-to-request.browser.js"
+    "./es/http/fold-formdata-to-request.node.js": "./es/http/fold-formdata-to-request.browser.js",
+    "./src/helpers/btoa.node.js": "./src/helpers/btoa.browser.js",
+    "./lib/helpers/btoa.node.js": "./lib/helpers/btoa.browser.js",
+    "./es/helpers/btoa.node.js": "./es/helpers/btoa.browser.js"
   },
   "main": "lib/commonjs.js",
   "module": "es/index.js",
@@ -63,52 +66,51 @@
   ],
   "license": "Apache-2.0",
   "devDependencies": {
-    "@babel/cli": "=7.16.8",
-    "@babel/core": "=7.16.7",
+    "@babel/cli": "=7.17.10",
+    "@babel/core": "=7.17.10",
     "@babel/plugin-proposal-class-properties": "=7.16.7",
-    "@babel/plugin-proposal-object-rest-spread": "=7.16.7",
-    "@babel/plugin-transform-runtime": "=7.16.8",
-    "@babel/preset-env": "=7.16.8",
-    "@babel/register": "=7.16.9",
+    "@babel/plugin-proposal-object-rest-spread": "=7.17.3",
+    "@babel/plugin-transform-runtime": "=7.17.10",
+    "@babel/preset-env": "=7.17.10",
+    "@babel/register": "=7.17.7",
     "@commitlint/cli": "^16.0.1",
     "@commitlint/config-conventional": "^16.0.0",
     "abort-controller": "^3.0.0",
-    "babel-loader": "=8.2.3",
+    "babel-loader": "=8.2.5",
     "babel-plugin-lodash": "=3.3.4",
     "cross-env": "=7.0.3",
     "eslint": "^8.2.0",
     "eslint-config-airbnb-base": "^15.0.0",
-    "eslint-config-prettier": "=8.3.0",
-    "eslint-plugin-import": "=2.25.4",
+    "eslint-config-prettier": "=8.5.0",
+    "eslint-plugin-import": "=2.26.0",
     "eslint-plugin-prettier": "=4.0.0",
-    "expect": "=27.4.6",
+    "expect": "=27.5.1",
     "fetch-mock": "=9.11.0",
-    "glob": "=7.2.0",
+    "glob": "=8.0.1",
     "husky": "^7.0.1",
     "inspectpack": "=4.7.1",
     "install": "=0.13.0",
     "jest": "^27.0.1",
     "json-loader": "=0.5.7",
     "license-checker": "=25.0.1",
-    "lint-staged": "=12.2.0",
+    "lint-staged": "=12.4.1",
     "lodash-webpack-plugin": "=0.11.6",
-    "nock": "=13.2.2",
-    "node-fetch": "=2.6.1",
+    "nock": "=13.2.4",
+    "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.66.0",
+    "webpack": "=5.72.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"
   },
   "dependencies": {
     "@babel/runtime-corejs3": "^7.11.2",
-    "btoa": "^1.2.1",
-    "cookie": "~0.4.1",
-    "cross-fetch": "^3.1.4",
+    "cookie": "~0.5.0",
+    "cross-fetch": "^3.1.5",
     "deepmerge": "~4.2.2",
     "fast-json-patch": "^3.0.0-1",
     "form-data-encoder": "^1.4.3",