@speclynx/apidom-ns-json-schema-draft-4 1.12.2 → 2.1.0

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"));
 /**
@@ -30,24 +31,26 @@ class FixedFieldsVisitor extends _SpecificationVisitor.default {
     this.specPath = specPath;
     this.ignoredFields = ignoredFields || [];
   }
-  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.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 { MemberElement, isStringElement, cloneDeep } from '@speclynx/apidom-datamodel';
+import { toValue } from '@speclynx/apidom-core';
 import SpecificationVisitor from "../SpecificationVisitor.mjs";
 /**
  * @public
@@ -23,24 +24,26 @@ class FixedFieldsVisitor extends SpecificationVisitor {
     this.specPath = specPath;
     this.ignoredFields = ignoredFields || [];
   }
-  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');
         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 FixedFieldsVisitor;

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"));
 /**
@@ -32,22 +33,24 @@ class PatternedFieldsVisitor extends _SpecificationVisitor.default {
       this.fieldPatternPredicate = fieldPatternPredicate;
     }
   }
-  ObjectElement(objectElement) {
+  ObjectElement(path) {
+    const objectElement = path.node;
     // @ts-ignore
     objectElement.forEach((value, key, memberElement) => {
-      if (!this.ignoredFields.includes((0, _apidomCore.toValue)(key)) && this.fieldPatternPredicate((0, _apidomCore.toValue)(key))) {
+      const keyValue = (0, _apidomCore.toValue)(key);
+      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";
 /**
  * @public
@@ -26,22 +27,24 @@ class PatternedFieldsVisitor extends SpecificationVisitor {
       this.fieldPatternPredicate = fieldPatternPredicate;
     }
   }
-  ObjectElement(objectElement) {
+  ObjectElement(path) {
+    const objectElement = path.node;
     // @ts-ignore
     objectElement.forEach((value, key, memberElement) => {
-      if (!this.ignoredFields.includes(toValue(key)) && this.fieldPatternPredicate(toValue(key))) {
+      const keyValue = toValue(key);
+      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/json-schema/AllOfVisitor.cjs

@@ -1,13 +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 _FallbackVisitor = _interopRequireDefault(require("../FallbackVisitor.cjs"));
-var _SpecificationVisitor = _interopRequireDefault(require("../SpecificationVisitor.cjs"));
-var _ParentSchemaAwareVisitor = _interopRequireDefault(require("./ParentSchemaAwareVisitor.cjs"));
+var _apidomDatamodel = require("@speclynx/apidom-datamodel");
+var _bases = require("./bases.cjs");
 var _predicates = require("../../predicates.cjs");
 /**
  * @public
@@ -16,20 +12,21 @@ var _predicates = require("../../predicates.cjs");
 /**
  * @public
  */
-class AllOfVisitor extends (0, _tsMixer.Mixin)(_SpecificationVisitor.default, _ParentSchemaAwareVisitor.default, _FallbackVisitor.default) {
+class AllOfVisitor extends _bases.AllOfVisitorBase {
   constructor(options) {
     super(options);
-    this.element = new _apidomCore.ArrayElement();
+    this.element = new _apidomDatamodel.ArrayElement();
     this.element.classes.push('json-schema-allOf');
   }
-  ArrayElement(arrayElement) {
+  ArrayElement(path) {
+    const arrayElement = path.node;
     arrayElement.forEach(item => {
       const specPath = (0, _predicates.isJSONReferenceLikeElement)(item) ? ['document', 'objects', 'JSONReference'] : ['document', 'objects', 'JSONSchema'];
       const element = this.toRefractedElement(specPath, item);
       this.element.push(element);
     });
     this.copyMetaAndAttributes(arrayElement, this.element);
-    return _apidomCore.BREAK;
+    path.stop();
   }
 }
 var _default = exports.default = AllOfVisitor;

package/src/refractor/visitors/json-schema/AllOfVisitor.mjs

@@ -1,8 +1,5 @@
-import { Mixin } from 'ts-mixer';
-import { ArrayElement, BREAK } from '@speclynx/apidom-core';
-import FallbackVisitor from "../FallbackVisitor.mjs";
-import SpecificationVisitor from "../SpecificationVisitor.mjs";
-import ParentSchemaAwareVisitor from "./ParentSchemaAwareVisitor.mjs";
+import { ArrayElement } from '@speclynx/apidom-datamodel';
+import { AllOfVisitorBase } from "./bases.mjs";
 import { isJSONReferenceLikeElement } from "../../predicates.mjs";
 /**
  * @public
@@ -10,20 +7,21 @@ import { isJSONReferenceLikeElement } from "../../predicates.mjs";
 /**
  * @public
  */
-class AllOfVisitor extends Mixin(SpecificationVisitor, ParentSchemaAwareVisitor, FallbackVisitor) {
+class AllOfVisitor extends AllOfVisitorBase {
   constructor(options) {
     super(options);
     this.element = new ArrayElement();
     this.element.classes.push('json-schema-allOf');
   }
-  ArrayElement(arrayElement) {
+  ArrayElement(path) {
+    const arrayElement = path.node;
     arrayElement.forEach(item => {
       const specPath = isJSONReferenceLikeElement(item) ? ['document', 'objects', 'JSONReference'] : ['document', 'objects', 'JSONSchema'];
       const element = this.toRefractedElement(specPath, item);
       this.element.push(element);
     });
     this.copyMetaAndAttributes(arrayElement, this.element);
-    return BREAK;
+    path.stop();
   }
 }
 export default AllOfVisitor;

package/src/refractor/visitors/json-schema/AnyOfVisitor.cjs

@@ -1,13 +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 _FallbackVisitor = _interopRequireDefault(require("../FallbackVisitor.cjs"));
-var _SpecificationVisitor = _interopRequireDefault(require("../SpecificationVisitor.cjs"));
-var _ParentSchemaAwareVisitor = _interopRequireDefault(require("./ParentSchemaAwareVisitor.cjs"));
+var _apidomDatamodel = require("@speclynx/apidom-datamodel");
+var _bases = require("./bases.cjs");
 var _predicates = require("../../predicates.cjs");
 /**
  * @public
@@ -16,20 +12,21 @@ var _predicates = require("../../predicates.cjs");
 /**
  * @public
  */
-class AnyOfVisitor extends (0, _tsMixer.Mixin)(_SpecificationVisitor.default, _ParentSchemaAwareVisitor.default, _FallbackVisitor.default) {
+class AnyOfVisitor extends _bases.AnyOfVisitorBase {
   constructor(options) {
     super(options);
-    this.element = new _apidomCore.ArrayElement();
+    this.element = new _apidomDatamodel.ArrayElement();
     this.element.classes.push('json-schema-anyOf');
   }
-  ArrayElement(arrayElement) {
+  ArrayElement(path) {
+    const arrayElement = path.node;
     arrayElement.forEach(item => {
       const specPath = (0, _predicates.isJSONReferenceLikeElement)(item) ? ['document', 'objects', 'JSONReference'] : ['document', 'objects', 'JSONSchema'];
       const element = this.toRefractedElement(specPath, item);
       this.element.push(element);
     });
     this.copyMetaAndAttributes(arrayElement, this.element);
-    return _apidomCore.BREAK;
+    path.stop();
   }
 }
 var _default = exports.default = AnyOfVisitor;

package/src/refractor/visitors/json-schema/AnyOfVisitor.mjs

@@ -1,8 +1,5 @@
-import { Mixin } from 'ts-mixer';
-import { ArrayElement, BREAK } from '@speclynx/apidom-core';
-import FallbackVisitor from "../FallbackVisitor.mjs";
-import SpecificationVisitor from "../SpecificationVisitor.mjs";
-import ParentSchemaAwareVisitor from "./ParentSchemaAwareVisitor.mjs";
+import { ArrayElement } from '@speclynx/apidom-datamodel';
+import { AnyOfVisitorBase } from "./bases.mjs";
 import { isJSONReferenceLikeElement } from "../../predicates.mjs";
 /**
  * @public
@@ -10,20 +7,21 @@ import { isJSONReferenceLikeElement } from "../../predicates.mjs";
 /**
  * @public
  */
-class AnyOfVisitor extends Mixin(SpecificationVisitor, ParentSchemaAwareVisitor, FallbackVisitor) {
+class AnyOfVisitor extends AnyOfVisitorBase {
   constructor(options) {
     super(options);
     this.element = new ArrayElement();
     this.element.classes.push('json-schema-anyOf');
   }
-  ArrayElement(arrayElement) {
+  ArrayElement(path) {
+    const arrayElement = path.node;
     arrayElement.forEach(item => {
       const specPath = isJSONReferenceLikeElement(item) ? ['document', 'objects', 'JSONReference'] : ['document', 'objects', 'JSONSchema'];
       const element = this.toRefractedElement(specPath, item);
       this.element.push(element);
     });
     this.copyMetaAndAttributes(arrayElement, this.element);
-    return BREAK;
+    path.stop();
   }
 }
 export default AnyOfVisitor;

package/src/refractor/visitors/json-schema/DefinitionsVisitor.cjs

@@ -1,13 +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 _FallbackVisitor = _interopRequireDefault(require("../FallbackVisitor.cjs"));
-var _MapVisitor = _interopRequireDefault(require("../generics/MapVisitor.cjs"));
-var _ParentSchemaAwareVisitor = _interopRequireDefault(require("./ParentSchemaAwareVisitor.cjs"));
+var _apidomDatamodel = require("@speclynx/apidom-datamodel");
+var _bases = require("./bases.cjs");
 var _predicates = require("../../predicates.cjs");
 /**
  * @public
@@ -16,10 +12,10 @@ var _predicates = require("../../predicates.cjs");
 /**
  * @public
  */
-class DefinitionsVisitor extends (0, _tsMixer.Mixin)(_MapVisitor.default, _ParentSchemaAwareVisitor.default, _FallbackVisitor.default) {
+class DefinitionsVisitor extends _bases.DefinitionsVisitorBase {
   constructor(options) {
     super(options);
-    this.element = new _apidomCore.ObjectElement();
+    this.element = new _apidomDatamodel.ObjectElement();
     this.element.classes.push('json-schema-definitions');
     this.specPath = element => (0, _predicates.isJSONReferenceLikeElement)(element) ? ['document', 'objects', 'JSONReference'] : ['document', 'objects', 'JSONSchema'];
   }

package/src/refractor/visitors/json-schema/DefinitionsVisitor.mjs

@@ -1,8 +1,5 @@
-import { Mixin } from 'ts-mixer';
-import { ObjectElement } from '@speclynx/apidom-core';
-import FallbackVisitor from "../FallbackVisitor.mjs";
-import MapVisitor from "../generics/MapVisitor.mjs";
-import ParentSchemaAwareVisitor from "./ParentSchemaAwareVisitor.mjs";
+import { ObjectElement } from '@speclynx/apidom-datamodel';
+import { DefinitionsVisitorBase } from "./bases.mjs";
 import { isJSONReferenceLikeElement } from "../../predicates.mjs";
 /**
  * @public
@@ -10,7 +7,7 @@ import { isJSONReferenceLikeElement } from "../../predicates.mjs";
 /**
  * @public
  */
-class DefinitionsVisitor extends Mixin(MapVisitor, ParentSchemaAwareVisitor, FallbackVisitor) {
+class DefinitionsVisitor extends DefinitionsVisitorBase {
   constructor(options) {
     super(options);
     this.element = new ObjectElement();

package/src/refractor/visitors/json-schema/DependenciesVisitor.cjs

@@ -1,13 +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 _ParentSchemaAwareVisitor = _interopRequireDefault(require("./ParentSchemaAwareVisitor.cjs"));
+var _apidomDatamodel = require("@speclynx/apidom-datamodel");
+var _bases = require("./bases.cjs");
 var _predicates = require("../../predicates.cjs");
 /**
  * @public
@@ -16,10 +12,10 @@ var _predicates = require("../../predicates.cjs");
 /**
  * @public
  */
-class DependenciesVisitor extends (0, _tsMixer.Mixin)(_MapVisitor.default, _ParentSchemaAwareVisitor.default, _FallbackVisitor.default) {
+class DependenciesVisitor extends _bases.DependenciesVisitorBase {
   constructor(options) {
     super(options);
-    this.element = new _apidomCore.ObjectElement();
+    this.element = new _apidomDatamodel.ObjectElement();
     this.element.classes.push('json-schema-dependencies');
     this.specPath = element => (0, _predicates.isJSONReferenceLikeElement)(element) ? ['document', 'objects', 'JSONReference'] : ['document', 'objects', 'JSONSchema'];
   }

package/src/refractor/visitors/json-schema/DependenciesVisitor.mjs

@@ -1,8 +1,5 @@
-import { Mixin } from 'ts-mixer';
-import { ObjectElement } from '@speclynx/apidom-core';
-import MapVisitor from "../generics/MapVisitor.mjs";
-import FallbackVisitor from "../FallbackVisitor.mjs";
-import ParentSchemaAwareVisitor from "./ParentSchemaAwareVisitor.mjs";
+import { ObjectElement } from '@speclynx/apidom-datamodel';
+import { DependenciesVisitorBase } from "./bases.mjs";
 import { isJSONReferenceLikeElement } from "../../predicates.mjs";
 /**
  * @public
@@ -10,7 +7,7 @@ import { isJSONReferenceLikeElement } from "../../predicates.mjs";
 /**
  * @public
  */
-class DependenciesVisitor extends Mixin(MapVisitor, ParentSchemaAwareVisitor, FallbackVisitor) {
+class DependenciesVisitor extends DependenciesVisitorBase {
   constructor(options) {
     super(options);
     this.element = new ObjectElement();

package/src/refractor/visitors/json-schema/EnumVisitor.cjs

@@ -8,10 +8,9 @@ var _FallbackVisitor = _interopRequireDefault(require("../FallbackVisitor.cjs"))
  * @public
  */
 class EnumVisitor extends _FallbackVisitor.default {
-  ArrayElement(arrayElement) {
-    const result = this.enter(arrayElement);
+  ArrayElement(path) {
+    super.enter(path);
     this.element.classes.push('json-schema-enum');
-    return result;
   }
 }
 var _default = exports.default = EnumVisitor;

package/src/refractor/visitors/json-schema/EnumVisitor.mjs

@@ -3,10 +3,9 @@ import FallbackVisitor from "../FallbackVisitor.mjs";
  * @public
  */
 class EnumVisitor extends FallbackVisitor {
-  ArrayElement(arrayElement) {
-    const result = this.enter(arrayElement);
+  ArrayElement(path) {
+    super.enter(path);
     this.element.classes.push('json-schema-enum');
-    return result;
   }
 }
 export default EnumVisitor;

package/src/refractor/visitors/json-schema/ItemsVisitor.cjs

@@ -1,13 +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 _SpecificationVisitor = _interopRequireDefault(require("../SpecificationVisitor.cjs"));
-var _FallbackVisitor = _interopRequireDefault(require("../FallbackVisitor.cjs"));
-var _ParentSchemaAwareVisitor = _interopRequireDefault(require("./ParentSchemaAwareVisitor.cjs"));
+var _apidomDatamodel = require("@speclynx/apidom-datamodel");
+var _bases = require("./bases.cjs");
 var _predicates = require("../../predicates.cjs");
 /**
  * @public
@@ -16,14 +12,16 @@ var _predicates = require("../../predicates.cjs");
 /**
  * @public
  */
-class ItemsVisitor extends (0, _tsMixer.Mixin)(_SpecificationVisitor.default, _ParentSchemaAwareVisitor.default, _FallbackVisitor.default) {
-  ObjectElement(objectElement) {
+class ItemsVisitor extends _bases.ItemsVisitorBase {
+  ObjectElement(path) {
+    const objectElement = path.node;
     const specPath = (0, _predicates.isJSONReferenceLikeElement)(objectElement) ? ['document', 'objects', 'JSONReference'] : ['document', 'objects', 'JSONSchema'];
     this.element = this.toRefractedElement(specPath, objectElement);
-    return _apidomCore.BREAK;
+    path.stop();
   }
-  ArrayElement(arrayElement) {
-    this.element = new _apidomCore.ArrayElement();
+  ArrayElement(path) {
+    const arrayElement = path.node;
+    this.element = new _apidomDatamodel.ArrayElement();
     this.element.classes.push('json-schema-items');
     arrayElement.forEach(item => {
       const specPath = (0, _predicates.isJSONReferenceLikeElement)(item) ? ['document', 'objects', 'JSONReference'] : ['document', 'objects', 'JSONSchema'];
@@ -31,7 +29,7 @@ class ItemsVisitor extends (0, _tsMixer.Mixin)(_SpecificationVisitor.default, _P
       this.element.push(element);
     });
     this.copyMetaAndAttributes(arrayElement, this.element);
-    return _apidomCore.BREAK;
+    path.stop();
   }
 }
 var _default = exports.default = ItemsVisitor;

package/src/refractor/visitors/json-schema/ItemsVisitor.mjs

@@ -1,8 +1,5 @@
-import { Mixin } from 'ts-mixer';
-import { ArrayElement, BREAK } from '@speclynx/apidom-core';
-import SpecificationVisitor from "../SpecificationVisitor.mjs";
-import FallbackVisitor from "../FallbackVisitor.mjs";
-import ParentSchemaAwareVisitor from "./ParentSchemaAwareVisitor.mjs";
+import { ArrayElement } from '@speclynx/apidom-datamodel';
+import { ItemsVisitorBase } from "./bases.mjs";
 import { isJSONReferenceLikeElement } from "../../predicates.mjs";
 /**
  * @public
@@ -10,13 +7,15 @@ import { isJSONReferenceLikeElement } from "../../predicates.mjs";
 /**
  * @public
  */
-class ItemsVisitor extends Mixin(SpecificationVisitor, ParentSchemaAwareVisitor, FallbackVisitor) {
-  ObjectElement(objectElement) {
+class ItemsVisitor extends ItemsVisitorBase {
+  ObjectElement(path) {
+    const objectElement = path.node;
     const specPath = isJSONReferenceLikeElement(objectElement) ? ['document', 'objects', 'JSONReference'] : ['document', 'objects', 'JSONSchema'];
     this.element = this.toRefractedElement(specPath, objectElement);
-    return BREAK;
+    path.stop();
   }
-  ArrayElement(arrayElement) {
+  ArrayElement(path) {
+    const arrayElement = path.node;
     this.element = new ArrayElement();
     this.element.classes.push('json-schema-items');
     arrayElement.forEach(item => {
@@ -25,7 +24,7 @@ class ItemsVisitor extends Mixin(SpecificationVisitor, ParentSchemaAwareVisitor,
       this.element.push(element);
     });
     this.copyMetaAndAttributes(arrayElement, this.element);
-    return BREAK;
+    path.stop();
   }
 }
 export default ItemsVisitor;

package/src/refractor/visitors/json-schema/LinksVisitor.cjs

@@ -1,13 +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 _FallbackVisitor = _interopRequireDefault(require("../FallbackVisitor.cjs"));
-var _SpecificationVisitor = _interopRequireDefault(require("../SpecificationVisitor.cjs"));
-var _ParentSchemaAwareVisitor = _interopRequireDefault(require("./ParentSchemaAwareVisitor.cjs"));
+var _apidomDatamodel = require("@speclynx/apidom-datamodel");
+var _bases = require("./bases.cjs");
 /**
  * @public
  */
@@ -15,19 +11,20 @@ var _ParentSchemaAwareVisitor = _interopRequireDefault(require("./ParentSchemaAw
 /**
  * @public
  */
-class LinksVisitor extends (0, _tsMixer.Mixin)(_SpecificationVisitor.default, _ParentSchemaAwareVisitor.default, _FallbackVisitor.default) {
+class LinksVisitor extends _bases.LinksVisitorBase {
   constructor(options) {
     super(options);
-    this.element = new _apidomCore.ArrayElement();
+    this.element = new _apidomDatamodel.ArrayElement();
     this.element.classes.push('json-schema-links');
   }
-  ArrayElement(arrayElement) {
+  ArrayElement(path) {
+    const arrayElement = path.node;
     arrayElement.forEach(item => {
       const linkDescriptionElement = this.toRefractedElement(['document', 'objects', 'LinkDescription'], item);
       this.element.push(linkDescriptionElement);
     });
     this.copyMetaAndAttributes(arrayElement, this.element);
-    return _apidomCore.BREAK;
+    path.stop();
   }
 }
 var _default = exports.default = LinksVisitor;