swagger-client 3.37.2 → 3.37.4

package/es/execute/index.js

@@ -1,3 +1,4 @@
+import _includesInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/includes";
 import { identity, has } from 'ramda';
 import { isPlainObject, isNonEmptyString } from 'ramda-adjunct';
 import { test as testServerURLTemplate, substitute as substituteServerURLTemplate } from 'openapi-server-url-templating';
@@ -18,10 +19,11 @@ const findObjectOrArraySchema = (schema, {
   recurse = true,
   depth = 1
 } = {}) => {
+  var _context, _context2;
   if (!isPlainObject(schema)) return undefined;
 
   // check if the schema is an object or array type
-  if (schema.type === 'object' || schema.type === 'array' || Array.isArray(schema.type) && (schema.type.includes('object') || schema.type.includes('array'))) {
+  if (schema.type === 'object' || schema.type === 'array' || Array.isArray(schema.type) && (_includesInstanceProperty(_context = schema.type).call(_context, 'object') || _includesInstanceProperty(_context2 = schema.type).call(_context2, 'array'))) {
     return schema;
   }
   if (depth > TRAVERSE_LIMIT) return undefined;
@@ -213,7 +215,7 @@ export function buildRequest(options) {
     method,
     pathName
   } = operationRaw;
-  baseURL = baseURL !== null && baseURL !== void 0 ? baseURL : baseUrl({
+  baseURL = baseURL ?? baseUrl({
     spec,
     scheme,
     contextUrl,
@@ -359,15 +361,14 @@ function oas3BaseUrl({
   serverVariables = {},
   serverVariableEncoder
 }) {
-  var _spec$paths, _spec$paths2;
   let servers = [];
   let selectedServerUrl = '';
   let selectedServerObj;
 
   // compute the servers (this will be taken care of by ApiDOM refrator plugins in future
-  const operationLevelServers = 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;
-  const pathItemLevelServers = 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;
-  const rootLevelServers = spec === null || spec === void 0 ? void 0 : spec.servers;
+  const operationLevelServers = spec?.paths?.[pathName]?.[(method || '').toLowerCase()]?.servers;
+  const pathItemLevelServers = spec?.paths?.[pathName]?.servers;
+  const rootLevelServers = spec?.servers;
   servers = isNonEmptyServerList(operationLevelServers) // eslint-disable-line no-nested-ternary
   ? operationLevelServers : isNonEmptyServerList(pathItemLevelServers) // eslint-disable-line no-nested-ternary
   ? pathItemLevelServers : isNonEmptyServerList(rootLevelServers) ? rootLevelServers : [DEFAULT_OPENAPI_3_SERVER];

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

@@ -57,8 +57,7 @@ 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') {
-            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 : {};
+            const encoding = requestBodyDef.content[requestContentType]?.encoding ?? {};
             req.form = {};
             Object.keys(requestBody).forEach(k => {
               let value;
@@ -73,8 +72,7 @@ export default function buildRequest(options, req) {
               };
             });
           } else if (typeof requestBody === 'string') {
-            var _requestBodyDef$conte3, _requestBodyDef$conte4;
-            const encoding = (_requestBodyDef$conte3 = (_requestBodyDef$conte4 = requestBodyDef.content[requestContentType]) === null || _requestBodyDef$conte4 === void 0 ? void 0 : _requestBodyDef$conte4.encoding) !== null && _requestBodyDef$conte3 !== void 0 ? _requestBodyDef$conte3 : {};
+            const encoding = requestBodyDef.content[requestContentType]?.encoding ?? {};
             try {
               req.form = {};
               const form = JSON.parse(requestBody);
@@ -109,7 +107,6 @@ export function applySecurities({
   operation = {},
   spec
 }) {
-  var _spec$components;
   const result = {
     ...request
   };
@@ -118,7 +115,7 @@ export function applySecurities({
   } = securities;
   const security = operation.security || spec.security || [];
   const isAuthorized = authorized && !!Object.keys(authorized).length;
-  const securityDef = (spec === null || spec === void 0 || (_spec$components = spec.components) === null || _spec$components === void 0 ? void 0 : _spec$components.securitySchemes) || {};
+  const securityDef = 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/oas3/content-serializer.js

@@ -1,10 +1,11 @@
+import _includesInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/includes";
 /*
   Serializer that serializes according to a media type instead of OpenAPI's
   `style` + `explode` constructs.
 */
 
 export default function serialize(value, mediaType) {
-  if (mediaType.includes('application/json')) {
+  if (_includesInstanceProperty(mediaType).call(mediaType, 'application/json')) {
     if (typeof value === 'string') {
       // Assume the user has a JSON string
       return value;

package/es/execute/oas3/parameter-builders.js

@@ -32,7 +32,7 @@ export function path({
         key: parameter.name,
         value: val,
         style: style || 'simple',
-        explode: explode !== null && explode !== void 0 ? explode : false,
+        explode: explode ?? false,
         escape: 'reserved'
       })
     });
@@ -126,13 +126,12 @@ export function cookie({
     return;
   }
   if (value !== undefined && !(Array.isArray(value) && value.length === 0)) {
-    var _parameter$explode;
     const serializedValue = stylize({
       key: parameter.name,
       value,
       escape: false,
       style: parameter.style || 'form',
-      explode: (_parameter$explode = parameter.explode) !== null && _parameter$explode !== void 0 ? _parameter$explode : false
+      explode: parameter.explode ?? false
     });
     const cookieValue = Array.isArray(value) && parameter.explode ? `${cookieName}=${serializedValue}` : serializedValue;
     req.headers.Cookie = serializeCookie({

package/es/execute/oas3/style-serializer.js

@@ -40,7 +40,7 @@ export function valueEncoder(value, escape = false) {
   if (escape && typeof value === 'string' && value.length > 0) {
     return encodeCharacters(value, escape);
   }
-  return value !== null && value !== void 0 ? value : '';
+  return value ?? '';
 }
 function encodeArray({
   key,

package/es/http/index.js

@@ -1,4 +1,3 @@
-import '../helpers/fetch-polyfill.node.js';
 import { serializeRequest } from './serializers/request/index.js';
 import { serializeResponse } from './serializers/response/index.js';
 export { serializeResponse as serializeRes };

package/es/http/serializers/response/index.js

@@ -1,3 +1,4 @@
+import _includesInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/includes";
 import jsYaml from 'js-yaml';
 export const shouldDownloadAsText = (contentType = '') => /(json|xml|yaml|text)\b/.test(contentType);
 function parseBody(body, contentType) {
@@ -12,7 +13,7 @@ function parseBody(body, contentType) {
   return jsYaml.load(body);
 }
 function serializeHeaderValue(value) {
-  const isMulti = value.includes(', ');
+  const isMulti = _includesInstanceProperty(value).call(value, ', ');
   return isMulti ? value.split(', ') : value;
 }
 

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

@@ -30,9 +30,8 @@ class OpenAPI3_1SwaggerClientDereferenceStrategy extends OpenAPI3_1DereferenceSt
     this.ancestors = [...ancestors];
   }
   async dereference(file, options) {
-    var _options$dereference$;
     const namespace = createNamespace(openApi3_1Namespace);
-    const immutableRefSet = (_options$dereference$ = options.dereference.refSet) !== null && _options$dereference$ !== void 0 ? _options$dereference$ : new ReferenceSet();
+    const immutableRefSet = options.dereference.refSet ?? new ReferenceSet();
     const mutableRefsSet = new ReferenceSet();
     let refSet = immutableRefSet;
     let reference;

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

@@ -11,10 +11,9 @@ class AllOfVisitor {
 
       // 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$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);
+        this.options.dereference.dereferenceOpts?.errors?.push?.(error);
         return undefined;
       }
 
@@ -27,10 +26,9 @@ class AllOfVisitor {
       // 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$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);
+        this.options.dereference.dereferenceOpts?.errors?.push?.(error);
         return undefined;
       }
       while (schemaElement.hasKey('allOf')) {

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

@@ -1,3 +1,4 @@
+import _includesInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/includes";
 /* eslint-disable camelcase */
 import { RefElement, isObjectElement, isPrimitiveElement, isStringElement, isMemberElement, IdentityManager, visit, includesClasses, toValue, cloneShallow, cloneDeep } from '@swagger-api/apidom-core';
 import { ApiDOMError } from '@swagger-api/apidom-error';
@@ -44,8 +45,9 @@ class OpenAPI3_1SwaggerClientDereferenceVisitor extends OpenAPI3_1DereferenceVis
   }
   async ReferenceElement(referencingElement, key, parent, path, ancestors, link) {
     try {
+      var _context, _context2;
       // skip current referencing element as it's already been access
-      if (this.indirections.includes(referencingElement)) {
+      if (_includesInstanceProperty(_context = this.indirections).call(_context, referencingElement)) {
         return false;
       }
       const [ancestorsLineage, directAncestors] = this.toAncestorLineage([...ancestors, parent]);
@@ -100,12 +102,11 @@ class OpenAPI3_1SwaggerClientDereferenceVisitor extends OpenAPI3_1DereferenceVis
       }
 
       // detect second deep dive into the same fragment and avoid it
-      if (ancestorsLineage.includes(referencedElement)) {
+      if (_includesInstanceProperty(ancestorsLineage).call(ancestorsLineage, referencedElement)) {
         reference.refSet.circular = true;
         if (this.options.dereference.circular === 'error') {
           throw new ApiDOMError('Circular reference detected');
         } else if (this.options.dereference.circular === 'replace') {
-          var _this$options$derefer, _this$options$derefer2;
           const refElement = new RefElement(referencedElement.id, {
             type: 'reference',
             uri: reference.uri,
@@ -113,7 +114,7 @@ class OpenAPI3_1SwaggerClientDereferenceVisitor extends OpenAPI3_1DereferenceVis
             baseURI: $refBaseURI,
             referencingElement
           });
-          const replacer = (_this$options$derefer = (_this$options$derefer2 = this.options.dereference.strategyOpts['openapi-3-1']) === null || _this$options$derefer2 === void 0 ? void 0 : _this$options$derefer2.circularReplacer) !== null && _this$options$derefer !== void 0 ? _this$options$derefer : this.options.dereference.circularReplacer;
+          const replacer = this.options.dereference.strategyOpts['openapi-3-1']?.circularReplacer ?? this.options.dereference.circularReplacer;
           const replacement = replacer(refElement);
           link.replaceWith(refElement, mutationReplacer);
           return !parent ? replacement : false;
@@ -130,9 +131,8 @@ class OpenAPI3_1SwaggerClientDereferenceVisitor extends OpenAPI3_1DereferenceVis
        *  4. We are dereferencing the fragment lazily/eagerly depending on circular mode
        */
       const isNonRootDocument = url.stripHash(reference.refSet.rootRef.uri) !== reference.uri;
-      const shouldDetectCircular = ['error', 'replace'].includes(this.options.dereference.circular);
+      const shouldDetectCircular = _includesInstanceProperty(_context2 = ['error', 'replace']).call(_context2, this.options.dereference.circular);
       if ((isExternalReference || isNonRootDocument || isReferenceElement(referencedElement) || shouldDetectCircular) && !ancestorsLineage.includesCycle(referencedElement)) {
-        var _this$basePath;
         // append referencing reference to ancestors lineage
         directAncestors.add(referencingElement);
         const visitor = new OpenAPI3_1SwaggerClientDereferenceVisitor({
@@ -144,7 +144,7 @@ class OpenAPI3_1SwaggerClientDereferenceVisitor extends OpenAPI3_1DereferenceVis
           ancestors: ancestorsLineage,
           allowMetaPatches: this.allowMetaPatches,
           useCircularStructures: this.useCircularStructures,
-          basePath: (_this$basePath = this.basePath) !== null && _this$basePath !== void 0 ? _this$basePath : [...toPath([...ancestors, parent, referencingElement]), '$ref']
+          basePath: this.basePath ?? [...toPath([...ancestors, parent, referencingElement]), '$ref']
         });
         referencedElement = await visitAsync(referencedElement, visitor, {
           keyMap,
@@ -199,27 +199,27 @@ class OpenAPI3_1SwaggerClientDereferenceVisitor extends OpenAPI3_1DereferenceVis
        */
       return !parent ? mergedElement : false;
     } catch (error) {
-      var _this$basePath2, _this$options$derefer3, _this$options$derefer4;
       const rootCause = getRootCause(error);
       const wrappedError = wrapError(rootCause, {
         baseDoc: this.reference.uri,
         $ref: toValue(referencingElement.$ref),
         pointer: URIFragmentIdentifier.fromURIReference(toValue(referencingElement.$ref)),
-        fullPath: (_this$basePath2 = this.basePath) !== null && _this$basePath2 !== void 0 ? _this$basePath2 : [...toPath([...ancestors, parent, referencingElement]), '$ref']
+        fullPath: this.basePath ?? [...toPath([...ancestors, parent, referencingElement]), '$ref']
       });
-      (_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);
+      this.options.dereference.dereferenceOpts?.errors?.push?.(wrappedError);
       return undefined;
     }
   }
   async PathItemElement(pathItemElement, key, parent, path, ancestors, link) {
     try {
+      var _context3, _context4;
       // ignore PathItemElement without $ref field
       if (!isStringElement(pathItemElement.$ref)) {
         return undefined;
       }
 
       // skip current referencing element as it's already been access
-      if (this.indirections.includes(pathItemElement)) {
+      if (_includesInstanceProperty(_context3 = this.indirections).call(_context3, pathItemElement)) {
         return false;
       }
 
@@ -271,12 +271,11 @@ class OpenAPI3_1SwaggerClientDereferenceVisitor extends OpenAPI3_1DereferenceVis
       }
 
       // detect second deep dive into the same fragment and avoid it
-      if (ancestorsLineage.includes(referencedElement)) {
+      if (_includesInstanceProperty(ancestorsLineage).call(ancestorsLineage, referencedElement)) {
         reference.refSet.circular = true;
         if (this.options.dereference.circular === 'error') {
           throw new ApiDOMError('Circular reference detected');
         } else if (this.options.dereference.circular === 'replace') {
-          var _this$options$derefer5, _this$options$derefer6;
           const refElement = new RefElement(referencedElement.id, {
             type: 'path-item',
             uri: reference.uri,
@@ -284,7 +283,7 @@ class OpenAPI3_1SwaggerClientDereferenceVisitor extends OpenAPI3_1DereferenceVis
             baseURI: $refBaseURI,
             referencingElement: pathItemElement
           });
-          const replacer = (_this$options$derefer5 = (_this$options$derefer6 = this.options.dereference.strategyOpts['openapi-3-1']) === null || _this$options$derefer6 === void 0 ? void 0 : _this$options$derefer6.circularReplacer) !== null && _this$options$derefer5 !== void 0 ? _this$options$derefer5 : this.options.dereference.circularReplacer;
+          const replacer = this.options.dereference.strategyOpts['openapi-3-1']?.circularReplacer ?? this.options.dereference.circularReplacer;
           const replacement = replacer(refElement);
           link.replaceWith(refElement, mutationReplacer);
           return !parent ? replacement : false;
@@ -301,9 +300,8 @@ class OpenAPI3_1SwaggerClientDereferenceVisitor extends OpenAPI3_1DereferenceVis
        *  4. We are dereferencing the fragment lazily/eagerly depending on circular mode
        */
       const isNonRootDocument = url.stripHash(reference.refSet.rootRef.uri) !== reference.uri;
-      const shouldDetectCircular = ['error', 'replace'].includes(this.options.dereference.circular);
+      const shouldDetectCircular = _includesInstanceProperty(_context4 = ['error', 'replace']).call(_context4, this.options.dereference.circular);
       if ((isExternalReference || isNonRootDocument || isPathItemElement(referencedElement) && isStringElement(referencedElement.$ref) || shouldDetectCircular) && !ancestorsLineage.includesCycle(referencedElement)) {
-        var _this$basePath3;
         // append referencing schema to ancestors lineage
         directAncestors.add(pathItemElement);
 
@@ -316,7 +314,7 @@ class OpenAPI3_1SwaggerClientDereferenceVisitor extends OpenAPI3_1DereferenceVis
           ancestors: ancestorsLineage,
           allowMetaPatches: this.allowMetaPatches,
           useCircularStructures: this.useCircularStructures,
-          basePath: (_this$basePath3 = this.basePath) !== null && _this$basePath3 !== void 0 ? _this$basePath3 : [...toPath([...ancestors, parent, pathItemElement]), '$ref']
+          basePath: this.basePath ?? [...toPath([...ancestors, parent, pathItemElement]), '$ref']
         });
         referencedElement = await visitAsync(referencedElement, visitor, {
           keyMap,
@@ -370,20 +368,20 @@ class OpenAPI3_1SwaggerClientDereferenceVisitor extends OpenAPI3_1DereferenceVis
        */
       return !parent ? referencedElement : undefined;
     } catch (error) {
-      var _this$basePath4, _this$options$derefer7, _this$options$derefer8;
       const rootCause = getRootCause(error);
       const wrappedError = wrapError(rootCause, {
         baseDoc: this.reference.uri,
         $ref: toValue(pathItemElement.$ref),
         pointer: URIFragmentIdentifier.fromURIReference(toValue(pathItemElement.$ref)),
-        fullPath: (_this$basePath4 = this.basePath) !== null && _this$basePath4 !== void 0 ? _this$basePath4 : [...toPath([...ancestors, parent, pathItemElement]), '$ref']
+        fullPath: this.basePath ?? [...toPath([...ancestors, parent, pathItemElement]), '$ref']
       });
-      (_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);
+      this.options.dereference.dereferenceOpts?.errors?.push?.(wrappedError);
       return undefined;
     }
   }
   async SchemaElement(referencingElement, key, parent, path, ancestors, link) {
     try {
+      var _context5, _context6;
       // skip current referencing schema as $ref keyword was not defined
       if (!isStringElement(referencingElement.$ref)) {
         // skip traversing this schema but traverse all it's child schemas
@@ -391,7 +389,7 @@ class OpenAPI3_1SwaggerClientDereferenceVisitor extends OpenAPI3_1DereferenceVis
       }
 
       // skip current referencing element as it's already been access
-      if (this.indirections.includes(referencingElement)) {
+      if (_includesInstanceProperty(_context5 = this.indirections).call(_context5, referencingElement)) {
         return false;
       }
       const [ancestorsLineage, directAncestors] = this.toAncestorLineage([...ancestors, parent]);
@@ -523,12 +521,11 @@ class OpenAPI3_1SwaggerClientDereferenceVisitor extends OpenAPI3_1DereferenceVis
       }
 
       // detect second deep dive into the same fragment and avoid it
-      if (ancestorsLineage.includes(referencedElement)) {
+      if (_includesInstanceProperty(ancestorsLineage).call(ancestorsLineage, referencedElement)) {
         reference.refSet.circular = true;
         if (this.options.dereference.circular === 'error') {
           throw new ApiDOMError('Circular reference detected');
         } else if (this.options.dereference.circular === 'replace') {
-          var _this$options$derefer9, _this$options$derefer0;
           const refElement = new RefElement(referencedElement.id, {
             type: 'json-schema',
             uri: reference.uri,
@@ -536,7 +533,7 @@ class OpenAPI3_1SwaggerClientDereferenceVisitor extends OpenAPI3_1DereferenceVis
             baseURI: url.resolve(retrievalURI, $refBaseURI),
             referencingElement
           });
-          const replacer = (_this$options$derefer9 = (_this$options$derefer0 = this.options.dereference.strategyOpts['openapi-3-1']) === null || _this$options$derefer0 === void 0 ? void 0 : _this$options$derefer0.circularReplacer) !== null && _this$options$derefer9 !== void 0 ? _this$options$derefer9 : this.options.dereference.circularReplacer;
+          const replacer = this.options.dereference.strategyOpts['openapi-3-1']?.circularReplacer ?? this.options.dereference.circularReplacer;
           const replacement = replacer(refElement);
           link.replaceWith(replacement, mutationReplacer);
           return !parent ? replacement : false;
@@ -553,9 +550,8 @@ class OpenAPI3_1SwaggerClientDereferenceVisitor extends OpenAPI3_1DereferenceVis
        *  4. We are dereferencing the fragment lazily/eagerly depending on circular mode
        */
       const isNonRootDocument = url.stripHash(reference.refSet.rootRef.uri) !== reference.uri;
-      const shouldDetectCircular = ['error', 'replace'].includes(this.options.dereference.circular);
+      const shouldDetectCircular = _includesInstanceProperty(_context6 = ['error', 'replace']).call(_context6, this.options.dereference.circular);
       if ((isExternalReference || isNonRootDocument || isSchemaElement(referencedElement) && isStringElement(referencedElement.$ref) || shouldDetectCircular) && !ancestorsLineage.includesCycle(referencedElement)) {
-        var _this$basePath5;
         // append referencing schema to ancestors lineage
         directAncestors.add(referencingElement);
 
@@ -568,7 +564,7 @@ class OpenAPI3_1SwaggerClientDereferenceVisitor extends OpenAPI3_1DereferenceVis
           useCircularStructures: this.useCircularStructures,
           allowMetaPatches: this.allowMetaPatches,
           ancestors: ancestorsLineage,
-          basePath: (_this$basePath5 = this.basePath) !== null && _this$basePath5 !== void 0 ? _this$basePath5 : [...toPath([...ancestors, parent, referencingElement]), '$ref']
+          basePath: this.basePath ?? [...toPath([...ancestors, parent, referencingElement]), '$ref']
         });
         referencedElement = await visitAsync(referencedElement, mergeVisitor, {
           keyMap,
@@ -635,15 +631,14 @@ class OpenAPI3_1SwaggerClientDereferenceVisitor extends OpenAPI3_1DereferenceVis
        */
       return !parent ? referencedElement : undefined;
     } catch (error) {
-      var _this$basePath6, _this$options$derefer1, _this$options$derefer10;
       const rootCause = getRootCause(error);
       const wrappedError = new SchemaRefError(`Could not resolve reference: ${rootCause.message}`, {
         baseDoc: this.reference.uri,
         $ref: toValue(referencingElement.$ref),
-        fullPath: (_this$basePath6 = this.basePath) !== null && _this$basePath6 !== void 0 ? _this$basePath6 : [...toPath([...ancestors, parent, referencingElement]), '$ref'],
+        fullPath: this.basePath ?? [...toPath([...ancestors, parent, referencingElement]), '$ref'],
         cause: rootCause
       });
-      (_this$options$derefer1 = this.options.dereference.dereferenceOpts) === null || _this$options$derefer1 === void 0 || (_this$options$derefer1 = _this$options$derefer1.errors) === null || _this$options$derefer1 === void 0 || (_this$options$derefer10 = _this$options$derefer1.push) === null || _this$options$derefer10 === void 0 || _this$options$derefer10.call(_this$options$derefer1, wrappedError);
+      this.options.dereference.dereferenceOpts?.errors?.push?.(wrappedError);
       return undefined;
     }
   }
@@ -661,14 +656,13 @@ class OpenAPI3_1SwaggerClientDereferenceVisitor extends OpenAPI3_1DereferenceVis
     try {
       return await super.ExampleElement(exampleElement, key, parent, path, ancestors, link);
     } catch (error) {
-      var _this$basePath7, _this$options$derefer11, _this$options$derefer12;
       const rootCause = getRootCause(error);
       const wrappedError = wrapError(rootCause, {
         baseDoc: this.reference.uri,
         externalValue: toValue(exampleElement.externalValue),
-        fullPath: (_this$basePath7 = this.basePath) !== null && _this$basePath7 !== void 0 ? _this$basePath7 : [...toPath([...ancestors, parent, exampleElement]), 'externalValue']
+        fullPath: this.basePath ?? [...toPath([...ancestors, parent, exampleElement]), 'externalValue']
       });
-      (_this$options$derefer11 = this.options.dereference.dereferenceOpts) === null || _this$options$derefer11 === void 0 || (_this$options$derefer11 = _this$options$derefer11.errors) === null || _this$options$derefer11 === void 0 || (_this$options$derefer12 = _this$options$derefer11.push) === null || _this$options$derefer12 === void 0 || _this$options$derefer12.call(_this$options$derefer11, wrappedError);
+      this.options.dereference.dereferenceOpts?.errors?.push?.(wrappedError);
       return undefined;
     }
   }

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

@@ -20,12 +20,11 @@ class ParameterMacroVisitor {
         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$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);
+        this.options.dereference.dereferenceOpts?.errors?.push?.(macroError);
       }
     }
   };

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

@@ -13,12 +13,11 @@ class ModelPropertyMacroVisitor {
           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$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);
+          this.options.dereference.dereferenceOpts?.errors?.push?.(macroError);
         }
       });
     }

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

@@ -30,9 +30,8 @@ class OpenAPI3_2SwaggerClientDereferenceStrategy extends OpenAPI3_2DereferenceSt
     this.ancestors = [...ancestors];
   }
   async dereference(file, options) {
-    var _options$dereference$;
     const namespace = createNamespace(openApi3_2Namespace);
-    const immutableRefSet = (_options$dereference$ = options.dereference.refSet) !== null && _options$dereference$ !== void 0 ? _options$dereference$ : new ReferenceSet();
+    const immutableRefSet = options.dereference.refSet ?? new ReferenceSet();
     const mutableRefsSet = new ReferenceSet();
     let refSet = immutableRefSet;
     let reference;

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

@@ -11,10 +11,9 @@ class AllOfVisitor {
 
       // 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$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);
+        this.options.dereference.dereferenceOpts?.errors?.push?.(error);
         return undefined;
       }
 
@@ -27,10 +26,9 @@ class AllOfVisitor {
       // 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$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);
+        this.options.dereference.dereferenceOpts?.errors?.push?.(error);
         return undefined;
       }
       while (schemaElement.hasKey('allOf')) {