swagger-client 3.27.6 → 3.27.8

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';
@@ -163,7 +164,7 @@ export function buildRequest(options) {
     method,
     pathName
   } = operationRaw;
-  req.url += baseUrl({
+  const baseURL = baseUrl({
     spec,
     scheme,
     contextUrl,
@@ -172,6 +173,7 @@ export function buildRequest(options) {
     pathName,
     method
   });
+  req.url += baseURL;
 
   // Mostly for testing
   if (!operationId) {
@@ -235,7 +237,7 @@ export function buildRequest(options) {
         value,
         operation,
         spec,
-        pathName
+        baseURL
       });
     }
   });
@@ -316,7 +318,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 +348,9 @@ function buildOas3UrlWithContext(ourUrl = '', contextUrl = '') {
   }
   return res[res.length - 1] === '/' ? res.slice(0, -1) : res;
 }
-function getVariableTemplateNames(str) {
-  const results = [];
-  const re = /{([^}]{1,29})}/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/es/execute/oas3/parameter-builders.js

@@ -5,7 +5,7 @@ export function path({
   req,
   value,
   parameter,
-  pathName
+  baseURL
 }) {
   const {
     name,
@@ -14,16 +14,17 @@ export function path({
     content
   } = parameter;
   if (value === undefined) return;
+  const pathname = req.url.replace(baseURL, '');
   let resolvedPathname;
   if (content) {
     const effectiveMediaType = Object.keys(content)[0];
-    resolvedPathname = resolvePathTemplate(pathName, {
+    resolvedPathname = resolvePathTemplate(pathname, {
       [name]: value
     }, {
       encoder: val => encodeCharacters(serialize(val, effectiveMediaType))
     });
   } else {
-    resolvedPathname = resolvePathTemplate(pathName, {
+    resolvedPathname = resolvePathTemplate(pathname, {
       [name]: value
     }, {
       encoder: val => stylize({
@@ -35,7 +36,7 @@ export function path({
       })
     });
   }
-  req.url = req.url.replace(pathName, resolvedPathname);
+  req.url = baseURL + resolvedPathname;
 }
 export function query({
   req,

package/es/execute/swagger2/parameter-builders.js

@@ -64,13 +64,14 @@ function pathBuilder({
   req,
   value,
   parameter,
-  pathName
+  baseURL
 }) {
   if (value !== undefined) {
-    const resolvedPathname = resolvePathTemplate(pathName, {
+    const pathname = req.url.replace(baseURL, '');
+    const resolvedPathname = resolvePathTemplate(pathname, {
       [parameter.name]: value
     });
-    req.url = req.url.replace(pathName, resolvedPathname);
+    req.url = baseURL + resolvedPathname;
   }
 }
 

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");
@@ -172,7 +173,7 @@ function buildRequest(options) {
     method,
     pathName
   } = operationRaw;
-  req.url += baseUrl({
+  const baseURL = baseUrl({
     spec,
     scheme,
     contextUrl,
@@ -181,6 +182,7 @@ function buildRequest(options) {
     pathName,
     method
   });
+  req.url += baseURL;
 
   // Mostly for testing
   if (!operationId) {
@@ -244,7 +246,7 @@ function buildRequest(options) {
         value,
         operation,
         spec,
-        pathName
+        baseURL
       });
     }
   });
@@ -325,7 +327,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 +357,9 @@ function buildOas3UrlWithContext(ourUrl = '', contextUrl = '') {
   }
   return res[res.length - 1] === '/' ? res.slice(0, -1) : res;
 }
-function getVariableTemplateNames(str) {
-  const results = [];
-  const re = /{([^}]{1,29})}/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/lib/execute/oas3/parameter-builders.js

@@ -14,7 +14,7 @@ function path({
   req,
   value,
   parameter,
-  pathName
+  baseURL
 }) {
   const {
     name,
@@ -23,16 +23,17 @@ function path({
     content
   } = parameter;
   if (value === undefined) return;
+  const pathname = req.url.replace(baseURL, '');
   let resolvedPathname;
   if (content) {
     const effectiveMediaType = Object.keys(content)[0];
-    resolvedPathname = (0, _openapiPathTemplating.resolve)(pathName, {
+    resolvedPathname = (0, _openapiPathTemplating.resolve)(pathname, {
       [name]: value
     }, {
       encoder: val => (0, _styleSerializer.encodeCharacters)((0, _contentSerializer.default)(val, effectiveMediaType))
     });
   } else {
-    resolvedPathname = (0, _openapiPathTemplating.resolve)(pathName, {
+    resolvedPathname = (0, _openapiPathTemplating.resolve)(pathname, {
       [name]: value
     }, {
       encoder: val => (0, _styleSerializer.default)({
@@ -44,7 +45,7 @@ function path({
       })
     });
   }
-  req.url = req.url.replace(pathName, resolvedPathname);
+  req.url = baseURL + resolvedPathname;
 }
 function query({
   req,

package/lib/execute/swagger2/parameter-builders.js

@@ -64,13 +64,14 @@ function pathBuilder({
   req,
   value,
   parameter,
-  pathName
+  baseURL
 }) {
   if (value !== undefined) {
-    const resolvedPathname = (0, _openapiPathTemplating.resolve)(pathName, {
+    const pathname = req.url.replace(baseURL, '');
+    const resolvedPathname = (0, _openapiPathTemplating.resolve)(pathname, {
       [parameter.name]: value
     });
-    req.url = req.url.replace(pathName, resolvedPathname);
+    req.url = baseURL + resolvedPathname;
   }
 }
 

package/package.json

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