@mablhq/mabl-cli 2.72.4 → 2.72.12

package/mablscript/importer.js

@@ -103,7 +103,6 @@ const ActionTypes = [
 const StepTypes = [
     AccessibilityCheck_1.AccessibilityCheckStep,
     AssertStep_1.AssertStep,
-    AssertStepOld_1.AssertStepOld,
     AwaitTabStep_1.AwaitTabStep,
     AwaitUploadsStep_1.AwaitUploadsStep,
     ClearCookiesStep_1.ClearCookiesStep,
@@ -156,15 +155,6 @@ const MobileStepTypes = [
     PushFileStep_1.PushFileStep,
     UninstallAppStep_1.UninstallAppStep,
 ];
-const SyntheticActionCodes = [
-    'autologin',
-    'capture_application_state',
-    'root_page',
-    'verify_url',
-    'validate_links',
-    'validate_page',
-];
-const ACCESSIBILITY_CHECK_ACTION_NAME = 'accessibility_check';
 function parseMablScript(mablscript) {
     const ast = (0, esprima_1.parseScript)(mablscript, { loc: true });
     const stepStack = {};
@@ -198,16 +188,24 @@ function parseMablScript(mablscript) {
 }
 const rawMablscriptToObjectsStepMap = {};
 StepTypes.forEach((step) => {
-    step.mablScriptStepNames.forEach((name) => (rawMablscriptToObjectsStepMap[name] = step));
+    step.mablScriptStepNames
+        .concat(step.yamlMablScriptNames)
+        .forEach((name) => (rawMablscriptToObjectsStepMap[name] = step));
 });
 const rawMablscriptToObjectsActionsMap = {};
 ActionTypes.forEach((step) => {
     step.mablScriptStepNames.forEach((name) => (rawMablscriptToObjectsActionsMap[name] = step));
 });
+const legacyMablscriptStepGeneratorMap = {};
+StepTypes.forEach((step) => {
+    step.mablScriptStepNames.forEach((name) => {
+        legacyMablscriptStepGeneratorMap[name] = step
+            .fromLegacyMablscript;
+    });
+});
 function loadMablScriptIntoSteps(parsedMablscript) {
     return Object.entries(parsedMablscript).map(([stepIndexString, [...parsed]]) => {
         const lastAction = parsed.pop();
-        const stepType = rawMablscriptToObjectsStepMap[lastAction.name];
         const actions = parsed.map((parsedAction, actionIndex) => {
             const actionType = rawMablscriptToObjectsActionsMap[parsedAction.name];
             const action = actionType
@@ -216,13 +214,33 @@ function loadMablScriptIntoSteps(parsedMablscript) {
             action.setActionSourceIndexInStep(actionIndex);
             return action;
         });
-        let step = stepType
-            ? new stepType(lastAction.name, lastAction.arguments, actions)
-            : new MablStep_1.MablStep(lastAction.name, lastAction.arguments, actions, lastAction.name);
-        if (step instanceof AssertStepOld_1.AssertStepOld) {
-            step = step.getNewAssertionStep();
+        let step;
+        let wasAssertStepOld = false;
+        if (lastAction.name.startsWith('assert_') &&
+            lastAction.name !== 'assert_download') {
+            step = AssertStepOld_1.AssertStepOldConverter.convert(lastAction.name, lastAction.arguments, actions);
+            wasAssertStepOld = true;
+        }
+        else if (lastAction.name === 'assert') {
+            step = new AssertStep_1.AssertStep(lastAction.name, lastAction.arguments, actions);
+        }
+        else {
+            const stepGenerator = legacyMablscriptStepGeneratorMap[lastAction.name];
+            step = stepGenerator
+                ? stepGenerator(lastAction.arguments, actions)
+                : new MablStep_1.MablStep(lastAction.name, lastAction.arguments, actions, lastAction.name);
+        }
+        if ((0, MablStepV2_1.isMablStepV2)(step)) {
+            if (wasAssertStepOld) {
+                step.setActionSourceIndexInStep(actions.length);
+            }
+            else {
+                step.setActionSourceIndexInStep(step.actions.length);
+            }
+        }
+        else {
+            step.setActionSourceIndexInStep(actions.length);
         }
-        step.setActionSourceIndexInStep(actions.length);
         step.setStepSourceIndexInFlow(parseInt(stepIndexString));
         return step;
     });
@@ -233,7 +251,9 @@ function yamlifyTheLoadedSteps(translatedSteps, fullLocatorsOn = true) {
 }
 const yamlMablscriptToObjectsStepV1Map = {};
 StepTypes.forEach((step) => {
-    step.yamlMablScriptNames.forEach((name) => (yamlMablscriptToObjectsStepV1Map[name] = step.fromYaml));
+    step.yamlMablScriptNames.forEach((name) => {
+        yamlMablscriptToObjectsStepV1Map[name] = step.fromYaml;
+    });
 });
 const yamlMablscriptToObjectsMobileStepMap = {};
 MobileStepTypes.forEach((step) => {
@@ -245,41 +265,38 @@ function loadYamlSteps(yamlSteps, isMobile) {
 }
 function interpretStepsFromObjectsInFlow(flow, isMobile) {
     const steps = interpretStepsFromObjects(flow.json_steps?.steps, isMobile);
-    let flowDescriptions = [];
-    if (flow.script_description) {
-        flowDescriptions = flow.script_description?.split('\n') ?? [];
-    }
-    steps.forEach((step, index) => {
-        step.setDescription(flowDescriptions[index]);
-        if (flow?.step_annotations?.[index]) {
-            step.setAnnotation(flow.step_annotations[index]);
-        }
-    });
+    applyStepDescriptionsAndAnnotations(steps, flow);
     return steps;
 }
+function applyStepDescriptionsAndAnnotations(steps, flow) {
+    if (flow.script_description || flow.step_annotations) {
+        const flowDescriptions = flow.script_description?.split('\n') ?? [];
+        steps.forEach((step, index) => {
+            if (flowDescriptions[index]) {
+                step.setDescription(flowDescriptions[index]);
+            }
+            const stepAnnotation = flow?.step_annotations?.[index];
+            if (stepAnnotation) {
+                step.setAnnotation(stepAnnotation);
+            }
+        });
+    }
+}
 function interpretStepsFromObjects(steps, isMobile) {
-    let cumulativeIndex = 0;
     return steps.map((stepObject, index) => {
         const stepName = Object.keys(stepObject)[0];
         const stepArgs = stepObject[stepName];
         const isStepDisabled = stepObject[stepName].disabled;
         const step = stepFromObjectInfo(stepName, stepArgs, isMobile ?? false);
         step.setStepSourceIndexInFlow(index);
-        const actionCount = step.actions.length;
         step.actions?.forEach((action, actionIndex) => {
-            if ((0, MablStepV2_1.isMablStepV2)(step) && actionIndex + 1 !== actionCount) {
+            if ((0, MablStepV2_1.isMablStepV2)(step)) {
                 action.setActionSourceIndexInStep(actionIndex);
-                if (step.actionCode && SyntheticActionCodes.includes(step.actionCode)) {
-                    step.cumulativeActionSourceIndexInFlow = steps.length;
-                }
-                else if (step.actionCode === ACCESSIBILITY_CHECK_ACTION_NAME) {
-                    step.cumulativeActionSourceIndexInFlow = 1;
-                }
-                else {
-                    action.cumulativeActionSourceIndexInFlow = cumulativeIndex++;
-                }
             }
         });
+        if ((0, MablStepV2_1.isMablStepV2)(step)) {
+            step.setActionSourceIndexInStep(step.actions.length);
+        }
         if (isStepDisabled) {
             step.setDisabled(isStepDisabled);
         }
@@ -287,6 +304,9 @@ function interpretStepsFromObjects(steps, isMobile) {
     });
 }
 function stepFromObjectInfo(stepName, stepArgs, isMobile) {
+    if (stepName.startsWith('assert_') && stepName !== 'assert_download') {
+        return AssertStepOld_1.AssertStepOldConverter.convert(stepName, stepArgs, []);
+    }
     if (isMobile &&
         Object.keys(yamlMablscriptToObjectsMobileStepMap).includes(stepName)) {
         return yamlMablscriptToObjectsMobileStepMap[stepName](stepName, stepArgs);
@@ -458,23 +478,20 @@ function removeCommentsAndGetDisabledIndices(mablscript) {
     return { updatedScript, disabledIndices };
 }
 function parseMablScriptIntoSteps(flow) {
-    if (!flow.script) {
-        return [];
+    let loadedSteps = [];
+    if (flow.json_steps?.steps) {
+        const isMobile = flow.flow_type === mablApi_1.TestTypeEnum.Mobile;
+        loadedSteps = interpretStepsFromObjects(flow.json_steps.steps, isMobile);
     }
-    let flowDescriptions = [];
-    if (flow.script_description) {
-        flowDescriptions = flow.script_description.split('\n');
+    else if (flow.script) {
+        const { updatedScript, disabledIndices } = removeCommentsAndGetDisabledIndices(flow.script);
+        const parsed = parseMablScript(updatedScript);
+        loadedSteps = loadMablScriptIntoSteps(parsed);
+        loadedSteps
+            .filter((_step, index) => disabledIndices.includes(index))
+            .forEach((step) => step.setDisabled(true));
     }
-    const { updatedScript, disabledIndices } = removeCommentsAndGetDisabledIndices(flow.script);
-    const parsed = parseMablScript(updatedScript);
-    const loadedSteps = loadMablScriptIntoSteps(parsed);
-    loadedSteps.forEach((step, index) => {
-        step.setDescription(flowDescriptions[index]);
-        if (flow?.step_annotations?.[index]) {
-            step.setAnnotation(flow.step_annotations[index]);
-        }
-        step.setDisabled(disabledIndices.includes(index));
-    });
+    applyStepDescriptionsAndAnnotations(loadedSteps, flow);
     return loadedSteps;
 }
 function extractInputVariables(steps) {
@@ -491,7 +508,10 @@ function parseMablScriptIntoV2Step(script) {
         script,
     });
     const stepAsObject = parsedMablscriptStep[0].getFormattedStep(true);
-    const [parsedStep] = interpretStepsFromObjects([stepAsObject], true);
+    let [parsedStep] = interpretStepsFromObjects([stepAsObject], true);
+    if (parsedStep.getStepName() === 'UnimplementedStep') {
+        [parsedStep] = interpretStepsFromObjects([stepAsObject], false);
+    }
     return parsedStep;
 }
 function getQueryIds(flows, testType) {
@@ -513,8 +533,8 @@ function getSnippetIdFromStep(step) {
     }
     else if ((0, CreateVariableStep_1.isCreateVariableStep)(step)) {
         if (step.generationType === CreateVariableStepDescriptor_1.VariableGenerator.JAVASCRIPT &&
-            (0, JavaScriptAction_1.isJavaScriptActionDescriptor)(step.actions[0])) {
-            jsDescriptor = step.actions[0].javaScript;
+            (0, JavaScriptAction_1.isJavaScriptActionDescriptor)(step.descriptor.generator)) {
+            jsDescriptor = step.descriptor.generator.javaScript;
         }
     }
     else if ((0, DatabaseQueryStep_1.isDatabaseQueryStep)(step)) {

package/mablscript/mobile/steps/CreateVariableMobileStep.js

@@ -33,7 +33,9 @@ class CreateVariableMobileStep extends MablStepV2_1.MablStepV2 {
         }
     }
     static fromYaml(_stepName, stepDescriptor) {
-        if (!stepDescriptor.find) {
+        if (stepDescriptor.selector &&
+            !stepDescriptor.find &&
+            stepDescriptor.generator.find) {
             stepDescriptor.find = stepDescriptor.generator.find;
             delete stepDescriptor.generator.find;
             delete stepDescriptor.selector;

package/mablscript/steps/AbstractAssertionsAndVariablesStep.js

@@ -3,17 +3,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AbstractAssertionsAndVariablesStep = void 0;
 const domUtil_1 = require("../../domUtil");
 const MablAction_1 = require("../MablAction");
-const MablStep_1 = require("../MablStep");
+const MablStepV2_1 = require("../MablStepV2");
 const ConditionDescriptor_1 = require("../types/ConditionDescriptor");
 const AssertStep_1 = require("./AssertStep");
-class AbstractAssertionsAndVariablesStep extends MablStep_1.MablStep {
-    constructor(name, args, actions, mablScriptName, stepName, descriptor) {
-        super(name, args, actions, mablScriptName);
-        this.stepName = stepName;
-        this.descriptor = descriptor;
+class AbstractAssertionsAndVariablesStep extends MablStepV2_1.MablStepV2 {
+    constructor(name, descriptor, actionCode) {
+        super(name, descriptor, actionCode);
     }
     getStepName() {
-        return this.stepName;
+        return this.name;
+    }
+    stepDescription() {
+        return `Execute ${this.getStepName()}`;
     }
     toStepDescriptor() {
         const formatted = JSON.parse(JSON.stringify(this.descriptor));
@@ -26,8 +27,9 @@ class AbstractAssertionsAndVariablesStep extends MablStep_1.MablStep {
         return formatted;
     }
     toMablscript() {
+        const { actionCode, description, ...params } = this.toStepDescriptor();
         return `${this.getActionCode()}(${(0, domUtil_1.buildStepArgumentString)({
-            params: { ...this.descriptor },
+            params,
             legacy: true,
         })})`;
     }

package/mablscript/steps/AccessibilityCheck.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AccessibilityCheckStep = exports.AccessibilityCheckSeverity = void 0;
 const MablStep_1 = require("../MablStep");
+const MablStepV2_1 = require("../MablStepV2");
 const FindAction_1 = require("../actions/FindAction");
 const ActionsUtils_1 = require("./ActionsUtils");
 const domUtil_1 = require("../../domUtil");
@@ -12,19 +13,39 @@ var AccessibilityCheckSeverity;
     AccessibilityCheckSeverity["Moderate"] = "moderate";
     AccessibilityCheckSeverity["Serious"] = "serious";
 })(AccessibilityCheckSeverity || (exports.AccessibilityCheckSeverity = AccessibilityCheckSeverity = {}));
-class AccessibilityCheckStep extends MablStep_1.MablStep {
-    constructor(name, args, actions) {
-        super(name, args, actions, 'accessibility_check');
-        if (this.actions.length) {
-            this.findAction = ActionsUtils_1.ActionsUtils.validateSingleFindAction(this.actions);
+class AccessibilityCheckStep extends MablStepV2_1.MablStepV2 {
+    constructor(descriptor) {
+        super(AccessibilityCheckStep.stepName, descriptor, AccessibilityCheckStep.actionCode);
+        if (descriptor.find && descriptor.descriptorToActionMap) {
+            this.findAction = descriptor.descriptorToActionMap.get(descriptor.find);
+        }
+        const maybeCheckConfig = {
+            ...(descriptor.tags && { tags: descriptor.tags }),
+            ...(descriptor.rules && { rules: descriptor.rules }),
+            ...(descriptor.disabledRules && {
+                disabledRules: descriptor.disabledRules,
+            }),
+            ...(descriptor.failOn && { failOn: descriptor.failOn }),
+            ...(descriptor.runInMainFrame !== undefined && {
+                runInMainFrame: descriptor.runInMainFrame,
+            }),
+            ...(descriptor.bypassCors !== undefined && {
+                bypassCors: descriptor.bypassCors,
+            }),
+            ...(descriptor.disabledRulesOnIframes && {
+                disabledRulesOnIframes: descriptor.disabledRulesOnIframes,
+            }),
+        };
+        const hasCheckConfig = Object.values(maybeCheckConfig).filter((value) => !!value).length > 0;
+        if (hasCheckConfig) {
+            this.checkConfig = maybeCheckConfig;
         }
-        this.checkConfig = this.getActionArgs()[0];
     }
     canContinueOnFailure() {
         return true;
     }
     getStepName() {
-        return AccessibilityCheckStep.yamlMablScriptNames[0];
+        return AccessibilityCheckStep.stepName;
     }
     toStepDescriptor() {
         if (this.findAction) {
@@ -37,7 +58,7 @@ class AccessibilityCheckStep extends MablStep_1.MablStep {
                     return {
                         ...this.checkConfig,
                         find,
-                        descriptorToActionMap: new Map().set(find, this),
+                        descriptorToActionMap: new Map().set(find, this.findAction),
                         actionCode: this.actionCode,
                     };
                 default:
@@ -49,33 +70,12 @@ class AccessibilityCheckStep extends MablStep_1.MablStep {
             ...this.checkConfig,
         };
     }
-    getFormattedStep(_fullLocatorsOn) {
-        let finalStep;
-        if (this.findAction) {
-            finalStep = {
-                AccessibilityCheck: {
-                    ...super.annotationsAsYml(),
-                    ...this.findAction.toYaml(),
-                    ...this.checkConfig,
-                },
-            };
-        }
-        else {
-            finalStep = {
-                AccessibilityCheck: {
-                    ...super.annotationsAsYml(),
-                    ...this.checkConfig,
-                },
-            };
-        }
-        if (this.stepId()) {
-            finalStep.AccessibilityCheck.id = this.stepId();
-        }
-        return finalStep;
-    }
     static fromYaml(_stepName, stepArgs) {
         const actions = [];
-        if (stepArgs.selector) {
+        if (stepArgs.find) {
+            actions.push(FindAction_1.FindAction.findActionFromStepArgs(stepArgs));
+        }
+        else if (stepArgs.selector) {
             actions.push(FindAction_1.FindAction.findActionFromStepArgs(stepArgs));
         }
         const checkConfig = {
@@ -84,10 +84,21 @@ class AccessibilityCheckStep extends MablStep_1.MablStep {
             disabledRules: stepArgs.disabledRules,
             failOn: stepArgs.failOn,
         };
-        const step = new AccessibilityCheckStep(AccessibilityCheckStep.mablScriptStepNames[0], [checkConfig], actions);
+        const stepDescriptor = buildStepDescriptor(actions.length ? actions[0] : undefined, checkConfig);
+        const step = new AccessibilityCheckStep(stepDescriptor);
         step.setStepId(stepArgs.id);
         return step;
     }
+    static fromLegacyMablscript(args, actions) {
+        const checkConfig = args[0];
+        const findAction = actions.length
+            ? ActionsUtils_1.ActionsUtils.validateSingleFindAction(actions)
+            : undefined;
+        const stepDescriptor = buildStepDescriptor(findAction, checkConfig);
+        const step = new AccessibilityCheckStep(stepDescriptor);
+        step.actions = actions;
+        return step;
+    }
     toMablscript() {
         let argString = '';
         if (this.checkConfig?.tags ||
@@ -101,7 +112,38 @@ class AccessibilityCheckStep extends MablStep_1.MablStep {
         }
         return `${findAction}${AccessibilityCheckStep.mablScriptStepNames[0]}(${argString})`;
     }
+    getInputVariables() {
+        return this.findAction?.getInputVariables() ?? [];
+    }
+    stepDescription() {
+        return 'Check accessibility';
+    }
 }
 exports.AccessibilityCheckStep = AccessibilityCheckStep;
-AccessibilityCheckStep.mablScriptStepNames = ['accessibility_check'];
-AccessibilityCheckStep.yamlMablScriptNames = ['AccessibilityCheck'];
+AccessibilityCheckStep.stepName = 'AccessibilityCheck';
+AccessibilityCheckStep.actionCode = 'accessibility_check';
+AccessibilityCheckStep.mablScriptStepNames = [AccessibilityCheckStep.actionCode];
+AccessibilityCheckStep.yamlMablScriptNames = [AccessibilityCheckStep.stepName];
+function buildStepDescriptor(findAction, checkConfig) {
+    if (findAction) {
+        const find = findAction.toDescriptor();
+        switch (find.findType) {
+            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 {
+                    ...checkConfig,
+                    find,
+                    descriptorToActionMap: new Map().set(find, findAction),
+                    actionCode: AccessibilityCheckStep.actionCode,
+                };
+            default:
+                throw new Error(`Error generating step descriptor for ${AccessibilityCheckStep.stepName}: Unexpected find type ${find.findType}`);
+        }
+    }
+    return {
+        actionCode: AccessibilityCheckStep.actionCode,
+        ...checkConfig,
+    };
+}