swagger-client 3.27.3 → 3.27.5

package/es/execute/index.js

@@ -1,5 +1,6 @@
 import cookie from 'cookie';
 import { isPlainObject } from 'is-plain-object';
+import { escapeRegExp } from 'ramda-adjunct';
 import { ApiDOMStructuredError } from '@swagger-api/apidom-error';
 import { url } from '@swagger-api/apidom-reference/configuration/empty';
 import { DEFAULT_BASE_URL, DEFAULT_OPENAPI_3_SERVER } from '../constants.js';
@@ -233,7 +234,8 @@ export function buildRequest(options) {
         parameter,
         value,
         operation,
-        spec
+        spec,
+        pathName
       });
     }
   });
@@ -320,7 +322,7 @@ function oas3BaseUrl({
         // variable is defined in server
         const variableDefinition = selectedServerObj.variables[variable];
         const variableValue = serverVariables[variable] || variableDefinition.default;
-        const re = new RegExp(`{${variable}}`, 'g');
+        const re = new RegExp(`{${escapeRegExp(variable)}}`, 'g');
         selectedServerUrl = selectedServerUrl.replace(re, variableValue);
       }
     });

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

@@ -1,9 +1,11 @@
+import { resolve as resolvePathTemplate } from 'openapi-path-templating';
 import stylize, { encodeCharacters } from './style-serializer.js';
 import serialize from './content-serializer.js';
 export function path({
   req,
   value,
-  parameter
+  parameter,
+  pathName
 }) {
   const {
     name,
@@ -12,19 +14,28 @@ export function path({
     content
   } = parameter;
   if (value === undefined) return;
+  let resolvedPathname;
   if (content) {
     const effectiveMediaType = Object.keys(content)[0];
-    req.url = req.url.split(`{${name}}`).join(encodeCharacters(serialize(value, effectiveMediaType)));
+    resolvedPathname = resolvePathTemplate(pathName, {
+      [name]: value
+    }, {
+      encoder: val => encodeCharacters(serialize(val, effectiveMediaType))
+    });
   } else {
-    const styledValue = stylize({
-      key: parameter.name,
-      value,
-      style: style || 'simple',
-      explode: explode || false,
-      escape: 'reserved'
+    resolvedPathname = resolvePathTemplate(pathName, {
+      [name]: value
+    }, {
+      encoder: val => stylize({
+        key: parameter.name,
+        value: val,
+        style: style || 'simple',
+        explode: explode || false,
+        escape: 'reserved'
+      })
     });
-    req.url = req.url.replace(new RegExp(`{${name}}`, 'g'), styledValue);
   }
+  req.url = req.url.replace(pathName, resolvedPathname);
 }
 export function query({
   req,

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

@@ -1,3 +1,5 @@
+import { resolve as resolvePathTemplate } from 'openapi-path-templating';
+
 // These functions will update the request.
 // They'll be given {req, value, paramter, spec, operation}.
 
@@ -61,10 +63,14 @@ function headerBuilder({
 function pathBuilder({
   req,
   value,
-  parameter
+  parameter,
+  pathName
 }) {
   if (value !== undefined) {
-    req.url = req.url.replace(new RegExp(`{${parameter.name}}`, 'g'), encodeURIComponent(value));
+    const resolvedPathname = resolvePathTemplate(pathName, {
+      [parameter.name]: value
+    });
+    req.url = req.url.replace(pathName, resolvedPathname);
   }
 }
 

package/lib/execute/index.js

@@ -9,6 +9,7 @@ exports.execute = execute;
 exports.self = void 0;
 var _cookie = _interopRequireDefault(require("cookie"));
 var _isPlainObject = require("is-plain-object");
+var _ramdaAdjunct = require("ramda-adjunct");
 var _apidomError = require("@swagger-api/apidom-error");
 var _empty = require("@swagger-api/apidom-reference/configuration/empty");
 var _constants = require("../constants.js");
@@ -242,7 +243,8 @@ function buildRequest(options) {
         parameter,
         value,
         operation,
-        spec
+        spec,
+        pathName
       });
     }
   });
@@ -329,7 +331,7 @@ function oas3BaseUrl({
         // variable is defined in server
         const variableDefinition = selectedServerObj.variables[variable];
         const variableValue = serverVariables[variable] || variableDefinition.default;
-        const re = new RegExp(`{${variable}}`, 'g');
+        const re = new RegExp(`{${(0, _ramdaAdjunct.escapeRegExp)(variable)}}`, 'g');
         selectedServerUrl = selectedServerUrl.replace(re, variableValue);
       }
     });

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

@@ -7,12 +7,14 @@ exports.cookie = cookie;
 exports.header = header;
 exports.path = path;
 exports.query = query;
+var _openapiPathTemplating = require("openapi-path-templating");
 var _styleSerializer = _interopRequireWildcard(require("./style-serializer.js"));
 var _contentSerializer = _interopRequireDefault(require("./content-serializer.js"));
 function path({
   req,
   value,
-  parameter
+  parameter,
+  pathName
 }) {
   const {
     name,
@@ -21,19 +23,28 @@ function path({
     content
   } = parameter;
   if (value === undefined) return;
+  let resolvedPathname;
   if (content) {
     const effectiveMediaType = Object.keys(content)[0];
-    req.url = req.url.split(`{${name}}`).join((0, _styleSerializer.encodeCharacters)((0, _contentSerializer.default)(value, effectiveMediaType)));
+    resolvedPathname = (0, _openapiPathTemplating.resolve)(pathName, {
+      [name]: value
+    }, {
+      encoder: val => (0, _styleSerializer.encodeCharacters)((0, _contentSerializer.default)(val, effectiveMediaType))
+    });
   } else {
-    const styledValue = (0, _styleSerializer.default)({
-      key: parameter.name,
-      value,
-      style: style || 'simple',
-      explode: explode || false,
-      escape: 'reserved'
+    resolvedPathname = (0, _openapiPathTemplating.resolve)(pathName, {
+      [name]: value
+    }, {
+      encoder: val => (0, _styleSerializer.default)({
+        key: parameter.name,
+        value: val,
+        style: style || 'simple',
+        explode: explode || false,
+        escape: 'reserved'
+      })
     });
-    req.url = req.url.replace(new RegExp(`{${name}}`, 'g'), styledValue);
   }
+  req.url = req.url.replace(pathName, resolvedPathname);
 }
 function query({
   req,

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

@@ -2,6 +2,7 @@
 
 exports.__esModule = true;
 exports.default = void 0;
+var _openapiPathTemplating = require("openapi-path-templating");
 // These functions will update the request.
 // They'll be given {req, value, paramter, spec, operation}.
 var _default = exports.default = {
@@ -62,10 +63,14 @@ function headerBuilder({
 function pathBuilder({
   req,
   value,
-  parameter
+  parameter,
+  pathName
 }) {
   if (value !== undefined) {
-    req.url = req.url.replace(new RegExp(`{${parameter.name}}`, 'g'), encodeURIComponent(value));
+    const resolvedPathname = (0, _openapiPathTemplating.resolve)(pathName, {
+      [parameter.name]: value
+    });
+    req.url = req.url.replace(pathName, resolvedPathname);
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "swagger-client",
-  "version": "3.27.3",
+  "version": "3.27.5",
   "description": "SwaggerJS - a collection of interfaces for OAI specs",
   "browser": {
     "./src/helpers/btoa.node.js": "./src/helpers/btoa.browser.js",
@@ -122,7 +122,9 @@
     "js-yaml": "^4.1.0",
     "node-abort-controller": "^3.1.1",
     "node-fetch-commonjs": "^3.3.2",
+    "openapi-path-templating": "^1.5.1",
     "qs": "^6.10.2",
+    "ramda-adjunct": "^5.0.0",
     "traverse": "=0.6.8"
   },
   "overrides": {