swagger-client 3.27.5 → 3.27.7

package/es/execute/index.js

@@ -1,3 +1,4 @@
+import _matchAllInstanceProperty from "@babel/runtime-corejs3/core-js/instance/match-all";
 import cookie from 'cookie';
 import { isPlainObject } from 'is-plain-object';
 import { escapeRegExp } from 'ramda-adjunct';
@@ -316,7 +317,7 @@ function oas3BaseUrl({
   }
   if (selectedServerUrl.includes('{')) {
     // do variable substitution
-    const varNames = getVariableTemplateNames(selectedServerUrl);
+    const varNames = extractServerVariableNames(selectedServerUrl);
     varNames.forEach(variable => {
       if (selectedServerObj.variables && selectedServerObj.variables[variable]) {
         // variable is defined in server
@@ -346,16 +347,9 @@ function buildOas3UrlWithContext(ourUrl = '', contextUrl = '') {
   }
   return res[res.length - 1] === '/' ? res.slice(0, -1) : res;
 }
-function getVariableTemplateNames(str) {
-  const results = [];
-  const re = /{([^}]+)}/g;
-  let text;
-
-  // eslint-disable-next-line no-cond-assign
-  while (text = re.exec(str)) {
-    results.push(text[1]);
-  }
-  return results;
+function extractServerVariableNames(serverURL) {
+  const match = _matchAllInstanceProperty(serverURL).call(serverURL, /\{([^{}]+)}|([^{}]+)/g);
+  return Array.from(match, ([, variable]) => variable).filter(Boolean);
 }
 
 // Compose the baseUrl ( scheme + host + basePath )

package/lib/execute/index.js

@@ -7,6 +7,7 @@ exports.baseUrl = baseUrl;
 exports.buildRequest = buildRequest;
 exports.execute = execute;
 exports.self = void 0;
+var _matchAll = _interopRequireDefault(require("@babel/runtime-corejs3/core-js/instance/match-all"));
 var _cookie = _interopRequireDefault(require("cookie"));
 var _isPlainObject = require("is-plain-object");
 var _ramdaAdjunct = require("ramda-adjunct");
@@ -325,7 +326,7 @@ function oas3BaseUrl({
   }
   if (selectedServerUrl.includes('{')) {
     // do variable substitution
-    const varNames = getVariableTemplateNames(selectedServerUrl);
+    const varNames = extractServerVariableNames(selectedServerUrl);
     varNames.forEach(variable => {
       if (selectedServerObj.variables && selectedServerObj.variables[variable]) {
         // variable is defined in server
@@ -355,16 +356,9 @@ function buildOas3UrlWithContext(ourUrl = '', contextUrl = '') {
   }
   return res[res.length - 1] === '/' ? res.slice(0, -1) : res;
 }
-function getVariableTemplateNames(str) {
-  const results = [];
-  const re = /{([^}]+)}/g;
-  let text;
-
-  // eslint-disable-next-line no-cond-assign
-  while (text = re.exec(str)) {
-    results.push(text[1]);
-  }
-  return results;
+function extractServerVariableNames(serverURL) {
+  const match = (0, _matchAll.default)(serverURL).call(serverURL, /\{([^{}]+)}|([^{}]+)/g);
+  return Array.from(match, ([, variable]) => variable).filter(Boolean);
 }
 
 // Compose the baseUrl ( scheme + host + basePath )

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "swagger-client",
-  "version": "3.27.5",
+  "version": "3.27.7",
   "description": "SwaggerJS - a collection of interfaces for OAI specs",
   "browser": {
     "./src/helpers/btoa.node.js": "./src/helpers/btoa.browser.js",