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

package/src/refractor/visitors/json-schema/PatternPropertiesVisitor.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 PatternPropertiesVisitor extends (0, _tsMixer.Mixin)(_MapVisitor.default, _ParentSchemaAwareVisitor.default, _FallbackVisitor.default) {
+class PatternPropertiesVisitor extends _bases.PatternPropertiesVisitorBase {
   constructor(options) {
     super(options);
-    this.element = new _apidomCore.ObjectElement();
+    this.element = new _apidomDatamodel.ObjectElement();
     this.element.classes.push('json-schema-patternProperties');
     this.specPath = element => (0, _predicates.isJSONReferenceLikeElement)(element) ? ['document', 'objects', 'JSONReference'] : ['document', 'objects', 'JSONSchema'];
   }

package/src/refractor/visitors/json-schema/PatternPropertiesVisitor.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 { PatternPropertiesVisitorBase } from "./bases.mjs";
 import { isJSONReferenceLikeElement } from "../../predicates.mjs";
 /**
  * @public
@@ -10,7 +7,7 @@ import { isJSONReferenceLikeElement } from "../../predicates.mjs";
 /**
  * @public
  */
-class PatternPropertiesVisitor extends Mixin(MapVisitor, ParentSchemaAwareVisitor, FallbackVisitor) {
+class PatternPropertiesVisitor extends PatternPropertiesVisitorBase {
   constructor(options) {
     super(options);
     this.element = new ObjectElement();

package/src/refractor/visitors/json-schema/PropertiesVisitor.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 PropertiesVisitor extends (0, _tsMixer.Mixin)(_MapVisitor.default, _ParentSchemaAwareVisitor.default, _FallbackVisitor.default) {
+class PropertiesVisitor extends _bases.PropertiesVisitorBase {
   constructor(options) {
     super(options);
-    this.element = new _apidomCore.ObjectElement();
+    this.element = new _apidomDatamodel.ObjectElement();
     this.element.classes.push('json-schema-properties');
     this.specPath = element => (0, _predicates.isJSONReferenceLikeElement)(element) ? ['document', 'objects', 'JSONReference'] : ['document', 'objects', 'JSONSchema'];
   }

package/src/refractor/visitors/json-schema/PropertiesVisitor.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 { PropertiesVisitorBase } from "./bases.mjs";
 import { isJSONReferenceLikeElement } from "../../predicates.mjs";
 /**
  * @public
@@ -10,7 +7,7 @@ import { isJSONReferenceLikeElement } from "../../predicates.mjs";
 /**
  * @public
  */
-class PropertiesVisitor extends Mixin(MapVisitor, ParentSchemaAwareVisitor, FallbackVisitor) {
+class PropertiesVisitor extends PropertiesVisitorBase {
   constructor(options) {
     super(options);
     this.element = new ObjectElement();

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

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

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

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

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

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

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

@@ -3,15 +3,13 @@ import FallbackVisitor from "../FallbackVisitor.mjs";
  * @public
  */
 class TypeVisitor extends FallbackVisitor {
-  StringElement(stringElement) {
-    const result = this.enter(stringElement);
+  StringElement(path) {
+    super.enter(path);
     this.element.classes.push('json-schema-type');
-    return result;
   }
-  ArrayElement(arrayElement) {
-    const result = this.enter(arrayElement);
+  ArrayElement(path) {
+    super.enter(path);
     this.element.classes.push('json-schema-type');
-    return result;
   }
 }
 export default TypeVisitor;

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

@@ -0,0 +1,45 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault").default;
+exports.__esModule = true;
+exports.PropertiesVisitorBase = exports.PatternPropertiesVisitorBase = exports.OneOfVisitorBase = exports.MediaVisitorBase = exports.LinksVisitorBase = exports.LinkDescriptionVisitorBase = exports.JSONSchemaVisitorBase = exports.JSONReferenceVisitorBase = exports.ItemsVisitorBase = exports.DependenciesVisitorBase = exports.DefinitionsVisitorBase = exports.AnyOfVisitorBase = exports.AllOfVisitorBase = void 0;
+var _tsMixer = require("ts-mixer");
+var _FallbackVisitor = _interopRequireDefault(require("../FallbackVisitor.cjs"));
+var _SpecificationVisitor = _interopRequireDefault(require("../SpecificationVisitor.cjs"));
+var _FixedFieldsVisitor = _interopRequireDefault(require("../generics/FixedFieldsVisitor.cjs"));
+var _MapVisitor = _interopRequireDefault(require("../generics/MapVisitor.cjs"));
+var _ParentSchemaAwareVisitor = _interopRequireDefault(require("./ParentSchemaAwareVisitor.cjs"));
+/**
+ * These base classes are exported to satisfy api-extractor's ae-forgotten-export warnings.
+ * When ts-mixer creates mixin classes, TypeScript generates internal *_base types that
+ * need to be exported from the entry point.
+ */
+
+/** @public */
+const JSONSchemaVisitorBase = exports.JSONSchemaVisitorBase = (0, _tsMixer.Mixin)(_FixedFieldsVisitor.default, _ParentSchemaAwareVisitor.default, _FallbackVisitor.default);
+/** @public */
+const JSONReferenceVisitorBase = exports.JSONReferenceVisitorBase = (0, _tsMixer.Mixin)(_FixedFieldsVisitor.default, _FallbackVisitor.default);
+/** @public */
+const LinkDescriptionVisitorBase = exports.LinkDescriptionVisitorBase = (0, _tsMixer.Mixin)(_FixedFieldsVisitor.default, _FallbackVisitor.default);
+/** @public */
+const MediaVisitorBase = exports.MediaVisitorBase = (0, _tsMixer.Mixin)(_FixedFieldsVisitor.default, _FallbackVisitor.default);
+
+/** @public */
+const AllOfVisitorBase = exports.AllOfVisitorBase = (0, _tsMixer.Mixin)(_SpecificationVisitor.default, _ParentSchemaAwareVisitor.default, _FallbackVisitor.default);
+/** @public */
+const AnyOfVisitorBase = exports.AnyOfVisitorBase = (0, _tsMixer.Mixin)(_SpecificationVisitor.default, _ParentSchemaAwareVisitor.default, _FallbackVisitor.default);
+/** @public */
+const OneOfVisitorBase = exports.OneOfVisitorBase = (0, _tsMixer.Mixin)(_SpecificationVisitor.default, _ParentSchemaAwareVisitor.default, _FallbackVisitor.default);
+/** @public */
+const ItemsVisitorBase = exports.ItemsVisitorBase = (0, _tsMixer.Mixin)(_SpecificationVisitor.default, _ParentSchemaAwareVisitor.default, _FallbackVisitor.default);
+/** @public */
+const LinksVisitorBase = exports.LinksVisitorBase = (0, _tsMixer.Mixin)(_SpecificationVisitor.default, _ParentSchemaAwareVisitor.default, _FallbackVisitor.default);
+
+/** @public */
+const DefinitionsVisitorBase = exports.DefinitionsVisitorBase = (0, _tsMixer.Mixin)(_MapVisitor.default, _ParentSchemaAwareVisitor.default, _FallbackVisitor.default);
+/** @public */
+const DependenciesVisitorBase = exports.DependenciesVisitorBase = (0, _tsMixer.Mixin)(_MapVisitor.default, _ParentSchemaAwareVisitor.default, _FallbackVisitor.default);
+/** @public */
+const PatternPropertiesVisitorBase = exports.PatternPropertiesVisitorBase = (0, _tsMixer.Mixin)(_MapVisitor.default, _ParentSchemaAwareVisitor.default, _FallbackVisitor.default);
+/** @public */
+const PropertiesVisitorBase = exports.PropertiesVisitorBase = (0, _tsMixer.Mixin)(_MapVisitor.default, _ParentSchemaAwareVisitor.default, _FallbackVisitor.default);

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

@@ -0,0 +1,39 @@
+import { Mixin } from 'ts-mixer';
+import FallbackVisitor from "../FallbackVisitor.mjs";
+import SpecificationVisitor from "../SpecificationVisitor.mjs";
+import FixedFieldsVisitor from "../generics/FixedFieldsVisitor.mjs";
+import MapVisitor from "../generics/MapVisitor.mjs";
+import ParentSchemaAwareVisitor from "./ParentSchemaAwareVisitor.mjs";
+/**
+ * These base classes are exported to satisfy api-extractor's ae-forgotten-export warnings.
+ * When ts-mixer creates mixin classes, TypeScript generates internal *_base types that
+ * need to be exported from the entry point.
+ */
+/** @public */
+export const JSONSchemaVisitorBase = Mixin(FixedFieldsVisitor, ParentSchemaAwareVisitor, FallbackVisitor);
+/** @public */
+export const JSONReferenceVisitorBase = Mixin(FixedFieldsVisitor, FallbackVisitor);
+/** @public */
+export const LinkDescriptionVisitorBase = Mixin(FixedFieldsVisitor, FallbackVisitor);
+/** @public */
+export const MediaVisitorBase = Mixin(FixedFieldsVisitor, FallbackVisitor);
+
+/** @public */
+export const AllOfVisitorBase = Mixin(SpecificationVisitor, ParentSchemaAwareVisitor, FallbackVisitor);
+/** @public */
+export const AnyOfVisitorBase = Mixin(SpecificationVisitor, ParentSchemaAwareVisitor, FallbackVisitor);
+/** @public */
+export const OneOfVisitorBase = Mixin(SpecificationVisitor, ParentSchemaAwareVisitor, FallbackVisitor);
+/** @public */
+export const ItemsVisitorBase = Mixin(SpecificationVisitor, ParentSchemaAwareVisitor, FallbackVisitor);
+/** @public */
+export const LinksVisitorBase = Mixin(SpecificationVisitor, ParentSchemaAwareVisitor, FallbackVisitor);
+
+/** @public */
+export const DefinitionsVisitorBase = Mixin(MapVisitor, ParentSchemaAwareVisitor, FallbackVisitor);
+/** @public */
+export const DependenciesVisitorBase = Mixin(MapVisitor, ParentSchemaAwareVisitor, FallbackVisitor);
+/** @public */
+export const PatternPropertiesVisitorBase = Mixin(MapVisitor, ParentSchemaAwareVisitor, FallbackVisitor);
+/** @public */
+export const PropertiesVisitorBase = Mixin(MapVisitor, ParentSchemaAwareVisitor, FallbackVisitor);

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

@@ -3,13 +3,12 @@
 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 _ramdaAdjunct = require("ramda-adjunct");
+var _apidomDatamodel = require("@speclynx/apidom-datamodel");
 var _apidomCore = require("@speclynx/apidom-core");
 var _FixedFieldsVisitor = _interopRequireDefault(require("../generics/FixedFieldsVisitor.cjs"));
-var _ParentSchemaAwareVisitor = _interopRequireDefault(require("./ParentSchemaAwareVisitor.cjs"));
-var _FallbackVisitor = _interopRequireDefault(require("../FallbackVisitor.cjs"));
+var _bases = require("./bases.cjs");
 var _JSONSchema = _interopRequireDefault(require("../../../elements/JSONSchema.cjs"));
 var _predicates = require("../../../predicates.cjs");
 /**
@@ -19,7 +18,7 @@ var _predicates = require("../../../predicates.cjs");
 /**
  * @public
  */
-class JSONSchemaVisitor extends (0, _tsMixer.Mixin)(_FixedFieldsVisitor.default, _ParentSchemaAwareVisitor.default, _FallbackVisitor.default) {
+class JSONSchemaVisitor extends _bases.JSONSchemaVisitorBase {
   constructor(options) {
     super(options);
     this.element = new _JSONSchema.default();
@@ -28,29 +27,30 @@ class JSONSchemaVisitor extends (0, _tsMixer.Mixin)(_FixedFieldsVisitor.default,
   get defaultDialectIdentifier() {
     return 'http://json-schema.org/draft-04/schema#';
   }
-  ObjectElement(objectElement) {
+  ObjectElement(path) {
+    const objectElement = path.node;
     this.handleDialectIdentifier(objectElement);
     this.handleSchemaIdentifier(objectElement);
 
     // for further processing consider this JSONSchema Element as parent for all sub-schemas
     this.parent = this.element;
-    return _FixedFieldsVisitor.default.prototype.ObjectElement.call(this, objectElement);
+    return _FixedFieldsVisitor.default.prototype.ObjectElement.call(this, path);
   }
   handleDialectIdentifier(objectElement) {
     // handle $schema keyword in embedded resources
-    if ((0, _ramdaAdjunct.isUndefined)(this.parent) && !(0, _apidomCore.isStringElement)(objectElement.get('$schema'))) {
+    if ((0, _ramdaAdjunct.isUndefined)(this.parent) && !(0, _apidomDatamodel.isStringElement)(objectElement.get('$schema'))) {
       // no parent available and no $schema is defined, set default $schema
-      this.element.setMetaProperty('inheritedDialectIdentifier', this.defaultDialectIdentifier);
-    } else if ((0, _predicates.isJSONSchemaElement)(this.parent) && !(0, _apidomCore.isStringElement)(objectElement.get('$schema'))) {
+      this.element.meta.set('inheritedDialectIdentifier', this.defaultDialectIdentifier);
+    } else if ((0, _predicates.isJSONSchemaElement)(this.parent) && !(0, _apidomDatamodel.isStringElement)(objectElement.get('$schema'))) {
       // parent is available and no $schema is defined, set parent $schema
       const inheritedDialectIdentifier = (0, _ramda.defaultTo)((0, _apidomCore.toValue)(this.parent.meta.get('inheritedDialectIdentifier')), (0, _apidomCore.toValue)(this.parent.$schema));
-      this.element.setMetaProperty('inheritedDialectIdentifier', inheritedDialectIdentifier);
+      this.element.meta.set('inheritedDialectIdentifier', inheritedDialectIdentifier);
     }
   }
   handleSchemaIdentifier(objectElement, identifierKeyword = 'id') {
     // handle schema identifier in embedded resources
     // fetch parent's ancestorsSchemaIdentifiers
-    const ancestorsSchemaIdentifiers = this.parent !== undefined ? (0, _apidomCore.cloneDeep)(this.parent.getMetaProperty('ancestorsSchemaIdentifiers', [])) : new _apidomCore.ArrayElement();
+    const ancestorsSchemaIdentifiers = this.parent !== undefined ? (0, _apidomDatamodel.cloneDeep)(this.parent.meta.get('ancestorsSchemaIdentifiers') ?? new _apidomDatamodel.ArrayElement()) : new _apidomDatamodel.ArrayElement();
     // get current schema identifier
     const schemaIdentifier = (0, _apidomCore.toValue)(objectElement.get(identifierKeyword));
 
@@ -58,7 +58,7 @@ class JSONSchemaVisitor extends (0, _tsMixer.Mixin)(_FixedFieldsVisitor.default,
     if ((0, _ramdaAdjunct.isNonEmptyString)(schemaIdentifier)) {
       ancestorsSchemaIdentifiers.push(schemaIdentifier);
     }
-    this.element.setMetaProperty('ancestorsSchemaIdentifiers', ancestorsSchemaIdentifiers);
+    this.element.meta.set('ancestorsSchemaIdentifiers', ancestorsSchemaIdentifiers);
   }
 }
 var _default = exports.default = JSONSchemaVisitor;

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

@@ -1,10 +1,9 @@
-import { Mixin } from 'ts-mixer';
 import { always, defaultTo } from 'ramda';
 import { isNonEmptyString, isUndefined } from 'ramda-adjunct';
-import { ArrayElement, isStringElement, cloneDeep, toValue } from '@speclynx/apidom-core';
+import { ArrayElement, isStringElement, cloneDeep } from '@speclynx/apidom-datamodel';
+import { toValue } from '@speclynx/apidom-core';
 import FixedFieldsVisitor from "../generics/FixedFieldsVisitor.mjs";
-import ParentSchemaAwareVisitor from "./ParentSchemaAwareVisitor.mjs";
-import FallbackVisitor from "../FallbackVisitor.mjs";
+import { JSONSchemaVisitorBase } from "./bases.mjs";
 import JSONSchemaElement from "../../../elements/JSONSchema.mjs";
 import { isJSONSchemaElement } from "../../../predicates.mjs";
 /**
@@ -13,7 +12,7 @@ import { isJSONSchemaElement } from "../../../predicates.mjs";
 /**
  * @public
  */
-class JSONSchemaVisitor extends Mixin(FixedFieldsVisitor, ParentSchemaAwareVisitor, FallbackVisitor) {
+class JSONSchemaVisitor extends JSONSchemaVisitorBase {
   constructor(options) {
     super(options);
     this.element = new JSONSchemaElement();
@@ -22,29 +21,30 @@ class JSONSchemaVisitor extends Mixin(FixedFieldsVisitor, ParentSchemaAwareVisit
   get defaultDialectIdentifier() {
     return 'http://json-schema.org/draft-04/schema#';
   }
-  ObjectElement(objectElement) {
+  ObjectElement(path) {
+    const objectElement = path.node;
     this.handleDialectIdentifier(objectElement);
     this.handleSchemaIdentifier(objectElement);
 
     // for further processing consider this JSONSchema Element as parent for all sub-schemas
     this.parent = this.element;
-    return FixedFieldsVisitor.prototype.ObjectElement.call(this, objectElement);
+    return FixedFieldsVisitor.prototype.ObjectElement.call(this, path);
   }
   handleDialectIdentifier(objectElement) {
     // handle $schema keyword in embedded resources
     if (isUndefined(this.parent) && !isStringElement(objectElement.get('$schema'))) {
       // no parent available and no $schema is defined, set default $schema
-      this.element.setMetaProperty('inheritedDialectIdentifier', this.defaultDialectIdentifier);
+      this.element.meta.set('inheritedDialectIdentifier', this.defaultDialectIdentifier);
     } else if (isJSONSchemaElement(this.parent) && !isStringElement(objectElement.get('$schema'))) {
       // parent is available and no $schema is defined, set parent $schema
       const inheritedDialectIdentifier = defaultTo(toValue(this.parent.meta.get('inheritedDialectIdentifier')), toValue(this.parent.$schema));
-      this.element.setMetaProperty('inheritedDialectIdentifier', inheritedDialectIdentifier);
+      this.element.meta.set('inheritedDialectIdentifier', inheritedDialectIdentifier);
     }
   }
   handleSchemaIdentifier(objectElement, identifierKeyword = 'id') {
     // handle schema identifier in embedded resources
     // fetch parent's ancestorsSchemaIdentifiers
-    const ancestorsSchemaIdentifiers = this.parent !== undefined ? cloneDeep(this.parent.getMetaProperty('ancestorsSchemaIdentifiers', [])) : new ArrayElement();
+    const ancestorsSchemaIdentifiers = this.parent !== undefined ? cloneDeep(this.parent.meta.get('ancestorsSchemaIdentifiers') ?? new ArrayElement()) : new ArrayElement();
     // get current schema identifier
     const schemaIdentifier = toValue(objectElement.get(identifierKeyword));
 
@@ -52,7 +52,7 @@ class JSONSchemaVisitor extends Mixin(FixedFieldsVisitor, ParentSchemaAwareVisit
     if (isNonEmptyString(schemaIdentifier)) {
       ancestorsSchemaIdentifiers.push(schemaIdentifier);
     }
-    this.element.setMetaProperty('ancestorsSchemaIdentifiers', ancestorsSchemaIdentifiers);
+    this.element.meta.set('ancestorsSchemaIdentifiers', ancestorsSchemaIdentifiers);
   }
 }
 export default JSONSchemaVisitor;

package/src/refractor/visitors/json-schema/json-reference/$RefVisitor.cjs

@@ -8,10 +8,9 @@ var _FallbackVisitor = _interopRequireDefault(require("../../FallbackVisitor.cjs
  * @public
  */
 class $RefVisitor extends _FallbackVisitor.default {
-  StringElement(stringElement) {
-    const result = this.enter(stringElement);
+  StringElement(path) {
+    super.enter(path);
     this.element.classes.push('reference-value');
-    return result;
   }
 }
 var _default = exports.default = $RefVisitor;

package/src/refractor/visitors/json-schema/json-reference/$RefVisitor.mjs

@@ -3,10 +3,9 @@ import FallbackVisitor from "../../FallbackVisitor.mjs";
  * @public
  */
 class $RefVisitor extends FallbackVisitor {
-  StringElement(stringElement) {
-    const result = this.enter(stringElement);
+  StringElement(path) {
+    super.enter(path);
     this.element.classes.push('reference-value');
-    return result;
   }
 }
 export default $RefVisitor;

package/src/refractor/visitors/json-schema/json-reference/index.cjs

@@ -3,12 +3,11 @@
 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 _apidomDatamodel = require("@speclynx/apidom-datamodel");
 var _JSONReference = _interopRequireDefault(require("../../../../elements/JSONReference.cjs"));
 var _FixedFieldsVisitor = _interopRequireDefault(require("../../generics/FixedFieldsVisitor.cjs"));
-var _FallbackVisitor = _interopRequireDefault(require("../../FallbackVisitor.cjs"));
+var _bases = require("../bases.cjs");
 /**
  * @public
  */
@@ -16,20 +15,19 @@ var _FallbackVisitor = _interopRequireDefault(require("../../FallbackVisitor.cjs
 /**
  * @public
  */
-class JSONReferenceVisitor extends (0, _tsMixer.Mixin)(_FixedFieldsVisitor.default, _FallbackVisitor.default) {
+class JSONReferenceVisitor extends _bases.JSONReferenceVisitorBase {
   constructor(options) {
     super(options);
     this.element = new _JSONReference.default();
     this.specPath = (0, _ramda.always)(['document', 'objects', 'JSONReference']);
   }
-  ObjectElement(objectElement) {
-    const result = _FixedFieldsVisitor.default.prototype.ObjectElement.call(this, objectElement);
+  ObjectElement(path) {
+    _FixedFieldsVisitor.default.prototype.ObjectElement.call(this, path);
 
     // mark this JSONReferenceElement with reference metadata
-    if ((0, _apidomCore.isStringElement)(this.element.$ref)) {
+    if ((0, _apidomDatamodel.isStringElement)(this.element.$ref)) {
       this.element.classes.push('reference-element');
     }
-    return result;
   }
 }
 var _default = exports.default = JSONReferenceVisitor;

package/src/refractor/visitors/json-schema/json-reference/index.mjs

@@ -1,29 +1,27 @@
-import { Mixin } from 'ts-mixer';
 import { always } from 'ramda';
-import { isStringElement } from '@speclynx/apidom-core';
+import { isStringElement } from '@speclynx/apidom-datamodel';
 import JSONReferenceElement from "../../../../elements/JSONReference.mjs";
 import FixedFieldsVisitor from "../../generics/FixedFieldsVisitor.mjs";
-import FallbackVisitor from "../../FallbackVisitor.mjs";
+import { JSONReferenceVisitorBase } from "../bases.mjs";
 /**
  * @public
  */
 /**
  * @public
  */
-class JSONReferenceVisitor extends Mixin(FixedFieldsVisitor, FallbackVisitor) {
+class JSONReferenceVisitor extends JSONReferenceVisitorBase {
   constructor(options) {
     super(options);
     this.element = new JSONReferenceElement();
     this.specPath = always(['document', 'objects', 'JSONReference']);
   }
-  ObjectElement(objectElement) {
-    const result = FixedFieldsVisitor.prototype.ObjectElement.call(this, objectElement);
+  ObjectElement(path) {
+    FixedFieldsVisitor.prototype.ObjectElement.call(this, path);
 
     // mark this JSONReferenceElement with reference metadata
     if (isStringElement(this.element.$ref)) {
       this.element.classes.push('reference-element');
     }
-    return result;
   }
 }
 export default JSONReferenceVisitor;

package/src/refractor/visitors/json-schema/link-description/index.cjs

@@ -3,11 +3,9 @@
 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 _LinkDescription = _interopRequireDefault(require("../../../../elements/LinkDescription.cjs"));
-var _FixedFieldsVisitor = _interopRequireDefault(require("../../generics/FixedFieldsVisitor.cjs"));
-var _FallbackVisitor = _interopRequireDefault(require("../../FallbackVisitor.cjs"));
+var _bases = require("../bases.cjs");
 /**
  * @public
  */
@@ -15,7 +13,7 @@ var _FallbackVisitor = _interopRequireDefault(require("../../FallbackVisitor.cjs
 /**
  * @public
  */
-class LinkDescriptionVisitor extends (0, _tsMixer.Mixin)(_FixedFieldsVisitor.default, _FallbackVisitor.default) {
+class LinkDescriptionVisitor extends _bases.LinkDescriptionVisitorBase {
   constructor(options) {
     super(options);
     this.element = new _LinkDescription.default();

package/src/refractor/visitors/json-schema/link-description/index.mjs

@@ -1,15 +1,13 @@
-import { Mixin } from 'ts-mixer';
 import { always } from 'ramda';
 import LinkDescriptionElement from "../../../../elements/LinkDescription.mjs";
-import FixedFieldsVisitor from "../../generics/FixedFieldsVisitor.mjs";
-import FallbackVisitor from "../../FallbackVisitor.mjs";
+import { LinkDescriptionVisitorBase } from "../bases.mjs";
 /**
  * @public
  */
 /**
  * @public
  */
-class LinkDescriptionVisitor extends Mixin(FixedFieldsVisitor, FallbackVisitor) {
+class LinkDescriptionVisitor extends LinkDescriptionVisitorBase {
   constructor(options) {
     super(options);
     this.element = new LinkDescriptionElement();

package/src/refractor/visitors/json-schema/media/index.cjs

@@ -3,11 +3,9 @@
 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 _Media = _interopRequireDefault(require("../../../../elements/Media.cjs"));
-var _FixedFieldsVisitor = _interopRequireDefault(require("../../generics/FixedFieldsVisitor.cjs"));
-var _FallbackVisitor = _interopRequireDefault(require("../../FallbackVisitor.cjs"));
+var _bases = require("../bases.cjs");
 /**
  * @public
  */
@@ -15,7 +13,7 @@ var _FallbackVisitor = _interopRequireDefault(require("../../FallbackVisitor.cjs
 /**
  * @public
  */
-class MediaVisitor extends (0, _tsMixer.Mixin)(_FixedFieldsVisitor.default, _FallbackVisitor.default) {
+class MediaVisitor extends _bases.MediaVisitorBase {
   constructor(options) {
     super(options);
     this.element = new _Media.default();

package/src/refractor/visitors/json-schema/media/index.mjs

@@ -1,15 +1,13 @@
-import { Mixin } from 'ts-mixer';
 import { always } from 'ramda';
 import MediaElement from "../../../../elements/Media.mjs";
-import FixedFieldsVisitor from "../../generics/FixedFieldsVisitor.mjs";
-import FallbackVisitor from "../../FallbackVisitor.mjs";
+import { MediaVisitorBase } from "../bases.mjs";
 /**
  * @public
  */
 /**
  * @public
  */
-class MediaVisitor extends Mixin(FixedFieldsVisitor, FallbackVisitor) {
+class MediaVisitor extends MediaVisitorBase {
   constructor(options) {
     super(options);
     this.element = new MediaElement();