@midscene/shared 1.0.1-beta-20251024063839.0 → 1.0.1-beta-20251027033034.0

package/src/extractor/dom-util.ts

@@ -1,4 +1,4 @@
-import { NodeType } from '../constants';
+import type { LocateResultElement, Rect } from '../types';
 import { generateHashId } from '../utils';
 
 export function isFormElement(node: globalThis.Node) {
@@ -132,20 +132,24 @@ function includeBaseElement(node: globalThis.Node) {
   return false;
 }
 
-export function generateElementByPosition(position: { x: number; y: number }) {
+export function generateElementByPosition(position: {
+  x: number;
+  y: number;
+}): LocateResultElement {
+  const edgeSize = 8;
   const rect = {
-    left: Math.max(position.x - 4, 0),
-    top: Math.max(position.y - 4, 0),
-    width: 8,
-    height: 8,
+    left: Math.round(Math.max(position.x - edgeSize / 2, 0)),
+    top: Math.round(Math.max(position.y - edgeSize / 2, 0)),
+    width: edgeSize,
+    height: edgeSize,
   };
   const id = generateHashId(rect);
   const element = {
     id,
-    attributes: { nodeType: NodeType.POSITION },
     rect,
     content: '',
-    center: [position.x, position.y],
+    center: [position.x, position.y] as [number, number],
+    isOrderSensitive: false, // actually it's 'unknown'
   };
 
   return element;

package/src/extractor/index.ts

@@ -35,8 +35,6 @@ export { extractTreeNode as webExtractNodeTree } from './web-extractor';
 
 export { extractTreeNodeAsString as webExtractNodeTreeAsString } from './web-extractor';
 
-export { setNodeHashCacheListOnWindow, getNodeFromCacheList } from './util';
-
 export {
   getXpathsByPoint,
   getNodeInfoByXpath,

package/src/extractor/locator.ts

@@ -1,7 +1,6 @@
 import type { ElementInfo } from '.';
 import type { Point } from '../types';
 import { isSvgElement } from './dom-util';
-import { getNodeFromCacheList } from './util';
 import { getRect, isElementPartiallyInViewport } from './util';
 import { collectElementInfo } from './web-extractor';
 

package/src/extractor/tree.ts

@@ -45,7 +45,7 @@ export function trimAttributes(
       res[currentKey] = truncateText(attributeVal, truncateTextLength);
       return res;
     },
-    {} as BaseElement['attributes'],
+    {} as Record<string, string>,
   );
   return tailorAttributes;
 }
@@ -106,8 +106,8 @@ export function descriptionOfTree<
           .replace(/\sNode$/, '')
           .toLowerCase();
       }
-      const markerId = node.node.indexId;
-      const markerIdString = markerId ? `markerId="${markerId}"` : '';
+      // const markerId = node.node.indexId;
+      // const markerIdString = markerId ? `markerId="${markerId}"` : '';
       const rectAttribute = node.node.rect
         ? {
             left: node.node.rect.left,
@@ -116,7 +116,7 @@ export function descriptionOfTree<
             height: node.node.rect.height,
           }
         : {};
-      before = `<${nodeTypeString} id="${node.node.id}" ${markerIdString} ${attributesString(trimAttributes(node.node.attributes || {}, truncateTextLength))} ${attributesString(rectAttribute)}>`;
+      before = `<${nodeTypeString} id="${node.node.id}" ${attributesString(trimAttributes(node.node.attributes || {}, truncateTextLength))} ${attributesString(rectAttribute)}>`;
       const content = truncateText(node.node.content, truncateTextLength);
       contentWithIndent = content ? `\n${indentStr}  ${content}` : '';
       after = `</${nodeTypeString}>`;

package/src/extractor/util.ts

@@ -399,42 +399,10 @@ export function midsceneGenerateHash(
 ): string {
   const slicedHash = generateHashId(rect, content);
 
-  if (node) {
-    if (!(window as any).midsceneNodeHashCacheList) {
-      setNodeHashCacheListOnWindow();
-    }
-
-    setNodeToCacheList(node, slicedHash);
-  }
-
   // Returns the first 10 characters as a short hash
   return slicedHash;
 }
 
-export function setNodeHashCacheListOnWindow() {
-  if (typeof window !== 'undefined') {
-    (window as any).midsceneNodeHashCacheList = [];
-  }
-}
-
-export function setNodeToCacheList(node: globalThis.Node, id: string) {
-  if (typeof window !== 'undefined') {
-    if (getNodeFromCacheList(id)) {
-      return;
-    }
-    (window as any).midsceneNodeHashCacheList?.push({ node, id });
-  }
-}
-
-export function getNodeFromCacheList(id: string) {
-  if (typeof window !== 'undefined') {
-    return (window as any).midsceneNodeHashCacheList?.find(
-      (item: { node: Node; id: string }) => item.id === id,
-    )?.node;
-  }
-  return null;
-}
-
 export function generateId(numberId: number) {
   //   const letters = 'ABCDEFGHIJKLMNPRSTUVXYZ';
   //   const numbers = '0123456789';

package/src/node/fs.ts

@@ -75,7 +75,7 @@ export async function getExtraReturnLogic(tree = false) {
     return null;
   }
 
-  const elementInfosScriptContent = `${getElementInfosScriptContent()}midscene_element_inspector.setNodeHashCacheListOnWindow();`;
+  const elementInfosScriptContent = `${getElementInfosScriptContent()};`;
 
   if (tree) {
     return `${elementInfosScriptContent}midscene_element_inspector.webExtractNodeTree()`;

package/src/types/index.ts

@@ -17,7 +17,7 @@ export type Rect = Point & Size & { zoom?: number };
 export abstract class BaseElement {
   abstract id: string;
 
-  abstract indexId?: number; // markerId for web
+  // abstract indexId?: number; // markerId for web
 
   abstract attributes: {
     nodeType: NodeType;
@@ -30,7 +30,7 @@ export abstract class BaseElement {
 
   abstract center: [number, number];
 
-  abstract xpaths?: string[];
+  // abstract xpaths?: string[];
 
   abstract isVisible: boolean;
 }
@@ -45,3 +45,10 @@ export interface ElementTreeNode<
 export interface WebElementInfo extends ElementInfo {
   zoom: number;
 }
+
+export type LocateResultElement = {
+  center: [number, number];
+  rect: Rect;
+  id: string;
+  isOrderSensitive?: boolean;
+};