rnxsim 0.1.458 → 0.1.460

package/dist-lib/sdk.mjs

@@ -1,4 +1,4 @@
-/*! rnx v0.1.458 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
+/*! rnx v0.1.460 | (c) 2026 Tamagui LLC | Proprietary — see LICENSE */
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
@@ -1253,11 +1253,12 @@ async function resolveTargetCoords(bridge, target) {
   if (!isSimSemanticTree(semanticNodes) || typeof x !== "number" || !Number.isFinite(x) || typeof y !== "number" || !Number.isFinite(y)) {
     throw new Error("resolve returned an invalid result");
   }
-  const semanticMatch = semanticNodes[0];
+  const semanticMatch = semanticNodes[1];
   if (!semanticMatch) throw new Error("resolve returned an invalid result");
   return {
     x,
     y,
+    nodeId: semanticMatch.nodeId,
     testID: semanticMatch.testID ?? null,
     text: semanticMatch.text ?? (target.mode === "text" ? target.value : semanticMatch.label),
     type: semanticMatch.type
@@ -1469,34 +1470,6 @@ function offscreenPayload(cx, cy, screen) {
   }
   return { offscreen: true, screen };
 }
-function geometryContains(geometry, x, y) {
-  return x >= geometry.x && y >= geometry.y && x <= geometry.x + geometry.width && y <= geometry.y + geometry.height;
-}
-function hitTestSemanticTree(nodes, x, y, ancestors = []) {
-  for (let index = nodes.length - 1; index >= 0; index--) {
-    const node = nodes[index];
-    if (!node || !geometryContains(node.geometry, x, y)) continue;
-    const childHit = node.children?.length ? hitTestSemanticTree(node.children, x, y, [...ancestors, node]) : null;
-    return childHit ?? { node, ancestors };
-  }
-  return null;
-}
-function nodeMatchesRequested(node, requested) {
-  if (typeof requested.nodeId === "number" && node.nodeId === requested.nodeId) {
-    return true;
-  }
-  if (requested.testID && node.testID === requested.testID) return true;
-  if (requested.id && node.testID === requested.id) return true;
-  return false;
-}
-function coveringNodeSummary(node) {
-  return {
-    nodeId: node.nodeId,
-    testID: node.testID ?? null,
-    text: node.text ?? node.label ?? null,
-    type: node.type
-  };
-}
 var DEFAULT_AGENT_TIMING = {
   initialWaitMs: 3e3,
   deadlineMs: 5e3,
@@ -1523,9 +1496,10 @@ function isTapSuccess(result) {
   return true;
 }
 function tapTargetFromPayload(payload, textFallback) {
+  const id = payload.target?.id ?? payload.match?.id ?? payload.node?.id;
   return {
     nodeId: payload.target?.nodeId ?? payload.match?.nodeId ?? payload.node?.nodeId ?? null,
-    id: payload.target?.id ?? payload.match?.id ?? payload.node?.id ?? null,
+    id: typeof id === "string" ? id : null,
     testID: payload.target?.testID ?? payload.match?.testID ?? payload.node?.testID ?? null,
     text: payload.target?.text ?? payload.target?.accessibilityLabel ?? payload.match?.text ?? payload.match?.accessibilityLabel ?? payload.node?.text ?? textFallback ?? null,
     type: payload.target?.type ?? payload.match?.type ?? payload.node?.type ?? null
@@ -1583,36 +1557,17 @@ async function tapResolvedTarget(bridge, args) {
       } else {
         lastOffscreenAt = null;
         const requestedTarget = tapTargetFromPayload(payload, args.textFallback);
-        const { tree } = await inspectTree(bridge, 50);
-        let moved = false;
-        if (Array.isArray(tree) && tree.length > 0) {
-          const hit = hitTestSemanticTree(tree, payload.cx, payload.cy);
-          const matched = hit !== null && (nodeMatchesRequested(hit.node, requestedTarget) || hit.ancestors.some(
-            (ancestor) => nodeMatchesRequested(ancestor, requestedTarget)
-          ));
-          const blocks = hit !== null && (hit.node.type === "text" || hit.node.pressable === true || hit.ancestors.some((ancestor) => ancestor.pressable === true));
-          if (hit && !matched && blocks) {
-            moved = subtreeMatchesRequested(hit.node, requestedTarget);
-            lastResult = {
-              hit: false,
-              reason: moved ? "target-moved" : "target-covered",
-              requestedTarget,
-              coordinateTarget: coveringNodeSummary(hit.node)
-            };
-            if (!moved)
-              return { payload, result: lastResult, attempts, failure: "missed" };
-          }
-        }
-        if (!moved) {
-          const result = await tapCoordinates(
-            bridge,
-            payload.cx,
-            payload.cy,
-            requestedTarget
-          );
-          lastResult = result;
-          if (isTapSuccess(result)) return { payload, result, attempts };
+        const result = await tapCoordinates(
+          bridge,
+          payload.cx,
+          payload.cy,
+          requestedTarget
+        );
+        lastResult = result;
+        if (result?.requestedTargetMatched === false) {
+          return { payload, result, attempts, failure: "missed" };
         }
+        if (isTapSuccess(result)) return { payload, result, attempts };
       }
     }
     const remaining = deadline - Date.now();
@@ -1641,13 +1596,6 @@ async function tapResolvedTarget(bridge, args) {
     failure: lastPayload && typeof lastPayload.cx === "number" ? "missed" : "not-found"
   };
 }
-function subtreeMatchesRequested(node, requested) {
-  for (const child of node.children ?? []) {
-    if (nodeMatchesRequested(child, requested) || subtreeMatchesRequested(child, requested))
-      return true;
-  }
-  return false;
-}
 async function tapCoordinates(bridge, x, y, target) {
   return bridge.send({
     type: "tap",
@@ -1668,7 +1616,7 @@ function payloadFromResolved(resolved, match, extra = {}) {
       type: match.type ?? null
     },
     target: {
-      nodeId: match.nodeId ?? null,
+      nodeId: resolved.nodeId ?? match.nodeId ?? null,
       id: resolved.testID ?? match.testID ?? null,
       testID: resolved.testID ?? match.testID ?? null,
       text: resolved.text ?? match.text ?? null,
@@ -1800,7 +1748,7 @@ async function tapBest(bridge, query, opts = {}) {
           ...payloadFromResolved(byId, byId),
           strategy: "testid",
           node: {
-            nodeId: null,
+            nodeId: byId.nodeId ?? null,
             id: byId.testID ?? query,
             testID: byId.testID ?? query,
             type: byId.type ?? null,
@@ -1814,7 +1762,7 @@ async function tapBest(bridge, query, opts = {}) {
           ...payloadFromResolved(byText, byText),
           strategy: "text",
           node: {
-            nodeId: null,
+            nodeId: byText.nodeId ?? null,
             id: byText.testID ?? null,
             testID: byText.testID ?? null,
             type: byText.type ?? null,
@@ -2133,11 +2081,16 @@ var SimClient = class {
       const { text, ...textOpts } = target;
       return this.throwUnlessTapped(await tapByText(this, text, textOpts), text);
     }
-    if ("testID" in target && typeof target.testID === "string") {
+    if ("testID" in target && typeof target.testID === "string" && typeof target.nodeId !== "number") {
       return this.throwUnlessTapped(await tapById(this, target.testID), target.testID);
     }
     const coords = this.coordsForTapTarget(target);
-    const result = await this.send({ type: "tap", x: coords.x, y: coords.y });
+    const result = await this.send({
+      type: "tap",
+      x: coords.x,
+      y: coords.y,
+      ..."nodeId" in target && typeof target.nodeId === "number" ? { target: { nodeId: target.nodeId } } : {}
+    });
     if (!isTapSuccess(result)) {
       throw new SimTapError(
         `tap at ${coords.x},${coords.y} missed: ${JSON.stringify(result)}`
@@ -2200,6 +2153,7 @@ var SimClient = class {
         x: target.x,
         y: target.y,
         target: {
+          nodeId: target.nodeId,
           testID: target.testID ?? void 0,
           text: target.text ?? void 0,
           type: target.type ?? void 0