@empiricalrun/playwright-utils 0.20.1 → 0.20.3

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @empiricalrun/playwright-utils
 
+## 0.20.3
+
+### Patch Changes
+
+- bb0496f: fix: hover failure error stack should not contain patch method
+
+## 0.20.2
+
+### Patch Changes
+
+- 1e3466d: fix: shared highlight method for all patch methods
+
 ## 0.20.1
 
 ### Patch Changes

package/dist/overlay-tests/click.spec.js

@@ -64,3 +64,17 @@ test_1.test.beforeEach(async ({ page }) => {
     await (0, test_1.expect)(page.getByText("This is a toast message")).not.toBeVisible();
     await (0, test_1.expect)(page.getByRole("button", { name: "Close" })).toBeVisible();
 });
+(0, test_1.test)("should not return patch method in error stack", async ({ page }) => {
+    await page.goto(`http://localhost:${PORT}/tos.html`);
+    let error;
+    try {
+        await page.locator("div.some-random-class-name").hover();
+    }
+    catch (e) {
+        error = e;
+    }
+    (0, test_1.expect)(error).toBeDefined();
+    (0, test_1.expect)(error.stack).toBeDefined();
+    (0, test_1.expect)(error.stack).not.toContain("hover.ts");
+    (0, test_1.expect)(error.stack).toContain("overlay-tests/click.spec.ts:83");
+});

package/dist/test/scripts/agent-capabilities.d.ts

@@ -1,3 +1,4 @@
-import type { Page, PlaywrightTestArgs, PlaywrightTestOptions, PlaywrightWorkerArgs, PlaywrightWorkerOptions, TestType } from "@playwright/test";
-export declare function addAgentCapabilities(page: Page, testFn: TestType<PlaywrightTestArgs & PlaywrightTestOptions, PlaywrightWorkerArgs & PlaywrightWorkerOptions>): void;
+import type { Page } from "@playwright/test";
+import { TestFn } from "./types";
+export declare function addAgentCapabilities(page: Page, testFn: TestFn): void;
 //# sourceMappingURL=agent-capabilities.d.ts.map

package/dist/test/scripts/agent-capabilities.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agent-capabilities.d.ts","sourceRoot":"","sources":["../../../src/test/scripts/agent-capabilities.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,IAAI,EACJ,kBAAkB,EAClB,qBAAqB,EACrB,oBAAoB,EACpB,uBAAuB,EACvB,QAAQ,EACT,MAAM,kBAAkB,CAAC;AAe1B,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,QAAQ,CACd,kBAAkB,GAAG,qBAAqB,EAC1C,oBAAoB,GAAG,uBAAuB,CAC/C,QAMF"}
+{"version":3,"file":"agent-capabilities.d.ts","sourceRoot":"","sources":["../../../src/test/scripts/agent-capabilities.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAG7C,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAOjC,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,QAK9D"}

package/dist/test/scripts/index.d.ts

@@ -1,4 +1,5 @@
-import type { Page, PlaywrightTestArgs, PlaywrightTestOptions, PlaywrightWorkerArgs, PlaywrightWorkerOptions, TestType } from "@playwright/test";
+import type { Page } from "@playwright/test";
 import { HighlighterOpts } from "../types";
-export declare function injectLocatorHighlightScripts(page: Page, testFn: TestType<PlaywrightTestArgs & PlaywrightTestOptions, PlaywrightWorkerArgs & PlaywrightWorkerOptions>, options?: HighlighterOpts): void;
+import { TestFn } from "./types";
+export declare function injectLocatorHighlightScripts(page: Page, testFn: TestFn, options?: HighlighterOpts): void;
 //# sourceMappingURL=index.d.ts.map

package/dist/test/scripts/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/test/scripts/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,IAAI,EACJ,kBAAkB,EAClB,qBAAqB,EACrB,oBAAoB,EACpB,uBAAuB,EACvB,QAAQ,EACT,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAa3C,wBAAgB,6BAA6B,CAC3C,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,QAAQ,CACd,kBAAkB,GAAG,qBAAqB,EAC1C,oBAAoB,GAAG,uBAAuB,CAC/C,EACD,OAAO,GAAE,eAAgC,QAsB1C"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/test/scripts/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAG7C,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAK3C,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AASjC,wBAAgB,6BAA6B,CAC3C,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,EACd,OAAO,GAAE,eAAgC,QAsB1C"}

package/dist/test/scripts/index.js

@@ -22,7 +22,7 @@ function injectLocatorHighlightScripts(page, testFn, options = defaultOptions) {
             (0, mouse_pointer_1.addMousePointerHighlighter)(page);
         }
         if (opts.locatorHighlighter) {
-            (0, locator_highlights_1.addLocatorHighlights)(page);
+            (0, locator_highlights_1.addLocatorHighlights)(page, testFn);
         }
         if (opts.visionMethods) {
             (0, locator_vision_1.addLocatorVisionMethods)(page);

package/dist/test/scripts/locator-highlights.d.ts

@@ -1,3 +1,4 @@
 import type { Page } from "@playwright/test";
-export declare function addLocatorHighlights(page: Page): void;
+import { TestFn } from "./types";
+export declare function addLocatorHighlights(page: Page, testFn: TestFn): void;
 //# sourceMappingURL=locator-highlights.d.ts.map

package/dist/test/scripts/locator-highlights.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"locator-highlights.d.ts","sourceRoot":"","sources":["../../../src/test/scripts/locator-highlights.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAW7C,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,IAAI,QAK9C"}
+{"version":3,"file":"locator-highlights.d.ts","sourceRoot":"","sources":["../../../src/test/scripts/locator-highlights.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAU7C,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAEjC,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,QAK9D"}

package/dist/test/scripts/locator-highlights.js

@@ -9,21 +9,21 @@ const is_checked_1 = require("./pw-locator-patch/highlight/is-checked");
 const is_disabled_1 = require("./pw-locator-patch/highlight/is-disabled");
 const is_editable_1 = require("./pw-locator-patch/highlight/is-editable");
 const text_content_1 = require("./pw-locator-patch/highlight/text-content");
-function addLocatorHighlights(page) {
-    applyHighlights(page);
+function addLocatorHighlights(page, testFn) {
+    applyHighlights(page, testFn);
     page.context().on("page", async (newPage) => {
-        applyHighlights(newPage);
+        applyHighlights(newPage, testFn);
     });
 }
 exports.addLocatorHighlights = addLocatorHighlights;
-function applyHighlights(page) {
+function applyHighlights(page, testFn) {
     const LocatorClass = page.locator("").constructor;
+    (0, hover_1.patchHover)(LocatorClass, testFn);
     (0, expect_1.patchExpect)(LocatorClass);
     (0, input_value_1.patchInputValue)(LocatorClass);
     (0, is_checked_1.patchIsChecked)(LocatorClass);
     (0, is_editable_1.patchIsEditable)(LocatorClass);
     (0, is_disabled_1.patchIsDisabled)(LocatorClass);
-    (0, hover_1.patchHover)(LocatorClass);
     (0, inner_text_1.patchInnerText)(LocatorClass);
     (0, text_content_1.patchTextContent)(LocatorClass);
 }

package/dist/test/scripts/pw-locator-patch/highlight/expect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"expect.d.ts","sourceRoot":"","sources":["../../../../../src/test/scripts/pw-locator-patch/highlight/expect.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAOhD,wBAAgB,WAAW,CAAC,YAAY,EAAE,QAAQ,GAAG;IAAE,SAAS,EAAE,OAAO,CAAA;CAAE,QAuC1E"}
+{"version":3,"file":"expect.d.ts","sourceRoot":"","sources":["../../../../../src/test/scripts/pw-locator-patch/highlight/expect.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAMhD,wBAAgB,WAAW,CAAC,YAAY,EAAE,QAAQ,GAAG;IAAE,SAAS,EAAE,OAAO,CAAA;CAAE,QAmB1E"}

package/dist/test/scripts/pw-locator-patch/highlight/expect.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.patchExpect = void 0;
-const logger_1 = require("../../../../logger");
-const constants_1 = require("../../../constants");
+const utils_1 = require("../utils");
 const isExpectPatched = new WeakMap();
 function patchExpect(LocatorClass) {
     if (isExpectPatched.get(LocatorClass)) {
@@ -15,25 +14,7 @@ function patchExpect(LocatorClass) {
     LocatorClass.prototype._expect = async function (expression, options) {
         const result = await originalExpect.apply(this, [expression, options]);
         if (result.matches) {
-            try {
-                await this.evaluate((node) => {
-                    if (node.scrollIntoViewIfNeeded) {
-                        node.scrollIntoViewIfNeeded();
-                    }
-                    else {
-                        node.scrollIntoView();
-                    }
-                    node.classList.add("empirical-element-grab-highlight");
-                    setTimeout(() => {
-                        if (node && node.isConnected && node.classList) {
-                            node.classList.remove("empirical-element-grab-highlight");
-                        }
-                    }, 2000);
-                }, undefined, { timeout: constants_1.DEFAULT_SCRIPT_EXECUTION_TIMEOUT });
-            }
-            catch (e) {
-                logger_1.logger.debug("Failed to add highlight for locator method: _expect");
-            }
+            await (0, utils_1.scrollAndHighlight)(this);
         }
         return result;
     };

package/dist/test/scripts/pw-locator-patch/highlight/hover.d.ts

@@ -1,5 +1,6 @@
 import type { Locator } from "@playwright/test";
+import { TestFn } from "../../types";
 export declare function patchHover(LocatorClass: Function & {
     prototype: Locator;
-}): void;
+}, testFn: TestFn): void;
 //# sourceMappingURL=hover.d.ts.map

package/dist/test/scripts/pw-locator-patch/highlight/hover.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hover.d.ts","sourceRoot":"","sources":["../../../../../src/test/scripts/pw-locator-patch/highlight/hover.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAOhD,wBAAgB,UAAU,CAAC,YAAY,EAAE,QAAQ,GAAG;IAAE,SAAS,EAAE,OAAO,CAAA;CAAE,QAyBzE"}
+{"version":3,"file":"hover.d.ts","sourceRoot":"","sources":["../../../../../src/test/scripts/pw-locator-patch/highlight/hover.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAEhD,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAKrC,wBAAgB,UAAU,CACxB,YAAY,EAAE,QAAQ,GAAG;IAAE,SAAS,EAAE,OAAO,CAAA;CAAE,EAC/C,MAAM,EAAE,MAAM,QA2Bf"}

package/dist/test/scripts/pw-locator-patch/highlight/hover.js

@@ -1,29 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.patchHover = void 0;
-const logger_1 = require("../../../../logger");
-const constants_1 = require("../../../constants");
+const utils_1 = require("../utils");
 const isHoverPatched = new WeakMap();
-function patchHover(LocatorClass) {
+function patchHover(LocatorClass, testFn) {
     if (isHoverPatched.get(LocatorClass)) {
         return;
     }
     const originalHover = LocatorClass.prototype.hover;
     LocatorClass.prototype.hover = async function (options) {
-        await originalHover.apply(this, [options]);
-        try {
-            await this.evaluate((node) => {
-                node.classList.add("empirical-element-grab-highlight");
-                setTimeout(() => {
-                    if (node && node.isConnected && node.classList) {
-                        node.classList.remove("empirical-element-grab-highlight");
-                    }
-                }, 2000);
-            }, undefined, { timeout: constants_1.DEFAULT_SCRIPT_EXECUTION_TIMEOUT });
-        }
-        catch (e) {
-            logger_1.logger.debug("Failed to add highlight for locator method: hover");
-        }
+        let result;
+        const stepName = `locator.hover(${(0, utils_1.description)(this)})`;
+        await testFn.step(stepName, async () => {
+            try {
+                result = await originalHover.apply(this, [options]);
+            }
+            catch (error) {
+                if (error instanceof Error) {
+                    Error.captureStackTrace(error, LocatorClass.prototype.hover);
+                }
+                throw error;
+            }
+            await (0, utils_1.highlight)(this);
+        }, { box: true });
+        return result;
     };
     isHoverPatched.set(LocatorClass, true);
 }

package/dist/test/scripts/pw-locator-patch/highlight/inner-text.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"inner-text.d.ts","sourceRoot":"","sources":["../../../../../src/test/scripts/pw-locator-patch/highlight/inner-text.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAOhD,wBAAgB,cAAc,CAC5B,YAAY,EAAE,QAAQ,GAAG;IAAE,SAAS,EAAE,OAAO,CAAA;CAAE,QAiChD"}
+{"version":3,"file":"inner-text.d.ts","sourceRoot":"","sources":["../../../../../src/test/scripts/pw-locator-patch/highlight/inner-text.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAMhD,wBAAgB,cAAc,CAC5B,YAAY,EAAE,QAAQ,GAAG;IAAE,SAAS,EAAE,OAAO,CAAA;CAAE,QAahD"}

package/dist/test/scripts/pw-locator-patch/highlight/inner-text.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.patchInnerText = void 0;
-const logger_1 = require("../../../../logger");
-const constants_1 = require("../../../constants");
+const utils_1 = require("../utils");
 const isInnerTextPatched = new WeakMap();
 function patchInnerText(LocatorClass) {
     if (isInnerTextPatched.get(LocatorClass)) {
@@ -12,25 +11,7 @@ function patchInnerText(LocatorClass) {
     //ref: https://github.com/microsoft/playwright/blob/69287f26bc514b740eac40160503d6fac8185d37/packages/playwright-core/src/client/locator.ts#L251
     LocatorClass.prototype.innerText = async function (options) {
         const result = await originalInnerText.apply(this, [options]);
-        try {
-            await this.evaluate((node) => {
-                if (node.scrollIntoViewIfNeeded) {
-                    node.scrollIntoViewIfNeeded();
-                }
-                else {
-                    node.scrollIntoView();
-                }
-                node.classList.add("empirical-element-grab-highlight");
-                setTimeout(() => {
-                    if (node && node.isConnected && node.classList) {
-                        node.classList.remove("empirical-element-grab-highlight");
-                    }
-                }, 2000);
-            }, undefined, { timeout: constants_1.DEFAULT_SCRIPT_EXECUTION_TIMEOUT });
-        }
-        catch (e) {
-            logger_1.logger.debug("Failed to add highlight for locator method: innerText");
-        }
+        await (0, utils_1.scrollAndHighlight)(this);
         return result;
     };
     isInnerTextPatched.set(LocatorClass, true);

package/dist/test/scripts/pw-locator-patch/highlight/input-value.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"input-value.d.ts","sourceRoot":"","sources":["../../../../../src/test/scripts/pw-locator-patch/highlight/input-value.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAOhD,wBAAgB,eAAe,CAC7B,YAAY,EAAE,QAAQ,GAAG;IAAE,SAAS,EAAE,OAAO,CAAA;CAAE,QAiChD"}
+{"version":3,"file":"input-value.d.ts","sourceRoot":"","sources":["../../../../../src/test/scripts/pw-locator-patch/highlight/input-value.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAMhD,wBAAgB,eAAe,CAC7B,YAAY,EAAE,QAAQ,GAAG;IAAE,SAAS,EAAE,OAAO,CAAA;CAAE,QAahD"}

package/dist/test/scripts/pw-locator-patch/highlight/input-value.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.patchInputValue = void 0;
-const logger_1 = require("../../../../logger");
-const constants_1 = require("../../../constants");
+const utils_1 = require("../utils");
 const isInputValuePatched = new WeakMap();
 function patchInputValue(LocatorClass) {
     if (isInputValuePatched.get(LocatorClass)) {
@@ -12,25 +11,7 @@ function patchInputValue(LocatorClass) {
     //ref: github.com/microsoft/playwright/blob/69287f26bc514b740eac40160503d6fac8185d37/packages/playwright-core/src/client/locator.ts#L255
     LocatorClass.prototype.inputValue = async function (options) {
         const result = await originalInputValue.apply(this, [options]);
-        try {
-            await this.evaluate((node) => {
-                if (node.scrollIntoViewIfNeeded) {
-                    node.scrollIntoViewIfNeeded();
-                }
-                else {
-                    node.scrollIntoView();
-                }
-                node.classList.add("empirical-element-grab-highlight");
-                setTimeout(() => {
-                    if (node && node.isConnected && node.classList) {
-                        node.classList.remove("empirical-element-grab-highlight");
-                    }
-                }, 2000);
-            }, undefined, { timeout: constants_1.DEFAULT_SCRIPT_EXECUTION_TIMEOUT });
-        }
-        catch (e) {
-            logger_1.logger.debug("Failed to add highlight for locator method: inputValue");
-        }
+        await (0, utils_1.scrollAndHighlight)(this);
         return result;
     };
     isInputValuePatched.set(LocatorClass, true);

package/dist/test/scripts/pw-locator-patch/highlight/is-checked.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"is-checked.d.ts","sourceRoot":"","sources":["../../../../../src/test/scripts/pw-locator-patch/highlight/is-checked.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAOhD,wBAAgB,cAAc,CAC5B,YAAY,EAAE,QAAQ,GAAG;IAAE,SAAS,EAAE,OAAO,CAAA;CAAE,QAiChD"}
+{"version":3,"file":"is-checked.d.ts","sourceRoot":"","sources":["../../../../../src/test/scripts/pw-locator-patch/highlight/is-checked.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAMhD,wBAAgB,cAAc,CAC5B,YAAY,EAAE,QAAQ,GAAG;IAAE,SAAS,EAAE,OAAO,CAAA;CAAE,QAahD"}

package/dist/test/scripts/pw-locator-patch/highlight/is-checked.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.patchIsChecked = void 0;
-const logger_1 = require("../../../../logger");
-const constants_1 = require("../../../constants");
+const utils_1 = require("../utils");
 const isIsCheckedPatched = new WeakMap();
 function patchIsChecked(LocatorClass) {
     if (isIsCheckedPatched.get(LocatorClass)) {
@@ -12,25 +11,7 @@ function patchIsChecked(LocatorClass) {
     LocatorClass.prototype.isChecked = async function (options) {
         // ref: https://github.com/microsoft/playwright/blob/69287f26bc514b740eac40160503d6fac8185d37/packages/playwright-core/src/client/locator.ts#L259
         const result = await originalIsChecked.apply(this, [options]);
-        try {
-            await this.evaluate((node) => {
-                if (node.scrollIntoViewIfNeeded) {
-                    node.scrollIntoViewIfNeeded();
-                }
-                else {
-                    node.scrollIntoView();
-                }
-                node.classList.add("empirical-element-grab-highlight");
-                setTimeout(() => {
-                    if (node && node.isConnected && node.classList) {
-                        node.classList.remove("empirical-element-grab-highlight");
-                    }
-                }, 2000);
-            }, undefined, { timeout: constants_1.DEFAULT_SCRIPT_EXECUTION_TIMEOUT });
-        }
-        catch (e) {
-            logger_1.logger.debug("Failed to add highlight for locator method: isChecked");
-        }
+        await (0, utils_1.scrollAndHighlight)(this);
         return result;
     };
     isIsCheckedPatched.set(LocatorClass, true);

package/dist/test/scripts/pw-locator-patch/highlight/is-disabled.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"is-disabled.d.ts","sourceRoot":"","sources":["../../../../../src/test/scripts/pw-locator-patch/highlight/is-disabled.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAOhD,wBAAgB,eAAe,CAC7B,YAAY,EAAE,QAAQ,GAAG;IAAE,SAAS,EAAE,OAAO,CAAA;CAAE,QAiChD"}
+{"version":3,"file":"is-disabled.d.ts","sourceRoot":"","sources":["../../../../../src/test/scripts/pw-locator-patch/highlight/is-disabled.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAMhD,wBAAgB,eAAe,CAC7B,YAAY,EAAE,QAAQ,GAAG;IAAE,SAAS,EAAE,OAAO,CAAA;CAAE,QAahD"}

package/dist/test/scripts/pw-locator-patch/highlight/is-disabled.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.patchIsDisabled = void 0;
-const logger_1 = require("../../../../logger");
-const constants_1 = require("../../../constants");
+const utils_1 = require("../utils");
 const isIsDisabledPatched = new WeakMap();
 function patchIsDisabled(LocatorClass) {
     if (isIsDisabledPatched.get(LocatorClass)) {
@@ -12,25 +11,7 @@ function patchIsDisabled(LocatorClass) {
     LocatorClass.prototype.isDisabled = async function (options) {
         // ref: https://github.com/microsoft/playwright/blob/69287f26bc514b740eac40160503d6fac8185d37/packages/playwright-core/src/client/locator.ts#L263
         const result = await originalIsDisabled.apply(this, [options]);
-        try {
-            await this.evaluate((node) => {
-                if (node.scrollIntoViewIfNeeded) {
-                    node.scrollIntoViewIfNeeded();
-                }
-                else {
-                    node.scrollIntoView();
-                }
-                node.classList.add("empirical-element-grab-highlight");
-                setTimeout(() => {
-                    if (node && node.isConnected && node.classList) {
-                        node.classList.remove("empirical-element-grab-highlight");
-                    }
-                }, 2000);
-            }, undefined, { timeout: constants_1.DEFAULT_SCRIPT_EXECUTION_TIMEOUT });
-        }
-        catch (e) {
-            logger_1.logger.debug("Failed to add highlight for locator method: isDisabled");
-        }
+        await (0, utils_1.scrollAndHighlight)(this);
         return result;
     };
     isIsDisabledPatched.set(LocatorClass, true);

package/dist/test/scripts/pw-locator-patch/highlight/is-editable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"is-editable.d.ts","sourceRoot":"","sources":["../../../../../src/test/scripts/pw-locator-patch/highlight/is-editable.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAOhD,wBAAgB,eAAe,CAC7B,YAAY,EAAE,QAAQ,GAAG;IAAE,SAAS,EAAE,OAAO,CAAA;CAAE,QAgChD"}
+{"version":3,"file":"is-editable.d.ts","sourceRoot":"","sources":["../../../../../src/test/scripts/pw-locator-patch/highlight/is-editable.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAMhD,wBAAgB,eAAe,CAC7B,YAAY,EAAE,QAAQ,GAAG;IAAE,SAAS,EAAE,OAAO,CAAA;CAAE,QAYhD"}

package/dist/test/scripts/pw-locator-patch/highlight/is-editable.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.patchIsEditable = void 0;
-const logger_1 = require("../../../../logger");
-const constants_1 = require("../../../constants");
+const utils_1 = require("../utils");
 const isIsEditablePatched = new WeakMap();
 function patchIsEditable(LocatorClass) {
     if (isIsEditablePatched.get(LocatorClass)) {
@@ -11,25 +10,7 @@ function patchIsEditable(LocatorClass) {
     const originalIsEditable = LocatorClass.prototype.isEditable;
     LocatorClass.prototype.isEditable = async function (options) {
         const result = await originalIsEditable.apply(this, [options]);
-        try {
-            await this.evaluate((node) => {
-                if (node.scrollIntoViewIfNeeded) {
-                    node.scrollIntoViewIfNeeded();
-                }
-                else {
-                    node.scrollIntoView();
-                }
-                node.classList.add("empirical-element-grab-highlight");
-                setTimeout(() => {
-                    if (node && node.isConnected && node.classList) {
-                        node.classList.remove("empirical-element-grab-highlight");
-                    }
-                }, 2000);
-            }, undefined, { timeout: constants_1.DEFAULT_SCRIPT_EXECUTION_TIMEOUT });
-        }
-        catch (e) {
-            logger_1.logger.debug("Failed to add highlight for locator method: isEditable");
-        }
+        await (0, utils_1.scrollAndHighlight)(this);
         return result;
     };
     isIsEditablePatched.set(LocatorClass, true);

package/dist/test/scripts/pw-locator-patch/highlight/text-content.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"text-content.d.ts","sourceRoot":"","sources":["../../../../../src/test/scripts/pw-locator-patch/highlight/text-content.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAOhD,wBAAgB,gBAAgB,CAC9B,YAAY,EAAE,QAAQ,GAAG;IAAE,SAAS,EAAE,OAAO,CAAA;CAAE,QAiChD"}
+{"version":3,"file":"text-content.d.ts","sourceRoot":"","sources":["../../../../../src/test/scripts/pw-locator-patch/highlight/text-content.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAMhD,wBAAgB,gBAAgB,CAC9B,YAAY,EAAE,QAAQ,GAAG;IAAE,SAAS,EAAE,OAAO,CAAA;CAAE,QAahD"}

package/dist/test/scripts/pw-locator-patch/highlight/text-content.js

@@ -1,36 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.patchTextContent = void 0;
-const logger_1 = require("../../../../logger");
-const constants_1 = require("../../../constants");
+const utils_1 = require("../utils");
 const isTextContentPatched = new WeakMap();
 function patchTextContent(LocatorClass) {
     if (isTextContentPatched.get(LocatorClass)) {
         return;
     }
     const originalTextContent = LocatorClass.prototype.textContent;
-    //ref: https://github.com/microsoft/playwright/blob/69287f26bc514b740eac40160503d6fac8185d37/packages/playwright-core/src/client/locator.ts#L318
+    // ref: https://github.com/microsoft/playwright/blob/69287f26bc514b740eac40160503d6fac8185d37/packages/playwright-core/src/client/locator.ts#L318
     LocatorClass.prototype.textContent = async function (options) {
         const result = await originalTextContent.apply(this, [options]);
-        try {
-            await this.evaluate((node) => {
-                if (node.scrollIntoViewIfNeeded) {
-                    node.scrollIntoViewIfNeeded();
-                }
-                else {
-                    node.scrollIntoView();
-                }
-                node.classList.add("empirical-element-grab-highlight");
-                setTimeout(() => {
-                    if (node && node.isConnected && node.classList) {
-                        node.classList.remove("empirical-element-grab-highlight");
-                    }
-                }, 2000);
-            }, undefined, { timeout: constants_1.DEFAULT_SCRIPT_EXECUTION_TIMEOUT });
-        }
-        catch (e) {
-            logger_1.logger.debug("Failed to add highlight for locator method: textContent");
-        }
+        await (0, utils_1.scrollAndHighlight)(this);
         return result;
     };
     isTextContentPatched.set(LocatorClass, true);

package/dist/test/scripts/pw-locator-patch/utils/index.d.ts

@@ -0,0 +1,5 @@
+import { Locator } from "playwright-core";
+export declare function description(locator: Locator): string;
+export declare function scrollAndHighlight(locator: Locator): Promise<void>;
+export declare function highlight(locator: Locator): Promise<void>;
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/test/scripts/pw-locator-patch/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAK1C,wBAAgB,WAAW,CAAC,OAAO,EAAE,OAAO,UA0B3C;AAED,wBAAsB,kBAAkB,CAAC,OAAO,EAAE,OAAO,iBAsBxD;AAED,wBAAsB,SAAS,CAAC,OAAO,EAAE,OAAO,iBAiB/C"}

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

@@ -0,0 +1,65 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.highlight = exports.scrollAndHighlight = exports.description = void 0;
+const logger_1 = require("../../../../logger");
+const constants_1 = require("../../../constants");
+function description(locator) {
+    const fallbackDescription = locator.toString();
+    try {
+        let cleanedDescription = fallbackDescription;
+        if (fallbackDescription.startsWith("locator(") &&
+            fallbackDescription.endsWith(")")) {
+            cleanedDescription = fallbackDescription
+                .substring(8, fallbackDescription.length - 1)
+                .trim();
+            if ((cleanedDescription.startsWith("'") &&
+                cleanedDescription.endsWith("'")) ||
+                (cleanedDescription.startsWith('"') && cleanedDescription.endsWith('"'))) {
+                cleanedDescription = cleanedDescription.substring(1, cleanedDescription.length - 1);
+            }
+        }
+        return cleanedDescription;
+    }
+    catch (e) {
+        return fallbackDescription;
+    }
+}
+exports.description = description;
+async function scrollAndHighlight(locator) {
+    try {
+        await locator.evaluate((node) => {
+            if (node.scrollIntoViewIfNeeded) {
+                node.scrollIntoViewIfNeeded();
+            }
+            else {
+                node.scrollIntoView();
+            }
+            node.classList.add("empirical-element-grab-highlight");
+            setTimeout(() => {
+                if (node && node.isConnected && node.classList) {
+                    node.classList.remove("empirical-element-grab-highlight");
+                }
+            }, 2000);
+        }, undefined, { timeout: constants_1.DEFAULT_SCRIPT_EXECUTION_TIMEOUT });
+    }
+    catch (e) {
+        logger_1.logger.debug("Failed to scroll and highlight for locator method");
+    }
+}
+exports.scrollAndHighlight = scrollAndHighlight;
+async function highlight(locator) {
+    try {
+        await locator.evaluate((node) => {
+            node.classList.add("empirical-element-grab-highlight");
+            setTimeout(() => {
+                if (node && node.isConnected && node.classList) {
+                    node.classList.remove("empirical-element-grab-highlight");
+                }
+            }, 2000);
+        }, undefined, { timeout: constants_1.DEFAULT_SCRIPT_EXECUTION_TIMEOUT });
+    }
+    catch (e) {
+        logger_1.logger.debug("Failed to add highlight for locator method");
+    }
+}
+exports.highlight = highlight;

package/dist/test/scripts/types.d.ts

@@ -0,0 +1,3 @@
+import type { PlaywrightTestArgs, PlaywrightTestOptions, PlaywrightWorkerArgs, PlaywrightWorkerOptions, TestType } from "@playwright/test";
+export type TestFn = TestType<PlaywrightTestArgs & PlaywrightTestOptions, PlaywrightWorkerArgs & PlaywrightWorkerOptions>;
+//# sourceMappingURL=types.d.ts.map

package/dist/test/scripts/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/test/scripts/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,kBAAkB,EAClB,qBAAqB,EACrB,oBAAoB,EACpB,uBAAuB,EACvB,QAAQ,EACT,MAAM,kBAAkB,CAAC;AAE1B,MAAM,MAAM,MAAM,GAAG,QAAQ,CAC3B,kBAAkB,GAAG,qBAAqB,EAC1C,oBAAoB,GAAG,uBAAuB,CAC/C,CAAC"}

package/dist/test/scripts/types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@empiricalrun/playwright-utils",
-  "version": "0.20.1",
+  "version": "0.20.3",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"
@@ -43,8 +43,8 @@
     "puppeteer-extra-plugin-recaptcha": "^3.6.8",
     "rimraf": "^6.0.1",
     "@empiricalrun/llm": "^0.9.35",
-    "@empiricalrun/test-gen": "^0.43.0",
-    "@empiricalrun/r2-uploader": "^0.3.8"
+    "@empiricalrun/r2-uploader": "^0.3.8",
+    "@empiricalrun/test-gen": "^0.43.0"
   },
   "scripts": {
     "dev": "tsc --build --watch",