@mablhq/mabl-cli 1.12.9 → 1.12.38

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,"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: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){let e=[t];return Array.from(t.children).forEach(t=>{e=e.concat(u(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 s(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,e){const n=t=>void 0!==t&&"html"!==t.tagName.toLowerCase();let o=t;for(;!n(o);){const e=window.getComputedStyle(t).zIndex;if(e&&"auto"!==e)return e;o=(null==o?void 0:o.parentElement)?o.parentElement:void 0}return e}(t[t.length-1],0)),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{zIndex:0,elementsInFront:0,dismissedStatus:!1,domCovering:[],actionableElements:[]};const r=async function(n,r){for(const i of n)if(s(i,r),await d(750),l(t,e.x,e.y).length<o)return!0;return!1};let i=m(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 t.dismissedStatus=!0,t}n=l(t,e.x,e.y),i=m(n);const a=c(i),f=a.length?a[0]:{zIndex:0,elementsInFront:0,dismissedStatus:!1,domCovering:[],actionableElements:[]};return f.elementsInFront=n.length,f.dismissedStatus=!1,f}catch(t){return{zIndex:0,elementsInFront:0,dismissedStatus:!1,domCovering:[],actionableElements:[],errorInDetection: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,"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: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){let e=[t];return Array.from(t.children).forEach(t=>{e=e.concat(u(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 s(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{zIndex:0,elementsInFront:0,dismissedStatus:!1,domCovering:[],actionableElements:[]};const r=async function(n,r){for(const i of n)if(s(i,r),await d(750),l(t,e.x,e.y).length<o)return!0;return!1};let i=m(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 t.dismissedStatus=!0,t}n=l(t,e.x,e.y),i=m(n);const a=c(i),f=a.length?a[0]:{zIndex:0,elementsInFront:0,dismissedStatus:!1,domCovering:[],actionableElements:[]};return f.elementsInFront=n.length,f.dismissedStatus=!1,f}catch(t){return{zIndex:0,elementsInFront:0,dismissedStatus:!1,domCovering:[],actionableElements:[],errorInDetection:t.toString()}}}function g(t){return l(t).length}}]);

package/util/RichPromise.js

@@ -12,8 +12,8 @@ class RichPromise {
         });
         if (chained) {
             chained
-                .then(result => this.resolve(result))
-                .catch(reason => this.reject(reason));
+                .then((result) => this.resolve(result))
+                .catch((reason) => this.reject(reason));
         }
     }
     isPending() {

package/util/actionabilityUtil.js

@@ -19,15 +19,45 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.maybeAddPopupLogic = exports.checkActionabilityAt = void 0;
+exports.maybeAddPopupLogic = exports.checkActionabilityAt = exports.checkActionabilityAtWithRetries = void 0;
 const fs = __importStar(require("fs"));
 const resourceUtil_1 = require("./resourceUtil");
 const messaging_1 = require("../core/messaging/messaging");
+const ExecutorUtils_1 = require("../execution/actions/ExecutorUtils");
+const logUtils_1 = require("./logUtils");
+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';
 let embeddedPopupScript;
 let embeddedActionabilityLogic;
-async function checkActionabilityAt(elementHandle, point, executionContext, withRetry = true) {
+async function checkActionabilityAtWithRetries(elementHandle, executionContext, failIfClickablePointWasNotFound = true) {
+    var _a, _b, _c, _d;
+    let actionabilityResult;
+    try {
+        actionabilityResult = await ExecutorUtils_1.runWithRetries(() => checkActionabilityAt(elementHandle, executionContext), 10, [
+            'Element not at point',
+            'Element not clickable at point',
+            NO_CLICKABLE_POINT_ERROR,
+        ], executionContext);
+    }
+    catch (error) {
+        if (failIfClickablePointWasNotFound &&
+            error.message === NO_CLICKABLE_POINT_ERROR) {
+            throw new Error(NO_CLICKABLE_POINT_ERROR);
+        }
+        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 at the expected point (x: ${(_b = (_a = actionabilityResult === null || actionabilityResult === void 0 ? void 0 : actionabilityResult.clickablePoint) === null || _a === void 0 ? void 0 : _a.x) !== null && _b !== void 0 ? _b : 'Not found'}, y: ${(_d = (_c = actionabilityResult === null || actionabilityResult === void 0 ? void 0 : actionabilityResult.clickablePoint) === null || _c === void 0 ? void 0 : _c.y) !== null && _d !== void 0 ? _d : 'Not found'}), performing action anyway`);
+    }
+}
+exports.checkActionabilityAtWithRetries = checkActionabilityAtWithRetries;
+async function checkActionabilityAt(elementHandle, executionContext, recheckOnFail = true) {
+    let point = await elementHandle.clickablePoint();
+    if (point === undefined) {
+        throw new Error(NO_CLICKABLE_POINT_ERROR);
+    }
     const frame = await elementHandle.frame();
     if (frame === null || frame === void 0 ? void 0 : frame.parentFrame()) {
         const element = await frame.getFrameOwnerElement();
@@ -40,43 +70,43 @@ async function checkActionabilityAt(elementHandle, point, executionContext, with
         }
     }
     await maybeAddActionabilityLogic(elementHandle);
-    const result = await elementHandle.evaluate((node, point) => mablCheckActionability(node, point), point);
+    const result = await elementHandle.evaluate((node, point) => mablCheckActionability(node, point), { ...point });
     if (result !== 'done') {
         if (typeof result === 'object' && 'actionabilityDescription' in result) {
-            executionContext.log.info(`${result.actionabilityDescription} intercepts pointer events. Trying to auto-dismiss popups.`, { executionPhase: messaging_1.ExecutionPhase.DURING_ACTION });
-            await attemptPopupDismissal(elementHandle, executionContext.log);
-            if (withRetry) {
-                return checkActionabilityAt(elementHandle, point, executionContext, false);
+            logUtils_1.logInternal(`${result.actionabilityDescription} intercepts pointer events. Trying to auto-dismiss popups.`);
+            await attemptPopupDismissal(elementHandle);
+            if (recheckOnFail) {
+                return checkActionabilityAt(elementHandle, executionContext, false);
             }
             throw new Error(`Element not clickable at point.`);
         }
         throw new Error(`Element not at point. ${result}`);
     }
-    return result;
+    return { result, clickablePoint: point };
 }
 exports.checkActionabilityAt = checkActionabilityAt;
-async function attemptPopupDismissal(element, logger) {
+async function attemptPopupDismissal(element) {
     const frame = await element.frame();
     if (frame === undefined) {
         return false;
     }
     await maybeAddPopupLogic(element);
-    const { dismissedStatus, elementsInFront } = await element.evaluate(element => window.popupDismissal.detectAndDismissPopupCandidates(element));
+    const { dismissedStatus, elementsInFront } = await element.evaluate((element) => window.popupDismissal.detectAndDismissPopupCandidates(element));
     if (!dismissedStatus) {
         if (elementsInFront) {
-            logger.info('Failed to auto dismiss and there are still elements in front. Sending escape key to body.');
+            logUtils_1.logInternal('Failed to auto dismiss and there are still elements in front. Sending escape key to body.');
             const bodyElement = await frame.$('BODY');
             if (bodyElement) {
                 await bodyElement.press('Escape');
             }
-            const elementsInFront = await element.evaluate(element => window.popupDismissal.elementsInFrontCount(element));
+            const elementsInFront = await element.evaluate((element) => window.popupDismissal.elementsInFrontCount(element));
             if (elementsInFront) {
-                logger.info('The popup did not dismiss using the escape key.');
+                logUtils_1.logInternal('The popup did not dismiss using the escape key.');
                 return false;
             }
         }
         else {
-            logger.info('Failed to auto dismiss. No elements found in front of target element.');
+            logUtils_1.logInternal('Failed to auto dismiss. No elements found in front of target element.');
             return false;
         }
     }

package/util/downloadUtil.js

@@ -54,7 +54,7 @@ async function getLatestFile(downloadDirectory, filePathSuffix) {
     const filesInDownloadDir = await readDirectoryAsync(downloadDirectory);
     let latestFileTime = 0;
     let latestFilePath;
-    filesInDownloadDir.forEach(fileName => {
+    filesInDownloadDir.forEach((fileName) => {
         const fullPath = `${downloadDirectory}/${fileName}`;
         try {
             const stats = fs.statSync(path.normalize(fullPath));

package/util/logUtils.js

@@ -1,8 +1,13 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.logWebUIAndCliOutput = exports.findResultSeverityToLogLevel = exports.logCliOutput = exports.logInternal = void 0;
+exports.formatTimestamp = exports.valueToString = exports.logWebUIAndCliOutput = exports.findResultSeverityToLogLevel = exports.logCliOutput = exports.logInternal = void 0;
 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);
 }
@@ -55,3 +60,17 @@ function logWebUIAndCliOutput(logLine, logLevel, executionContext, metadata) {
     }
 }
 exports.logWebUIAndCliOutput = logWebUIAndCliOutput;
+function valueToString(value) {
+    if (typeof value !== 'object') {
+        return '' + value;
+    }
+    return JSON.stringify(value);
+}
+exports.valueToString = valueToString;
+function formatTimestamp(timeAsNumber) {
+    if (!timeAsNumber) {
+        return '';
+    }
+    return moment_1.default.utc(timeAsNumber).format(constants_1.ListTimeFormat);
+}
+exports.formatTimestamp = formatTimestamp;

package/util/markdownUtil.js

@@ -19,7 +19,7 @@ function formatResultsAsGithubMarkdown(results) {
     const tableRows = [];
     tableRows.push(['Plan', 'Test', 'Browser', 'Status', 'Run Time']);
     const finalExecutions = (_a = results === null || results === void 0 ? void 0 : results.executions) !== null && _a !== void 0 ? _a : [];
-    finalExecutions.forEach(summary => {
+    finalExecutions.forEach((summary) => {
         var _a, _b, _c, _d, _e, _f, _g;
         const retryPrefix = ((_a = summary === null || summary === void 0 ? void 0 : summary.plan_execution) === null || _a === void 0 ? void 0 : _a.is_retry) ? '[Retry] ' : '';
         const planName = retryPrefix + ((_c = (_b = summary.plan) === null || _b === void 0 ? void 0 : _b.name) !== null && _c !== void 0 ? _c : '<plan name unavailable>');
@@ -29,7 +29,7 @@ function formatResultsAsGithubMarkdown(results) {
             maybeCapitalize(humanizedPlanRunStatus === null || humanizedPlanRunStatus === void 0 ? void 0 : humanizedPlanRunStatus.toString());
         const planHref = (_e = summary.plan) === null || _e === void 0 ? void 0 : _e.app_href;
         const journeyMap = new Map();
-        (_f = summary.journeys) === null || _f === void 0 ? void 0 : _f.forEach(journeySummary => journeyMap.set(journeySummary.id, journeySummary));
+        (_f = summary.journeys) === null || _f === void 0 ? void 0 : _f.forEach((journeySummary) => journeyMap.set(journeySummary.id, journeySummary));
         tableRows.push([
             `[${planName}](${planHref})`,
             '---',
@@ -37,7 +37,7 @@ function formatResultsAsGithubMarkdown(results) {
             planRunStatus,
             summaryToElapsedTime(summary),
         ]);
-        (_g = summary.journey_executions) === null || _g === void 0 ? void 0 : _g.forEach(journeyRun => {
+        (_g = summary.journey_executions) === null || _g === void 0 ? void 0 : _g.forEach((journeyRun) => {
             const humanizedJourneyRunStatus = humanizeMablStatus(journeyRun.status);
             const journeyStatus = humanizedMablStatusToGithubIcon(humanizedJourneyRunStatus) +
                 ' ' +

package/util/pureUtil.js

@@ -32,8 +32,8 @@ function getCliPackage() {
         return cliPackage;
     }
     const packagePath = possibleCliPackagePaths
-        .map(relativePath => path.resolve(__dirname, relativePath))
-        .find(path => fs.existsSync(path));
+        .map((relativePath) => path.resolve(__dirname, relativePath))
+        .find((path) => fs.existsSync(path));
     if (!packagePath) {
         throw new Error('Cannot find package.json');
     }
@@ -82,10 +82,10 @@ exports.getCliName = getCliName;
 function extractKeyCountsFromArgs(argv) {
     const ignoreKeys = ['$0', '_'];
     const keysUsed = Object.keys(argv)
-        .filter(key => !ignoreKeys.includes(key))
-        .filter(key => !/[A-Z]/.test(key));
+        .filter((key) => !ignoreKeys.includes(key))
+        .filter((key) => !/[A-Z]/.test(key));
     const keyValueCountMap = {};
-    keysUsed.forEach(key => {
+    keysUsed.forEach((key) => {
         const value = argv[key];
         let count;
         if (value === undefined || value === null) {
@@ -118,7 +118,7 @@ function extractKeyCountsFromArgs(argv) {
 }
 exports.extractKeyCountsFromArgs = extractKeyCountsFromArgs;
 function getCaseInsensitiveProperty(obj, key) {
-    const keyInObject = Object.keys(obj).find(k => k.toLowerCase() === key.toLowerCase());
+    const keyInObject = Object.keys(obj).find((k) => k.toLowerCase() === key.toLowerCase());
     if (keyInObject !== undefined) {
         return obj[keyInObject];
     }

package/util/resourceUtil.js

@@ -19,7 +19,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findDirectory = exports.findResource = void 0;
+exports.findNodeModulesDirectory = exports.findDirectory = exports.findResource = void 0;
 const path = __importStar(require("path"));
 const fs = __importStar(require("fs"));
 function findResource(pathInResource) {
@@ -40,3 +40,16 @@ function findDirectory(pathFromBase) {
     return packedPath;
 }
 exports.findDirectory = findDirectory;
+function findNodeModulesDirectory() {
+    const unpackedPath = path.normalize(path.resolve(`${__dirname}/../../../node_modules`));
+    if (fs.existsSync(unpackedPath)) {
+        return unpackedPath;
+    }
+    const packedAsMabltronDependency = path.normalize(path.resolve(`${__dirname}/../../mabl-cli-internal/node_modules/`));
+    if (fs.existsSync(packedAsMabltronDependency)) {
+        return packedAsMabltronDependency;
+    }
+    const packedPath = path.normalize(path.resolve(`${__dirname}/../../node_modules`));
+    return packedPath;
+}
+exports.findNodeModulesDirectory = findNodeModulesDirectory;

package/core/trainer/trainerBrowserUtil.js

@@ -1,33 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.addClosedAllWindowsEventWatch = exports.addManualCloseEventWatch = void 0;
-const messaging_1 = require("../messaging/messaging");
-const testsUtil_1 = require("../../commands/tests/testsUtil");
-const browserLauncher_1 = require("../../browserLauncher/browserLauncher");
-function addManualCloseEventWatch(trainingBrowser, closeAction) {
-    trainingBrowser.on(browserLauncher_1.BrowserEvent.Disconnected, async () => {
-        await testsUtil_1.sleep(1000);
-        if (closeAction) {
-            closeAction();
-        }
-        trainingBrowser
-            .close()
-            .catch(error => messaging_1.mablEventEmitter.log('Error shutting down browser on manual close' + error));
-    });
-}
-exports.addManualCloseEventWatch = addManualCloseEventWatch;
-function addClosedAllWindowsEventWatch(trainingBrowser, closeAction) {
-    trainingBrowser.on(browserLauncher_1.BrowserEvent.PageDestroyed, async () => {
-        const pages = await trainingBrowser.pages();
-        if (pages.length === 0) {
-            await testsUtil_1.sleep(1000);
-            if (closeAction) {
-                closeAction();
-            }
-            trainingBrowser
-                .close()
-                .catch(error => messaging_1.mablEventEmitter.log('Error shutting down browser on manual close' + error));
-        }
-    });
-}
-exports.addClosedAllWindowsEventWatch = addClosedAllWindowsEventWatch;