swagger-client 3.23.1 → 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.23.1",
+  "version": "3.24.1",
   "description": "SwaggerJS - a collection of interfaces for OAI specs",
   "browser": {
     "./src/helpers/btoa.node.js": "./src/helpers/btoa.browser.js",
@@ -50,7 +50,7 @@
     "build:es": "cross-env BABEL_ENV=es babel src --out-dir es",
     "lint": "eslint src/ test/",
     "lint:fix": "npm run lint -- --fix",
-    "link:apidom": "npm link @swagger-api/apidom-core @swagger-api/apidom-error @swagger-api/apidom-reference @swagger-api/apidom-ns-openapi-3-1 @swagger-api/apidom-ns-openapi-3-0 @swagger-api/apidom-ns-json-schema-draft-4 @swagger-api/apidom-json-pointer",
+    "link:apidom": "npm link @swagger-api/apidom-core @swagger-api/apidom-error @swagger-api/apidom-reference @swagger-api/apidom-ns-openapi-2 @swagger-api/apidom-ns-openapi-3-0 @swagger-api/apidom-ns-openapi-3-1 @swagger-api/apidom-ns-json-schema-draft-4 @swagger-api/apidom-json-pointer",
     "test": "run-s test:unit:coverage test:artifact",
     "test:unit": "cross-env BABEL_ENV=commonjs jest --runInBand --config ./config/jest/jest.unit.config.js",
     "test:unit:coverage": "cross-env BABEL_ENV=commonjs jest --runInBand --config ./config/jest/jest.unit.coverage.config.js",
@@ -77,15 +77,15 @@
     "@babel/plugin-transform-runtime": "^7.21.0",
     "@babel/preset-env": "^7.20.2",
     "@babel/register": "^7.21.0",
-    "@commitlint/cli": "^17.0.0",
-    "@commitlint/config-conventional": "^17.0.0",
+    "@commitlint/cli": "^18.0.0",
+    "@commitlint/config-conventional": "^18.0.0",
     "babel-loader": "=9.1.3",
     "cross-env": "=7.0.3",
     "eslint": "^8.42.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-config-prettier": "=9.0.0",
-    "eslint-plugin-import": "=2.28.1",
-    "eslint-plugin-prettier": "=5.0.0",
+    "eslint-plugin-import": "=2.29.0",
+    "eslint-plugin-prettier": "=5.0.1",
     "expect": "^29.0.3",
     "glob": "=10.3.10",
     "husky": "^8.0.1",
@@ -95,24 +95,24 @@
     "jest-environment-jsdom": "^29.0.3",
     "json-loader": "=0.5.7",
     "license-checker": "=25.0.1",
-    "lint-staged": "=14.0.1",
+    "lint-staged": "=15.0.2",
     "lodash": "^4.17.21",
     "npm-run-all": "=4.1.5",
     "prettier": "^3.0.0",
     "rimraf": "=5.0.5",
     "source-map-explorer": "^2.5.3",
     "terser-webpack-plugin": "^5.0.3",
-    "webpack": "=5.88.2",
+    "webpack": "=5.89.0",
     "webpack-bundle-size-analyzer": "=3.1.0",
     "webpack-cli": "=5.1.4",
     "webpack-stats-plugin": "=1.1.3"
   },
   "dependencies": {
     "@babel/runtime-corejs3": "^7.22.15",
-    "@swagger-api/apidom-core": ">=0.77.0 <1.0.0",
-    "@swagger-api/apidom-json-pointer": ">=0.77.0 <1.0.0",
-    "@swagger-api/apidom-ns-openapi-3-1": ">=0.77.0 <1.0.0",
-    "@swagger-api/apidom-reference": ">=0.77.0 <1.0.0",
+    "@swagger-api/apidom-core": ">=0.82.0 <1.0.0",
+    "@swagger-api/apidom-json-pointer": ">=0.82.0 <1.0.0",
+    "@swagger-api/apidom-ns-openapi-3-1": ">=0.82.0 <1.0.0",
+    "@swagger-api/apidom-reference": ">=0.82.0 <1.0.0",
     "cookie": "~0.5.0",
     "deepmerge": "~4.3.0",
     "fast-json-patch": "^3.0.0-1",
@@ -127,11 +127,14 @@
   "overrides": {
     "@swagger-api/apidom-reference": {
       "@swagger-api/apidom-ns-asyncapi-2": "npm:-@0.0.1",
+      "@swagger-api/apidom-ns-openapi-2": "npm:-@0.0.1",
       "@swagger-api/apidom-parser-adapter-api-design-systems-json": "npm:-@0.0.1",
       "@swagger-api/apidom-parser-adapter-api-design-systems-yaml": "npm:-@0.0.1",
       "@swagger-api/apidom-parser-adapter-asyncapi-json-2": "npm:-@0.0.1",
       "@swagger-api/apidom-parser-adapter-asyncapi-yaml-2": "npm:-@0.0.1",
       "@swagger-api/apidom-parser-adapter-json": "npm:-@0.0.1",
+      "@swagger-api/apidom-parser-adapter-openapi-json-2": "npm:-@0.0.1",
+      "@swagger-api/apidom-parser-adapter-openapi-yaml-2": "npm:-@0.0.1",
       "@swagger-api/apidom-parser-adapter-openapi-json-3-0": "npm:-@0.0.1",
       "@swagger-api/apidom-parser-adapter-openapi-json-3-1": "npm:-@0.0.1",
       "@swagger-api/apidom-parser-adapter-openapi-yaml-3-0": "npm:-@0.0.1",