Skip to content

Commit

Permalink
fix(resolver): fix side effects in OpenAPI 3.1.0 resolving (#3456)
Browse files Browse the repository at this point in the history
Refs #3455
  • Loading branch information
char0n committed Apr 4, 2024
1 parent 0446d56 commit 1631813
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 11 deletions.
10 changes: 5 additions & 5 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions package.json
Expand Up @@ -110,11 +110,11 @@
},
"dependencies": {
"@babel/runtime-corejs3": "^7.22.15",
"@swagger-api/apidom-core": ">=0.98.0 <1.0.0",
"@swagger-api/apidom-error": ">=0.98.0 <1.0.0",
"@swagger-api/apidom-json-pointer": ">=0.98.0 <1.0.0",
"@swagger-api/apidom-ns-openapi-3-1": ">=0.98.0 <1.0.0",
"@swagger-api/apidom-reference": ">=0.98.0 <1.0.0",
"@swagger-api/apidom-core": ">=0.99.0 <1.0.0",
"@swagger-api/apidom-error": ">=0.99.0 <1.0.0",
"@swagger-api/apidom-json-pointer": ">=0.99.0 <1.0.0",
"@swagger-api/apidom-ns-openapi-3-1": ">=0.99.0 <1.0.0",
"@swagger-api/apidom-reference": ">=0.99.0 <1.0.0",
"cookie": "~0.6.0",
"deepmerge": "~4.3.0",
"fast-json-patch": "^3.0.0-1",
Expand Down
Expand Up @@ -10,6 +10,7 @@ import ModelPropertyMacroVisitor from './visitors/properties.js';
import AllOfVisitor from './visitors/all-of.js';

const visitAsync = visit[Symbol.for('nodejs.util.promisify.custom')];
const mergeAllVisitorsAsync = mergeAllVisitors[Symbol.for('nodejs.util.promisify.custom')];

const OpenApi3_1SwaggerClientDereferenceStrategy = OpenApi3_1DereferenceStrategy.compose({
props: {
Expand Down Expand Up @@ -87,7 +88,7 @@ const OpenApi3_1SwaggerClientDereferenceStrategy = OpenApi3_1DereferenceStrategy
}

// establish root visitor by visitor merging
const rootVisitor = mergeAllVisitors(visitors, { nodeTypeGetter: getNodeType });
const rootVisitor = mergeAllVisitorsAsync(visitors, { nodeTypeGetter: getNodeType });

const dereferencedElement = await visitAsync(refSet.rootRef.value, rootVisitor, {
keyMap,
Expand Down

0 comments on commit 1631813

Please sign in to comment.