swagger-client 3.27.9 → 3.28.1

package/lib/resolver/apidom/reference/resolve/resolvers/http-swagger-client/index.js

@@ -7,66 +7,68 @@ var _empty = require("@swagger-api/apidom-reference/configuration/empty");
 require("../../../../../../helpers/fetch-polyfill.node.js");
 require("../../../../../../helpers/abortcontroller-polyfill.node.js");
 var _index = _interopRequireDefault(require("../../../../../../http/index.js"));
-const HttpResolverSwaggerClient = _empty.HttpResolver.compose({
-  props: {
-    name: 'http-swagger-client',
-    swaggerHTTPClient: _index.default,
-    swaggerHTTPClientConfig: {}
-  },
-  init({
-    swaggerHTTPClient = this.swaggerHTTPClient
+class HTTPResolverSwaggerClient extends _empty.HTTPResolver {
+  swaggerHTTPClient = _index.default;
+  swaggerHTTPClientConfig;
+  constructor({
+    swaggerHTTPClient = _index.default,
+    swaggerHTTPClientConfig = {},
+    ...rest
   } = {}) {
+    super({
+      ...rest,
+      name: 'http-swagger-client'
+    });
     this.swaggerHTTPClient = swaggerHTTPClient;
-  },
-  methods: {
-    getHttpClient() {
-      return this.swaggerHTTPClient;
-    },
-    async read(file) {
-      const client = this.getHttpClient();
-      const controller = new AbortController();
-      const {
-        signal
-      } = controller;
-      const timeoutID = setTimeout(() => {
-        controller.abort();
-      }, this.timeout);
-      const credentials = this.getHttpClient().withCredentials || this.withCredentials ? 'include' : 'same-origin';
-      const redirect = this.redirects === 0 ? 'error' : 'follow';
-      const follow = this.redirects > 0 ? this.redirects : undefined;
-      try {
-        const response = await client({
-          url: file.uri,
-          signal,
-          userFetch: async (resource, options) => {
-            let res = await fetch(resource, options);
-            try {
-              // undici supports mutations
-              res.headers.delete('Content-Type');
-            } catch {
-              // Fetch API has guards which prevent mutations
-              res = new Response(res.body, {
-                ...res,
-                headers: new Headers(res.headers)
-              });
-              res.headers.delete('Content-Type');
-            }
-            return res;
-          },
-          credentials,
-          redirect,
-          follow,
-          ...this.swaggerHTTPClientConfig
-        });
-        return response.text.arrayBuffer();
-      } catch (error) {
-        throw new _empty.ResolverError(`Error downloading "${file.uri}"`, {
-          cause: error
-        });
-      } finally {
-        clearTimeout(timeoutID);
-      }
+    this.swaggerHTTPClientConfig = swaggerHTTPClientConfig;
+  }
+  getHttpClient() {
+    return this.swaggerHTTPClient;
+  }
+  async read(file) {
+    const client = this.getHttpClient();
+    const controller = new AbortController();
+    const {
+      signal
+    } = controller;
+    const timeoutID = setTimeout(() => {
+      controller.abort();
+    }, this.timeout);
+    const credentials = this.getHttpClient().withCredentials || this.withCredentials ? 'include' : 'same-origin';
+    const redirect = this.redirects === 0 ? 'error' : 'follow';
+    const follow = this.redirects > 0 ? this.redirects : undefined;
+    try {
+      const response = await client({
+        url: file.uri,
+        signal,
+        userFetch: async (resource, options) => {
+          let res = await fetch(resource, options);
+          try {
+            // undici supports mutations
+            res.headers.delete('Content-Type');
+          } catch {
+            // Fetch API has guards which prevent mutations
+            res = new Response(res.body, {
+              ...res,
+              headers: new Headers(res.headers)
+            });
+            res.headers.delete('Content-Type');
+          }
+          return res;
+        },
+        credentials,
+        redirect,
+        follow,
+        ...this.swaggerHTTPClientConfig
+      });
+      return response.text.arrayBuffer();
+    } catch (error) {
+      throw new _empty.ResolverError(`Error downloading "${file.uri}"`, {
+        cause: error
+      });
+    } finally {
+      clearTimeout(timeoutID);
     }
   }
-});
-var _default = exports.default = HttpResolverSwaggerClient;
+}
+var _default = exports.default = HTTPResolverSwaggerClient;

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

@@ -76,14 +76,14 @@ const resolveOpenAPI31Strategy = async options => {
     const fragmentElement = (0, _apidomJsonPointer.evaluate)(jsonPointer, openApiElement);
 
     // prepare reference set for dereferencing
-    const openApiElementReference = (0, _empty.Reference)({
+    const openApiElementReference = new _empty.Reference({
       uri: baseURI,
       value: openApiParseResultElement
     });
-    const refSet = (0, _empty.ReferenceSet)({
+    const refSet = new _empty.ReferenceSet({
       refs: [openApiElementReference]
     });
-    if (jsonPointer !== '') refSet.rootRef = null; // reset root reference as we want fragment to become the root reference
+    if (jsonPointer !== '') refSet.rootRef = undefined; // reset root reference as we want fragment to become the root reference
 
     // prepare ancestors; needed for cases where fragment is not OpenAPI element
     const ancestors = [new Set([fragmentElement])];
@@ -97,7 +97,7 @@ const resolveOpenAPI31Strategy = async options => {
          * then below baseURI check will make sure that constant HTTPS URL is used as baseURI.
          */
         baseURI: `${baseURI}${jsonPointerURI}`,
-        resolvers: [(0, _index.default)({
+        resolvers: [new _index.default({
           timeout: timeout || 10000,
           redirects: redirects || 10
         })],
@@ -107,30 +107,30 @@ const resolveOpenAPI31Strategy = async options => {
             responseInterceptor
           }
         },
-        strategies: [(0, _openapi.default)()]
+        strategies: [new _openapi.default()]
       },
       parse: {
         mediaType: _apidomNsOpenapi.mediaTypes.latest(),
-        parsers: [(0, _index4.default)({
+        parsers: [new _index4.default({
           allowEmpty: false,
           sourceMap: false
-        }), (0, _index5.default)({
+        }), new _index5.default({
           allowEmpty: false,
           sourceMap: false
-        }), (0, _index2.default)({
+        }), new _index2.default({
           allowEmpty: false,
           sourceMap: false
-        }), (0, _index3.default)({
+        }), new _index3.default({
           allowEmpty: false,
           sourceMap: false
-        }), (0, _binary.default)({
+        }), new _binary.default({
           allowEmpty: false,
           sourceMap: false
         })]
       },
       dereference: {
         maxDepth: 100,
-        strategies: [(0, _index6.default)({
+        strategies: [new _index6.default({
           allowMetaPatches,
           useCircularStructures,
           parameterMacro,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "swagger-client",
-  "version": "3.27.9",
+  "version": "3.28.1",
   "description": "SwaggerJS - a collection of interfaces for OAI specs",
   "browser": {
     "./src/helpers/btoa.node.js": "./src/helpers/btoa.browser.js",
@@ -71,9 +71,29 @@
     "json-refs"
   ],
   "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",
+    "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",
+    "qs": "^6.10.2",
+    "ramda-adjunct": "^5.0.0",
+    "traverse": "=0.6.8"
+  },
   "devDependencies": {
     "@babel/cli": "^7.21.0",
     "@babel/core": "^7.21.0",
+    "@babel/eslint-parser": "^7.24.5",
     "@babel/plugin-transform-runtime": "^7.21.0",
     "@babel/preset-env": "^7.20.2",
     "@babel/register": "^7.21.0",
@@ -87,7 +107,7 @@
     "eslint-plugin-import": "=2.29.1",
     "eslint-plugin-prettier": "=5.1.3",
     "expect": "^29.0.3",
-    "glob": "=10.3.12",
+    "glob": "=10.3.15",
     "husky": "^9.0.11",
     "inspectpack": "=4.7.1",
     "install": "=0.13.0",
@@ -99,7 +119,7 @@
     "lodash": "^4.17.21",
     "npm-run-all": "=4.1.5",
     "prettier": "^3.1.1",
-    "rimraf": "=5.0.5",
+    "rimraf": "=5.0.7",
     "source-map-explorer": "^2.5.3",
     "terser-webpack-plugin": "^5.0.3",
     "undici": "^5.28.4",
@@ -108,25 +128,6 @@
     "webpack-cli": "=5.1.4",
     "webpack-stats-plugin": "=1.1.3"
   },
-  "dependencies": {
-    "@babel/runtime-corejs3": "^7.22.15",
-    "@swagger-api/apidom-core": ">=0.99.2 <1.0.0",
-    "@swagger-api/apidom-error": ">=0.99.0 <1.0.0",
-    "@swagger-api/apidom-json-pointer": ">=0.99.2 <1.0.0",
-    "@swagger-api/apidom-ns-openapi-3-1": ">=0.99.2 <1.0.0",
-    "@swagger-api/apidom-reference": ">=0.99.2 <1.0.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",
-    "qs": "^6.10.2",
-    "ramda-adjunct": "^5.0.0",
-    "traverse": "=0.6.8"
-  },
   "overrides": {
     "@swagger-api/apidom-reference": {
       "@swagger-api/apidom-ns-asyncapi-2": "npm:-@0.0.1",

package/es/resolver/apidom/reference/dereference/strategies/openapi-3-1-swagger-client/utils/compose.js

@@ -1,5 +0,0 @@
-/* eslint-disable camelcase */
-import OpenApi3_1DereferenceStrategy from '@swagger-api/apidom-reference/dereference/strategies/openapi-3-1';
-const compose = OpenApi3_1DereferenceStrategy.compose.bind();
-export default compose;
-/* eslint-enable camelcase */

package/lib/resolver/apidom/reference/dereference/strategies/openapi-3-1-swagger-client/utils/compose.js

@@ -1,11 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault").default;
-exports.__esModule = true;
-exports.default = void 0;
-var _openapi = _interopRequireDefault(require("@swagger-api/apidom-reference/dereference/strategies/openapi-3-1"));
-/* eslint-disable camelcase */
-
-const compose = _openapi.default.compose.bind();
-var _default = exports.default = compose;
-/* eslint-enable camelcase */