@speclynx/apidom-core 1.12.1 → 2.0.1

package/src/index.cjs

@@ -3,97 +3,31 @@
 var _interopRequireWildcard = require("@babel/runtime-corejs3/helpers/interopRequireWildcard").default;
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault").default;
 exports.__esModule = true;
-exports.visit = exports.traverse = exports.transclude = exports.toYAML = exports.toValue = exports.toString = exports.toJSON = exports.some = exports.sexprs = exports.reject = exports.refractorPluginSemanticElementIdentity = exports.refractorPluginElementIdentity = exports.refract = exports.parents = exports.namespace = exports.mergeRight = exports.mergeLeft = exports.mergeAllVisitors = exports.keyMap = exports.isStringElement = exports.isSourceMapElement = exports.isRefElement = exports.isPrimitiveElement = exports.isParseResultElement = exports.isObjectElement = exports.isNumberElement = exports.isNullElement = exports.isMemberElement = exports.isLinkElement = exports.isElement = exports.isBooleanElement = exports.isArrayElement = exports.isAnnotationElement = exports.includesSymbols = exports.includesClasses = exports.hasElementSourceMap = exports.getNodeType = exports.from = exports.findAtOffset = exports.find = exports.filter = exports.dispatchRefractorPlugins = exports.dereference = exports.dehydrate = exports.defaultIdentityManager = exports.deepmerge = exports.createPredicate = exports.createNamespace = exports.cloneShallow = exports.cloneNode = exports.cloneDeep = exports.Transcluder = exports.StringElement = exports.SourceMapElement = exports.ShallowCloneError = exports.RefElement = exports.ParseResultElement = exports.ObjectSlice = exports.ObjectElement = exports.NumberElement = exports.NullElement = exports.Namespace = exports.MemberElement = exports.MediaTypes = exports.LinkElement = exports.KeyValuePair = exports.IdentityManager = exports.ElementIdentityError = exports.Element = exports.DeepCloneError = exports.CommentElement = exports.CloneError = exports.BooleanElement = exports.BREAK = exports.ArraySlice = exports.ArrayElement = exports.AnnotationElement = void 0;
+exports.transclude = exports.toYAML = exports.toValue = exports.toString = exports.toJSON = exports.sexprs = exports.resolveSpecification = exports.refractorPluginSemanticElementIdentity = exports.refractorPluginElementIdentity = exports.mergeRight = exports.mergeLeft = exports.from = exports.dispatchRefractorPlugins = exports.dehydrate = exports.defaultIdentityManager = exports.deepmerge = exports.createToolbox = exports.Transcluder = exports.MediaTypes = exports.IdentityManager = exports.ElementIdentityError = void 0;
 var _index = require("./refractor/plugins/dispatcher/index.cjs");
 exports.dispatchRefractorPlugins = _index.dispatchPluginsSync;
+var _toolbox = _interopRequireDefault(require("./refractor/toolbox.cjs"));
+exports.createToolbox = _toolbox.default;
 var _elementIdentity = _interopRequireDefault(require("./refractor/plugins/element-identity.cjs"));
 exports.refractorPluginElementIdentity = _elementIdentity.default;
 var _semanticElementIdentity = _interopRequireDefault(require("./refractor/plugins/semantic-element-identity.cjs"));
 exports.refractorPluginSemanticElementIdentity = _semanticElementIdentity.default;
 var _mediaTypes = _interopRequireDefault(require("./media-types.cjs"));
 exports.MediaTypes = _mediaTypes.default;
-var _minim = require("minim");
-exports.Element = _minim.Element;
-exports.MemberElement = _minim.MemberElement;
-exports.KeyValuePair = _minim.KeyValuePair;
-exports.ObjectSlice = _minim.ObjectSlice;
-exports.ArraySlice = _minim.ArraySlice;
-exports.refract = _minim.refract;
-var _namespace = _interopRequireWildcard(require("./namespace.cjs"));
-exports.namespace = _namespace.default;
-exports.Namespace = _namespace.Namespace;
-exports.createNamespace = _namespace.createNamespace;
-var _registration = require("./refractor/registration.cjs");
-exports.ObjectElement = _registration.ObjectElement;
-exports.ArrayElement = _registration.ArrayElement;
-exports.BooleanElement = _registration.BooleanElement;
-exports.NullElement = _registration.NullElement;
-exports.NumberElement = _registration.NumberElement;
-exports.StringElement = _registration.StringElement;
-exports.LinkElement = _registration.LinkElement;
-exports.RefElement = _registration.RefElement;
-exports.AnnotationElement = _registration.AnnotationElement;
-exports.CommentElement = _registration.CommentElement;
-exports.ParseResultElement = _registration.ParseResultElement;
-exports.SourceMapElement = _registration.SourceMapElement;
-var _index2 = require("./predicates/index.cjs");
-exports.isElement = _index2.isElement;
-exports.isStringElement = _index2.isStringElement;
-exports.isNumberElement = _index2.isNumberElement;
-exports.isNullElement = _index2.isNullElement;
-exports.isBooleanElement = _index2.isBooleanElement;
-exports.isArrayElement = _index2.isArrayElement;
-exports.isObjectElement = _index2.isObjectElement;
-exports.isMemberElement = _index2.isMemberElement;
-exports.isLinkElement = _index2.isLinkElement;
-exports.isRefElement = _index2.isRefElement;
-exports.isAnnotationElement = _index2.isAnnotationElement;
-exports.isParseResultElement = _index2.isParseResultElement;
-exports.isSourceMapElement = _index2.isSourceMapElement;
-exports.isPrimitiveElement = _index2.isPrimitiveElement;
-exports.hasElementSourceMap = _index2.hasElementSourceMap;
-exports.includesSymbols = _index2.includesSymbols;
-exports.includesClasses = _index2.includesClasses;
-var _helpers = _interopRequireDefault(require("./predicates/helpers.cjs"));
-exports.createPredicate = _helpers.default;
-var _index3 = require("./traversal/index.cjs");
-exports.filter = _index3.filter;
-exports.reject = _index3.reject;
-exports.find = _index3.find;
-exports.findAtOffset = _index3.findAtOffset;
-exports.some = _index3.some;
-exports.traverse = _index3.traverse;
-exports.parents = _index3.parents;
-var _visitor = require("./traversal/visitor.cjs");
-exports.visit = _visitor.visit;
-exports.BREAK = _visitor.BREAK;
-exports.mergeAllVisitors = _visitor.mergeAllVisitors;
-exports.getNodeType = _visitor.getNodeType;
-exports.cloneNode = _visitor.cloneNode;
-exports.keyMap = _visitor.keyMapDefault;
-var _index4 = _interopRequireWildcard(require("./transcluder/index.cjs"));
-exports.transclude = _index4.transclude;
-exports.Transcluder = _index4.default;
-var _util = require("./util.cjs");
-exports.dereference = _util.dereference;
-var _index5 = require("./clone/index.cjs");
-exports.cloneShallow = _index5.cloneShallow;
-exports.cloneDeep = _index5.cloneDeep;
-var _CloneError = _interopRequireDefault(require("./clone/errors/CloneError.cjs"));
-exports.CloneError = _CloneError.default;
-var _DeepCloneError = _interopRequireDefault(require("./clone/errors/DeepCloneError.cjs"));
-exports.DeepCloneError = _DeepCloneError.default;
-var _ShallowCloneError = _interopRequireDefault(require("./clone/errors/ShallowCloneError.cjs"));
-exports.ShallowCloneError = _ShallowCloneError.default;
-var _index6 = require("./identity/index.cjs");
-exports.defaultIdentityManager = _index6.defaultIdentityManager;
-exports.IdentityManager = _index6.IdentityManager;
+var _index2 = _interopRequireWildcard(require("./transcluder/index.cjs"));
+exports.transclude = _index2.transclude;
+exports.Transcluder = _index2.default;
+var _specification = require("./specification.cjs");
+exports.resolveSpecification = _specification.resolveSpecification;
+var _index3 = require("./identity/index.cjs");
+exports.defaultIdentityManager = _index3.defaultIdentityManager;
+exports.IdentityManager = _index3.IdentityManager;
 var _ElementIdentityError = _interopRequireDefault(require("./identity/errors/ElementIdentityError.cjs"));
 exports.ElementIdentityError = _ElementIdentityError.default;
 var _from = _interopRequireDefault(require("./transformers/from.cjs"));
 exports.from = _from.default;
-var _index7 = _interopRequireDefault(require("./transformers/serializers/value/index.cjs"));
-exports.toValue = _index7.default;
+var _value = _interopRequireDefault(require("./transformers/serializers/value.cjs"));
+exports.toValue = _value.default;
 var _json = _interopRequireDefault(require("./transformers/serializers/json.cjs"));
 exports.toJSON = _json.default;
 var _yaml = _interopRequireDefault(require("./transformers/serializers/yaml-1-2.cjs"));

package/src/index.mjs

@@ -1,20 +1,10 @@
 export { dispatchPluginsSync as dispatchRefractorPlugins } from "./refractor/plugins/dispatcher/index.mjs";
+export { default as createToolbox } from "./refractor/toolbox.mjs";
 export { default as refractorPluginElementIdentity } from "./refractor/plugins/element-identity.mjs";
 export { default as refractorPluginSemanticElementIdentity } from "./refractor/plugins/semantic-element-identity.mjs";
 export { default as MediaTypes } from "./media-types.mjs";
-export { Element, MemberElement, KeyValuePair, ObjectSlice, ArraySlice, refract } from 'minim';
-export { default as namespace, Namespace, createNamespace } from "./namespace.mjs";
-export { ObjectElement, ArrayElement, BooleanElement, NullElement, NumberElement, StringElement, LinkElement, RefElement, AnnotationElement, CommentElement, ParseResultElement, SourceMapElement } from "./refractor/registration.mjs";
-export { isElement, isStringElement, isNumberElement, isNullElement, isBooleanElement, isArrayElement, isObjectElement, isMemberElement, isLinkElement, isRefElement, isAnnotationElement, isParseResultElement, isSourceMapElement, isPrimitiveElement, hasElementSourceMap, includesSymbols, includesClasses } from "./predicates/index.mjs";
-export { default as createPredicate } from "./predicates/helpers.mjs";
-export { filter, reject, find, findAtOffset, some, traverse, parents } from "./traversal/index.mjs";
-export { visit, BREAK, mergeAllVisitors, getNodeType, cloneNode, keyMapDefault as keyMap } from "./traversal/visitor.mjs";
 export { transclude, default as Transcluder } from "./transcluder/index.mjs";
-export { dereference } from "./util.mjs";
-export { cloneShallow, cloneDeep } from "./clone/index.mjs";
-export { default as CloneError } from "./clone/errors/CloneError.mjs";
-export { default as DeepCloneError } from "./clone/errors/DeepCloneError.mjs";
-export { default as ShallowCloneError } from "./clone/errors/ShallowCloneError.mjs";
+export { resolveSpecification } from "./specification.mjs";
 export { defaultIdentityManager, IdentityManager } from "./identity/index.mjs";
 export { default as ElementIdentityError } from "./identity/errors/ElementIdentityError.mjs";
 /**
@@ -26,7 +16,7 @@ export { default as from } from "./transformers/from.mjs";
  * This POJO would be the result of interpreting the ApiDOM
  * into JavaScript structure.
  */
-export { default as toValue } from "./transformers/serializers/value/index.mjs";
+export { default as toValue } from "./transformers/serializers/value.mjs";
 /**
  * Transforms the ApiDOM into JSON string.
  */

package/src/merge/deepmerge.cjs

@@ -3,10 +3,8 @@
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault").default;
 exports.__esModule = true;
 exports.emptyElement = exports.defaultOptions = exports.default = void 0;
-var _minim = require("minim");
-var _index = require("../predicates/index.cjs");
-var _index2 = require("../clone/index.cjs");
-var _index3 = _interopRequireDefault(require("../transformers/serializers/value/index.cjs"));
+var _apidomDatamodel = require("@speclynx/apidom-datamodel");
+var _value = _interopRequireDefault(require("../transformers/serializers/value.cjs"));
 /**
  * @public
  */
@@ -48,8 +46,8 @@ var _index3 = _interopRequireDefault(require("../transformers/serializers/value/
  */
 
 const emptyElement = element => {
-  const meta = element.meta.length > 0 ? (0, _index2.cloneDeep)(element.meta) : undefined;
-  const attributes = element.attributes.length > 0 ? (0, _index2.cloneDeep)(element.attributes) : undefined;
+  const meta = !element.isMetaEmpty ? (0, _apidomDatamodel.cloneDeep)(element.meta) : undefined;
+  const attributes = !element.isAttributesEmpty ? (0, _apidomDatamodel.cloneDeep)(element.attributes) : undefined;
 
   // @ts-ignore
   return new element.constructor(undefined, meta, attributes);
@@ -65,35 +63,39 @@ const getMergeFunction = (keyElement, options) => {
 };
 const getMetaMergeFunction = options => {
   if (typeof options.customMetaMerge !== 'function') {
-    return targetMeta => (0, _index2.cloneDeep)(targetMeta);
+    return targetMeta => (0, _apidomDatamodel.cloneDeep)(targetMeta);
   }
   return options.customMetaMerge;
 };
 const getAttributesMergeFunction = options => {
   if (typeof options.customAttributesMerge !== 'function') {
-    return targetAttributes => (0, _index2.cloneDeep)(targetAttributes);
+    return targetAttributes => (0, _apidomDatamodel.cloneDeep)(targetAttributes);
   }
   return options.customAttributesMerge;
 };
-const mergeArrayElement = (targetElement, sourceElement, options) => targetElement.concat(sourceElement)['fantasy-land/map'](item => cloneUnlessOtherwiseSpecified(item, options));
+const mergeArrayElement = (targetElement, sourceElement, options) => {
+  const Ctor = targetElement.constructor;
+  const merged = targetElement.concat(sourceElement);
+  return new Ctor(merged.map(item => cloneUnlessOtherwiseSpecified(item, options)));
+};
 const mergeObjectElement = (targetElement, sourceElement, options) => {
-  const destination = (0, _index.isObjectElement)(targetElement) ? emptyElement(targetElement) : emptyElement(sourceElement);
-  if ((0, _index.isObjectElement)(targetElement)) {
+  const destination = (0, _apidomDatamodel.isObjectElement)(targetElement) ? emptyElement(targetElement) : emptyElement(sourceElement);
+  if ((0, _apidomDatamodel.isObjectElement)(targetElement)) {
     targetElement.forEach((value, key, member) => {
-      const clonedMember = (0, _index2.cloneShallow)(member);
+      const clonedMember = (0, _apidomDatamodel.cloneShallow)(member);
       clonedMember.value = cloneUnlessOtherwiseSpecified(value, options);
       destination.content.push(clonedMember);
     });
   }
   sourceElement.forEach((value, key, member) => {
-    const keyValue = (0, _index3.default)(key);
+    const keyValue = (0, _value.default)(key);
     let clonedMember;
-    if ((0, _index.isObjectElement)(targetElement) && targetElement.hasKey(keyValue) && options.isMergeableElement(value)) {
+    if ((0, _apidomDatamodel.isObjectElement)(targetElement) && targetElement.hasKey(keyValue) && options.isMergeableElement(value)) {
       const targetValue = targetElement.get(keyValue);
-      clonedMember = (0, _index2.cloneShallow)(member);
+      clonedMember = (0, _apidomDatamodel.cloneShallow)(member);
       clonedMember.value = getMergeFunction(key, options)(targetValue, value, options);
     } else {
-      clonedMember = (0, _index2.cloneShallow)(member);
+      clonedMember = (0, _apidomDatamodel.cloneShallow)(member);
       clonedMember.value = cloneUnlessOtherwiseSpecified(value, options);
     }
     destination.remove(keyValue);
@@ -103,7 +105,7 @@ const mergeObjectElement = (targetElement, sourceElement, options) => {
 };
 const defaultOptions = exports.defaultOptions = {
   clone: true,
-  isMergeableElement: element => (0, _index.isObjectElement)(element) || (0, _index.isArrayElement)(element),
+  isMergeableElement: element => (0, _apidomDatamodel.isObjectElement)(element) || (0, _apidomDatamodel.isArrayElement)(element),
   arrayElementMerge: mergeArrayElement,
   objectElementMerge: mergeObjectElement,
   customMerge: undefined,
@@ -122,8 +124,8 @@ const deepmerge = (targetElement, sourceElement, options) => {
   mergedOptions.isMergeableElement = mergedOptions.isMergeableElement ?? defaultOptions.isMergeableElement;
   mergedOptions.arrayElementMerge = mergedOptions.arrayElementMerge ?? defaultOptions.arrayElementMerge;
   mergedOptions.objectElementMerge = mergedOptions.objectElementMerge ?? defaultOptions.objectElementMerge;
-  const sourceIsArrayElement = (0, _index.isArrayElement)(sourceElement);
-  const targetIsArrayElement = (0, _index.isArrayElement)(targetElement);
+  const sourceIsArrayElement = (0, _apidomDatamodel.isArrayElement)(sourceElement);
+  const targetIsArrayElement = (0, _apidomDatamodel.isArrayElement)(targetElement);
   const sourceAndTargetTypesMatch = sourceIsArrayElement === targetIsArrayElement;
   if (!sourceAndTargetTypesMatch) {
     return cloneUnlessOtherwiseSpecified(sourceElement, mergedOptions);
@@ -142,7 +144,7 @@ deepmerge.all = (list, options) => {
     throw new TypeError('First argument of deepmerge should be an array.');
   }
   if (list.length === 0) {
-    return new _minim.ObjectElement();
+    return new _apidomDatamodel.ObjectElement();
   }
   return list.reduce((target, source) => {
     return deepmerge(target, source, options);

package/src/merge/deepmerge.mjs

@@ -1,7 +1,5 @@
-import { ObjectElement } from 'minim';
-import { isObjectElement, isArrayElement } from "../predicates/index.mjs";
-import { cloneDeep, cloneShallow } from "../clone/index.mjs";
-import toValue from "../transformers/serializers/value/index.mjs";
+import { ObjectElement, isObjectElement, isArrayElement, cloneDeep, cloneShallow } from '@speclynx/apidom-datamodel';
+import toValue from "../transformers/serializers/value.mjs";
 /**
  * @public
  */
@@ -33,8 +31,8 @@ import toValue from "../transformers/serializers/value/index.mjs";
  * @public
  */
 export const emptyElement = element => {
-  const meta = element.meta.length > 0 ? cloneDeep(element.meta) : undefined;
-  const attributes = element.attributes.length > 0 ? cloneDeep(element.attributes) : undefined;
+  const meta = !element.isMetaEmpty ? cloneDeep(element.meta) : undefined;
+  const attributes = !element.isAttributesEmpty ? cloneDeep(element.attributes) : undefined;
 
   // @ts-ignore
   return new element.constructor(undefined, meta, attributes);
@@ -59,7 +57,11 @@ const getAttributesMergeFunction = options => {
   }
   return options.customAttributesMerge;
 };
-const mergeArrayElement = (targetElement, sourceElement, options) => targetElement.concat(sourceElement)['fantasy-land/map'](item => cloneUnlessOtherwiseSpecified(item, options));
+const mergeArrayElement = (targetElement, sourceElement, options) => {
+  const Ctor = targetElement.constructor;
+  const merged = targetElement.concat(sourceElement);
+  return new Ctor(merged.map(item => cloneUnlessOtherwiseSpecified(item, options)));
+};
 const mergeObjectElement = (targetElement, sourceElement, options) => {
   const destination = isObjectElement(targetElement) ? emptyElement(targetElement) : emptyElement(sourceElement);
   if (isObjectElement(targetElement)) {

package/src/merge/merge-right.cjs

@@ -3,7 +3,7 @@
 var _interopRequireWildcard = require("@babel/runtime-corejs3/helpers/interopRequireWildcard").default;
 exports.__esModule = true;
 exports.default = void 0;
-var _minim = require("minim");
+var _apidomDatamodel = require("@speclynx/apidom-datamodel");
 var _deepmerge = _interopRequireWildcard(require("./deepmerge.cjs"));
 /**
  * @public
@@ -26,7 +26,7 @@ mergeRight.all = (list, options) => {
     throw new TypeError('First argument of mergeRight should be an array.');
   }
   if (list.length === 0) {
-    return new _minim.ObjectElement();
+    return new _apidomDatamodel.ObjectElement();
   }
   return list.reduce((target, source) => {
     return mergeRight(target, source, options);

package/src/merge/merge-right.mjs

@@ -1,4 +1,4 @@
-import { ObjectElement } from 'minim';
+import { ObjectElement } from '@speclynx/apidom-datamodel';
 import deepmerge, { defaultOptions as defaultDeepmergeOptions, emptyElement } from "./deepmerge.mjs";
 /**
  * @public

package/src/namespace.cjs

@@ -1,42 +1,10 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault").default;
 exports.__esModule = true;
-exports.default = exports.createNamespace = exports.Namespace = void 0;
-var _minim = require("minim");
-var _ramdaAdjunct = require("ramda-adjunct");
-var _Annotation = _interopRequireDefault(require("./elements/Annotation.cjs"));
-var _Comment = _interopRequireDefault(require("./elements/Comment.cjs"));
-var _ParseResult = _interopRequireDefault(require("./elements/ParseResult.cjs"));
-var _SourceMap = _interopRequireDefault(require("./elements/SourceMap.cjs"));
+exports.default = void 0;
+var _apidomDatamodel = require("@speclynx/apidom-datamodel");
 /**
- * @public
+ * Default namespace instance with all base elements registered.
  */
-class Namespace extends _minim.Namespace {
-  constructor() {
-    super();
-    this.register('annotation', _Annotation.default);
-    this.register('comment', _Comment.default);
-    this.register('parseResult', _ParseResult.default);
-    this.register('sourceMap', _SourceMap.default);
-  }
-}
-
-/**
- * @public
- */
-exports.Namespace = Namespace;
-const namespace = new Namespace();
-
-/**
- * @public
- */
-const createNamespace = namespacePlugin => {
-  const namespaceInstance = new Namespace();
-  if ((0, _ramdaAdjunct.isPlainObject)(namespacePlugin)) {
-    namespaceInstance.use(namespacePlugin);
-  }
-  return namespaceInstance;
-};
-exports.createNamespace = createNamespace;
+const namespace = new _apidomDatamodel.Namespace();
 var _default = exports.default = namespace;

package/src/namespace.mjs

@@ -1,35 +1,7 @@
-import { Namespace as MinimNamespace } from 'minim';
-import { isPlainObject } from 'ramda-adjunct';
-import AnnotationElement from "./elements/Annotation.mjs";
-import CommentElement from "./elements/Comment.mjs";
-import ParseResultElement from "./elements/ParseResult.mjs";
-import SourceMapElement from "./elements/SourceMap.mjs";
-/**
- * @public
- */
-export class Namespace extends MinimNamespace {
-  constructor() {
-    super();
-    this.register('annotation', AnnotationElement);
-    this.register('comment', CommentElement);
-    this.register('parseResult', ParseResultElement);
-    this.register('sourceMap', SourceMapElement);
-  }
-}
+import { Namespace } from '@speclynx/apidom-datamodel';
 
 /**
- * @public
+ * Default namespace instance with all base elements registered.
  */
 const namespace = new Namespace();
-
-/**
- * @public
- */
-export const createNamespace = namespacePlugin => {
-  const namespaceInstance = new Namespace();
-  if (isPlainObject(namespacePlugin)) {
-    namespaceInstance.use(namespacePlugin);
-  }
-  return namespaceInstance;
-};
 export default namespace;

package/src/refractor/plugins/dispatcher/index.cjs

@@ -3,10 +3,10 @@
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault").default;
 exports.__esModule = true;
 exports.dispatchPluginsSync = exports.dispatchPluginsAsync = void 0;
+var _apidomTraverse = require("@speclynx/apidom-traverse");
 var _ramda = require("ramda");
 var _ramdaAdjunct = require("ramda-adjunct");
 var _toolbox = _interopRequireDefault(require("../../toolbox.cjs"));
-var _visitor = require("../../../traversal/visitor.cjs");
 /**
  * @public
  */
@@ -22,7 +22,6 @@ var _visitor = require("../../../traversal/visitor.cjs");
 const defaultDispatchPluginsOptions = {
   toolboxCreator: _toolbox.default,
   visitorOptions: {
-    nodeTypeGetter: _visitor.getNodeType,
     exposeEdits: true
   }
 };
@@ -39,11 +38,9 @@ const dispatchPluginsSync = (element, plugins, options = {}) => {
   } = mergedOptions;
   const toolbox = toolboxCreator();
   const pluginsSpecs = plugins.map(plugin => plugin(toolbox));
-  const mergedPluginsVisitor = (0, _visitor.mergeAllVisitors)(pluginsSpecs.map((0, _ramda.propOr)({}, 'visitor')), {
-    ...visitorOptions
-  });
+  const mergedPluginsVisitor = (0, _apidomTraverse.mergeVisitors)(pluginsSpecs.map((0, _ramda.propOr)({}, 'visitor')), visitorOptions);
   pluginsSpecs.forEach((0, _ramdaAdjunct.invokeArgs)(['pre'], []));
-  const newElement = (0, _visitor.visit)(element, mergedPluginsVisitor, visitorOptions);
+  const newElement = (0, _apidomTraverse.traverse)(element, mergedPluginsVisitor);
   pluginsSpecs.forEach((0, _ramdaAdjunct.invokeArgs)(['post'], []));
   return newElement;
 };
@@ -57,13 +54,9 @@ const dispatchPluginsAsync = async (element, plugins, options = {}) => {
   } = mergedOptions;
   const toolbox = toolboxCreator();
   const pluginsSpecs = plugins.map(plugin => plugin(toolbox));
-  const mergeAllVisitorsAsync = _visitor.mergeAllVisitors[Symbol.for('nodejs.util.promisify.custom')];
-  const visitAsync = _visitor.visit[Symbol.for('nodejs.util.promisify.custom')];
-  const mergedPluginsVisitor = mergeAllVisitorsAsync(pluginsSpecs.map((0, _ramda.propOr)({}, 'visitor')), {
-    ...visitorOptions
-  });
+  const mergedPluginsVisitor = (0, _apidomTraverse.mergeVisitorsAsync)(pluginsSpecs.map((0, _ramda.propOr)({}, 'visitor')), visitorOptions);
   await Promise.allSettled(pluginsSpecs.map((0, _ramdaAdjunct.invokeArgs)(['pre'], [])));
-  const newElement = await visitAsync(element, mergedPluginsVisitor, visitorOptions);
+  const newElement = await (0, _apidomTraverse.traverseAsync)(element, mergedPluginsVisitor);
   await Promise.allSettled(pluginsSpecs.map((0, _ramdaAdjunct.invokeArgs)(['post'], [])));
   return newElement;
 };

package/src/refractor/plugins/dispatcher/index.mjs

@@ -1,7 +1,7 @@
+import { traverse, traverseAsync, mergeVisitors, mergeVisitorsAsync } from '@speclynx/apidom-traverse';
 import { mergeDeepRight, propOr } from 'ramda';
 import { invokeArgs } from 'ramda-adjunct';
 import createToolbox from "../../toolbox.mjs";
-import { getNodeType, mergeAllVisitors, visit } from "../../../traversal/visitor.mjs";
 /**
  * @public
  */
@@ -14,7 +14,6 @@ import { getNodeType, mergeAllVisitors, visit } from "../../../traversal/visitor
 const defaultDispatchPluginsOptions = {
   toolboxCreator: createToolbox,
   visitorOptions: {
-    nodeTypeGetter: getNodeType,
     exposeEdits: true
   }
 };
@@ -31,11 +30,9 @@ export const dispatchPluginsSync = (element, plugins, options = {}) => {
   } = mergedOptions;
   const toolbox = toolboxCreator();
   const pluginsSpecs = plugins.map(plugin => plugin(toolbox));
-  const mergedPluginsVisitor = mergeAllVisitors(pluginsSpecs.map(propOr({}, 'visitor')), {
-    ...visitorOptions
-  });
+  const mergedPluginsVisitor = mergeVisitors(pluginsSpecs.map(propOr({}, 'visitor')), visitorOptions);
   pluginsSpecs.forEach(invokeArgs(['pre'], []));
-  const newElement = visit(element, mergedPluginsVisitor, visitorOptions);
+  const newElement = traverse(element, mergedPluginsVisitor);
   pluginsSpecs.forEach(invokeArgs(['post'], []));
   return newElement;
 };
@@ -48,13 +45,9 @@ export const dispatchPluginsAsync = async (element, plugins, options = {}) => {
   } = mergedOptions;
   const toolbox = toolboxCreator();
   const pluginsSpecs = plugins.map(plugin => plugin(toolbox));
-  const mergeAllVisitorsAsync = mergeAllVisitors[Symbol.for('nodejs.util.promisify.custom')];
-  const visitAsync = visit[Symbol.for('nodejs.util.promisify.custom')];
-  const mergedPluginsVisitor = mergeAllVisitorsAsync(pluginsSpecs.map(propOr({}, 'visitor')), {
-    ...visitorOptions
-  });
+  const mergedPluginsVisitor = mergeVisitorsAsync(pluginsSpecs.map(propOr({}, 'visitor')), visitorOptions);
   await Promise.allSettled(pluginsSpecs.map(invokeArgs(['pre'], [])));
-  const newElement = await visitAsync(element, mergedPluginsVisitor, visitorOptions);
+  const newElement = await traverseAsync(element, mergedPluginsVisitor);
   await Promise.allSettled(pluginsSpecs.map(invokeArgs(['post'], [])));
   return newElement;
 };

package/src/refractor/plugins/element-identity.cjs

@@ -19,8 +19,8 @@ const plugin = ({
       });
     },
     visitor: {
-      enter(element) {
-        element.id = identityManager.identify(element);
+      enter(path) {
+        path.node.id = identityManager.identify(path.node);
       }
     },
     post() {

package/src/refractor/plugins/element-identity.mjs

@@ -14,8 +14,8 @@ const plugin = ({
       });
     },
     visitor: {
-      enter(element) {
-        element.id = identityManager.identify(element);
+      enter(path) {
+        path.node.id = identityManager.identify(path.node);
       }
     },
     post() {

package/src/refractor/plugins/semantic-element-identity.cjs

@@ -2,20 +2,15 @@
 
 exports.__esModule = true;
 exports.default = void 0;
+var _apidomDatamodel = require("@speclynx/apidom-datamodel");
 var _index = require("../../identity/index.cjs");
-/**
- * @public
- */
-
 /**
  * Plugin for decorating every semantic element in ApiDOM tree with UUID.
  * @public
  */
 const plugin = ({
   length = 6
-} = {}) => ({
-  predicates
-}) => {
+} = {}) => () => {
   let identityManager;
   return {
     pre() {
@@ -24,9 +19,9 @@ const plugin = ({
       });
     },
     visitor: {
-      enter(element) {
-        if (!predicates.isPrimitiveElement(element)) {
-          element.id = identityManager.identify(element);
+      enter(path) {
+        if (!(0, _apidomDatamodel.isPrimitiveElement)(path.node)) {
+          path.node.id = identityManager.identify(path.node);
         }
       }
     },

package/src/refractor/plugins/semantic-element-identity.mjs

@@ -1,16 +1,12 @@
+import { isPrimitiveElement } from '@speclynx/apidom-datamodel';
 import { IdentityManager } from "../../identity/index.mjs";
-/**
- * @public
- */
 /**
  * Plugin for decorating every semantic element in ApiDOM tree with UUID.
  * @public
  */
 const plugin = ({
   length = 6
-} = {}) => ({
-  predicates
-}) => {
+} = {}) => () => {
   let identityManager;
   return {
     pre() {
@@ -19,9 +15,9 @@ const plugin = ({
       });
     },
     visitor: {
-      enter(element) {
-        if (!predicates.isPrimitiveElement(element)) {
-          element.id = identityManager.identify(element);
+      enter(path) {
+        if (!isPrimitiveElement(path.node)) {
+          path.node.id = identityManager.identify(path.node);
         }
       }
     },

package/src/refractor/toolbox.cjs

@@ -1,15 +1,35 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault").default;
-var _interopRequireWildcard = require("@babel/runtime-corejs3/helpers/interopRequireWildcard").default;
 exports.__esModule = true;
 exports.default = void 0;
-var basePredicates = _interopRequireWildcard(require("../predicates/index.cjs"));
+var _apidomDatamodel = require("@speclynx/apidom-datamodel");
 var _namespace = _interopRequireDefault(require("../namespace.cjs"));
 /**
  * @public
  */
 
+const predicates = {
+  isElement: _apidomDatamodel.isElement,
+  isStringElement: _apidomDatamodel.isStringElement,
+  isNumberElement: _apidomDatamodel.isNumberElement,
+  isNullElement: _apidomDatamodel.isNullElement,
+  isBooleanElement: _apidomDatamodel.isBooleanElement,
+  isArrayElement: _apidomDatamodel.isArrayElement,
+  isObjectElement: _apidomDatamodel.isObjectElement,
+  isMemberElement: _apidomDatamodel.isMemberElement,
+  isPrimitiveElement: _apidomDatamodel.isPrimitiveElement,
+  isLinkElement: _apidomDatamodel.isLinkElement,
+  isRefElement: _apidomDatamodel.isRefElement,
+  isAnnotationElement: _apidomDatamodel.isAnnotationElement,
+  isCommentElement: _apidomDatamodel.isCommentElement,
+  isParseResultElement: _apidomDatamodel.isParseResultElement,
+  isSourceMapElement: _apidomDatamodel.isSourceMapElement,
+  hasElementSourceMap: _apidomDatamodel.hasElementSourceMap,
+  includesSymbols: _apidomDatamodel.includesSymbols,
+  includesClasses: _apidomDatamodel.includesClasses
+};
+
 /**
  * @public
  */
@@ -18,9 +38,6 @@ var _namespace = _interopRequireDefault(require("../namespace.cjs"));
  * @public
  */
 const createToolbox = () => {
-  const predicates = {
-    ...basePredicates
-  };
   return {
     predicates,
     namespace: _namespace.default