swagger-client 3.24.0 → 3.24.1

package/es/helpers/index.js

@@ -3,4 +3,5 @@ export { default as findOperation } from './find-operation.js';
 export { default as getOperationRaw } from './get-operation-raw.js';
 export { default as opId } from './op-id.js';
 export { default as idFromPathMethod } from './id-from-path-method/index.js';
-export { default as idFromPathMethodLegacy } from './id-from-path-method/legacy.js';
+export { default as idFromPathMethodLegacy } from './id-from-path-method/legacy.js';
+export { default as isHttpUrl } from './is-http-url.js';

package/es/helpers/is-http-url.js

@@ -0,0 +1,5 @@
+import { url } from '@swagger-api/apidom-reference/configuration/empty';
+const {
+  isHttpUrl
+} = url;
+export default isHttpUrl;

package/es/index.js

@@ -8,7 +8,8 @@ import openApi30ResolveStrategy from './resolver/strategies/openapi-3-0/index.js
 import openApi31ApiDOMResolveStrategy from './resolver/strategies/openapi-3-1-apidom/index.js';
 import { makeApisTagOperation } from './interfaces.js';
 import { execute, buildRequest, baseUrl } from './execute/index.js';
-import { opId } from './helpers/index.js';
+import { opId, isHttpUrl } from './helpers/index.js';
+import { isOpenAPI2, isOpenAPI3 } from './helpers/openapi-predicates.js';
 import HttpResolverSwaggerClient from './resolver/apidom/reference/resolve/resolvers/http-swagger-client/index.js';
 import JsonParser from './resolver/apidom/reference/parse/parsers/json/index.js';
 import YamlParser from './resolver/apidom/reference/parse/parsers/yaml-1-2/index.js';
@@ -123,8 +124,7 @@ Swagger.prototype.applyDefaults = function applyDefaults() {
     spec
   } = this;
   const specUrl = this.url;
-  // TODO: OAS3: support servers here
-  if (specUrl && specUrl.startsWith('http')) {
+  if (isOpenAPI2(spec) && isHttpUrl(specUrl)) {
     const parsed = new URL(specUrl);
     if (!spec.host) {
       spec.host = parsed.host;
@@ -135,6 +135,12 @@ Swagger.prototype.applyDefaults = function applyDefaults() {
     if (!spec.basePath) {
       spec.basePath = '/';
     }
+  } else if (isOpenAPI3(spec) && isHttpUrl(specUrl)) {
+    if (!spec.servers) {
+      spec.servers = [{
+        url: specUrl
+      }];
+    }
   }
 };
 

package/lib/helpers/index.js

@@ -2,7 +2,7 @@
 
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault").default;
 exports.__esModule = true;
-exports.opId = exports.idFromPathMethodLegacy = exports.idFromPathMethod = exports.getOperationRaw = exports.findOperation = exports.eachOperation = void 0;
+exports.opId = exports.isHttpUrl = exports.idFromPathMethodLegacy = exports.idFromPathMethod = exports.getOperationRaw = exports.findOperation = exports.eachOperation = void 0;
 var _eachOperation = _interopRequireDefault(require("./each-operation.js"));
 exports.eachOperation = _eachOperation.default;
 var _findOperation = _interopRequireDefault(require("./find-operation.js"));
@@ -14,4 +14,6 @@ exports.opId = _opId.default;
 var _index = _interopRequireDefault(require("./id-from-path-method/index.js"));
 exports.idFromPathMethod = _index.default;
 var _legacy = _interopRequireDefault(require("./id-from-path-method/legacy.js"));
-exports.idFromPathMethodLegacy = _legacy.default;
+exports.idFromPathMethodLegacy = _legacy.default;
+var _isHttpUrl = _interopRequireDefault(require("./is-http-url.js"));
+exports.isHttpUrl = _isHttpUrl.default;

package/lib/helpers/is-http-url.js

@@ -0,0 +1,9 @@
+"use strict";
+
+exports.__esModule = true;
+exports.default = void 0;
+var _empty = require("@swagger-api/apidom-reference/configuration/empty");
+const {
+  isHttpUrl
+} = _empty.url;
+var _default = exports.default = isHttpUrl;

package/lib/index.js

@@ -14,6 +14,7 @@ var _index7 = _interopRequireDefault(require("./resolver/strategies/openapi-3-1-
 var _interfaces = require("./interfaces.js");
 var _index8 = require("./execute/index.js");
 var _index9 = require("./helpers/index.js");
+var _openapiPredicates = require("./helpers/openapi-predicates.js");
 var _index10 = _interopRequireDefault(require("./resolver/apidom/reference/resolve/resolvers/http-swagger-client/index.js"));
 var _index11 = _interopRequireDefault(require("./resolver/apidom/reference/parse/parsers/json/index.js"));
 var _index12 = _interopRequireDefault(require("./resolver/apidom/reference/parse/parsers/yaml-1-2/index.js"));
@@ -134,8 +135,7 @@ Swagger.prototype.applyDefaults = function applyDefaults() {
     spec
   } = this;
   const specUrl = this.url;
-  // TODO: OAS3: support servers here
-  if (specUrl && specUrl.startsWith('http')) {
+  if ((0, _openapiPredicates.isOpenAPI2)(spec) && (0, _index9.isHttpUrl)(specUrl)) {
     const parsed = new URL(specUrl);
     if (!spec.host) {
       spec.host = parsed.host;
@@ -146,6 +146,12 @@ Swagger.prototype.applyDefaults = function applyDefaults() {
     if (!spec.basePath) {
       spec.basePath = '/';
     }
+  } else if ((0, _openapiPredicates.isOpenAPI3)(spec) && (0, _index9.isHttpUrl)(specUrl)) {
+    if (!spec.servers) {
+      spec.servers = [{
+        url: specUrl
+      }];
+    }
   }
 };
 

package/package.json

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