android-midscene-automation 0.1.6 → 0.1.9

package/src/appium-recorder/tree.ts

@@ -1,5 +1,11 @@
 import type { AppiumBounds, AppiumNode, AppiumSelector } from './types';
 
+type SelectorCounts = {
+  contentDesc: Map<string, number>;
+  resourceId: Map<string, number>;
+  textClass: Map<string, number>;
+};
+
 function attr(element: Element, name: string) {
   return element.getAttribute(name) || '';
 }
@@ -25,19 +31,35 @@ function escapeUiAutomatorText(value: string) {
   return value.replace(/\\/g, '\\\\').replace(/"/g, '\\"');
 }
 
-function buildSelector(element: Element, bounds?: AppiumBounds): AppiumSelector {
+function textClassKey(element: Element) {
+  return `${attr(element, 'text')}|${attr(element, 'class')}`;
+}
+
+function withCount(selector: AppiumSelector, count: number): AppiumSelector {
+  return {
+    ...selector,
+    unique: count === 1,
+    matchCount: count,
+    source: selector.source || 'node',
+  };
+}
+
+function buildSelector(element: Element, counts: SelectorCounts, bounds?: AppiumBounds): AppiumSelector {
   const contentDesc = attr(element, 'content-desc');
   const resourceId = attr(element, 'resource-id');
   const text = attr(element, 'text');
   const className = attr(element, 'class');
-  if (contentDesc) return { strategy: 'accessibilityId', value: contentDesc };
-  if (resourceId) return { strategy: 'id', value: resourceId };
+  if (contentDesc) return withCount({ strategy: 'accessibilityId', value: contentDesc }, counts.contentDesc.get(contentDesc) || 1);
+  if (resourceId) return withCount({ strategy: 'id', value: resourceId }, counts.resourceId.get(resourceId) || 1);
   if (text) {
     const classClause = className ? `.className("${escapeUiAutomatorText(className)}")` : '';
-    return { strategy: 'androidUiAutomator', value: `new UiSelector().text("${escapeUiAutomatorText(text)}")${classClause}` };
+    return withCount(
+      { strategy: 'androidUiAutomator', value: `new UiSelector().text("${escapeUiAutomatorText(text)}")${classClause}` },
+      counts.textClass.get(textClassKey(element)) || 1,
+    );
   }
-  if (bounds) return { strategy: 'bounds', centerX: bounds.centerX, centerY: bounds.centerY };
-  return { strategy: 'xpath', value: '' };
+  if (bounds) return { strategy: 'bounds', centerX: bounds.centerX, centerY: bounds.centerY, unique: false, matchCount: 0, source: 'fallback' };
+  return { strategy: 'xpath', value: '', unique: false, matchCount: 0 };
 }
 
 function nodeLabel(element: Element) {
@@ -61,6 +83,8 @@ function transformNode(
   parentPath: string,
   index: number,
   resourceIdCounts: Map<string, number>,
+  counts: SelectorCounts,
+  nearestContextSelector?: AppiumSelector,
 ): AppiumNode {
   const bounds = parseBounds(attr(element, 'bounds'));
   const className = attr(element, 'class') || element.tagName;
@@ -72,8 +96,13 @@ function transformNode(
   const xpath = resourceId && resourceIdCounts.get(resourceId) === 1
     ? `//*[@resource-id='${escapeXpathValue(resourceId)}']`
     : `${parentPath}/${className}[${sameClassIndex}]`;
+  const selector = buildSelector(element, counts, bounds);
+  const selfContextSelector: AppiumSelector = selector.unique && selector.strategy !== 'bounds'
+    ? selector
+    : { strategy: 'xpath', value: xpath, unique: true, matchCount: 1, source: 'ancestor' };
+  const contextSelector = selector.unique ? undefined : nearestContextSelector;
   const children = elementChildren(element).map((child, childIndex) => (
-    transformNode(child, xpath, childIndex, resourceIdCounts)
+    transformNode(child, xpath, childIndex, resourceIdCounts, counts, selfContextSelector)
   ));
   return {
     id: `${xpath}-${attr(element, 'bounds') || index}`,
@@ -87,7 +116,8 @@ function transformNode(
     enabled: attr(element, 'enabled') !== 'false',
     xpath,
     bounds,
-    selector: buildSelector(element, bounds),
+    selector,
+    contextSelector,
     children,
   };
 }
@@ -97,11 +127,27 @@ export function parseWindowHierarchy(xml: string) {
   const root = doc.querySelector('hierarchy > node') || doc.querySelector('node');
   if (!root) return null;
   const resourceIdCounts = new Map<string, number>();
+  const counts: SelectorCounts = {
+    contentDesc: new Map(),
+    resourceId: resourceIdCounts,
+    textClass: new Map(),
+  };
   doc.querySelectorAll('node[resource-id]').forEach((element) => {
     const resourceId = attr(element, 'resource-id');
     if (resourceId) resourceIdCounts.set(resourceId, (resourceIdCounts.get(resourceId) || 0) + 1);
   });
-  return transformNode(root, '', 0, resourceIdCounts);
+  doc.querySelectorAll('node[content-desc]').forEach((element) => {
+    const contentDesc = attr(element, 'content-desc');
+    if (contentDesc) counts.contentDesc.set(contentDesc, (counts.contentDesc.get(contentDesc) || 0) + 1);
+  });
+  doc.querySelectorAll('node[text]').forEach((element) => {
+    const text = attr(element, 'text');
+    if (text) {
+      const key = textClassKey(element);
+      counts.textClass.set(key, (counts.textClass.get(key) || 0) + 1);
+    }
+  });
+  return transformNode(root, '', 0, resourceIdCounts, counts);
 }
 
 export function flattenNodes(node: AppiumNode | null): AppiumNode[] {

package/src/appium-recorder/types.ts

@@ -12,6 +12,16 @@ export type AppiumSelector = {
   value?: string;
   centerX?: number;
   centerY?: number;
+  unique?: boolean;
+  matchCount?: number;
+  source?: 'node' | 'ancestor' | 'fallback';
+};
+
+export type AppiumPageSnapshot = {
+  activity?: string;
+  packageName?: string;
+  treeSignature?: string;
+  selectedNodePath?: string;
 };
 
 export type AppiumNode = {
@@ -27,6 +37,7 @@ export type AppiumNode = {
   xpath: string;
   bounds?: AppiumBounds;
   selector: AppiumSelector;
+  contextSelector?: AppiumSelector;
   children: AppiumNode[];
 };
 
@@ -35,6 +46,10 @@ export type AppiumRecordedStep = {
   type:
     | 'tap'
     | 'input'
+    | 'tapIfExists'
+    | 'inputIfExists'
+    | 'clearIfExists'
+    | 'backIfExists'
     | 'waitFor'
     | 'assertExists'
     | 'key'
@@ -48,13 +63,30 @@ export type AppiumRecordedStep = {
     | 'waitDisappear'
     | 'assertText'
     | 'longPress'
-    | 'pinch';
+    | 'pinch'
+    | 'runScript';
   label: string;
   selector?: AppiumSelector;
+  contextSelector?: AppiumSelector;
+  selectorChain?: AppiumSelector[];
   fallback?: AppiumSelector;
   value?: string;
+  optional?: boolean;
   keyCode?: number;
   timeoutMs?: number;
+  flow?: {
+    scope?: 'pre' | 'main' | 'post';
+    nodeKind?: 'action' | 'condition' | 'assertion';
+    yesTargetId?: string;
+    noTargetId?: string;
+    parentConditionId?: string;
+    parentBranch?: 'yes' | 'no';
+    successTargetId?: string;
+    failureTargetId?: string;
+    collapsed?: boolean;
+  };
+  pageBefore?: AppiumPageSnapshot;
+  pageAfter?: AppiumPageSnapshot;
   swipe?: {
     startX: number;
     startY: number;