@midscene/recorder 0.24.1-beta-20250728094050.0 → 0.24.1-beta-20250728154033.0

package/dist/recorder-iife.js

@@ -521,7 +521,6 @@
                 getNodeFromCacheList: ()=>getNodeFromCacheList,
                 getNodeInfoByXpath: ()=>getNodeInfoByXpath,
                 getXpathsById: ()=>getXpathsById,
-                getXpathsByPoint: ()=>getXpathsByPoint,
                 isNotContainerElement: ()=>isNotContainerElement,
                 setNodeHashCacheListOnWindow: ()=>setNodeHashCacheListOnWindow,
                 traverseTree: ()=>traverseTree,
@@ -1245,18 +1244,30 @@ ${indentStr}${after}`;
                 }
                 return index;
             };
-            function normalizeText(text) {
-                if ("string" != typeof text) return "";
-                return text.replace(/\s+/g, " ").trim();
-            }
-            var getElementXPath = (element, isOrderSensitive, isLeafElement)=>{
+            var getTextNodeIndex = (textNode)=>{
+                let index = 1;
+                let current = textNode.previousSibling;
+                while(current){
+                    if (current.nodeType === Node.TEXT_NODE) index++;
+                    current = current.previousSibling;
+                }
+                return index;
+            };
+            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, true);
-                        const textContent2 = element.textContent?.trim();
-                        if (textContent2) return `${parentXPath}/text()[normalize-space()="${normalizeText(textContent2)}"]`;
-                        return `${parentXPath}/text()`;
+                        const parentXPath2 = getElementXPath(parentNode);
+                        const textIndex = getTextNodeIndex(element);
+                        const textContent = element.textContent?.trim();
+                        if (textContent) return `${parentXPath2}/text()[${textIndex}]${createNormalizeSpaceCondition(textContent)}`;
+                        return `${parentXPath2}/text()[${textIndex}]`;
                     }
                     return "";
                 }
@@ -1266,37 +1277,19 @@ ${indentStr}${after}`;
                 if (el === document.body) return "/html/body";
                 const isSVG = "http://www.w3.org/2000/svg" === el.namespaceURI;
                 const tagName = el.nodeName.toLowerCase();
-                if (isSVG) {
-                    let parent = el.parentNode;
-                    while(parent && parent.nodeType === Node.ELEMENT_NODE){
-                        const parentEl = parent;
-                        if ("http://www.w3.org/2000/svg" !== parentEl.namespaceURI) return getElementXPath(parent, isOrderSensitive, isLeafElement);
-                        parent = parent.parentNode;
-                    }
-                    return getElementXPath(el.parentNode, isOrderSensitive, isLeafElement);
+                if (isSVG && "svg" === tagName) return getElementXPath(el.parentNode);
+                if (!el.parentNode) {
+                    const baseXPath2 = `/${tagName}`;
+                    return addTextContentToXPath(el, baseXPath2);
                 }
-                const textContent = el.textContent?.trim();
-                const buildParentPath = ()=>{
-                    if (!el.parentNode) return "";
-                    return getElementXPath(el.parentNode, true);
-                };
-                const buildCurrentElement = (useIndex, useText)=>{
-                    const parentPath = buildParentPath();
-                    const prefix = parentPath ? `${parentPath}/` : "/";
-                    if (useText && textContent) return `${prefix}${tagName}[normalize-space()="${normalizeText(textContent)}"]`;
-                    if (useIndex) {
-                        const index = getElementIndex(el);
-                        return `${prefix}${tagName}[${index}]`;
-                    }
-                    return `${prefix}${tagName}`;
-                };
-                if (isOrderSensitive) return buildCurrentElement(true);
-                if (isLeafElement) return buildCurrentElement(false, true);
-                return buildCurrentElement(true);
+                const parentXPath = getElementXPath(el.parentNode);
+                const index = getElementIndex(el);
+                const baseXPath = `${parentXPath}/${tagName}[${index}]`;
+                return addTextContentToXPath(el, baseXPath);
             };
-            function generateXPaths(node, isOrderSensitive) {
+            function generateXPaths(node) {
                 if (!node) return [];
-                const fullXPath = getElementXPath(node, isOrderSensitive, true);
+                const fullXPath = getElementXPath(node);
                 return [
                     fullXPath
                 ];
@@ -1306,11 +1299,6 @@ ${indentStr}${after}`;
                 if (!node) return null;
                 return generateXPaths(node);
             }
-            function getXpathsByPoint(point, isOrderSensitive) {
-                const element = document.elementFromPoint(point.left, point.top);
-                if (!element) return null;
-                return generateXPaths(element, isOrderSensitive);
-            }
             function getNodeInfoByXpath(xpath) {
                 const xpathResult = document.evaluate(xpath, document, null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);
                 if (1 !== xpathResult.snapshotLength) return null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midscene/recorder",
-  "version": "0.24.1-beta-20250728094050.0",
+  "version": "0.24.1-beta-20250728154033.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-20250728094050.0"
+    "@midscene/shared": "0.24.1-beta-20250728154033.0"
   },
   "peerDependencies": {
     "react": "18.3.1",