swagger-client 3.24.4 → 3.24.6

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

@@ -17,15 +17,14 @@ const OpenApi3_1SwaggerClientDereferenceStrategy = OpenApi3_1DereferenceStrategy
     mode: 'non-strict',
     ancestors: null
   },
-  init() {
-    let {
-      useCircularStructures = this.useCircularStructures,
-      allowMetaPatches = this.allowMetaPatches,
-      parameterMacro = this.parameterMacro,
-      modelPropertyMacro = this.modelPropertyMacro,
-      mode = this.mode,
-      ancestors = []
-    } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  init({
+    useCircularStructures = this.useCircularStructures,
+    allowMetaPatches = this.allowMetaPatches,
+    parameterMacro = this.parameterMacro,
+    modelPropertyMacro = this.modelPropertyMacro,
+    mode = this.mode,
+    ancestors = []
+  } = {}) {
     this.name = 'openapi-3-1-swagger-client';
     this.useCircularStructures = useCircularStructures;
     this.allowMetaPatches = allowMetaPatches;

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

@@ -3,10 +3,9 @@ import { isSchemaElement, SchemaElement } from '@swagger-api/apidom-ns-openapi-3
 import compose from '../utils/compose.js';
 import toPath from '../utils/to-path.js';
 const AllOfVisitor = compose({
-  init(_ref) {
-    let {
-      options
-    } = _ref;
+  init({
+    options
+  }) {
     this.options = options;
   },
   props: {

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

@@ -1,5 +1,6 @@
 /* eslint-disable camelcase */
-import { isObjectElement, isPrimitiveElement, isStringElement, isMemberElement, visit, toValue, cloneShallow, cloneDeep } from '@swagger-api/apidom-core';
+import { isObjectElement, isPrimitiveElement, isStringElement, isMemberElement, IdentityManager, visit, includesClasses, toValue, cloneShallow, cloneDeep } from '@swagger-api/apidom-core';
+import { ApiDOMError } from '@swagger-api/apidom-error';
 import { isReferenceElementExternal, isReferenceLikeElement, isPathItemElementExternal, isBooleanJsonSchemaElement, ReferenceElement, PathItemElement, SchemaElement, getNodeType, keyMap } from '@swagger-api/apidom-ns-openapi-3-1';
 import { evaluate as jsonPointerEvaluate, uriToPointer } from '@swagger-api/apidom-json-pointer';
 import { url, MaximumDereferenceDepthError, File } from '@swagger-api/apidom-reference/configuration/empty';
@@ -14,18 +15,26 @@ const {
   wrapError
 } = specMapMod;
 const visitAsync = visit[Symbol.for('nodejs.util.promisify.custom')];
+
+// initialize element identity manager
+const identityManager = IdentityManager();
+
+/**
+ * Predicate for detecting if element was created by merging referencing
+ * element with particular element identity with a referenced element.
+ */
+const wasReferencedBy = referencingElement => element => element.meta.hasKey('ref-referencing-element-id') && element.meta.get('ref-referencing-element-id').equals(toValue(identityManager.identify(referencingElement)));
 const OpenApi3_1SwaggerClientDereferenceVisitor = OpenApi3_1DereferenceVisitor.compose({
   props: {
     useCircularStructures: true,
     allowMetaPatches: false,
     basePath: null
   },
-  init(_ref) {
-    let {
-      allowMetaPatches = this.allowMetaPatches,
-      useCircularStructures = this.useCircularStructures,
-      basePath = this.basePath
-    } = _ref;
+  init({
+    allowMetaPatches = this.allowMetaPatches,
+    useCircularStructures = this.useCircularStructures,
+    basePath = this.basePath
+  }) {
     this.allowMetaPatches = allowMetaPatches;
     this.useCircularStructures = useCircularStructures;
     this.basePath = basePath;
@@ -36,6 +45,11 @@ const OpenApi3_1SwaggerClientDereferenceVisitor = OpenApi3_1DereferenceVisitor.c
         var _this$basePath;
         const [ancestorsLineage, directAncestors] = this.toAncestorLineage([...ancestors, parent]);
 
+        // skip already identified cycled Path Item Objects
+        if (includesClasses(['cycle'], referencingElement.$ref)) {
+          return false;
+        }
+
         // detect possible cycle in traversal and avoid it
         if (ancestorsLineage.includesCycle(referencingElement)) {
           return false;
@@ -72,7 +86,7 @@ const OpenApi3_1SwaggerClientDereferenceVisitor = OpenApi3_1DereferenceVisitor.c
 
         // detect direct or indirect reference
         if (this.indirections.includes(referencedElement)) {
-          throw new Error('Recursive JSON Pointer detected');
+          throw new ApiDOMError('Recursive JSON Pointer detected');
         }
 
         // detect maximum depth of dereferencing
@@ -84,9 +98,11 @@ const OpenApi3_1SwaggerClientDereferenceVisitor = OpenApi3_1DereferenceVisitor.c
           if (hasCycles) {
             if (url.isHttpUrl(retrievalURI) || url.isFileSystemPath(retrievalURI)) {
               // make the referencing URL or file system path absolute
-              return new ReferenceElement({
+              const cycledReferenceElement = new ReferenceElement({
                 $ref: $refBaseURI
               }, cloneDeep(referencingElement.meta), cloneDeep(referencingElement.attributes));
+              cycledReferenceElement.get('$ref').classes.push('cycle');
+              return cycledReferenceElement;
             }
             // skip processing this reference
             return false;
@@ -121,26 +137,22 @@ const OpenApi3_1SwaggerClientDereferenceVisitor = OpenApi3_1DereferenceVisitor.c
           // annotate fragment with info about original Reference element
           copy.setMetaProperty('ref-fields', {
             $ref: toValue(referencingElement.$ref),
-            // @ts-ignore
             description: toValue(referencingElement.description),
-            // @ts-ignore
             summary: toValue(referencingElement.summary)
           });
           // annotate fragment with info about origin
           copy.setMetaProperty('ref-origin', reference.uri);
+          // annotate fragment with info about referencing element
+          copy.setMetaProperty('ref-referencing-element-id', cloneDeep(identityManager.identify(referencingElement)));
 
           // override description and summary (outer has higher priority then inner)
           if (isObjectElement(refedElement)) {
             if (referencingElement.hasKey('description') && 'description' in refedElement) {
-              // @ts-ignore
               copy.remove('description');
-              // @ts-ignore
               copy.set('description', referencingElement.get('description'));
             }
             if (referencingElement.hasKey('summary') && 'summary' in refedElement) {
-              // @ts-ignore
               copy.remove('summary');
-              // @ts-ignore
               copy.set('summary', referencingElement.get('summary'));
             }
           }
@@ -157,13 +169,14 @@ const OpenApi3_1SwaggerClientDereferenceVisitor = OpenApi3_1DereferenceVisitor.c
         };
 
         // attempting to create cycle
-        if (ancestorsLineage.includes(referencedElement)) {
+        if (ancestorsLineage.includes(referencingElement) || ancestorsLineage.includes(referencedElement)) {
+          var _ancestorsLineage$fin;
+          const replaceWith = (_ancestorsLineage$fin = ancestorsLineage.findItem(wasReferencedBy(referencingElement))) !== null && _ancestorsLineage$fin !== void 0 ? _ancestorsLineage$fin : mergeAndAnnotateReferencedElement(referencedElement);
           if (isMemberElement(parent)) {
-            parent.value = mergeAndAnnotateReferencedElement(referencedElement); // eslint-disable-line no-param-reassign
+            parent.value = replaceWith; // eslint-disable-line no-param-reassign
           } else if (Array.isArray(parent)) {
-            parent[key] = mergeAndAnnotateReferencedElement(referencedElement); // eslint-disable-line no-param-reassign
+            parent[key] = replaceWith; // eslint-disable-line no-param-reassign
           }
-
           return false;
         }
 
@@ -192,6 +205,11 @@ const OpenApi3_1SwaggerClientDereferenceVisitor = OpenApi3_1DereferenceVisitor.c
           return undefined;
         }
 
+        // skip already identified cycled Path Item Objects
+        if (includesClasses(['cycle'], pathItemElement.$ref)) {
+          return false;
+        }
+
         // detect possible cycle in traversal and avoid it
         if (ancestorsLineage.includesCycle(pathItemElement)) {
           return false;
@@ -219,7 +237,7 @@ const OpenApi3_1SwaggerClientDereferenceVisitor = OpenApi3_1DereferenceVisitor.c
 
         // detect direct or indirect reference
         if (this.indirections.includes(referencedElement)) {
-          throw new Error('Recursive JSON Pointer detected');
+          throw new ApiDOMError('Recursive JSON Pointer detected');
         }
 
         // detect maximum depth of dereferencing
@@ -231,9 +249,11 @@ const OpenApi3_1SwaggerClientDereferenceVisitor = OpenApi3_1DereferenceVisitor.c
           if (hasCycles) {
             if (url.isHttpUrl(retrievalURI) || url.isFileSystemPath(retrievalURI)) {
               // make the referencing URL or file system path absolute
-              return new PathItemElement({
+              const cycledPathItemElement = new PathItemElement({
                 $ref: $refBaseURI
               }, cloneDeep(pathItemElement.meta), cloneDeep(pathItemElement.attributes));
+              cycledPathItemElement.get('$ref').classes.push('cycle');
+              return cycledPathItemElement;
             }
             // skip processing this path item and all it's child elements
             return false;
@@ -278,6 +298,8 @@ const OpenApi3_1SwaggerClientDereferenceVisitor = OpenApi3_1DereferenceVisitor.c
           });
           // annotate referenced element with info about origin
           mergedElement.setMetaProperty('ref-origin', reference.uri);
+          // annotate fragment with info about referencing element
+          mergedElement.setMetaProperty('ref-referencing-element-id', cloneDeep(identityManager.identify(pathItemElement)));
 
           // apply meta patches
           if (this.allowMetaPatches) {
@@ -291,13 +313,14 @@ const OpenApi3_1SwaggerClientDereferenceVisitor = OpenApi3_1DereferenceVisitor.c
         };
 
         // attempting to create cycle
-        if (ancestorsLineage.includes(referencedElement)) {
+        if (ancestorsLineage.includes(pathItemElement) || ancestorsLineage.includes(referencedElement)) {
+          var _ancestorsLineage$fin2;
+          const replaceWith = (_ancestorsLineage$fin2 = ancestorsLineage.findItem(wasReferencedBy(pathItemElement))) !== null && _ancestorsLineage$fin2 !== void 0 ? _ancestorsLineage$fin2 : mergeAndAnnotateReferencedElement(referencedElement);
           if (isMemberElement(parent)) {
-            parent.value = mergeAndAnnotateReferencedElement(referencedElement); // eslint-disable-line no-param-reassign
+            parent.value = replaceWith; // eslint-disable-line no-param-reassign
           } else if (Array.isArray(parent)) {
-            parent[key] = mergeAndAnnotateReferencedElement(referencedElement); // eslint-disable-line no-param-reassign
+            parent[key] = replaceWith; // eslint-disable-line no-param-reassign
           }
-
           return false;
         }
 
@@ -327,6 +350,11 @@ const OpenApi3_1SwaggerClientDereferenceVisitor = OpenApi3_1DereferenceVisitor.c
           return undefined;
         }
 
+        // skip already identified cycled Path Item Objects
+        if (includesClasses(['cycle'], referencingElement.$ref)) {
+          return false;
+        }
+
         // detect possible cycle in traversal and avoid it
         if (ancestorsLineage.includesCycle(referencingElement)) {
           return false;
@@ -393,7 +421,7 @@ const OpenApi3_1SwaggerClientDereferenceVisitor = OpenApi3_1DereferenceVisitor.c
 
         // detect direct or indirect reference
         if (this.indirections.includes(referencedElement)) {
-          throw new Error('Recursive Schema Object reference detected');
+          throw new ApiDOMError('Recursive Schema Object reference detected');
         }
 
         // detect maximum depth of dereferencing
@@ -403,14 +431,16 @@ const OpenApi3_1SwaggerClientDereferenceVisitor = OpenApi3_1DereferenceVisitor.c
 
         // useCircularStructures option processing
         if (!this.useCircularStructures) {
-          const hasCycles = ancestorsLineage.some(ancs => ancs.has(referencedElement));
+          const hasCycles = ancestorsLineage.includes(referencedElement);
           if (hasCycles) {
             if (url.isHttpUrl(retrievalURI) || url.isFileSystemPath(retrievalURI)) {
               // make the referencing URL or file system path absolute
               const baseURI = url.resolve(retrievalURI, $refBaseURI);
-              return new SchemaElement({
+              const cycledSchemaElement = new SchemaElement({
                 $ref: baseURI
               }, cloneDeep(referencingElement.meta), cloneDeep(referencingElement.attributes));
+              cycledSchemaElement.get('$ref').classes.push('cycle');
+              return cycledSchemaElement;
             }
             // skip processing this schema and all it's child schemas
             return false;
@@ -447,6 +477,8 @@ const OpenApi3_1SwaggerClientDereferenceVisitor = OpenApi3_1DereferenceVisitor.c
           });
           // annotate referenced element with info about origin
           booleanJsonSchemaElement.setMetaProperty('ref-origin', reference.uri);
+          // annotate fragment with info about referencing element
+          booleanJsonSchemaElement.setMetaProperty('ref-referencing-element-id', cloneDeep(identityManager.identify(referencingElement)));
           return booleanJsonSchemaElement;
         }
         const mergeAndAnnotateReferencedElement = refedElement => {
@@ -464,6 +496,8 @@ const OpenApi3_1SwaggerClientDereferenceVisitor = OpenApi3_1DereferenceVisitor.c
           });
           // annotate fragment with info about origin
           mergedElement.setMetaProperty('ref-origin', reference.uri);
+          // annotate fragment with info about referencing element
+          mergedElement.setMetaProperty('ref-referencing-element-id', cloneDeep(identityManager.identify(referencingElement)));
 
           // allowMetaPatches option processing
           if (this.allowMetaPatches) {
@@ -477,13 +511,14 @@ const OpenApi3_1SwaggerClientDereferenceVisitor = OpenApi3_1DereferenceVisitor.c
         };
 
         // attempting to create cycle
-        if (ancestorsLineage.includes(referencedElement)) {
+        if (ancestorsLineage.includes(referencingElement) || ancestorsLineage.includes(referencedElement)) {
+          var _ancestorsLineage$fin3;
+          const replaceWith = (_ancestorsLineage$fin3 = ancestorsLineage.findItem(wasReferencedBy(referencingElement))) !== null && _ancestorsLineage$fin3 !== void 0 ? _ancestorsLineage$fin3 : mergeAndAnnotateReferencedElement(referencedElement);
           if (isMemberElement(parent)) {
-            parent.value = mergeAndAnnotateReferencedElement(referencedElement); // eslint-disable-line no-param-reassign
+            parent.value = replaceWith; // eslint-disable-line no-param-reassign
           } else if (Array.isArray(parent)) {
-            parent[key] = mergeAndAnnotateReferencedElement(referencedElement); // eslint-disable-line no-param-reassign
+            parent[key] = replaceWith; // eslint-disable-line no-param-reassign
           }
-
           return false;
         }
 

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

@@ -2,11 +2,10 @@ import { toValue } from '@swagger-api/apidom-core';
 import compose from '../utils/compose.js';
 import toPath from '../utils/to-path.js';
 const ParameterMacroVisitor = compose({
-  init(_ref) {
-    let {
-      parameterMacro,
-      options
-    } = _ref;
+  init({
+    parameterMacro,
+    options
+  }) {
     this.parameterMacro = parameterMacro;
     this.options = options;
   },

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

@@ -2,11 +2,10 @@ import { isObjectElement, toValue } from '@swagger-api/apidom-core';
 import compose from '../utils/compose.js';
 import toPath from '../utils/to-path.js';
 const ModelPropertyMacroVisitor = compose({
-  init(_ref) {
-    let {
-      modelPropertyMacro,
-      options
-    } = _ref;
+  init({
+    modelPropertyMacro,
+    options
+  }) {
     this.modelPropertyMacro = modelPropertyMacro;
     this.options = options;
   },

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

@@ -8,10 +8,9 @@ const HttpResolverSwaggerClient = HttpResolver.compose({
     swaggerHTTPClient: Http,
     swaggerHTTPClientConfig: {}
   },
-  init() {
-    let {
-      swaggerHTTPClient = this.swaggerHTTPClient
-    } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  init({
+    swaggerHTTPClient = this.swaggerHTTPClient
+  } = {}) {
     this.swaggerHTTPClient = swaggerHTTPClient;
   },
   methods: {

package/es/resolver/strategies/generic/index.js

@@ -9,10 +9,9 @@ const genericStrategy = {
   match() {
     return true;
   },
-  normalize(_ref) {
-    let {
-      spec
-    } = _ref;
+  normalize({
+    spec
+  }) {
     const {
       spec: normalized
     } = normalize({

package/es/resolver/strategies/generic/normalize.js

@@ -17,7 +17,6 @@ export default function normalize(parsedSpec) {
     if (path == null || !['object', 'function'].includes(typeof path)) {
       continue; // eslint-disable-line no-continue
     }
-
     const pathParameters = path.parameters;
 
     // eslint-disable-next-line no-restricted-syntax, guard-for-in
@@ -26,7 +25,6 @@ export default function normalize(parsedSpec) {
       if (operation == null || !['object', 'function'].includes(typeof operation)) {
         continue; // eslint-disable-line no-continue
       }
-
       const oid = opId(operation, pathName, method);
       if (oid) {
         if (map[oid]) {

package/es/resolver/strategies/openapi-2/index.js

@@ -4,16 +4,14 @@ import { isOpenAPI2 } from '../../../helpers/openapi-predicates.js';
 export { clearCache } from '../generic/index.js';
 const openApi2Strategy = {
   name: 'openapi-2',
-  match(_ref) {
-    let {
-      spec
-    } = _ref;
+  match({
+    spec
+  }) {
     return isOpenAPI2(spec);
   },
-  normalize(_ref2) {
-    let {
-      spec
-    } = _ref2;
+  normalize({
+    spec
+  }) {
     const {
       spec: normalized
     } = normalize({

package/es/resolver/strategies/openapi-3-0/index.js

@@ -4,16 +4,14 @@ import { isOpenAPI30 } from '../../../helpers/openapi-predicates.js';
 export { clearCache } from '../generic/index.js';
 const openApi30Strategy = {
   name: 'openapi-3-0',
-  match(_ref) {
-    let {
-      spec
-    } = _ref;
+  match({
+    spec
+  }) {
     return isOpenAPI30(spec);
   },
-  normalize(_ref2) {
-    let {
-      spec
-    } = _ref2;
+  normalize({
+    spec
+  }) {
     const {
       spec: normalized
     } = normalize({

package/es/resolver/strategies/openapi-3-1-apidom/index.js

@@ -3,16 +3,14 @@ import normalize, { pojoAdapter } from './normalize.js';
 import { isOpenAPI31 } from '../../../helpers/openapi-predicates.js';
 const openApi31ApiDOMStrategy = {
   name: 'openapi-3-1-apidom',
-  match(_ref) {
-    let {
-      spec
-    } = _ref;
+  match({
+    spec
+  }) {
     return isOpenAPI31(spec);
   },
-  normalize(_ref2) {
-    let {
-      spec
-    } = _ref2;
+  normalize({
+    spec
+  }) {
     return pojoAdapter(normalize)(spec);
   },
   async resolve(options) {

package/es/resolver/strategies/openapi-3-1-apidom/normalize.js

@@ -30,7 +30,7 @@ const normalize = element => {
  */
 export const pojoAdapter = normalizeFn => spec => {
   if (spec !== null && spec !== void 0 && spec.$$normalized) return spec;
-  if (pojoAdapter.cache.has(spec)) return spec;
+  if (pojoAdapter.cache.has(spec)) return pojoAdapter.cache.get(spec);
   const openApiElement = OpenApi3_1Element.refract(spec);
   const normalized = normalizeFn(openApiElement);
   const value = toValue(normalized);

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

@@ -66,7 +66,7 @@ const resolveOpenAPI31Strategy = async options => {
     if (jsonPointer !== '') refSet.rootRef = null; // 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 WeakSet([fragmentElement])];
+    const ancestors = [new Set([fragmentElement])];
     const errors = [];
     const dereferenced = await dereferenceApiDOM(fragmentElement, {
       resolve: {

package/es/resolver/utils/index.js

@@ -1,8 +1,7 @@
 import { ACCEPT_HEADER_VALUE_FOR_DOCUMENTS } from '../../constants.js';
 
 // eslint-disable-next-line import/prefer-default-export
-export function makeFetchJSON(http) {
-  let opts = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+export function makeFetchJSON(http, opts = {}) {
   const {
     requestInterceptor,
     responseInterceptor

package/es/specmap/helpers.js

@@ -33,12 +33,11 @@ export function isFreelyNamed(parentPath) {
     freelyNamedKeyParents.indexOf(parentKey) > -1 && nonFreelyNamedKeyGrandparents.indexOf(grandparentKey) === -1 || freelyNamedPaths.indexOf(parentStr) > -1 || freelyNamedAncestors.some(el => parentStr.indexOf(el) > -1)
   );
 }
-export function generateAbsoluteRefPatches(obj, basePath) {
-  let {
-    specmap,
-    getBaseUrlForNodePath = path => specmap.getContext([...basePath, ...path]).baseDoc,
-    targetKeys = ['$ref', '$$ref']
-  } = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+export function generateAbsoluteRefPatches(obj, basePath, {
+  specmap,
+  getBaseUrlForNodePath = path => specmap.getContext([...basePath, ...path]).baseDoc,
+  targetKeys = ['$ref', '$$ref']
+} = {}) {
   const patches = [];
   traverse(obj).forEach(function callback() {
     if (targetKeys.includes(this.key) && typeof this.node === 'string') {

package/es/specmap/index.js

@@ -48,24 +48,16 @@ class SpecMap {
     this.patches.push(lib.context([], this.context));
     this.updatePatches(this.patches);
   }
-  debug(level) {
+  debug(level, ...args) {
     if (this.debugLevel === level) {
-      for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
-        args[_key - 1] = arguments[_key];
-      }
       console.log(...args); // eslint-disable-line no-console
     }
   }
-
-  verbose(header) {
+  verbose(header, ...args) {
     if (this.debugLevel === 'verbose') {
-      for (var _len2 = arguments.length, args = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
-        args[_key2 - 1] = arguments[_key2];
-      }
       console.log(`[${header}]   `, ...args); // eslint-disable-line no-console
     }
   }
-
   wrapPlugin(plugin, name) {
     const {
       pathDiscriminator

package/es/specmap/lib/create-error.js

@@ -1,13 +1,10 @@
 export default function createErrorType(name, init) {
-  function E() {
+  function E(...args) {
     if (!Error.captureStackTrace) {
       this.stack = new Error().stack;
     } else {
       Error.captureStackTrace(this, this.constructor);
     }
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
     [this.message] = args;
     if (init) {
       init.apply(this, args);

package/es/subtree-resolver/index.js

@@ -24,8 +24,7 @@ import resolve from '../resolver/index.js';
 import genericResolverStrategy from '../resolver/strategies/generic/index.js';
 import openApi2ResolverStrategy from '../resolver/strategies/openapi-2/index.js';
 import openApi30ResolverStrategy from '../resolver/strategies/openapi-3-0/index.js';
-const resolveSubtree = async function (obj, path) {
-  let options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+const resolveSubtree = async (obj, path, options = {}) => {
   const {
     returnEntireTree,
     baseDoc,
@@ -60,8 +59,7 @@ const resolveSubtree = async function (obj, path) {
   }
   return result;
 };
-export const makeResolveSubtree = defaultOptions => async function (obj, path) {
-  let options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+export const makeResolveSubtree = defaultOptions => async (obj, path, options = {}) => {
   const mergedOptions = {
     ...defaultOptions,
     ...options

package/lib/execute/index.js

@@ -78,19 +78,18 @@ const self = exports.self = {
 
 // Execute request, with the given operationId and parameters
 // pathName/method or operationId is optional
-function execute(_ref) {
-  let {
-    http: userHttp,
-    fetch,
-    // This is legacy
-    spec,
-    operationId,
-    pathName,
-    method,
-    parameters,
-    securities,
-    ...extras
-  } = _ref;
+function execute({
+  http: userHttp,
+  fetch,
+  // This is legacy
+  spec,
+  operationId,
+  pathName,
+  method,
+  parameters,
+  securities,
+  ...extras
+}) {
   // Provide default fetch implementation
   const http = userHttp || fetch || _index.default; // Default to _our_ http
 
@@ -293,16 +292,15 @@ function baseUrl(obj) {
   return specIsOAS3 ? oas3BaseUrl(obj) : swagger2BaseUrl(obj);
 }
 const isNonEmptyServerList = value => Array.isArray(value) && value.length > 0;
-function oas3BaseUrl(_ref2) {
+function oas3BaseUrl({
+  spec,
+  pathName,
+  method,
+  server,
+  contextUrl,
+  serverVariables = {}
+}) {
   var _spec$paths, _spec$paths2;
-  let {
-    spec,
-    pathName,
-    method,
-    server,
-    contextUrl,
-    serverVariables = {}
-  } = _ref2;
   let servers = [];
   let selectedServerUrl = '';
   let selectedServerObj;
@@ -341,13 +339,7 @@ function oas3BaseUrl(_ref2) {
   }
   return buildOas3UrlWithContext(selectedServerUrl, contextUrl);
 }
-function buildOas3UrlWithContext(ourUrl, contextUrl) {
-  if (ourUrl === void 0) {
-    ourUrl = '';
-  }
-  if (contextUrl === void 0) {
-    contextUrl = '';
-  }
+function buildOas3UrlWithContext(ourUrl = '', contextUrl = '') {
   // relative server url should be resolved against contextUrl
   const parsedUrl = ourUrl && contextUrl ? parseURIReference(_empty.url.resolve(contextUrl, ourUrl)) : parseURIReference(ourUrl);
   const parsedContextUrl = parseURIReference(contextUrl);
@@ -377,12 +369,11 @@ function getVariableTemplateNames(str) {
 }
 
 // Compose the baseUrl ( scheme + host + basePath )
-function swagger2BaseUrl(_ref3) {
-  let {
-    spec,
-    scheme,
-    contextUrl = ''
-  } = _ref3;
+function swagger2BaseUrl({
+  spec,
+  scheme,
+  contextUrl = ''
+}) {
   const parsedContextUrl = parseURIReference(contextUrl);
   const firstSchemeInSpec = Array.isArray(spec.schemes) ? spec.schemes[0] : null;
   const computedScheme = scheme || firstSchemeInSpec || stripNonAlpha(parsedContextUrl.protocol) || 'http';