@speclynx/apidom-reference 2.13.1 → 3.1.0

package/src/dereference/strategies/openapi-3-1/index.cjs

@@ -1,13 +1,12 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault").default;
-var _interopRequireWildcard = require("@babel/runtime-corejs3/helpers/interopRequireWildcard").default;
 exports.__esModule = true;
 exports.resolveSchema$refField = exports.resolveSchema$idField = exports.maybeRefractToSchemaElement = exports.default = void 0;
 var _ramda = require("ramda");
 var _apidomDatamodel = require("@speclynx/apidom-datamodel");
 var _apidomTraverse = require("@speclynx/apidom-traverse");
-var _apidomNsOpenapi = _interopRequireWildcard(require("@speclynx/apidom-ns-openapi-3-1"));
+var _apidomNsOpenapi = require("@speclynx/apidom-ns-openapi-3-1");
 var _DereferenceStrategy = _interopRequireDefault(require("../DereferenceStrategy.cjs"));
 var _Reference = _interopRequireDefault(require("../../../Reference.cjs"));
 var _ReferenceSet = _interopRequireDefault(require("../../../ReferenceSet.cjs"));
@@ -41,7 +40,6 @@ class OpenAPI3_1DereferenceStrategy extends _DereferenceStrategy.default {
     return (0, _apidomNsOpenapi.isOpenApi3_1Element)(file.parseResult?.result);
   }
   async dereference(file, options) {
-    const namespace = new _apidomDatamodel.Namespace().use(_apidomNsOpenapi.default);
     const immutableRefSet = options.dereference.refSet ?? new _ReferenceSet.default();
     const mutableRefSet = new _ReferenceSet.default();
     let refSet = immutableRefSet;
@@ -71,7 +69,6 @@ class OpenAPI3_1DereferenceStrategy extends _DereferenceStrategy.default {
     }
     const visitor = new _visitor.default({
       reference: reference,
-      namespace,
       options
     });
     const dereferencedElement = await (0, _apidomTraverse.traverseAsync)(refSet.rootRef.value, visitor, {

package/src/dereference/strategies/openapi-3-1/index.mjs

@@ -1,7 +1,7 @@
 import { propEq } from 'ramda';
-import { Namespace, cloneDeep } from '@speclynx/apidom-datamodel';
+import { cloneDeep } from '@speclynx/apidom-datamodel';
 import { traverseAsync } from '@speclynx/apidom-traverse';
-import openApi3_1Namespace, { isOpenApi3_1Element, mediaTypes } from '@speclynx/apidom-ns-openapi-3-1';
+import { isOpenApi3_1Element, mediaTypes } from '@speclynx/apidom-ns-openapi-3-1';
 import DereferenceStrategy from "../DereferenceStrategy.mjs";
 import Reference from "../../../Reference.mjs";
 import ReferenceSet from "../../../ReferenceSet.mjs";
@@ -29,7 +29,6 @@ class OpenAPI3_1DereferenceStrategy extends DereferenceStrategy {
     return isOpenApi3_1Element(file.parseResult?.result);
   }
   async dereference(file, options) {
-    const namespace = new Namespace().use(openApi3_1Namespace);
     const immutableRefSet = options.dereference.refSet ?? new ReferenceSet();
     const mutableRefSet = new ReferenceSet();
     let refSet = immutableRefSet;
@@ -59,7 +58,6 @@ class OpenAPI3_1DereferenceStrategy extends DereferenceStrategy {
     }
     const visitor = new OpenAPI3_1DereferenceVisitor({
       reference: reference,
-      namespace,
       options
     });
     const dereferencedElement = await traverseAsync(refSet.rootRef.value, visitor, {

package/src/dereference/strategies/openapi-3-1/util.cjs

@@ -16,7 +16,7 @@ const resolveSchema$refField = (retrievalURI, schemaElement) => {
     return undefined;
   }
   const hash = url.getHash((0, _apidomCore.toValue)(schemaElement.$ref));
-  const ancestorsSchemaIdentifiers = (0, _apidomCore.toValue)(schemaElement.meta.get('ancestorsSchemaIdentifiers'));
+  const ancestorsSchemaIdentifiers = schemaElement.meta.get('ancestorsSchemaIdentifiers');
   const $refBaseURI = (0, _ramda.reduce)((acc, uri) => {
     return url.resolve(acc, url.sanitize(url.stripHash(uri)));
   }, retrievalURI, [...ancestorsSchemaIdentifiers, (0, _apidomCore.toValue)(schemaElement.$ref)]);
@@ -31,7 +31,7 @@ const resolveSchema$idField = (retrievalURI, schemaElement) => {
   if (typeof schemaElement.$id === 'undefined') {
     return undefined;
   }
-  const ancestorsSchemaIdentifiers = (0, _apidomCore.toValue)(schemaElement.meta.get('ancestorsSchemaIdentifiers'));
+  const ancestorsSchemaIdentifiers = schemaElement.meta.get('ancestorsSchemaIdentifiers');
   return (0, _ramda.reduce)((acc, $id) => {
     return url.resolve(acc, url.sanitize(url.stripHash($id)));
   }, retrievalURI, ancestorsSchemaIdentifiers);

package/src/dereference/strategies/openapi-3-1/util.mjs

@@ -11,7 +11,7 @@ export const resolveSchema$refField = (retrievalURI, schemaElement) => {
     return undefined;
   }
   const hash = url.getHash(toValue(schemaElement.$ref));
-  const ancestorsSchemaIdentifiers = toValue(schemaElement.meta.get('ancestorsSchemaIdentifiers'));
+  const ancestorsSchemaIdentifiers = schemaElement.meta.get('ancestorsSchemaIdentifiers');
   const $refBaseURI = reduce((acc, uri) => {
     return url.resolve(acc, url.sanitize(url.stripHash(uri)));
   }, retrievalURI, [...ancestorsSchemaIdentifiers, toValue(schemaElement.$ref)]);
@@ -25,7 +25,7 @@ export const resolveSchema$idField = (retrievalURI, schemaElement) => {
   if (typeof schemaElement.$id === 'undefined') {
     return undefined;
   }
-  const ancestorsSchemaIdentifiers = toValue(schemaElement.meta.get('ancestorsSchemaIdentifiers'));
+  const ancestorsSchemaIdentifiers = schemaElement.meta.get('ancestorsSchemaIdentifiers');
   return reduce((acc, $id) => {
     return url.resolve(acc, url.sanitize(url.stripHash($id)));
   }, retrievalURI, ancestorsSchemaIdentifiers);