swagger-client 3.28.1 → 3.28.2

package/es/execute/index.js

@@ -1,7 +1,6 @@
-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';
+import { isPlainObject } from 'ramda-adjunct';
+import { test as testServerURLTemplate, substitute as substituteServerURLTemplate } from 'openapi-server-url-templating';
 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';
@@ -316,17 +315,18 @@ function oas3BaseUrl({
     [selectedServerObj] = servers;
     selectedServerUrl = selectedServerObj.url;
   }
-  if (selectedServerUrl.includes('{')) {
-    // do variable substitution
-    const varNames = extractServerVariableNames(selectedServerUrl);
-    varNames.forEach(variable => {
-      if (selectedServerObj.variables && selectedServerObj.variables[variable]) {
-        // variable is defined in server
-        const variableDefinition = selectedServerObj.variables[variable];
-        const variableValue = serverVariables[variable] || variableDefinition.default;
-        const re = new RegExp(`{${escapeRegExp(variable)}}`, 'g');
-        selectedServerUrl = selectedServerUrl.replace(re, variableValue);
-      }
+  if (testServerURLTemplate(selectedServerUrl, {
+    strict: true
+  })) {
+    const selectedServerVariables = Object.entries({
+      ...selectedServerObj.variables
+    }).reduce((acc, [serverVariableName, serverVariable]) => {
+      acc[serverVariableName] = serverVariable.default;
+      return acc;
+    }, {});
+    selectedServerUrl = substituteServerURLTemplate(selectedServerUrl, {
+      ...selectedServerVariables,
+      ...serverVariables
     });
   }
   return buildOas3UrlWithContext(selectedServerUrl, contextUrl);
@@ -348,10 +348,6 @@ function buildOas3UrlWithContext(ourUrl = '', contextUrl = '') {
   }
   return res[res.length - 1] === '/' ? res.slice(0, -1) : res;
 }
-function extractServerVariableNames(serverURL) {
-  const match = _matchAllInstanceProperty(serverURL).call(serverURL, /\{([^{}]+)}|([^{}]+)/g);
-  return Array.from(match, ([, variable]) => variable).filter(Boolean);
-}
 
 // Compose the baseUrl ( scheme + host + basePath )
 function swagger2BaseUrl({

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

@@ -1,6 +1,6 @@
 // This function runs after the common function,
 // `src/execute/index.js#buildRequest`
-import { isPlainObject } from 'is-plain-object';
+import { isPlainObject } from 'ramda-adjunct';
 import btoa from '../../helpers/btoa.node.js';
 export default function buildRequest(options, req) {
   const {

package/lib/execute/index.js

@@ -7,10 +7,9 @@ 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");
+var _openapiServerUrlTemplating = require("openapi-server-url-templating");
 var _apidomError = require("@swagger-api/apidom-error");
 var _empty = require("@swagger-api/apidom-reference/configuration/empty");
 var _constants = require("../constants.js");
@@ -104,7 +103,7 @@ function execute({
     http,
     ...extras
   });
-  if (request.body && ((0, _isPlainObject.isPlainObject)(request.body) || Array.isArray(request.body))) {
+  if (request.body && ((0, _ramdaAdjunct.isPlainObject)(request.body) || Array.isArray(request.body))) {
     request.body = JSON.stringify(request.body);
   }
 
@@ -325,17 +324,18 @@ function oas3BaseUrl({
     [selectedServerObj] = servers;
     selectedServerUrl = selectedServerObj.url;
   }
-  if (selectedServerUrl.includes('{')) {
-    // do variable substitution
-    const varNames = extractServerVariableNames(selectedServerUrl);
-    varNames.forEach(variable => {
-      if (selectedServerObj.variables && selectedServerObj.variables[variable]) {
-        // variable is defined in server
-        const variableDefinition = selectedServerObj.variables[variable];
-        const variableValue = serverVariables[variable] || variableDefinition.default;
-        const re = new RegExp(`{${(0, _ramdaAdjunct.escapeRegExp)(variable)}}`, 'g');
-        selectedServerUrl = selectedServerUrl.replace(re, variableValue);
-      }
+  if ((0, _openapiServerUrlTemplating.test)(selectedServerUrl, {
+    strict: true
+  })) {
+    const selectedServerVariables = Object.entries({
+      ...selectedServerObj.variables
+    }).reduce((acc, [serverVariableName, serverVariable]) => {
+      acc[serverVariableName] = serverVariable.default;
+      return acc;
+    }, {});
+    selectedServerUrl = (0, _openapiServerUrlTemplating.substitute)(selectedServerUrl, {
+      ...selectedServerVariables,
+      ...serverVariables
     });
   }
   return buildOas3UrlWithContext(selectedServerUrl, contextUrl);
@@ -357,10 +357,6 @@ function buildOas3UrlWithContext(ourUrl = '', contextUrl = '') {
   }
   return res[res.length - 1] === '/' ? res.slice(0, -1) : res;
 }
-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 )
 function swagger2BaseUrl({

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

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequ
 exports.__esModule = true;
 exports.applySecurities = applySecurities;
 exports.default = buildRequest;
-var _isPlainObject = require("is-plain-object");
+var _ramdaAdjunct = require("ramda-adjunct");
 var _btoaNode = _interopRequireDefault(require("../../helpers/btoa.node.js"));
 // This function runs after the common function,
 // `src/execute/index.js#buildRequest`
@@ -49,7 +49,7 @@ function buildRequest(options, req) {
   if (!options.responseContentType && operation.responses) {
     const mediaTypes = Object.entries(operation.responses).filter(([key, value]) => {
       const code = parseInt(key, 10);
-      return code >= 200 && code < 300 && (0, _isPlainObject.isPlainObject)(value.content);
+      return code >= 200 && code < 300 && (0, _ramdaAdjunct.isPlainObject)(value.content);
     }).reduce((acc, [, value]) => acc.concat(Object.keys(value.content)), []);
     if (mediaTypes.length > 0) {
       req.headers.accept = mediaTypes.join(', ');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "swagger-client",
-  "version": "3.28.1",
+  "version": "3.28.2",
   "description": "SwaggerJS - a collection of interfaces for OAI specs",
   "browser": {
     "./src/helpers/btoa.node.js": "./src/helpers/btoa.browser.js",
@@ -73,19 +73,19 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@babel/runtime-corejs3": "^7.22.15",
-    "@swagger-api/apidom-core": ">=1.0.0-alpha.3 <1.0.0-beta.0",
-    "@swagger-api/apidom-error": ">=1.0.0-alpha.1 <1.0.0-beta.0",
-    "@swagger-api/apidom-json-pointer": ">=1.0.0-alpha.3 <1.0.0-beta.0",
-    "@swagger-api/apidom-ns-openapi-3-1": ">=1.0.0-alpha.3 <1.0.0-beta.0",
-    "@swagger-api/apidom-reference": ">=1.0.0-alpha.3 <1.0.0-beta.0",
+    "@swagger-api/apidom-core": ">=1.0.0-alpha.5 <1.0.0-beta.0",
+    "@swagger-api/apidom-error": ">=1.0.0-alpha.5 <1.0.0-beta.0",
+    "@swagger-api/apidom-json-pointer": ">=1.0.0-alpha.5 <1.0.0-beta.0",
+    "@swagger-api/apidom-ns-openapi-3-1": ">=1.0.0-alpha.5 <1.0.0-beta.0",
+    "@swagger-api/apidom-reference": ">=1.0.0-alpha.5 <1.0.0-beta.0",
     "cookie": "~0.6.0",
     "deepmerge": "~4.3.0",
     "fast-json-patch": "^3.0.0-1",
-    "is-plain-object": "^5.0.0",
     "js-yaml": "^4.1.0",
     "node-abort-controller": "^3.1.1",
     "node-fetch-commonjs": "^3.3.2",
     "openapi-path-templating": "^1.5.1",
+    "openapi-server-url-templating": "^1.0.0",
     "qs": "^6.10.2",
     "ramda-adjunct": "^5.0.0",
     "traverse": "=0.6.8"
@@ -107,7 +107,7 @@
     "eslint-plugin-import": "=2.29.1",
     "eslint-plugin-prettier": "=5.1.3",
     "expect": "^29.0.3",
-    "glob": "=10.3.15",
+    "glob": "=10.4.1",
     "husky": "^9.0.11",
     "inspectpack": "=4.7.1",
     "install": "=0.13.0",
@@ -115,7 +115,7 @@
     "jest-environment-jsdom": "^29.0.3",
     "json-loader": "=0.5.7",
     "license-checker": "=25.0.1",
-    "lint-staged": "=15.2.2",
+    "lint-staged": "=15.2.5",
     "lodash": "^4.17.21",
     "npm-run-all": "=4.1.5",
     "prettier": "^3.1.1",