swagger-client 3.20.1 → 3.21.0

package/es/execute/index.js

@@ -1,10 +1,6 @@
-import _objectSpread from "@babel/runtime-corejs3/helpers/objectSpread2";
-import _objectWithoutProperties from "@babel/runtime-corejs3/helpers/objectWithoutProperties";
-const _excluded = ["http", "fetch", "spec", "operationId", "pathName", "method", "parameters", "securities"];
-import getIn from 'lodash/get';
-import url from 'url';
 import cookie from 'cookie';
 import { isPlainObject } from 'is-plain-object';
+import { url } from '@swagger-api/apidom-reference/configuration/empty';
 import stockHttp, { mergeInQueryOrForm } from '../http/index.js';
 import createError from '../specmap/lib/create-error.js';
 import SWAGGER2_PARAMETER_BUILDERS from './swagger2/parameter-builders.js';
@@ -14,6 +10,33 @@ import swagger2BuildRequest from './swagger2/build-request.js';
 import { getOperationRaw, idFromPathMethodLegacy } from '../helpers/index.js';
 import { isOpenAPI3 } from '../helpers/openapi-predicates.js';
 const arrayOrEmpty = ar => Array.isArray(ar) ? ar : [];
+
+/**
+ * `parseURIReference` function simulates the behavior of `node:url` parse function.
+ * New WHATWG URL API is not capable of parsing relative references natively,
+ * but can be adapter by utilizing the `base` parameter.
+ */
+const parseURIReference = uriReference => {
+  try {
+    return new URL(uriReference);
+  } catch {
+    const parsedURL = new URL(uriReference, 'https://swagger.io');
+    const pathname = String(uriReference).startsWith('/') ? parsedURL.pathname : parsedURL.pathname.substring(1);
+    return {
+      hash: parsedURL.hash,
+      host: '',
+      hostname: '',
+      href: '',
+      origin: '',
+      password: '',
+      pathname,
+      port: '',
+      protocol: '',
+      search: parsedURL.search,
+      searchParams: parsedURL.searchParams
+    };
+  }
+};
 const OperationNotFoundError = createError('OperationNotFoundError', function cb(message, extra, oriError) {
   this.originalError = oriError;
   Object.assign(this, extra || {});
@@ -47,30 +70,31 @@ export const self = {
 // pathName/method or operationId is optional
 export function execute(_ref) {
   let {
-      http: userHttp,
-      fetch,
-      // This is legacy
-      spec,
-      operationId,
-      pathName,
-      method,
-      parameters,
-      securities
-    } = _ref,
-    extras = _objectWithoutProperties(_ref, _excluded);
+    http: userHttp,
+    fetch,
+    // This is legacy
+    spec,
+    operationId,
+    pathName,
+    method,
+    parameters,
+    securities,
+    ...extras
+  } = _ref;
   // Provide default fetch implementation
   const http = userHttp || fetch || stockHttp; // Default to _our_ http
 
   if (pathName && method && !operationId) {
     operationId = idFromPathMethodLegacy(pathName, method);
   }
-  const request = self.buildRequest(_objectSpread({
+  const request = self.buildRequest({
     spec,
     operationId,
     parameters,
     securities,
-    http
-  }, extras));
+    http,
+    ...extras
+  });
   if (request.body && (isPlainObject(request.body) || Array.isArray(request.body))) {
     request.body = JSON.stringify(request.body);
   }
@@ -217,9 +241,10 @@ export function buildRequest(options) {
   });
 
   // Do version-specific tasks, then return those results.
-  const versionSpecificOptions = _objectSpread(_objectSpread({}, options), {}, {
+  const versionSpecificOptions = {
+    ...options,
     operation
-  });
+  };
   if (specIsOAS3) {
     req = oas3BuildRequest(versionSpecificOptions, req);
   } else {
@@ -258,6 +283,7 @@ export function baseUrl(obj) {
   return specIsOAS3 ? oas3BaseUrl(obj) : swagger2BaseUrl(obj);
 }
 function oas3BaseUrl(_ref2) {
+  var _spec$paths, _spec$paths2;
   let {
     spec,
     pathName,
@@ -266,7 +292,7 @@ function oas3BaseUrl(_ref2) {
     contextUrl,
     serverVariables = {}
   } = _ref2;
-  const servers = getIn(spec, ['paths', pathName, (method || '').toLowerCase(), 'servers']) || getIn(spec, ['paths', pathName, 'servers']) || getIn(spec, ['servers']);
+  const servers = (spec === null || spec === void 0 || (_spec$paths = spec.paths) === null || _spec$paths === void 0 || (_spec$paths = _spec$paths[pathName]) === null || _spec$paths === void 0 || (_spec$paths = _spec$paths[(method || '').toLowerCase()]) === null || _spec$paths === void 0 ? void 0 : _spec$paths.servers) || (spec === null || spec === void 0 || (_spec$paths2 = spec.paths) === null || _spec$paths2 === void 0 || (_spec$paths2 = _spec$paths2[pathName]) === null || _spec$paths2 === void 0 ? void 0 : _spec$paths2.servers) || (spec === null || spec === void 0 ? void 0 : spec.servers);
   let selectedServerUrl = '';
   let selectedServerObj = null;
   if (server && servers && servers.length) {
@@ -300,11 +326,11 @@ function buildOas3UrlWithContext() {
   let ourUrl = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
   let contextUrl = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
   // relative server url should be resolved against contextUrl
-  const parsedUrl = ourUrl && contextUrl ? url.parse(url.resolve(contextUrl, ourUrl)) : url.parse(ourUrl);
-  const parsedContextUrl = url.parse(contextUrl);
-  const computedScheme = stripNonAlpha(parsedUrl.protocol) || stripNonAlpha(parsedContextUrl.protocol) || '';
+  const parsedUrl = ourUrl && contextUrl ? parseURIReference(url.resolve(contextUrl, ourUrl)) : parseURIReference(ourUrl);
+  const parsedContextUrl = parseURIReference(contextUrl);
+  const computedScheme = stripNonAlpha(parsedUrl.protocol) || stripNonAlpha(parsedContextUrl.protocol);
   const computedHost = parsedUrl.host || parsedContextUrl.host;
-  const computedPath = parsedUrl.pathname || '';
+  const computedPath = parsedUrl.pathname;
   let res;
   if (computedScheme && computedHost) {
     res = `${computedScheme}://${computedHost + computedPath}`;
@@ -334,7 +360,7 @@ function swagger2BaseUrl(_ref3) {
     scheme,
     contextUrl = ''
   } = _ref3;
-  const parsedContextUrl = url.parse(contextUrl);
+  const parsedContextUrl = parseURIReference(contextUrl);
   const firstSchemeInSpec = Array.isArray(spec.schemes) ? spec.schemes[0] : null;
   const computedScheme = scheme || firstSchemeInSpec || stripNonAlpha(parsedContextUrl.protocol) || 'http';
   const computedHost = spec.host || parsedContextUrl.host || '';

package/es/execute/oas3/build-request.js

@@ -1,8 +1,6 @@
-import _objectSpread from "@babel/runtime-corejs3/helpers/objectSpread2";
 // This function runs after the common function,
 // `src/execute/index.js#buildRequest`
 import { isPlainObject } from 'is-plain-object';
-import get from 'lodash/get';
 import btoa from '../../helpers/btoa.node.js';
 export default function buildRequest(options, req) {
   const {
@@ -63,7 +61,8 @@ export default function buildRequest(options, req) {
         // contentType that has been explicitly set
         if (requestContentType === 'application/x-www-form-urlencoded' || requestContentType === 'multipart/form-data') {
           if (typeof requestBody === 'object') {
-            const encoding = requestBodyDef.content[requestContentType]?.encoding ?? {};
+            var _requestBodyDef$conte, _requestBodyDef$conte2;
+            const encoding = (_requestBodyDef$conte = (_requestBodyDef$conte2 = requestBodyDef.content[requestContentType]) === null || _requestBodyDef$conte2 === void 0 ? void 0 : _requestBodyDef$conte2.encoding) !== null && _requestBodyDef$conte !== void 0 ? _requestBodyDef$conte : {};
             req.form = {};
             Object.keys(requestBody).forEach(k => {
               req.form[k] = {
@@ -88,19 +87,22 @@ export default function buildRequest(options, req) {
 // Add security values, to operations - that declare their need on them
 // Adapted from the Swagger2 implementation
 export function applySecurities(_ref3) {
+  var _spec$components;
   let {
     request,
     securities = {},
     operation = {},
     spec
   } = _ref3;
-  const result = _objectSpread({}, request);
+  const result = {
+    ...request
+  };
   const {
     authorized = {}
   } = securities;
   const security = operation.security || spec.security || [];
   const isAuthorized = authorized && !!Object.keys(authorized).length;
-  const securityDef = get(spec, ['components', 'securitySchemes']) || {};
+  const securityDef = (spec === null || spec === void 0 || (_spec$components = spec.components) === null || _spec$components === void 0 ? void 0 : _spec$components.securitySchemes) || {};
   result.headers = result.headers || {};
   result.query = result.query || {};
   if (!Object.keys(securities).length || !isAuthorized || !security || Array.isArray(operation.security) && !operation.security.length) {

package/es/execute/swagger2/build-request.js

@@ -1,4 +1,3 @@
-import _objectSpread from "@babel/runtime-corejs3/helpers/objectSpread2";
 import btoa from '../../helpers/btoa.node.js';
 
 // This function runs after the common function,
@@ -53,7 +52,9 @@ export function applySecurities(_ref) {
     operation = {},
     spec
   } = _ref;
-  const result = _objectSpread({}, request);
+  const result = {
+    ...request
+  };
   const {
     authorized = {},
     specSecurity = []

package/es/helpers/fetch-polyfill.browser.js

@@ -0,0 +1,13 @@
+import { fetch, Headers, Request, Response } from './fetch-ponyfill.browser.js';
+if (typeof globalThis.fetch === 'undefined') {
+  globalThis.fetch = fetch;
+}
+if (typeof globalThis.Headers === 'undefined') {
+  globalThis.Headers = Headers;
+}
+if (typeof globalThis.Request === 'undefined') {
+  globalThis.Request = Request;
+}
+if (typeof globalThis.Response === 'undefined') {
+  globalThis.Response = Response;
+}

package/es/helpers/fetch-polyfill.node.js

@@ -0,0 +1,14 @@
+import { fetch as fetchU, Headers as HeaderU, Request as RequestU, Response as ResponseU } from './fetch-ponyfill-undici.node.js';
+import { fetch as fetchNF, Headers as HeadersNF, Request as RequestNF, Response as ResponseNF } from './fetch-ponyfill-node-fetch.node.js';
+if (typeof globalThis.fetch === 'undefined') {
+  globalThis.fetch = fetchU || fetchNF;
+}
+if (typeof globalThis.Headers === 'undefined') {
+  globalThis.Headers = HeaderU || HeadersNF;
+}
+if (typeof globalThis.Request === 'undefined') {
+  globalThis.Request = RequestU || RequestNF;
+}
+if (typeof globalThis.Response === 'undefined') {
+  globalThis.Response = ResponseU || ResponseNF;
+}

package/es/helpers/fetch-ponyfill-node-fetch.node.js

@@ -0,0 +1,3 @@
+// we cannot use `node-fetch@3` as it's pure ESM package not compatible with CommonJS
+import fetch, { Response, Headers, Request } from 'node-fetch-commonjs';
+export { fetch, Response, Headers, Request };

package/es/helpers/fetch-ponyfill-undici.node.js

@@ -0,0 +1,2 @@
+import { fetch, Response, Headers, Request } from 'undici';
+export { fetch, Response, Headers, Request };

package/es/helpers/fetch-ponyfill.browser.js

@@ -0,0 +1,8 @@
+// we're targeting browsers that already support fetch API
+const {
+  fetch,
+  Response,
+  Headers,
+  Request
+} = globalThis;
+export { fetch, Response, Headers, Request };

package/es/http/index.js

@@ -1,9 +1,8 @@
-import 'cross-fetch/polyfill';
 import qs from 'qs';
 import jsYaml from 'js-yaml';
 import { FormData, File, Blob } from 'formdata-node';
+import '../helpers/fetch-polyfill.node.js';
 import { encodeDisallowedCharacters } from '../execute/oas3/style-serializer.js';
-import foldFormDataToRequest from './fold-formdata-to-request.node.js';
 
 // For testing
 export const self = {
@@ -12,7 +11,7 @@ export const self = {
 };
 
 // Handles fetch-like syntax and the case where there is only one object passed-in
-// (which will have the URL as a property). Also serilizes the response.
+// (which will have the URL as a property). Also serializes the response.
 export default async function http(url) {
   let request = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   if (typeof url === 'object') {
@@ -27,7 +26,7 @@ export default async function http(url) {
   self.mergeInQueryOrForm(request);
 
   // Newlines in header values cause weird error messages from `window.fetch`,
-  // so let's massage them out.
+  // so let's message them out.
   // Context: https://stackoverflow.com/a/50709178
   if (request.headers) {
     Object.keys(request.headers).forEach(headerName => {
@@ -45,11 +44,12 @@ export default async function http(url) {
     request = (await request.requestInterceptor(request)) || request;
   }
 
-  // for content-type=multipart\/form-data remove content-type from request before fetch
-  // so that correct one with `boundary` is set when request body is different than boundary encoded string
+  /**
+   *  For content-type=multipart/form-data remove content-type from request before fetch,
+   *  so that correct one with `boundary` is set when request body is different from boundary encoded string.
+   */
   const contentType = request.headers['content-type'] || request.headers['Content-Type'];
-  // TODO(vladimir.gorej@gmail.com): assertion of FormData instance can be removed when migrated to node-fetch@2.x
-  if (/multipart\/form-data/i.test(contentType) && request.body instanceof FormData) {
+  if (/multipart\/form-data/i.test(contentType)) {
     delete request.headers['content-type'];
     delete request.headers['Content-Type'];
   }
@@ -429,7 +429,8 @@ export function mergeInQueryOrForm() {
     const contentType = req.headers['content-type'] || req.headers['Content-Type'];
     if (hasFile || /multipart\/form-data/i.test(contentType)) {
       const formdata = buildFormData(req.form);
-      foldFormDataToRequest(formdata, req);
+      req.formdata = formdata;
+      req.body = formdata;
     } else {
       req.body = encodeFormOrQuery(form);
     }

package/es/index.js

@@ -1,6 +1,4 @@
-import _objectSpread from "@babel/runtime-corejs3/helpers/objectSpread2";
 /* eslint-disable camelcase */
-import Url from 'url';
 import Http, { makeHttp, serializeRes, serializeHeaders } from './http/index.js';
 import { makeResolve } from './resolver/index.js';
 import { makeResolveSubtree } from './subtree-resolver/index.js';
@@ -88,7 +86,7 @@ Swagger.prototype = {
   http: Http,
   execute(options) {
     this.applyDefaults();
-    return Swagger.execute(_objectSpread({
+    return Swagger.execute({
       spec: this.spec,
       http: this.http,
       securities: {
@@ -96,12 +94,13 @@ Swagger.prototype = {
       },
       contextUrl: typeof this.url === 'string' ? this.url : undefined,
       requestInterceptor: this.requestInterceptor || null,
-      responseInterceptor: this.responseInterceptor || null
-    }, options));
+      responseInterceptor: this.responseInterceptor || null,
+      ...options
+    });
   },
   resolve() {
     let options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-    return Swagger.resolve(_objectSpread({
+    return Swagger.resolve({
       spec: this.spec,
       url: this.url,
       http: this.http || this.fetch,
@@ -109,8 +108,9 @@ Swagger.prototype = {
       useCircularStructures: this.useCircularStructures,
       requestInterceptor: this.requestInterceptor || null,
       responseInterceptor: this.responseInterceptor || null,
-      skipNormalization: this.skipNormalization || false
-    }, options)).then(obj => {
+      skipNormalization: this.skipNormalization || false,
+      ...options
+    }).then(obj => {
       this.originalSpec = this.spec;
       this.spec = obj.spec;
       this.errors = obj.errors;
@@ -125,7 +125,7 @@ Swagger.prototype.applyDefaults = function applyDefaults() {
   const specUrl = this.url;
   // TODO: OAS3: support servers here
   if (specUrl && specUrl.startsWith('http')) {
-    const parsed = Url.parse(specUrl);
+    const parsed = new URL(specUrl);
     if (!spec.host) {
       spec.host = parsed.host;
     }

package/es/interfaces.js

@@ -1,4 +1,3 @@
-import _objectSpread from "@babel/runtime-corejs3/helpers/objectSpread2";
 import { eachOperation, opId } from './helpers/index.js';
 const nullFn = () => null;
 const normalizeArray = arg => Array.isArray(arg) ? arg : [arg];
@@ -25,7 +24,7 @@ export function makeExecute() {
         responseInterceptor,
         userFetch
       } = swaggerJs;
-      return swaggerJs.execute(_objectSpread({
+      return swaggerJs.execute({
         spec: swaggerJs.spec,
         requestInterceptor,
         responseInterceptor,
@@ -33,8 +32,9 @@ export function makeExecute() {
         pathName,
         method,
         parameters,
-        operationId
-      }, opts));
+        operationId,
+        ...opts
+      });
     };
   };
 }

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

@@ -36,9 +36,10 @@ const OpenApi3_1SwaggerClientDereferenceStrategy = OpenApi3_1DereferenceStrategy
   },
   methods: {
     async dereference(file, options) {
+      var _options$dereference$;
       const visitors = [];
       const namespace = createNamespace(openApi3_1Namespace);
-      const refSet = options.dereference.refSet ?? ReferenceSet();
+      const refSet = (_options$dereference$ = options.dereference.refSet) !== null && _options$dereference$ !== void 0 ? _options$dereference$ : ReferenceSet();
       let reference;
       if (!refSet.has(file.uri)) {
         reference = Reference({

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

@@ -18,9 +18,10 @@ const AllOfVisitor = compose({
 
         // collect error and return if allOf keyword is not an array
         if (!isArrayElement(schemaElement.allOf)) {
+          var _this$options$derefer, _this$options$derefer2;
           const error = new TypeError('allOf must be an array');
           error.fullPath = [...toPath([...ancestors, parent, schemaElement]), 'allOf'];
-          this.options.dereference.dereferenceOpts?.errors?.push?.(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 || _this$options$derefer2.call(_this$options$derefer, error);
           return undefined;
         }
 
@@ -32,9 +33,10 @@ const AllOfVisitor = compose({
         // collect errors if allOf keyword contains anything else than Schema Object
         const includesSchemaElementOnly = schemaElement.allOf.content.every(isSchemaElement);
         if (!includesSchemaElementOnly) {
+          var _this$options$derefer3, _this$options$derefer4;
           const error = new TypeError('Elements in allOf must be objects');
           error.fullPath = [...toPath([...ancestors, parent, schemaElement]), 'allOf'];
-          this.options.dereference.dereferenceOpts?.errors?.push?.(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 || _this$options$derefer4.call(_this$options$derefer3, error);
           return undefined;
         }
         const mergedSchemaElement = deepmerge.all([...schemaElement.allOf.content, schemaElement]);

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

@@ -33,6 +33,7 @@ const OpenApi3_1SwaggerClientDereferenceVisitor = OpenApi3_1DereferenceVisitor.c
   methods: {
     async ReferenceElement(referenceElement, key, parent, path, ancestors) {
       try {
+        var _this$basePath, _referenceElement$$re, _referenceElement$des, _referenceElement$sum;
         const [ancestorsLineage, directAncestors] = this.toAncestorLineage([...ancestors, parent]);
 
         // skip already identified cycled Path Item Objects
@@ -112,7 +113,7 @@ const OpenApi3_1SwaggerClientDereferenceVisitor = OpenApi3_1DereferenceVisitor.c
           ancestors: ancestorsLineage,
           allowMetaPatches: this.allowMetaPatches,
           useCircularStructures: this.useCircularStructures,
-          basePath: this.basePath ?? [...toPath([...ancestors, parent, referenceElement]), '$ref']
+          basePath: (_this$basePath = this.basePath) !== null && _this$basePath !== void 0 ? _this$basePath : [...toPath([...ancestors, parent, referenceElement]), '$ref']
         });
         fragment = await visitAsync(fragment, visitor, {
           keyMap,
@@ -124,9 +125,9 @@ const OpenApi3_1SwaggerClientDereferenceVisitor = OpenApi3_1DereferenceVisitor.c
         this.indirections.pop();
         fragment = fragment.clone();
         fragment.setMetaProperty('ref-fields', {
-          $ref: referenceElement.$ref?.toValue(),
-          description: referenceElement.description?.toValue(),
-          summary: referenceElement.summary?.toValue()
+          $ref: (_referenceElement$$re = referenceElement.$ref) === null || _referenceElement$$re === void 0 ? void 0 : _referenceElement$$re.toValue(),
+          description: (_referenceElement$des = referenceElement.description) === null || _referenceElement$des === void 0 ? void 0 : _referenceElement$des.toValue(),
+          summary: (_referenceElement$sum = referenceElement.summary) === null || _referenceElement$sum === void 0 ? void 0 : _referenceElement$sum.toValue()
         });
         // annotate fragment with info about origin
         fragment.setMetaProperty('ref-origin', reference.uri);
@@ -154,19 +155,21 @@ const OpenApi3_1SwaggerClientDereferenceVisitor = OpenApi3_1DereferenceVisitor.c
         // transclude the element for a fragment
         return fragment;
       } catch (error) {
+        var _this$basePath2, _this$options$derefer, _this$options$derefer2;
         const rootCause = getRootCause(error);
         const wrappedError = wrapError(rootCause, {
           baseDoc: this.reference.uri,
           $ref: referenceElement.$ref.toValue(),
           pointer: uriToPointer(referenceElement.$ref.toValue()),
-          fullPath: this.basePath ?? [...toPath([...ancestors, parent, referenceElement]), '$ref']
+          fullPath: (_this$basePath2 = this.basePath) !== null && _this$basePath2 !== void 0 ? _this$basePath2 : [...toPath([...ancestors, parent, referenceElement]), '$ref']
         });
-        this.options.dereference.dereferenceOpts?.errors?.push?.(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 || _this$options$derefer2.call(_this$options$derefer, wrappedError);
         return undefined;
       }
     },
     async PathItemElement(pathItemElement, key, parent, path, ancestors) {
       try {
+        var _this$basePath3, _pathItemElement$$ref;
         const [ancestorsLineage, directAncestors] = this.toAncestorLineage([...ancestors, parent]);
 
         // ignore PathItemElement without $ref field
@@ -242,7 +245,7 @@ const OpenApi3_1SwaggerClientDereferenceVisitor = OpenApi3_1DereferenceVisitor.c
           ancestors: ancestorsLineage,
           allowMetaPatches: this.allowMetaPatches,
           useCircularStructures: this.useCircularStructures,
-          basePath: this.basePath ?? [...toPath([...ancestors, parent, pathItemElement]), '$ref']
+          basePath: (_this$basePath3 = this.basePath) !== null && _this$basePath3 !== void 0 ? _this$basePath3 : [...toPath([...ancestors, parent, pathItemElement]), '$ref']
         });
         referencedElement = await visitAsync(referencedElement, visitor, {
           keyMap,
@@ -264,7 +267,7 @@ const OpenApi3_1SwaggerClientDereferenceVisitor = OpenApi3_1DereferenceVisitor.c
 
         // annotate referenced element with info about original referencing element
         mergedPathItemElement.setMetaProperty('ref-fields', {
-          $ref: pathItemElement.$ref?.toValue()
+          $ref: (_pathItemElement$$ref = pathItemElement.$ref) === null || _pathItemElement$$ref === void 0 ? void 0 : _pathItemElement$$ref.toValue()
         });
         // annotate referenced element with info about origin
         mergedPathItemElement.setMetaProperty('ref-origin', reference.uri);
@@ -281,19 +284,21 @@ const OpenApi3_1SwaggerClientDereferenceVisitor = OpenApi3_1DereferenceVisitor.c
         // transclude referencing element with merged referenced element
         return mergedPathItemElement;
       } catch (error) {
+        var _this$basePath4, _this$options$derefer3, _this$options$derefer4;
         const rootCause = getRootCause(error);
         const wrappedError = wrapError(rootCause, {
           baseDoc: this.reference.uri,
           $ref: pathItemElement.$ref.toValue(),
           pointer: uriToPointer(pathItemElement.$ref.toValue()),
-          fullPath: this.basePath ?? [...toPath([...ancestors, parent, pathItemElement]), '$ref']
+          fullPath: (_this$basePath4 = this.basePath) !== null && _this$basePath4 !== void 0 ? _this$basePath4 : [...toPath([...ancestors, parent, pathItemElement]), '$ref']
         });
-        this.options.dereference.dereferenceOpts?.errors?.push?.(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 || _this$options$derefer4.call(_this$options$derefer3, wrappedError);
         return undefined;
       }
     },
     async SchemaElement(referencingElement, key, parent, path, ancestors) {
       try {
+        var _this$basePath5, _referencingElement$$2;
         const [ancestorsLineage, directAncestors] = this.toAncestorLineage([...ancestors, parent]);
 
         // skip current referencing schema as $ref keyword was not defined
@@ -412,7 +417,7 @@ const OpenApi3_1SwaggerClientDereferenceVisitor = OpenApi3_1DereferenceVisitor.c
           useCircularStructures: this.useCircularStructures,
           allowMetaPatches: this.allowMetaPatches,
           ancestors: ancestorsLineage,
-          basePath: this.basePath ?? [...toPath([...ancestors, parent, referencingElement]), '$ref']
+          basePath: (_this$basePath5 = this.basePath) !== null && _this$basePath5 !== void 0 ? _this$basePath5 : [...toPath([...ancestors, parent, referencingElement]), '$ref']
         });
         referencedElement = await visitAsync(referencedElement, mergeVisitor, {
           keyMap,
@@ -423,11 +428,12 @@ const OpenApi3_1SwaggerClientDereferenceVisitor = OpenApi3_1DereferenceVisitor.c
         directAncestors.delete(referencingElement);
         this.indirections.pop();
         if (isBooleanJsonSchemaElement(referencedElement)) {
+          var _referencingElement$$;
           // Boolean JSON Schema
           const jsonSchemaBooleanElement = referencedElement.clone();
           // annotate referenced element with info about original referencing element
           jsonSchemaBooleanElement.setMetaProperty('ref-fields', {
-            $ref: referencingElement.$ref?.toValue()
+            $ref: (_referencingElement$$ = referencingElement.$ref) === null || _referencingElement$$ === void 0 ? void 0 : _referencingElement$$.toValue()
           });
           // annotate referenced element with info about origin
           jsonSchemaBooleanElement.setMetaProperty('ref-origin', retrievalURI);
@@ -445,7 +451,7 @@ const OpenApi3_1SwaggerClientDereferenceVisitor = OpenApi3_1DereferenceVisitor.c
 
         // annotate referenced element with info about original referencing element
         mergedSchemaElement.setMetaProperty('ref-fields', {
-          $ref: referencingElement.$ref?.toValue()
+          $ref: (_referencingElement$$2 = referencingElement.$ref) === null || _referencingElement$$2 === void 0 ? void 0 : _referencingElement$$2.toValue()
         });
         // annotate fragment with info about origin
         mergedSchemaElement.setMetaProperty('ref-origin', retrievalURI);
@@ -462,13 +468,14 @@ const OpenApi3_1SwaggerClientDereferenceVisitor = OpenApi3_1DereferenceVisitor.c
         // transclude referencing element with merged referenced element
         return mergedSchemaElement;
       } catch (error) {
+        var _this$basePath6, _this$options$derefer5, _this$options$derefer6;
         const rootCause = getRootCause(error);
         const wrappedError = new SchemaRefError(`Could not resolve reference: ${rootCause.message}`, {
           baseDoc: this.reference.uri,
           $ref: referencingElement.$ref.toValue(),
-          fullPath: this.basePath ?? [...toPath([...ancestors, parent, referencingElement]), '$ref']
+          fullPath: (_this$basePath6 = this.basePath) !== null && _this$basePath6 !== void 0 ? _this$basePath6 : [...toPath([...ancestors, parent, referencingElement]), '$ref']
         }, rootCause);
-        this.options.dereference.dereferenceOpts?.errors?.push?.(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 || _this$options$derefer6.call(_this$options$derefer5, wrappedError);
         return undefined;
       }
     },
@@ -484,13 +491,14 @@ const OpenApi3_1SwaggerClientDereferenceVisitor = OpenApi3_1DereferenceVisitor.c
       try {
         return await OpenApi3_1DereferenceVisitor.compose.methods.ExampleElement.call(this, exampleElement, key, parent, path, ancestors);
       } catch (error) {
+        var _exampleElement$exter, _this$basePath7, _this$options$derefer7, _this$options$derefer8;
         const rootCause = getRootCause(error);
         const wrappedError = wrapError(rootCause, {
           baseDoc: this.reference.uri,
-          externalValue: exampleElement.externalValue?.toValue(),
-          fullPath: this.basePath ?? [...toPath([...ancestors, parent, exampleElement]), 'externalValue']
+          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 : [...toPath([...ancestors, parent, exampleElement]), 'externalValue']
         });
-        this.options.dereference.dereferenceOpts?.errors?.push?.(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 || _this$options$derefer8.call(_this$options$derefer7, wrappedError);
         return undefined;
       }
     }

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

@@ -30,11 +30,12 @@ const ParameterMacroVisitor = compose({
           const macroValue = this.parameterMacro(pojoOperation, pojoParameter);
           parameterElement.set('default', macroValue);
         } catch (error) {
+          var _this$options$derefer, _this$options$derefer2;
           const macroError = new Error(error, {
             cause: error
           });
           macroError.fullPath = toPath([...ancestors, parent]);
-          this.options.dereference.dereferenceOpts?.errors?.push?.(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 || _this$options$derefer2.call(_this$options$derefer, macroError);
         }
       }
     }

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

@@ -23,11 +23,12 @@ const ModelPropertyMacroVisitor = compose({
             const macroValue = this.modelPropertyMacro(toValue(property));
             property.set('default', macroValue);
           } catch (error) {
+            var _this$options$derefer, _this$options$derefer2;
             const macroError = new Error(error, {
               cause: error
             });
             macroError.fullPath = [...toPath([...ancestors, parent, schemaElement]), 'properties'];
-            this.options.dereference.dereferenceOpts?.errors?.push?.(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 || _this$options$derefer2.call(_this$options$derefer, macroError);
           }
         });
       }