@mablhq/mabl-cli 1.16.32 → 1.18.3

package/mablscript/actions/JavaScriptAction.js

@@ -75,7 +75,7 @@ class JavaScriptAction extends MablAction_1.MablAction {
     }
     static fromDescriptor(descriptor) {
         const { javaScript } = descriptor;
-        if (JavaScriptDescriptor_1.isReusableSnippetDescriptor(javaScript)) {
+        if ((0, JavaScriptDescriptor_1.isReusableSnippetDescriptor)(javaScript)) {
             return new JavaScriptAction(JavaScriptAction.mablscriptName, [
                 {
                     id: javaScript.snippetId,
@@ -84,20 +84,20 @@ class JavaScriptAction extends MablAction_1.MablAction {
                 { parameter_overrides: javaScript.parameterOverrides },
             ]);
         }
-        else if (JavaScriptDescriptor_1.isInlineSnippetDescriptor(javaScript)) {
+        else if ((0, JavaScriptDescriptor_1.isInlineSnippetDescriptor)(javaScript)) {
             return new JavaScriptAction(JavaScriptAction.mablscriptName, [
                 javaScript.inlineSnippet,
                 { parameter_overrides: javaScript.parameterOverrides },
             ]);
         }
-        else if (JavaScriptDescriptor_1.isLegacyReusableSnippetDescriptor(javaScript)) {
+        else if ((0, JavaScriptDescriptor_1.isLegacyReusableSnippetDescriptor)(javaScript)) {
             return new JavaScriptAction(JavaScriptAction.mablscriptName, [
                 {
                     id: javaScript.snippetInvariantId,
                 },
             ]);
         }
-        else if (JavaScriptDescriptor_1.isLegacyInlineJavaScriptDescriptor(javaScript)) {
+        else if ((0, JavaScriptDescriptor_1.isLegacyInlineJavaScriptDescriptor)(javaScript)) {
             return new JavaScriptAction(JavaScriptAction.mablscriptName, [
                 javaScript.encodedJS,
             ]);
@@ -106,19 +106,19 @@ class JavaScriptAction extends MablAction_1.MablAction {
     }
     toYaml() {
         const actionYaml = {};
-        if (JavaScriptDescriptor_1.isReusableSnippetDescriptor(this.javaScript)) {
+        if ((0, JavaScriptDescriptor_1.isReusableSnippetDescriptor)(this.javaScript)) {
             actionYaml.snippetId = this.javaScript.snippetId;
             actionYaml.snippetInvariantId = this.javaScript.snippetInvariantId;
             actionYaml.parameterOverrides = this.javaScript.parameterOverrides;
         }
-        else if (JavaScriptDescriptor_1.isInlineSnippetDescriptor(this.javaScript)) {
+        else if ((0, JavaScriptDescriptor_1.isInlineSnippetDescriptor)(this.javaScript)) {
             actionYaml.snippet = this.javaScript.inlineSnippet;
             actionYaml.parameterOverrides = this.javaScript.parameterOverrides;
         }
-        else if (JavaScriptDescriptor_1.isLegacyReusableSnippetDescriptor(this.javaScript)) {
+        else if ((0, JavaScriptDescriptor_1.isLegacyReusableSnippetDescriptor)(this.javaScript)) {
             actionYaml.snippetId = this.javaScript.snippetInvariantId;
         }
-        else if (JavaScriptDescriptor_1.isLegacyInlineJavaScriptDescriptor(this.javaScript)) {
+        else if ((0, JavaScriptDescriptor_1.isLegacyInlineJavaScriptDescriptor)(this.javaScript)) {
             actionYaml.code = this.javaScript.encodedJS;
         }
         else {
@@ -160,27 +160,27 @@ class JavaScriptAction extends MablAction_1.MablAction {
         return new JavaScriptAction(MABLSCRIPT_NAME, args);
     }
     toMablscript() {
-        if (JavaScriptDescriptor_1.isReusableSnippetDescriptor(this.javaScript)) {
-            const snippetReference = domUtil_1.buildStepArgumentString({
+        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',
             });
-            const snippetOptions = `, {parameter_overrides: ${domUtil_1.buildStepArgumentString(this.javaScript.parameterOverrides)}}`;
+            const snippetOptions = `, {parameter_overrides: ${(0, domUtil_1.buildStepArgumentString)(this.javaScript.parameterOverrides)}}`;
             return `evaluate_js(${snippetReference}${snippetOptions})`;
         }
-        if (JavaScriptDescriptor_1.isInlineSnippetDescriptor(this.javaScript)) {
-            const snippetReference = domUtil_1.buildStepArgumentString({
+        if ((0, JavaScriptDescriptor_1.isInlineSnippetDescriptor)(this.javaScript)) {
+            const snippetReference = (0, domUtil_1.buildStepArgumentString)({
                 ...this.javaScript.inlineSnippet,
                 snippet_type: 'javascript',
             });
-            const snippetOptions = `, {parameter_overrides: ${domUtil_1.buildStepArgumentString(this.javaScript.parameterOverrides)}}`;
+            const snippetOptions = `, {parameter_overrides: ${(0, domUtil_1.buildStepArgumentString)(this.javaScript.parameterOverrides)}}`;
             return `evaluate_js(${snippetReference}${snippetOptions})`;
         }
-        if (JavaScriptDescriptor_1.isLegacyReusableSnippetDescriptor(this.javaScript)) {
+        if ((0, JavaScriptDescriptor_1.isLegacyReusableSnippetDescriptor)(this.javaScript)) {
             return `evaluate_js({id: "${this.javaScript.snippetInvariantId}", snippet_type: "javascript"})`;
         }
-        if (JavaScriptDescriptor_1.isLegacyInlineJavaScriptDescriptor(this.javaScript)) {
+        if ((0, JavaScriptDescriptor_1.isLegacyInlineJavaScriptDescriptor)(this.javaScript)) {
             return `evaluate_js("${this.javaScript.encodedJS}")`;
         }
         throw new Error(`Cannot export action to mablscript: ${JSON.stringify(this.javaScript)}`);

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,
@@ -99,10 +101,10 @@ const StepTypes = [
     WaitStep_1.WaitStep,
 ];
 function parseMablScript(mablscript) {
-    const ast = esprima_1.parseScript(mablscript, { loc: true });
+    const ast = (0, esprima_1.parseScript)(mablscript, { loc: true });
     const stepStack = {};
     let stepLine = 0;
-    estraverse_1.traverse(ast, {
+    (0, estraverse_1.traverse)(ast, {
         enter(node) {
             switch (node.type) {
                 case 'ExpressionStatement':
@@ -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;
@@ -161,7 +166,7 @@ function loadMablScriptIntoSteps(parsedMablscript) {
 exports.loadMablScriptIntoSteps = loadMablScriptIntoSteps;
 function yamlifyTheLoadedSteps(translatedSteps, fullLocatorsOn = true) {
     const steps = translatedSteps.map((step) => step.getFormattedStep(fullLocatorsOn));
-    return js_yaml_1.dump(steps);
+    return (0, js_yaml_1.dump)(steps);
 }
 exports.yamlifyTheLoadedSteps = yamlifyTheLoadedSteps;
 const yamlMablscriptToObjectsStepMap = {};
@@ -169,7 +174,7 @@ StepTypes.forEach((step) => {
     step.yamlMablScriptNames.forEach((name) => (yamlMablscriptToObjectsStepMap[name] = step.fromYaml));
 });
 function loadYamlSteps(yamlSteps) {
-    const loadedStepData = 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];
@@ -239,19 +244,19 @@ function getArgumentsFromCallExpressionArgs(expressionArguments) {
                 break;
             case 'Identifier':
                 const singleIdentifier = expressionArg;
-                expressionArgs.push(MablSymbol_1.formatSymbol(singleIdentifier.name));
+                expressionArgs.push((0, MablSymbol_1.formatSymbol)(singleIdentifier.name));
                 break;
             case 'MemberExpression':
                 const memberExpression = expressionArg;
                 if (expressionArg.object.type === 'MemberExpression') {
                     const chainedVariableExpression = memberExpressionChainBuilder(memberExpression);
                     const property = memberExpression.property;
-                    expressionArgs.push(MablSymbol_1.formatSymbol(`${chainedVariableExpression}.${property.name}`));
+                    expressionArgs.push((0, MablSymbol_1.formatSymbol)(`${chainedVariableExpression}.${property.name}`));
                 }
                 else {
                     const identifier = memberExpression.object;
                     const property = memberExpression.property;
-                    expressionArgs.push(MablSymbol_1.formatSymbol(`${identifier.name}.${property.name}`));
+                    expressionArgs.push((0, MablSymbol_1.formatSymbol)(`${identifier.name}.${property.name}`));
                 }
                 break;
             case 'ObjectExpression':
@@ -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,
@@ -85,8 +85,10 @@ class AccessibilityCheckStep extends MablStep_1.MablStep {
     toMablscript() {
         var _a, _b, _c;
         let argString = '';
-        if (((_a = this.checkConfig) === null || _a === void 0 ? void 0 : _a.tags) || ((_b = this.checkConfig) === null || _b === void 0 ? void 0 : _b.disabledRules) || ((_c = this.checkConfig) === null || _c === void 0 ? void 0 : _c.rules)) {
-            argString = `{${MablStep_1.buildObjectString(this.checkConfig)}}`;
+        if (((_a = this.checkConfig) === null || _a === void 0 ? void 0 : _a.tags) ||
+            ((_b = this.checkConfig) === null || _b === void 0 ? void 0 : _b.disabledRules) ||
+            ((_c = this.checkConfig) === null || _c === void 0 ? void 0 : _c.rules)) {
+            argString = `{${(0, MablStep_1.buildObjectString)(this.checkConfig)}}`;
         }
         let findAction = '';
         if (this.findAction) {

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 (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;
             }
@@ -129,23 +131,23 @@ class AssertStep extends MablStep_1.MablStep {
             formatted.assertionValue = this.assertionValue;
         }
         const find = this.primaryAction.toDescriptor();
-        if (GetCurrentLocationDescriptor_1.isGetCurrentLocationDescriptor(find) || GetVariableDescriptor_1.isGetVariableDescriptor(find)) {
+        if ((0, GetCurrentLocationDescriptor_1.isGetCurrentLocationDescriptor)(find) || (0, GetVariableDescriptor_1.isGetVariableDescriptor)(find)) {
         }
         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 (!GetCurrentLocationDescriptor_1.isGetCurrentLocationDescriptor(find) &&
-            !GetVariableDescriptor_1.isGetVariableDescriptor(find) &&
-            (find.findType === mablscriptFind_1.FindType.FIND_EMAIL ||
-                find.findType === mablscriptFind_1.FindType.FIND_COOKIE)) {
+        if (!(0, GetCurrentLocationDescriptor_1.isGetCurrentLocationDescriptor)(find) &&
+            !(0, GetVariableDescriptor_1.isGetVariableDescriptor)(find) &&
+            (find.findType === domUtil_1.FindType.FIND_EMAIL ||
+                find.findType === domUtil_1.FindType.FIND_COOKIE)) {
             return [this.unsupportedSelIdeExportStep()];
         }
         if (this.assertionType === 'present') {
@@ -198,7 +211,7 @@ class AssertStep extends MablStep_1.MablStep {
             if (this.primaryAction instanceof GetVariableValue_1.GetVariableValue) {
                 throw new Error('Invalid state. You cannot assert presence against variable properties.');
             }
-            const assertPresentStep = SeleniumIdeStep_1.buildSeleniumIdeStep('assertElementPresent', this);
+            const assertPresentStep = (0, SeleniumIdeStep_1.buildSeleniumIdeStep)('assertElementPresent', this);
             assertPresentStep.target = this.primaryAction.getSelIdeTarget();
             return [assertPresentStep];
         }
@@ -209,41 +222,42 @@ class AssertStep extends MablStep_1.MablStep {
             if (this.primaryAction instanceof GetVariableValue_1.GetVariableValue) {
                 throw new Error('Invalid state. You cannot assert presence against variable properties.');
             }
-            const assertNotPresentStep = SeleniumIdeStep_1.buildSeleniumIdeStep('assertElementNotPresent', this);
+            const assertNotPresentStep = (0, SeleniumIdeStep_1.buildSeleniumIdeStep)('assertElementNotPresent', this);
             assertNotPresentStep.target = this.primaryAction.getSelIdeTarget();
             return [assertNotPresentStep];
         }
-        return buildSeleniumIdeJsAssertion(stepIndex, (!GetCurrentLocationDescriptor_1.isGetCurrentLocationDescriptor(find) &&
-            !GetVariableDescriptor_1.isGetVariableDescriptor(find) &&
-            find.findType === mablscriptFind_1.FindType.FIND_ONE &&
+        return buildSeleniumIdeJsAssertion(stepIndex, (!(0, GetCurrentLocationDescriptor_1.isGetCurrentLocationDescriptor)(find) &&
+            !(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);
     }
     unsupportedSelIdeExportStep() {
-        const seleniumStep = SeleniumIdeStep_1.buildSeleniumIdeStep('echo', this);
+        const seleniumStep = (0, SeleniumIdeStep_1.buildSeleniumIdeStep)('echo', this);
         const findDescriptor = this.primaryAction.toDescriptor();
-        seleniumStep.value = `[${this.getStepName()}] step with find type [${FindAction_1.findTypesToFormattedType[(!GetCurrentLocationDescriptor_1.isGetCurrentLocationDescriptor(findDescriptor) &&
-            !GetVariableDescriptor_1.isGetVariableDescriptor(findDescriptor) &&
+        seleniumStep.value = `[${this.getStepName()}] step with find type [${FindAction_1.findTypesToFormattedType[(!(0, GetCurrentLocationDescriptor_1.isGetCurrentLocationDescriptor)(findDescriptor) &&
+            !(0, GetVariableDescriptor_1.isGetVariableDescriptor)(findDescriptor) &&
             findDescriptor.findType) ||
             'unknown']} is not supported for Selenium IDE export`;
         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;
@@ -253,11 +267,11 @@ function buildSeleniumIdeJsAssertion(stepIndex, xpath, assertionAttribute, asser
     const variableName = `assertVariable-${stepIndex}`;
     let storeAttribute;
     if (assertionAttribute !== 'innerText') {
-        storeAttribute = SeleniumIdeStep_1.buildSeleniumIdeStep('executeScript', step);
+        storeAttribute = (0, SeleniumIdeStep_1.buildSeleniumIdeStep)('executeScript', step);
         storeAttribute.target = `return document.evaluate('${xpath}', document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue['${assertionAttribute}']`;
     }
     else {
-        storeAttribute = SeleniumIdeStep_1.buildSeleniumIdeStep('storeText', step);
+        storeAttribute = (0, SeleniumIdeStep_1.buildSeleniumIdeStep)('storeText', step);
         storeAttribute.target = `xpath=${xpath}`;
     }
     storeAttribute.value = variableName;
@@ -300,10 +314,10 @@ function buildSeleniumIdeJsAssertion(stepIndex, xpath, assertionAttribute, asser
             condition = `!\${${variableName}} <= '${assertAgainst}'`;
             break;
     }
-    const ifStep = SeleniumIdeStep_1.buildSeleniumIdeStep('if', step);
+    const ifStep = (0, SeleniumIdeStep_1.buildSeleniumIdeStep)('if', step);
     ifStep.target = condition;
-    const throwError = SeleniumIdeStep_1.buildSeleniumIdeStep('executeScript', step);
+    const throwError = (0, SeleniumIdeStep_1.buildSeleniumIdeStep)('executeScript', step);
     throwError.target = `throw new Error('${exports.fieldToAssertionStep[assertionType]} step failure')`;
-    const endStep = SeleniumIdeStep_1.buildSeleniumIdeStep('end', step);
+    const endStep = (0, SeleniumIdeStep_1.buildSeleniumIdeStep)('end', step);
     return [storeAttribute, ifStep, throwError, endStep];
 }