@empiricalrun/playwright-utils 0.22.0 → 0.22.2

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @empiricalrun/playwright-utils
 
+## 0.22.2
+
+### Patch Changes
+
+- Updated dependencies [cce1c90]
+  - @empiricalrun/test-gen@0.46.5
+
+## 0.22.1
+
+### Patch Changes
+
+- 8e4bf9d: fix: text content for dismissed overlay is undefined
+- Updated dependencies [0c29798]
+  - @empiricalrun/test-gen@0.46.4
+
 ## 0.22.0
 
 ### Minor Changes

package/dist/test/scripts/pw-locator-patch/dismiss-overlays/cache.d.ts

@@ -1,7 +1,14 @@
 import type { Page } from "@playwright/test";
-import { OverlayElement } from "./types";
-export declare function setCodeToCache(pageRef: Page, element: OverlayElement | undefined, code: string): Promise<void>;
-export declare function executeFromCache(pageRef: Page, element: OverlayElement | undefined): Promise<{
+export declare function setCodeToCache({ dom, text, code, }: {
+    dom: string | undefined;
+    text: string | undefined;
+    code: string;
+}): Promise<void>;
+export declare function executeFromCache({ page, dom, text, }: {
+    page: Page;
+    dom: string | undefined;
+    text: string | undefined;
+}): Promise<{
     success: boolean;
 }>;
 //# sourceMappingURL=cache.d.ts.map

package/dist/test/scripts/pw-locator-patch/dismiss-overlays/cache.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cache.d.ts","sourceRoot":"","sources":["../../../../../src/test/scripts/pw-locator-patch/dismiss-overlays/cache.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAI7C,OAAO,EAA6B,cAAc,EAAE,MAAM,SAAS,CAAC;AAcpE,wBAAsB,cAAc,CAClC,OAAO,EAAE,IAAI,EACb,OAAO,EAAE,cAAc,GAAG,SAAS,EACnC,IAAI,EAAE,MAAM,iBAiCb;AAED,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,IAAI,EACb,OAAO,EAAE,cAAc,GAAG,SAAS,GAClC,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CAiC/B"}
+{"version":3,"file":"cache.d.ts","sourceRoot":"","sources":["../../../../../src/test/scripts/pw-locator-patch/dismiss-overlays/cache.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAsB7C,wBAAsB,cAAc,CAAC,EACnC,GAAG,EACH,IAAI,EACJ,IAAI,GACL,EAAE;IACD,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;IACxB,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;IACzB,IAAI,EAAE,MAAM,CAAC;CACd,iBAiCA;AAED,wBAAsB,gBAAgB,CAAC,EACrC,IAAI,EACJ,GAAG,EACH,IAAI,GACL,EAAE;IACD,IAAI,EAAE,IAAI,CAAC;IACX,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;IACxB,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;CAC1B,GAAG,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CAkChC"}

package/dist/test/scripts/pw-locator-patch/dismiss-overlays/cache.js

@@ -6,14 +6,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeFromCache = exports.setCodeToCache = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
-const utils_1 = require("./utils");
 const CACHE_FILE = path_1.default.join(process.cwd(), ".empiricalrun", `overlay-cache.json`);
 function isCacheSupported(code) {
     // Current release only supports caching for code that contains 1 `click` only
     return code.includes("click") && code.trim().split("\n").length <= 1;
 }
-async function setCodeToCache(pageRef, element, code) {
-    if (!element || !element.interceptor) {
+function normalizeString(str) {
+    // Replace all whitespace sequences with a single space
+    return str.replace(/\s+/g, " ").trim();
+}
+async function setCodeToCache({ dom, text, code, }) {
+    if (!dom && !text) {
+        // At least one of the two is required
         return;
     }
     if (!isCacheSupported(code)) {
@@ -21,8 +25,8 @@ async function setCodeToCache(pageRef, element, code) {
     }
     const obj = {
         element: {
-            dom: element.interceptor,
-            textContent: (await (0, utils_1.textContent)(pageRef, element))?.trim() || "",
+            dom: dom || "",
+            textContent: normalizeString(text || ""),
         },
         code,
     };
@@ -47,29 +51,30 @@ async function setCodeToCache(pageRef, element, code) {
     fs_1.default.writeFileSync(CACHE_FILE, JSON.stringify(cache, null, 2));
 }
 exports.setCodeToCache = setCodeToCache;
-async function executeFromCache(pageRef, element) {
-    if (!element || !element.interceptor) {
+async function executeFromCache({ page, dom, text, }) {
+    if (!dom && !text) {
+        // At least one of the two is required
         return { success: false };
     }
     try {
         const cache = JSON.parse(fs_1.default.readFileSync(CACHE_FILE, "utf8"));
-        const text = (await (0, utils_1.textContent)(pageRef, element))?.trim() || "";
         const match = cache.data.find((c) => {
-            return (c.element.dom === element.interceptor && c.element.textContent === text);
+            return (c.element.dom === (dom || "") &&
+                c.element.textContent === normalizeString(text || ""));
         });
         if (!match) {
             return { success: false };
         }
         try {
-            console.log(`Executing for element: ${element} and code: ${match.code}`);
+            console.log(`Executing "${match.code}" for element: ${dom}`);
             // Ref: https://davidwalsh.name/async-function-class
             const AsyncFunction = Object.getPrototypeOf(async function () { }).constructor;
             const exec = new AsyncFunction("page", match.code);
-            await exec(pageRef);
+            await exec(page);
             return { success: true };
         }
         catch (err) {
-            console.log(`Failed to execute ${match.code} for element: ${element}`);
+            console.log(`Failed in "${match.code}" for element: ${dom}`);
             return { success: false };
         }
     }

package/dist/test/scripts/pw-locator-patch/dismiss-overlays/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/test/scripts/pw-locator-patch/dismiss-overlays/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAGxC,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAKzC,wBAAgB,gBAAgB,CAAC,YAAY,EAAE,MAAM,GAAG,SAAS,WAKhE;AAED,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,IAAI,EACb,OAAO,EAAE,cAAc,GAAG,SAAS,iBAkDpC;AAED,wBAAgB,0BAA0B,CACxC,YAAY,EAAE,MAAM,GACnB,cAAc,GAAG,SAAS,CAiC5B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/test/scripts/pw-locator-patch/dismiss-overlays/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAGxC,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAKzC,wBAAgB,gBAAgB,CAAC,YAAY,EAAE,MAAM,GAAG,SAAS,WAKhE;AAED,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,IAAI,EACb,OAAO,EAAE,cAAc,GAAG,SAAS,iBAyDpC;AAED,wBAAgB,0BAA0B,CACxC,YAAY,EAAE,MAAM,GACnB,cAAc,GAAG,SAAS,CAiC5B"}

package/dist/test/scripts/pw-locator-patch/dismiss-overlays/index.js

@@ -48,7 +48,11 @@ Don't reattempt the click on Target element, your job is done after the first cl
             : ``;
         task += `${promptAddition}`;
     }
-    const { success } = await (0, cache_1.executeFromCache)(pageRef, element);
+    const { success } = await (0, cache_1.executeFromCache)({
+        page: pageRef,
+        dom: element?.interceptor,
+        text,
+    });
     if (success) {
         return;
     }
@@ -59,7 +63,11 @@ Don't reattempt the click on Target element, your job is done after the first cl
             useActionSpecificAnnotations: true,
         },
     });
-    await (0, cache_1.setCodeToCache)(pageRef, element, result.code);
+    await (0, cache_1.setCodeToCache)({
+        dom: element?.interceptor,
+        text,
+        code: result.code,
+    });
 }
 exports.runAgentOnOverlay = runAgentOnOverlay;
 function extractInterceptingElement(errorMessage) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@empiricalrun/playwright-utils",
-  "version": "0.22.0",
+  "version": "0.22.2",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"
@@ -44,7 +44,7 @@
     "rimraf": "^6.0.1",
     "@empiricalrun/llm": "^0.9.35",
     "@empiricalrun/r2-uploader": "^0.3.8",
-    "@empiricalrun/test-gen": "^0.46.3"
+    "@empiricalrun/test-gen": "^0.46.5"
   },
   "scripts": {
     "dev": "tsc --build --watch",