@mablhq/mabl-cli 2.5.2 → 2.6.7

package/mablscript/importer.js

@@ -63,6 +63,7 @@ const NavigateHomeStep_1 = require("./mobile/steps/NavigateHomeStep");
 const CreateVariableStepDescriptor_1 = require("./types/CreateVariableStepDescriptor");
 const JavaScriptDescriptor_1 = require("./types/JavaScriptDescriptor");
 const MablStepV2_1 = require("./MablStepV2");
+const PushFileStep_1 = require("./mobile/steps/PushFileStep");
 const ActionTypes = [
     AwaitDownloadAction_1.AwaitDownloadAction,
     AwaitPDFDownloadAction_1.AwaitPDFDownloadAction,
@@ -122,6 +123,7 @@ const MobileStepTypes = [
     EnterTextStep_2.EnterTextStep,
     SetOrientationStep_1.SetOrientationStep,
     ScrollStep_1.ScrollStep,
+    PushFileStep_1.PushFileStep,
 ];
 const SyntheticActionCodes = [
     'autologin',

package/mablscript/mobile/steps/PushFileStep.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PushFileStep = void 0;
+const MablStepV2_1 = require("../../MablStepV2");
+class PushFileStep extends MablStepV2_1.MablStepV2 {
+    constructor(descriptor) {
+        super(PushFileStep.stepName, descriptor, PushFileStep.stepName);
+    }
+    stepDescription() {
+        const filesLength = this.descriptor.files.length;
+        if (filesLength > 1) {
+            return `Push ${filesLength} files to the test device`;
+        }
+        const firstFile = this.descriptor.files[0];
+        if (firstFile.file.name) {
+            return `Push the file "${firstFile.file.name}" to the test device at path "${firstFile.path}"`;
+        }
+        return `Push file to the test device at path "${firstFile.path}"`;
+    }
+    static fromYaml(_stepName, stepDescriptor) {
+        return new PushFileStep(stepDescriptor);
+    }
+}
+exports.PushFileStep = PushFileStep;
+PushFileStep.stepName = 'PushFile';
+PushFileStep.yamlMablScriptNames = [PushFileStep.stepName];
+PushFileStep.stepVersion = 2;

package/mablscript/mobile/tests/steps/PushFileStep.mobiletest.js

@@ -0,0 +1,55 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const StepTestsUtil_1 = require("../StepTestsUtil");
+const PushFileStep_1 = require("../../steps/PushFileStep");
+describe('Push File steps parse correctly', () => {
+    it('Parses a PushFile step', () => {
+        const pushFileDescriptor = {
+            id: 'pushItRealGood',
+            files: [
+                {
+                    file: {
+                        id: 'id-1',
+                        name: 'candy1.jpeg',
+                    },
+                    path: '@mabl.sandbox:documents/Presentation.key',
+                },
+            ],
+        };
+        const steps = [
+            {
+                PushFile: pushFileDescriptor,
+            },
+        ];
+        (0, StepTestsUtil_1.parseAndValidateYamlConversion)(steps, PushFileStep_1.PushFileStep.stepName, pushFileDescriptor);
+        const pushFileStep = new PushFileStep_1.PushFileStep(pushFileDescriptor);
+        expect(pushFileStep.stepId()).toEqual(pushFileDescriptor.id);
+        const stepDescription = pushFileStep.stepDescription();
+        expect(stepDescription).toEqual(`Push the file \"candy1.jpeg\" to the test device at path \"@mabl.sandbox:documents/Presentation.key\"`);
+    });
+    it('Humanizes a push file step with multiple files', () => {
+        const pushFileDescriptor = {
+            id: 'pushItRealGood',
+            files: [
+                {
+                    file: {
+                        id: 'id-1',
+                        name: 'candy1.jpeg',
+                    },
+                    path: '@mabl.sandbox:documents/Presentation.key',
+                },
+                {
+                    file: {
+                        id: 'id-2',
+                        name: 'candy2.jpeg',
+                    },
+                    path: '@mabl.sandbox:documents/Presentations.key',
+                },
+            ],
+        };
+        const pushFileStep = new PushFileStep_1.PushFileStep(pushFileDescriptor);
+        expect(pushFileStep.stepId()).toEqual(pushFileDescriptor.id);
+        const stepDescription = pushFileStep.stepDescription();
+        expect(stepDescription).toEqual(`Push 2 files to the test device`);
+    });
+});

package/mablscript/types/mobile/PushFileDescriptor.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mablhq/mabl-cli",
-  "version": "2.5.2",
+  "version": "2.6.7",
   "license": "SEE LICENSE IN LICENSE.txt",
   "description": "The official mabl command line interface tool",
   "main": "index.js",
@@ -75,7 +75,7 @@
     "newman": "5.3.2",
     "open": "6.4.0",
     "ora": "4.0.4",
-    "playwright": "1.39.0",
+    "playwright": "1.40.0",
     "pluralize": "8.0.0",
     "pngjs": "6.0.0",
     "portfinder": "1.0.28",

package/util/asyncUtil.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.filterAsync = exports.mapAsync = exports.TimeoutError = exports.promiseWithTimeout = void 0;
+exports.filterAsync = exports.TimeoutError = exports.promiseWithTimeout = void 0;
 const loggingProvider_1 = require("../providers/logging/loggingProvider");
+const pureUtil_1 = require("./pureUtil");
+const logUtils_1 = require("./logUtils");
 async function promiseWithTimeout(promise, timeoutMillis, description, timeoutType = 'mabl timeout', printToConsole = true) {
     const startTimeMillis = new Date().getTime();
     const { timer, cancelTimer, errorMessage } = startTimer(timeoutMillis, description, timeoutType);
@@ -48,12 +50,12 @@ const startTimer = (timeoutMillis, description, timeoutType) => {
         errorMessage: timeoutError.message,
     };
 };
-function mapAsync(array, callback) {
-    return Promise.all(array.map(callback));
-}
-exports.mapAsync = mapAsync;
 async function filterAsync(array, callback) {
-    const filterMap = await mapAsync(array, callback);
-    return array.filter((_, index) => filterMap[index]);
+    const results = await Promise.allSettled(array.map(callback));
+    (0, logUtils_1.logPromiseSettledRejections)(results);
+    return array.filter((_, index) => {
+        const result = results[index];
+        return (0, pureUtil_1.isFulfilledPromise)(result) && result.value;
+    });
 }
 exports.filterAsync = filterAsync;

package/util/logUtils.js

@@ -3,11 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.logPromiseSettledRejections = exports.logErrorVerbose = exports.formatTimestamp = exports.valueToString = exports.logWebUIAndCliOutput = exports.logWebUI = exports.findResultSeverityToLogLevel = exports.logCliOutput = exports.logInternal = void 0;
+exports.getPromiseSettledValues = exports.logPromiseSettledRejections = exports.logErrorVerbose = exports.formatTimestamp = exports.valueToString = exports.logWebUIAndCliOutput = exports.logWebUI = 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");
+const pureUtil_1 = require("./pureUtil");
 function logInternal(logLine, ...meta) {
     loggingProvider_1.logger.debug(logLine, meta);
 }
@@ -89,13 +90,18 @@ function logErrorVerbose(error, context) {
     }
 }
 exports.logErrorVerbose = logErrorVerbose;
-function logPromiseSettledRejections(promises) {
+function logPromiseSettledRejections(promises, reThrow = false) {
     promises
-        .filter((promise) => promise.status === 'rejected')
-        .forEach((promise) => {
-        if ('reason' in promise) {
-            logErrorVerbose(promise.reason);
-        }
-    });
+        .filter(pureUtil_1.isRejectedPromise)
+        .forEach((promise) => logErrorVerbose(promise.reason));
+    const findRejectedPromise = promises.find(pureUtil_1.isRejectedPromise);
+    if (findRejectedPromise && reThrow) {
+        throw findRejectedPromise.reason;
+    }
 }
 exports.logPromiseSettledRejections = logPromiseSettledRejections;
+function getPromiseSettledValues(promises, reThrow = false) {
+    logPromiseSettledRejections(promises, reThrow);
+    return promises.filter(pureUtil_1.isFulfilledPromise).map((promise) => promise.value);
+}
+exports.getPromiseSettledValues = getPromiseSettledValues;

package/util/pureUtil.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCaseInsensitiveProperty = exports.extractKeyCountsFromArgs = exports.getCliName = exports.getCliVersion = exports.stringifyIfPresent = exports.stringify = exports.isWholeNumber = exports.isString = exports.isNullish = exports.isDefined = void 0;
+exports.getCaseInsensitiveProperty = exports.extractKeyCountsFromArgs = exports.getCliName = exports.getCliVersion = exports.stringifyIfPresent = exports.stringify = exports.isRejectedPromise = exports.isFulfilledPromise = exports.isWholeNumber = exports.isString = exports.isNullish = exports.isDefined = void 0;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const possibleCliPackagePaths = Object.freeze([
@@ -65,6 +65,14 @@ function isWholeNumber(value) {
     return parsed - Math.floor(parsed) === 0;
 }
 exports.isWholeNumber = isWholeNumber;
+function isFulfilledPromise(settledPromise) {
+    return settledPromise.status === 'fulfilled';
+}
+exports.isFulfilledPromise = isFulfilledPromise;
+function isRejectedPromise(settledPromise) {
+    return settledPromise.status === 'rejected';
+}
+exports.isRejectedPromise = isRejectedPromise;
 function stringify(value) {
     if (isNullish(value)) {
         return '';