touchpress 0.2.0 → 0.2.1

package/dist/core/index.mjs

@@ -1,2 +1,2 @@
-import { A as normalizeText, C as parseScreen, D as deviceNameForSlot, E as TOUCHPRESS_DEFAULTS, M as TouchpressError, O as parseDeviceOptions, S as silentSink, T as resolve, a as sizeOf, d as createScrollSearch, f as directionToward, g as evaluate, h as describeCheck, i as relativeTo, j as textMatch, k as describeQuery, l as captureEvidence, m as probe, n as compareScreenshot, o as toPixelBox, p as formatFailure, r as cropScreenshot, t as preflight, u as createDevice, v as openSession, w as renderScreen, x as renderTitle, y as sessionName } from "../preflight-sFz236o3.mjs";
+import { A as normalizeText, C as parseScreen, D as deviceNameForSlot, E as TOUCHPRESS_DEFAULTS, M as TouchpressError, O as parseDeviceOptions, S as silentSink, T as resolve, a as sizeOf, d as createScrollSearch, f as directionToward, g as evaluate, h as describeCheck, i as relativeTo, j as textMatch, k as describeQuery, l as captureEvidence, m as probe, n as compareScreenshot, o as toPixelBox, p as formatFailure, r as cropScreenshot, t as preflight, u as createDevice, v as openSession, w as renderScreen, x as renderTitle, y as sessionName } from "../preflight-D1aux7ic.mjs";
 export { TOUCHPRESS_DEFAULTS, TouchpressError, captureEvidence, compareScreenshot, createDevice, createScrollSearch, cropScreenshot, describeCheck, describeQuery, deviceNameForSlot, directionToward, evaluate, formatFailure, normalizeText, openSession, parseDeviceOptions, parseScreen, preflight, probe, relativeTo, renderScreen, renderTitle, resolve, sessionName, silentSink, sizeOf, textMatch, toPixelBox };

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { C as parseScreen, E as TOUCHPRESS_DEFAULTS, M as TouchpressError, O as parseDeviceOptions, S as silentSink, T as resolve, _ as createQueue, a as sizeOf, b as sleep, c as createClient, i as relativeTo, j as textMatch, l as captureEvidence, n as compareScreenshot, o as toPixelBox, r as cropScreenshot, s as createAgentDeviceDriver, t as preflight, u as createDevice, v as openSession, w as renderScreen, x as renderTitle } from "./preflight-sFz236o3.mjs";
+import { C as parseScreen, E as TOUCHPRESS_DEFAULTS, M as TouchpressError, O as parseDeviceOptions, S as silentSink, T as resolve, _ as createQueue, a as sizeOf, b as sleep, c as createClient, i as relativeTo, j as textMatch, l as captureEvidence, n as compareScreenshot, o as toPixelBox, r as cropScreenshot, s as createAgentDeviceDriver, t as preflight, u as createDevice, v as openSession, w as renderScreen, x as renderTitle } from "./preflight-D1aux7ic.mjs";
 import { expect as expect$1, test as test$1 } from "@playwright/test";
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { dirname } from "node:path";

package/dist/{preflight-sFz236o3.mjs → preflight-D1aux7ic.mjs}

@@ -51,11 +51,11 @@ function formatError(info) {
 			info.screen
 		].join("\n");
 		case "fill-unconfirmed": return [
-			`fill left the field holding something else after ${String(info.attempts)} attempts in ${String(info.timeoutMs)}ms.`,
+			info.actual === null ? `fill lost the field after ${String(info.attempts)} attempts in ${String(info.timeoutMs)}ms.` : `fill left the field holding something else after ${String(info.attempts)} attempts in ${String(info.timeoutMs)}ms.`,
 			``,
 			`Locator: ${info.locator}`,
 			`Expected value: ${describeValue(info.expected)}${info.expected.kind === "masked" ? " (a secure field reports a mask, not its contents)" : ""}`,
-			`Actual value: ${info.actual === null ? "the locator stopped resolving" : describeValue(info.actual)}`,
+			`Actual value: ${info.actual === null ? "unknown, the field no longer resolved after the write" : describeValue(info.actual)}`,
 			``,
 			`Screen:`,
 			info.screen
@@ -1388,6 +1388,7 @@ function perform(session, sink, record, options, dispatch, write) {
 			let retriedStaleRef = false;
 			let attempts = 0;
 			let target = record.query;
+			let written = null;
 			let lastActual = null;
 			let screen = await device.capture();
 			const unconfirmed = (expected) => new TouchpressError({
@@ -1426,6 +1427,7 @@ function perform(session, sink, record, options, dispatch, write) {
 						typed: typedOf(resolution.node.role, write)
 					}), () => Promise.resolve(), { box: true });
 					target = identityOf(screen, resolution.node);
+					written = confirmation;
 					screen = await device.capture();
 					lastActual = valueAt(screen, target);
 					if (lastActual !== null && holds(confirmation, lastActual)) {
@@ -1442,13 +1444,16 @@ function perform(session, sink, record, options, dispatch, write) {
 					continue;
 				}
 				const remaining = deadline - Date.now();
-				if (remaining <= 0) throw new TouchpressError({
-					kind: "not-found",
-					locator,
-					timeoutMs: timeout,
-					screen: renderScreen(screen),
-					scrolled: search.trail()
-				});
+				if (remaining <= 0) {
+					if (written !== null) throw unconfirmed(expectedOf(written));
+					throw new TouchpressError({
+						kind: "not-found",
+						locator,
+						timeoutMs: timeout,
+						screen: renderScreen(screen),
+						scrolled: search.trail()
+					});
+				}
 				if (attempts === 0 && await search.step(screen, target, remaining)) {
 					screen = await device.capture();
 					continue;
@@ -1630,18 +1635,29 @@ function valueAt(screen, target) {
 /**
 * How the written node is found again on the next snapshot.
 *
-* The driver copies an ancestor's identifier onto every descendant that
-* inherits it, so a testId names this node alone only when it resolves to this
-* node alone. Two inheriting siblings would otherwise turn a landed fill into a
-* strict-mode failure. Position in the tree is the fallback.
+* A testId rarely names one node. SwiftUI puts one identifier on a field, its
+* placeholder, and the button under it, and the driver copies an ancestor's
+* identifier onto every inheriting descendant. The role narrows those to the
+* field, and failing that the field's position among nodes of its role stands
+* in. Never the raw tree index: the software keyboard inserts its windows at the
+* top of the tree, which shifts every index but adds no text field.
 */
 function identityOf(screen, node) {
 	if (node.testId !== null) {
-		const byTestId = { testId: textMatch(node.testId, true) };
+		const byTestId = {
+			role: node.role,
+			testId: textMatch(node.testId, true)
+		};
 		const resolution = resolve(screen, byTestId);
 		if (resolution.outcome === "one" && resolution.node === node) return byTestId;
 	}
-	return { where: (other) => other.index === node.index };
+	const byRole = { role: node.role };
+	const index = matchesOf(screen, byRole).indexOf(node);
+	if (index === -1) throw new Error(`${node.ref} does not resolve under its own role`);
+	return {
+		...byRole,
+		index
+	};
 }
 //#endregion
 //#region src/core/evidence.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "touchpress",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "End-to-end testing for mobile apps.",
   "homepage": "https://github.com/wobsoriano/touchpress#readme",
   "bugs": {