@cqa-lib/cqa-ui 1.1.482 → 1.1.483

package/fesm2020/cqa-lib-cqa-ui.mjs

@@ -14174,18 +14174,56 @@ class ApiStepComponent extends BaseStepComponent {
         }
     }
     /**
-     * Extracts JSON path from the clicked position in a formatted JSON string
+     * Walks jsonData and builds a map from each line number (in the output of
+     * JSON.stringify(jsonData, null, 2)) to the segment path that line represents.
+     * Segments are strings for object keys and numbers for array indices.
+     */
+    buildLinePathMap(obj) {
+        const map = new Map();
+        const state = { line: 0 };
+        const walk = (value, path) => {
+            if (Array.isArray(value)) {
+                if (value.length === 0)
+                    return;
+                for (let i = 0; i < value.length; i++) {
+                    state.line += 1; // newline before element
+                    const elementPath = [...path, i];
+                    map.set(state.line, elementPath);
+                    walk(value[i], elementPath);
+                }
+                state.line += 1; // newline before closing ]
+                return;
+            }
+            if (value && typeof value === 'object') {
+                const keys = Object.keys(value);
+                if (keys.length === 0)
+                    return;
+                for (const key of keys) {
+                    state.line += 1; // newline before "key":
+                    const keyPath = [...path, key];
+                    map.set(state.line, keyPath);
+                    walk(value[key], keyPath);
+                }
+                state.line += 1; // newline before closing }
+                return;
+            }
+            // primitive — no additional lines
+        };
+        // Root line (line 0) is the opening { or [ or primitive.
+        walk(obj, []);
+        return map;
+    }
+    /**
+     * Extracts JSON path from the clicked position in a formatted JSON string.
+     * Returns an array of segments (string keys or numeric array indices), or null.
      */
     getJsonPathFromClick(event, jsonData, prefix = '') {
         const target = event.target;
-        if (!target || !jsonData)
+        if (!target || jsonData == null)
             return null;
         const preElement = target.closest('pre');
         if (!preElement)
             return null;
-        // Get the formatted JSON text
-        const formattedJson = this.formatJson(jsonData);
-        const lines = formattedJson.split('\n');
         // Create a range at the click position
         let range = null;
         if (document.caretRangeFromPoint) {
@@ -14208,58 +14246,44 @@ class ApiStepComponent extends BaseStepComponent {
         const textBeforeClick = preRange.toString();
         // Count newlines to find which line we're on
         const lineIndex = (textBeforeClick.match(/\n/g) || []).length;
-        // Get the clicked line
-        const clickedLine = lines[lineIndex] || '';
-        // Extract key from the line (pattern: "key":)
-        const keyMatch = clickedLine.match(/^\s*"([^"]+)":/);
-        if (!keyMatch)
-            return null;
-        const clickedKey = keyMatch[1];
-        const clickedIndent = (keyMatch[0].match(/^(\s+)/)?.[1]?.length || 0) / 2; // Divide by 2 since JSON.stringify uses 2 spaces
-        // Build path by finding parent keys based on indentation
-        const path = [];
-        // Traverse backwards from the clicked line to find all parent keys
-        let currentIndent = clickedIndent;
-        for (let i = lineIndex - 1; i >= 0; i--) {
-            const line = lines[i];
-            const lineKeyMatch = line.match(/^(\s+)"([^"]+)":/);
-            if (lineKeyMatch) {
-                const lineIndent = lineKeyMatch[1].length / 2; // Divide by 2 for 2-space indentation
-                const lineKey = lineKeyMatch[2];
-                // If this line has less indentation, it's a parent
-                if (lineIndent < currentIndent) {
-                    path.unshift(lineKey);
-                    currentIndent = lineIndent;
-                    // Stop if we've reached the root level
-                    if (lineIndent === 0)
-                        break;
-                }
-            }
-        }
-        // Add the clicked key
-        path.push(clickedKey);
-        // Build the full path string
-        if (path.length === 0)
+        const linePathMap = this.buildLinePathMap(jsonData);
+        // Exact match first; otherwise fall back to the nearest preceding mapped line
+        // (handles clicks on closing brackets or blank columns).
+        let segments = linePathMap.get(lineIndex);
+        if (!segments) {
+            for (let i = lineIndex - 1; i >= 0; i--) {
+                const candidate = linePathMap.get(i);
+                if (candidate) {
+                    segments = candidate;
+                    break;
+                }
+            }
+        }
+        if (!segments || segments.length === 0)
             return null;
-        const fullPath = prefix ? `${prefix}.${path.join('.')}` : path.join('.');
-        return fullPath;
+        return prefix ? [prefix, ...segments] : [...segments];
     }
-    normalizeJsonPath(path, prefix) {
-        if (!path || !prefix) {
-            return path;
-        }
-        const parts = path.split('.');
-        if (parts.length < 2) {
-            return path;
+    formatSegmentsPath(segments) {
+        return segments.reduce((acc, seg) => {
+            if (typeof seg === 'number')
+                return `${acc}[${seg}]`;
+            return acc ? `${acc}.${seg}` : String(seg);
+        }, '');
+    }
+    normalizeJsonPath(segments, prefix) {
+        if (!segments || segments.length === 0)
+            return '';
+        if (!prefix || segments.length < 2) {
+            return this.formatSegmentsPath(segments);
         }
-        const [, ...rest] = parts;
+        const [, ...rest] = segments;
         if (prefix === 'requestHeaders' || prefix === 'responseHeaders') {
-            return rest.length ? `headers.${rest.join('.')}` : 'headers';
+            return rest.length ? `headers${this.formatSegmentsPath(rest).startsWith('[') ? '' : '.'}${this.formatSegmentsPath(rest)}` : 'headers';
         }
         if (prefix === 'requestBody' || prefix === 'responseBody') {
-            return rest.length ? `body.${rest.join('.')}` : 'body';
+            return rest.length ? `body${this.formatSegmentsPath(rest).startsWith('[') ? '' : '.'}${this.formatSegmentsPath(rest)}` : 'body';
         }
-        return path;
+        return this.formatSegmentsPath(segments);
     }
     /**
      * Copy JSON path on double-click
@@ -14267,12 +14291,12 @@ class ApiStepComponent extends BaseStepComponent {
     copyJsonPath(event, jsonData, prefix = '') {
         if (!jsonData)
             return;
-        const path = this.getJsonPathFromClick(event, jsonData, prefix);
-        if (path) {
+        const segments = this.getJsonPathFromClick(event, jsonData, prefix);
+        if (segments && segments.length > 0) {
             const source = prefix;
-            const normalizedPath = this.normalizeJsonPath(path, prefix);
+            const normalizedPath = this.normalizeJsonPath(segments, prefix);
             navigator.clipboard.writeText(normalizedPath).then(() => {
-                console.log('Copied to clipboard:', path);
+                console.log('Copied to clipboard:', normalizedPath);
                 // Call the handler on every double-click (even on success, for now showing error as per requirement)
                 if (this.onJsonPathCopiedHandler) {
                     console.log('Calling onJsonPathCopiedHandler on success with:', { path: normalizedPath, source });