@mablhq/mabl-cli 2.4.0 → 2.5.2

package/README.md

@@ -35,7 +35,7 @@ Complete help documentation available at
 
 ## Installation
 
-Note: **Node 16+ is required** to run the mabl CLI
+Note: **Node 18+ is required** to run the mabl CLI
 
 Stable version:
 
@@ -350,10 +350,10 @@ mabl config delete http.sslVerify
 
 ## Installation Troubleshooting
 
-If you receive the following error message, you need to ensure you have Node 16+
+If you receive the following error message, you need to ensure you have Node 18+
 installed.
 
 ```bash
-npm WARN notsup Unsupported engine for @mablhq/mabl-cli@1.54.0: wanted: {"node":">= 16.0.0"} (current: {"node":"8.15.1","npm":"6.13.4"})
-npm WARN notsup Not compatible with your version of node/npm: @mablhq/mabl-cli@1.54.0
+npm WARN notsup Unsupported engine for @mablhq/mabl-cli@1.54.0: wanted: {"node":">= 18.0.0"} (current: {"node":"8.15.1","npm":"6.13.4"})
+npm WARN notsup Not compatible with your version of node/npm: @mablhq/mabl-cli@2.5.0
 ```

package/browserLauncher/errors.js

@@ -1,17 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RUNNER_ERRORS = exports.TimeoutError = exports.RunnerError = void 0;
+exports.RUNNER_ERRORS = exports.NavigationInterruptedError = exports.TimeoutError = exports.RunnerError = void 0;
 class RunnerError extends Error {
     constructor(message) {
         super(message);
         this.name = this.constructor.name;
         Error.captureStackTrace(this, this.constructor);
     }
+    static isPlaywrightNavigationInterruptedError(error) {
+        const errorString = error.message.toLowerCase();
+        return (errorString.includes('interrupted by another navigation') &&
+            errorString.includes('frame.goto'));
+    }
 }
 exports.RunnerError = RunnerError;
 class TimeoutError extends RunnerError {
 }
 exports.TimeoutError = TimeoutError;
+class NavigationInterruptedError extends RunnerError {
+}
+exports.NavigationInterruptedError = NavigationInterruptedError;
 exports.RUNNER_ERRORS = {
     TimeoutError,
+    NavigationInterruptedError,
 };

package/browserLauncher/playwrightBrowserLauncher/chromium/chromiumBrowserDelegate.js

@@ -24,7 +24,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ChromiumBrowserDelegate = void 0;
-const playwright = __importStar(require("@playwright/test"));
+const playwright = __importStar(require("playwright"));
 const chromiumPageDelegate_1 = require("./chromiumPageDelegate");
 class ChromiumBrowserDelegate {
     constructor(context) {

package/browserLauncher/playwrightBrowserLauncher/chromium/chromiumElementHandleDelegate.js

@@ -24,7 +24,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ChromiumElementHandleDelegate = void 0;
-const playwright = __importStar(require("@playwright/test"));
+const playwright = __importStar(require("playwright"));
 const testsUtil_1 = require("../../../commands/tests/testsUtil");
 const logUtils_1 = require("../../../util/logUtils");
 const elementHandle_1 = require("../../elementHandle");

package/browserLauncher/playwrightBrowserLauncher/chromium/chromiumPageDelegate.js

@@ -24,7 +24,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ChromiumPageDelegate = void 0;
-const playwright = __importStar(require("@playwright/test"));
+const playwright = __importStar(require("playwright"));
 const chromiumElementHandleDelegate_1 = require("./chromiumElementHandleDelegate");
 const logUtils_1 = require("../../../util/logUtils");
 const chromiumFrameDelegate_1 = require("./chromiumFrameDelegate");

package/browserLauncher/playwrightBrowserLauncher/firefox/firefoxBrowserDelegate.js

@@ -24,7 +24,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FirefoxBrowserDelegate = void 0;
-const playwright = __importStar(require("@playwright/test"));
+const playwright = __importStar(require("playwright"));
 const firefoxPageDelegate_1 = require("./firefoxPageDelegate");
 const nonChromiumAbstractBrowserDelegate_1 = require("../nonChromium/nonChromiumAbstractBrowserDelegate");
 class FirefoxBrowserDelegate extends nonChromiumAbstractBrowserDelegate_1.NonChromiumAbstractBrowserDelegate {
@@ -41,7 +41,7 @@ class FirefoxBrowserDelegate extends nonChromiumAbstractBrowserDelegate_1.NonChr
         return new firefoxPageDelegate_1.FirefoxPageDelegate(page);
     }
     getCDPSession() {
-        return this._browser._connection;
+        return this._browser._connection.rootSession;
     }
     supportsExposeFunction() {
         return true;

package/browserLauncher/playwrightBrowserLauncher/nonChromium/nonChromiumAbstractElementHandleDelegate.js

@@ -24,7 +24,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NonChromiumAbstractElementHandleDelegate = void 0;
-const playwright = __importStar(require("@playwright/test"));
+const playwright = __importStar(require("playwright"));
 const logUtils_1 = require("../../../util/logUtils");
 class NonChromiumAbstractElementHandleDelegate {
     constructor(elementHandle) {

package/browserLauncher/playwrightBrowserLauncher/nonChromium/nonChromiumAbstractPageDelegate.js

@@ -24,7 +24,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NonChromiumAbstractPageDelegate = void 0;
-const playwright = __importStar(require("@playwright/test"));
+const playwright = __importStar(require("playwright"));
 const logUtils_1 = require("../../../util/logUtils");
 class NonChromiumAbstractPageDelegate {
     constructor(page) {

package/browserLauncher/playwrightBrowserLauncher/playwrightBrowser.js

@@ -28,7 +28,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PlaywrightBrowser = void 0;
 const events_1 = __importDefault(require("events"));
-const playwright = __importStar(require("@playwright/test"));
+const playwright = __importStar(require("playwright"));
 const browserLauncher_1 = require("../browserLauncher");
 const playwrightPage_1 = require("./playwrightPage");
 const types_1 = require("../types");

package/browserLauncher/playwrightBrowserLauncher/playwrightBrowserLauncher.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PlaywrightBrowserLauncher = void 0;
-const test_1 = require("@playwright/test");
+const playwright_1 = require("playwright");
 const path_1 = __importDefault(require("path"));
 const browserTypes_1 = require("../../commands/browserTypes");
 const loggingProvider_1 = require("../../providers/logging/loggingProvider");
@@ -71,11 +71,11 @@ function getPlaywrightBrowserType(browserType) {
     switch (browserType) {
         case browserTypes_1.BrowserType.Chrome:
         case browserTypes_1.BrowserType.Edge:
-            return test_1.chromium;
+            return playwright_1.chromium;
         case browserTypes_1.BrowserType.Firefox:
-            return test_1.firefox;
+            return playwright_1.firefox;
         case browserTypes_1.BrowserType.Webkit:
-            return test_1.webkit;
+            return playwright_1.webkit;
         default:
             throw new Error(`Unsupported browser type: ${browserType}`);
     }

package/browserLauncher/playwrightBrowserLauncher/playwrightDom.js

@@ -24,7 +24,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PlaywrightElementHandle = exports.PlaywrightJsHandle = exports.NAVIGATION_ERROR_MESSAGE = void 0;
-const playwright = __importStar(require("@playwright/test"));
+const playwright = __importStar(require("playwright"));
 const types_1 = require("../types");
 const utils_1 = require("../utils");
 const logUtils_1 = require("../../util/logUtils");

package/browserLauncher/playwrightBrowserLauncher/playwrightFrame.js

@@ -25,7 +25,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PlaywrightFrame = exports.UTILITY_CONTEXT_NAME = void 0;
 const browserLauncher_1 = require("../browserLauncher");
-const playwright = __importStar(require("@playwright/test"));
+const playwright = __importStar(require("playwright"));
 const types_1 = require("../types");
 const utils_1 = require("../utils");
 const playwrightHttpResponse_1 = require("./playwrightHttpResponse");
@@ -142,19 +142,9 @@ class PlaywrightFrame extends browserLauncher_1.Frame {
         return new playwrightDom_1.PlaywrightElementHandle(frameElement, this.parentPage, this.parentPage.delegate.createElementHandleDelegate(frameElement));
     }
     async goto(url, options) {
-        var _a;
         const lifecycleEvent = this.delegate.getLifecycleEventStrategy(options === null || options === void 0 ? void 0 : options.waitUntil);
         try {
-            const response = await this.frame.goto(url, {
-                waitUntil: lifecycleEvent.waitUntil,
-                timeout: options === null || options === void 0 ? void 0 : options.timeout,
-            });
-            if (lifecycleEvent.waitForNetworkIdle) {
-                await this.frame.waitForLoadState(types_1.LifecycleEvent.NetworkIdle, {
-                    timeout: (_a = options === null || options === void 0 ? void 0 : options.timeout) !== null && _a !== void 0 ? _a : types_1.DefaultTimeouts.defaultWaitTimeoutMs,
-                });
-            }
-            return (0, utils_1.mapIfNotNull)(response, (response) => new playwrightHttpResponse_1.PlaywrightHttpResponse(this.parentPage, response));
+            return await this.tryGoto(url, lifecycleEvent, options);
         }
         catch (e) {
             if (e instanceof playwright.errors.TimeoutError) {
@@ -163,6 +153,32 @@ class PlaywrightFrame extends browserLauncher_1.Frame {
             throw new browserLauncher_1.RunnerError(e.message);
         }
     }
+    async tryGoto(url, lifecycleEvent, options) {
+        var _a;
+        const timeout = (_a = options === null || options === void 0 ? void 0 : options.timeout) !== null && _a !== void 0 ? _a : types_1.DefaultTimeouts.defaultWaitTimeoutMs;
+        let response;
+        let responseHasNavigationError = false;
+        try {
+            response = await this.frame.goto(url, {
+                waitUntil: lifecycleEvent.waitUntil,
+                timeout: options === null || options === void 0 ? void 0 : options.timeout,
+            });
+        }
+        catch (e) {
+            if (browserLauncher_1.RunnerError.isPlaywrightNavigationInterruptedError(e)) {
+                responseHasNavigationError = true;
+            }
+            else {
+                throw e;
+            }
+        }
+        if (lifecycleEvent.waitForNetworkIdle || responseHasNavigationError) {
+            await this.frame.waitForLoadState(types_1.LifecycleEvent.NetworkIdle, {
+                timeout,
+            });
+        }
+        return (0, utils_1.mapIfNotNull)(response, (response) => new playwrightHttpResponse_1.PlaywrightHttpResponse(this.parentPage, response));
+    }
     id() {
         return this.frame._guid;
     }

package/browserLauncher/playwrightBrowserLauncher/playwrightHttpRequest.js

@@ -24,7 +24,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PlaywrightHttpRequest = void 0;
-const playwright = __importStar(require("@playwright/test"));
+const playwright = __importStar(require("playwright"));
 const logUtils_1 = require("../../util/logUtils");
 class PlaywrightHttpRequest {
     constructor(page, request, route) {

package/browserLauncher/playwrightBrowserLauncher/playwrightPage.js

@@ -30,7 +30,7 @@ exports.PlaywrightPage = void 0;
 const events_1 = __importDefault(require("events"));
 const promises_1 = require("fs/promises");
 const browserLauncher_1 = require("../browserLauncher");
-const playwright = __importStar(require("@playwright/test"));
+const playwright = __importStar(require("playwright"));
 const playwrightHttpResponse_1 = require("./playwrightHttpResponse");
 const playwrightHttpRequest_1 = require("./playwrightHttpRequest");
 const playwrightFrame_1 = require("./playwrightFrame");

package/browserLauncher/playwrightBrowserLauncher/webkit/webkitBrowserDelegate.js

@@ -24,7 +24,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebkitBrowserDelegate = void 0;
-const playwright = __importStar(require("@playwright/test"));
+const playwright = __importStar(require("playwright"));
 const webkitPageDelegate_1 = require("./webkitPageDelegate");
 const nonChromiumAbstractBrowserDelegate_1 = require("../nonChromium/nonChromiumAbstractBrowserDelegate");
 class WebkitBrowserDelegate extends nonChromiumAbstractBrowserDelegate_1.NonChromiumAbstractBrowserDelegate {

package/commands/commandUtil/util.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCredentialType = exports.parseColinJoinedVariablePair = exports.validateValuePairInputs = exports.validateArrayInputs = exports.getWorkspaceIdFromAppOrEnv = exports.getJourneyFlowArray = exports.TEST_WITHOUT_FLOWS_MESSAGE = exports.getWorkspaceId = exports.failWrapper = exports.getDescribeDescriptions = void 0;
+exports.getCredentialType = exports.parseColonJoinedVariablePair = exports.validateValuePairInputs = exports.validateArrayInputs = exports.getWorkspaceIdFromAppOrEnv = exports.getJourneyFlowArray = exports.TEST_WITHOUT_FLOWS_MESSAGE = exports.getWorkspaceId = exports.failWrapper = exports.getDescribeDescriptions = void 0;
 const mablApi_1 = require("../../mablApi");
 const cliConfigProvider_1 = require("../../providers/cliConfigProvider");
 const constants_1 = require("../constants");
@@ -94,7 +94,7 @@ function validateValuePairInputs(inputName, inputs) {
         const wrappingWhitespace = inputs.filter((header) => !/^([^\s:]{1,2}|[^\s:][^:]+[^\s:]):([^\s:]{1,2}|[^\s:][^:]+[^\s:])?$/m.test(header));
         if (wrappingWhitespace.length > 0) {
             const cleanFunction = (header) => {
-                const { name, value } = parseColinJoinedVariablePair(header);
+                const { name, value } = parseColonJoinedVariablePair(header);
                 return [name, value].map((part) => part.trim()).join(':');
             };
             const cleaned = inputs.map(cleanFunction);
@@ -108,12 +108,12 @@ function validateValuePairInputs(inputName, inputs) {
     return inputs;
 }
 exports.validateValuePairInputs = validateValuePairInputs;
-function parseColinJoinedVariablePair(input) {
+function parseColonJoinedVariablePair(input) {
     const name = input.substring(0, input.indexOf(':'));
     const value = input.substring(input.indexOf(':') + 1);
     return { name, value };
 }
-exports.parseColinJoinedVariablePair = parseColinJoinedVariablePair;
+exports.parseColonJoinedVariablePair = parseColonJoinedVariablePair;
 function getCredentialType(credential) {
     if (credential.cloud_only) {
         return credential.type === mablApi_1.Credentials.TypeEnum.Basic

package/commands/environments/environments_cmds/create.js

@@ -12,6 +12,7 @@ const branches_1 = require("../../commandUtil/branches");
 const chalk_1 = __importDefault(require("chalk"));
 const loggingProvider_1 = require("../../../providers/logging/loggingProvider");
 const add_1 = require("./urls_cmds/add");
+const environmentsValidation_1 = require("../../../core/entityValidation/environmentsValidation");
 exports.command = 'create';
 exports.describe = 'Create a new mabl environment';
 exports.builder = (yargs) => {
@@ -90,10 +91,23 @@ function addUpdateEnvCommands(argv) {
         (0, util_1.validateArrayInputs)(variables, 'Variables must be SPACE delimited, e.g. --variables foo:bar baz:qux');
         const validVariables = (0, util_1.validateValuePairInputs)('Variable', variables);
         return validVariables.reduce((variablesObject, item) => {
-            const { name, value } = (0, util_1.parseColinJoinedVariablePair)(item);
+            const { name, value } = (0, util_1.parseColonJoinedVariablePair)(item);
             variablesObject[name] = value;
             return variablesObject;
         }, {});
+    })
+        .check((argv) => {
+        const variables = argv[constants_1.CommandArgVariables];
+        if (!variables) {
+            return true;
+        }
+        const variableNames = Object.keys(variables);
+        const invalidVariableNames = variableNames.filter((name) => !(0, environmentsValidation_1.isValidEnvironmentVariableName)(name));
+        if (invalidVariableNames.length === 0) {
+            return true;
+        }
+        const maybePlural = invalidVariableNames.length > 1 ? 's' : '';
+        throw new Error(`Invalid environment variable name${maybePlural}: ${invalidVariableNames.join(', ')}. Environment variable names must start with a letter or underscore and contain only letters, numbers, and underscores.`);
     });
 }
 exports.addUpdateEnvCommands = addUpdateEnvCommands;

package/core/entityValidation/environmentsValidation.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isValidEnvironmentVariableName = void 0;
+function isValidEnvironmentVariableName(name) {
+    return /^[a-zA-Z_][a-zA-Z0-9_]*$/.test(name);
+}
+exports.isValidEnvironmentVariableName = isValidEnvironmentVariableName;