@mablhq/mabl-cli 1.58.20 → 1.58.25

package/middleware.js

@@ -2,7 +2,6 @@
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CLI_MIDDLEWARE = void 0;
 const chalk_1 = __importDefault(require("chalk"));
@@ -15,7 +14,7 @@ const pureUtil_1 = require("./util/pureUtil");
 const simple_update_notifier_1 = __importDefault(require("simple-update-notifier"));
 const cliPackage = require('./package.json');
 const UPDATE_CHECK_INTERVAL_MILLISECONDS = 24 * 60 * 60 * 1000;
-const MIN_SUPPORTED_NODE_VERSION = (0, versionUtil_1.extractNodeVersionTuple)((_a = cliPackage === null || cliPackage === void 0 ? void 0 : cliPackage.engines) === null || _a === void 0 ? void 0 : _a.node);
+const MIN_SUPPORTED_NODE_VERSION = (0, versionUtil_1.extractNodeVersionTuple)(cliPackage?.engines?.node);
 exports.CLI_MIDDLEWARE = [
     () => {
         (0, logLineMessaging_1.registerConsoleLoggerForOutput)(messaging_1.mablEventEmitter);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mablhq/mabl-cli",
-  "version": "1.58.20",
+  "version": "1.58.25",
   "license": "SEE LICENSE IN LICENSE.txt",
   "description": "The official mabl command line interface tool",
   "main": "index.js",
@@ -30,7 +30,7 @@
     "@types/fs-extra": "8.1.1",
     "@types/serve-handler": "6.1.0",
     "@types/tmp": "0.2.0",
-    "@types/tough-cookie": "4.0.0",
+    "@types/tough-cookie": "4.0.2",
     "agent-base": "6.0.2",
     "analytics-node": "3.5.0",
     "async-mutex": "0.3.1",

package/popupDismissal/index.js

@@ -44,7 +44,7 @@ function getEffectiveZIndex(element) {
         if (zIndex && zIndex !== ZINDEX_AUTO) {
             return parseInt(zIndex, 10);
         }
-        current = (current === null || current === void 0 ? void 0 : current.parentElement) ? current.parentElement : undefined;
+        current = current?.parentElement ? current.parentElement : undefined;
     }
     return 0;
 }
@@ -91,9 +91,8 @@ function developCloseCandidates(candidates) {
         const domCovering = [];
         const actionableElements = [];
         candidate.elements.forEach((element) => {
-            var _a;
-            if (element === null || element === void 0 ? void 0 : element.offsetParent) {
-                if (['BUTTON', 'A', 'DIV'].includes((_a = element.tagName) === null || _a === void 0 ? void 0 : _a.toUpperCase()) &&
+            if (element?.offsetParent) {
+                if (['BUTTON', 'A', 'DIV'].includes(element.tagName?.toUpperCase()) &&
                     checkElementAttributes(element) &&
                     !actionableElements.includes(element)) {
                     actionableElements.push(element);
@@ -171,7 +170,7 @@ function getAllElementsAbove(targetElement, elements) {
         return [];
     }
     const targetZindex = getEffectiveZIndex(targetElement);
-    const zIndexAboveTarget = Math.min(...elements === null || elements === void 0 ? void 0 : elements.map((el) => getEffectiveZIndex(el)));
+    const zIndexAboveTarget = Math.min(...elements?.map((el) => getEffectiveZIndex(el)));
     if (zIndexAboveTarget <= targetZindex) {
         return [];
     }

package/providers/authenticationProvider.js

@@ -106,7 +106,6 @@ class AuthenticationProvider {
         return config.authentication.authType;
     }
     async displayInfo() {
-        var _a;
         try {
             const config = await cliConfigProvider_1.CliConfigProvider.getCliConfig();
             if (config.authentication.authType === types_1.AuthType.ApiKey) {
@@ -118,7 +117,8 @@ class AuthenticationProvider {
                 return;
             }
             loggingProvider_1.logger.info(`Logged in as user [${chalk.magenta.bold(config.email)}]`);
-            const expirationMilliseconds = ((_a = config.authentication.refreshTokenExpirationTimeMilliseconds) !== null && _a !== void 0 ? _a : config.authentication.accessTokenExpirationTimeMilliseconds) -
+            const expirationMilliseconds = (config.authentication.refreshTokenExpirationTimeMilliseconds ??
+                config.authentication.accessTokenExpirationTimeMilliseconds) -
                 Date.now();
             if (expirationMilliseconds > 0) {
                 loggingProvider_1.logger.info(`Login expires in [${chalk.magenta.bold(humanizeExpirationTime(expirationMilliseconds))}]`);
@@ -218,13 +218,12 @@ ${authUrl}
 }
 exports.AuthenticationProvider = AuthenticationProvider;
 function processAuthorizationError(error, isTokenRefresh) {
-    var _a;
     const mainErrorMessage = isTokenRefresh ? 'Token refresh' : 'Authorization';
     loggingProvider_1.logger.error(chalk.red.bold(`${mainErrorMessage} failed.`));
     loggingProvider_1.logger.error(chalk.red.bold(error.toString()));
     let hasResponseData = false;
     if (axios_1.default.isAxiosError(error)) {
-        const data = (_a = error.response) === null || _a === void 0 ? void 0 : _a.data;
+        const data = error.response?.data;
         if (isOidcError(data)) {
             loggingProvider_1.logger.error(chalk.red.bold(`${mainErrorMessage} failed: ${data.error_description} [${data.error}]`));
             hasResponseData = true;
@@ -248,7 +247,7 @@ function humanizeExpirationTime(milliseconds) {
     });
 }
 function isOidcError(err) {
-    return ((0, pureUtil_1.isString)(err === null || err === void 0 ? void 0 : err.error) &&
-        (0, pureUtil_1.isString)(err === null || err === void 0 ? void 0 : err.error_description));
+    return ((0, pureUtil_1.isString)(err?.error) &&
+        (0, pureUtil_1.isString)(err?.error_description));
 }
 exports.isOidcError = isOidcError;

package/providers/cliConfigProvider.js

@@ -60,7 +60,6 @@ exports.AUTH_KEY_NAMES = [
 ];
 let isKeytarAvailable = true;
 async function getEncryptionKey() {
-    var _a;
     if ((0, utilities_1.areWeTestingInJest)()) {
         return;
     }
@@ -69,7 +68,7 @@ async function getEncryptionKey() {
         try {
             const keytar = require('keytar');
             maybeEncryptionKey =
-                (_a = (await keytar.getPassword(env_1.CONF_FILE_PROJECT_NAME, env_1.ENV))) !== null && _a !== void 0 ? _a : undefined;
+                (await keytar.getPassword(env_1.CONF_FILE_PROJECT_NAME, env_1.ENV)) ?? undefined;
             if (!maybeEncryptionKey) {
                 maybeEncryptionKey = crypto
                     .randomFillSync(Buffer.alloc(48))
@@ -212,27 +211,26 @@ class CliConfigProvider {
         return this.getCliConfig();
     }
     static async setCliConfig(config) {
-        var _a, _b, _c, _d, _e, _f;
-        await setValue(AUTH_PROVIDER, (_a = config === null || config === void 0 ? void 0 : config.authentication) === null || _a === void 0 ? void 0 : _a.authProvider);
-        await setValue(AUTH_TYPE, (_b = config === null || config === void 0 ? void 0 : config.authentication) === null || _b === void 0 ? void 0 : _b.authType);
-        await setValue(ACCESS_TOKEN_NAME, (_c = config === null || config === void 0 ? void 0 : config.authentication) === null || _c === void 0 ? void 0 : _c.accessToken);
-        await setValue(REFRESH_TOKEN_NAME, (_d = config === null || config === void 0 ? void 0 : config.authentication) === null || _d === void 0 ? void 0 : _d.refreshToken);
-        await setValue(ACCESS_TOKEN_EXPIRATION_MILLISECONDS_NAME, (_e = config === null || config === void 0 ? void 0 : config.authentication) === null || _e === void 0 ? void 0 : _e.accessTokenExpirationTimeMilliseconds);
-        await setValue(REFRESH_TOKEN_EXPIRATION_MILLISECONDS_NAME, (_f = config === null || config === void 0 ? void 0 : config.authentication) === null || _f === void 0 ? void 0 : _f.refreshTokenExpirationTimeMilliseconds);
+        await setValue(AUTH_PROVIDER, config?.authentication?.authProvider);
+        await setValue(AUTH_TYPE, config?.authentication?.authType);
+        await setValue(ACCESS_TOKEN_NAME, config?.authentication?.accessToken);
+        await setValue(REFRESH_TOKEN_NAME, config?.authentication?.refreshToken);
+        await setValue(ACCESS_TOKEN_EXPIRATION_MILLISECONDS_NAME, config?.authentication?.accessTokenExpirationTimeMilliseconds);
+        await setValue(REFRESH_TOKEN_EXPIRATION_MILLISECONDS_NAME, config?.authentication?.refreshTokenExpirationTimeMilliseconds);
         await setValue(USER_ID_NAME, config.userId);
         await setValue(EMAIL_NAME, config.email);
         await setValue(USER_FULL_NAME_NAME, config.userFullName);
         return config;
     }
     static async setCliAuthInfo(authInfo, updateMilliseconds) {
-        await setValue(AUTH_TYPE, authInfo === null || authInfo === void 0 ? void 0 : authInfo.auth_type);
+        await setValue(AUTH_TYPE, authInfo?.auth_type);
         switch (authInfo.auth_type) {
             case types_2.AuthType.Bearer:
                 const bearerAuthInfo = authInfo;
                 const expirationTimeMilliseconds = updateMilliseconds + bearerAuthInfo.expires_in * 1000;
                 await setValue(AUTH_PROVIDER, bearerAuthInfo.auth_provider);
-                await setValue(ACCESS_TOKEN_NAME, bearerAuthInfo === null || bearerAuthInfo === void 0 ? void 0 : bearerAuthInfo.access_token);
-                await setValue(REFRESH_TOKEN_NAME, bearerAuthInfo === null || bearerAuthInfo === void 0 ? void 0 : bearerAuthInfo.refresh_token);
+                await setValue(ACCESS_TOKEN_NAME, bearerAuthInfo?.access_token);
+                await setValue(REFRESH_TOKEN_NAME, bearerAuthInfo?.refresh_token);
                 await setValue(ACCESS_TOKEN_EXPIRATION_MILLISECONDS_NAME, expirationTimeMilliseconds);
                 if (bearerAuthInfo.refresh_token_expires_at) {
                     await setValue(REFRESH_TOKEN_EXPIRATION_MILLISECONDS_NAME, bearerAuthInfo.refresh_token_expires_at * 1000);

package/providers/exportRequestProvider.js

@@ -23,8 +23,7 @@ class ExportRequestProvider {
         this.outputFilepath = outputFilepath;
     }
     isExportIncomplete() {
-        var _a;
-        if ((_a = this.latestRequest) === null || _a === void 0 ? void 0 : _a.status) {
+        if (this.latestRequest?.status) {
             return this.continuationStatuses.includes(this.latestRequest.status);
         }
         return false;
@@ -58,8 +57,7 @@ class ExportRequestProvider {
         return this.latestRequest;
     }
     async awaitCompletion() {
-        var _a;
-        if (!((_a = this.latestRequest) === null || _a === void 0 ? void 0 : _a.id)) {
+        if (!this.latestRequest?.id) {
             throw new Error('CreateExportRequest is undefined');
         }
         await this.pollForStatusUpdate(this.latestRequest.id);
@@ -153,7 +151,7 @@ class ExportRequestProvider {
                 this.exportDownloadSpinner,
             ]
                 .forEach((spinner) => {
-                if (spinner === null || spinner === void 0 ? void 0 : spinner.isSpinning) {
+                if (spinner?.isSpinning) {
                     spinner.fail();
                 }
             });

package/providers/logging/loggingProvider.js

@@ -68,7 +68,7 @@ exports.logger = winston.createLogger({
     defaultMeta: { service: 'mabl-cli' },
     transports: [
         new CliTransport({
-            format: winston.format.printf((info) => { var _a; return `${(_a = info.message) !== null && _a !== void 0 ? _a : info[MESSAGE]}`; }),
+            format: winston.format.printf((info) => `${info.message ?? info[MESSAGE]}`),
         }),
     ],
 });

package/reporters/mochAwesome/mochAwesomeReporter.js

@@ -102,7 +102,7 @@ function generatePlainSuiteFromTestResults(testResults) {
     const command = constructTestRunCommand();
     return {
         uuid: parentId,
-        title: command !== null && command !== void 0 ? command : `mabl CLI tests`,
+        title: command ?? `mabl CLI tests`,
         fullFile: '',
         file: '',
         beforeHooks: [],
@@ -121,9 +121,8 @@ function generatePlainSuiteFromTestResults(testResults) {
 }
 exports.generatePlainSuiteFromTestResults = generatePlainSuiteFromTestResults;
 function generatePlainTestForTestRun(parentUuid, testResult) {
-    var _a;
     return {
-        title: (_a = testResult.testName) !== null && _a !== void 0 ? _a : '',
+        title: testResult.testName ?? '',
         fullTitle: `${testResult.testName} - ${testResult.testId}`,
         timedOut: false,
         code: getCodeForResult(testResult),
@@ -200,7 +199,6 @@ function generateHoldingTestSuiteObj(suite) {
     };
 }
 function generateReportOptions(supplied) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
     if (supplied.json) {
         supplied.saveJson = supplied.json;
         supplied.saveHtml = !supplied.saveJson;
@@ -210,16 +208,16 @@ function generateReportOptions(supplied) {
         supplied.saveJson = !supplied.saveHtml;
     }
     return {
-        reportFilename: (_a = supplied.reportFilename) !== null && _a !== void 0 ? _a : `mabl-mochawesomeReport`,
-        reportDir: (_b = supplied.reportDir) !== null && _b !== void 0 ? _b : path.normalize(`./mablReports`),
-        overwrite: (_c = supplied.overwrite) !== null && _c !== void 0 ? _c : true,
-        reportTitle: (_d = supplied.reportTitle) !== null && _d !== void 0 ? _d : `mabl mochawesome report`,
-        reportPageTitle: (_e = supplied.reportPageTitle) !== null && _e !== void 0 ? _e : `mabl mochawesome report`,
-        autoOpen: (_f = supplied.autoOpen) !== null && _f !== void 0 ? _f : !supplied.saveJson,
-        showPassed: (_g = supplied.showPassed) !== null && _g !== void 0 ? _g : true,
-        showFailed: (_h = supplied.showFailed) !== null && _h !== void 0 ? _h : true,
-        showPending: (_j = supplied.showPending) !== null && _j !== void 0 ? _j : true,
-        showSkipped: (_k = supplied.showSkipped) !== null && _k !== void 0 ? _k : true,
+        reportFilename: supplied.reportFilename ?? `mabl-mochawesomeReport`,
+        reportDir: supplied.reportDir ?? path.normalize(`./mablReports`),
+        overwrite: supplied.overwrite ?? true,
+        reportTitle: supplied.reportTitle ?? `mabl mochawesome report`,
+        reportPageTitle: supplied.reportPageTitle ?? `mabl mochawesome report`,
+        autoOpen: supplied.autoOpen ?? !supplied.saveJson,
+        showPassed: supplied.showPassed ?? true,
+        showFailed: supplied.showFailed ?? true,
+        showPending: supplied.showPending ?? true,
+        showSkipped: supplied.showSkipped ?? true,
         saveJson: supplied.saveJson,
         saveHtml: supplied.saveHtml,
     };