@speclynx/apidom-traverse 2.1.0 → 2.2.1

package/src/Path.cjs

@@ -2,8 +2,9 @@
 
 exports.__esModule = true;
 exports.Path = void 0;
+var _apidomDatamodel = require("@speclynx/apidom-datamodel");
 var _apidomJsonPointer = require("@speclynx/apidom-json-pointer");
-var _jsonpath = require("@swaggerexpert/jsonpath");
+var _apidomJsonPath = require("@speclynx/apidom-json-path");
 /**
  * Possible return values from a visitor function.
  * @public
@@ -142,14 +143,34 @@ class Path {
   }
 
   /**
-   * Get the path from root as an array of keys.
+   * Get the semantic path from root as an array of keys.
+   * Returns logical document keys (property names, array indices) rather than
+   * internal ApiDOM structure keys.
+   *
+   * @example
+   * // For a path to $.paths['/pets'].get in an OpenAPI document:
+   * path.getPathKeys(); // => ['paths', '/pets', 'get']
    */
   getPathKeys() {
     const keys = [];
     // eslint-disable-next-line @typescript-eslint/no-this-alias
     let current = this;
     while (current !== null && current.key !== undefined) {
-      keys.unshift(current.key);
+      const {
+        key,
+        parent,
+        parentPath
+      } = current;
+      if ((0, _apidomDatamodel.isMemberElement)(parent) && key === 'value') {
+        // Inside MemberElement.value → push the member's key
+        if (!(0, _apidomDatamodel.isStringElement)(parent.key)) {
+          throw new TypeError('MemberElement.key must be a StringElement');
+        }
+        keys.unshift(parent.key.toValue());
+      } else if ((0, _apidomDatamodel.isArrayElement)(parentPath?.node) && typeof key === 'number') {
+        // Inside ArrayElement → push the numeric index
+        keys.unshift(key);
+      }
       current = current.parentPath;
     }
     return keys;
@@ -185,7 +206,7 @@ class Path {
     }
     if (pathFormat === 'jsonpath') {
       // RFC 9535 Normalized JSONPath
-      return (0, _jsonpath.compile)(parts);
+      return _apidomJsonPath.NormalizedPath.from(parts);
     }
 
     // RFC 6901 JSON Pointer

package/src/Path.mjs

@@ -1,5 +1,6 @@
+import { isMemberElement, isArrayElement, isStringElement } from '@speclynx/apidom-datamodel';
 import { compile as compileJSONPointer } from '@speclynx/apidom-json-pointer';
-import { compile as compileJSONPath } from '@swaggerexpert/jsonpath';
+import { NormalizedPath } from '@speclynx/apidom-json-path';
 
 /**
  * Possible return values from a visitor function.
@@ -139,14 +140,34 @@ export class Path {
   }
 
   /**
-   * Get the path from root as an array of keys.
+   * Get the semantic path from root as an array of keys.
+   * Returns logical document keys (property names, array indices) rather than
+   * internal ApiDOM structure keys.
+   *
+   * @example
+   * // For a path to $.paths['/pets'].get in an OpenAPI document:
+   * path.getPathKeys(); // => ['paths', '/pets', 'get']
    */
   getPathKeys() {
     const keys = [];
     // eslint-disable-next-line @typescript-eslint/no-this-alias
     let current = this;
     while (current !== null && current.key !== undefined) {
-      keys.unshift(current.key);
+      const {
+        key,
+        parent,
+        parentPath
+      } = current;
+      if (isMemberElement(parent) && key === 'value') {
+        // Inside MemberElement.value → push the member's key
+        if (!isStringElement(parent.key)) {
+          throw new TypeError('MemberElement.key must be a StringElement');
+        }
+        keys.unshift(parent.key.toValue());
+      } else if (isArrayElement(parentPath?.node) && typeof key === 'number') {
+        // Inside ArrayElement → push the numeric index
+        keys.unshift(key);
+      }
       current = current.parentPath;
     }
     return keys;
@@ -182,7 +203,7 @@ export class Path {
     }
     if (pathFormat === 'jsonpath') {
       // RFC 9535 Normalized JSONPath
-      return compileJSONPath(parts);
+      return NormalizedPath.from(parts);
     }
 
     // RFC 6901 JSON Pointer

package/types/apidom-traverse.d.ts

@@ -226,7 +226,13 @@ export declare class Path<TNode = Element_2> {
      */
     getAncestorNodes(): TNode[];
     /**
-     * Get the path from root as an array of keys.
+     * Get the semantic path from root as an array of keys.
+     * Returns logical document keys (property names, array indices) rather than
+     * internal ApiDOM structure keys.
+     *
+     * @example
+     * // For a path to $.paths['/pets'].get in an OpenAPI document:
+     * path.getPathKeys(); // => ['paths', '/pets', 'get']
      */
     getPathKeys(): PropertyKey[];
     /**