@mablhq/mabl-cli 1.48.26 → 1.48.35

package/mablscript/importer.js

@@ -52,6 +52,7 @@ const CountAction_1 = require("./actions/CountAction");
 const AccessibilityCheck_1 = require("./steps/AccessibilityCheck");
 const EvaluateFlowStep_1 = require("./steps/EvaluateFlowStep");
 const RightClickStep_1 = require("./steps/RightClickStep");
+const EnterAuthCodeStep_1 = require("./steps/EnterAuthCodeStep");
 const ActionTypes = [
     AwaitDownloadAction_1.AwaitDownloadAction,
     AwaitPDFDownloadAction_1.AwaitPDFDownloadAction,
@@ -81,6 +82,7 @@ const StepTypes = [
     ElseStep_1.ElseStep,
     ElseIfConditionStep_1.ElseIfConditionStep,
     EndStep_1.EndStep,
+    EnterAuthCodeStep_1.EnterAuthCodeStep,
     EnterTextStep_1.EnterTextStep,
     EvaluateFlowStep_1.EvaluateFlowStep,
     HoverStep_1.HoverStep,

package/mablscript/steps/EnterAuthCodeStep.js

@@ -0,0 +1,51 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EnterAuthCodeStep = void 0;
+const FindAction_1 = require("../actions/FindAction");
+const MablStep_1 = require("../MablStep");
+const domUtil_1 = require("../../domUtil");
+const ActionsUtils_1 = require("./ActionsUtils");
+class EnterAuthCodeStep extends MablStep_1.MablStep {
+    constructor(name, args, actions) {
+        super(name, args, actions);
+        this.findAction = ActionsUtils_1.ActionsUtils.validateSingleFindAction(this.actions);
+    }
+    getStepName() {
+        return 'EnterAuthCode';
+    }
+    toStepDescriptor() {
+        const find = this.findAction.toDescriptor();
+        switch (find.findType) {
+            case domUtil_1.FindType.FIND_FIRST:
+            case domUtil_1.FindType.FIND_LAST:
+            case domUtil_1.FindType.FIND_ANY:
+            case domUtil_1.FindType.FIND_ONE:
+                return {
+                    find,
+                    descriptorToActionMap: new Map().set(find, this.findAction),
+                };
+            default:
+                throw new Error(`Error generating step descriptor for ${this.getStepName()}: Unexpected find type ${find.findType}`);
+        }
+    }
+    getFormattedStep(_fullLocatorsOn) {
+        return {
+            EnterAuthCode: {
+                ...super.annotationsAsYml(),
+                ...this.findAction.toYaml(),
+            },
+        };
+    }
+    static fromYaml(_stepName, stepArgs) {
+        return new EnterAuthCodeStep('enter_auth_code', [], [FindAction_1.FindAction.findActionFromStepArgs(stepArgs)]);
+    }
+    toMablscript() {
+        return `${this.findAction.toMablscript()}.enter_auth_code()`;
+    }
+    getInputVariables() {
+        return this.findAction.getInputVariables();
+    }
+}
+exports.EnterAuthCodeStep = EnterAuthCodeStep;
+EnterAuthCodeStep.mablScriptStepNames = ['enter_auth_code'];
+EnterAuthCodeStep.yamlMablScriptNames = ['EnterAuthCode'];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mablhq/mabl-cli",
-  "version": "1.48.26",
+  "version": "1.48.35",
   "license": "SEE LICENSE IN LICENSE.txt",
   "description": "The official mabl command line interface tool",
   "main": "index.js",
@@ -21,7 +21,7 @@
   },
   "dependencies": {
     "@mablhq/newman-reporter-mabl-console": "0.1.0",
-    "@playwright/test": "1.29.2",
+    "@playwright/test": "1.30.0",
     "@types/fs-extra": "8.1.1",
     "@types/serve-handler": "6.1.0",
     "@types/tmp": "0.2.0",
@@ -69,7 +69,7 @@
     "newman": "5.3.2",
     "open": "6.4.0",
     "ora": "4.0.4",
-    "playwright-core": "1.29.2",
+    "playwright-core": "1.30.0",
     "pluralize": "8.0.0",
     "pngjs": "6.0.0",
     "portfinder": "1.0.28",

package/popupDismissal/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.elementsInFrontCount = exports.detectAndDismissPopupCandidates = exports.getAllElementsAbove = exports.elementsAtCoordinate = exports.fireRightClickEvent = exports.fireClickEvent = exports.fireDoubleClickEvent = exports.elementsByHigherZIndex = void 0;
+exports.elementsInFrontCount = exports.detectAndDismissPopupCandidates = exports.getAllElementsAbove = exports.getOverlappingElements = exports.fireRightClickEvent = exports.fireClickEvent = exports.fireDoubleClickEvent = exports.elementsByHigherZIndex = void 0;
 const DISMISSAL_WAIT_TIME_MS = 750;
 const ZINDEX_AUTO = 'auto';
 const MINIMUM_POPUP_DISPLAY_COVERAGE_PX = 0.95;
@@ -150,14 +150,19 @@ function fireRightClickEvent(targetElement, leftEdgeClick = false) {
     dispatchMouseEvent(targetElement, 'contextmenu', leftEdgeClick);
 }
 exports.fireRightClickEvent = fireRightClickEvent;
-function elementsAtCoordinate(element, pointX, pointY) {
-    const x = pointX !== undefined ? pointX : element.getBoundingClientRect().x;
-    const y = pointY !== undefined ? pointY : element.getBoundingClientRect().y;
+function getCenterCoordinates(rect) {
+    return {
+        x: rect.left + rect.width / 2,
+        y: rect.top + rect.height / 2,
+    };
+}
+function getOverlappingElements(element) {
+    const { x, y } = getCenterCoordinates(element.getBoundingClientRect());
     const elementsAtPoint = document.elementsFromPoint(x, y);
     const targetIndex = elementsAtPoint.findIndex((iterElement) => iterElement === element);
     return targetIndex ? elementsAtPoint.slice(0, targetIndex) : [];
 }
-exports.elementsAtCoordinate = elementsAtCoordinate;
+exports.getOverlappingElements = getOverlappingElements;
 function sleep(time) {
     return new Promise((resolve) => setTimeout(resolve, time));
 }
@@ -182,9 +187,8 @@ function getAllElementsAbove(targetElement, elements) {
 }
 exports.getAllElementsAbove = getAllElementsAbove;
 async function detectAndDismissPopupCandidates(element) {
-    const elementBoundingBox = element.getBoundingClientRect();
     try {
-        let higherElements = elementsAtCoordinate(element, elementBoundingBox.x, elementBoundingBox.y);
+        let higherElements = getOverlappingElements(element);
         const elementsInFrontCount = higherElements.length;
         if (elementsInFrontCount === 0) {
             return {
@@ -196,7 +200,7 @@ async function detectAndDismissPopupCandidates(element) {
             for (const candidate of candidates) {
                 fireClickEvent(candidate, leftEdgeClick);
                 await sleep(DISMISSAL_WAIT_TIME_MS);
-                if (elementsAtCoordinate(element, elementBoundingBox.x, elementBoundingBox.y).length < elementsInFrontCount) {
+                if (getOverlappingElements(element).length < elementsInFrontCount) {
                     return true;
                 }
             }
@@ -216,7 +220,7 @@ async function detectAndDismissPopupCandidates(element) {
                 };
             }
         }
-        higherElements = elementsAtCoordinate(element, elementBoundingBox.x, elementBoundingBox.y);
+        higherElements = getOverlappingElements(element);
         allElements = getAllElementsAbove(element, higherElements);
         const candidates = developCloseCandidates(allElements);
         const result = candidates.length
@@ -245,6 +249,6 @@ async function detectAndDismissPopupCandidates(element) {
 }
 exports.detectAndDismissPopupCandidates = detectAndDismissPopupCandidates;
 function elementsInFrontCount(element) {
-    return elementsAtCoordinate(element).length;
+    return getOverlappingElements(element).length;
 }
 exports.elementsInFrontCount = elementsInFrontCount;

package/resources/popupDismissal.js

@@ -1 +1 @@
-window.popupDismissal=function(t){var e={};function n(r){if(e[r])return e[r].exports;var o=e[r]={i:r,l:!1,exports:{}};return t[r].call(o.exports,o,o.exports,n),o.l=!0,o.exports}return n.m=t,n.c=e,n.d=function(t,e,r){n.o(t,e)||Object.defineProperty(t,e,{enumerable:!0,get:r})},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 r=Object.create(null);if(n.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:t}),2&e&&"string"!=typeof t)for(var o in t)n.d(r,o,function(e){return t[e]}.bind(null,o));return r},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,"fireDoubleClickEvent",(function(){return d})),n.d(e,"fireClickEvent",(function(){return f})),n.d(e,"fireRightClickEvent",(function(){return m})),n.d(e,"elementsAtCoordinate",(function(){return g})),n.d(e,"getAllElementsAbove",(function(){return b})),n.d(e,"detectAndDismissPopupCandidates",(function(){return p})),n.d(e,"elementsInFrontCount",(function(){return y}));const r=["close","dismiss","exit","not at this time","no thanks","no, thanks","i, agree","i agree"],o=[{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 r=parseFloat(globalThis.getComputedStyle(n).zIndex);return!Number.isNaN(r)&&r>=t&&(e.has(r)?e.get(r).push(n):e.set(r,[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=globalThis.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 c(t){let e=[t];return Array.from(t.children).forEach(t=>{e=e.concat(c(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;(null==t?void 0:t.offsetParent)&&(["BUTTON","A","DIV"].includes(null===(e=t.tagName)||void 0===e?void 0:e.toUpperCase())&&function(t){let e=0;return o.forEach(n=>{r.forEach(r=>{t.getAttribute(n.attributeName)&&n.matchFunction(t.getAttribute(n.attributeName),r)&&(e+=1)})}),e}(t)&&!i.includes(t)?i.push(t):function(t){if(t.getBoundingClientRect){const e=t.getBoundingClientRect(),n=e.width/globalThis.innerWidth,r=e.height/globalThis.innerHeight;return n>.95&&r>.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,n=!1){const r=t.getBoundingClientRect(),o=r.height/2,i=n?1:r.width/2,u="contextmenu"===e?2:0,c=new MouseEvent(e,{bubbles:!0,cancelable:!0,view:window,detail:0,screenX:r.left+i,screenY:r.top+o,clientX:t.clientLeft+i,clientY:t.clientTop+o,ctrlKey:!1,altKey:!1,shiftKey:!1,metaKey:!1,button:u,relatedTarget:void 0});t.dispatchEvent(c)}function d(t){f(t,!1),f(t,!1),l(t,"dblclick")}function f(t,e=!1){l(t,"click",e)}function m(t,e=!1){l(t,"contextmenu",e)}function g(t,e,n){const r=void 0!==e?e:t.getBoundingClientRect().x,o=void 0!==n?n:t.getBoundingClientRect().y,i=document.elementsFromPoint(r,o),u=i.findIndex(e=>e===t);return u?i.slice(0,u):[]}function h(t){return new Promise(e=>setTimeout(e,t))}function b(t,e){if(0===e.length)return[];const n=u(t),r=Math.min(...null==e?void 0:e.map(t=>u(t)));if(r<=n)return[];const o=i(r),s=Array.from(o).map(([t,e])=>({zIndex:t,elements:e.flatMap(c).reverse()}));return s.sort((t,e)=>e.zIndex-t.zIndex),s}async function p(t){const e=t.getBoundingClientRect();try{let n=g(t,e.x,e.y);const r=n.length;if(0===r)return{elementsInFront:0,dismissedStatus:!1};const o=async function(n,o){for(const i of n)if(f(i,o),await h(750),g(t,e.x,e.y).length<r)return!0;return!1};let i=b(t,n);const u=a(i);for(const t of u){let e=await o(t.domCovering,!0);if(e||(e=await o(t.actionableElements,!1)),e)return{dismissedStatus:!0,elementsInFront:0}}n=g(t,e.x,e.y),i=b(t,n);const c=a(i),s=c.length?c[0]:{zIndex:0,elementsInFront:0,dismissedStatus:!1,domCovering:[],actionableElements:[]};return s.elementsInFront=n.length,s.dismissedStatus=!1,{dismissedStatus:s.dismissedStatus,elementsInFront:s.elementsInFront}}catch(t){return{elementsInFront:0,dismissedStatus:!1,error:t.toString()}}}function y(t){return g(t).length}}]);
+window.popupDismissal=function(t){var e={};function n(r){if(e[r])return e[r].exports;var o=e[r]={i:r,l:!1,exports:{}};return t[r].call(o.exports,o,o.exports,n),o.l=!0,o.exports}return n.m=t,n.c=e,n.d=function(t,e,r){n.o(t,e)||Object.defineProperty(t,e,{enumerable:!0,get:r})},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 r=Object.create(null);if(n.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:t}),2&e&&"string"!=typeof t)for(var o in t)n.d(r,o,function(e){return t[e]}.bind(null,o));return r},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,"fireDoubleClickEvent",(function(){return d})),n.d(e,"fireClickEvent",(function(){return f})),n.d(e,"fireRightClickEvent",(function(){return m})),n.d(e,"getOverlappingElements",(function(){return h})),n.d(e,"getAllElementsAbove",(function(){return p})),n.d(e,"detectAndDismissPopupCandidates",(function(){return b})),n.d(e,"elementsInFrontCount",(function(){return v}));const r=["close","dismiss","exit","not at this time","no thanks","no, thanks","i, agree","i agree"],o=[{attributeName:"className",matchFunction:c},{attributeName:"name",matchFunction:c},{attributeName:"id",matchFunction:c},{attributeName:"href",matchFunction:c},{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 r=parseFloat(globalThis.getComputedStyle(n).zIndex);return!Number.isNaN(r)&&r>=t&&(e.has(r)?e.get(r).push(n):e.set(r,[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=globalThis.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 c(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;(null==t?void 0:t.offsetParent)&&(["BUTTON","A","DIV"].includes(null===(e=t.tagName)||void 0===e?void 0:e.toUpperCase())&&function(t){let e=0;return o.forEach(n=>{r.forEach(r=>{t.getAttribute(n.attributeName)&&n.matchFunction(t.getAttribute(n.attributeName),r)&&(e+=1)})}),e}(t)&&!i.includes(t)?i.push(t):function(t){if(t.getBoundingClientRect){const e=t.getBoundingClientRect(),n=e.width/globalThis.innerWidth,r=e.height/globalThis.innerHeight;return n>.95&&r>.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,n=!1){const r=t.getBoundingClientRect(),o=r.height/2,i=n?1:r.width/2,u="contextmenu"===e?2:0,s=new MouseEvent(e,{bubbles:!0,cancelable:!0,view:window,detail:0,screenX:r.left+i,screenY:r.top+o,clientX:t.clientLeft+i,clientY:t.clientTop+o,ctrlKey:!1,altKey:!1,shiftKey:!1,metaKey:!1,button:u,relatedTarget:void 0});t.dispatchEvent(s)}function d(t){f(t,!1),f(t,!1),l(t,"dblclick")}function f(t,e=!1){l(t,"click",e)}function m(t,e=!1){l(t,"contextmenu",e)}function h(t){const{x:e,y:n}={x:(r=t.getBoundingClientRect()).left+r.width/2,y:r.top+r.height/2};var r;const o=document.elementsFromPoint(e,n),i=o.findIndex(e=>e===t);return i?o.slice(0,i):[]}function g(t){return new Promise(e=>setTimeout(e,t))}function p(t,e){if(0===e.length)return[];const n=u(t),r=Math.min(...null==e?void 0:e.map(t=>u(t)));if(r<=n)return[];const o=i(r),c=Array.from(o).map(([t,e])=>({zIndex:t,elements:e.flatMap(s).reverse()}));return c.sort((t,e)=>e.zIndex-t.zIndex),c}async function b(t){try{let e=h(t);const n=e.length;if(0===n)return{elementsInFront:0,dismissedStatus:!1};const r=async function(e,r){for(const o of e)if(f(o,r),await g(750),h(t).length<n)return!0;return!1};let o=p(t,e);const i=a(o);for(const t of i){let e=await r(t.domCovering,!0);if(e||(e=await r(t.actionableElements,!1)),e)return{dismissedStatus:!0,elementsInFront:0}}e=h(t),o=p(t,e);const u=a(o),s=u.length?u[0]:{zIndex:0,elementsInFront:0,dismissedStatus:!1,domCovering:[],actionableElements:[]};return s.elementsInFront=e.length,s.dismissedStatus=!1,{dismissedStatus:s.dismissedStatus,elementsInFront:s.elementsInFront}}catch(t){return{elementsInFront:0,dismissedStatus:!1,error:t.toString()}}}function v(t){return h(t).length}}]);