swagger-client 3.19.10 → 3.19.11

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

@@ -51,7 +51,9 @@ const OpenApi3_1SwaggerClientDereferenceVisitor = OpenApi3_1DereferenceVisitor.c
           return false;
         }
         const reference = await this.toReference(referenceElement.$ref.toValue());
-        const retrievalURI = reference.uri;
+        const {
+          uri: retrievalURI
+        } = reference;
         const $refBaseURI = url.resolve(retrievalURI, referenceElement.$ref.toValue());
         this.indirections.push(referenceElement);
         const jsonPointer = uriToPointer($refBaseURI);
@@ -188,7 +190,9 @@ const OpenApi3_1SwaggerClientDereferenceVisitor = OpenApi3_1DereferenceVisitor.c
           return undefined;
         }
         const reference = await this.toReference(pathItemElement.$ref.toValue());
-        const retrievalURI = reference.uri;
+        const {
+          uri: retrievalURI
+        } = reference;
         const $refBaseURI = url.resolve(retrievalURI, pathItemElement.$ref.toValue());
         this.indirections.push(pathItemElement);
         const jsonPointer = uriToPointer($refBaseURI);
@@ -310,9 +314,7 @@ const OpenApi3_1SwaggerClientDereferenceVisitor = OpenApi3_1DereferenceVisitor.c
         }
 
         // compute baseURI using rules around $id and $ref keywords
-        let {
-          reference
-        } = this;
+        let reference = await this.toReference(url.unsanitize(this.reference.uri));
         let {
           uri: retrievalURI
         } = reference;

package/lib/resolver/apidom/reference/dereference/strategies/openapi-3-1-swagger-client/visitors/all-of.js

@@ -22,10 +22,10 @@ const AllOfVisitor = (0, _compose.default)({
 
         // collect error and return if allOf keyword is not an array
         if (!(0, _apidomCore.isArrayElement)(schemaElement.allOf)) {
-          var _this$options$derefer, _this$options$derefer2, _this$options$derefer3;
+          var _this$options$derefer, _this$options$derefer2;
           const error = new TypeError('allOf must be an array');
           error.fullPath = [...(0, _toPath.default)([...ancestors, parent, schemaElement]), 'allOf'];
-          (_this$options$derefer = this.options.dereference.dereferenceOpts) === null || _this$options$derefer === void 0 ? void 0 : (_this$options$derefer2 = _this$options$derefer.errors) === null || _this$options$derefer2 === void 0 ? void 0 : (_this$options$derefer3 = _this$options$derefer2.push) === null || _this$options$derefer3 === void 0 ? void 0 : _this$options$derefer3.call(_this$options$derefer2, error);
+          (_this$options$derefer = this.options.dereference.dereferenceOpts) === null || _this$options$derefer === void 0 || (_this$options$derefer = _this$options$derefer.errors) === null || _this$options$derefer === void 0 || (_this$options$derefer2 = _this$options$derefer.push) === null || _this$options$derefer2 === void 0 ? void 0 : _this$options$derefer2.call(_this$options$derefer, error);
           return undefined;
         }
 
@@ -37,10 +37,10 @@ const AllOfVisitor = (0, _compose.default)({
         // collect errors if allOf keyword contains anything else than Schema Object
         const includesSchemaElementOnly = schemaElement.allOf.content.every(_apidomNsOpenapi.isSchemaElement);
         if (!includesSchemaElementOnly) {
-          var _this$options$derefer4, _this$options$derefer5, _this$options$derefer6;
+          var _this$options$derefer3, _this$options$derefer4;
           const error = new TypeError('Elements in allOf must be objects');
           error.fullPath = [...(0, _toPath.default)([...ancestors, parent, schemaElement]), 'allOf'];
-          (_this$options$derefer4 = this.options.dereference.dereferenceOpts) === null || _this$options$derefer4 === void 0 ? void 0 : (_this$options$derefer5 = _this$options$derefer4.errors) === null || _this$options$derefer5 === void 0 ? void 0 : (_this$options$derefer6 = _this$options$derefer5.push) === null || _this$options$derefer6 === void 0 ? void 0 : _this$options$derefer6.call(_this$options$derefer5, error);
+          (_this$options$derefer3 = this.options.dereference.dereferenceOpts) === null || _this$options$derefer3 === void 0 || (_this$options$derefer3 = _this$options$derefer3.errors) === null || _this$options$derefer3 === void 0 || (_this$options$derefer4 = _this$options$derefer3.push) === null || _this$options$derefer4 === void 0 ? void 0 : _this$options$derefer4.call(_this$options$derefer3, error);
           return undefined;
         }
         const mergedSchemaElement = _apidomCore.deepmerge.all([...schemaElement.allOf.content, schemaElement]);

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

@@ -57,7 +57,9 @@ const OpenApi3_1SwaggerClientDereferenceVisitor = _openapi.OpenApi3_1Dereference
           return false;
         }
         const reference = await this.toReference(referenceElement.$ref.toValue());
-        const retrievalURI = reference.uri;
+        const {
+          uri: retrievalURI
+        } = reference;
         const $refBaseURI = _empty.url.resolve(retrievalURI, referenceElement.$ref.toValue());
         this.indirections.push(referenceElement);
         const jsonPointer = (0, _apidomJsonPointer.uriToPointer)($refBaseURI);
@@ -158,7 +160,7 @@ const OpenApi3_1SwaggerClientDereferenceVisitor = _openapi.OpenApi3_1Dereference
         // transclude the element for a fragment
         return fragment;
       } catch (error) {
-        var _this$basePath2, _this$options$derefer, _this$options$derefer2, _this$options$derefer3;
+        var _this$basePath2, _this$options$derefer, _this$options$derefer2;
         const rootCause = (0, _getRootCause.default)(error);
         const wrappedError = wrapError(rootCause, {
           baseDoc: this.reference.uri,
@@ -166,7 +168,7 @@ const OpenApi3_1SwaggerClientDereferenceVisitor = _openapi.OpenApi3_1Dereference
           pointer: (0, _apidomJsonPointer.uriToPointer)(referenceElement.$ref.toValue()),
           fullPath: (_this$basePath2 = this.basePath) !== null && _this$basePath2 !== void 0 ? _this$basePath2 : [...(0, _toPath.default)([...ancestors, parent, referenceElement]), '$ref']
         });
-        (_this$options$derefer = this.options.dereference.dereferenceOpts) === null || _this$options$derefer === void 0 ? void 0 : (_this$options$derefer2 = _this$options$derefer.errors) === null || _this$options$derefer2 === void 0 ? void 0 : (_this$options$derefer3 = _this$options$derefer2.push) === null || _this$options$derefer3 === void 0 ? void 0 : _this$options$derefer3.call(_this$options$derefer2, wrappedError);
+        (_this$options$derefer = this.options.dereference.dereferenceOpts) === null || _this$options$derefer === void 0 || (_this$options$derefer = _this$options$derefer.errors) === null || _this$options$derefer === void 0 || (_this$options$derefer2 = _this$options$derefer.push) === null || _this$options$derefer2 === void 0 ? void 0 : _this$options$derefer2.call(_this$options$derefer, wrappedError);
         return undefined;
       }
     },
@@ -196,7 +198,9 @@ const OpenApi3_1SwaggerClientDereferenceVisitor = _openapi.OpenApi3_1Dereference
           return undefined;
         }
         const reference = await this.toReference(pathItemElement.$ref.toValue());
-        const retrievalURI = reference.uri;
+        const {
+          uri: retrievalURI
+        } = reference;
         const $refBaseURI = _empty.url.resolve(retrievalURI, pathItemElement.$ref.toValue());
         this.indirections.push(pathItemElement);
         const jsonPointer = (0, _apidomJsonPointer.uriToPointer)($refBaseURI);
@@ -285,7 +289,7 @@ const OpenApi3_1SwaggerClientDereferenceVisitor = _openapi.OpenApi3_1Dereference
         // transclude referencing element with merged referenced element
         return mergedPathItemElement;
       } catch (error) {
-        var _this$basePath4, _this$options$derefer4, _this$options$derefer5, _this$options$derefer6;
+        var _this$basePath4, _this$options$derefer3, _this$options$derefer4;
         const rootCause = (0, _getRootCause.default)(error);
         const wrappedError = wrapError(rootCause, {
           baseDoc: this.reference.uri,
@@ -293,7 +297,7 @@ const OpenApi3_1SwaggerClientDereferenceVisitor = _openapi.OpenApi3_1Dereference
           pointer: (0, _apidomJsonPointer.uriToPointer)(pathItemElement.$ref.toValue()),
           fullPath: (_this$basePath4 = this.basePath) !== null && _this$basePath4 !== void 0 ? _this$basePath4 : [...(0, _toPath.default)([...ancestors, parent, pathItemElement]), '$ref']
         });
-        (_this$options$derefer4 = this.options.dereference.dereferenceOpts) === null || _this$options$derefer4 === void 0 ? void 0 : (_this$options$derefer5 = _this$options$derefer4.errors) === null || _this$options$derefer5 === void 0 ? void 0 : (_this$options$derefer6 = _this$options$derefer5.push) === null || _this$options$derefer6 === void 0 ? void 0 : _this$options$derefer6.call(_this$options$derefer5, wrappedError);
+        (_this$options$derefer3 = this.options.dereference.dereferenceOpts) === null || _this$options$derefer3 === void 0 || (_this$options$derefer3 = _this$options$derefer3.errors) === null || _this$options$derefer3 === void 0 || (_this$options$derefer4 = _this$options$derefer3.push) === null || _this$options$derefer4 === void 0 ? void 0 : _this$options$derefer4.call(_this$options$derefer3, wrappedError);
         return undefined;
       }
     },
@@ -320,9 +324,7 @@ const OpenApi3_1SwaggerClientDereferenceVisitor = _openapi.OpenApi3_1Dereference
         }
 
         // compute baseURI using rules around $id and $ref keywords
-        let {
-          reference
-        } = this;
+        let reference = await this.toReference(_empty.url.unsanitize(this.reference.uri));
         let {
           uri: retrievalURI
         } = reference;
@@ -471,14 +473,14 @@ const OpenApi3_1SwaggerClientDereferenceVisitor = _openapi.OpenApi3_1Dereference
         // transclude referencing element with merged referenced element
         return mergedSchemaElement;
       } catch (error) {
-        var _this$basePath6, _this$options$derefer7, _this$options$derefer8, _this$options$derefer9;
+        var _this$basePath6, _this$options$derefer5, _this$options$derefer6;
         const rootCause = (0, _getRootCause.default)(error);
         const wrappedError = new _index.SchemaRefError(`Could not resolve reference: ${rootCause.message}`, {
           baseDoc: this.reference.uri,
           $ref: referencingElement.$ref.toValue(),
           fullPath: (_this$basePath6 = this.basePath) !== null && _this$basePath6 !== void 0 ? _this$basePath6 : [...(0, _toPath.default)([...ancestors, parent, referencingElement]), '$ref']
         }, rootCause);
-        (_this$options$derefer7 = this.options.dereference.dereferenceOpts) === null || _this$options$derefer7 === void 0 ? void 0 : (_this$options$derefer8 = _this$options$derefer7.errors) === null || _this$options$derefer8 === void 0 ? void 0 : (_this$options$derefer9 = _this$options$derefer8.push) === null || _this$options$derefer9 === void 0 ? void 0 : _this$options$derefer9.call(_this$options$derefer8, wrappedError);
+        (_this$options$derefer5 = this.options.dereference.dereferenceOpts) === null || _this$options$derefer5 === void 0 || (_this$options$derefer5 = _this$options$derefer5.errors) === null || _this$options$derefer5 === void 0 || (_this$options$derefer6 = _this$options$derefer5.push) === null || _this$options$derefer6 === void 0 ? void 0 : _this$options$derefer6.call(_this$options$derefer5, wrappedError);
         return undefined;
       }
     },
@@ -494,14 +496,14 @@ const OpenApi3_1SwaggerClientDereferenceVisitor = _openapi.OpenApi3_1Dereference
       try {
         return await _openapi.OpenApi3_1DereferenceVisitor.compose.methods.ExampleElement.call(this, exampleElement, key, parent, path, ancestors);
       } catch (error) {
-        var _exampleElement$exter, _this$basePath7, _this$options$derefer10, _this$options$derefer11, _this$options$derefer12;
+        var _exampleElement$exter, _this$basePath7, _this$options$derefer7, _this$options$derefer8;
         const rootCause = (0, _getRootCause.default)(error);
         const wrappedError = wrapError(rootCause, {
           baseDoc: this.reference.uri,
           externalValue: (_exampleElement$exter = exampleElement.externalValue) === null || _exampleElement$exter === void 0 ? void 0 : _exampleElement$exter.toValue(),
           fullPath: (_this$basePath7 = this.basePath) !== null && _this$basePath7 !== void 0 ? _this$basePath7 : [...(0, _toPath.default)([...ancestors, parent, exampleElement]), 'externalValue']
         });
-        (_this$options$derefer10 = this.options.dereference.dereferenceOpts) === null || _this$options$derefer10 === void 0 ? void 0 : (_this$options$derefer11 = _this$options$derefer10.errors) === null || _this$options$derefer11 === void 0 ? void 0 : (_this$options$derefer12 = _this$options$derefer11.push) === null || _this$options$derefer12 === void 0 ? void 0 : _this$options$derefer12.call(_this$options$derefer11, wrappedError);
+        (_this$options$derefer7 = this.options.dereference.dereferenceOpts) === null || _this$options$derefer7 === void 0 || (_this$options$derefer7 = _this$options$derefer7.errors) === null || _this$options$derefer7 === void 0 || (_this$options$derefer8 = _this$options$derefer7.push) === null || _this$options$derefer8 === void 0 ? void 0 : _this$options$derefer8.call(_this$options$derefer7, wrappedError);
         return undefined;
       }
     }

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

@@ -34,12 +34,12 @@ const ParameterMacroVisitor = (0, _compose.default)({
           const macroValue = this.parameterMacro(pojoOperation, pojoParameter);
           parameterElement.set('default', macroValue);
         } catch (error) {
-          var _this$options$derefer, _this$options$derefer2, _this$options$derefer3;
+          var _this$options$derefer, _this$options$derefer2;
           const macroError = new Error(error, {
             cause: error
           });
           macroError.fullPath = (0, _toPath.default)([...ancestors, parent]);
-          (_this$options$derefer = this.options.dereference.dereferenceOpts) === null || _this$options$derefer === void 0 ? void 0 : (_this$options$derefer2 = _this$options$derefer.errors) === null || _this$options$derefer2 === void 0 ? void 0 : (_this$options$derefer3 = _this$options$derefer2.push) === null || _this$options$derefer3 === void 0 ? void 0 : _this$options$derefer3.call(_this$options$derefer2, macroError);
+          (_this$options$derefer = this.options.dereference.dereferenceOpts) === null || _this$options$derefer === void 0 || (_this$options$derefer = _this$options$derefer.errors) === null || _this$options$derefer === void 0 || (_this$options$derefer2 = _this$options$derefer.push) === null || _this$options$derefer2 === void 0 ? void 0 : _this$options$derefer2.call(_this$options$derefer, macroError);
         }
       }
     }

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

@@ -27,12 +27,12 @@ const ModelPropertyMacroVisitor = (0, _compose.default)({
             const macroValue = this.modelPropertyMacro((0, _apidomCore.toValue)(property));
             property.set('default', macroValue);
           } catch (error) {
-            var _this$options$derefer, _this$options$derefer2, _this$options$derefer3;
+            var _this$options$derefer, _this$options$derefer2;
             const macroError = new Error(error, {
               cause: error
             });
             macroError.fullPath = [...(0, _toPath.default)([...ancestors, parent, schemaElement]), 'properties'];
-            (_this$options$derefer = this.options.dereference.dereferenceOpts) === null || _this$options$derefer === void 0 ? void 0 : (_this$options$derefer2 = _this$options$derefer.errors) === null || _this$options$derefer2 === void 0 ? void 0 : (_this$options$derefer3 = _this$options$derefer2.push) === null || _this$options$derefer3 === void 0 ? void 0 : _this$options$derefer3.call(_this$options$derefer2, macroError);
+            (_this$options$derefer = this.options.dereference.dereferenceOpts) === null || _this$options$derefer === void 0 || (_this$options$derefer = _this$options$derefer.errors) === null || _this$options$derefer === void 0 || (_this$options$derefer2 = _this$options$derefer.push) === null || _this$options$derefer2 === void 0 ? void 0 : _this$options$derefer2.call(_this$options$derefer, macroError);
           }
         });
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "swagger-client",
-  "version": "3.19.10",
+  "version": "3.19.11",
   "description": "SwaggerJS - a collection of interfaces for OAI specs",
   "browser": {
     "./src/http/fold-formdata-to-request.node.js": "./src/http/fold-formdata-to-request.browser.js",
@@ -79,17 +79,17 @@
     "@commitlint/cli": "^17.0.0",
     "@commitlint/config-conventional": "^17.0.0",
     "abort-controller": "^3.0.0",
-    "babel-loader": "=9.1.2",
+    "babel-loader": "=9.1.3",
     "babel-plugin-lodash": "=3.3.4",
     "cross-env": "=7.0.3",
     "eslint": "^8.42.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-config-prettier": "=8.8.0",
     "eslint-plugin-import": "=2.27.5",
-    "eslint-plugin-prettier": "=4.2.1",
+    "eslint-plugin-prettier": "=5.0.0",
     "expect": "^29.0.3",
     "fetch-mock": "=9.11.0",
-    "glob": "=10.2.7",
+    "glob": "=10.3.3",
     "husky": "^8.0.1",
     "inspectpack": "=4.7.1",
     "install": "=0.13.0",
@@ -97,16 +97,16 @@
     "jest-environment-jsdom": "^29.0.3",
     "json-loader": "=0.5.7",
     "license-checker": "=25.0.1",
-    "lint-staged": "=13.2.2",
+    "lint-staged": "=13.2.3",
     "lodash-webpack-plugin": "=0.11.6",
-    "nock": "=13.3.1",
+    "nock": "=13.3.2",
     "node-fetch": "^2.6.7",
     "npm-run-all": "=4.1.5",
-    "prettier": "^2.3.0",
+    "prettier": "^3.0.0",
     "rimraf": "=5.0.1",
     "source-map-explorer": "^2.5.3",
     "terser-webpack-plugin": "^5.0.3",
-    "webpack": "=5.87.0",
+    "webpack": "=5.88.1",
     "webpack-bundle-size-analyzer": "=3.1.0",
     "webpack-cli": "=5.1.4",
     "webpack-stats-plugin": "=1.1.3",
@@ -114,10 +114,10 @@
   },
   "dependencies": {
     "@babel/runtime-corejs3": "^7.20.13",
-    "@swagger-api/apidom-core": ">=0.70.1 <1.0.0",
-    "@swagger-api/apidom-json-pointer": ">=0.70.1 <1.0.0",
-    "@swagger-api/apidom-ns-openapi-3-1": ">=0.70.2 <1.0.0",
-    "@swagger-api/apidom-reference": ">=0.70.2 <1.0.0",
+    "@swagger-api/apidom-core": ">=0.71.0 <1.0.0",
+    "@swagger-api/apidom-json-pointer": ">=0.71.0 <1.0.0",
+    "@swagger-api/apidom-ns-openapi-3-1": ">=0.71.0 <1.0.0",
+    "@swagger-api/apidom-reference": ">=0.71.1 <1.0.0",
     "cookie": "~0.5.0",
     "cross-fetch": "^3.1.5",
     "deepmerge": "~4.3.0",