@mablhq/mabl-cli 1.13.14 → 1.13.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mablhq/mabl-cli",
-  "version": "1.13.14",
+  "version": "1.13.21",
   "license": "SEE LICENSE IN LICENSE.txt",
   "description": "The official mabl command line interface tool",
   "main": "index.js",
@@ -25,8 +25,8 @@
     "postinstall": "node ./util/postInstallMessage.js"
   },
   "dependencies": {
-    "@playwright/test": "1.17.1",
-    "playwright-core": "1.17.1",
+    "@playwright/test": "1.17.2",
+    "playwright-core": "1.17.2",
     "@types/fs-extra": "^8.1.0",
     "@types/serve-handler": "^6.1.0",
     "@types/tmp": "^0.2.0",

package/popupDismissal/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.elementsInFrontCount = exports.detectAndDismissPopupCandidates = exports.getAllElementsAbove = exports.elementsByHigherZIndex = void 0;
+exports.elementsInFrontCount = exports.detectAndDismissPopupCandidates = exports.getAllElementsAbove = exports.elementsAtCoordinate = exports.elementsByHigherZIndex = void 0;
 const DISMISSAL_WAIT_TIME_MS = 750;
 const ZINDEX_AUTO = 'auto';
 const MINIMUM_POPUP_DISPLAY_COVERAGE_PX = 0.95;
@@ -40,9 +40,9 @@ function getEffectiveZIndex(element) {
     const isRootElement = (element) => element === undefined || element.tagName.toLowerCase() === 'html';
     let current = element;
     while (!isRootElement(current)) {
-        const zIndex = window.getComputedStyle(element).zIndex;
+        const zIndex = window.getComputedStyle(current).zIndex;
         if (zIndex && zIndex !== ZINDEX_AUTO) {
-            return zIndex;
+            return parseInt(zIndex, 10);
         }
         current = (current === null || current === void 0 ? void 0 : current.parentElement) ? current.parentElement : undefined;
     }
@@ -135,13 +135,14 @@ function fireClickEvent(targetElement, leftEdgeClick) {
     });
     targetElement.dispatchEvent(mouseEvent);
 }
-function elementsInFront(element, pointX, pointY) {
+function elementsAtCoordinate(element, pointX, pointY) {
     const x = pointX !== undefined ? pointX : getBoundingClientRectWithXY(element).x;
     const y = pointY !== undefined ? pointY : getBoundingClientRectWithXY(element).y;
     const elementsAtPoint = document.elementsFromPoint(x, y);
     const targetIndex = elementsAtPoint.findIndex((iterElement) => iterElement === element);
     return targetIndex ? elementsAtPoint.slice(0, targetIndex) : [];
 }
+exports.elementsAtCoordinate = elementsAtCoordinate;
 function sleep(time) {
     return new Promise((resolve) => setTimeout(resolve, time));
 }
@@ -158,8 +159,15 @@ function getBoundingClientRectWithXY(element) {
         width: Math.floor(rect.right) - Math.ceil(rect.left),
     };
 }
-function getAllElementsAbove(elements) {
-    const zIndexAboveTarget = getEffectiveZIndex(elements[elements.length - 1]);
+function getAllElementsAbove(targetElement, elements) {
+    if (elements.length === 0) {
+        return [];
+    }
+    const targetZindex = getEffectiveZIndex(targetElement);
+    const zIndexAboveTarget = Math.min(...elements === null || elements === void 0 ? void 0 : elements.map((el) => getEffectiveZIndex(el)));
+    if (zIndexAboveTarget <= targetZindex) {
+        return [];
+    }
     const higherElementsByZIndex = elementsByHigherZIndex(zIndexAboveTarget);
     const allElementsByZIndex = Array.from(higherElementsByZIndex).map(([item, higherElements]) => {
         const allElements = higherElements
@@ -174,7 +182,7 @@ exports.getAllElementsAbove = getAllElementsAbove;
 async function detectAndDismissPopupCandidates(element) {
     const elementBoundingBox = getBoundingClientRectWithXY(element);
     try {
-        let higherElements = elementsInFront(element, elementBoundingBox.x, elementBoundingBox.y);
+        let higherElements = elementsAtCoordinate(element, elementBoundingBox.x, elementBoundingBox.y);
         const elementsInFrontCount = higherElements.length;
         if (elementsInFrontCount === 0) {
             return {
@@ -186,14 +194,13 @@ async function detectAndDismissPopupCandidates(element) {
             for (const candidate of candidates) {
                 fireClickEvent(candidate, leftEdgeClick);
                 await sleep(DISMISSAL_WAIT_TIME_MS);
-                if (elementsInFront(element, elementBoundingBox.x, elementBoundingBox.y)
-                    .length < elementsInFrontCount) {
+                if (elementsAtCoordinate(element, elementBoundingBox.x, elementBoundingBox.y).length < elementsInFrontCount) {
                     return true;
                 }
             }
             return false;
         };
-        let allElements = getAllElementsAbove(higherElements);
+        let allElements = getAllElementsAbove(element, higherElements);
         const candidatesByZIndex = developCloseCandidates(allElements);
         for (const candidate of candidatesByZIndex) {
             let matched = await clickCandidates(candidate.domCovering, true);
@@ -207,8 +214,8 @@ async function detectAndDismissPopupCandidates(element) {
                 };
             }
         }
-        higherElements = elementsInFront(element, elementBoundingBox.x, elementBoundingBox.y);
-        allElements = getAllElementsAbove(higherElements);
+        higherElements = elementsAtCoordinate(element, elementBoundingBox.x, elementBoundingBox.y);
+        allElements = getAllElementsAbove(element, higherElements);
         const candidates = developCloseCandidates(allElements);
         const result = candidates.length
             ? candidates[0]
@@ -236,6 +243,6 @@ async function detectAndDismissPopupCandidates(element) {
 }
 exports.detectAndDismissPopupCandidates = detectAndDismissPopupCandidates;
 function elementsInFrontCount(element) {
-    return elementsInFront(element).length;
+    return elementsAtCoordinate(element).length;
 }
 exports.elementsInFrontCount = elementsInFrontCount;

package/resources/popupDismissal.js

@@ -1 +1 @@
-window.popupDismissal=function(t){var e={};function n(o){if(e[o])return e[o].exports;var r=e[o]={i:o,l:!1,exports:{}};return t[o].call(r.exports,r,r.exports,n),r.l=!0,r.exports}return n.m=t,n.c=e,n.d=function(t,e,o){n.o(t,e)||Object.defineProperty(t,e,{enumerable:!0,get:o})},n.r=function(t){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})},n.t=function(t,e){if(1&e&&(t=n(t)),8&e)return t;if(4&e&&"object"==typeof t&&t&&t.__esModule)return t;var o=Object.create(null);if(n.r(o),Object.defineProperty(o,"default",{enumerable:!0,value:t}),2&e&&"string"!=typeof t)for(var r in t)n.d(o,r,function(e){return t[e]}.bind(null,r));return o},n.n=function(t){var e=t&&t.__esModule?function(){return t.default}:function(){return t};return n.d(e,"a",e),e},n.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},n.p="",n(n.s=0)}([function(t,e,n){"use strict";n.r(e),n.d(e,"elementsByHigherZIndex",(function(){return i})),n.d(e,"getAllElementsAbove",(function(){return m})),n.d(e,"detectAndDismissPopupCandidates",(function(){return h})),n.d(e,"elementsInFrontCount",(function(){return g}));const o=["close","dismiss","exit","not at this time","no thanks","no, thanks","i, agree","i agree"],r=[{attributeName:"className",matchFunction:s},{attributeName:"name",matchFunction:s},{attributeName:"id",matchFunction:s},{attributeName:"href",matchFunction:s},{attributeName:"innerText",matchFunction:function(t,e){const n=new RegExp(`\\b${e}\\b`);return!!t.toLowerCase().match(n)}}];function i(t){return Array.from(document.querySelectorAll("body *")).reduce((e,n)=>{const o=parseFloat(window.getComputedStyle(n).zIndex);return!Number.isNaN(o)&&o>=t&&(e.has(o)?e.get(o).push(n):e.set(o,[n])),e},new Map)}function u(t){let e=[t];return Array.from(t.children).forEach(t=>{e=e.concat(u(t))}),e}function s(t,e){return t.toLowerCase().includes(e)}function a(t){const e=[];return t.forEach(t=>{const n=[],i=[];t.elements.forEach(t=>{var e,u;(null===(e=t)||void 0===e?void 0:e.offsetParent)&&(["BUTTON","A","DIV"].includes(null===(u=t.tagName)||void 0===u?void 0:u.toUpperCase())&&function(t){let e=0;return r.forEach(n=>{o.forEach(o=>{t.getAttribute(n.attributeName)&&n.matchFunction(t.getAttribute(n.attributeName),o)&&(e+=1)})}),e}(t)&&!i.includes(t)?i.push(t):function(t){if(t.getBoundingClientRect){const e=t.getBoundingClientRect(),n=e.width/window.innerWidth,o=e.height/window.innerHeight;return n>.95&&o>.95}return!1}(t)&&n.push(t))}),e.push({zIndex:t.zIndex,actionableElements:i,domCovering:n,dismissedStatus:!1,elementsInFront:0})}),e}function c(t,e){const n=t.getBoundingClientRect(),o=n.height/2,r=e?1:n.width/2,i=new MouseEvent("click",{bubbles:!0,cancelable:!0,view:window,detail:0,screenX:n.left+r,screenY:n.top+o,clientX:t.clientLeft+r,clientY:t.clientTop+o,ctrlKey:!1,altKey:!1,shiftKey:!1,metaKey:!1,button:0,relatedTarget:void 0});t.dispatchEvent(i)}function l(t,e,n){const o=void 0!==e?e:f(t).x,r=void 0!==n?n:f(t).y,i=document.elementsFromPoint(o,r),u=i.findIndex(e=>e===t);return u?i.slice(0,u):[]}function d(t){return new Promise(e=>setTimeout(e,t))}function f(t){const e=t.getBoundingClientRect();return{x:Math.floor(e.x),y:Math.floor(e.y),top:Math.floor(e.top),bottom:Math.ceil(e.bottom),left:Math.floor(e.left),right:Math.ceil(e.right),height:Math.floor(e.bottom)-Math.ceil(e.top),width:Math.floor(e.right)-Math.ceil(e.left)}}function m(t){const e=i(function(t){const e=t=>void 0===t||"html"===t.tagName.toLowerCase();let n=t;for(;!e(n);){const e=window.getComputedStyle(t).zIndex;if(e&&"auto"!==e)return e;n=(null==n?void 0:n.parentElement)?n.parentElement:void 0}return 0}(t[t.length-1])),n=Array.from(e).map(([t,e])=>({zIndex:t,elements:e.flatMap(u).reverse()}));return n.sort((t,e)=>e.zIndex-t.zIndex),n}async function h(t){const e=f(t);try{let n=l(t,e.x,e.y);const o=n.length;if(0===o)return{elementsInFront:0,dismissedStatus:!1};const r=async function(n,r){for(const i of n)if(c(i,r),await d(750),l(t,e.x,e.y).length<o)return!0;return!1};let i=m(n);const u=a(i);for(const t of u){let e=await r(t.domCovering,!0);if(e||(e=await r(t.actionableElements,!1)),e)return{dismissedStatus:!0,elementsInFront:0}}n=l(t,e.x,e.y),i=m(n);const s=a(i),f=s.length?s[0]:{zIndex:0,elementsInFront:0,dismissedStatus:!1,domCovering:[],actionableElements:[]};return f.elementsInFront=n.length,f.dismissedStatus=!1,{dismissedStatus:f.dismissedStatus,elementsInFront:f.elementsInFront}}catch(t){return{elementsInFront:0,dismissedStatus:!1,error:t.toString()}}}function g(t){return l(t).length}}]);
+window.popupDismissal=function(t){var e={};function n(o){if(e[o])return e[o].exports;var r=e[o]={i:o,l:!1,exports:{}};return t[o].call(r.exports,r,r.exports,n),r.l=!0,r.exports}return n.m=t,n.c=e,n.d=function(t,e,o){n.o(t,e)||Object.defineProperty(t,e,{enumerable:!0,get:o})},n.r=function(t){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})},n.t=function(t,e){if(1&e&&(t=n(t)),8&e)return t;if(4&e&&"object"==typeof t&&t&&t.__esModule)return t;var o=Object.create(null);if(n.r(o),Object.defineProperty(o,"default",{enumerable:!0,value:t}),2&e&&"string"!=typeof t)for(var r in t)n.d(o,r,function(e){return t[e]}.bind(null,r));return o},n.n=function(t){var e=t&&t.__esModule?function(){return t.default}:function(){return t};return n.d(e,"a",e),e},n.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},n.p="",n(n.s=0)}([function(t,e,n){"use strict";n.r(e),n.d(e,"elementsByHigherZIndex",(function(){return i})),n.d(e,"elementsAtCoordinate",(function(){return d})),n.d(e,"getAllElementsAbove",(function(){return h})),n.d(e,"detectAndDismissPopupCandidates",(function(){return g})),n.d(e,"elementsInFrontCount",(function(){return p}));const o=["close","dismiss","exit","not at this time","no thanks","no, thanks","i, agree","i agree"],r=[{attributeName:"className",matchFunction:a},{attributeName:"name",matchFunction:a},{attributeName:"id",matchFunction:a},{attributeName:"href",matchFunction:a},{attributeName:"innerText",matchFunction:function(t,e){const n=new RegExp(`\\b${e}\\b`);return!!t.toLowerCase().match(n)}}];function i(t){return Array.from(document.querySelectorAll("body *")).reduce((e,n)=>{const o=parseFloat(window.getComputedStyle(n).zIndex);return!Number.isNaN(o)&&o>=t&&(e.has(o)?e.get(o).push(n):e.set(o,[n])),e},new Map)}function u(t){const e=t=>void 0===t||"html"===t.tagName.toLowerCase();let n=t;for(;!e(n);){const t=window.getComputedStyle(n).zIndex;if(t&&"auto"!==t)return parseInt(t,10);n=(null==n?void 0:n.parentElement)?n.parentElement:void 0}return 0}function s(t){let e=[t];return Array.from(t.children).forEach(t=>{e=e.concat(s(t))}),e}function a(t,e){return t.toLowerCase().includes(e)}function c(t){const e=[];return t.forEach(t=>{const n=[],i=[];t.elements.forEach(t=>{var e,u;(null===(e=t)||void 0===e?void 0:e.offsetParent)&&(["BUTTON","A","DIV"].includes(null===(u=t.tagName)||void 0===u?void 0:u.toUpperCase())&&function(t){let e=0;return r.forEach(n=>{o.forEach(o=>{t.getAttribute(n.attributeName)&&n.matchFunction(t.getAttribute(n.attributeName),o)&&(e+=1)})}),e}(t)&&!i.includes(t)?i.push(t):function(t){if(t.getBoundingClientRect){const e=t.getBoundingClientRect(),n=e.width/window.innerWidth,o=e.height/window.innerHeight;return n>.95&&o>.95}return!1}(t)&&n.push(t))}),e.push({zIndex:t.zIndex,actionableElements:i,domCovering:n,dismissedStatus:!1,elementsInFront:0})}),e}function l(t,e){const n=t.getBoundingClientRect(),o=n.height/2,r=e?1:n.width/2,i=new MouseEvent("click",{bubbles:!0,cancelable:!0,view:window,detail:0,screenX:n.left+r,screenY:n.top+o,clientX:t.clientLeft+r,clientY:t.clientTop+o,ctrlKey:!1,altKey:!1,shiftKey:!1,metaKey:!1,button:0,relatedTarget:void 0});t.dispatchEvent(i)}function d(t,e,n){const o=void 0!==e?e:m(t).x,r=void 0!==n?n:m(t).y,i=document.elementsFromPoint(o,r),u=i.findIndex(e=>e===t);return u?i.slice(0,u):[]}function f(t){return new Promise(e=>setTimeout(e,t))}function m(t){const e=t.getBoundingClientRect();return{x:Math.floor(e.x),y:Math.floor(e.y),top:Math.floor(e.top),bottom:Math.ceil(e.bottom),left:Math.floor(e.left),right:Math.ceil(e.right),height:Math.floor(e.bottom)-Math.ceil(e.top),width:Math.floor(e.right)-Math.ceil(e.left)}}function h(t,e){if(0===e.length)return[];const n=u(t),o=Math.min(...null==e?void 0:e.map(t=>u(t)));if(o<=n)return[];const r=i(o),a=Array.from(r).map(([t,e])=>({zIndex:t,elements:e.flatMap(s).reverse()}));return a.sort((t,e)=>e.zIndex-t.zIndex),a}async function g(t){const e=m(t);try{let n=d(t,e.x,e.y);const o=n.length;if(0===o)return{elementsInFront:0,dismissedStatus:!1};const r=async function(n,r){for(const i of n)if(l(i,r),await f(750),d(t,e.x,e.y).length<o)return!0;return!1};let i=h(t,n);const u=c(i);for(const t of u){let e=await r(t.domCovering,!0);if(e||(e=await r(t.actionableElements,!1)),e)return{dismissedStatus:!0,elementsInFront:0}}n=d(t,e.x,e.y),i=h(t,n);const s=c(i),a=s.length?s[0]:{zIndex:0,elementsInFront:0,dismissedStatus:!1,domCovering:[],actionableElements:[]};return a.elementsInFront=n.length,a.dismissedStatus=!1,{dismissedStatus:a.dismissedStatus,elementsInFront:a.elementsInFront}}catch(t){return{elementsInFront:0,dismissedStatus:!1,error:t.toString()}}}function p(t){return d(t).length}}]);

package/util/actionabilityUtil.js

@@ -29,6 +29,7 @@ const loggingProvider_1 = require("../providers/logging/loggingProvider");
 const ACTIONABILITY_CHECK_SCRIPT_LOCATION = resourceUtil_1.findResource('actionabilityCheck.js');
 const EMBEDDED_POPUP_SCRIPT_LOCATION = resourceUtil_1.findResource('popupDismissal.js');
 const NO_CLICKABLE_POINT_ERROR = 'Unable to find a clickable point for the element';
+const POPUP_ERROR_MESSAGE_HINT = 'intercepts pointer events';
 let embeddedPopupScript;
 let embeddedActionabilityLogic;
 async function checkPopupDismissalOnAction(elementHandle, action, executionContext, recheckOnFail = true) {
@@ -36,15 +37,21 @@ async function checkPopupDismissalOnAction(elementHandle, action, executionConte
         await action();
     }
     catch (error) {
-        if (error.message.includes('intercepts pointer events')) {
-            await attemptPopupDismissal(elementHandle);
+        if (error.message.includes(POPUP_ERROR_MESSAGE_HINT)) {
+            const hasPopup = await isElementWithPopup(elementHandle);
+            if (hasPopup) {
+                return;
+            }
+            const dismissalResult = await attemptPopupDismissal(elementHandle, executionContext);
             if (recheckOnFail) {
                 return checkPopupDismissalOnAction(elementHandle, action, executionContext, false);
             }
-            logUtils_1.logWebUIAndCliOutput(`Found element may not be actionable`, loggingProvider_1.LogLevel.Warn, executionContext, {
-                executionPhase: messaging_1.ExecutionPhase.DURING_ACTION,
-            });
-            logUtils_1.logInternal(`Found element might not be actionable. ${error.toString()}`);
+            if (!dismissalResult) {
+                logUtils_1.logWebUIAndCliOutput(`Found element may not be actionable`, loggingProvider_1.LogLevel.Warn, executionContext, {
+                    executionPhase: messaging_1.ExecutionPhase.DURING_ACTION,
+                });
+                logUtils_1.logInternal(`Found element might not be actionable. ${error.toString()}`);
+            }
         }
     }
 }
@@ -92,7 +99,14 @@ async function checkActionabilityAt(elementHandle, executionContext, recheckOnFa
     if (result !== 'done') {
         if (typeof result === 'object' && 'actionabilityDescription' in result) {
             logUtils_1.logInternal(`${result.actionabilityDescription} intercepts pointer events. Trying to auto-dismiss popups.`);
-            await attemptPopupDismissal(elementHandle);
+            const hasPopup = await isElementWithPopup(elementHandle);
+            if (hasPopup) {
+                return {
+                    result: 'done',
+                    clickablePoint: point,
+                };
+            }
+            await attemptPopupDismissal(elementHandle, executionContext);
             if (recheckOnFail) {
                 return checkActionabilityAt(elementHandle, executionContext, false);
             }
@@ -103,7 +117,7 @@ async function checkActionabilityAt(elementHandle, executionContext, recheckOnFa
     return { result, clickablePoint: point };
 }
 exports.checkActionabilityAt = checkActionabilityAt;
-async function attemptPopupDismissal(element) {
+async function attemptPopupDismissal(element, executionContext) {
     const frame = await element.frame();
     if (frame === undefined) {
         return false;
@@ -131,6 +145,9 @@ async function attemptPopupDismissal(element) {
             return false;
         }
     }
+    logUtils_1.logWebUIAndCliOutput(`A popup was detected and dismissed`, loggingProvider_1.LogLevel.Info, executionContext, {
+        executionPhase: messaging_1.ExecutionPhase.DURING_ACTION,
+    });
     return true;
 }
 exports.attemptPopupDismissal = attemptPopupDismissal;
@@ -159,3 +176,7 @@ function isActionabilityLogicInTarget(element) {
 function isPopupDismissalInTarget(element) {
     return element.evaluate(() => !!window.popupDismissal);
 }
+function isElementWithPopup(element) {
+    return element.evaluate((element) => element.getAttribute('aria-expanded') === 'true' &&
+        element.getAttribute('aria-haspopup') === 'true');
+}

package/util/logUtils.js

@@ -8,8 +8,8 @@ const mablscriptFind_1 = require("../mablscriptFind");
 const loggingProvider_1 = require("../providers/logging/loggingProvider");
 const moment_1 = __importDefault(require("moment"));
 const constants_1 = require("../commands/constants");
-function logInternal(logLine) {
-    loggingProvider_1.logger.debug(logLine);
+function logInternal(logLine, ...meta) {
+    loggingProvider_1.logger.debug(logLine, meta);
 }
 exports.logInternal = logInternal;
 function logCliOutput(logLevel, logLine) {