@applitools/spec-driver-puppeteer 1.1.72 → 1.1.73

package/CHANGELOG.md

@@ -1,5 +1,43 @@
 # Changelog
 
+## [1.1.73](https://github.com/applitools/eyes.sdk.javascript1/compare/js/spec-driver-puppeteer@1.1.72...js/spec-driver-puppeteer@1.1.73) (2023-08-18)
+
+
+### Code Refactoring
+
+* refactored spec driver interface ([#1839](https://github.com/applitools/eyes.sdk.javascript1/issues/1839)) ([aa49ec2](https://github.com/applitools/eyes.sdk.javascript1/commit/aa49ec2a7d14b8529acc3a8a4c2baecfa113d98a))
+
+
+### Dependencies
+
+* @applitools/utils bumped to 1.5.1
+  #### Code Refactoring
+
+  * refactored spec driver interface ([#1839](https://github.com/applitools/eyes.sdk.javascript1/issues/1839)) ([aa49ec2](https://github.com/applitools/eyes.sdk.javascript1/commit/aa49ec2a7d14b8529acc3a8a4c2baecfa113d98a))
+* @applitools/logger bumped to 2.0.8
+  #### Code Refactoring
+
+  * refactored spec driver interface ([#1839](https://github.com/applitools/eyes.sdk.javascript1/issues/1839)) ([aa49ec2](https://github.com/applitools/eyes.sdk.javascript1/commit/aa49ec2a7d14b8529acc3a8a4c2baecfa113d98a))
+
+
+
+* @applitools/snippets bumped to 2.4.23
+  #### Code Refactoring
+
+  * refactored spec driver interface ([#1839](https://github.com/applitools/eyes.sdk.javascript1/issues/1839)) ([aa49ec2](https://github.com/applitools/eyes.sdk.javascript1/commit/aa49ec2a7d14b8529acc3a8a4c2baecfa113d98a))
+* @applitools/driver bumped to 1.13.5
+  #### Bug Fixes
+
+  * optimize driver usage in close ([#1867](https://github.com/applitools/eyes.sdk.javascript1/issues/1867)) ([60dff6b](https://github.com/applitools/eyes.sdk.javascript1/commit/60dff6b160e69d3893c91a1125d668fa18b43072))
+
+
+  #### Code Refactoring
+
+  * refactored spec driver interface ([#1839](https://github.com/applitools/eyes.sdk.javascript1/issues/1839)) ([aa49ec2](https://github.com/applitools/eyes.sdk.javascript1/commit/aa49ec2a7d14b8529acc3a8a4c2baecfa113d98a))
+
+
+
+
 ## [1.1.72](https://github.com/applitools/eyes.sdk.javascript1/compare/js/spec-driver-puppeteer@1.1.71...js/spec-driver-puppeteer@1.1.72) (2023-08-03)
 
 

package/dist/spec-driver.js

@@ -23,10 +23,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.build = exports.waitUntilDisplayed = exports.hover = exports.click = exports.takeScreenshot = exports.visit = exports.getUrl = exports.getTitle = exports.getDriverInfo = exports.getCookies = exports.setViewportSize = exports.getViewportSize = exports.setElementText = exports.findElements = exports.findElement = exports.childContext = exports.parentContext = exports.mainContext = exports.executeScript = exports.isStaleElementError = exports.extractContext = exports.untransformSelector = exports.transformSelector = exports.isSelector = exports.isElement = exports.isContext = exports.isDriver = void 0;
+exports.build = exports.takeScreenshot = exports.visit = exports.getUrl = exports.getTitle = exports.getCookies = exports.setViewportSize = exports.getViewportSize = exports.getDriverInfo = exports.childContext = exports.parentContext = exports.mainContext = exports.click = exports.hover = exports.setElementText = exports.findElements = exports.findElement = exports.executeScript = exports.extractContext = exports.toSimpleCommonSelector = exports.toSelector = exports.isStaleElementError = exports.isSelector = exports.isElement = exports.isContext = exports.isDriver = void 0;
 const utils = __importStar(require("@applitools/utils"));
-// #region HELPERS
-const XPATH_SELECTOR_START = ['/', '(', '../', './', '*/'];
 async function handleToObject(handle) {
     const [, type] = handle.toString().split('@');
     if (type === 'array') {
@@ -98,11 +96,10 @@ function scriptRunner(script, arg, ...elements) {
         }
     }
 }
+const XPATH_SELECTOR_START = ['/', '(', '../', './', '*/'];
 function isXpathSelector(selector) {
     return XPATH_SELECTOR_START.some(start => selector.startsWith(start));
 }
-// #endregion
-// #region UTILITY
 function isDriver(page) {
     if (!page)
         return false;
@@ -125,40 +122,61 @@ function isSelector(selector) {
     return utils.types.isString(selector);
 }
 exports.isSelector = isSelector;
-function transformSelector(selector) {
+function isStaleElementError(err) {
+    var _a, _b, _c;
+    return (((_a = err === null || err === void 0 ? void 0 : err.message) === null || _a === void 0 ? void 0 : _a.includes('Execution context was destroyed')) ||
+        ((_b = err === null || err === void 0 ? void 0 : err.message) === null || _b === void 0 ? void 0 : _b.includes('Cannot find context with specified id')) ||
+        ((_c = err === null || err === void 0 ? void 0 : err.message) === null || _c === void 0 ? void 0 : _c.includes('JSHandles can be evaluated only in the context they were created')));
+}
+exports.isStaleElementError = isStaleElementError;
+function toSelector(selector) {
     if (utils.types.has(selector, 'selector'))
         return selector.selector;
     return selector;
 }
-exports.transformSelector = transformSelector;
-function untransformSelector(selector) {
+exports.toSelector = toSelector;
+function toSimpleCommonSelector(selector) {
     if (utils.types.isString(selector)) {
         return { type: isXpathSelector(selector) ? 'xpath' : 'css', selector };
     }
     return selector;
 }
-exports.untransformSelector = untransformSelector;
+exports.toSimpleCommonSelector = toSimpleCommonSelector;
 function extractContext(page) {
     return isDriver(page) ? page.mainFrame() : page;
 }
 exports.extractContext = extractContext;
-function isStaleElementError(err) {
-    var _a, _b, _c;
-    return (((_a = err === null || err === void 0 ? void 0 : err.message) === null || _a === void 0 ? void 0 : _a.includes('Execution context was destroyed')) ||
-        ((_b = err === null || err === void 0 ? void 0 : err.message) === null || _b === void 0 ? void 0 : _b.includes('Cannot find context with specified id')) ||
-        ((_c = err === null || err === void 0 ? void 0 : err.message) === null || _c === void 0 ? void 0 : _c.includes('JSHandles can be evaluated only in the context they were created')));
-}
-exports.isStaleElementError = isStaleElementError;
-// #endregion
-// #region COMMANDS
 async function executeScript(frame, script, arg) {
     script = utils.types.isString(script) ? script : `function() {return (${script.toString()}).apply(null, arguments)}`;
     const result = await frame.evaluateHandle(scriptRunner, script, ...transformArgument(arg));
     return handleToObject(result);
 }
 exports.executeScript = executeScript;
+async function findElement(frame, selector, parent) {
+    const root = parent !== null && parent !== void 0 ? parent : frame;
+    return (isXpathSelector(selector) ? root.$x(selector).then(elements => elements[0]) : root.$(selector));
+}
+exports.findElement = findElement;
+async function findElements(frame, selector, parent) {
+    const root = parent !== null && parent !== void 0 ? parent : frame;
+    return (isXpathSelector(selector) ? root.$x(selector) : root.$$(selector));
+}
+exports.findElements = findElements;
+async function setElementText(frame, element, text) {
+    const resolvedElement = isSelector(element) ? await findElement(frame, element) : element;
+    await (resolvedElement === null || resolvedElement === void 0 ? void 0 : resolvedElement.evaluate(element => (element.value = '')));
+    await (resolvedElement === null || resolvedElement === void 0 ? void 0 : resolvedElement.type(text));
+}
+exports.setElementText = setElementText;
+async function hover(_frame, element) {
+    await element.hover();
+}
+exports.hover = hover;
+async function click(_frame, element) {
+    await element.click();
+}
+exports.click = click;
 async function mainContext(frame) {
-    frame = extractContext(frame);
     let mainFrame = frame;
     while (mainFrame.parentFrame()) {
         mainFrame = mainFrame.parentFrame();
@@ -168,7 +186,6 @@ async function mainContext(frame) {
 exports.mainContext = mainContext;
 async function parentContext(frame) {
     var _a;
-    frame = extractContext(frame);
     return (_a = frame.parentFrame()) !== null && _a !== void 0 ? _a : frame;
 }
 exports.parentContext = parentContext;
@@ -177,22 +194,10 @@ async function childContext(_frame, element) {
     return frame;
 }
 exports.childContext = childContext;
-async function findElement(frame, selector, parent) {
-    const root = parent !== null && parent !== void 0 ? parent : frame;
-    return (isXpathSelector(selector) ? root.$x(selector).then(elements => elements[0]) : root.$(selector));
-}
-exports.findElement = findElement;
-async function findElements(frame, selector, parent) {
-    const root = parent !== null && parent !== void 0 ? parent : frame;
-    return (isXpathSelector(selector) ? root.$x(selector) : root.$$(selector));
-}
-exports.findElements = findElements;
-async function setElementText(frame, element, text) {
-    const resolvedElement = isSelector(element) ? await findElement(frame, element) : element;
-    await (resolvedElement === null || resolvedElement === void 0 ? void 0 : resolvedElement.evaluate(element => (element.value = '')));
-    await (resolvedElement === null || resolvedElement === void 0 ? void 0 : resolvedElement.type(text));
+async function getDriverInfo(_page) {
+    return { features: { allCookies: true } };
 }
-exports.setElementText = setElementText;
+exports.getDriverInfo = getDriverInfo;
 async function getViewportSize(page) {
     return page.viewport();
 }
@@ -218,10 +223,6 @@ async function getCookies(page) {
     });
 }
 exports.getCookies = getCookies;
-async function getDriverInfo(_page) {
-    return { features: { allCookies: true } };
-}
-exports.getDriverInfo = getDriverInfo;
 async function getTitle(page) {
     return page.title();
 }
@@ -239,22 +240,6 @@ async function takeScreenshot(page) {
     return result;
 }
 exports.takeScreenshot = takeScreenshot;
-async function click(frame, element) {
-    const resolvedElement = isSelector(element) ? await findElement(frame, element) : element;
-    await (resolvedElement === null || resolvedElement === void 0 ? void 0 : resolvedElement.click());
-}
-exports.click = click;
-async function hover(frame, element) {
-    const resolvedElement = isSelector(element) ? await findElement(frame, element) : element;
-    await (resolvedElement === null || resolvedElement === void 0 ? void 0 : resolvedElement.hover());
-}
-exports.hover = hover;
-async function waitUntilDisplayed(frame, selector) {
-    await frame.waitForSelector(selector);
-}
-exports.waitUntilDisplayed = waitUntilDisplayed;
-// #endregion
-// #region BUILD
 const browserNames = ['chrome', 'firefox'];
 /*
  * Spawn a browser with a given configuration (INTERNAL USE ONLY)
@@ -304,4 +289,3 @@ async function build(env) {
     return [page, () => driver.close()];
 }
 exports.build = build;
-// #endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/spec-driver-puppeteer",
-  "version": "1.1.72",
+  "version": "1.1.73",
   "keywords": [
     "puppeteer",
     "chrome devtools protocol",
@@ -37,11 +37,11 @@
     "test": "run --top-level mocha './test/**/*.spec.ts' --exit",
     "setup": "yarn puppeteer:setup",
     "puppeteer:setup": "PUPPETEER_PRODUCT=firefox node --require puppeteer/install.js --eval null",
-    "up:framework": "run --top-level add-silent puppeteer"
+    "up:framework": "yarn add --dev --caret puppeteer${APPLITOOLS_FRAMEWORK_VERSION:+@$APPLITOOLS_FRAMEWORK_VERSION}"
   },
   "dependencies": {
-    "@applitools/driver": "1.13.4",
-    "@applitools/utils": "1.5.0"
+    "@applitools/driver": "1.13.5",
+    "@applitools/utils": "1.5.1"
   },
   "devDependencies": {
     "@applitools/api-extractor": "^1.2.21",

package/types/index.d.ts

@@ -1,34 +1,40 @@
-declare const _default: import('@applitools/driver').SpecDriver<SpecType>;
+declare const _default: SpecDriver;
 export default _default;
 export function isDriver(page: any): page is Driver;
 export function isContext(frame: any): frame is Context;
 export function isElement(element: any): element is Element<globalThis.Element>;
 export function isSelector(selector: any): selector is Selector;
-export function transformSelector(selector: import('@applitools/driver').CommonSelector<Selector>): Selector;
-export function untransformSelector(selector: Selector): import('@applitools/driver').CommonSelector;
-export function extractContext(page: Driver | Context): Context;
 export function isStaleElementError(err: any): boolean;
+export function toSelector(selector: import('@applitools/driver').CommonSelector<Selector>): Selector;
+export function toSimpleCommonSelector(selector: Selector): import('@applitools/driver').CommonSelector;
+export function extractContext(page: Driver): Context;
 export function executeScript(frame: Context, script: string | ((arg: any) => any), arg: any): Promise<any>;
-export function mainContext(frame: Context): Promise<Context>;
-export function parentContext(frame: Context): Promise<Context>;
-export function childContext(_frame: Context, element: Element<globalThis.Element>): Promise<Context>;
 export function findElement(frame: Context, selector: Selector, parent?: undefined | Element<globalThis.Element>): Promise<null | Element<globalThis.Element>>;
 export function findElements(frame: Context, selector: Selector, parent?: undefined | Element<globalThis.Element>): Promise<Array<Element<globalThis.Element>>>;
 export function setElementText(frame: Context, element: Selector | Element<globalThis.Element>, text: string): Promise<void>;
+export function hover(_frame: Context, element: Element<globalThis.Element>): Promise<void>;
+export function click(_frame: Context, element: Element<globalThis.Element>): Promise<void>;
+export function mainContext(frame: Context): Promise<Context>;
+export function parentContext(frame: Context): Promise<Context>;
+export function childContext(_frame: Context, element: Element<globalThis.Element>): Promise<Context>;
+export function getDriverInfo(_page: Driver): Promise<import('@applitools/driver').DriverInfo>;
 export function getViewportSize(page: Driver): Promise<{ width: number; height: number; }>;
 export function setViewportSize(page: Driver, size: { width: number; height: number; }): Promise<void>;
 export function getCookies(page: Driver): Promise<Array<import('@applitools/driver').Cookie>>;
-export function getDriverInfo(_page: Driver): Promise<import('@applitools/driver').DriverInfo>;
 export function getTitle(page: Driver): Promise<string>;
 export function getUrl(page: Driver): Promise<string>;
 export function visit(page: Driver, url: string): Promise<void>;
 export function takeScreenshot(page: Driver): Promise<Buffer>;
-export function click(frame: Context, element: Selector | Element<globalThis.Element>): Promise<void>;
-export function hover(frame: Context, element: Selector | Element<globalThis.Element>): Promise<void>;
-export function waitUntilDisplayed(frame: Context, selector: Selector): Promise<void>;
 export function build(env: any): Promise<[Driver, () => Promise<void>]>;
 export type Driver = import('puppeteer').Page & { __applitoolsBrand?: undefined; };
 export type Context = import('puppeteer').Frame & { __applitoolsBrand?: undefined; };
 export type Element<T extends globalThis.Element = globalThis.Element> = import('puppeteer').ElementHandle<T> & { __applitoolsBrand?: undefined; };
 export type Selector = string & { __applitoolsBrand?: undefined; };
-export type SpecType = { driver: Driver; context: Context; element: Element<globalThis.Element>; selector: Selector; };
+export type PrimarySpecType = {
+    driver: Driver;
+    context: Context;
+    element: Element<globalThis.Element>;
+    selector: Selector;
+    secondary: never;
+};
+export type SpecDriver = import('@applitools/driver').SpecDriver<PrimarySpecType>;