@speclynx/apidom-ns-json-schema-2019-09 1.12.2 → 2.0.1

package/src/refractor/plugins/replace-empty-element.cjs

@@ -3,10 +3,11 @@
 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 _apidomTraverse = require("@speclynx/apidom-traverse");
 var _JSONSchema = _interopRequireDefault(require("../../elements/JSONSchema.cjs"));
 var _LinkDescription = _interopRequireDefault(require("../../elements/LinkDescription.cjs"));
-var _visitor = require("../../traversal/visitor.cjs");
 /**
  * JSON Schema 2019-09 specification elements.
  */
@@ -45,7 +46,7 @@ var _visitor = require("../../traversal/visitor.cjs");
  *      (JSONSchemaElement))
  */
 
-const isEmptyElement = element => (0, _apidomCore.isStringElement)(element) && (0, _apidomCore.includesClasses)(['yaml-e-node', 'yaml-e-scalar'], element);
+const isEmptyElement = element => (0, _apidomDatamodel.isStringElement)(element) && (0, _apidomDatamodel.includesClasses)(element, ['yaml-e-node', 'yaml-e-scalar']);
 const schema = {
   JSONSchema201909Element: {
     additionalItems(...args) {
@@ -58,12 +59,12 @@ const schema = {
       return new _JSONSchema.default(...args);
     },
     required(...args) {
-      const element = new _apidomCore.ArrayElement(...args);
+      const element = new _apidomDatamodel.ArrayElement(...args);
       element.classes.push('json-schema-required');
       return element;
     },
     properties(...args) {
-      const element = new _apidomCore.ObjectElement(...args);
+      const element = new _apidomDatamodel.ObjectElement(...args);
       element.classes.push('json-schema-properties');
       return element;
     },
@@ -71,12 +72,12 @@ const schema = {
       return new _JSONSchema.default(...args);
     },
     patternProperties(...args) {
-      const element = new _apidomCore.ObjectElement(...args);
+      const element = new _apidomDatamodel.ObjectElement(...args);
       element.classes.push('json-schema-patternProperties');
       return element;
     },
     dependentSchemas(...args) {
-      const element = new _apidomCore.ObjectElement(...args);
+      const element = new _apidomDatamodel.ObjectElement(...args);
       element.classes.push('json-schema-dependentSchemas');
       return element;
     },
@@ -84,22 +85,22 @@ const schema = {
       return new _JSONSchema.default(...args);
     },
     enum(...args) {
-      const element = new _apidomCore.ArrayElement(...args);
+      const element = new _apidomDatamodel.ArrayElement(...args);
       element.classes.push('json-schema-enum');
       return element;
     },
     allOf(...args) {
-      const element = new _apidomCore.ArrayElement(...args);
+      const element = new _apidomDatamodel.ArrayElement(...args);
       element.classes.push('json-schema-allOf');
       return element;
     },
     anyOf(...args) {
-      const element = new _apidomCore.ArrayElement(...args);
+      const element = new _apidomDatamodel.ArrayElement(...args);
       element.classes.push('json-schema-anyOf');
       return element;
     },
     oneOf(...args) {
-      const element = new _apidomCore.ArrayElement(...args);
+      const element = new _apidomDatamodel.ArrayElement(...args);
       element.classes.push('json-schema-oneOf');
       return element;
     },
@@ -116,22 +117,22 @@ const schema = {
       return new _JSONSchema.default(...args);
     },
     $defs(...args) {
-      const element = new _apidomCore.ObjectElement(...args);
+      const element = new _apidomDatamodel.ObjectElement(...args);
       element.classes.push('json-schema-$defs');
       return element;
     },
     examples(...args) {
-      const element = new _apidomCore.ArrayElement(...args);
+      const element = new _apidomDatamodel.ArrayElement(...args);
       element.classes.push('json-schema-examples');
       return element;
     },
     links(...args) {
-      const element = new _apidomCore.ArrayElement(...args);
+      const element = new _apidomDatamodel.ArrayElement(...args);
       element.classes.push('json-schema-links');
       return element;
     },
     $vocabulary(...args) {
-      const element = new _apidomCore.ObjectElement(...args);
+      const element = new _apidomDatamodel.ObjectElement(...args);
       element.classes.push('json-schema-$vocabulary');
       return element;
     },
@@ -142,7 +143,7 @@ const schema = {
       return new _JSONSchema.default(...args);
     },
     $dependentRequired(...args) {
-      const element = new _apidomCore.ObjectElement(...args);
+      const element = new _apidomDatamodel.ObjectElement(...args);
       element.classes.push('json-schema-$dependentRequired');
       return element;
     },
@@ -150,7 +151,7 @@ const schema = {
       return new _JSONSchema.default(...args);
     },
     type(...args) {
-      const element = new _apidomCore.ArrayElement(...args);
+      const element = new _apidomDatamodel.ArrayElement(...args);
       element.classes.push('json-schema-type');
       return element;
     }
@@ -166,13 +167,13 @@ const schema = {
       return new _JSONSchema.default(...args);
     },
     templatePointers(...args) {
-      return new _apidomCore.ObjectElement(...args);
+      return new _apidomDatamodel.ObjectElement(...args);
     },
     templateRequired(...args) {
-      return new _apidomCore.ArrayElement(...args);
+      return new _apidomDatamodel.ArrayElement(...args);
     },
     targetHints(...args) {
-      return new _apidomCore.ObjectElement(...args);
+      return new _apidomDatamodel.ObjectElement(...args);
     },
     headerSchema(...args) {
       return new _JSONSchema.default(...args);
@@ -220,7 +221,7 @@ const schema = {
   }
 };
 const findElementFactory = (ancestor, keyName) => {
-  const elementType = (0, _visitor.getNodeType)(ancestor); // @ts-ignore
+  const elementType = (0, _apidomTraverse.getNodeType)(ancestor); // @ts-ignore
   const keyMapping = schema[elementType] || schema[(0, _apidomCore.toValue)(ancestor.classes.first)];
   return typeof keyMapping === 'undefined' ? undefined : Object.hasOwn(keyMapping, '[key: *]') ? keyMapping['[key: *]'] : keyMapping[keyName];
 };
@@ -231,25 +232,30 @@ const findElementFactory = (ancestor, keyName) => {
 const plugin = () => () => {
   return {
     visitor: {
-      StringElement(element, key, parent, path, ancestors) {
-        if (!isEmptyElement(element)) return undefined;
-        const lineage = [...ancestors, parent].filter(_apidomCore.isElement);
+      StringElement(path) {
+        const element = path.node;
+        if (!isEmptyElement(element)) return;
+
+        // getAncestorNodes() returns [parent, grandparent, ..., root], so reverse to get [root, ..., parent]
+        const lineage = path.getAncestorNodes().reverse().filter(_apidomDatamodel.isElement);
         const parentElement = lineage.at(-1);
         let elementFactory;
         let context;
-        if ((0, _apidomCore.isArrayElement)(parentElement)) {
+        if ((0, _apidomDatamodel.isArrayElement)(parentElement)) {
           context = element;
           elementFactory = findElementFactory(parentElement, '<*>');
-        } else if ((0, _apidomCore.isMemberElement)(parentElement)) {
+        } else if ((0, _apidomDatamodel.isMemberElement)(parentElement)) {
           context = lineage.at(-2);
           elementFactory = findElementFactory(context, (0, _apidomCore.toValue)(parentElement.key));
         }
 
         // no element factory found
-        if (typeof elementFactory !== 'function') return undefined;
-        return elementFactory.call({
+        if (typeof elementFactory !== 'function') return;
+        const replacement = elementFactory.call({
           context
-        }, undefined, (0, _apidomCore.cloneDeep)(element.meta), (0, _apidomCore.cloneDeep)(element.attributes));
+        }, undefined, (0, _apidomDatamodel.cloneDeep)(element.meta), (0, _apidomDatamodel.cloneDeep)(element.attributes));
+        _apidomDatamodel.SourceMapElement.transfer(element, replacement);
+        path.replaceWith(replacement);
       }
     }
   };

package/src/refractor/plugins/replace-empty-element.mjs

@@ -1,10 +1,11 @@
-import { ArrayElement, ObjectElement, isStringElement, isArrayElement, isElement, isMemberElement, includesClasses, cloneDeep, toValue } from '@speclynx/apidom-core';
+import { ArrayElement, ObjectElement, isArrayElement, isElement, isMemberElement, isStringElement, includesClasses, cloneDeep, SourceMapElement } from '@speclynx/apidom-datamodel';
+import { toValue } from '@speclynx/apidom-core';
+import { getNodeType } from '@speclynx/apidom-traverse';
 /**
  * JSON Schema 2019-09 specification elements.
  */
 import JSONSchemaElement from "../../elements/JSONSchema.mjs";
 import LinkDescriptionElement from "../../elements/LinkDescription.mjs";
-import { getNodeType } from "../../traversal/visitor.mjs";
 /**
  * This plugin is specific to YAML 1.2 format, which allows defining key-value pairs
  * with empty key, empty value, or both. If the value is not provided in YAML format,
@@ -38,7 +39,7 @@ import { getNodeType } from "../../traversal/visitor.mjs";
  *      (StringElement)
  *      (JSONSchemaElement))
  */
-const isEmptyElement = element => isStringElement(element) && includesClasses(['yaml-e-node', 'yaml-e-scalar'], element);
+const isEmptyElement = element => isStringElement(element) && includesClasses(element, ['yaml-e-node', 'yaml-e-scalar']);
 const schema = {
   JSONSchema201909Element: {
     additionalItems(...args) {
@@ -224,9 +225,12 @@ const findElementFactory = (ancestor, keyName) => {
 const plugin = () => () => {
   return {
     visitor: {
-      StringElement(element, key, parent, path, ancestors) {
-        if (!isEmptyElement(element)) return undefined;
-        const lineage = [...ancestors, parent].filter(isElement);
+      StringElement(path) {
+        const element = path.node;
+        if (!isEmptyElement(element)) return;
+
+        // getAncestorNodes() returns [parent, grandparent, ..., root], so reverse to get [root, ..., parent]
+        const lineage = path.getAncestorNodes().reverse().filter(isElement);
         const parentElement = lineage.at(-1);
         let elementFactory;
         let context;
@@ -239,10 +243,12 @@ const plugin = () => () => {
         }
 
         // no element factory found
-        if (typeof elementFactory !== 'function') return undefined;
-        return elementFactory.call({
+        if (typeof elementFactory !== 'function') return;
+        const replacement = elementFactory.call({
           context
         }, undefined, cloneDeep(element.meta), cloneDeep(element.attributes));
+        SourceMapElement.transfer(element, replacement);
+        path.replaceWith(replacement);
       }
     }
   };

package/src/refractor/specification.cjs

@@ -20,7 +20,10 @@ var _DependentRequiredVisitor = _interopRequireDefault(require("./visitors/json-
 var _index2 = _interopRequireDefault(require("./visitors/json-schema/link-description/index.cjs"));
 const specification = (0, _ramda.pipe)(
 // JSON Schema object modifications
-(0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', '$visitor'], _index.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', '$vocabulary'], _$vocabularyVisitor.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', '$anchor'], _apidomNsJsonSchemaDraft.specificationObj.visitors.value), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', '$recursiveAnchor'], _apidomNsJsonSchemaDraft.specificationObj.visitors.value), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', '$recursiveRef'], _apidomNsJsonSchemaDraft.specificationObj.visitors.value), (0, _ramda.dissocPath)(['visitors', 'document', 'objects', 'JSONReference', '$visitor']), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', '$ref'], _$refVisitor.default), (0, _ramda.dissocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'definitions']), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', '$defs'], _$defsVisitor.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'allOf'], _AllOfVisitor.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'anyOf'], _AnyOfVisitor.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'oneOf'], _OneOfVisitor.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'not'], _index.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'if'], _index.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'then'], _index.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'else'], _index.default), (0, _ramda.dissocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'dependencies']), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'dependentSchemas'], _DependentSchemasVisitor.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'items'], _ItemsVisitor.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'contains'], _index.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'properties'], _PropertiesVisitor.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'patternProperties'], _PatternPropertiesVisitor.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'additionalProperties'], _index.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'additionalItems'], _index.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'propertyNames'], _index.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'unevaluatedItems'], _index.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'unevaluatedProperties'], _index.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'maxContains'], _apidomNsJsonSchemaDraft.specificationObj.visitors.value), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'minContains'], _apidomNsJsonSchemaDraft.specificationObj.visitors.value), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'dependentRequired'], _DependentRequiredVisitor.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'deprecated'], _apidomNsJsonSchemaDraft.specificationObj.visitors.value), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'contentSchema'], _index.default),
+(0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'element'], 'jSONSchema201909'), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', '$visitor'], _index.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', '$vocabulary'], _$vocabularyVisitor.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', '$anchor'], _apidomNsJsonSchemaDraft.specificationObj.visitors.value), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', '$recursiveAnchor'], _apidomNsJsonSchemaDraft.specificationObj.visitors.value), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', '$recursiveRef'], _apidomNsJsonSchemaDraft.specificationObj.visitors.value), (0, _ramda.dissocPath)(['visitors', 'document', 'objects', 'JSONReference', '$visitor']), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', '$ref'], _$refVisitor.default), (0, _ramda.dissocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'definitions']), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', '$defs'], _$defsVisitor.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'allOf'], _AllOfVisitor.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'anyOf'], _AnyOfVisitor.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'oneOf'], _OneOfVisitor.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'not'], _index.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'if'], _index.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'then'], _index.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'else'], _index.default), (0, _ramda.dissocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'dependencies']), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'dependentSchemas'], _DependentSchemasVisitor.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'items'], {
+  $visitor: _ItemsVisitor.default,
+  alias: 'itemsField'
+}), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'contains'], _index.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'properties'], _PropertiesVisitor.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'patternProperties'], _PatternPropertiesVisitor.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'additionalProperties'], _index.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'additionalItems'], _index.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'propertyNames'], _index.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'unevaluatedItems'], _index.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'unevaluatedProperties'], _index.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'maxContains'], _apidomNsJsonSchemaDraft.specificationObj.visitors.value), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'minContains'], _apidomNsJsonSchemaDraft.specificationObj.visitors.value), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'dependentRequired'], _DependentRequiredVisitor.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'deprecated'], _apidomNsJsonSchemaDraft.specificationObj.visitors.value), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'contentSchema'], _index.default),
 // Link Description object modifications
-(0, _ramda.assocPath)(['visitors', 'document', 'objects', 'LinkDescription', '$visitor'], _index2.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'targetSchema'], _index.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'hrefSchema'], _index.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'headerSchema'], _index.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'submissionSchema'], _index.default))(_apidomNsJsonSchemaDraft.specificationObj);
+(0, _ramda.assocPath)(['visitors', 'document', 'objects', 'LinkDescription', 'element'], 'linkDescription'), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'LinkDescription', '$visitor'], _index2.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'targetSchema'], _index.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'hrefSchema'], _index.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'headerSchema'], _index.default), (0, _ramda.assocPath)(['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'submissionSchema'], _index.default))(_apidomNsJsonSchemaDraft.specificationObj);
 var _default = exports.default = specification;

package/src/refractor/specification.mjs

@@ -15,7 +15,10 @@ import JSONSchemaDependentRequiredVisitor from "./visitors/json-schema/Dependent
 import JSONSchemaLinkDescriptionVisitor from "./visitors/json-schema/link-description/index.mjs";
 const specification = pipe(
 // JSON Schema object modifications
-assocPath(['visitors', 'document', 'objects', 'JSONSchema', '$visitor'], JSONSchemaVisitor), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', '$vocabulary'], JSONSchema$vocabularyVisitor), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', '$anchor'], specificationObj.visitors.value), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', '$recursiveAnchor'], specificationObj.visitors.value), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', '$recursiveRef'], specificationObj.visitors.value), dissocPath(['visitors', 'document', 'objects', 'JSONReference', '$visitor']), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', '$ref'], JSONSchema$refVisitor), dissocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'definitions']), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', '$defs'], JSONSchema$defsVisitor), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'allOf'], JSONSchemaAllOfVisitor), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'anyOf'], JSONSchemaAnyOfVisitor), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'oneOf'], JSONSchemaOneOfVisitor), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'not'], JSONSchemaVisitor), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'if'], JSONSchemaVisitor), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'then'], JSONSchemaVisitor), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'else'], JSONSchemaVisitor), dissocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'dependencies']), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'dependentSchemas'], JSONSchemaDependentSchemasVisitor), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'items'], JSONSchemaItemsVisitor), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'contains'], JSONSchemaVisitor), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'properties'], JSONSchemaPropertiesVisitor), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'patternProperties'], JSONSchemaPatternPropertiesVisitor), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'additionalProperties'], JSONSchemaVisitor), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'additionalItems'], JSONSchemaVisitor), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'propertyNames'], JSONSchemaVisitor), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'unevaluatedItems'], JSONSchemaVisitor), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'unevaluatedProperties'], JSONSchemaVisitor), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'maxContains'], specificationObj.visitors.value), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'minContains'], specificationObj.visitors.value), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'dependentRequired'], JSONSchemaDependentRequiredVisitor), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'deprecated'], specificationObj.visitors.value), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'contentSchema'], JSONSchemaVisitor),
+assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'element'], 'jSONSchema201909'), assocPath(['visitors', 'document', 'objects', 'JSONSchema', '$visitor'], JSONSchemaVisitor), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', '$vocabulary'], JSONSchema$vocabularyVisitor), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', '$anchor'], specificationObj.visitors.value), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', '$recursiveAnchor'], specificationObj.visitors.value), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', '$recursiveRef'], specificationObj.visitors.value), dissocPath(['visitors', 'document', 'objects', 'JSONReference', '$visitor']), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', '$ref'], JSONSchema$refVisitor), dissocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'definitions']), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', '$defs'], JSONSchema$defsVisitor), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'allOf'], JSONSchemaAllOfVisitor), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'anyOf'], JSONSchemaAnyOfVisitor), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'oneOf'], JSONSchemaOneOfVisitor), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'not'], JSONSchemaVisitor), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'if'], JSONSchemaVisitor), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'then'], JSONSchemaVisitor), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'else'], JSONSchemaVisitor), dissocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'dependencies']), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'dependentSchemas'], JSONSchemaDependentSchemasVisitor), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'items'], {
+  $visitor: JSONSchemaItemsVisitor,
+  alias: 'itemsField'
+}), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'contains'], JSONSchemaVisitor), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'properties'], JSONSchemaPropertiesVisitor), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'patternProperties'], JSONSchemaPatternPropertiesVisitor), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'additionalProperties'], JSONSchemaVisitor), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'additionalItems'], JSONSchemaVisitor), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'propertyNames'], JSONSchemaVisitor), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'unevaluatedItems'], JSONSchemaVisitor), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'unevaluatedProperties'], JSONSchemaVisitor), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'maxContains'], specificationObj.visitors.value), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'minContains'], specificationObj.visitors.value), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'dependentRequired'], JSONSchemaDependentRequiredVisitor), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'deprecated'], specificationObj.visitors.value), assocPath(['visitors', 'document', 'objects', 'JSONSchema', 'fixedFields', 'contentSchema'], JSONSchemaVisitor),
 // Link Description object modifications
-assocPath(['visitors', 'document', 'objects', 'LinkDescription', '$visitor'], JSONSchemaLinkDescriptionVisitor), assocPath(['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'targetSchema'], JSONSchemaVisitor), assocPath(['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'hrefSchema'], JSONSchemaVisitor), assocPath(['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'headerSchema'], JSONSchemaVisitor), assocPath(['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'submissionSchema'], JSONSchemaVisitor))(specificationObj);
+assocPath(['visitors', 'document', 'objects', 'LinkDescription', 'element'], 'linkDescription'), assocPath(['visitors', 'document', 'objects', 'LinkDescription', '$visitor'], JSONSchemaLinkDescriptionVisitor), assocPath(['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'targetSchema'], JSONSchemaVisitor), assocPath(['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'hrefSchema'], JSONSchemaVisitor), assocPath(['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'headerSchema'], JSONSchemaVisitor), assocPath(['visitors', 'document', 'objects', 'LinkDescription', 'fixedFields', 'submissionSchema'], JSONSchemaVisitor))(specificationObj);
 export default specification;

package/src/refractor/toolbox.cjs

@@ -4,15 +4,20 @@ var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequ
 var _interopRequireWildcard = require("@babel/runtime-corejs3/helpers/interopRequireWildcard").default;
 exports.__esModule = true;
 exports.default = void 0;
-var _apidomCore = require("@speclynx/apidom-core");
+var _apidomDatamodel = require("@speclynx/apidom-datamodel");
 var jsonSchema201909Predicates = _interopRequireWildcard(require("../predicates.cjs"));
 var _namespace = _interopRequireDefault(require("../namespace.cjs"));
+/**
+ * @public
+ */
+
 const createToolbox = () => {
-  const namespace = (0, _apidomCore.createNamespace)(_namespace.default);
+  const namespace = new _apidomDatamodel.Namespace();
   const predicates = {
     ...jsonSchema201909Predicates,
-    isStringElement: _apidomCore.isStringElement
+    isStringElement: _apidomDatamodel.isStringElement
   };
+  namespace.use(_namespace.default);
   return {
     predicates,
     namespace

package/src/refractor/toolbox.mjs

@@ -1,12 +1,16 @@
-import { createNamespace, isStringElement } from '@speclynx/apidom-core';
+import { isStringElement, Namespace } from '@speclynx/apidom-datamodel';
 import * as jsonSchema201909Predicates from "../predicates.mjs";
 import jsonSchema201909Namespace from "../namespace.mjs";
+/**
+ * @public
+ */
 const createToolbox = () => {
-  const namespace = createNamespace(jsonSchema201909Namespace);
+  const namespace = new Namespace();
   const predicates = {
     ...jsonSchema201909Predicates,
     isStringElement
   };
+  namespace.use(jsonSchema201909Namespace);
   return {
     predicates,
     namespace

package/src/refractor/visitors/json-schema/$defsVisitor.cjs

@@ -2,10 +2,9 @@
 
 exports.__esModule = true;
 exports.default = void 0;
-var _tsMixer = require("ts-mixer");
 var _ramda = require("ramda");
-var _apidomCore = require("@speclynx/apidom-core");
-var _apidomNsJsonSchemaDraft = require("@speclynx/apidom-ns-json-schema-draft-7");
+var _apidomDatamodel = require("@speclynx/apidom-datamodel");
+var _bases = require("./bases.cjs");
 /**
  * @public
  */
@@ -13,10 +12,10 @@ var _apidomNsJsonSchemaDraft = require("@speclynx/apidom-ns-json-schema-draft-7"
 /**
  * @public
  */
-class $defsVisitor extends (0, _tsMixer.Mixin)(_apidomNsJsonSchemaDraft.MapVisitor, _apidomNsJsonSchemaDraft.ParentSchemaAwareVisitor, _apidomNsJsonSchemaDraft.FallbackVisitor) {
+class $defsVisitor extends _bases.BaseSchemaMapVisitor {
   constructor(options) {
     super(options);
-    this.element = new _apidomCore.ObjectElement();
+    this.element = new _apidomDatamodel.ObjectElement();
     this.element.classes.push('json-schema-$defs');
     this.specPath = (0, _ramda.always)(['document', 'objects', 'JSONSchema']);
   }

package/src/refractor/visitors/json-schema/$defsVisitor.mjs

@@ -1,16 +1,13 @@
-import { Mixin } from 'ts-mixer';
 import { always } from 'ramda';
-import { ObjectElement } from '@speclynx/apidom-core';
-import { FallbackVisitor, MapVisitor, ParentSchemaAwareVisitor } from '@speclynx/apidom-ns-json-schema-draft-7';
-
+import { ObjectElement } from '@speclynx/apidom-datamodel';
+import { BaseSchemaMapVisitor } from "./bases.mjs";
 /**
  * @public
  */
-
 /**
  * @public
  */
-class $defsVisitor extends Mixin(MapVisitor, ParentSchemaAwareVisitor, FallbackVisitor) {
+class $defsVisitor extends BaseSchemaMapVisitor {
   constructor(options) {
     super(options);
     this.element = new ObjectElement();

package/src/refractor/visitors/json-schema/$refVisitor.cjs

@@ -7,10 +7,9 @@ var _apidomNsJsonSchemaDraft = require("@speclynx/apidom-ns-json-schema-draft-7"
  * @public
  */
 class $refVisitor extends _apidomNsJsonSchemaDraft.FallbackVisitor {
-  StringElement(stringElement) {
-    const result = super.enter(stringElement);
+  StringElement(path) {
+    this.enter(path);
     this.element.classes.push('reference-value');
-    return result;
   }
 }
 var _default = exports.default = $refVisitor;

package/src/refractor/visitors/json-schema/$refVisitor.mjs

@@ -3,10 +3,9 @@ import { FallbackVisitor } from '@speclynx/apidom-ns-json-schema-draft-7';
  * @public
  */
 class $refVisitor extends FallbackVisitor {
-  StringElement(stringElement) {
-    const result = super.enter(stringElement);
+  StringElement(path) {
+    this.enter(path);
     this.element.classes.push('reference-value');
-    return result;
   }
 }
 export default $refVisitor;

package/src/refractor/visitors/json-schema/$vocabularyVisitor.cjs

@@ -7,10 +7,9 @@ var _apidomNsJsonSchemaDraft = require("@speclynx/apidom-ns-json-schema-draft-7"
  * @public
  */
 class $vocabularyVisitor extends _apidomNsJsonSchemaDraft.FallbackVisitor {
-  ObjectElement(objectElement) {
-    const result = super.enter(objectElement);
+  ObjectElement(path) {
+    this.enter(path);
     this.element.classes.push('json-schema-$vocabulary');
-    return result;
   }
 }
 var _default = exports.default = $vocabularyVisitor;

package/src/refractor/visitors/json-schema/$vocabularyVisitor.mjs

@@ -3,10 +3,9 @@ import { FallbackVisitor } from '@speclynx/apidom-ns-json-schema-draft-7';
  * @public
  */
 class $vocabularyVisitor extends FallbackVisitor {
-  ObjectElement(objectElement) {
-    const result = super.enter(objectElement);
+  ObjectElement(path) {
+    this.enter(path);
     this.element.classes.push('json-schema-$vocabulary');
-    return result;
   }
 }
 export default $vocabularyVisitor;

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

@@ -2,9 +2,8 @@
 
 exports.__esModule = true;
 exports.default = void 0;
-var _tsMixer = require("ts-mixer");
-var _apidomCore = require("@speclynx/apidom-core");
-var _apidomNsJsonSchemaDraft = require("@speclynx/apidom-ns-json-schema-draft-7");
+var _apidomDatamodel = require("@speclynx/apidom-datamodel");
+var _bases = require("./bases.cjs");
 /**
  * @public
  */
@@ -12,19 +11,20 @@ var _apidomNsJsonSchemaDraft = require("@speclynx/apidom-ns-json-schema-draft-7"
 /**
  * @public
  */
-class AllOfVisitor extends (0, _tsMixer.Mixin)(_apidomNsJsonSchemaDraft.SpecificationVisitor, _apidomNsJsonSchemaDraft.ParentSchemaAwareVisitor, _apidomNsJsonSchemaDraft.FallbackVisitor) {
+class AllOfVisitor extends _bases.BaseSchemaArrayVisitor {
   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 element = this.toRefractedElement(['document', 'objects', 'JSONSchema'], 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,27 +1,25 @@
-import { Mixin } from 'ts-mixer';
-import { ArrayElement, BREAK } from '@speclynx/apidom-core';
-import { FallbackVisitor, SpecificationVisitor, ParentSchemaAwareVisitor } from '@speclynx/apidom-ns-json-schema-draft-7';
-
+import { ArrayElement } from '@speclynx/apidom-datamodel';
+import { BaseSchemaArrayVisitor } from "./bases.mjs";
 /**
  * @public
  */
-
 /**
  * @public
  */
-class AllOfVisitor extends Mixin(SpecificationVisitor, ParentSchemaAwareVisitor, FallbackVisitor) {
+class AllOfVisitor extends BaseSchemaArrayVisitor {
   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 element = this.toRefractedElement(['document', 'objects', 'JSONSchema'], 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

@@ -2,9 +2,8 @@
 
 exports.__esModule = true;
 exports.default = void 0;
-var _tsMixer = require("ts-mixer");
-var _apidomCore = require("@speclynx/apidom-core");
-var _apidomNsJsonSchemaDraft = require("@speclynx/apidom-ns-json-schema-draft-7");
+var _apidomDatamodel = require("@speclynx/apidom-datamodel");
+var _bases = require("./bases.cjs");
 /**
  * @public
  */
@@ -12,19 +11,20 @@ var _apidomNsJsonSchemaDraft = require("@speclynx/apidom-ns-json-schema-draft-7"
 /**
  * @public
  */
-class AnyOfVisitor extends (0, _tsMixer.Mixin)(_apidomNsJsonSchemaDraft.SpecificationVisitor, _apidomNsJsonSchemaDraft.ParentSchemaAwareVisitor, _apidomNsJsonSchemaDraft.FallbackVisitor) {
+class AnyOfVisitor extends _bases.BaseSchemaArrayVisitor {
   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 element = this.toRefractedElement(['document', 'objects', 'JSONSchema'], 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,27 +1,25 @@
-import { Mixin } from 'ts-mixer';
-import { ArrayElement, BREAK } from '@speclynx/apidom-core';
-import { FallbackVisitor, SpecificationVisitor, ParentSchemaAwareVisitor } from '@speclynx/apidom-ns-json-schema-draft-7';
-
+import { ArrayElement } from '@speclynx/apidom-datamodel';
+import { BaseSchemaArrayVisitor } from "./bases.mjs";
 /**
  * @public
  */
-
 /**
  * @public
  */
-class AnyOfVisitor extends Mixin(SpecificationVisitor, ParentSchemaAwareVisitor, FallbackVisitor) {
+class AnyOfVisitor extends BaseSchemaArrayVisitor {
   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 element = this.toRefractedElement(['document', 'objects', 'JSONSchema'], item);
       this.element.push(element);
     });
     this.copyMetaAndAttributes(arrayElement, this.element);
-    return BREAK;
+    path.stop();
   }
 }
 export default AnyOfVisitor;

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

@@ -7,10 +7,9 @@ var _apidomNsJsonSchemaDraft = require("@speclynx/apidom-ns-json-schema-draft-7"
  * @public
  */
 class DependentRequiredVisitor extends _apidomNsJsonSchemaDraft.FallbackVisitor {
-  ObjectElement(objectElement) {
-    const result = super.enter(objectElement);
+  ObjectElement(path) {
+    this.enter(path);
     this.element.classes.push('json-schema-dependentRequired');
-    return result;
   }
 }
 var _default = exports.default = DependentRequiredVisitor;

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

@@ -3,10 +3,9 @@ import { FallbackVisitor } from '@speclynx/apidom-ns-json-schema-draft-7';
  * @public
  */
 class DependentRequiredVisitor extends FallbackVisitor {
-  ObjectElement(objectElement) {
-    const result = super.enter(objectElement);
+  ObjectElement(path) {
+    this.enter(path);
     this.element.classes.push('json-schema-dependentRequired');
-    return result;
   }
 }
 export default DependentRequiredVisitor;