@speclynx/apidom-json-pointer-relative 1.12.1 → 2.0.1

package/src/evaluate.mjs

@@ -1,4 +1,5 @@
-import { visit, cloneDeep, BREAK, isElement, isMemberElement, isArrayElement, NumberElement } from '@speclynx/apidom-core';
+import { isElement, isMemberElement, isArrayElement, NumberElement, cloneDeep } from '@speclynx/apidom-datamodel';
+import { traverse } from '@speclynx/apidom-traverse';
 import { compile as compileJsonPointer, evaluate as evaluateJsonPointer } from '@speclynx/apidom-json-pointer';
 import { last } from 'ramda';
 import EvaluationRelativeJsonPointerError from "./errors/EvaluationRelativeJsonPointerError.mjs";
@@ -10,13 +11,12 @@ import parse from "./parse.mjs";
 const evaluate = (relativePointer, currentElement, rootElement) => {
   let ancestorLineage = [];
   let cursor = currentElement;
-  visit(rootElement, {
-    enter(element, key, parent, path, ancestors) {
-      if (element === currentElement) {
-        ancestorLineage = [...ancestors, parent].filter(isElement);
-        return BREAK;
+  traverse(rootElement, {
+    enter(path) {
+      if (path.node === currentElement) {
+        ancestorLineage = path.getAncestorNodes().reverse().filter(isElement);
+        path.stop();
       }
-      return undefined;
     }
   });
   if (ancestorLineage.length === 0) {
@@ -81,9 +81,10 @@ const evaluate = (relativePointer, currentElement, rootElement) => {
         cursorElement: cloneDeep.safe(cursor)
       });
     }
-    const currentCursorIndex = containedArray.content.indexOf(cursor);
+    const arrayContent = containedArray.content;
+    const currentCursorIndex = arrayContent.indexOf(cursor);
     const newCursorIndex = currentCursorIndex + relativeJsonPointer.indexManipulation;
-    cursor = containedArray.content[newCursorIndex];
+    cursor = arrayContent[newCursorIndex];
     if (typeof cursor === 'undefined') {
       throw new EvaluationRelativeJsonPointerError(`Relative JSON Pointer evaluation failed on index-manipulation "${relativeJsonPointer.indexManipulation}"`, {
         relativePointer,

package/types/apidom-json-pointer-relative.d.ts

@@ -1,6 +1,6 @@
 import { ApiDOMErrorOptions } from '@speclynx/apidom-error';
 import { ApiDOMStructuredError } from '@speclynx/apidom-error';
-import { Element as Element_2 } from '@speclynx/apidom-core';
+import { Element as Element_2 } from '@speclynx/apidom-datamodel';
 
 /**
  * @public