swagger-client 3.35.0 → 3.35.2

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

@@ -2,7 +2,7 @@
 import { RefElement, isObjectElement, isPrimitiveElement, isStringElement, isMemberElement, IdentityManager, visit, includesClasses, toValue, cloneShallow, cloneDeep } from '@swagger-api/apidom-core';
 import { ApiDOMError } from '@swagger-api/apidom-error';
 import { isReferenceLikeElement, isReferenceElement, isBooleanJsonSchemaElement, isPathItemElement, isSchemaElement, 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 { evaluate as jsonPointerEvaluate, URIFragmentIdentifier } from '@swagger-api/apidom-json-pointer/modern';
 import { url, MaximumDereferenceDepthError, File } from '@swagger-api/apidom-reference/configuration/empty';
 import { OpenAPI3_1DereferenceVisitor, resolveSchema$refField, maybeRefractToSchemaElement } from '@swagger-api/apidom-reference/dereference/strategies/openapi-3-1';
 import { isAnchor, uriToAnchor, evaluate as $anchorEvaluate } from '@swagger-api/apidom-reference/dereference/strategies/openapi-3-1/selectors/$anchor';
@@ -64,10 +64,10 @@ class OpenAPI3_1SwaggerClientDereferenceVisitor extends OpenAPI3_1DereferenceVis
       const reference = await this.toReference(toValue(referencingElement.$ref));
       const $refBaseURI = url.resolve(retrievalURI, toValue(referencingElement.$ref));
       this.indirections.push(referencingElement);
-      const jsonPointer = uriToPointer($refBaseURI);
+      const jsonPointer = URIFragmentIdentifier.fromURIReference($refBaseURI);
 
       // possibly non-semantic fragment
-      let referencedElement = jsonPointerEvaluate(jsonPointer, reference.value.result);
+      let referencedElement = jsonPointerEvaluate(reference.value.result, jsonPointer);
       referencedElement.id = identityManager.identify(referencedElement);
 
       // applying semantics to a fragment
@@ -204,7 +204,7 @@ class OpenAPI3_1SwaggerClientDereferenceVisitor extends OpenAPI3_1DereferenceVis
       const wrappedError = wrapError(rootCause, {
         baseDoc: this.reference.uri,
         $ref: toValue(referencingElement.$ref),
-        pointer: uriToPointer(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']
       });
       (_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);
@@ -243,10 +243,10 @@ class OpenAPI3_1SwaggerClientDereferenceVisitor extends OpenAPI3_1DereferenceVis
       const reference = await this.toReference(toValue(pathItemElement.$ref));
       const $refBaseURI = url.resolve(retrievalURI, toValue(pathItemElement.$ref));
       this.indirections.push(pathItemElement);
-      const jsonPointer = uriToPointer($refBaseURI);
+      const jsonPointer = URIFragmentIdentifier.fromURIReference($refBaseURI);
 
       // possibly non-semantic referenced element
-      let referencedElement = jsonPointerEvaluate(jsonPointer, reference.value.result);
+      let referencedElement = jsonPointerEvaluate(reference.value.result, jsonPointer);
       referencedElement.id = identityManager.identify(referencedElement);
 
       // applying semantics to a referenced element
@@ -375,7 +375,7 @@ class OpenAPI3_1SwaggerClientDereferenceVisitor extends OpenAPI3_1DereferenceVis
       const wrappedError = wrapError(rootCause, {
         baseDoc: this.reference.uri,
         $ref: toValue(pathItemElement.$ref),
-        pointer: uriToPointer(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']
       });
       (_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);
@@ -451,9 +451,9 @@ class OpenAPI3_1SwaggerClientDereferenceVisitor extends OpenAPI3_1DereferenceVis
             return undefined;
           }
           reference = await this.toReference(url.unsanitize($refBaseURI));
-          const selector = uriToPointer($refBaseURI);
+          const selector = URIFragmentIdentifier.fromURIReference($refBaseURI);
           const referenceAsSchema = maybeRefractToSchemaElement(reference.value.result);
-          referencedElement = jsonPointerEvaluate(selector, referenceAsSchema);
+          referencedElement = jsonPointerEvaluate(referenceAsSchema, selector);
           referencedElement = maybeRefractToSchemaElement(referencedElement);
           referencedElement.id = identityManager.identify(referencedElement);
         }
@@ -501,9 +501,9 @@ class OpenAPI3_1SwaggerClientDereferenceVisitor extends OpenAPI3_1DereferenceVis
               return undefined;
             }
             reference = await this.toReference(url.unsanitize($refBaseURI));
-            const selector = uriToPointer($refBaseURI);
+            const selector = URIFragmentIdentifier.fromURIReference($refBaseURI);
             const referenceAsSchema = maybeRefractToSchemaElement(reference.value.result);
-            referencedElement = jsonPointerEvaluate(selector, referenceAsSchema);
+            referencedElement = jsonPointerEvaluate(referenceAsSchema, selector);
             referencedElement = maybeRefractToSchemaElement(referencedElement);
             referencedElement.id = identityManager.identify(referencedElement);
           }
@@ -528,7 +528,7 @@ class OpenAPI3_1SwaggerClientDereferenceVisitor extends OpenAPI3_1DereferenceVis
         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$derefer10;
+          var _this$options$derefer9, _this$options$derefer0;
           const refElement = new RefElement(referencedElement.id, {
             type: 'json-schema',
             uri: reference.uri,
@@ -536,7 +536,7 @@ class OpenAPI3_1SwaggerClientDereferenceVisitor extends OpenAPI3_1DereferenceVis
             baseURI: url.resolve(retrievalURI, $refBaseURI),
             referencingElement
           });
-          const replacer = (_this$options$derefer9 = (_this$options$derefer10 = this.options.dereference.strategyOpts['openapi-3-1']) === null || _this$options$derefer10 === void 0 ? void 0 : _this$options$derefer10.circularReplacer) !== null && _this$options$derefer9 !== void 0 ? _this$options$derefer9 : this.options.dereference.circularReplacer;
+          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 replacement = replacer(refElement);
           link.replaceWith(replacement, mutationReplacer);
           return !parent ? replacement : false;
@@ -635,7 +635,7 @@ class OpenAPI3_1SwaggerClientDereferenceVisitor extends OpenAPI3_1DereferenceVis
        */
       return !parent ? referencedElement : undefined;
     } catch (error) {
-      var _this$basePath6, _this$options$derefer11, _this$options$derefer12;
+      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,
@@ -643,7 +643,7 @@ class OpenAPI3_1SwaggerClientDereferenceVisitor extends OpenAPI3_1DereferenceVis
         fullPath: (_this$basePath6 = this.basePath) !== null && _this$basePath6 !== void 0 ? _this$basePath6 : [...toPath([...ancestors, parent, referencingElement]), '$ref'],
         cause: rootCause
       });
-      (_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$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);
       return undefined;
     }
   }
@@ -661,14 +661,14 @@ class OpenAPI3_1SwaggerClientDereferenceVisitor extends OpenAPI3_1DereferenceVis
     try {
       return await super.ExampleElement(exampleElement, key, parent, path, ancestors, link);
     } catch (error) {
-      var _this$basePath7, _this$options$derefer13, _this$options$derefer14;
+      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']
       });
-      (_this$options$derefer13 = this.options.dereference.dereferenceOpts) === null || _this$options$derefer13 === void 0 || (_this$options$derefer13 = _this$options$derefer13.errors) === null || _this$options$derefer13 === void 0 || (_this$options$derefer14 = _this$options$derefer13.push) === null || _this$options$derefer14 === void 0 || _this$options$derefer14.call(_this$options$derefer13, wrappedError);
+      (_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);
       return undefined;
     }
   }

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

@@ -1,3 +1,4 @@
+import { isPlainObject } from 'ramda-adjunct';
 import opId from '../../../helpers/op-id.js';
 export default function normalize(parsedSpec) {
   const {
@@ -73,12 +74,16 @@ export default function normalize(parsedSpec) {
           for (const inherits of inheritsList) {
             // eslint-disable-next-line no-restricted-syntax
             for (const inheritName in inherits) {
-              if (!operation[inheritName]) {
+              if (!Array.isArray(operation[inheritName])) {
                 operation[inheritName] = inherits[inheritName];
               } else if (inheritName === 'parameters') {
                 // eslint-disable-next-line no-restricted-syntax
                 for (const param of inherits[inheritName]) {
-                  const exists = operation[inheritName].some(opParam => opParam.name && opParam.name === param.name || opParam.$ref && opParam.$ref === param.$ref || opParam.$$ref && opParam.$$ref === param.$$ref || opParam === param);
+                  const exists = operation[inheritName].some(opParam => {
+                    if (!isPlainObject(opParam) && !isPlainObject(param)) return false;
+                    if (opParam === param) return true;
+                    return ['name', '$ref', '$$ref'].some(key => typeof opParam[key] === 'string' && typeof param[key] === 'string' && opParam[key] === param[key]);
+                  });
                   if (!exists) {
                     operation[inheritName].push(param);
                   }

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

@@ -1,6 +1,6 @@
 /* eslint-disable camelcase */
 import { ParseResultElement, ObjectElement, toValue, transclude, cloneDeep } from '@swagger-api/apidom-core';
-import { compile as jsonPointerCompile, evaluate as jsonPointerEvaluate, EvaluationJsonPointerError, InvalidJsonPointerError } from '@swagger-api/apidom-json-pointer';
+import { compile as jsonPointerCompile, evaluate as jsonPointerEvaluate, JSONPointerEvaluateError } from '@swagger-api/apidom-json-pointer/modern';
 import { mediaTypes, OpenApi3_1Element } from '@swagger-api/apidom-ns-openapi-3-1';
 import { dereferenceApiDOM, url, ReferenceSet, Reference, options as referenceOptions } from '@swagger-api/apidom-reference/configuration/empty';
 import BinaryParser from '@swagger-api/apidom-reference/parse/parsers/binary';
@@ -66,7 +66,7 @@ const resolveOpenAPI31Strategy = async options => {
     // prepare fragment for dereferencing
     const jsonPointer = jsonPointerCompile(pathDiscriminator);
     const jsonPointerURI = jsonPointer === '' ? '' : `#${jsonPointer}`;
-    const fragmentElement = jsonPointerEvaluate(jsonPointer, openApiElement);
+    const fragmentElement = jsonPointerEvaluate(openApiElement, jsonPointer);
 
     // prepare reference set for dereferencing
     const openApiElementReference = new Reference({
@@ -147,7 +147,7 @@ const resolveOpenAPI31Strategy = async options => {
       errors
     };
   } catch (error) {
-    if (error instanceof InvalidJsonPointerError || error instanceof EvaluationJsonPointerError) {
+    if (error instanceof JSONPointerEvaluateError) {
       return {
         spec,
         errors: []

package/lib/index.js

@@ -15,14 +15,14 @@ var _index7 = _interopRequireDefault(require("./resolver/strategies/openapi-3-0/
 var _index8 = _interopRequireDefault(require("./resolver/strategies/openapi-3-1-apidom/index.js"));
 var _interfaces = require("./interfaces.js");
 var _index9 = require("./execute/index.js");
-var _index10 = require("./helpers/index.js");
+var _index0 = require("./helpers/index.js");
 var _openapiPredicates = require("./helpers/openapi-predicates.js");
-var _index11 = _interopRequireDefault(require("./resolver/apidom/reference/resolve/resolvers/http-swagger-client/index.js"));
-var _index12 = _interopRequireDefault(require("./resolver/apidom/reference/parse/parsers/json/index.js"));
-var _index13 = _interopRequireDefault(require("./resolver/apidom/reference/parse/parsers/yaml-1-2/index.js"));
-var _index14 = _interopRequireDefault(require("./resolver/apidom/reference/parse/parsers/openapi-json-3-1/index.js"));
-var _index15 = _interopRequireDefault(require("./resolver/apidom/reference/parse/parsers/openapi-yaml-3-1/index.js"));
-var _index16 = _interopRequireDefault(require("./resolver/apidom/reference/dereference/strategies/openapi-3-1-swagger-client/index.js"));
+var _index1 = _interopRequireDefault(require("./resolver/apidom/reference/resolve/resolvers/http-swagger-client/index.js"));
+var _index10 = _interopRequireDefault(require("./resolver/apidom/reference/parse/parsers/json/index.js"));
+var _index11 = _interopRequireDefault(require("./resolver/apidom/reference/parse/parsers/yaml-1-2/index.js"));
+var _index12 = _interopRequireDefault(require("./resolver/apidom/reference/parse/parsers/openapi-json-3-1/index.js"));
+var _index13 = _interopRequireDefault(require("./resolver/apidom/reference/parse/parsers/openapi-yaml-3-1/index.js"));
+var _index14 = _interopRequireDefault(require("./resolver/apidom/reference/dereference/strategies/openapi-3-1-swagger-client/index.js"));
 /* eslint-disable camelcase */
 
 Swagger.http = _index.default;
@@ -46,26 +46,26 @@ Swagger.clearCache = _index6.clearCache;
 Swagger.makeApisTagOperation = _interfaces.makeApisTagOperation;
 Swagger.buildRequest = _index9.buildRequest;
 Swagger.helpers = {
-  opId: _index10.opId
+  opId: _index0.opId
 };
 Swagger.getBaseUrl = _index9.baseUrl;
 Swagger.apidom = {
   resolve: {
     resolvers: {
-      HTTPResolverSwaggerClient: _index11.default
+      HTTPResolverSwaggerClient: _index1.default
     }
   },
   parse: {
     parsers: {
-      JsonParser: _index12.default,
-      YamlParser: _index13.default,
-      OpenApiJson3_1Parser: _index14.default,
-      OpenApiYaml3_1Parser: _index15.default
+      JsonParser: _index10.default,
+      YamlParser: _index11.default,
+      OpenApiJson3_1Parser: _index12.default,
+      OpenApiYaml3_1Parser: _index13.default
     }
   },
   dereference: {
     strategies: {
-      OpenApi3_1SwaggerClientDereferenceStrategy: _index16.default
+      OpenApi3_1SwaggerClientDereferenceStrategy: _index14.default
     }
   }
 };
@@ -132,7 +132,7 @@ Swagger.prototype.applyDefaults = function applyDefaults() {
     spec
   } = this;
   const specUrl = this.url;
-  if ((0, _openapiPredicates.isOpenAPI2)(spec) && (0, _index10.isHttpUrl)(specUrl)) {
+  if ((0, _openapiPredicates.isOpenAPI2)(spec) && (0, _index0.isHttpUrl)(specUrl)) {
     const parsed = new URL(specUrl);
     if (!spec.host) {
       spec.host = parsed.host;

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

@@ -6,7 +6,7 @@ exports.default = void 0;
 var _apidomCore = require("@swagger-api/apidom-core");
 var _apidomError = require("@swagger-api/apidom-error");
 var _apidomNsOpenapi = require("@swagger-api/apidom-ns-openapi-3-1");
-var _apidomJsonPointer = require("@swagger-api/apidom-json-pointer");
+var _modern = require("@swagger-api/apidom-json-pointer/modern");
 var _empty = require("@swagger-api/apidom-reference/configuration/empty");
 var _openapi = require("@swagger-api/apidom-reference/dereference/strategies/openapi-3-1");
 var _$anchor = require("@swagger-api/apidom-reference/dereference/strategies/openapi-3-1/selectors/$anchor");
@@ -70,10 +70,10 @@ class OpenAPI3_1SwaggerClientDereferenceVisitor extends _openapi.OpenAPI3_1Deref
       const reference = await this.toReference((0, _apidomCore.toValue)(referencingElement.$ref));
       const $refBaseURI = _empty.url.resolve(retrievalURI, (0, _apidomCore.toValue)(referencingElement.$ref));
       this.indirections.push(referencingElement);
-      const jsonPointer = (0, _apidomJsonPointer.uriToPointer)($refBaseURI);
+      const jsonPointer = _modern.URIFragmentIdentifier.fromURIReference($refBaseURI);
 
       // possibly non-semantic fragment
-      let referencedElement = (0, _apidomJsonPointer.evaluate)(jsonPointer, reference.value.result);
+      let referencedElement = (0, _modern.evaluate)(reference.value.result, jsonPointer);
       referencedElement.id = identityManager.identify(referencedElement);
 
       // applying semantics to a fragment
@@ -210,7 +210,7 @@ class OpenAPI3_1SwaggerClientDereferenceVisitor extends _openapi.OpenAPI3_1Deref
       const wrappedError = wrapError(rootCause, {
         baseDoc: this.reference.uri,
         $ref: (0, _apidomCore.toValue)(referencingElement.$ref),
-        pointer: (0, _apidomJsonPointer.uriToPointer)((0, _apidomCore.toValue)(referencingElement.$ref)),
+        pointer: _modern.URIFragmentIdentifier.fromURIReference((0, _apidomCore.toValue)(referencingElement.$ref)),
         fullPath: (_this$basePath2 = this.basePath) != null ? _this$basePath2 : [...(0, _toPath.default)([...ancestors, parent, referencingElement]), '$ref']
       });
       (_this$options$derefer3 = this.options.dereference.dereferenceOpts) == null || (_this$options$derefer3 = _this$options$derefer3.errors) == null || _this$options$derefer3.push == null || _this$options$derefer3.push(wrappedError);
@@ -249,10 +249,10 @@ class OpenAPI3_1SwaggerClientDereferenceVisitor extends _openapi.OpenAPI3_1Deref
       const reference = await this.toReference((0, _apidomCore.toValue)(pathItemElement.$ref));
       const $refBaseURI = _empty.url.resolve(retrievalURI, (0, _apidomCore.toValue)(pathItemElement.$ref));
       this.indirections.push(pathItemElement);
-      const jsonPointer = (0, _apidomJsonPointer.uriToPointer)($refBaseURI);
+      const jsonPointer = _modern.URIFragmentIdentifier.fromURIReference($refBaseURI);
 
       // possibly non-semantic referenced element
-      let referencedElement = (0, _apidomJsonPointer.evaluate)(jsonPointer, reference.value.result);
+      let referencedElement = (0, _modern.evaluate)(reference.value.result, jsonPointer);
       referencedElement.id = identityManager.identify(referencedElement);
 
       // applying semantics to a referenced element
@@ -381,7 +381,7 @@ class OpenAPI3_1SwaggerClientDereferenceVisitor extends _openapi.OpenAPI3_1Deref
       const wrappedError = wrapError(rootCause, {
         baseDoc: this.reference.uri,
         $ref: (0, _apidomCore.toValue)(pathItemElement.$ref),
-        pointer: (0, _apidomJsonPointer.uriToPointer)((0, _apidomCore.toValue)(pathItemElement.$ref)),
+        pointer: _modern.URIFragmentIdentifier.fromURIReference((0, _apidomCore.toValue)(pathItemElement.$ref)),
         fullPath: (_this$basePath4 = this.basePath) != null ? _this$basePath4 : [...(0, _toPath.default)([...ancestors, parent, pathItemElement]), '$ref']
       });
       (_this$options$derefer6 = this.options.dereference.dereferenceOpts) == null || (_this$options$derefer6 = _this$options$derefer6.errors) == null || _this$options$derefer6.push == null || _this$options$derefer6.push(wrappedError);
@@ -457,9 +457,9 @@ class OpenAPI3_1SwaggerClientDereferenceVisitor extends _openapi.OpenAPI3_1Deref
             return undefined;
           }
           reference = await this.toReference(_empty.url.unsanitize($refBaseURI));
-          const selector = (0, _apidomJsonPointer.uriToPointer)($refBaseURI);
+          const selector = _modern.URIFragmentIdentifier.fromURIReference($refBaseURI);
           const referenceAsSchema = (0, _openapi.maybeRefractToSchemaElement)(reference.value.result);
-          referencedElement = (0, _apidomJsonPointer.evaluate)(selector, referenceAsSchema);
+          referencedElement = (0, _modern.evaluate)(referenceAsSchema, selector);
           referencedElement = (0, _openapi.maybeRefractToSchemaElement)(referencedElement);
           referencedElement.id = identityManager.identify(referencedElement);
         }
@@ -507,9 +507,9 @@ class OpenAPI3_1SwaggerClientDereferenceVisitor extends _openapi.OpenAPI3_1Deref
               return undefined;
             }
             reference = await this.toReference(_empty.url.unsanitize($refBaseURI));
-            const selector = (0, _apidomJsonPointer.uriToPointer)($refBaseURI);
+            const selector = _modern.URIFragmentIdentifier.fromURIReference($refBaseURI);
             const referenceAsSchema = (0, _openapi.maybeRefractToSchemaElement)(reference.value.result);
-            referencedElement = (0, _apidomJsonPointer.evaluate)(selector, referenceAsSchema);
+            referencedElement = (0, _modern.evaluate)(referenceAsSchema, selector);
             referencedElement = (0, _openapi.maybeRefractToSchemaElement)(referencedElement);
             referencedElement.id = identityManager.identify(referencedElement);
           }
@@ -667,14 +667,14 @@ class OpenAPI3_1SwaggerClientDereferenceVisitor extends _openapi.OpenAPI3_1Deref
     try {
       return await super.ExampleElement(exampleElement, key, parent, path, ancestors, link);
     } catch (error) {
-      var _this$basePath7, _this$options$derefer10;
+      var _this$basePath7, _this$options$derefer0;
       const rootCause = (0, _getRootCause.default)(error);
       const wrappedError = wrapError(rootCause, {
         baseDoc: this.reference.uri,
         externalValue: (0, _apidomCore.toValue)(exampleElement.externalValue),
         fullPath: (_this$basePath7 = this.basePath) != null ? _this$basePath7 : [...(0, _toPath.default)([...ancestors, parent, exampleElement]), 'externalValue']
       });
-      (_this$options$derefer10 = this.options.dereference.dereferenceOpts) == null || (_this$options$derefer10 = _this$options$derefer10.errors) == null || _this$options$derefer10.push == null || _this$options$derefer10.push(wrappedError);
+      (_this$options$derefer0 = this.options.dereference.dereferenceOpts) == null || (_this$options$derefer0 = _this$options$derefer0.errors) == null || _this$options$derefer0.push == null || _this$options$derefer0.push(wrappedError);
       return undefined;
     }
   }

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

@@ -3,6 +3,7 @@
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault").default;
 exports.__esModule = true;
 exports.default = normalize;
+var _ramdaAdjunct = require("ramda-adjunct");
 var _opId = _interopRequireDefault(require("../../../helpers/op-id.js"));
 function normalize(parsedSpec) {
   const {
@@ -78,12 +79,16 @@ function normalize(parsedSpec) {
           for (const inherits of inheritsList) {
             // eslint-disable-next-line no-restricted-syntax
             for (const inheritName in inherits) {
-              if (!operation[inheritName]) {
+              if (!Array.isArray(operation[inheritName])) {
                 operation[inheritName] = inherits[inheritName];
               } else if (inheritName === 'parameters') {
                 // eslint-disable-next-line no-restricted-syntax
                 for (const param of inherits[inheritName]) {
-                  const exists = operation[inheritName].some(opParam => opParam.name && opParam.name === param.name || opParam.$ref && opParam.$ref === param.$ref || opParam.$$ref && opParam.$$ref === param.$$ref || opParam === param);
+                  const exists = operation[inheritName].some(opParam => {
+                    if (!(0, _ramdaAdjunct.isPlainObject)(opParam) && !(0, _ramdaAdjunct.isPlainObject)(param)) return false;
+                    if (opParam === param) return true;
+                    return ['name', '$ref', '$$ref'].some(key => typeof opParam[key] === 'string' && typeof param[key] === 'string' && opParam[key] === param[key]);
+                  });
                   if (!exists) {
                     operation[inheritName].push(param);
                   }

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

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequ
 exports.__esModule = true;
 exports.default = exports.circularReplacer = void 0;
 var _apidomCore = require("@swagger-api/apidom-core");
-var _apidomJsonPointer = require("@swagger-api/apidom-json-pointer");
+var _modern = require("@swagger-api/apidom-json-pointer/modern");
 var _apidomNsOpenapi = require("@swagger-api/apidom-ns-openapi-3-1");
 var _empty = require("@swagger-api/apidom-reference/configuration/empty");
 var _binary = _interopRequireDefault(require("@swagger-api/apidom-reference/parse/parsers/binary"));
@@ -72,9 +72,9 @@ const resolveOpenAPI31Strategy = async options => {
     const openApiParseResultElement = new _apidomCore.ParseResultElement([openApiElement]);
 
     // prepare fragment for dereferencing
-    const jsonPointer = (0, _apidomJsonPointer.compile)(pathDiscriminator);
+    const jsonPointer = (0, _modern.compile)(pathDiscriminator);
     const jsonPointerURI = jsonPointer === '' ? '' : `#${jsonPointer}`;
-    const fragmentElement = (0, _apidomJsonPointer.evaluate)(jsonPointer, openApiElement);
+    const fragmentElement = (0, _modern.evaluate)(openApiElement, jsonPointer);
 
     // prepare reference set for dereferencing
     const openApiElementReference = new _empty.Reference({
@@ -155,7 +155,7 @@ const resolveOpenAPI31Strategy = async options => {
       errors
     };
   } catch (error) {
-    if (error instanceof _apidomJsonPointer.InvalidJsonPointerError || error instanceof _apidomJsonPointer.EvaluationJsonPointerError) {
+    if (error instanceof _modern.JSONPointerEvaluateError) {
       return {
         spec,
         errors: []

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "swagger-client",
-  "version": "3.35.0",
+  "version": "3.35.2",
   "description": "SwaggerJS - a collection of interfaces for OAI specs",
   "browser": {
     "./src/helpers/btoa.node.js": "./src/helpers/btoa.browser.js",
@@ -74,11 +74,11 @@
   "dependencies": {
     "@babel/runtime-corejs3": "^7.22.15",
     "@scarf/scarf": "=1.4.0",
-    "@swagger-api/apidom-core": ">=1.0.0-beta.31 <1.0.0-rc.0",
-    "@swagger-api/apidom-error": ">=1.0.0-beta.31 <1.0.0-rc.0",
-    "@swagger-api/apidom-json-pointer": ">=1.0.0-beta.31 <1.0.0-rc.0",
-    "@swagger-api/apidom-ns-openapi-3-1": ">=1.0.0-beta.31 <1.0.0-rc.0",
-    "@swagger-api/apidom-reference": ">=1.0.0-beta.31 <1.0.0-rc.0",
+    "@swagger-api/apidom-core": ">=1.0.0-beta.37 <1.0.0-rc.0",
+    "@swagger-api/apidom-error": ">=1.0.0-beta.37 <1.0.0-rc.0",
+    "@swagger-api/apidom-json-pointer": ">=1.0.0-beta.37 <1.0.0-rc.0",
+    "@swagger-api/apidom-ns-openapi-3-1": ">=1.0.0-beta.37 <1.0.0-rc.0",
+    "@swagger-api/apidom-reference": ">=1.0.0-beta.37 <1.0.0-rc.0",
     "@swaggerexpert/cookie": "^2.0.2",
     "deepmerge": "~4.3.0",
     "fast-json-patch": "^3.0.0-1",
@@ -104,9 +104,9 @@
     "cross-env": "=7.0.3",
     "eslint": "^8.42.0",
     "eslint-config-airbnb-base": "^15.0.0",
-    "eslint-config-prettier": "=10.1.2",
+    "eslint-config-prettier": "=10.1.5",
     "eslint-plugin-import": "=2.31.0",
-    "eslint-plugin-prettier": "=5.2.6",
+    "eslint-plugin-prettier": "=5.4.0",
     "expect": "^29.0.3",
     "glob": "=11.0.2",
     "husky": "^9.0.11",
@@ -116,7 +116,7 @@
     "jest-environment-jsdom": "^29.0.3",
     "json-loader": "=0.5.7",
     "license-checker": "=25.0.1",
-    "lint-staged": "=15.5.1",
+    "lint-staged": "=16.0.0",
     "lodash": "^4.17.21",
     "npm-run-all": "=4.1.5",
     "prettier": "^3.1.1",
@@ -124,7 +124,7 @@
     "source-map-explorer": "^2.5.3",
     "terser-webpack-plugin": "^5.0.3",
     "undici": "^5.28.4",
-    "webpack": "=5.99.7",
+    "webpack": "=5.99.8",
     "webpack-bundle-size-analyzer": "=3.1.0",
     "webpack-cli": "=6.0.1",
     "webpack-stats-plugin": "=1.1.3"