@mablhq/mabl-cli 1.57.9 → 1.58.7

package/mablscript/actions/AwaitPDFDownloadAction.js

@@ -9,7 +9,10 @@ class AwaitPDFDownloadAction extends AwaitDownloadAction_1.AwaitDownloadAction {
         this.pdfUUID = this.getActionArgs()[0].uuid;
     }
     toMablscript() {
-        return `await_pdf(${(0, domUtil_1.buildStepArgumentString)({ uuid: this.pdfUUID })})`;
+        return `await_pdf(${(0, domUtil_1.buildStepArgumentString)({
+            params: { uuid: this.pdfUUID },
+            legacy: true,
+        })})`;
     }
 }
 exports.AwaitPDFDownloadAction = AwaitPDFDownloadAction;

package/mablscript/actions/FindAction.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.normalize = exports.isElementSelector = exports.FindAction = exports.findTypesToFormattedType = void 0;
+exports.normalizeEmail = exports.isEmailSelectorOrDescriptor = exports.normalize = exports.isElementSelector = exports.FindAction = exports.findTypesToFormattedType = void 0;
 const domUtil_1 = require("../../domUtil");
 const mablscriptFind_1 = require("../../mablscriptFind");
 const MablAction_1 = require("../MablAction");
@@ -78,12 +78,16 @@ class FindAction extends MablAction_1.MablAction {
             }
             case domUtil_1.FindType.FIND_EMAIL:
                 const [selectors] = this.getActionArgs();
-                if (!(0, domUtil_1.isEmailSelector)(selectors)) {
+                if (!isEmailSelectorOrDescriptor(selectors)) {
                     this.isValid = false;
                 }
+                const [target] = Array.isArray(selectors)
+                    ? [...selectors]
+                    : [selectors];
+                const findTarget = normalizeEmail(target);
                 this.findDescriptor = {
                     findType,
-                    findTarget: selectors,
+                    findTarget,
                 };
                 break;
             case domUtil_1.FindType.FIND_TAB: {
@@ -206,7 +210,7 @@ class FindAction extends MablAction_1.MablAction {
                 args = (0, mablscriptFind_1.buildCookieSelectorString)(this.findDescriptor.findTarget);
                 break;
             case domUtil_1.FindType.FIND_EMAIL: {
-                args = (0, mablscriptFind_1.buildEmailSelectorString)(this.findDescriptor.findTarget);
+                args = (0, domUtil_1.buildFindEmailDescriptorString)(this.findDescriptor.findTarget);
                 break;
             }
             case domUtil_1.FindType.FIND_TAB:
@@ -269,3 +273,29 @@ function normalize(maybeFindDescriptor) {
     return { selector: maybeFindDescriptor };
 }
 exports.normalize = normalize;
+function isEmailSelectorOrDescriptor(selectorOrDescriptor) {
+    const [target] = Array.isArray(selectorOrDescriptor)
+        ? [...selectorOrDescriptor]
+        : [selectorOrDescriptor];
+    return (0, domUtil_1.isEmailSelector)(target) || (0, domUtil_1.isNormalizedFindEmailDescriptor)(target);
+}
+exports.isEmailSelectorOrDescriptor = isEmailSelectorOrDescriptor;
+function normalizeEmail(selectorOrDescriptor) {
+    if ((0, domUtil_1.isNormalizedFindEmailDescriptor)(selectorOrDescriptor)) {
+        return { ...selectorOrDescriptor };
+    }
+    if ((0, domUtil_1.isEmailSelector)(selectorOrDescriptor)) {
+        if (selectorOrDescriptor.subject_exact) {
+            const { subject_exact: subjectExact, ...restOfObject } = selectorOrDescriptor;
+            return {
+                selector: {
+                    subject: subjectExact,
+                    ...restOfObject,
+                },
+                type: 'email',
+            };
+        }
+    }
+    return { selector: selectorOrDescriptor, type: 'email' };
+}
+exports.normalizeEmail = normalizeEmail;

package/mablscript/actions/JavaScriptAction.js

@@ -162,19 +162,25 @@ class JavaScriptAction extends MablAction_1.MablAction {
     toMablscript() {
         if ((0, JavaScriptDescriptor_1.isReusableSnippetDescriptor)(this.javaScript)) {
             const snippetReference = (0, domUtil_1.buildStepArgumentString)({
-                id: this.javaScript.snippetId,
-                invariant_id: this.javaScript.snippetInvariantId,
-                snippet_type: 'javascript',
+                params: {
+                    id: this.javaScript.snippetId,
+                    invariant_id: this.javaScript.snippetInvariantId,
+                    snippet_type: 'javascript',
+                },
+                legacy: true,
             });
-            const snippetOptions = `, {parameter_overrides: ${(0, domUtil_1.buildStepArgumentString)(this.javaScript.parameterOverrides)}}`;
+            const snippetOptions = `, {parameter_overrides: ${(0, domUtil_1.buildStepArgumentString)({ params: this.javaScript.parameterOverrides, legacy: true })}}`;
             return `evaluate_js(${snippetReference}${snippetOptions})`;
         }
         if ((0, JavaScriptDescriptor_1.isInlineSnippetDescriptor)(this.javaScript)) {
             const snippetReference = (0, domUtil_1.buildStepArgumentString)({
-                ...this.javaScript.inlineSnippet,
-                snippet_type: 'javascript',
+                params: { ...this.javaScript.inlineSnippet, snippet_type: 'javascript' },
+                legacy: true,
             });
-            const snippetOptions = `, {parameter_overrides: ${(0, domUtil_1.buildStepArgumentString)(this.javaScript.parameterOverrides)}}`;
+            const snippetOptions = `, {parameter_overrides: ${(0, domUtil_1.buildStepArgumentString)({
+                params: this.javaScript.parameterOverrides,
+                legacy: true,
+            })}}`;
             return `evaluate_js(${snippetReference}${snippetOptions})`;
         }
         if ((0, JavaScriptDescriptor_1.isLegacyReusableSnippetDescriptor)(this.javaScript)) {

package/mablscript/steps/AssertStep.js

@@ -149,11 +149,11 @@ class AssertStep extends MablStep_1.MablStep {
         }
         else {
             switch (find.findType) {
-                case domUtil_1.FindType.FIND_COOKIE:
                 case domUtil_1.FindType.FIND_EMAIL:
                     formatted.findType = FindAction_1.findTypesToFormattedType[find.findType];
-                    formatted.selector = find.findTarget;
+                    formatted.selector = find.findTarget.selector;
                     break;
+                case domUtil_1.FindType.FIND_COOKIE:
                 case domUtil_1.FindType.FIND_FIRST:
                 case domUtil_1.FindType.FIND_LAST:
                 case domUtil_1.FindType.FIND_ANY:

package/mablscript/steps/DownloadStep.js

@@ -79,7 +79,10 @@ class DownloadStep extends MablStep_1.MablStep {
         return new DownloadStep('assert_download', [fileAttributes], [awaitDownloadAction]);
     }
     toMablscript() {
-        const mablArgs = (0, domUtil_1.buildStepArgumentString)(this.fileAttributes);
+        const mablArgs = (0, domUtil_1.buildStepArgumentString)({
+            params: { ...this.fileAttributes },
+            legacy: true,
+        });
         return `${this.awaitDownloadAction.toMablscript()}.assert_download(${mablArgs ? mablArgs : ''})`;
     }
     getInputVariables() {

package/mablscript/steps/EvaluateFlowStep.js

@@ -29,9 +29,12 @@ class EvaluateFlowStep extends MablStep_1.MablStep {
         return new EvaluateFlowStep(EvaluateFlowStep.mablScriptStepNames[0], [descriptor, config], []);
     }
     toMablscript() {
-        const flowReference = (0, domUtil_1.buildStepArgumentString)(this.flowDescriptor);
+        const flowReference = (0, domUtil_1.buildStepArgumentString)({
+            params: { ...this.flowDescriptor },
+            legacy: true,
+        });
         const flowConfig = this.config
-            ? ', ' + (0, domUtil_1.buildStepArgumentString)(this.config)
+            ? ', ' + (0, domUtil_1.buildStepArgumentString)({ params: { ...this.config }, legacy: true })
             : '';
         return `${EvaluateFlowStep.mablScriptStepNames[0]}(${flowReference}${flowConfig})`;
     }

package/mablscript/steps/OpenEmailStep.js

@@ -22,8 +22,9 @@ class OpenEmailStep extends MablStep_1.MablStep {
         const find = this.findAction.toDescriptor();
         return {
             tab: this.tabUuid,
-            selector: find.findTarget,
+            selector: find.findTarget.selector,
             findType: 'FindEmail',
+            configuration: find.findTarget.configuration,
         };
     }
     static fromYaml(_stepName, stepArgs) {

package/mablscript/steps/SendHttpRequestStep.js

@@ -38,7 +38,10 @@ class SendHttpRequestStep extends MablStep_1.MablStep {
         return new SendHttpRequestStep('send_http_request', [formatted], []);
     }
     toMablscript() {
-        return `send_http_request(${(0, domUtil_1.buildStepArgumentString)(this.sendRequest)})`;
+        return `send_http_request(${(0, domUtil_1.buildStepArgumentString)({
+            params: { ...this.sendRequest },
+            legacy: true,
+        })})`;
     }
     getInputVariables() {
         return MablAction_1.MablAction.findUniqueVariableReferencesInValue(this.sendRequest);

package/mablscript/steps/SendKeyStep.js

@@ -64,7 +64,7 @@ class SendKeyStep extends MablStep_1.MablStep {
     }
     toMablscript() {
         const keysToSend = this.keys
-            .map((key) => (0, domUtil_1.buildStepArgumentString)(key))
+            .map((key) => (0, domUtil_1.buildStepArgumentString)({ params: { ...key }, legacy: true }))
             .join();
         return `${this.findAction.toMablscript()}.send_keys(${keysToSend})`;
     }