@mablhq/mabl-cli 1.17.0 → 1.19.3

package/mablscript/diffing/diffingUtil.js

@@ -0,0 +1,146 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.diffFlows = exports.diffTests = exports.convertDiffingFormatIntoDiffingSteps = exports.flattenTestFlowsIntoLineDiffingFormat = exports.convertFlowToStepList = exports.lineModeDiff = exports.DiffOperation = void 0;
+const mablApi_1 = require("../../mablApi");
+const importer_1 = require("../importer");
+const EvaluateFlowStep_1 = require("../steps/EvaluateFlowStep");
+const diffPatchMatch_1 = __importDefault(require("./diffPatchMatch"));
+const fast_json_stable_stringify_1 = __importDefault(require("fast-json-stable-stringify"));
+var DiffOperation;
+(function (DiffOperation) {
+    DiffOperation["DELETE"] = "DELETE";
+    DiffOperation["EQUAL"] = "EQUAL";
+    DiffOperation["INSERT"] = "INSERT";
+})(DiffOperation = exports.DiffOperation || (exports.DiffOperation = {}));
+function lineModeDiff(text1, text2) {
+    const dmp = new diffPatchMatch_1.default();
+    const lineToCharDiff = dmp.diff_linesToChars(text1, text2);
+    const lineText1 = lineToCharDiff.chars1;
+    const lineText2 = lineToCharDiff.chars2;
+    const lineArray = lineToCharDiff.lineArray;
+    const diffs = dmp.diff_main(lineText1, lineText2, false);
+    dmp.diff_charsToLines(diffs, lineArray);
+    const typedDiff = diffs.map((diff) => ({
+        operation: convertOperationValue(diff[0]),
+        text: diff[1],
+    }));
+    return typedDiff;
+}
+exports.lineModeDiff = lineModeDiff;
+function convertOperationValue(op) {
+    switch (op) {
+        case -1:
+            return DiffOperation.DELETE;
+        case 0:
+            return DiffOperation.EQUAL;
+        case 1:
+            return DiffOperation.INSERT;
+        default:
+            return DiffOperation.EQUAL;
+    }
+}
+function convertFlowToStepList(flow, flowConfig) {
+    if (!flow.reusable && flow.flow_type === mablApi_1.Flow.FlowTypeEnum.Mablscript) {
+        return (0, importer_1.parseMablScriptIntoSteps)(flow);
+    }
+    const evaluateFlowStep = new EvaluateFlowStep_1.EvaluateFlowStep(EvaluateFlowStep_1.EvaluateFlowStep.mablScriptStepNames[0], [
+        {
+            invariant_id: flow === null || flow === void 0 ? void 0 : flow.invariant_id,
+        },
+        flowConfig,
+    ], []);
+    if (flow.description) {
+        evaluateFlowStep.setDescription(flow.description);
+    }
+    return [evaluateFlowStep];
+}
+exports.convertFlowToStepList = convertFlowToStepList;
+function flattenTestFlowsIntoSteps(flows, flowConfig) {
+    return flows.flatMap((flow, index) => convertFlowToStepList(flow, flowConfig === null || flowConfig === void 0 ? void 0 : flowConfig[index]));
+}
+function flattenTestFlowsIntoLineDiffingFormat(flows, flowConfig) {
+    const flattenedSteps = flattenTestFlowsIntoSteps(flows, flowConfig);
+    const diffingFormat = flattenedSteps
+        .map((step) => step.toLineDiffFormat())
+        .join('\n');
+    return { flattenedSteps, diffingFormat };
+}
+exports.flattenTestFlowsIntoLineDiffingFormat = flattenTestFlowsIntoLineDiffingFormat;
+function convertDiffingFormatIntoDiffingSteps(diffs, sourceSteps, targetSteps) {
+    const leftSteps = [...sourceSteps];
+    const rightSteps = [...targetSteps];
+    leftSteps.forEach((step) => {
+        step.setStepSourceIndexInFlow(0);
+    });
+    rightSteps.forEach((step) => {
+        step.setStepSourceIndexInFlow(0);
+    });
+    const stepDiffs = diffs.map((diff) => {
+        const lineDiffs = diff.text.trim().split('\n');
+        const stepDiffCount = lineDiffs.length;
+        let steps = [];
+        switch (diff.operation) {
+            case DiffOperation.EQUAL:
+                steps = leftSteps.splice(0, stepDiffCount);
+                rightSteps.splice(0, stepDiffCount);
+                break;
+            case DiffOperation.INSERT:
+                steps = rightSteps.splice(0, stepDiffCount);
+                break;
+            case DiffOperation.DELETE:
+                steps = leftSteps.splice(0, stepDiffCount);
+                break;
+        }
+        return {
+            operation: diff.operation,
+            steps,
+        };
+    });
+    return stepDiffs;
+}
+exports.convertDiffingFormatIntoDiffingSteps = convertDiffingFormatIntoDiffingSteps;
+function diffTests(test1Flows, test1FlowConfig, test2Flows, test2FlowConfig) {
+    const { flattenedSteps: flattenedTest1Steps, diffingFormat: test1DiffingFormat, } = flattenTestFlowsIntoLineDiffingFormat(test1Flows, test1FlowConfig);
+    const { flattenedSteps: flattenedTest2Steps, diffingFormat: test2DiffingFormat, } = flattenTestFlowsIntoLineDiffingFormat(test2Flows, test2FlowConfig);
+    const diffs = lineModeDiff(test1DiffingFormat, test2DiffingFormat);
+    return convertDiffingFormatIntoDiffingSteps(diffs, flattenedTest1Steps, flattenedTest2Steps);
+}
+exports.diffTests = diffTests;
+function diffFlows(flow1, flow2) {
+    var _a, _b;
+    const flow1Steps = (0, importer_1.parseMablScriptIntoSteps)(flow1);
+    const formattedFlow1Steps = flow1Steps
+        .map((step) => step.toLineDiffFormat())
+        .join('\n');
+    const flow2Steps = (0, importer_1.parseMablScriptIntoSteps)(flow2);
+    const formattedFlow2Steps = flow2Steps
+        .map((step) => step.toLineDiffFormat())
+        .join('\n');
+    const flattenedDiffs = lineModeDiff(formattedFlow1Steps, formattedFlow2Steps);
+    const stepDiffs = convertDiffingFormatIntoDiffingSteps(flattenedDiffs, flow1Steps, flow2Steps);
+    const parametersDiff = diffFlowVariables(flow1.parameters, flow2.parameters);
+    const inputVariablesDiff = diffFlowVariables((_a = flow1.variables) === null || _a === void 0 ? void 0 : _a.inputs, (_b = flow2.variables) === null || _b === void 0 ? void 0 : _b.inputs);
+    return { stepDiff: stepDiffs, parametersDiff, inputVariablesDiff };
+}
+exports.diffFlows = diffFlows;
+function diffFlowVariables(flow1Variables, flow2Variables) {
+    const flow1VariablesFlattened = flattenFlowVariables(flow1Variables);
+    const flow2VariablesFlattened = flattenFlowVariables(flow2Variables);
+    const diffs = lineModeDiff(flow1VariablesFlattened, flow2VariablesFlattened);
+    const flowVariablesDiff = diffs.map((diff) => {
+        const variablesStringified = diff.text.trim().split('\n');
+        const reassembledVariables = variablesStringified.map((variablesText) => JSON.parse(variablesText));
+        return {
+            operation: diff.operation,
+            variables: reassembledVariables,
+        };
+    });
+    return flowVariablesDiff;
+}
+function flattenFlowVariables(flowVariables) {
+    var _a;
+    return ((_a = flowVariables === null || flowVariables === void 0 ? void 0 : flowVariables.sort((a, b) => a.name.localeCompare(b.name)).map((parameter) => (0, fast_json_stable_stringify_1.default)(parameter)).join('\n')) !== null && _a !== void 0 ? _a : '');
+}

package/mablscript/importer.js

@@ -51,6 +51,7 @@ const ReleaseStep_1 = require("./steps/ReleaseStep");
 const CountAction_1 = require("./actions/CountAction");
 const loggingProvider_1 = require("../providers/logging/loggingProvider");
 const AccessibilityCheck_1 = require("./steps/AccessibilityCheck");
+const EvaluateFlowStep_1 = require("./steps/EvaluateFlowStep");
 const ActionTypes = [
     AwaitDownloadAction_1.AwaitDownloadAction,
     AwaitPDFDownloadAction_1.AwaitPDFDownloadAction,
@@ -81,6 +82,7 @@ const StepTypes = [
     ElseIfConditionStep_1.ElseIfConditionStep,
     EndStep_1.EndStep,
     EnterTextStep_1.EnterTextStep,
+    EvaluateFlowStep_1.EvaluateFlowStep,
     HoverStep_1.HoverStep,
     IfConditionStep_1.IfConditionStep,
     EvaluateJavaScriptStep_1.EvaluateJavaScriptStep,
@@ -150,9 +152,12 @@ function loadMablScriptIntoSteps(parsedMablscript) {
             action.setActionSourceIndexInStep(actionIndex);
             return action;
         });
-        const step = stepType
+        let step = stepType
             ? new stepType(lastAction.name, lastAction.arguments, actions)
             : new MablStep_1.MablStep(lastAction.name, lastAction.arguments, actions);
+        if (step instanceof AssertStepOld_1.AssertStepOld) {
+            step = step.getNewAssertionStep();
+        }
         step.setActionSourceIndexInStep(actions.length);
         step.setStepSourceIndexInFlow(parseInt(stepIndexString));
         return step;
@@ -169,7 +174,7 @@ StepTypes.forEach((step) => {
     step.yamlMablScriptNames.forEach((name) => (yamlMablscriptToObjectsStepMap[name] = step.fromYaml));
 });
 function loadYamlSteps(yamlSteps) {
-    const loadedStepData = (0, js_yaml_1.safeLoad)(yamlSteps);
+    const loadedStepData = (0, js_yaml_1.load)(yamlSteps);
     return loadedStepData.map((stepObject) => {
         const stepName = Object.keys(stepObject)[0];
         const stepArgs = stepObject[stepName];
@@ -280,6 +285,19 @@ function parseObjectExpression(expression) {
         let key;
         let value;
         switch (property.value.type) {
+            case 'UnaryExpression':
+                key = property.key;
+                value = property.value;
+                const operator = value.operator;
+                const rawValue = Number(value.argument.raw);
+                if (operator === '-') {
+                    value = -Math.abs(rawValue);
+                }
+                else {
+                    throw Error(`Cannot parse UnaryExpression ${property}`);
+                }
+                finalObj[key.name] = value;
+                break;
             case 'Literal':
                 key =
                     property.key.type === 'Identifier'

package/mablscript/steps/AccessibilityCheck.js

@@ -4,7 +4,7 @@ exports.AccessibilityCheckStep = exports.AccessibilityCheckSeverity = void 0;
 const MablStep_1 = require("../MablStep");
 const FindAction_1 = require("../actions/FindAction");
 const ActionsUtils_1 = require("./ActionsUtils");
-const mablscriptFind_1 = require("../../mablscriptFind");
+const domUtil_1 = require("../../domUtil");
 var AccessibilityCheckSeverity;
 (function (AccessibilityCheckSeverity) {
     AccessibilityCheckSeverity["Critical"] = "critical";
@@ -32,10 +32,10 @@ class AccessibilityCheckStep extends MablStep_1.MablStep {
         if (this.findAction) {
             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 {
                         ...this.checkConfig,
                         find,

package/mablscript/steps/AssertStep.js

@@ -6,7 +6,7 @@ const SeleniumIdeStep_1 = require("./SeleniumIdeStep");
 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 GetUrlAction_1 = require("../actions/GetUrlAction");
 const GetCurrentLocationDescriptor_1 = require("../types/GetCurrentLocationDescriptor");
 const GetVariableValue_1 = require("../actions/GetVariableValue");
@@ -37,6 +37,7 @@ exports.fieldToAssertionStep = {};
 Object.entries(exports.assertionStepToField).forEach(([stepType, field]) => (exports.fieldToAssertionStep[field] = stepType));
 class AssertStep extends MablStep_1.MablStep {
     constructor(name, args, actions) {
+        var _a, _b;
         super(name, args, actions);
         const firstAction = actions[0];
         if (firstAction instanceof FindAction_1.FindAction ||
@@ -62,11 +63,12 @@ class AssertStep extends MablStep_1.MablStep {
         this.assertionType = this.conditionAction.conditionAttribute;
         this.assertionValue = this.conditionAction.conditionValueAttribute;
         this.isWaitUntilStep = this.determineIfWaitUntilStep();
-        const assertArguments = args[0] && typeof args[0] === 'object'
-            ? args[0]
-            : undefined;
-        this.continueOnFailure = (assertArguments === null || assertArguments === void 0 ? void 0 : assertArguments.onFailure) === 'continue';
-        this.observationScope = assertArguments === null || assertArguments === void 0 ? void 0 : assertArguments.observationScope;
+        this.assertArguments =
+            args[0] && typeof args[0] === 'object'
+                ? args[0]
+                : undefined;
+        this.continueOnFailure = ((_a = this.assertArguments) === null || _a === void 0 ? void 0 : _a.onFailure) === 'continue';
+        this.observationScope = (_b = this.assertArguments) === null || _b === void 0 ? void 0 : _b.observationScope;
     }
     validate() {
         if (!(this.actions.length === 2 || this.actions.length === 3) &&
@@ -78,7 +80,7 @@ class AssertStep extends MablStep_1.MablStep {
     determineIfWaitUntilStep() {
         var _a, _b;
         const find = this.primaryAction.toDescriptor();
-        if ((0, mablscriptFind_1.isFindElementDescriptor)(find)) {
+        if ((0, domUtil_1.isFindElementDescriptor)(find)) {
             if ((_b = (_a = find.findOptions) === null || _a === void 0 ? void 0 : _a.waitUntil) === null || _b === void 0 ? void 0 : _b.timeoutSeconds) {
                 return true;
             }
@@ -133,19 +135,19 @@ class AssertStep extends MablStep_1.MablStep {
         }
         else {
             switch (find.findType) {
-                case mablscriptFind_1.FindType.FIND_COOKIE:
-                case mablscriptFind_1.FindType.FIND_EMAIL:
+                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 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:
                     formatted.findType = FindAction_1.findTypesToFormattedType[find.findType];
                     formatted.selector = find.findTarget;
                     break;
-                case mablscriptFind_1.FindType.FIND_ONE:
+                case domUtil_1.FindType.FIND_ONE:
                     formatted.selector = find.findTarget.selector;
                     if (find.findOptions) {
                         formatted.findOptions = find.findOptions;
@@ -161,8 +163,14 @@ class AssertStep extends MablStep_1.MablStep {
         const actions = [];
         const assertionType = exports.assertionStepToField[stepName];
         const assertionValue = stepArgs.assertionValue;
-        const findAction = FindAction_1.FindAction.findActionFromStepArgs(stepArgs);
-        actions.push(findAction);
+        let primaryAction;
+        if (stepArgs.kind === GetCurrentLocationDescriptor_1.GET_CURRENT_LOCATION_KIND) {
+            primaryAction = new GetUrlAction_1.GetUrlAction(GetUrlAction_1.GetUrlAction.mablScriptStepNames[0], []);
+        }
+        else {
+            primaryAction = FindAction_1.FindAction.findActionFromStepArgs(stepArgs);
+        }
+        actions.push(primaryAction);
         if (assertionType === 'present' || assertionType === 'not_present') {
             actions.push(new ConditionAction_1.ConditionAction('evaluate_presence', [assertionType]));
         }
@@ -181,14 +189,19 @@ class AssertStep extends MablStep_1.MablStep {
                 assertionValue,
             ]));
         }
-        return new AssertStep('assert', [], actions);
+        return new AssertStep('assert', [
+            {
+                onFailure: stepArgs.continueOnFailure ? 'continue' : undefined,
+                observationScope: stepArgs.observationScope,
+            },
+        ], actions);
     }
     produceSelIdeFormattedSteps(stepIndex) {
         const find = this.primaryAction.toDescriptor();
         if (!(0, GetCurrentLocationDescriptor_1.isGetCurrentLocationDescriptor)(find) &&
             !(0, GetVariableDescriptor_1.isGetVariableDescriptor)(find) &&
-            (find.findType === mablscriptFind_1.FindType.FIND_EMAIL ||
-                find.findType === mablscriptFind_1.FindType.FIND_COOKIE)) {
+            (find.findType === domUtil_1.FindType.FIND_EMAIL ||
+                find.findType === domUtil_1.FindType.FIND_COOKIE)) {
             return [this.unsupportedSelIdeExportStep()];
         }
         if (this.assertionType === 'present') {
@@ -215,7 +228,7 @@ class AssertStep extends MablStep_1.MablStep {
         }
         return buildSeleniumIdeJsAssertion(stepIndex, (!(0, GetCurrentLocationDescriptor_1.isGetCurrentLocationDescriptor)(find) &&
             !(0, GetVariableDescriptor_1.isGetVariableDescriptor)(find) &&
-            find.findType === mablscriptFind_1.FindType.FIND_ONE &&
+            find.findType === domUtil_1.FindType.FIND_ONE &&
             find.findTarget.selector.xpath) ||
             '', this.extractAction ? this.extractAction.extractionAttribute : '', this.substituteSeleniumVariable(this.conditionAction.conditionValueAttribute || ''), this.assertionType, this);
     }
@@ -229,21 +242,22 @@ class AssertStep extends MablStep_1.MablStep {
         return seleniumStep;
     }
     toMablscript() {
-        if (this.assertionType === 'present' ||
-            this.assertionType === 'not_present' ||
-            this.isWaitUntilStep) {
-            const finalAssertionType = this.isWaitUntilStep
-                ? 'present'
-                : this.assertionType;
-            return `${this.primaryAction.generateMablscriptFindOne()}.evaluate_presence("${finalAssertionType}").assert()`;
-        }
+        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)
+            : ''})`;
         if (this.countAction) {
-            return `${this.primaryAction.toMablscript()}.${this.countAction.toMablscript()}.${this.conditionAction.toMablscript()}.assert()`;
+            return `${this.primaryAction.toMablscript()}.${this.countAction.toMablscript()}.${this.conditionAction.toMablscript()}${assertAction}`;
         }
         if (this.extractAction) {
-            return `${this.primaryAction.toMablscript()}.${this.extractAction.toMablscript()}.${this.conditionAction.toMablscript()}.assert()`;
+            return `${this.primaryAction.toMablscript()}.${this.extractAction.toMablscript()}.${this.conditionAction.toMablscript()}${assertAction}`;
+        }
+        if (this.assertionType === 'present' ||
+            this.assertionType === 'not_present') {
+            return `${this.primaryAction.generateFindMablscript()}.evaluate_presence("${this.assertionType}")${assertAction}`;
         }
-        return `${this.primaryAction.toMablscript()}.${this.conditionAction.toMablscript()}.assert()`;
+        return `${this.primaryAction.toMablscript()}.${this.conditionAction.toMablscript()}${assertAction}`;
     }
 }
 exports.AssertStep = AssertStep;

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,26 +71,34 @@ 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() {

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),

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 {
@@ -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),

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,6 +2,7 @@
 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 {
@@ -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;