swagger-client 3.22.2 → 3.22.3

package/es/constants.js

@@ -1,2 +1,2 @@
-// eslint-disable-next-line import/prefer-default-export
-export const ACCEPT_HEADER_VALUE_FOR_DOCUMENTS = 'application/json, application/yaml';
+export const ACCEPT_HEADER_VALUE_FOR_DOCUMENTS = 'application/json, application/yaml';
+export const DEFAULT_BASE_URL = 'https://swagger.io';

package/es/execute/index.js

@@ -1,6 +1,7 @@
 import cookie from 'cookie';
 import { isPlainObject } from 'is-plain-object';
 import { url } from '@swagger-api/apidom-reference/configuration/empty';
+import { DEFAULT_BASE_URL } from '../constants.js';
 import stockHttp, { mergeInQueryOrForm } from '../http/index.js';
 import createError from '../specmap/lib/create-error.js';
 import SWAGGER2_PARAMETER_BUILDERS from './swagger2/parameter-builders.js';
@@ -20,7 +21,7 @@ const parseURIReference = uriReference => {
   try {
     return new URL(uriReference);
   } catch {
-    const parsedURL = new URL(uriReference, 'https://swagger.io');
+    const parsedURL = new URL(uriReference, DEFAULT_BASE_URL);
     const pathname = String(uriReference).startsWith('/') ? parsedURL.pathname : parsedURL.pathname.substring(1);
     return {
       hash: parsedURL.hash,

package/es/resolver/strategies/openapi-3-1-apidom/resolve.js

@@ -5,6 +5,7 @@ import { OpenApi3_1Element, mediaTypes } from '@swagger-api/apidom-ns-openapi-3-
 import { dereferenceApiDOM, url, ReferenceSet, Reference } from '@swagger-api/apidom-reference/configuration/empty';
 import BinaryParser from '@swagger-api/apidom-reference/parse/parsers/binary';
 import OpenApi3_1ResolveStrategy from '@swagger-api/apidom-reference/resolve/strategies/openapi-3-1';
+import { DEFAULT_BASE_URL } from '../../../constants.js';
 import * as optionsUtil from '../../utils/options.js';
 import normalize from './normalize.js';
 import HttpResolverSwaggerClient from '../../apidom/reference/resolve/resolvers/http-swagger-client/index.js';
@@ -34,7 +35,7 @@ const resolveOpenAPI31Strategy = async options => {
     } = resolveOpenAPI31Strategy;
 
     // determining BaseURI
-    const cwd = url.isHttpUrl(url.cwd()) ? url.cwd() : 'https://smartbear.com/';
+    const cwd = url.isHttpUrl(url.cwd()) ? url.cwd() : DEFAULT_BASE_URL;
     const retrievalURI = optionsUtil.retrievalURI(options);
     const baseURI = url.resolve(cwd, retrievalURI);
 

package/es/specmap/helpers.js

@@ -1,5 +1,6 @@
 import traverse from 'traverse';
 import { url } from '@swagger-api/apidom-reference/configuration/empty';
+import { DEFAULT_BASE_URL } from '../constants.js';
 
 // This will match if the direct parent's key exactly matches an item.
 const freelyNamedKeyParents = ['properties'];
@@ -55,10 +56,10 @@ export function absolutifyPointer(pointer, baseUrl) {
   const safeUrlPart = urlPart !== null && urlPart !== void 0 ? urlPart : '';
   let newRefUrlPart;
   if (!url.isHttpUrl(safeBaseUrl)) {
-    const cwd = url.cwd();
-    const absoluteBaseUrl = url.resolve(cwd, safeBaseUrl);
+    const absoluteBaseUrl = url.resolve(DEFAULT_BASE_URL, safeBaseUrl);
     const absoluteRefUrlPart = url.resolve(absoluteBaseUrl, safeUrlPart);
-    newRefUrlPart = absoluteRefUrlPart.replace(cwd, '');
+    const rawRefUrlPart = absoluteRefUrlPart.replace(DEFAULT_BASE_URL, '');
+    newRefUrlPart = safeUrlPart.startsWith('/') ? rawRefUrlPart : rawRefUrlPart.substring(1);
   } else {
     newRefUrlPart = url.resolve(safeBaseUrl, safeUrlPart);
   }

package/lib/constants.js

@@ -1,7 +1,8 @@
 "use strict";
 
 exports.__esModule = true;
-exports.ACCEPT_HEADER_VALUE_FOR_DOCUMENTS = void 0;
-// eslint-disable-next-line import/prefer-default-export
+exports.DEFAULT_BASE_URL = exports.ACCEPT_HEADER_VALUE_FOR_DOCUMENTS = void 0;
 const ACCEPT_HEADER_VALUE_FOR_DOCUMENTS = 'application/json, application/yaml';
-exports.ACCEPT_HEADER_VALUE_FOR_DOCUMENTS = ACCEPT_HEADER_VALUE_FOR_DOCUMENTS;
+exports.ACCEPT_HEADER_VALUE_FOR_DOCUMENTS = ACCEPT_HEADER_VALUE_FOR_DOCUMENTS;
+const DEFAULT_BASE_URL = 'https://swagger.io';
+exports.DEFAULT_BASE_URL = DEFAULT_BASE_URL;

package/lib/execute/index.js

@@ -10,6 +10,7 @@ exports.self = void 0;
 var _cookie = _interopRequireDefault(require("cookie"));
 var _isPlainObject = require("is-plain-object");
 var _empty = require("@swagger-api/apidom-reference/configuration/empty");
+var _constants = require("../constants.js");
 var _index = _interopRequireWildcard(require("../http/index.js"));
 var _createError = _interopRequireDefault(require("../specmap/lib/create-error.js"));
 var _parameterBuilders = _interopRequireDefault(require("./swagger2/parameter-builders.js"));
@@ -29,7 +30,7 @@ const parseURIReference = uriReference => {
   try {
     return new URL(uriReference);
   } catch {
-    const parsedURL = new URL(uriReference, 'https://swagger.io');
+    const parsedURL = new URL(uriReference, _constants.DEFAULT_BASE_URL);
     const pathname = String(uriReference).startsWith('/') ? parsedURL.pathname : parsedURL.pathname.substring(1);
     return {
       hash: parsedURL.hash,

package/lib/resolver/strategies/openapi-3-1-apidom/resolve.js

@@ -10,6 +10,7 @@ var _apidomNsOpenapi = require("@swagger-api/apidom-ns-openapi-3-1");
 var _empty = require("@swagger-api/apidom-reference/configuration/empty");
 var _binary = _interopRequireDefault(require("@swagger-api/apidom-reference/parse/parsers/binary"));
 var _openapi = _interopRequireDefault(require("@swagger-api/apidom-reference/resolve/strategies/openapi-3-1"));
+var _constants = require("../../../constants.js");
 var optionsUtil = _interopRequireWildcard(require("../../utils/options.js"));
 var _normalize = _interopRequireDefault(require("./normalize.js"));
 var _index = _interopRequireDefault(require("../../apidom/reference/resolve/resolvers/http-swagger-client/index.js"));
@@ -41,7 +42,7 @@ const resolveOpenAPI31Strategy = async options => {
     } = resolveOpenAPI31Strategy;
 
     // determining BaseURI
-    const cwd = _empty.url.isHttpUrl(_empty.url.cwd()) ? _empty.url.cwd() : 'https://smartbear.com/';
+    const cwd = _empty.url.isHttpUrl(_empty.url.cwd()) ? _empty.url.cwd() : _constants.DEFAULT_BASE_URL;
     const retrievalURI = optionsUtil.retrievalURI(options);
     const baseURI = _empty.url.resolve(cwd, retrievalURI);
 

package/lib/specmap/helpers.js

@@ -7,6 +7,7 @@ exports.generateAbsoluteRefPatches = generateAbsoluteRefPatches;
 exports.isFreelyNamed = isFreelyNamed;
 var _traverse = _interopRequireDefault(require("traverse"));
 var _empty = require("@swagger-api/apidom-reference/configuration/empty");
+var _constants = require("../constants.js");
 // This will match if the direct parent's key exactly matches an item.
 const freelyNamedKeyParents = ['properties'];
 
@@ -61,10 +62,10 @@ function absolutifyPointer(pointer, baseUrl) {
   const safeUrlPart = urlPart != null ? urlPart : '';
   let newRefUrlPart;
   if (!_empty.url.isHttpUrl(safeBaseUrl)) {
-    const cwd = _empty.url.cwd();
-    const absoluteBaseUrl = _empty.url.resolve(cwd, safeBaseUrl);
+    const absoluteBaseUrl = _empty.url.resolve(_constants.DEFAULT_BASE_URL, safeBaseUrl);
     const absoluteRefUrlPart = _empty.url.resolve(absoluteBaseUrl, safeUrlPart);
-    newRefUrlPart = absoluteRefUrlPart.replace(cwd, '');
+    const rawRefUrlPart = absoluteRefUrlPart.replace(_constants.DEFAULT_BASE_URL, '');
+    newRefUrlPart = safeUrlPart.startsWith('/') ? rawRefUrlPart : rawRefUrlPart.substring(1);
   } else {
     newRefUrlPart = _empty.url.resolve(safeBaseUrl, safeUrlPart);
   }

package/package.json

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