fix(reference): base OpenAPI 3.1.0 resolver strategy on dereference s…

…trategy (#3910) Refs #3452
swagger-api · Mar 8, 2024 · b21d7bf · b21d7bf
1 parent 98cb77f
commit b21d7bf
Show file tree

Hide file tree

Showing 22 changed files with 56 additions and 552 deletions.
diff --git a/packages/apidom-reference/src/dereference/strategies/openapi-3-1/index.ts b/packages/apidom-reference/src/dereference/strategies/openapi-3-1/index.ts
@@ -73,9 +73,6 @@ const OpenApi3_1DereferenceStrategy: stampit.Stamp<IDereferenceStrategy> = stamp
 );
 
 export { OpenApi3_1DereferenceVisitor };
-export {
-  resolveSchema$refField,
-  maybeRefractToSchemaElement,
-} from '../../../resolve/strategies/openapi-3-1/util';
+export { resolveSchema$refField, resolveSchema$idField, maybeRefractToSchemaElement } from './util';
 
 export default OpenApi3_1DereferenceStrategy;
diff --git a/packages/apidom-reference/src/dereference/strategies/openapi-3-1/selectors/uri.ts b/packages/apidom-reference/src/dereference/strategies/openapi-3-1/selectors/uri.ts
@@ -6,7 +6,7 @@ import { uriToPointer, evaluate as jsonPointerEvaluate } from '@swagger-api/apid
 import * as url from '../../../../util/url';
 import EvaluationJsonSchemaUriError from '../../../../errors/EvaluationJsonSchemaUriError';
 import { isAnchor, uriToAnchor, evaluate as $anchorEvaluate } from './$anchor';
-import { resolveSchema$idField } from '../../../../resolve/strategies/openapi-3-1/util';
+import { resolveSchema$idField } from '../util';
 
 /**
  * Evaluates JSON Schema $ref containing unknown URI against ApiDOM fragment.

diff --git a/...rc/resolve/strategies/openapi-3-1/util.ts → ...ereference/strategies/openapi-3-1/util.ts b/...rc/resolve/strategies/openapi-3-1/util.ts → ...ereference/strategies/openapi-3-1/util.ts
diff --git a/packages/apidom-reference/src/dereference/strategies/openapi-3-1/visitor.ts b/packages/apidom-reference/src/dereference/strategies/openapi-3-1/visitor.ts
@@ -40,10 +40,7 @@ import * as url from '../../../util/url';
 import parse from '../../../parse';
 import Reference from '../../../Reference';
 import File from '../../../util/File';
-import {
-  resolveSchema$refField,
-  maybeRefractToSchemaElement,
-} from '../../../resolve/strategies/openapi-3-1/util';
+import { resolveSchema$refField, maybeRefractToSchemaElement } from './util';
 import { AncestorLineage } from '../../util';
 import EvaluationJsonSchemaUriError from '../../../errors/EvaluationJsonSchemaUriError';
 

diff --git a/packages/apidom-reference/src/resolve/strategies/apidom/index.ts b/packages/apidom-reference/src/resolve/strategies/apidom/index.ts
@@ -9,8 +9,8 @@ import {
 } from '../../../types';
 import ReferenceSet from '../../../ReferenceSet';
 import Reference from '../../../Reference';
-import ApiDOMResolveVisitor from './visitor';
 import { merge as mergeOptions } from '../../../options/util';
+import ApiDOMResolveVisitor from './visitor';
 
 // @ts-ignore
 const visitAsync = visit[Symbol.for('nodejs.util.promisify.custom')];

diff --git a/packages/apidom-reference/src/resolve/strategies/asyncapi-2/index.ts b/packages/apidom-reference/src/resolve/strategies/asyncapi-2/index.ts
@@ -15,6 +15,7 @@ import {
 } from '../../../types';
 import ReferenceSet from '../../../ReferenceSet';
 import Reference from '../../../Reference';
+import { merge as mergeOptions } from '../../../options/util';
 import AsyncApi2ResolveVisitor from './visitor';
 
 // @ts-ignore
@@ -38,7 +39,8 @@ const AsyncApi2ResolveStrategy: stampit.Stamp<IResolveStrategy> = stampit(Resolv
     async resolve(file: IFile, options: IReferenceOptions) {
       const namespace = createNamespace(asyncApi2Namespace);
       const reference = Reference({ uri: file.uri, value: file.parseResult });
-      const visitor = AsyncApi2ResolveVisitor({ reference, namespace, options });
+      const mergedOptions = mergeOptions(options, { resolve: { internal: false } });
+      const visitor = AsyncApi2ResolveVisitor({ reference, namespace, options: mergedOptions });
       const refSet = ReferenceSet();
       refSet.add(reference);
 

diff --git a/packages/apidom-reference/src/resolve/strategies/openapi-2/index.ts b/packages/apidom-reference/src/resolve/strategies/openapi-2/index.ts
@@ -15,8 +15,8 @@ import {
 } from '../../../types';
 import ReferenceSet from '../../../ReferenceSet';
 import Reference from '../../../Reference';
-import OpenApi2ResolveVisitor from './visitor';
 import { merge as mergeOptions } from '../../../options/util';
+import OpenApi2ResolveVisitor from './visitor';
 
 // @ts-ignore
 const visitAsync = visit[Symbol.for('nodejs.util.promisify.custom')];

diff --git a/packages/apidom-reference/src/resolve/strategies/openapi-3-0/index.ts b/packages/apidom-reference/src/resolve/strategies/openapi-3-0/index.ts
@@ -15,8 +15,8 @@ import {
 } from '../../../types';
 import ReferenceSet from '../../../ReferenceSet';
 import Reference from '../../../Reference';
-import OpenApi3_0ResolveVisitor from './visitor';
 import { merge as mergeOptions } from '../../../options/util';
+import OpenApi3_0ResolveVisitor from './visitor';
 
 // @ts-ignore
 const visitAsync = visit[Symbol.for('nodejs.util.promisify.custom')];

diff --git a/packages/apidom-reference/src/resolve/strategies/openapi-3-1/index.ts b/packages/apidom-reference/src/resolve/strategies/openapi-3-1/index.ts
@@ -15,6 +15,7 @@ import {
 } from '../../../types';
 import ReferenceSet from '../../../ReferenceSet';
 import Reference from '../../../Reference';
+import { merge as mergeOptions } from '../../../options/util';
 import OpenApi3_1ResolveVisitor from './visitor';
 
 // @ts-ignore
@@ -39,15 +40,15 @@ const OpenApi3_1ResolveStrategy: stampit.Stamp<IResolveStrategy> = stampit(Resol
     async resolve(file: IFile, options: IReferenceOptions) {
       const namespace = createNamespace(openApi3_1Namespace);
       const reference = Reference({ uri: file.uri, value: file.parseResult });
-      const visitor = OpenApi3_1ResolveVisitor({ reference, namespace, options });
+      const mergedOptions = mergeOptions(options, { resolve: { internal: false } });
+      const visitor = OpenApi3_1ResolveVisitor({ reference, namespace, options: mergedOptions });
       const refSet = ReferenceSet();
       refSet.add(reference);
 
       await visitAsync(refSet.rootRef.value, visitor, {
         keyMap,
         nodeTypeGetter: getNodeType,
       });
-      await visitor.crawl();
 
       return refSet;
     },