@speclynx/apidom-ns-openapi-3-1 1.12.2 → 2.1.0

package/src/refractor/toolbox.cjs

@@ -4,23 +4,16 @@ var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequ
 var _interopRequireWildcard = require("@babel/runtime-corejs3/helpers/interopRequireWildcard").default;
 exports.__esModule = true;
 exports.default = exports.ancestorLineageToJSONPointer = void 0;
+var _apidomDatamodel = require("@speclynx/apidom-datamodel");
 var _apidomCore = require("@speclynx/apidom-core");
 var _apidomJsonPointer = require("@speclynx/apidom-json-pointer");
-var _apidomNsOpenapi = require("@speclynx/apidom-ns-openapi-3-0");
 var openApi3_1Predicates = _interopRequireWildcard(require("../predicates.cjs"));
+var refractorPredicates = _interopRequireWildcard(require("./predicates.cjs"));
 var _namespace = _interopRequireDefault(require("../namespace.cjs"));
 /**
  * @public
  */
 
-/**
- * @public
- */
-
-/**
- * @public
- */
-
 /**
  * Translates visitor ancestor lineage to a JSON Pointer tokens.
  * Ancestor lineage is constructed of following visitor method arguments:
@@ -32,11 +25,12 @@ var _namespace = _interopRequireDefault(require("../namespace.cjs"));
  */
 const ancestorLineageToJSONPointer = elementPath => {
   const jsonPointerTokens = elementPath.reduce((path, element, index) => {
-    if ((0, _apidomCore.isMemberElement)(element)) {
+    if ((0, _apidomDatamodel.isMemberElement)(element)) {
       const token = String((0, _apidomCore.toValue)(element.key));
       path.push(token);
-    } else if ((0, _apidomCore.isArrayElement)(elementPath[index - 2])) {
-      const token = String(elementPath[index - 2].content.indexOf(element));
+    } else if ((0, _apidomDatamodel.isArrayElement)(elementPath[index - 2])) {
+      const arrayElement = elementPath[index - 2];
+      const token = String(arrayElement.content?.indexOf(element) ?? -1);
       path.push(token);
     }
     return path;
@@ -49,18 +43,15 @@ const ancestorLineageToJSONPointer = elementPath => {
  */
 exports.ancestorLineageToJSONPointer = ancestorLineageToJSONPointer;
 const createToolbox = () => {
-  const namespace = (0, _apidomCore.createNamespace)(_namespace.default);
+  const namespace = new _apidomDatamodel.Namespace();
   const predicates = {
+    ...refractorPredicates,
     ...openApi3_1Predicates,
-    isElement: _apidomCore.isElement,
-    isStringElement: _apidomCore.isStringElement,
-    isArrayElement: _apidomCore.isArrayElement,
-    isObjectElement: _apidomCore.isObjectElement,
-    isMemberElement: _apidomCore.isMemberElement,
-    isServersElement: _apidomNsOpenapi.isServersElement,
-    includesClasses: _apidomCore.includesClasses,
-    hasElementSourceMap: _apidomCore.hasElementSourceMap
+    isStringElement: _apidomDatamodel.isStringElement,
+    isArrayElement: _apidomDatamodel.isArrayElement,
+    isObjectElement: _apidomDatamodel.isObjectElement
   };
+  namespace.use(_namespace.default);
   return {
     predicates,
     ancestorLineageToJSONPointer,

package/src/refractor/toolbox.mjs

@@ -1,14 +1,9 @@
-import { isElement, isStringElement, isArrayElement, isObjectElement, isMemberElement, toValue, createNamespace, includesClasses, hasElementSourceMap } from '@speclynx/apidom-core';
+import { Namespace, isStringElement, isArrayElement, isObjectElement, isMemberElement } from '@speclynx/apidom-datamodel';
+import { toValue } from '@speclynx/apidom-core';
 import { compile as compileJSONPointerTokens } from '@speclynx/apidom-json-pointer';
-import { isServersElement } from '@speclynx/apidom-ns-openapi-3-0';
 import * as openApi3_1Predicates from "../predicates.mjs";
+import * as refractorPredicates from "./predicates.mjs";
 import openApi3_1Namespace from "../namespace.mjs";
-/**
- * @public
- */
-/**
- * @public
- */
 /**
  * @public
  */
@@ -27,7 +22,8 @@ export const ancestorLineageToJSONPointer = elementPath => {
       const token = String(toValue(element.key));
       path.push(token);
     } else if (isArrayElement(elementPath[index - 2])) {
-      const token = String(elementPath[index - 2].content.indexOf(element));
+      const arrayElement = elementPath[index - 2];
+      const token = String(arrayElement.content?.indexOf(element) ?? -1);
       path.push(token);
     }
     return path;
@@ -39,18 +35,15 @@ export const ancestorLineageToJSONPointer = elementPath => {
  * @public
  */
 const createToolbox = () => {
-  const namespace = createNamespace(openApi3_1Namespace);
+  const namespace = new Namespace();
   const predicates = {
+    ...refractorPredicates,
     ...openApi3_1Predicates,
-    isElement,
     isStringElement,
     isArrayElement,
-    isObjectElement,
-    isMemberElement,
-    isServersElement,
-    includesClasses,
-    hasElementSourceMap
+    isObjectElement
   };
+  namespace.use(openApi3_1Namespace);
   return {
     predicates,
     ancestorLineageToJSONPointer,

package/src/refractor/visitors/open-api-3-1/JsonSchemaDialectVisitor.cjs

@@ -3,10 +3,9 @@
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault").default;
 exports.__esModule = true;
 exports.default = void 0;
-var _tsMixer = require("ts-mixer");
 var _apidomCore = require("@speclynx/apidom-core");
-var _apidomNsOpenapi = require("@speclynx/apidom-ns-openapi-3-0");
 var _JsonSchemaDialect = _interopRequireDefault(require("../../../elements/JsonSchemaDialect.cjs"));
+var _bases = require("./bases.cjs");
 /**
  * @public
  */
@@ -14,12 +13,13 @@ var _JsonSchemaDialect = _interopRequireDefault(require("../../../elements/JsonS
 /**
  * @public
  */
-class JsonSchemaDialectVisitor extends (0, _tsMixer.Mixin)(_apidomNsOpenapi.SpecificationVisitor, _apidomNsOpenapi.FallbackVisitor) {
-  StringElement(stringElement) {
+class JsonSchemaDialectVisitor extends _bases.BaseSpecificationVisitor {
+  StringElement(path) {
+    const stringElement = path.node;
     const jsonSchemaDialectElement = new _JsonSchemaDialect.default((0, _apidomCore.toValue)(stringElement));
     this.copyMetaAndAttributes(stringElement, jsonSchemaDialectElement);
     this.element = jsonSchemaDialectElement;
-    return _apidomCore.BREAK;
+    path.stop();
   }
 }
 var _default = exports.default = JsonSchemaDialectVisitor;

package/src/refractor/visitors/open-api-3-1/JsonSchemaDialectVisitor.mjs

@@ -1,19 +1,19 @@
-import { Mixin } from 'ts-mixer';
-import { BREAK, toValue } from '@speclynx/apidom-core';
-import { FallbackVisitor, SpecificationVisitor } from '@speclynx/apidom-ns-openapi-3-0';
+import { toValue } from '@speclynx/apidom-core';
 import JsonSchemaDialectElement from "../../../elements/JsonSchemaDialect.mjs";
+import { BaseSpecificationVisitor } from "./bases.mjs";
 /**
  * @public
  */
 /**
  * @public
  */
-class JsonSchemaDialectVisitor extends Mixin(SpecificationVisitor, FallbackVisitor) {
-  StringElement(stringElement) {
+class JsonSchemaDialectVisitor extends BaseSpecificationVisitor {
+  StringElement(path) {
+    const stringElement = path.node;
     const jsonSchemaDialectElement = new JsonSchemaDialectElement(toValue(stringElement));
     this.copyMetaAndAttributes(stringElement, jsonSchemaDialectElement);
     this.element = jsonSchemaDialectElement;
-    return BREAK;
+    path.stop();
   }
 }
 export default JsonSchemaDialectVisitor;

package/src/refractor/visitors/open-api-3-1/OpenapiVisitor.cjs

@@ -0,0 +1,25 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault").default;
+exports.__esModule = true;
+exports.default = void 0;
+var _apidomCore = require("@speclynx/apidom-core");
+var _bases = require("./bases.cjs");
+var _Openapi = _interopRequireDefault(require("../../../elements/Openapi.cjs"));
+/**
+ * @public
+ */
+
+/**
+ * @public
+ */
+class OpenapiVisitor extends _bases.BaseSpecificationVisitor {
+  StringElement(path) {
+    const stringElement = path.node;
+    const openapiElement = new _Openapi.default((0, _apidomCore.toValue)(stringElement));
+    this.copyMetaAndAttributes(stringElement, openapiElement);
+    this.element = openapiElement;
+    path.stop();
+  }
+}
+var _default = exports.default = OpenapiVisitor;

package/src/refractor/visitors/open-api-3-1/OpenapiVisitor.mjs

@@ -0,0 +1,19 @@
+import { toValue } from '@speclynx/apidom-core';
+import { BaseSpecificationVisitor } from "./bases.mjs";
+import OpenapiElement from "../../../elements/Openapi.mjs";
+/**
+ * @public
+ */
+/**
+ * @public
+ */
+class OpenapiVisitor extends BaseSpecificationVisitor {
+  StringElement(path) {
+    const stringElement = path.node;
+    const openapiElement = new OpenapiElement(toValue(stringElement));
+    this.copyMetaAndAttributes(stringElement, openapiElement);
+    this.element = openapiElement;
+    path.stop();
+  }
+}
+export default OpenapiVisitor;

package/src/refractor/visitors/open-api-3-1/WebhooksVisitor.cjs

@@ -3,11 +3,11 @@
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault").default;
 exports.__esModule = true;
 exports.default = void 0;
-var _tsMixer = require("ts-mixer");
 var _apidomCore = require("@speclynx/apidom-core");
 var _apidomNsOpenapi = require("@speclynx/apidom-ns-openapi-3-0");
 var _Webhooks = _interopRequireDefault(require("../../../elements/nces/Webhooks.cjs"));
 var _predicates = require("../../../predicates.cjs");
+var _bases = require("./bases.cjs");
 /**
  * @public
  */
@@ -15,14 +15,14 @@ var _predicates = require("../../../predicates.cjs");
 /**
  * @public
  */
-class WebhooksVisitor extends (0, _tsMixer.Mixin)(_apidomNsOpenapi.MapVisitor, _apidomNsOpenapi.FallbackVisitor) {
+class WebhooksVisitor extends _bases.BaseMapVisitor {
   constructor(options) {
     super(options);
     this.element = new _Webhooks.default();
     this.specPath = element => (0, _apidomNsOpenapi.isReferenceLikeElement)(element) ? ['document', 'objects', 'Reference'] : ['document', 'objects', 'PathItem'];
   }
-  ObjectElement(objectElement) {
-    const result = _apidomNsOpenapi.MapVisitor.prototype.ObjectElement.call(this, objectElement);
+  ObjectElement(path) {
+    _apidomNsOpenapi.MapVisitor.prototype.ObjectElement.call(this, path);
 
     // decorate every ReferenceElement with metadata about their referencing type
     // @ts-ignore
@@ -38,7 +38,6 @@ class WebhooksVisitor extends (0, _tsMixer.Mixin)(_apidomNsOpenapi.MapVisitor, _
       // @ts-ignore
       pathItemElement.setMetaProperty('webhook-name', (0, _apidomCore.toValue)(key));
     });
-    return result;
   }
 }
 var _default = exports.default = WebhooksVisitor;

package/src/refractor/visitors/open-api-3-1/WebhooksVisitor.mjs

@@ -1,22 +1,22 @@
-import { Mixin } from 'ts-mixer';
 import { toValue } from '@speclynx/apidom-core';
-import { isReferenceLikeElement, MapVisitor, FallbackVisitor } from '@speclynx/apidom-ns-openapi-3-0';
+import { isReferenceLikeElement, MapVisitor } from '@speclynx/apidom-ns-openapi-3-0';
 import WebhooksElement from "../../../elements/nces/Webhooks.mjs";
 import { isPathItemElement, isReferenceElement } from "../../../predicates.mjs";
+import { BaseMapVisitor } from "./bases.mjs";
 /**
  * @public
  */
 /**
  * @public
  */
-class WebhooksVisitor extends Mixin(MapVisitor, FallbackVisitor) {
+class WebhooksVisitor extends BaseMapVisitor {
   constructor(options) {
     super(options);
     this.element = new WebhooksElement();
     this.specPath = element => isReferenceLikeElement(element) ? ['document', 'objects', 'Reference'] : ['document', 'objects', 'PathItem'];
   }
-  ObjectElement(objectElement) {
-    const result = MapVisitor.prototype.ObjectElement.call(this, objectElement);
+  ObjectElement(path) {
+    MapVisitor.prototype.ObjectElement.call(this, path);
 
     // decorate every ReferenceElement with metadata about their referencing type
     // @ts-ignore
@@ -32,7 +32,6 @@ class WebhooksVisitor extends Mixin(MapVisitor, FallbackVisitor) {
       // @ts-ignore
       pathItemElement.setMetaProperty('webhook-name', toValue(key));
     });
-    return result;
   }
 }
 export default WebhooksVisitor;

package/src/refractor/visitors/open-api-3-1/bases.cjs

@@ -0,0 +1,46 @@
+"use strict";
+
+exports.__esModule = true;
+exports.BaseSpecificationVisitor = exports.BaseSchemaVisitor = exports.BaseMapVisitor = exports.BaseFixedFieldsVisitor = void 0;
+var _tsMixer = require("ts-mixer");
+var _apidomNsOpenapi = require("@speclynx/apidom-ns-openapi-3-0");
+var _apidomNsJsonSchema = require("@speclynx/apidom-ns-json-schema-2020-12");
+/**
+ * Base class for visitors using Mixin(SpecificationVisitor, FallbackVisitor)
+ * @public
+ */
+const BaseSpecificationVisitor = exports.BaseSpecificationVisitor = (0, _tsMixer.Mixin)(_apidomNsOpenapi.SpecificationVisitor, _apidomNsOpenapi.FallbackVisitor);
+
+/**
+ * @public
+ */
+
+/**
+ * Base class for visitors using Mixin(FixedFieldsVisitor, FallbackVisitor)
+ * @public
+ */
+const BaseFixedFieldsVisitor = exports.BaseFixedFieldsVisitor = (0, _tsMixer.Mixin)(_apidomNsOpenapi.FixedFieldsVisitor, _apidomNsOpenapi.FallbackVisitor);
+
+/**
+ * @public
+ */
+
+/**
+ * Base class for visitors using Mixin(MapVisitor, FallbackVisitor)
+ * @public
+ */
+const BaseMapVisitor = exports.BaseMapVisitor = (0, _tsMixer.Mixin)(_apidomNsOpenapi.MapVisitor, _apidomNsOpenapi.FallbackVisitor);
+
+/**
+ * @public
+ */
+
+/**
+ * Base class for visitors using Mixin(FixedFieldsVisitor, ParentSchemaAwareVisitor, FallbackVisitor)
+ * @public
+ */
+const BaseSchemaVisitor = exports.BaseSchemaVisitor = (0, _tsMixer.Mixin)(_apidomNsOpenapi.FixedFieldsVisitor, _apidomNsJsonSchema.ParentSchemaAwareVisitor, _apidomNsOpenapi.FallbackVisitor);
+
+/**
+ * @public
+ */

package/src/refractor/visitors/open-api-3-1/bases.mjs

@@ -0,0 +1,43 @@
+import { Mixin } from 'ts-mixer';
+import { SpecificationVisitor, FallbackVisitor, FixedFieldsVisitor, MapVisitor } from '@speclynx/apidom-ns-openapi-3-0';
+import { ParentSchemaAwareVisitor } from '@speclynx/apidom-ns-json-schema-2020-12';
+
+/**
+ * Base class for visitors using Mixin(SpecificationVisitor, FallbackVisitor)
+ * @public
+ */
+export const BaseSpecificationVisitor = Mixin(SpecificationVisitor, FallbackVisitor);
+
+/**
+ * @public
+ */
+
+/**
+ * Base class for visitors using Mixin(FixedFieldsVisitor, FallbackVisitor)
+ * @public
+ */
+export const BaseFixedFieldsVisitor = Mixin(FixedFieldsVisitor, FallbackVisitor);
+
+/**
+ * @public
+ */
+
+/**
+ * Base class for visitors using Mixin(MapVisitor, FallbackVisitor)
+ * @public
+ */
+export const BaseMapVisitor = Mixin(MapVisitor, FallbackVisitor);
+
+/**
+ * @public
+ */
+
+/**
+ * Base class for visitors using Mixin(FixedFieldsVisitor, ParentSchemaAwareVisitor, FallbackVisitor)
+ * @public
+ */
+export const BaseSchemaVisitor = Mixin(FixedFieldsVisitor, ParentSchemaAwareVisitor, FallbackVisitor);
+
+/**
+ * @public
+ */

package/src/refractor/visitors/open-api-3-1/callback/index.cjs

@@ -22,8 +22,8 @@ class CallbackVisitor extends BaseCallbackVisitor {
       return (0, _apidomNsOpenapi.isReferenceLikeElement)(element) ? ['document', 'objects', 'Reference'] : ['document', 'objects', 'PathItem'];
     };
   }
-  ObjectElement(objectElement) {
-    const result = BaseCallbackVisitor.prototype.ObjectElement.call(this, objectElement);
+  ObjectElement(path) {
+    BaseCallbackVisitor.prototype.ObjectElement.call(this, path);
 
     // decorate every ReferenceElement with metadata about their referencing type
     // @ts-ignore
@@ -31,7 +31,6 @@ class CallbackVisitor extends BaseCallbackVisitor {
       // @ts-ignore
       referenceElement.setMetaProperty('referenced-element', 'pathItem');
     });
-    return result;
   }
 }
 var _default = exports.default = CallbackVisitor;

package/src/refractor/visitors/open-api-3-1/callback/index.mjs

@@ -17,8 +17,8 @@ class CallbackVisitor extends BaseCallbackVisitor {
       return isReferenceLikeElement(element) ? ['document', 'objects', 'Reference'] : ['document', 'objects', 'PathItem'];
     };
   }
-  ObjectElement(objectElement) {
-    const result = BaseCallbackVisitor.prototype.ObjectElement.call(this, objectElement);
+  ObjectElement(path) {
+    BaseCallbackVisitor.prototype.ObjectElement.call(this, path);
 
     // decorate every ReferenceElement with metadata about their referencing type
     // @ts-ignore
@@ -26,7 +26,6 @@ class CallbackVisitor extends BaseCallbackVisitor {
       // @ts-ignore
       referenceElement.setMetaProperty('referenced-element', 'pathItem');
     });
-    return result;
   }
 }
 export default CallbackVisitor;

package/src/refractor/visitors/open-api-3-1/components/PathItemsVisitor.cjs

@@ -3,10 +3,10 @@
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault").default;
 exports.__esModule = true;
 exports.default = void 0;
-var _tsMixer = require("ts-mixer");
 var _apidomNsOpenapi = require("@speclynx/apidom-ns-openapi-3-0");
 var _ComponentsPathItems = _interopRequireDefault(require("../../../../elements/nces/ComponentsPathItems.cjs"));
 var _predicates = require("../../../../predicates.cjs");
+var _bases = require("../bases.cjs");
 /**
  * @public
  */
@@ -14,21 +14,20 @@ var _predicates = require("../../../../predicates.cjs");
 /**
  * @public
  */
-class PathItemsVisitor extends (0, _tsMixer.Mixin)(_apidomNsOpenapi.MapVisitor, _apidomNsOpenapi.FallbackVisitor) {
+class PathItemsVisitor extends _bases.BaseMapVisitor {
   constructor(options) {
     super(options);
     this.element = new _ComponentsPathItems.default();
     this.specPath = element => (0, _apidomNsOpenapi.isReferenceLikeElement)(element) ? ['document', 'objects', 'Reference'] : ['document', 'objects', 'PathItem'];
   }
-  ObjectElement(objectElement) {
-    const result = _apidomNsOpenapi.MapVisitor.prototype.ObjectElement.call(this, objectElement);
+  ObjectElement(path) {
+    _apidomNsOpenapi.MapVisitor.prototype.ObjectElement.call(this, path);
 
     // @ts-ignore
     this.element.filter(_predicates.isReferenceElement).forEach(referenceElement => {
       // @ts-ignore
       referenceElement.setMetaProperty('referenced-element', 'pathItem');
     });
-    return result;
   }
 }
 var _default = exports.default = PathItemsVisitor;

package/src/refractor/visitors/open-api-3-1/components/PathItemsVisitor.mjs

@@ -1,28 +1,27 @@
-import { Mixin } from 'ts-mixer';
-import { isReferenceLikeElement, MapVisitor, FallbackVisitor } from '@speclynx/apidom-ns-openapi-3-0';
+import { isReferenceLikeElement, MapVisitor } from '@speclynx/apidom-ns-openapi-3-0';
 import ComponentsPathItemsElement from "../../../../elements/nces/ComponentsPathItems.mjs";
 import { isReferenceElement } from "../../../../predicates.mjs";
+import { BaseMapVisitor } from "../bases.mjs";
 /**
  * @public
  */
 /**
  * @public
  */
-class PathItemsVisitor extends Mixin(MapVisitor, FallbackVisitor) {
+class PathItemsVisitor extends BaseMapVisitor {
   constructor(options) {
     super(options);
     this.element = new ComponentsPathItemsElement();
     this.specPath = element => isReferenceLikeElement(element) ? ['document', 'objects', 'Reference'] : ['document', 'objects', 'PathItem'];
   }
-  ObjectElement(objectElement) {
-    const result = MapVisitor.prototype.ObjectElement.call(this, objectElement);
+  ObjectElement(path) {
+    MapVisitor.prototype.ObjectElement.call(this, path);
 
     // @ts-ignore
     this.element.filter(isReferenceElement).forEach(referenceElement => {
       // @ts-ignore
       referenceElement.setMetaProperty('referenced-element', 'pathItem');
     });
-    return result;
   }
 }
 export default PathItemsVisitor;

package/src/refractor/visitors/open-api-3-1/components/SchemasVisitor.cjs

@@ -2,9 +2,9 @@
 
 exports.__esModule = true;
 exports.default = void 0;
-var _tsMixer = require("ts-mixer");
 var _ramda = require("ramda");
 var _apidomNsOpenapi = require("@speclynx/apidom-ns-openapi-3-0");
+var _bases = require("../bases.cjs");
 /**
  * @public
  */
@@ -12,7 +12,7 @@ var _apidomNsOpenapi = require("@speclynx/apidom-ns-openapi-3-0");
 /**
  * @public
  */
-class SchemasVisitor extends (0, _tsMixer.Mixin)(_apidomNsOpenapi.MapVisitor, _apidomNsOpenapi.FallbackVisitor) {
+class SchemasVisitor extends _bases.BaseMapVisitor {
   constructor(options) {
     super(options);
     this.element = new _apidomNsOpenapi.ComponentsSchemasElement();

package/src/refractor/visitors/open-api-3-1/components/SchemasVisitor.mjs

@@ -1,15 +1,13 @@
-import { Mixin } from 'ts-mixer';
 import { always } from 'ramda';
-import { ComponentsSchemasElement, MapVisitor, FallbackVisitor } from '@speclynx/apidom-ns-openapi-3-0';
-
+import { ComponentsSchemasElement } from '@speclynx/apidom-ns-openapi-3-0';
+import { BaseMapVisitor } from "../bases.mjs";
 /**
  * @public
  */
-
 /**
  * @public
  */
-class SchemasVisitor extends Mixin(MapVisitor, FallbackVisitor) {
+class SchemasVisitor extends BaseMapVisitor {
   constructor(options) {
     super(options);
     this.element = new ComponentsSchemasElement();

package/src/refractor/visitors/open-api-3-1/index.cjs

@@ -3,10 +3,10 @@
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault").default;
 exports.__esModule = true;
 exports.default = void 0;
-var _tsMixer = require("ts-mixer");
 var _ramda = require("ramda");
 var _apidomNsOpenapi = require("@speclynx/apidom-ns-openapi-3-0");
 var _OpenApi = _interopRequireDefault(require("../../../elements/OpenApi3-1.cjs"));
+var _bases = require("./bases.cjs");
 /**
  * @public
  */
@@ -15,7 +15,7 @@ var _OpenApi = _interopRequireDefault(require("../../../elements/OpenApi3-1.cjs"
  * @public
  */
 
-class OpenApi3_1Visitor extends (0, _tsMixer.Mixin)(_apidomNsOpenapi.FixedFieldsVisitor, _apidomNsOpenapi.FallbackVisitor) {
+class OpenApi3_1Visitor extends _bases.BaseFixedFieldsVisitor {
   constructor(options) {
     super(options);
     this.element = new _OpenApi.default();
@@ -23,9 +23,10 @@ class OpenApi3_1Visitor extends (0, _tsMixer.Mixin)(_apidomNsOpenapi.FixedFields
     this.canSupportSpecificationExtensions = true;
     this.openApiSemanticElement = this.element;
   }
-  ObjectElement(objectElement) {
+  ObjectElement(path) {
+    const objectElement = path.node;
     this.openApiGenericElement = objectElement;
-    return _apidomNsOpenapi.FixedFieldsVisitor.prototype.ObjectElement.call(this, objectElement);
+    _apidomNsOpenapi.FixedFieldsVisitor.prototype.ObjectElement.call(this, path);
   }
 }
 var _default = exports.default = OpenApi3_1Visitor;

package/src/refractor/visitors/open-api-3-1/index.mjs

@@ -1,7 +1,7 @@
-import { Mixin } from 'ts-mixer';
 import { always } from 'ramda';
-import { FixedFieldsVisitor, FallbackVisitor } from '@speclynx/apidom-ns-openapi-3-0';
+import { FixedFieldsVisitor } from '@speclynx/apidom-ns-openapi-3-0';
 import OpenApi3_1Element from "../../../elements/OpenApi3-1.mjs";
+import { BaseFixedFieldsVisitor } from "./bases.mjs";
 /**
  * @public
  */
@@ -9,7 +9,7 @@ import OpenApi3_1Element from "../../../elements/OpenApi3-1.mjs";
  * @public
  */
 
-class OpenApi3_1Visitor extends Mixin(FixedFieldsVisitor, FallbackVisitor) {
+class OpenApi3_1Visitor extends BaseFixedFieldsVisitor {
   constructor(options) {
     super(options);
     this.element = new OpenApi3_1Element();
@@ -17,9 +17,10 @@ class OpenApi3_1Visitor extends Mixin(FixedFieldsVisitor, FallbackVisitor) {
     this.canSupportSpecificationExtensions = true;
     this.openApiSemanticElement = this.element;
   }
-  ObjectElement(objectElement) {
+  ObjectElement(path) {
+    const objectElement = path.node;
     this.openApiGenericElement = objectElement;
-    return FixedFieldsVisitor.prototype.ObjectElement.call(this, objectElement);
+    FixedFieldsVisitor.prototype.ObjectElement.call(this, path);
   }
 }
 export default OpenApi3_1Visitor;