@midscene/recorder 0.24.1-beta-20250729035148.0 → 0.24.1-beta-20250729054413.0

package/dist/recorder-iife.js

@@ -521,7 +521,6 @@
                 getNodeFromCacheList: ()=>getNodeFromCacheList,
                 getNodeInfoByXpath: ()=>getNodeInfoByXpath,
                 getXpathsById: ()=>getXpathsById,
-                getXpathsByPoint: ()=>getXpathsByPoint,
                 isNotContainerElement: ()=>isNotContainerElement,
                 setNodeHashCacheListOnWindow: ()=>setNodeHashCacheListOnWindow,
                 traverseTree: ()=>traverseTree,
@@ -652,9 +651,6 @@ ${indentStr}${after}`;
             function isAElement(node) {
                 return node instanceof HTMLElement && "a" === node.tagName.toLowerCase();
             }
-            function isSvgElement(node) {
-                return node instanceof SVGElement;
-            }
             function isImgElement(node) {
                 if (!includeBaseElement(node) && node instanceof Element) {
                     const computedStyle = window.getComputedStyle(node);
@@ -1239,7 +1235,7 @@ ${indentStr}${after}`;
                     height: maxBottom - minTop
                 };
             }
-            var getElementXpathIndex = (element)=>{
+            var getElementIndex = (element)=>{
                 let index = 1;
                 let prev = element.previousElementSibling;
                 while(prev){
@@ -1248,31 +1244,30 @@ ${indentStr}${after}`;
                 }
                 return index;
             };
-            var normalizeXpathText = (text)=>{
-                if ("string" != typeof text) return "";
-                return text.replace(/\s+/g, " ").trim();
-            };
-            var buildCurrentElementXpath = (element, isOrderSensitive, isLeafElement)=>{
-                const parentPath = element.parentNode ? getElementXpath(element.parentNode, isOrderSensitive) : "";
-                const prefix = parentPath ? `${parentPath}/` : "/";
-                const tagName = element.nodeName.toLowerCase();
-                const textContent = element.textContent?.trim();
-                if (isOrderSensitive) {
-                    const index2 = getElementXpathIndex(element);
-                    return `${prefix}${tagName}[${index2}]`;
+            var getTextNodeIndex = (textNode)=>{
+                let index = 1;
+                let current = textNode.previousSibling;
+                while(current){
+                    if (current.nodeType === Node.TEXT_NODE) index++;
+                    current = current.previousSibling;
                 }
-                if (isLeafElement && textContent) return `${prefix}${tagName}[normalize-space()="${normalizeXpathText(textContent)}"]`;
-                const index = getElementXpathIndex(element);
-                return `${prefix}${tagName}[${index}]`;
+                return index;
             };
-            var getElementXpath = (element, isOrderSensitive = false, isLeafElement = false)=>{
+            var createNormalizeSpaceCondition = (textContent)=>`[normalize-space()="${textContent}"]`;
+            var addTextContentToXPath = (el, baseXPath)=>{
+                const textContent = el.textContent?.trim();
+                if (textContent && (isButtonElement(el) || isFormElement(el))) return `${baseXPath}${createNormalizeSpaceCondition(textContent)}`;
+                return baseXPath;
+            };
+            var getElementXPath = (element)=>{
                 if (element.nodeType === Node.TEXT_NODE) {
                     const parentNode = element.parentNode;
                     if (parentNode && parentNode.nodeType === Node.ELEMENT_NODE) {
-                        const parentXPath = getElementXpath(parentNode, isOrderSensitive, true);
+                        const parentXPath2 = getElementXPath(parentNode);
+                        const textIndex = getTextNodeIndex(element);
                         const textContent = element.textContent?.trim();
-                        if (textContent) return `${parentXPath}/text()[normalize-space()="${normalizeXpathText(textContent)}"]`;
-                        return `${parentXPath}/text()`;
+                        if (textContent) return `${parentXPath2}/text()[${textIndex}]${createNormalizeSpaceCondition(textContent)}`;
+                        return `${parentXPath2}/text()[${textIndex}]`;
                     }
                     return "";
                 }
@@ -1280,31 +1275,29 @@ ${indentStr}${after}`;
                 const el = element;
                 if (el === document.documentElement) return "/html";
                 if (el === document.body) return "/html/body";
-                if (isSvgElement(el)) {
-                    let parent = el.parentNode;
-                    while(parent && parent.nodeType === Node.ELEMENT_NODE){
-                        if (!isSvgElement(parent)) return getElementXpath(parent, isOrderSensitive, isLeafElement);
-                        parent = parent.parentNode;
-                    }
-                    return getElementXpath(el.parentNode, isOrderSensitive, isLeafElement);
+                const isSVG = "http://www.w3.org/2000/svg" === el.namespaceURI;
+                const tagName = el.nodeName.toLowerCase();
+                if (isSVG && "svg" === tagName) return getElementXPath(el.parentNode);
+                if (!el.parentNode) {
+                    const baseXPath2 = `/${tagName}`;
+                    return addTextContentToXPath(el, baseXPath2);
                 }
-                return buildCurrentElementXpath(el, isOrderSensitive, isLeafElement);
+                const parentXPath = getElementXPath(el.parentNode);
+                const index = getElementIndex(el);
+                const baseXPath = `${parentXPath}/${tagName}[${index}]`;
+                return addTextContentToXPath(el, baseXPath);
             };
-            function getXpathsById(id) {
-                const node = getNodeFromCacheList(id);
-                if (!node) return null;
-                const fullXPath = getElementXpath(node, false, true);
+            function generateXPaths(node) {
+                if (!node) return [];
+                const fullXPath = getElementXPath(node);
                 return [
                     fullXPath
                 ];
             }
-            function getXpathsByPoint(point, isOrderSensitive) {
-                const element = document.elementFromPoint(point.left, point.top);
-                if (!element) return null;
-                const fullXPath = getElementXpath(element, isOrderSensitive, true);
-                return [
-                    fullXPath
-                ];
+            function getXpathsById(id) {
+                const node = getNodeFromCacheList(id);
+                if (!node) return null;
+                return generateXPaths(node);
             }
             function getNodeInfoByXpath(xpath) {
                 const xpathResult = document.evaluate(xpath, document, null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midscene/recorder",
-  "version": "0.24.1-beta-20250729035148.0",
+  "version": "0.24.1-beta-20250729054413.0",
   "type": "module",
   "exports": {
     ".": {
@@ -24,7 +24,7 @@
     "antd": "^5.21.6",
     "dayjs": "^1.11.11",
     "react-dom": "18.3.1",
-    "@midscene/shared": "0.24.1-beta-20250729035148.0"
+    "@midscene/shared": "0.24.1-beta-20250729054413.0"
   },
   "peerDependencies": {
     "react": "18.3.1",