@mablhq/mabl-cli 1.12.24 → 1.12.33

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

@@ -41,7 +41,9 @@ async function checkActionabilityAtWithRetries(elementHandle, executionContext,
         if (failIfClickablePointWasNotFound && error === NO_CLICKABLE_POINT_ERROR) {
             throw new Error('Unable to find a clickable point for the element');
         }
-        logUtils_1.logWebUIAndCliOutput(`Found element may not be actionable`, loggingProvider_1.LogLevel.Warn, executionContext, { executionPhase: messaging_1.ExecutionPhase.DURING_ACTION });
+        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`);
     }
 }
@@ -84,7 +86,7 @@ async function attemptPopupDismissal(element) {
         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) {
             logUtils_1.logInternal('Failed to auto dismiss and there are still elements in front. Sending escape key to body.');
@@ -92,7 +94,7 @@ async function attemptPopupDismissal(element) {
             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) {
                 logUtils_1.logInternal('The popup did not dismiss using the escape key.');
                 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;