@speclynx/apidom-ns-openapi-3-0 1.12.1 → 2.0.1

package/src/refractor/visitors/FallbackVisitor.cjs

@@ -3,7 +3,7 @@
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault").default;
 exports.__esModule = true;
 exports.default = void 0;
-var _apidomCore = require("@speclynx/apidom-core");
+var _apidomDatamodel = require("@speclynx/apidom-datamodel");
 var _Visitor = _interopRequireDefault(require("./Visitor.cjs"));
 /**
  * This visitor is responsible for falling back to current traversed element
@@ -16,9 +16,9 @@ var _Visitor = _interopRequireDefault(require("./Visitor.cjs"));
  * @public
  */
 class FallbackVisitor extends _Visitor.default {
-  enter(element) {
-    this.element = (0, _apidomCore.cloneDeep)(element);
-    return _apidomCore.BREAK;
+  enter(path) {
+    this.element = (0, _apidomDatamodel.cloneDeep)(path.node);
+    path.stop();
   }
 }
 var _default = exports.default = FallbackVisitor;

package/src/refractor/visitors/FallbackVisitor.mjs

@@ -1,4 +1,4 @@
-import { BREAK, cloneDeep } from '@speclynx/apidom-core';
+import { cloneDeep } from '@speclynx/apidom-datamodel';
 import Visitor from "./Visitor.mjs";
 /**
  * This visitor is responsible for falling back to current traversed element
@@ -10,9 +10,9 @@ import Visitor from "./Visitor.mjs";
  * @public
  */
 class FallbackVisitor extends Visitor {
-  enter(element) {
-    this.element = cloneDeep(element);
-    return BREAK;
+  enter(path) {
+    this.element = cloneDeep(path.node);
+    path.stop();
   }
 }
 export default FallbackVisitor;

package/src/refractor/visitors/SpecificationExtensionVisitor.cjs

@@ -3,16 +3,16 @@
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault").default;
 exports.__esModule = true;
 exports.default = void 0;
-var _apidomCore = require("@speclynx/apidom-core");
+var _apidomDatamodel = require("@speclynx/apidom-datamodel");
 var _SpecificationVisitor = _interopRequireDefault(require("./SpecificationVisitor.cjs"));
 /**
  * @public
  */
 class SpecificationExtensionVisitor extends _SpecificationVisitor.default {
-  MemberElement(memberElement) {
-    this.element = (0, _apidomCore.cloneDeep)(memberElement);
+  MemberElement(path) {
+    this.element = (0, _apidomDatamodel.cloneDeep)(path.node);
     this.element.classes.push('specification-extension');
-    return _apidomCore.BREAK;
+    path.stop();
   }
 }
 var _default = exports.default = SpecificationExtensionVisitor;

package/src/refractor/visitors/SpecificationExtensionVisitor.mjs

@@ -1,13 +1,13 @@
-import { BREAK, cloneDeep } from '@speclynx/apidom-core';
+import { cloneDeep } from '@speclynx/apidom-datamodel';
 import SpecificationVisitor from "./SpecificationVisitor.mjs";
 /**
  * @public
  */
 class SpecificationExtensionVisitor extends SpecificationVisitor {
-  MemberElement(memberElement) {
-    this.element = cloneDeep(memberElement);
+  MemberElement(path) {
+    this.element = cloneDeep(path.node);
     this.element.classes.push('specification-extension');
-    return BREAK;
+    path.stop();
   }
 }
 export default SpecificationExtensionVisitor;

package/src/refractor/visitors/SpecificationVisitor.cjs

@@ -5,7 +5,8 @@ exports.__esModule = true;
 exports.default = void 0;
 var _ramda = require("ramda");
 var _ramdaAdjunct = require("ramda-adjunct");
-var _apidomCore = require("@speclynx/apidom-core");
+var _apidomDatamodel = require("@speclynx/apidom-datamodel");
+var _apidomTraverse = require("@speclynx/apidom-traverse");
 var _Visitor = _interopRequireDefault(require("./Visitor.cjs"));
 var _FallbackVisitor = _interopRequireDefault(require("./FallbackVisitor.cjs"));
 /**
@@ -75,9 +76,11 @@ class SpecificationVisitor extends _Visitor.default {
      */
     const visitor = this.retrieveVisitorInstance(specPath, options);
     if (visitor instanceof _FallbackVisitor.default && visitor?.constructor === _FallbackVisitor.default) {
-      return (0, _apidomCore.cloneDeep)(element);
+      return (0, _apidomDatamodel.cloneDeep)(element);
     }
-    (0, _apidomCore.visit)(element, visitor, options);
+    (0, _apidomTraverse.traverse)(element, visitor, {
+      nodeTypeGetter: _apidomTraverse.getNodePrimitiveType
+    });
     return visitor.element;
   }
 }

package/src/refractor/visitors/SpecificationVisitor.mjs

@@ -1,6 +1,7 @@
 import { pathSatisfies, path, pick } from 'ramda';
 import { isFunction } from 'ramda-adjunct';
-import { visit, cloneDeep } from '@speclynx/apidom-core';
+import { cloneDeep } from '@speclynx/apidom-datamodel';
+import { traverse, getNodePrimitiveType } from '@speclynx/apidom-traverse';
 import Visitor from "./Visitor.mjs";
 import FallbackVisitor from "./FallbackVisitor.mjs";
 /**
@@ -71,7 +72,9 @@ class SpecificationVisitor extends Visitor {
     if (visitor instanceof FallbackVisitor && visitor?.constructor === FallbackVisitor) {
       return cloneDeep(element);
     }
-    visit(element, visitor, options);
+    traverse(element, visitor, {
+      nodeTypeGetter: getNodePrimitiveType
+    });
     return visitor.element;
   }
 }

package/src/refractor/visitors/Visitor.cjs

@@ -3,6 +3,7 @@
 exports.__esModule = true;
 exports.default = void 0;
 var _apidomCore = require("@speclynx/apidom-core");
+var _apidomDatamodel = require("@speclynx/apidom-datamodel");
 /**
  * @public
  */
@@ -16,16 +17,17 @@ class Visitor {
     Object.assign(this, options);
   }
   copyMetaAndAttributes(from, to) {
-    if (from.meta.length > 0 || to.meta.length > 0) {
-      to.meta = (0, _apidomCore.deepmerge)(to.meta, from.meta);
-      if ((0, _apidomCore.hasElementSourceMap)(from)) {
-        // avoid deep merging of source maps
-        to.meta.set('sourceMap', from.meta.get('sourceMap'));
-      }
+    if (!from.isMetaEmpty || !to.isMetaEmpty) {
+      const target = to.isMetaEmpty ? new _apidomDatamodel.ObjectElement() : to.meta;
+      const source = from.isMetaEmpty ? new _apidomDatamodel.ObjectElement() : from.meta;
+      to.meta = (0, _apidomCore.deepmerge)(target, source);
     }
-    if (from.attributes.length > 0 || from.meta.length > 0) {
-      to.attributes = (0, _apidomCore.deepmerge)(to.attributes, from.attributes);
+    if (!from.isAttributesEmpty || !to.isAttributesEmpty) {
+      const target = to.isAttributesEmpty ? new _apidomDatamodel.ObjectElement() : to.attributes;
+      const source = from.isAttributesEmpty ? new _apidomDatamodel.ObjectElement() : from.attributes;
+      to.attributes = (0, _apidomCore.deepmerge)(target, source);
     }
+    _apidomDatamodel.SourceMapElement.transfer(from, to);
   }
 }
 var _default = exports.default = Visitor;

package/src/refractor/visitors/Visitor.mjs

@@ -1,4 +1,5 @@
-import { deepmerge, hasElementSourceMap } from '@speclynx/apidom-core';
+import { deepmerge } from '@speclynx/apidom-core';
+import { ObjectElement, SourceMapElement } from '@speclynx/apidom-datamodel';
 
 /**
  * @public
@@ -13,16 +14,17 @@ class Visitor {
     Object.assign(this, options);
   }
   copyMetaAndAttributes(from, to) {
-    if (from.meta.length > 0 || to.meta.length > 0) {
-      to.meta = deepmerge(to.meta, from.meta);
-      if (hasElementSourceMap(from)) {
-        // avoid deep merging of source maps
-        to.meta.set('sourceMap', from.meta.get('sourceMap'));
-      }
+    if (!from.isMetaEmpty || !to.isMetaEmpty) {
+      const target = to.isMetaEmpty ? new ObjectElement() : to.meta;
+      const source = from.isMetaEmpty ? new ObjectElement() : from.meta;
+      to.meta = deepmerge(target, source);
     }
-    if (from.attributes.length > 0 || from.meta.length > 0) {
-      to.attributes = deepmerge(to.attributes, from.attributes);
+    if (!from.isAttributesEmpty || !to.isAttributesEmpty) {
+      const target = to.isAttributesEmpty ? new ObjectElement() : to.attributes;
+      const source = from.isAttributesEmpty ? new ObjectElement() : from.attributes;
+      to.attributes = deepmerge(target, source);
     }
+    SourceMapElement.transfer(from, to);
   }
 }
 export default Visitor;

package/src/refractor/visitors/generics/AlternatingVisitor.cjs

@@ -5,7 +5,6 @@ exports.__esModule = true;
 exports.default = void 0;
 var _ramda = require("ramda");
 var _ramdaAdjunct = require("ramda-adjunct");
-var _apidomCore = require("@speclynx/apidom-core");
 var _SpecificationVisitor = _interopRequireDefault(require("../SpecificationVisitor.cjs"));
 /**
  * @public
@@ -29,14 +28,15 @@ class AlternatingVisitor extends _SpecificationVisitor.default {
     });
     this.alternator = alternator || [];
   }
-  enter(element) {
+  enter(path) {
+    const element = path.node;
     const functions = this.alternator.map(({
       predicate,
       specPath
     }) => (0, _ramda.ifElse)(predicate, (0, _ramda.always)(specPath), _ramdaAdjunct.stubUndefined));
     const specPath = (0, _ramdaAdjunct.dispatch)(functions)(element);
     this.element = this.toRefractedElement(specPath, element);
-    return _apidomCore.BREAK;
+    path.stop();
   }
 }
 var _default = exports.default = AlternatingVisitor;

package/src/refractor/visitors/generics/AlternatingVisitor.mjs

@@ -1,6 +1,5 @@
 import { ifElse, always } from 'ramda';
 import { dispatch, stubUndefined } from 'ramda-adjunct';
-import { BREAK } from '@speclynx/apidom-core';
 import SpecificationVisitor from "../SpecificationVisitor.mjs";
 /**
  * @public
@@ -22,14 +21,15 @@ class AlternatingVisitor extends SpecificationVisitor {
     });
     this.alternator = alternator || [];
   }
-  enter(element) {
+  enter(path) {
+    const element = path.node;
     const functions = this.alternator.map(({
       predicate,
       specPath
     }) => ifElse(predicate, always(specPath), stubUndefined));
     const specPath = dispatch(functions)(element);
     this.element = this.toRefractedElement(specPath, element);
-    return BREAK;
+    path.stop();
   }
 }
 export default AlternatingVisitor;

package/src/refractor/visitors/generics/FixedFieldsVisitor.cjs

@@ -3,6 +3,7 @@
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault").default;
 exports.__esModule = true;
 exports.default = void 0;
+var _apidomDatamodel = require("@speclynx/apidom-datamodel");
 var _apidomCore = require("@speclynx/apidom-core");
 var _SpecificationVisitor = _interopRequireDefault(require("../SpecificationVisitor.cjs"));
 var _predicates = require("../../predicates.cjs");
@@ -41,27 +42,29 @@ class FixedFieldsVisitor extends _SpecificationVisitor.default {
       this.specificationExtensionPredicate = specificationExtensionPredicate;
     }
   }
-  ObjectElement(objectElement) {
+  ObjectElement(path) {
+    const objectElement = path.node;
     const specPath = this.specPath(objectElement);
     const fields = this.retrieveFixedFields(specPath);
 
     // @ts-ignore
     objectElement.forEach((value, key, memberElement) => {
-      if ((0, _apidomCore.isStringElement)(key) && fields.includes((0, _apidomCore.toValue)(key)) && !this.ignoredFields.includes((0, _apidomCore.toValue)(key))) {
-        const fixedFieldElement = this.toRefractedElement([...specPath, 'fixedFields', (0, _apidomCore.toValue)(key)], value);
-        const newMemberElement = new _apidomCore.MemberElement((0, _apidomCore.cloneDeep)(key), fixedFieldElement);
+      const keyValue = (0, _apidomCore.toValue)(key);
+      if ((0, _apidomDatamodel.isStringElement)(key) && fields.includes(keyValue) && !this.ignoredFields.includes(keyValue)) {
+        const fixedFieldElement = this.toRefractedElement([...specPath, 'fixedFields', keyValue], value);
+        const newMemberElement = new _apidomDatamodel.MemberElement((0, _apidomDatamodel.cloneDeep)(key), fixedFieldElement);
         this.copyMetaAndAttributes(memberElement, newMemberElement);
         newMemberElement.classes.push('fixed-field');
         this.element.content.push(newMemberElement);
       } else if (this.canSupportSpecificationExtensions && this.specificationExtensionPredicate(memberElement)) {
         const extensionElement = this.toRefractedElement(['document', 'extension'], memberElement);
         this.element.content.push(extensionElement);
-      } else if (!this.ignoredFields.includes((0, _apidomCore.toValue)(key))) {
-        this.element.content.push((0, _apidomCore.cloneDeep)(memberElement));
+      } else if (!this.ignoredFields.includes(keyValue)) {
+        this.element.content.push((0, _apidomDatamodel.cloneDeep)(memberElement));
       }
     });
     this.copyMetaAndAttributes(objectElement, this.element);
-    return _apidomCore.BREAK;
+    path.stop();
   }
 }
 var _default = exports.default = FixedFieldsVisitor;

package/src/refractor/visitors/generics/FixedFieldsVisitor.mjs

@@ -1,4 +1,5 @@
-import { isStringElement, MemberElement, BREAK, cloneDeep, toValue } from '@speclynx/apidom-core';
+import { isStringElement, MemberElement, cloneDeep } from '@speclynx/apidom-datamodel';
+import { toValue } from '@speclynx/apidom-core';
 import SpecificationVisitor from "../SpecificationVisitor.mjs";
 import { isOpenApiExtension } from "../../predicates.mjs";
 /**
@@ -34,14 +35,16 @@ class FixedFieldsVisitor extends SpecificationVisitor {
       this.specificationExtensionPredicate = specificationExtensionPredicate;
     }
   }
-  ObjectElement(objectElement) {
+  ObjectElement(path) {
+    const objectElement = path.node;
     const specPath = this.specPath(objectElement);
     const fields = this.retrieveFixedFields(specPath);
 
     // @ts-ignore
     objectElement.forEach((value, key, memberElement) => {
-      if (isStringElement(key) && fields.includes(toValue(key)) && !this.ignoredFields.includes(toValue(key))) {
-        const fixedFieldElement = this.toRefractedElement([...specPath, 'fixedFields', toValue(key)], value);
+      const keyValue = toValue(key);
+      if (isStringElement(key) && fields.includes(keyValue) && !this.ignoredFields.includes(keyValue)) {
+        const fixedFieldElement = this.toRefractedElement([...specPath, 'fixedFields', keyValue], value);
         const newMemberElement = new MemberElement(cloneDeep(key), fixedFieldElement);
         this.copyMetaAndAttributes(memberElement, newMemberElement);
         newMemberElement.classes.push('fixed-field');
@@ -49,12 +52,12 @@ class FixedFieldsVisitor extends SpecificationVisitor {
       } else if (this.canSupportSpecificationExtensions && this.specificationExtensionPredicate(memberElement)) {
         const extensionElement = this.toRefractedElement(['document', 'extension'], memberElement);
         this.element.content.push(extensionElement);
-      } else if (!this.ignoredFields.includes(toValue(key))) {
+      } else if (!this.ignoredFields.includes(keyValue)) {
         this.element.content.push(cloneDeep(memberElement));
       }
     });
     this.copyMetaAndAttributes(objectElement, this.element);
-    return BREAK;
+    path.stop();
   }
 }
 export default FixedFieldsVisitor;

package/src/refractor/visitors/generics/MixedFieldsVisitor.cjs

@@ -2,7 +2,7 @@
 
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault").default;
 exports.__esModule = true;
-exports.default = void 0;
+exports.default = exports.MixedFieldsVisitorBase = void 0;
 var _tsMixer = require("ts-mixer");
 var _ramda = require("ramda");
 var _apidomCore = require("@speclynx/apidom-core");
@@ -13,9 +13,15 @@ var _PatternedFieldsVisitor = _interopRequireDefault(require("./PatternedFieldsV
  */
 
 /**
+ * Base class for MixedFieldsVisitor combining FixedFieldsVisitor and PatternedFieldsVisitor.
  * @public
  */
-class MixedFieldsVisitor extends (0, _tsMixer.Mixin)(_FixedFieldsVisitor.default, _PatternedFieldsVisitor.default) {
+const MixedFieldsVisitorBase = exports.MixedFieldsVisitorBase = (0, _tsMixer.Mixin)(_FixedFieldsVisitor.default, _PatternedFieldsVisitor.default);
+
+/**
+ * @public
+ */
+class MixedFieldsVisitor extends MixedFieldsVisitorBase {
   specPathFixedFields;
   specPathPatternedFields;
   constructor({
@@ -29,7 +35,8 @@ class MixedFieldsVisitor extends (0, _tsMixer.Mixin)(_FixedFieldsVisitor.default
     this.specPathFixedFields = specPathFixedFields;
     this.specPathPatternedFields = specPathPatternedFields;
   }
-  ObjectElement(objectElement) {
+  ObjectElement(path) {
+    const objectElement = path.node;
     const {
       specPath,
       ignoredFields
@@ -40,10 +47,10 @@ class MixedFieldsVisitor extends (0, _tsMixer.Mixin)(_FixedFieldsVisitor.default
       // let FixedFieldsVisitor only process fixed fields and leave rest to PatternedFieldsVisitor
       // @ts-ignore
       this.ignoredFields = [...ignoredFields, ...(0, _ramda.difference)(objectElement.keys(), fixedFields)];
-      _FixedFieldsVisitor.default.prototype.ObjectElement.call(this, objectElement);
+      _FixedFieldsVisitor.default.prototype.ObjectElement.call(this, path);
       this.specPath = this.specPathPatternedFields;
       this.ignoredFields = fixedFields;
-      _PatternedFieldsVisitor.default.prototype.ObjectElement.call(this, objectElement);
+      _PatternedFieldsVisitor.default.prototype.ObjectElement.call(this, path);
 
       // reorder this.element members by original objectElement keys
       const objectElementKeys = objectElement.keys();
@@ -54,7 +61,7 @@ class MixedFieldsVisitor extends (0, _tsMixer.Mixin)(_FixedFieldsVisitor.default
       this.specPath = specPath;
       throw e;
     }
-    return _apidomCore.BREAK;
+    path.stop();
   }
 }
 var _default = exports.default = MixedFieldsVisitor;

package/src/refractor/visitors/generics/MixedFieldsVisitor.mjs

@@ -1,15 +1,21 @@
 import { Mixin } from 'ts-mixer';
 import { difference } from 'ramda';
-import { BREAK, toValue } from '@speclynx/apidom-core';
+import { toValue } from '@speclynx/apidom-core';
 import FixedFieldsVisitor from "./FixedFieldsVisitor.mjs";
 import PatternedFieldsVisitor from "./PatternedFieldsVisitor.mjs";
 /**
  * @public
  */
 /**
+ * Base class for MixedFieldsVisitor combining FixedFieldsVisitor and PatternedFieldsVisitor.
  * @public
  */
-class MixedFieldsVisitor extends Mixin(FixedFieldsVisitor, PatternedFieldsVisitor) {
+export const MixedFieldsVisitorBase = Mixin(FixedFieldsVisitor, PatternedFieldsVisitor);
+
+/**
+ * @public
+ */
+class MixedFieldsVisitor extends MixedFieldsVisitorBase {
   specPathFixedFields;
   specPathPatternedFields;
   constructor({
@@ -23,7 +29,8 @@ class MixedFieldsVisitor extends Mixin(FixedFieldsVisitor, PatternedFieldsVisito
     this.specPathFixedFields = specPathFixedFields;
     this.specPathPatternedFields = specPathPatternedFields;
   }
-  ObjectElement(objectElement) {
+  ObjectElement(path) {
+    const objectElement = path.node;
     const {
       specPath,
       ignoredFields
@@ -34,10 +41,10 @@ class MixedFieldsVisitor extends Mixin(FixedFieldsVisitor, PatternedFieldsVisito
       // let FixedFieldsVisitor only process fixed fields and leave rest to PatternedFieldsVisitor
       // @ts-ignore
       this.ignoredFields = [...ignoredFields, ...difference(objectElement.keys(), fixedFields)];
-      FixedFieldsVisitor.prototype.ObjectElement.call(this, objectElement);
+      FixedFieldsVisitor.prototype.ObjectElement.call(this, path);
       this.specPath = this.specPathPatternedFields;
       this.ignoredFields = fixedFields;
-      PatternedFieldsVisitor.prototype.ObjectElement.call(this, objectElement);
+      PatternedFieldsVisitor.prototype.ObjectElement.call(this, path);
 
       // reorder this.element members by original objectElement keys
       const objectElementKeys = objectElement.keys();
@@ -48,7 +55,7 @@ class MixedFieldsVisitor extends Mixin(FixedFieldsVisitor, PatternedFieldsVisito
       this.specPath = specPath;
       throw e;
     }
-    return BREAK;
+    path.stop();
   }
 }
 export default MixedFieldsVisitor;

package/src/refractor/visitors/generics/PatternedFieldsVisitor.cjs

@@ -4,6 +4,7 @@ var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequ
 exports.__esModule = true;
 exports.default = void 0;
 var _ramda = require("ramda");
+var _apidomDatamodel = require("@speclynx/apidom-datamodel");
 var _apidomCore = require("@speclynx/apidom-core");
 var _SpecificationVisitor = _interopRequireDefault(require("../SpecificationVisitor.cjs"));
 var _predicates = require("../../predicates.cjs");
@@ -43,25 +44,27 @@ class PatternedFieldsVisitor extends _SpecificationVisitor.default {
       this.specificationExtensionPredicate = specificationExtensionPredicate;
     }
   }
-  ObjectElement(objectElement) {
+  ObjectElement(path) {
+    const objectElement = path.node;
     // @ts-ignore
     objectElement.forEach((value, key, memberElement) => {
+      const keyValue = (0, _apidomCore.toValue)(key);
       if (this.canSupportSpecificationExtensions && this.specificationExtensionPredicate(memberElement)) {
         const extensionElement = this.toRefractedElement(['document', 'extension'], memberElement);
         this.element.content.push(extensionElement);
-      } else if (!this.ignoredFields.includes((0, _apidomCore.toValue)(key)) && this.fieldPatternPredicate((0, _apidomCore.toValue)(key))) {
+      } else if (!this.ignoredFields.includes(keyValue) && this.fieldPatternPredicate(keyValue)) {
         const specPath = this.specPath(value);
         const patternedFieldElement = this.toRefractedElement(specPath, value);
-        const newMemberElement = new _apidomCore.MemberElement((0, _apidomCore.cloneDeep)(key), patternedFieldElement);
+        const newMemberElement = new _apidomDatamodel.MemberElement((0, _apidomDatamodel.cloneDeep)(key), patternedFieldElement);
         this.copyMetaAndAttributes(memberElement, newMemberElement);
         newMemberElement.classes.push('patterned-field');
         this.element.content.push(newMemberElement);
-      } else if (!this.ignoredFields.includes((0, _apidomCore.toValue)(key))) {
-        this.element.content.push((0, _apidomCore.cloneDeep)(memberElement));
+      } else if (!this.ignoredFields.includes(keyValue)) {
+        this.element.content.push((0, _apidomDatamodel.cloneDeep)(memberElement));
       }
     });
     this.copyMetaAndAttributes(objectElement, this.element);
-    return _apidomCore.BREAK;
+    path.stop();
   }
 }
 var _default = exports.default = PatternedFieldsVisitor;

package/src/refractor/visitors/generics/PatternedFieldsVisitor.mjs

@@ -1,5 +1,6 @@
 import { F as stubFalse } from 'ramda';
-import { MemberElement, BREAK, cloneDeep, toValue } from '@speclynx/apidom-core';
+import { MemberElement, cloneDeep } from '@speclynx/apidom-datamodel';
+import { toValue } from '@speclynx/apidom-core';
 import SpecificationVisitor from "../SpecificationVisitor.mjs";
 import { isOpenApiExtension } from "../../predicates.mjs";
 /**
@@ -37,25 +38,27 @@ class PatternedFieldsVisitor extends SpecificationVisitor {
       this.specificationExtensionPredicate = specificationExtensionPredicate;
     }
   }
-  ObjectElement(objectElement) {
+  ObjectElement(path) {
+    const objectElement = path.node;
     // @ts-ignore
     objectElement.forEach((value, key, memberElement) => {
+      const keyValue = toValue(key);
       if (this.canSupportSpecificationExtensions && this.specificationExtensionPredicate(memberElement)) {
         const extensionElement = this.toRefractedElement(['document', 'extension'], memberElement);
         this.element.content.push(extensionElement);
-      } else if (!this.ignoredFields.includes(toValue(key)) && this.fieldPatternPredicate(toValue(key))) {
+      } else if (!this.ignoredFields.includes(keyValue) && this.fieldPatternPredicate(keyValue)) {
         const specPath = this.specPath(value);
         const patternedFieldElement = this.toRefractedElement(specPath, value);
         const newMemberElement = new MemberElement(cloneDeep(key), patternedFieldElement);
         this.copyMetaAndAttributes(memberElement, newMemberElement);
         newMemberElement.classes.push('patterned-field');
         this.element.content.push(newMemberElement);
-      } else if (!this.ignoredFields.includes(toValue(key))) {
+      } else if (!this.ignoredFields.includes(keyValue)) {
         this.element.content.push(cloneDeep(memberElement));
       }
     });
     this.copyMetaAndAttributes(objectElement, this.element);
-    return BREAK;
+    path.stop();
   }
 }
 export default PatternedFieldsVisitor;

package/src/refractor/visitors/open-api-3-0/ContentVisitor.cjs

@@ -1,13 +1,10 @@
 "use strict";
 
-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 _apidomCore = require("@speclynx/apidom-core");
-var _MapVisitor = _interopRequireDefault(require("../generics/MapVisitor.cjs"));
-var _FallbackVisitor = _interopRequireDefault(require("../FallbackVisitor.cjs"));
+var _apidomDatamodel = require("@speclynx/apidom-datamodel");
+var _bases = require("./bases.cjs");
 /**
  * @public
  */
@@ -15,10 +12,10 @@ var _FallbackVisitor = _interopRequireDefault(require("../FallbackVisitor.cjs"))
 /**
  * @public
  */
-class ContentVisitor extends (0, _tsMixer.Mixin)(_MapVisitor.default, _FallbackVisitor.default) {
+class ContentVisitor extends _bases.BaseMapVisitor {
   constructor(options) {
     super(options);
-    this.element = new _apidomCore.ObjectElement();
+    this.element = new _apidomDatamodel.ObjectElement();
     this.element.classes.push('content');
     this.specPath = (0, _ramda.always)(['document', 'objects', 'MediaType']);
   }

package/src/refractor/visitors/open-api-3-0/ContentVisitor.mjs

@@ -1,15 +1,13 @@
-import { Mixin } from 'ts-mixer';
 import { always } from 'ramda';
-import { ObjectElement } from '@speclynx/apidom-core';
-import MapVisitor from "../generics/MapVisitor.mjs";
-import FallbackVisitor from "../FallbackVisitor.mjs";
+import { ObjectElement } from '@speclynx/apidom-datamodel';
+import { BaseMapVisitor } from "./bases.mjs";
 /**
  * @public
  */
 /**
  * @public
  */
-class ContentVisitor extends Mixin(MapVisitor, FallbackVisitor) {
+class ContentVisitor extends BaseMapVisitor {
   constructor(options) {
     super(options);
     this.element = new ObjectElement();

package/src/refractor/visitors/open-api-3-0/ExamplesVisitor.cjs

@@ -1,12 +1,9 @@
 "use strict";
 
-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 _MapVisitor = _interopRequireDefault(require("../generics/MapVisitor.cjs"));
-var _FallbackVisitor = _interopRequireDefault(require("../FallbackVisitor.cjs"));
+var _apidomDatamodel = require("@speclynx/apidom-datamodel");
+var _bases = require("./bases.cjs");
 var _predicates = require("../../predicates.cjs");
 var _predicates2 = require("../../../predicates.cjs");
 /**
@@ -16,22 +13,21 @@ var _predicates2 = require("../../../predicates.cjs");
 /**
  * @public
  */
-class ExamplesVisitor extends (0, _tsMixer.Mixin)(_MapVisitor.default, _FallbackVisitor.default) {
+class ExamplesVisitor extends _bases.BaseMapVisitor {
   constructor(options) {
     super(options);
-    this.element = new _apidomCore.ObjectElement();
+    this.element = new _apidomDatamodel.ObjectElement();
     this.element.classes.push('examples');
     this.specPath = element => (0, _predicates.isReferenceLikeElement)(element) ? ['document', 'objects', 'Reference'] : ['document', 'objects', 'Example'];
     this.canSupportSpecificationExtensions = true;
   }
-  ObjectElement(objectElement) {
-    const result = _MapVisitor.default.prototype.ObjectElement.call(this, objectElement);
+  ObjectElement(path) {
+    _bases.BaseMapVisitor.prototype.ObjectElement.call(this, path);
 
     // @ts-ignore
     this.element.filter(_predicates2.isReferenceElement).forEach(referenceElement => {
-      referenceElement.setMetaProperty('referenced-element', 'example');
+      referenceElement.meta.set('referenced-element', 'example');
     });
-    return result;
   }
 }
 var _default = exports.default = ExamplesVisitor;