@mablhq/mabl-cli 1.40.12 → 1.42.7

package/mablscript/steps/AssertStep.js

@@ -158,12 +158,16 @@ class AssertStep extends MablStep_1.MablStep {
                     throw new Error(`Error generating step descriptor for ${this.getStepName()}: Unexpected find type ${find.findType}`);
             }
         }
+        if (this.conditionAction.options) {
+            formatted.conditionOptions = this.conditionAction.options;
+        }
         return result;
     }
     static fromYaml(stepName, stepArgs) {
         const actions = [];
         const assertionType = exports.assertionStepToField[stepName];
         const assertionValue = stepArgs.assertionValue;
+        const conditionOptions = stepArgs.conditionOptions;
         let primaryAction;
         if (stepArgs.kind === GetCurrentLocationDescriptor_1.GET_CURRENT_LOCATION_KIND) {
             primaryAction = new GetUrlAction_1.GetUrlAction(GetUrlAction_1.GetUrlAction.mablScriptStepNames[0], []);
@@ -188,6 +192,7 @@ class AssertStep extends MablStep_1.MablStep {
             actions.push(new ConditionAction_1.ConditionAction('evaluate_condition', [
                 assertionType,
                 assertionValue,
+                conditionOptions,
             ]));
         }
         return new AssertStep('assert', [
@@ -198,6 +203,7 @@ class AssertStep extends MablStep_1.MablStep {
         ], actions);
     }
     produceSelIdeFormattedSteps(stepIndex) {
+        var _a;
         const find = this.primaryAction.toDescriptor();
         if (!(0, GetCurrentLocationDescriptor_1.isGetCurrentLocationDescriptor)(find) &&
             !(0, GetVariableDescriptor_1.isGetVariableDescriptor)(find) &&
@@ -231,7 +237,7 @@ class AssertStep extends MablStep_1.MablStep {
             !(0, GetVariableDescriptor_1.isGetVariableDescriptor)(find) &&
             find.findType === domUtil_1.FindType.FIND_ONE &&
             find.findTarget.selector.xpath) ||
-            '', this.extractAction ? this.extractAction.extractionAttribute : '', this.substituteSeleniumVariable(this.conditionAction.conditionValueAttribute || ''), this.assertionType, this);
+            '', this.extractAction ? this.extractAction.extractionAttribute : '', this.substituteSeleniumVariable(this.conditionAction.conditionValueAttribute || ''), this.assertionType, this, (_a = this.conditionAction.options) === null || _a === void 0 ? void 0 : _a.caseInsensitive);
     }
     unsupportedSelIdeExportStep() {
         const seleniumStep = (0, SeleniumIdeStep_1.buildSeleniumIdeStep)('echo', this);
@@ -246,7 +252,7 @@ class AssertStep extends MablStep_1.MablStep {
         var _a, _b;
         const assertAction = `.assert(${!!(((_a = this.assertArguments) === null || _a === void 0 ? void 0 : _a.onFailure) ||
             ((_b = this.assertArguments) === null || _b === void 0 ? void 0 : _b.observationScope))
-            ? this.convertObjectToMablscriptArgs(this.assertArguments)
+            ? (0, MablAction_1.convertObjectToMablscriptArgs)(this.assertArguments)
             : ''})`;
         if (this.countAction) {
             return `${this.primaryAction.toMablscript()}.${this.countAction.toMablscript()}.${this.conditionAction.toMablscript()}${assertAction}`;
@@ -273,7 +279,7 @@ class AssertStep extends MablStep_1.MablStep {
 exports.AssertStep = AssertStep;
 AssertStep.mablScriptStepNames = ['assert'];
 AssertStep.yamlMablScriptNames = yamlMablScriptNames();
-function buildSeleniumIdeJsAssertion(stepIndex, xpath, assertionAttribute, assertAgainst, assertionType, step) {
+function buildSeleniumIdeJsAssertion(stepIndex, xpath, assertionAttribute, assertAgainst, assertionType, step, caseInsensitive = false) {
     const variableName = `assertVariable-${stepIndex}`;
     let storeAttribute;
     if (assertionAttribute !== 'innerText') {
@@ -286,42 +292,45 @@ function buildSeleniumIdeJsAssertion(stepIndex, xpath, assertionAttribute, asser
     }
     storeAttribute.value = variableName;
     let condition = '';
+    const toLowerCaseString = caseInsensitive
+        ? '.toUpperCase().toLowerCase()'
+        : '';
     switch (assertionType) {
         case 'equals':
-            condition = `\${${variableName}} !== '${assertAgainst}'`;
+            condition = `\${${variableName}}${toLowerCaseString} !== '${assertAgainst}'${toLowerCaseString}`;
             break;
         case 'does_not_equal':
-            condition = `\${${variableName}} === '${assertAgainst}'`;
+            condition = `\${${variableName}}${toLowerCaseString} === '${assertAgainst}'${toLowerCaseString}`;
             break;
         case 'contains':
-            condition = `!\${${variableName}}.includes('${assertAgainst}')`;
+            condition = `!\${${variableName}}${toLowerCaseString}.includes('${assertAgainst}'${toLowerCaseString})`;
             break;
         case 'does_not_contain':
-            condition = `\${${variableName}}.includes('${assertAgainst}')`;
+            condition = `\${${variableName}}${toLowerCaseString}.includes('${assertAgainst}'${toLowerCaseString})`;
             break;
         case 'starts_with':
-            condition = `!\${${variableName}}.startsWith('${assertAgainst}')`;
+            condition = `!\${${variableName}}${toLowerCaseString}.startsWith('${assertAgainst}'${toLowerCaseString})`;
             break;
         case 'starts_without':
-            condition = `\${${variableName}}.startsWith('${assertAgainst}')`;
+            condition = `\${${variableName}}${toLowerCaseString}.startsWith('${assertAgainst}'${toLowerCaseString})`;
             break;
         case 'ends_with':
-            condition = `!\${${variableName}}.endsWith('${assertAgainst}')`;
+            condition = `!\${${variableName}}${toLowerCaseString}.endsWith('${assertAgainst}'${toLowerCaseString})`;
             break;
         case 'ends_without':
-            condition = `\${${variableName}}.endsWith('${assertAgainst}')`;
+            condition = `\${${variableName}}${toLowerCaseString}.endsWith('${assertAgainst}'${toLowerCaseString})`;
             break;
         case 'greater_than':
-            condition = `!\${${variableName}} > '${assertAgainst}'`;
+            condition = `!\${${variableName}}${toLowerCaseString} > '${assertAgainst}'${toLowerCaseString}`;
             break;
         case 'less_than':
-            condition = `!\${${variableName}} < '${assertAgainst}'`;
+            condition = `!\${${variableName}}${toLowerCaseString} < '${assertAgainst}'${toLowerCaseString}`;
             break;
         case 'greater_than_or_equals':
-            condition = `!\${${variableName}} >= '${assertAgainst}'`;
+            condition = `!\${${variableName}}${toLowerCaseString} >= '${assertAgainst}'${toLowerCaseString}`;
             break;
         case 'less_than_or_equals':
-            condition = `!\${${variableName}} <= '${assertAgainst}'`;
+            condition = `!\${${variableName}}${toLowerCaseString} <= '${assertAgainst}'${toLowerCaseString}`;
             break;
     }
     const ifStep = (0, SeleniumIdeStep_1.buildSeleniumIdeStep)('if', step);

package/mablscript/steps/IfConditionStep.js

@@ -59,6 +59,9 @@ class IfConditionStep extends MablStep_1.MablStep {
             if (this.conditionAction.conditionValueAttribute) {
                 details.conditionValue = this.conditionAction.conditionValueAttribute;
             }
+            if (this.conditionAction.options !== undefined) {
+                details.conditionOptions = this.conditionAction.options;
+            }
         }
         if (this.primaryAction instanceof GetVariableValue_1.GetVariableValue) {
             details.variableName = this.substituteMablscriptVariable(this.primaryAction.variable);
@@ -115,7 +118,11 @@ class IfConditionStep extends MablStep_1.MablStep {
             const conditionType = AssertStep_1.assertionStepToField[stepArgs.condition];
             actions.push(new ConditionAction_1.ConditionAction(conditionType === 'present' || conditionType === 'not_present'
                 ? 'evaluate_presence'
-                : 'evaluate_condition', [AssertStep_1.assertionStepToField[stepArgs.condition], stepArgs.conditionValue]));
+                : 'evaluate_condition', [
+                AssertStep_1.assertionStepToField[stepArgs.condition],
+                stepArgs.conditionValue,
+                stepArgs.conditionOptions,
+            ]));
         }
         return actions;
     }

package/mablscript/steps/ReleaseStep.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ReleaseStep = void 0;
 const FindAction_1 = require("../actions/FindAction");
 const MablStep_1 = require("../MablStep");
+const MablAction_1 = require("../MablAction");
 const domUtil_1 = require("../../domUtil");
 const ActionsUtils_1 = require("./ActionsUtils");
 class ReleaseStep extends MablStep_1.MablStep {
@@ -55,7 +56,7 @@ class ReleaseStep extends MablStep_1.MablStep {
         return new ReleaseStep('release', [], [FindAction_1.FindAction.findActionFromStepArgs(stepArgs)]);
     }
     toMablscript() {
-        const args = this.convertObjectToMablscriptArgs(this.releaseArgs);
+        const args = (0, MablAction_1.convertObjectToMablscriptArgs)(this.releaseArgs);
         return `${this.findAction.toMablscript()}.release(${args})`;
     }
     getInputVariables() {

package/mablscript/steps/SelectStep.js

@@ -62,7 +62,7 @@ class SelectStep extends MablStep_1.MablStep {
         const selectOptionType = this.selectOptionType
             ? `, "${this.selectOptionType}"`
             : '';
-        return `${this.findAction.toMablscript()}.select(${this.convertObjectToMablscriptArgs(this.selectOptions)}${selectOptionType})`;
+        return `${this.findAction.toMablscript()}.select(${(0, MablAction_1.convertObjectToMablscriptArgs)(this.selectOptions)}${selectOptionType})`;
     }
     getInputVariables() {
         return (0, MablAction_1.distinctStrings)([

package/mablscript/steps/SetFilesStep.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SetFilesStep = void 0;
 const FindAction_1 = require("../actions/FindAction");
+const MablAction_1 = require("../MablAction");
 const MablStep_1 = require("../MablStep");
 const domUtil_1 = require("../../domUtil");
 class SetFilesStep extends MablStep_1.MablStep {
@@ -51,7 +52,7 @@ class SetFilesStep extends MablStep_1.MablStep {
     }
     toMablscript() {
         const files = this.files
-            .map((key) => this.convertObjectToMablscriptArgs(key))
+            .map((key) => (0, MablAction_1.convertObjectToMablscriptArgs)(key))
             .join(', ');
         return `${this.findAction.toMablscript()}.set_files(${files})`;
     }

package/mablscript/steps/SyntheticStep.js

@@ -4,7 +4,7 @@ exports.SyntheticStep = exports.DEFAULT_STEP_SOURCE_INDEX_IN_FLOW = void 0;
 const MablStep_1 = require("../MablStep");
 exports.DEFAULT_STEP_SOURCE_INDEX_IN_FLOW = -1;
 class SyntheticStep extends MablStep_1.MablStep {
-    constructor(name, args, actions, stepSourceIndexInFlow = exports.DEFAULT_STEP_SOURCE_INDEX_IN_FLOW) {
+    constructor(name, args = [], actions = [], stepSourceIndexInFlow = exports.DEFAULT_STEP_SOURCE_INDEX_IN_FLOW) {
         super(name, args, actions);
         this.stepSourceIndexInFlow = stepSourceIndexInFlow;
         this.actionSourceIndexInStep = 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mablhq/mabl-cli",
-  "version": "1.40.12",
+  "version": "1.42.7",
   "license": "SEE LICENSE IN LICENSE.txt",
   "description": "The official mabl command line interface tool",
   "main": "index.js",
@@ -21,7 +21,7 @@
   },
   "dependencies": {
     "@mablhq/newman-reporter-mabl-console": "0.1.0",
-    "@playwright/test": "1.25.1",
+    "@playwright/test": "1.25.2",
     "@types/fs-extra": "8.1.1",
     "@types/serve-handler": "6.1.0",
     "@types/tmp": "0.2.0",
@@ -66,7 +66,7 @@
     "newman": "5.3.2",
     "open": "6.4.0",
     "ora": "4.0.4",
-    "playwright-core": "1.25.1",
+    "playwright-core": "1.25.2",
     "pluralize": "8.0.0",
     "pngjs": "6.0.0",
     "portfinder": "1.0.28",

package/providers/authenticationProvider.js

@@ -13,7 +13,7 @@ const mablApiClientFactory_1 = require("../api/mablApiClientFactory");
 const loggingProvider_1 = require("./logging/loggingProvider");
 const pureUtil_1 = require("../util/pureUtil");
 const OktaClient_1 = require("../auth/OktaClient");
-const httpUtil_1 = require("../util/httpUtil");
+const axiosProxyConfig_1 = require("../http/axiosProxyConfig");
 const types_2 = require("./types");
 const humanizeDuration = require('humanize-duration');
 const inquirer = require('inquirer');
@@ -24,7 +24,7 @@ class AuthenticationProvider {
     }
     async getOktaClient() {
         if (!this.oktaClient) {
-            const client = axios_1.default.create(await (0, httpUtil_1.currentProxyConfig)());
+            const client = axios_1.default.create(await (0, axiosProxyConfig_1.currentProxyConfig)());
             this.oktaClient = new OktaClient_1.OktaClient(client);
         }
         return this.oktaClient;

package/providers/cliConfigProvider.js

@@ -32,7 +32,7 @@ const conf_1 = __importDefault(require("conf"));
 const types_1 = require("./types");
 const types_2 = require("../api/types");
 const configKeys_1 = require("../commands/config/config_cmds/configKeys");
-const httpUtil_1 = require("../util/httpUtil");
+const httpUtil_1 = require("../http/httpUtil");
 const crypto = __importStar(require("crypto"));
 const loggingProvider_1 = require("./logging/loggingProvider");
 const utilities_1 = require("../utilities");

package/util/encodingUtil.js

@@ -0,0 +1,37 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.decodeTestConfigAsParamsForParsedUrlProtocol = exports.encodeTestConfigAsParamsForParsedUrlProtocol = exports.b64EncodeUnicodeInNode = exports.b64DecodeUnicodeInNode = exports.TEST_CONFIG_URL_PARAM_KEY = void 0;
+const querystring_1 = __importDefault(require("querystring"));
+const MAX_PARSED_URL_PROTOCOL_PARAMS_LENGTH = 2000;
+exports.TEST_CONFIG_URL_PARAM_KEY = 'scriptConfig';
+function b64DecodeUnicodeInNode(encoded) {
+    return Buffer.from(encoded, 'base64').toString();
+}
+exports.b64DecodeUnicodeInNode = b64DecodeUnicodeInNode;
+function b64EncodeUnicodeInNode(text) {
+    return Buffer.from(text).toString('base64');
+}
+exports.b64EncodeUnicodeInNode = b64EncodeUnicodeInNode;
+function encodeTestConfigAsParamsForParsedUrlProtocol(testConfig, b64Encode) {
+    const encoded = querystring_1.default.stringify({
+        ...testConfig,
+        [exports.TEST_CONFIG_URL_PARAM_KEY]: b64Encode(JSON.stringify(testConfig)),
+    });
+    if (encoded.length > MAX_PARSED_URL_PROTOCOL_PARAMS_LENGTH) {
+        throw new Error('Test parameters exceed size limit. Please use the mabl Desktop App to create or edit tests.');
+    }
+    return encoded;
+}
+exports.encodeTestConfigAsParamsForParsedUrlProtocol = encodeTestConfigAsParamsForParsedUrlProtocol;
+function decodeTestConfigAsParamsForParsedUrlProtocol(encoded, b64Decode, useV2) {
+    const params = querystring_1.default.parse(encoded);
+    if (useV2 && params[exports.TEST_CONFIG_URL_PARAM_KEY]) {
+        return JSON.parse(b64Decode(params[exports.TEST_CONFIG_URL_PARAM_KEY]));
+    }
+    delete params[exports.TEST_CONFIG_URL_PARAM_KEY];
+    return params;
+}
+exports.decodeTestConfigAsParamsForParsedUrlProtocol = decodeTestConfigAsParamsForParsedUrlProtocol;

package/util/fileUploadUtil.js

@@ -28,7 +28,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.removeUploadDirs = exports.cleanupOldFiles = exports.downloadFileUpload = void 0;
 const axios_1 = __importDefault(require("axios"));
-const httpUtil_1 = require("./httpUtil");
+const axiosProxyConfig_1 = require("../http/axiosProxyConfig");
 const path_1 = __importDefault(require("path"));
 const fs = __importStar(require("fs-extra"));
 const stream_1 = require("stream");
@@ -42,7 +42,7 @@ async function downloadFileUpload(fileUploadUrl, fileUpload, downloadDirectory,
         client = mablApiClient.httpClient;
     }
     else {
-        client = axios_1.default.create(await (0, httpUtil_1.currentProxyConfig)());
+        client = axios_1.default.create(await (0, axiosProxyConfig_1.currentProxyConfig)());
     }
     try {
         const finalDirectory = path_1.default.normalize(`${downloadDirectory}/${fileUpload.id}`);