@mablhq/mabl-cli 2.72.0 → 2.72.3

package/mablscript/importer.js

@@ -103,6 +103,7 @@ const ActionTypes = [
 const StepTypes = [
     AccessibilityCheck_1.AccessibilityCheckStep,
     AssertStep_1.AssertStep,
+    AssertStepOld_1.AssertStepOld,
     AwaitTabStep_1.AwaitTabStep,
     AwaitUploadsStep_1.AwaitUploadsStep,
     ClearCookiesStep_1.ClearCookiesStep,
@@ -155,6 +156,15 @@ 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 = {};
@@ -188,24 +198,16 @@ function parseMablScript(mablscript) {
 }
 const rawMablscriptToObjectsStepMap = {};
 StepTypes.forEach((step) => {
-    step.mablScriptStepNames
-        .concat(step.yamlMablScriptNames)
-        .forEach((name) => (rawMablscriptToObjectsStepMap[name] = step));
+    step.mablScriptStepNames.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
@@ -214,33 +216,13 @@ function loadMablScriptIntoSteps(parsedMablscript) {
             action.setActionSourceIndexInStep(actionIndex);
             return action;
         });
-        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);
+        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();
         }
+        step.setActionSourceIndexInStep(actions.length);
         step.setStepSourceIndexInFlow(parseInt(stepIndexString));
         return step;
     });
@@ -251,9 +233,7 @@ 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) => {
@@ -265,38 +245,41 @@ function loadYamlSteps(yamlSteps, isMobile) {
 }
 function interpretStepsFromObjectsInFlow(flow, isMobile) {
     const steps = interpretStepsFromObjects(flow.json_steps?.steps, isMobile);
-    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);
-            }
-        });
+    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]);
+        }
+    });
+    return steps;
 }
 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)) {
+            if ((0, MablStepV2_1.isMablStepV2)(step) && actionIndex + 1 !== actionCount) {
                 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);
         }
@@ -304,9 +287,6 @@ 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);
@@ -478,20 +458,23 @@ function removeCommentsAndGetDisabledIndices(mablscript) {
     return { updatedScript, disabledIndices };
 }
 function parseMablScriptIntoSteps(flow) {
-    let loadedSteps = [];
-    if (flow.json_steps?.steps) {
-        const isMobile = flow.flow_type === mablApi_1.TestTypeEnum.Mobile;
-        loadedSteps = interpretStepsFromObjects(flow.json_steps.steps, isMobile);
+    if (!flow.script) {
+        return [];
     }
-    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));
+    let flowDescriptions = [];
+    if (flow.script_description) {
+        flowDescriptions = flow.script_description.split('\n');
     }
-    applyStepDescriptionsAndAnnotations(loadedSteps, flow);
+    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));
+    });
     return loadedSteps;
 }
 function extractInputVariables(steps) {
@@ -508,10 +491,7 @@ function parseMablScriptIntoV2Step(script) {
         script,
     });
     const stepAsObject = parsedMablscriptStep[0].getFormattedStep(true);
-    let [parsedStep] = interpretStepsFromObjects([stepAsObject], true);
-    if (parsedStep.getStepName() === 'UnimplementedStep') {
-        [parsedStep] = interpretStepsFromObjects([stepAsObject], false);
-    }
+    const [parsedStep] = interpretStepsFromObjects([stepAsObject], true);
     return parsedStep;
 }
 function getQueryIds(flows, testType) {
@@ -533,8 +513,8 @@ function getSnippetIdFromStep(step) {
     }
     else if ((0, CreateVariableStep_1.isCreateVariableStep)(step)) {
         if (step.generationType === CreateVariableStepDescriptor_1.VariableGenerator.JAVASCRIPT &&
-            (0, JavaScriptAction_1.isJavaScriptActionDescriptor)(step.descriptor.generator)) {
-            jsDescriptor = step.descriptor.generator.javaScript;
+            (0, JavaScriptAction_1.isJavaScriptActionDescriptor)(step.actions[0])) {
+            jsDescriptor = step.actions[0].javaScript;
         }
     }
     else if ((0, DatabaseQueryStep_1.isDatabaseQueryStep)(step)) {

package/mablscript/mobile/steps/CreateVariableMobileStep.js

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

package/mablscript/mobile/steps/stepUtil.js

@@ -53,7 +53,7 @@ function buildElementDescriptionForAndroid(findTarget) {
         return `unknown android element`;
     }
     if (androidElementSelector.find_prompt) {
-        return `"${androidElementSelector.find_prompt}"`;
+        return `"${(0, domUtil_1.normalizeText)(androidElementSelector.find_prompt)}"`;
     }
     const description = `"${getSimpleAndroidElementName(androidElementSelector.class)}" element`;
     if (androidElementSelector?.hint) {
@@ -74,7 +74,7 @@ function buildElementDescriptionForiOS(findTarget) {
         return `unknown iOS element`;
     }
     if (iOSElementSelector.find_prompt) {
-        return `"${iOSElementSelector.find_prompt}"`;
+        return `"${(0, domUtil_1.normalizeText)(iOSElementSelector.find_prompt)}"`;
     }
     if (iOSElementSelector.name) {
         return `"${iOSElementSelector.name}" element`;

package/mablscript/steps/AbstractAssertionsAndVariablesStep.js

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

package/mablscript/steps/AccessibilityCheck.js

@@ -2,7 +2,6 @@
 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");
@@ -13,39 +12,19 @@ var AccessibilityCheckSeverity;
     AccessibilityCheckSeverity["Moderate"] = "moderate";
     AccessibilityCheckSeverity["Serious"] = "serious";
 })(AccessibilityCheckSeverity || (exports.AccessibilityCheckSeverity = AccessibilityCheckSeverity = {}));
-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;
+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);
         }
+        this.checkConfig = this.getActionArgs()[0];
     }
     canContinueOnFailure() {
         return true;
     }
     getStepName() {
-        return AccessibilityCheckStep.stepName;
+        return AccessibilityCheckStep.yamlMablScriptNames[0];
     }
     toStepDescriptor() {
         if (this.findAction) {
@@ -58,7 +37,7 @@ class AccessibilityCheckStep extends MablStepV2_1.MablStepV2 {
                     return {
                         ...this.checkConfig,
                         find,
-                        descriptorToActionMap: new Map().set(find, this.findAction),
+                        descriptorToActionMap: new Map().set(find, this),
                         actionCode: this.actionCode,
                     };
                 default:
@@ -70,12 +49,33 @@ class AccessibilityCheckStep extends MablStepV2_1.MablStepV2 {
             ...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.find) {
-            actions.push(FindAction_1.FindAction.findActionFromStepArgs(stepArgs));
-        }
-        else if (stepArgs.selector) {
+        if (stepArgs.selector) {
             actions.push(FindAction_1.FindAction.findActionFromStepArgs(stepArgs));
         }
         const checkConfig = {
@@ -84,19 +84,10 @@ class AccessibilityCheckStep extends MablStepV2_1.MablStepV2 {
             disabledRules: stepArgs.disabledRules,
             failOn: stepArgs.failOn,
         };
-        const stepDescriptor = buildStepDescriptor(actions.length ? actions[0] : undefined, checkConfig);
-        const step = new AccessibilityCheckStep(stepDescriptor);
+        const step = new AccessibilityCheckStep(AccessibilityCheckStep.mablScriptStepNames[0], [checkConfig], actions);
         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);
-        return new AccessibilityCheckStep(stepDescriptor);
-    }
     toMablscript() {
         let argString = '';
         if (this.checkConfig?.tags ||
@@ -110,38 +101,7 @@ class AccessibilityCheckStep extends MablStepV2_1.MablStepV2 {
         }
         return `${findAction}${AccessibilityCheckStep.mablScriptStepNames[0]}(${argString})`;
     }
-    getInputVariables() {
-        return this.findAction?.getInputVariables() ?? [];
-    }
-    stepDescription() {
-        return 'Check accessibility';
-    }
 }
 exports.AccessibilityCheckStep = AccessibilityCheckStep;
-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,
-    };
-}
+AccessibilityCheckStep.mablScriptStepNames = ['accessibility_check'];
+AccessibilityCheckStep.yamlMablScriptNames = ['AccessibilityCheck'];