@mablhq/mabl-cli 1.16.32 → 1.18.3

package/mablscript/steps/AssertStepOld.js

@@ -4,8 +4,10 @@ exports.AssertStepOld = void 0;
 const ExtractAction_1 = require("../actions/ExtractAction");
 const MablStep_1 = require("../MablStep");
 const FindAction_1 = require("../actions/FindAction");
-const mablscriptFind_1 = require("../../mablscriptFind");
+const domUtil_1 = require("../../domUtil");
 const importer_1 = require("../importer");
+const GetCurrentLocationDescriptor_1 = require("../types/GetCurrentLocationDescriptor");
+const GetVariableDescriptor_1 = require("../types/GetVariableDescriptor");
 const oldToNewAssertionTypes = {
     assert_contains: 'AssertContains',
     assert_does_not_contain: 'AssertDoesNotContain',
@@ -31,8 +33,16 @@ class AssertStepOld extends MablStep_1.MablStep {
         this.validate();
         this.setAssertAttribute();
         this.assertionType = this.name;
-        this.findAction = actions[0];
+        this.primaryAction = actions[0];
         this.extractAction = actions[1];
+        if (args.length === 1) {
+            this.continueOnFailure = args[0].onFailure === 'continue';
+            this.observationScope = args[0].observationScope;
+        }
+        else if (args.length === 2) {
+            this.continueOnFailure = args[1].onFailure === 'continue';
+            this.observationScope = args[1].observationScope;
+        }
     }
     validate() {
         if (this.actions.length !== 2 &&
@@ -61,31 +71,39 @@ class AssertStepOld extends MablStep_1.MablStep {
                 ExtractAction_1.ExtractAction.mablscriptToYamlType[this.extractAction.extractionType];
             formatted.attribute = this.extractAction.extractionAttribute;
         }
-        const find = this.findAction.toDescriptor();
-        switch (find.findType) {
-            case mablscriptFind_1.FindType.FIND_COOKIE:
-            case mablscriptFind_1.FindType.FIND_EMAIL:
-                formatted.findType = FindAction_1.findTypesToFormattedType[find.findType];
-                formatted.selector = find.findTarget;
-                break;
-            case mablscriptFind_1.FindType.FIND_FIRST:
-            case mablscriptFind_1.FindType.FIND_LAST:
-            case mablscriptFind_1.FindType.FIND_ANY:
-            case mablscriptFind_1.FindType.FIND_ALL:
-                formatted.findType = FindAction_1.findTypesToFormattedType[find.findType];
-                formatted.selector = find.findTarget;
-                break;
-            case mablscriptFind_1.FindType.FIND_ONE:
-                formatted.selector = find.findTarget.selector;
-                break;
-            default:
-                throw new Error(`Error generating step descriptor for ${this.getStepName()}: Unexpected find type ${find.findType}`);
+        const find = this.primaryAction.toDescriptor();
+        formatted.findOptions = find.selectorFindOption;
+        if ((0, GetCurrentLocationDescriptor_1.isGetCurrentLocationDescriptor)(find) || (0, GetVariableDescriptor_1.isGetVariableDescriptor)(find)) {
+            formatted.kind = find.kind;
+        }
+        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;
+                    break;
+                case domUtil_1.FindType.FIND_FIRST:
+                case domUtil_1.FindType.FIND_LAST:
+                case domUtil_1.FindType.FIND_ANY:
+                case domUtil_1.FindType.FIND_ALL:
+                    formatted.findType = FindAction_1.findTypesToFormattedType[find.findType];
+                    formatted.selector = find.findTarget;
+                    break;
+                case domUtil_1.FindType.FIND_ONE:
+                    formatted.selector = find.findTarget.selector;
+                    break;
+                default:
+                    throw new Error(`Error generating step descriptor for ${this.getStepName()}: Unexpected find type ${find.findType}`);
+            }
         }
+        formatted.continueOnFailure = this.continueOnFailure;
+        formatted.observationScope = this.observationScope;
         return formatted;
     }
     getNewAssertionStep() {
-        const yamlified = importer_1.yamlifyTheLoadedSteps([this]);
-        const reloadedSteps = importer_1.loadYamlSteps(yamlified);
+        const yamlified = (0, importer_1.yamlifyTheLoadedSteps)([this]);
+        const reloadedSteps = (0, importer_1.loadYamlSteps)(yamlified);
         const result = reloadedSteps[0];
         if (this.stepSourceIndexInFlow !== undefined) {
             result.setStepSourceIndexInFlow(this.stepSourceIndexInFlow);

package/mablscript/steps/AwaitTabStep.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AwaitTabStep = void 0;
+const domUtil_1 = require("../../domUtil");
 const MablStep_1 = require("../MablStep");
 class AwaitTabStep extends MablStep_1.MablStep {
     constructor(name, args, actions) {
@@ -20,14 +21,14 @@ class AwaitTabStep extends MablStep_1.MablStep {
     }
     toMablscript() {
         const mablscriptSelectorChunks = ['selector_type: "tab"'];
-        if (this.tab.title) {
-            mablscriptSelectorChunks.push(`title: "${this.tab.title}"`);
+        if (this.tab.title !== undefined) {
+            mablscriptSelectorChunks.push(`title: "${(0, domUtil_1.escapeMablscriptString)(this.tab.title)}"`);
         }
-        if (this.tab.url) {
-            mablscriptSelectorChunks.push(`url: "${this.tab.url}"`);
+        if (this.tab.url !== undefined) {
+            mablscriptSelectorChunks.push(`url: "${(0, domUtil_1.escapeMablscriptString)(this.tab.url)}"`);
         }
-        if (this.tab.uuid) {
-            mablscriptSelectorChunks.push(`uuid: "${this.tab.uuid}"`);
+        if (this.tab.uuid !== undefined) {
+            mablscriptSelectorChunks.push(`uuid: "${(0, domUtil_1.escapeMablscriptString)(this.tab.uuid)}"`);
         }
         return `await_tab({${mablscriptSelectorChunks.join(', ')}})`;
     }

package/mablscript/steps/ClickAndHoldStep.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ClickAndHoldStep = void 0;
 const FindAction_1 = require("../actions/FindAction");
 const MablStep_1 = require("../MablStep");
-const mablscriptFind_1 = require("../../mablscriptFind");
+const domUtil_1 = require("../../domUtil");
 const ActionsUtils_1 = require("./ActionsUtils");
 class ClickAndHoldStep extends MablStep_1.MablStep {
     constructor(name, args, actions) {
@@ -30,10 +30,10 @@ class ClickAndHoldStep extends MablStep_1.MablStep {
     toStepDescriptor() {
         const find = this.findAction.toDescriptor();
         switch (find.findType) {
-            case mablscriptFind_1.FindType.FIND_FIRST:
-            case mablscriptFind_1.FindType.FIND_LAST:
-            case mablscriptFind_1.FindType.FIND_ANY:
-            case mablscriptFind_1.FindType.FIND_ONE:
+            case domUtil_1.FindType.FIND_FIRST:
+            case domUtil_1.FindType.FIND_LAST:
+            case domUtil_1.FindType.FIND_ANY:
+            case domUtil_1.FindType.FIND_ONE:
                 return {
                     find,
                     isHtml5: this.clickArgs.isHtml5,
@@ -55,7 +55,7 @@ class ClickAndHoldStep extends MablStep_1.MablStep {
         return new ClickAndHoldStep('click_and_hold', [], [FindAction_1.FindAction.findActionFromStepArgs(stepArgs)]);
     }
     toMablscript() {
-        return `${this.findAction.toMablscript()}.click_and_hold()`;
+        return `${this.findAction.toMablscript()}.click_and_hold({isHtml5:${this.clickArgs.isHtml5}})`;
     }
 }
 exports.ClickAndHoldStep = ClickAndHoldStep;

package/mablscript/steps/ClickStep.js

@@ -4,7 +4,7 @@ exports.ClickStep = void 0;
 const FindAction_1 = require("../actions/FindAction");
 const SeleniumIdeStep_1 = require("./SeleniumIdeStep");
 const MablStep_1 = require("../MablStep");
-const mablscriptFind_1 = require("../../mablscriptFind");
+const domUtil_1 = require("../../domUtil");
 const ActionsUtils_1 = require("./ActionsUtils");
 class ClickStep extends MablStep_1.MablStep {
     constructor(name, args, actions) {
@@ -17,10 +17,10 @@ class ClickStep extends MablStep_1.MablStep {
     toStepDescriptor() {
         const find = this.findAction.toDescriptor();
         switch (find.findType) {
-            case mablscriptFind_1.FindType.FIND_FIRST:
-            case mablscriptFind_1.FindType.FIND_LAST:
-            case mablscriptFind_1.FindType.FIND_ANY:
-            case mablscriptFind_1.FindType.FIND_ONE:
+            case domUtil_1.FindType.FIND_FIRST:
+            case domUtil_1.FindType.FIND_LAST:
+            case domUtil_1.FindType.FIND_ANY:
+            case domUtil_1.FindType.FIND_ONE:
                 return {
                     find,
                     descriptorToActionMap: new Map().set(find, this.findAction),
@@ -38,7 +38,7 @@ class ClickStep extends MablStep_1.MablStep {
         };
     }
     produceSelIdeFormattedSteps(_stepIndex) {
-        const seleniumStep = SeleniumIdeStep_1.buildSeleniumIdeStep('click', this);
+        const seleniumStep = (0, SeleniumIdeStep_1.buildSeleniumIdeStep)('click', this);
         seleniumStep.target = this.findAction.getSelIdeTarget();
         return [seleniumStep];
     }

package/mablscript/steps/CreateVariableStep.js

@@ -8,7 +8,7 @@ const FindAction_1 = require("../actions/FindAction");
 const GenerateEmailAddressAction_1 = require("../actions/GenerateEmailAddressAction");
 const GenerateRandomStringAction_1 = require("../actions/GenerateRandomStringAction");
 const CreateVariableStepDescriptor_1 = require("../types/CreateVariableStepDescriptor");
-const mablscriptFind_1 = require("../../mablscriptFind");
+const domUtil_1 = require("../../domUtil");
 const JavaScriptAction_1 = require("../actions/JavaScriptAction");
 const CountAction_1 = require("../actions/CountAction");
 class CreateVariableStep extends MablStep_1.MablStep {
@@ -156,10 +156,10 @@ class CreateVariableStep extends MablStep_1.MablStep {
         switch (this.generationType) {
             case CreateVariableStepDescriptor_1.VariableGenerator.ATTRIBUTE:
                 if (this.actions[1].extractionAttribute === 'innerText') {
-                    seleniumStep = SeleniumIdeStep_1.buildSeleniumIdeStep('storeText', this);
+                    seleniumStep = (0, SeleniumIdeStep_1.buildSeleniumIdeStep)('storeText', this);
                 }
                 else {
-                    seleniumStep = SeleniumIdeStep_1.buildSeleniumIdeStep('storeAttribute', this);
+                    seleniumStep = (0, SeleniumIdeStep_1.buildSeleniumIdeStep)('storeAttribute', this);
                 }
                 seleniumStep.target = this.actions[0].getSelIdeTarget();
                 seleniumStep.value = this.variableName;
@@ -176,20 +176,20 @@ class CreateVariableStep extends MablStep_1.MablStep {
                     return `\${Math.round((Math.pow(36, ${length} + 1) - Math.random() * Math.pow(36, ${length}))).toString(36).slice(1)}`;
                 });
                 const executeScript = 'return ' + '`' + translated + '`';
-                seleniumStep = SeleniumIdeStep_1.buildSeleniumIdeStep('executeScript', this);
+                seleniumStep = (0, SeleniumIdeStep_1.buildSeleniumIdeStep)('executeScript', this);
                 seleniumStep.target = executeScript;
                 seleniumStep.value = this.variableName;
                 return [seleniumStep];
             case CreateVariableStepDescriptor_1.VariableGenerator.EMAIL:
-                seleniumStep = SeleniumIdeStep_1.buildSeleniumIdeStep('echo', this);
+                seleniumStep = (0, SeleniumIdeStep_1.buildSeleniumIdeStep)('echo', this);
                 seleniumStep.value = `Generate email address for variable name '${this.variableName} is not supported for Selenium IDE export`;
                 return [seleniumStep];
             case CreateVariableStepDescriptor_1.VariableGenerator.ELEMENT_COUNT:
-                seleniumStep = SeleniumIdeStep_1.buildSeleniumIdeStep('echo', this);
+                seleniumStep = (0, SeleniumIdeStep_1.buildSeleniumIdeStep)('echo', this);
                 seleniumStep.value = `Find and store count of elements for variable name '${this.variableName} is not supported for Selenium IDE export`;
                 return [seleniumStep];
             case CreateVariableStepDescriptor_1.VariableGenerator.JAVASCRIPT:
-                seleniumStep = SeleniumIdeStep_1.buildSeleniumIdeStep('echo', this);
+                seleniumStep = (0, SeleniumIdeStep_1.buildSeleniumIdeStep)('echo', this);
                 seleniumStep.value = `[${this.getStepName()}${this.actions[0].javaScript
                     ? ' from JavaScript'
                     : ''}] step for variable name '${this.variableName} is not supported for Selenium IDE export`;
@@ -207,7 +207,7 @@ class CreateVariableStep extends MablStep_1.MablStep {
                 actions.push(new ExtractAction_1.ExtractAction('extract_attribute', [generator.attribute]));
                 break;
             case CreateVariableStepDescriptor_1.VariableGenerator.ELEMENT_COUNT:
-                actions.push(FindAction_1.FindAction.findActionFromStepArgs(stepArgs, mablscriptFind_1.FindType.FIND_ALL));
+                actions.push(FindAction_1.FindAction.findActionFromStepArgs(stepArgs, domUtil_1.FindType.FIND_ALL));
                 actions.push(new CountAction_1.CountAction('count', []));
                 break;
             case CreateVariableStepDescriptor_1.VariableGenerator.EMAIL:

package/mablscript/steps/DoubleClickStep.js

@@ -4,7 +4,7 @@ exports.DoubleClickStep = void 0;
 const SeleniumIdeStep_1 = require("./SeleniumIdeStep");
 const MablStep_1 = require("../MablStep");
 const FindAction_1 = require("../actions/FindAction");
-const mablscriptFind_1 = require("../../mablscriptFind");
+const domUtil_1 = require("../../domUtil");
 class DoubleClickStep extends MablStep_1.MablStep {
     constructor(name, args, actions) {
         super(name, args, actions);
@@ -22,11 +22,11 @@ class DoubleClickStep extends MablStep_1.MablStep {
     toStepDescriptor() {
         const find = this.findAction.toDescriptor();
         switch (find.findType) {
-            case mablscriptFind_1.FindType.FIND_FIRST:
-            case mablscriptFind_1.FindType.FIND_LAST:
-            case mablscriptFind_1.FindType.FIND_ANY:
-            case mablscriptFind_1.FindType.FIND_ALL:
-            case mablscriptFind_1.FindType.FIND_ONE:
+            case domUtil_1.FindType.FIND_FIRST:
+            case domUtil_1.FindType.FIND_LAST:
+            case domUtil_1.FindType.FIND_ANY:
+            case domUtil_1.FindType.FIND_ALL:
+            case domUtil_1.FindType.FIND_ONE:
                 return {
                     find,
                     descriptorToActionMap: new Map().set(find, this.findAction),
@@ -47,7 +47,7 @@ class DoubleClickStep extends MablStep_1.MablStep {
         return new DoubleClickStep('double_click', [], [FindAction_1.FindAction.findActionFromStepArgs(stepArgs)]);
     }
     produceSelIdeFormattedSteps(_stepIndex) {
-        const seleniumStep = SeleniumIdeStep_1.buildSeleniumIdeStep('doubleClick', this);
+        const seleniumStep = (0, SeleniumIdeStep_1.buildSeleniumIdeStep)('doubleClick', this);
         seleniumStep.target = this.findAction.getSelIdeTarget();
         return [seleniumStep];
     }

package/mablscript/steps/DownloadStep.js

@@ -4,6 +4,7 @@ exports.DownloadStep = void 0;
 const MablStep_1 = require("../MablStep");
 const AwaitDownloadAction_1 = require("../actions/AwaitDownloadAction");
 const AwaitPDFDownloadAction_1 = require("../actions/AwaitPDFDownloadAction");
+const domUtil_1 = require("../../domUtil");
 class DownloadStep extends MablStep_1.MablStep {
     constructor(name, args, actions) {
         var _a;
@@ -77,8 +78,8 @@ class DownloadStep extends MablStep_1.MablStep {
         return new DownloadStep('assert_download', [fileAttributes], [awaitDownloadAction]);
     }
     toMablscript() {
-        const mablArgs = this.convertObjectToMablscriptArgs(this.fileAttributes);
-        return `${this.awaitDownloadAction.toMablscript()}.assert_download(${mablArgs})`;
+        const mablArgs = (0, domUtil_1.buildStepArgumentString)(this.fileAttributes);
+        return `${this.awaitDownloadAction.toMablscript()}.assert_download(${mablArgs ? mablArgs : ''})`;
     }
 }
 exports.DownloadStep = DownloadStep;

package/mablscript/steps/EchoStep.js

@@ -2,12 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EchoStep = void 0;
 const MablStep_1 = require("../MablStep");
+const domUtil_1 = require("../../domUtil");
 const SeleniumIdeStep_1 = require("./SeleniumIdeStep");
 const MablAction_1 = require("../MablAction");
 class EchoStep extends MablStep_1.MablStep {
     constructor(name, args, actions) {
         super(name, args, actions);
-        this.echoValue = MablAction_1.parseArgument(this.getActionArgs()[0]);
+        this.echoValue = (0, MablAction_1.parseArgument)(this.getActionArgs()[0]);
     }
     getStepName() {
         return 'Echo';
@@ -16,7 +17,7 @@ class EchoStep extends MablStep_1.MablStep {
         return { value: this.echoValue.toString() };
     }
     produceSelIdeFormattedSteps(_stepIndex) {
-        const seleniumStep = SeleniumIdeStep_1.buildSeleniumIdeStep('echo', this);
+        const seleniumStep = (0, SeleniumIdeStep_1.buildSeleniumIdeStep)('echo', this);
         seleniumStep.target = this.substituteSeleniumVariable(this.echoValue);
         return [seleniumStep];
     }
@@ -24,7 +25,8 @@ class EchoStep extends MablStep_1.MablStep {
         return new EchoStep('echo', [stepArgs.value], []);
     }
     toMablscript() {
-        return `echo(${this.substituteMablscriptVariable(this.echoValue)})`;
+        const stringEchoValue = `${this.echoValue}`;
+        return `echo("${(0, domUtil_1.escapeMablscriptString)(stringEchoValue)}")`;
     }
 }
 exports.EchoStep = EchoStep;

package/mablscript/steps/ElseIfConditionStep.js

@@ -1,17 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ElseIfConditionStep = void 0;
+const MablAction_1 = require("../MablAction");
 const IfConditionStep_1 = require("./IfConditionStep");
 class ElseIfConditionStep extends IfConditionStep_1.IfConditionStep {
     getStepName() {
         return 'ElseIf';
     }
     static fromYaml(_stepName, stepArgs) {
-        const actions = IfConditionStep_1.IfConditionStep.getActionsFromYamlForCondition(stepArgs);
+        const actions = [new MablAction_1.MablAction('conditional_else', [])];
+        actions.push(...IfConditionStep_1.IfConditionStep.getActionsFromYamlForCondition(stepArgs));
         return new ElseIfConditionStep('conditional_else_if', [], actions);
     }
     toMablscript() {
-        return `conditional_else().${this.actions.reduce((mablscript, action) => `${mablscript}${action.toMablscript()}.`, '')}conditional_else_if()`;
+        const actions = this.actions.reduce((mablscript, action) => `${mablscript}${action.toMablscript()}.`, '');
+        return `conditional_else()${actions}conditional_else_if()`;
     }
 }
 exports.ElseIfConditionStep = ElseIfConditionStep;

package/mablscript/steps/EnterTextStep.js

@@ -5,14 +5,14 @@ const FindAction_1 = require("../actions/FindAction");
 const SeleniumIdeStep_1 = require("./SeleniumIdeStep");
 const MablAction_1 = require("../MablAction");
 const MablStep_1 = require("../MablStep");
-const mablscriptFind_1 = require("../../mablscriptFind");
+const domUtil_1 = require("../../domUtil");
 class EnterTextStep extends MablStep_1.MablStep {
     constructor(name, args, actions) {
         super(name, args, actions);
         const arg = this.getActionArgs()[0];
-        this.text = MablAction_1.parseArgument(arg);
+        this.text = (0, MablAction_1.parseArgument)(arg);
         this.validate();
-        if (mablscriptFind_1.isFindElementType(this.actions[0].getActionName())) {
+        if ((0, domUtil_1.isFindElementType)(this.actions[0].getActionName())) {
             this.findAction = this.actions[0];
         }
         else {
@@ -30,10 +30,10 @@ class EnterTextStep extends MablStep_1.MablStep {
     toStepDescriptor() {
         const find = this.findAction.toDescriptor();
         switch (find.findType) {
-            case mablscriptFind_1.FindType.FIND_FIRST:
-            case mablscriptFind_1.FindType.FIND_LAST:
-            case mablscriptFind_1.FindType.FIND_ANY:
-            case mablscriptFind_1.FindType.FIND_ONE:
+            case domUtil_1.FindType.FIND_FIRST:
+            case domUtil_1.FindType.FIND_LAST:
+            case domUtil_1.FindType.FIND_ANY:
+            case domUtil_1.FindType.FIND_ONE:
                 return {
                     find,
                     descriptorToActionMap: new Map().set(find, this.findAction),
@@ -56,7 +56,7 @@ class EnterTextStep extends MablStep_1.MablStep {
         if (this.description) {
             formatted[stepName].description = this.description;
         }
-        if (step.find.findType === mablscriptFind_1.FindType.FIND_ONE) {
+        if (step.find.findType === domUtil_1.FindType.FIND_ONE) {
             formatted[stepName].selector = step.find.findTarget.selector;
             if ((_a = step.find.findTarget.auxiliaryDescriptors) === null || _a === void 0 ? void 0 : _a.length) {
                 formatted[stepName].selectorAncestors =
@@ -71,7 +71,7 @@ class EnterTextStep extends MablStep_1.MablStep {
         return formatted;
     }
     produceSelIdeFormattedSteps(_stepIndex) {
-        const seleniumStep = SeleniumIdeStep_1.buildSeleniumIdeStep('type', this);
+        const seleniumStep = (0, SeleniumIdeStep_1.buildSeleniumIdeStep)('type', this);
         seleniumStep.target = this.findAction.getSelIdeTarget();
         seleniumStep.value = this.substituteSeleniumVariable(this.text);
         return [seleniumStep];
@@ -80,7 +80,10 @@ class EnterTextStep extends MablStep_1.MablStep {
         return new EnterTextStep('enter_text', [stepArgs.text], [FindAction_1.FindAction.findActionFromStepArgs(stepArgs)]);
     }
     toMablscript() {
-        return `${this.findAction.toMablscript()}.enter_text(${this.substituteMablscriptVariable(this.text)})`;
+        const enterText = typeof this.text === 'string'
+            ? `"${(0, domUtil_1.escapeMablscriptString)(this.text)}"`
+            : this.substituteMablscriptVariable(this.text);
+        return `${this.findAction.toMablscript()}.enter_text(${enterText})`;
     }
 }
 exports.EnterTextStep = EnterTextStep;

package/mablscript/steps/EvaluateFlowStep.js

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EvaluateFlowStep = void 0;
+const MablStep_1 = require("../MablStep");
+const domUtil_1 = require("../../domUtil");
+class EvaluateFlowStep extends MablStep_1.MablStep {
+    constructor(name, args, actions) {
+        super(name, args, actions);
+        if (args.length < 1 || args.length > 2) {
+            throw new Error('EvaluateFlowStep expects 1 or 2 arguments');
+        }
+        this.flowDescriptor = this.getActionArgs()[0];
+        if (args.length === 2) {
+            this.config = this.getActionArgs()[1];
+        }
+    }
+    getStepName() {
+        return EvaluateFlowStep.yamlMablScriptNames[0];
+    }
+    toStepDescriptor() {
+        return {
+            descriptor: this.flowDescriptor,
+            config: this.config,
+        };
+    }
+    static fromYaml(_stepName, stepArgs) {
+        const { descriptor, config } = stepArgs;
+        return new EvaluateFlowStep(EvaluateFlowStep.mablScriptStepNames[0], [descriptor, config], []);
+    }
+    toMablscript() {
+        const flowReference = (0, domUtil_1.buildStepArgumentString)(this.flowDescriptor);
+        const flowConfig = this.config
+            ? ', ' + (0, domUtil_1.buildStepArgumentString)(this.config)
+            : '';
+        return `${EvaluateFlowStep.mablScriptStepNames[0]}(${flowReference}${flowConfig})`;
+    }
+}
+exports.EvaluateFlowStep = EvaluateFlowStep;
+EvaluateFlowStep.mablScriptStepNames = ['evaluate_flow'];
+EvaluateFlowStep.yamlMablScriptNames = ['EvaluateFlow'];

package/mablscript/steps/HoverStep.js

@@ -4,7 +4,7 @@ exports.HoverStep = void 0;
 const FindAction_1 = require("../actions/FindAction");
 const SeleniumIdeStep_1 = require("./SeleniumIdeStep");
 const MablStep_1 = require("../MablStep");
-const mablscriptFind_1 = require("../../mablscriptFind");
+const domUtil_1 = require("../../domUtil");
 class HoverStep extends MablStep_1.MablStep {
     constructor(name, args, actions) {
         super(name, args, actions);
@@ -22,10 +22,10 @@ class HoverStep extends MablStep_1.MablStep {
     toStepDescriptor() {
         const find = this.findAction.toDescriptor();
         switch (find.findType) {
-            case mablscriptFind_1.FindType.FIND_FIRST:
-            case mablscriptFind_1.FindType.FIND_LAST:
-            case mablscriptFind_1.FindType.FIND_ANY:
-            case mablscriptFind_1.FindType.FIND_ONE:
+            case domUtil_1.FindType.FIND_FIRST:
+            case domUtil_1.FindType.FIND_LAST:
+            case domUtil_1.FindType.FIND_ANY:
+            case domUtil_1.FindType.FIND_ONE:
                 return {
                     find,
                     descriptorToActionMap: new Map().set(find, this.findAction),
@@ -46,7 +46,7 @@ class HoverStep extends MablStep_1.MablStep {
         return new HoverStep('hover', [], [FindAction_1.FindAction.findActionFromStepArgs(stepArgs)]);
     }
     produceSelIdeFormattedSteps(_stepIndex) {
-        const seleniumStep = SeleniumIdeStep_1.buildSeleniumIdeStep('mouseOver', this);
+        const seleniumStep = (0, SeleniumIdeStep_1.buildSeleniumIdeStep)('mouseOver', this);
         seleniumStep.target = this.findAction.getSelIdeTarget();
         return [seleniumStep];
     }

package/mablscript/steps/IfConditionStep.js

@@ -7,7 +7,7 @@ const AssertStep_1 = require("./AssertStep");
 const FindAction_1 = require("../actions/FindAction");
 const MablStep_1 = require("../MablStep");
 const ExtractAction_1 = require("../actions/ExtractAction");
-const mablscriptFind_1 = require("../../mablscriptFind");
+const domUtil_1 = require("../../domUtil");
 const JavaScriptAction_1 = require("../actions/JavaScriptAction");
 const GetUrlAction_1 = require("../actions/GetUrlAction");
 const ConditionDescriptor_1 = require("../types/ConditionDescriptor");
@@ -34,7 +34,8 @@ class IfConditionStep extends MablStep_1.MablStep {
     toStepDescriptor() {
         var _a, _b;
         const conditionDescriptor = this.conditionAction !== undefined
-            ? (_a = this.conditionAction) === null || _a === void 0 ? void 0 : _a.conditionDescriptor : { conditionType: ConditionDescriptor_1.ConditionType.Truthy };
+            ? (_a = this.conditionAction) === null || _a === void 0 ? void 0 : _a.conditionDescriptor
+            : { conditionType: ConditionDescriptor_1.ConditionType.Truthy };
         const find = this.primaryAction.toDescriptor();
         return {
             find,
@@ -76,13 +77,13 @@ class IfConditionStep extends MablStep_1.MablStep {
         if (this.primaryAction instanceof FindAction_1.FindAction) {
             const find = this.primaryAction.toDescriptor();
             switch (find.findType) {
-                case mablscriptFind_1.FindType.FIND_FIRST:
-                case mablscriptFind_1.FindType.FIND_LAST:
-                case mablscriptFind_1.FindType.FIND_ANY:
-                case mablscriptFind_1.FindType.FIND_ALL:
+                case domUtil_1.FindType.FIND_FIRST:
+                case domUtil_1.FindType.FIND_LAST:
+                case domUtil_1.FindType.FIND_ANY:
+                case domUtil_1.FindType.FIND_ALL:
                     details.selector = find.findTarget;
                     break;
-                case mablscriptFind_1.FindType.FIND_ONE:
+                case domUtil_1.FindType.FIND_ONE:
                     details.selector = find.findTarget.selector;
                     if (find.findOptions) {
                         details.findOptions = find.findOptions;

package/mablscript/steps/NavigateStep.js

@@ -17,7 +17,7 @@ class NavigateStep extends MablStep_1.MablStep {
         };
     }
     produceSelIdeFormattedSteps(_stepIndex) {
-        const seleniumStep = SeleniumIdeStep_1.buildSeleniumIdeStep('executeScript', this);
+        const seleniumStep = (0, SeleniumIdeStep_1.buildSeleniumIdeStep)('executeScript', this);
         seleniumStep.target = 'window.location.reload()';
         return [seleniumStep];
     }

package/mablscript/steps/ReleaseStep.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ReleaseStep = void 0;
 const FindAction_1 = require("../actions/FindAction");
 const MablStep_1 = require("../MablStep");
-const mablscriptFind_1 = require("../../mablscriptFind");
+const domUtil_1 = require("../../domUtil");
 const ActionsUtils_1 = require("./ActionsUtils");
 class ReleaseStep extends MablStep_1.MablStep {
     constructor(name, args, actions) {
@@ -30,10 +30,10 @@ class ReleaseStep extends MablStep_1.MablStep {
     toStepDescriptor() {
         const find = this.findAction.toDescriptor();
         switch (find.findType) {
-            case mablscriptFind_1.FindType.FIND_FIRST:
-            case mablscriptFind_1.FindType.FIND_LAST:
-            case mablscriptFind_1.FindType.FIND_ANY:
-            case mablscriptFind_1.FindType.FIND_ONE:
+            case domUtil_1.FindType.FIND_FIRST:
+            case domUtil_1.FindType.FIND_LAST:
+            case domUtil_1.FindType.FIND_ANY:
+            case domUtil_1.FindType.FIND_ONE:
                 return {
                     find,
                     isHtml5: this.releaseArgs.isHtml5,
@@ -55,7 +55,8 @@ class ReleaseStep extends MablStep_1.MablStep {
         return new ReleaseStep('release', [], [FindAction_1.FindAction.findActionFromStepArgs(stepArgs)]);
     }
     toMablscript() {
-        return `${this.findAction.toMablscript()}.release()`;
+        const args = this.convertObjectToMablscriptArgs(this.releaseArgs);
+        return `${this.findAction.toMablscript()}.release(${args})`;
     }
 }
 exports.ReleaseStep = ReleaseStep;

package/mablscript/steps/RemoveCookieStep.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.RemoveCookieStep = void 0;
 const MablStep_1 = require("../MablStep");
 const CookieUtils_1 = require("./CookieUtils");
+const domUtil_1 = require("../../domUtil");
 class RemoveCookieStep extends MablStep_1.MablStep {
     constructor(name, args, actions) {
         super(name, args, actions);
@@ -20,9 +21,7 @@ class RemoveCookieStep extends MablStep_1.MablStep {
         return new RemoveCookieStep('remove_cookie', [stepArgs], []);
     }
     toMablscript() {
-        return `remove_cookie(${this.convertObjectToMablscriptArgs({
-            name: this.cookieName,
-        })})`;
+        return `remove_cookie({ name : "${(0, domUtil_1.escapeMablscriptString)(this.cookieName)}" })`;
     }
 }
 exports.RemoveCookieStep = RemoveCookieStep;

package/mablscript/steps/SelectStep.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SelectStep = void 0;
 const FindAction_1 = require("../actions/FindAction");
 const MablStep_1 = require("../MablStep");
-const mablscriptFind_1 = require("../../mablscriptFind");
+const domUtil_1 = require("../../domUtil");
 class SelectStep extends MablStep_1.MablStep {
     constructor(name, args, actions) {
         super(name, args, actions);
@@ -26,10 +26,10 @@ class SelectStep extends MablStep_1.MablStep {
         const formatted = { ...selectOptionsCopy };
         const find = this.findAction.toDescriptor();
         switch (find.findType) {
-            case mablscriptFind_1.FindType.FIND_FIRST:
-            case mablscriptFind_1.FindType.FIND_LAST:
-            case mablscriptFind_1.FindType.FIND_ANY:
-            case mablscriptFind_1.FindType.FIND_ONE:
+            case domUtil_1.FindType.FIND_FIRST:
+            case domUtil_1.FindType.FIND_LAST:
+            case domUtil_1.FindType.FIND_ANY:
+            case domUtil_1.FindType.FIND_ONE:
                 formatted.find = find;
                 formatted.descriptorToActionMap = new Map().set(find, this.findAction);
                 return formatted;

package/mablscript/steps/SendHttpRequestStep.js

@@ -2,8 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VariableSource = exports.HttpResponseAssertion = exports.SendHttpRequestStep = void 0;
 const MablStep_1 = require("../MablStep");
-const AssertStep_1 = require("./AssertStep");
 const ConditionDescriptor_1 = require("../types/ConditionDescriptor");
+const AssertStep_1 = require("./AssertStep");
+const domUtil_1 = require("../../domUtil");
 const evalAssertionType = {};
 Object.entries(AssertStep_1.assertionStepToField).forEach(([stepType, field]) => (evalAssertionType[field] = `${stepType.split('Assert')[1]}`));
 class SendHttpRequestStep extends MablStep_1.MablStep {
@@ -36,8 +37,7 @@ class SendHttpRequestStep extends MablStep_1.MablStep {
         return new SendHttpRequestStep('send_http_request', [formatted], []);
     }
     toMablscript() {
-        const stepAsSource = MablStep_1.buildSourceRepresentationOfObject(this.sendRequest);
-        return `send_http_request(${stepAsSource})`;
+        return `send_http_request(${(0, domUtil_1.buildStepArgumentString)(this.sendRequest)})`;
     }
 }
 exports.SendHttpRequestStep = SendHttpRequestStep;