@mablhq/mabl-cli 2.34.12 → 2.37.7

package/mablscript/MablStep.js

@@ -116,7 +116,10 @@ class MablStep extends MablAction_1.MablAction {
             disabled: this.isDisabled(),
             mablscript: this.toMablscript(),
         };
-        return (0, fast_json_stable_stringify_1.default)(lineDiffProperties);
+        return this.stringify(lineDiffProperties);
+    }
+    stringify(value) {
+        return (0, fast_json_stable_stringify_1.default)(value);
     }
     static cloneAndRemoveUndefinedEntriesFromObject(obj) {
         const clone = {};

package/mablscript/MablStepV2.js

@@ -47,6 +47,14 @@ class MablStepV2 extends MablStep_1.MablStep {
             this.stepDescription() ||
             this.getStepName());
     }
+    toLineDiffFormat() {
+        const lineDiffProperties = {
+            annotation: this.annotation,
+            disabled: this.isDisabled(),
+            descriptor: this.toStepDescriptor(),
+        };
+        return this.stringify(lineDiffProperties);
+    }
 }
 exports.MablStepV2 = MablStepV2;
 MablStepV2.mablScriptStepNames = [];

package/mablscript/diffing/diffingUtil.js

@@ -42,9 +42,17 @@ function convertOperationValue(op) {
             return DiffOperation.EQUAL;
     }
 }
+function parseFlowIntoStepList(flow) {
+    if (flow.flow_type === mablApi_1.Flow.FlowTypeEnum.Mobile) {
+        return (0, importer_1.interpretStepsFromObjectsInFlow)(flow, true);
+    }
+    return (0, importer_1.parseMablScriptIntoSteps)(flow);
+}
 function convertFlowToStepList(flow, flowConfig) {
-    if (!flow.reusable && flow.flow_type === mablApi_1.Flow.FlowTypeEnum.Mablscript) {
-        return (0, importer_1.parseMablScriptIntoSteps)(flow);
+    if (!flow.reusable &&
+        (flow.flow_type === mablApi_1.Flow.FlowTypeEnum.Mablscript ||
+            flow.flow_type === mablApi_1.Flow.FlowTypeEnum.Mobile)) {
+        return parseFlowIntoStepList(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) {
@@ -53,7 +61,7 @@ function convertFlowToStepList(flow, flowConfig) {
     return [evaluateFlowStep];
 }
 exports.convertFlowToStepList = convertFlowToStepList;
-function convertStepListToFlow(steps) {
+function convertStepListToFlow(steps, flowType = mablApi_1.Flow.FlowTypeEnum.Mablscript) {
     if (steps.length > 1 && steps.some((step) => (0, EvaluateFlowStep_1.isEvaluateFlowStep)(step))) {
         throw new Error('EvaluateFlow step(s) cannot be combined with other steps in a flow');
     }
@@ -76,20 +84,30 @@ function convertStepListToFlow(steps) {
         return annotations;
     }, {});
     const flow = {
-        script: addTrailingNewline((0, importer_1.mablscriptTheLoadedSteps)(steps)),
-        script_description: steps
-            .map((step) => { var _a; return (_a = step.getDescription()) !== null && _a !== void 0 ? _a : ''; })
-            .join('\n'),
+        json_steps: flowType === mablApi_1.Flow.FlowTypeEnum.Mobile
+            ? { steps: steps.map((step) => step.getFormattedStep(true)) }
+            : undefined,
+        script: flowType === mablApi_1.Flow.FlowTypeEnum.Mablscript
+            ? addTrailingNewline((0, importer_1.mablscriptTheLoadedSteps)(steps))
+            : undefined,
+        script_description: steps.map(getStepDescription).join('\n'),
         step_annotations: stepAnnotations,
     };
     return { flow };
 }
 exports.convertStepListToFlow = convertStepListToFlow;
+function getStepDescription(step) {
+    var _a;
+    if (step.getStepVersion() === 2) {
+        return step.stepDescription();
+    }
+    return (_a = step.getDescription()) !== null && _a !== void 0 ? _a : '';
+}
 function flattenTestFlowsIntoSteps(flows, flowConfigs) {
     return flows.flatMap((flow, index) => convertFlowToStepList(flow, flowConfigs === null || flowConfigs === void 0 ? void 0 : flowConfigs[index]));
 }
 exports.flattenTestFlowsIntoSteps = flattenTestFlowsIntoSteps;
-function constructTestFlowsFromSteps(steps) {
+function constructTestFlowsFromSteps(steps, flowType = mablApi_1.Flow.FlowTypeEnum.Mablscript) {
     const flowSteps = [];
     let chunk = [];
     for (const step of steps) {
@@ -115,7 +133,7 @@ function constructTestFlowsFromSteps(steps) {
         flowConfigs: {},
     };
     flowSteps.reduce((output, chunk, index) => {
-        const { flow, flowConfig } = convertStepListToFlow(chunk);
+        const { flow, flowConfig } = convertStepListToFlow(chunk, flowType);
         output.flows.push(flow);
         if (flowConfig) {
             const key = Number(index).toString();
@@ -174,9 +192,9 @@ function diffTests(test1Flows, test1FlowConfig, test2Flows, test2FlowConfig) {
 exports.diffTests = diffTests;
 function diffFlows(flow1, flow2) {
     var _a, _b;
-    const flow1Steps = (0, importer_1.parseMablScriptIntoSteps)(flow1);
+    const flow1Steps = parseFlowIntoStepList(flow1);
     const formattedFlow1Steps = addTrailingNewline(flow1Steps.map((step) => step.toLineDiffFormat()).join('\n'));
-    const flow2Steps = (0, importer_1.parseMablScriptIntoSteps)(flow2);
+    const flow2Steps = parseFlowIntoStepList(flow2);
     const formattedFlow2Steps = addTrailingNewline(flow2Steps.map((step) => step.toLineDiffFormat()).join('\n'));
     const flattenedDiffs = lineModeDiff(formattedFlow1Steps, formattedFlow2Steps);
     const stepDiffs = convertDiffingFormatIntoDiffingSteps(flattenedDiffs, flow1Steps, flow2Steps);

package/mablscript/importer.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSnippetIdsFromFlows = exports.getSnippetIdsFromMablscriptFlow = exports.getSnippetIdsFromJsonFlow = exports.parseMablScriptIntoV2Step = exports.extractOutputVariables = exports.extractInputVariables = exports.parseMablScriptIntoSteps = exports.mablscriptTheLoadedSteps = exports.interpretStepsFromObjects = exports.interpretStepsFromObjectsInFlow = exports.loadYamlSteps = exports.yamlifyTheLoadedSteps = exports.loadMablScriptIntoSteps = exports.parseMablScript = void 0;
+exports.getSnippetIdsFromFlows = exports.getSnippetIdsFromApiFlow = exports.getSnippetIdsFromMablscriptFlow = exports.getSnippetIdsFromJsonFlow = exports.parseMablScriptIntoV2Step = exports.extractOutputVariables = exports.extractInputVariables = exports.parseMablScriptIntoSteps = exports.mablscriptTheLoadedSteps = exports.interpretStepsFromObjects = exports.interpretStepsFromObjectsInFlow = exports.loadYamlSteps = exports.yamlifyTheLoadedSteps = exports.loadMablScriptIntoSteps = exports.parseMablScript = void 0;
 const esprima_1 = require("esprima");
 const estraverse_1 = require("estraverse");
 const AssertStep_1 = require("./steps/AssertStep");
@@ -49,6 +49,7 @@ const JavaScriptAction_1 = require("./actions/JavaScriptAction");
 const ClickAndHoldStep_1 = require("./steps/ClickAndHoldStep");
 const ReleaseStep_1 = require("./steps/ReleaseStep");
 const CountAction_1 = require("./actions/CountAction");
+const mablApi_1 = require("../mablApi");
 const AccessibilityCheck_1 = require("./steps/AccessibilityCheck");
 const EvaluateFlowStep_1 = require("./steps/EvaluateFlowStep");
 const RightClickStep_1 = require("./steps/RightClickStep");
@@ -544,9 +545,24 @@ function getSnippetIdsFromMablscriptFlow(flow) {
     return snippetIds;
 }
 exports.getSnippetIdsFromMablscriptFlow = getSnippetIdsFromMablscriptFlow;
-function getSnippetIdsFromFlows(flows, isMobileTest) {
-    return uniqueArray(flows.flatMap((flow) => isMobileTest
-        ? getSnippetIdsFromJsonFlow(flow)
-        : getSnippetIdsFromMablscriptFlow(flow)));
+function getSnippetIdsFromApiFlow(flow) {
+    var _a, _b;
+    return (_b = (_a = flow.snippet_references) === null || _a === void 0 ? void 0 : _a.map((reference) => reference.id)) !== null && _b !== void 0 ? _b : [];
+}
+exports.getSnippetIdsFromApiFlow = getSnippetIdsFromApiFlow;
+function getSnippetIdsFromFlow(flow, testType) {
+    switch (testType) {
+        case mablApi_1.TestTypeEnum.Api:
+            return getSnippetIdsFromApiFlow(flow);
+        case mablApi_1.TestTypeEnum.Mobile:
+            return getSnippetIdsFromJsonFlow(flow);
+        case mablApi_1.TestTypeEnum.Browser:
+            return getSnippetIdsFromMablscriptFlow(flow);
+        default:
+            return [];
+    }
+}
+function getSnippetIdsFromFlows(flows, testType) {
+    return uniqueArray(flows.flatMap((flow) => getSnippetIdsFromFlow(flow, testType)));
 }
 exports.getSnippetIdsFromFlows = getSnippetIdsFromFlows;

package/mablscript/mobile/steps/ScrollStep.js

@@ -34,10 +34,16 @@ function humanizeScrollInformation(stepDescriptor) {
             return humanizeCoordinateScroll(coordinates, 'of the screen');
         }
         case ScrollStepDescriptor_1.ScrollType.ScrollToElement: {
-            const { find, maxScrollAttempts, scrollDirection, targetElementDescriptor, } = stepDescriptor;
-            const containerElementDescription = (0, stepUtil_1.getElementDescriptionFromMobileFindDescriptor)(find);
+            const { coordinates, find, maxScrollAttempts, scrollDirection, targetElementDescriptor, } = stepDescriptor;
+            let scrollText = `Scroll ${scrollDirection} a maximum of ${maxScrollAttempts} times`;
+            if (coordinates) {
+                scrollText = humanizeCoordinateScroll(coordinates, `a maximum of ${maxScrollAttempts} times`);
+            }
+            const containerElementDescription = find
+                ? (0, stepUtil_1.getElementDescriptionFromMobileFindDescriptor)(find)
+                : 'screen';
             const targetElementDescription = (0, stepUtil_1.getElementDescriptionFromMobileFindDescriptor)(targetElementDescriptor);
-            return `Scroll ${scrollDirection} a maximum of ${maxScrollAttempts} times within the ${containerElementDescription} until the ${targetElementDescription} is visible`;
+            return `${scrollText} within the ${containerElementDescription} until the ${targetElementDescription} is visible`;
         }
         case ScrollStepDescriptor_1.ScrollType.ScrollWithinElement: {
             const { coordinates, find } = stepDescriptor;

package/mablscript/mobile/tests/steps/ScrollStep.mobiletest.js

@@ -9,6 +9,7 @@ describe('Scroll steps parse correctly', () => {
         it('Parses a ScrollDeviceScreen step', () => {
             const windowSize = { width: 1440, height: 2392 };
             const scrollStepDescriptor = {
+                description: 'Scroll down 94.06% of the screen',
                 id: 'scrolliePolieOlie',
                 coordinates: {
                     from: {
@@ -159,6 +160,7 @@ describe('Scroll steps parse correctly', () => {
         };
         it('Parses a ScrollToElement step', () => {
             const scrollStepDescriptor = {
+                description: 'Scroll right a maximum of 6 times within the "Name field" element until the "Email field" element is visible',
                 id: 'scrollMe',
                 actionCode: 'scroll',
                 find,
@@ -176,7 +178,58 @@ describe('Scroll steps parse correctly', () => {
             const scrollStep = new ScrollStep_1.ScrollStep(scrollStepDescriptor);
             expect(scrollStep.stepId()).toEqual(scrollStepDescriptor.id);
         });
-        it('Humanizes a ScrollToElement step', () => {
+        it('Humanizes ScrollToElement step with container element', () => {
+            const scrollStepDescriptor = {
+                id: 'scrollMe',
+                actionCode: 'scroll',
+                coordinates: {
+                    from: {
+                        xPercent: 0.109212,
+                        yPercent: 0.241223,
+                    },
+                    to: {
+                        xPercent: 0.145543,
+                        yPercent: 0.865454,
+                    },
+                },
+                find,
+                maxScrollAttempts: 6,
+                scrollDirection: ScrollStepDescriptor_1.ScrollDirection.Up,
+                scrollType: ScrollStepDescriptor_1.ScrollType.ScrollToElement,
+                targetElementDescriptor: innerFindTarget,
+            };
+            const stepYaml = {
+                Scroll: scrollStepDescriptor,
+            };
+            const step = (0, StepTestsUtil_1.loadRawStepIntoMablStep)(stepYaml);
+            expect(step.stepDescription()).toEqual(`Scroll up 62.42% a maximum of 6 times within the "Name field" element until the "Email field" element is visible`);
+        });
+        it('Humanizes ScrollToElement step without container element', () => {
+            const scrollStepDescriptor = {
+                id: 'scrollMe',
+                actionCode: 'scroll',
+                coordinates: {
+                    from: {
+                        xPercent: 0.109212,
+                        yPercent: 0.241223,
+                    },
+                    to: {
+                        xPercent: 0.145543,
+                        yPercent: 0.865454,
+                    },
+                },
+                maxScrollAttempts: 6,
+                scrollDirection: ScrollStepDescriptor_1.ScrollDirection.Up,
+                scrollType: ScrollStepDescriptor_1.ScrollType.ScrollToElement,
+                targetElementDescriptor: innerFindTarget,
+            };
+            const stepYaml = {
+                Scroll: scrollStepDescriptor,
+            };
+            const step = (0, StepTestsUtil_1.loadRawStepIntoMablStep)(stepYaml);
+            expect(step.stepDescription()).toEqual(`Scroll up 62.42% a maximum of 6 times within the screen until the "Email field" element is visible`);
+        });
+        it('Humanizes a legacy ScrollToElement step', () => {
             const scrollStepDescriptor = {
                 id: 'scrollMe',
                 actionCode: 'scroll',
@@ -207,6 +260,7 @@ describe('Scroll steps parse correctly', () => {
         };
         it('Parses a ScrollWithinElement step', () => {
             const scrollStepDescriptor = {
+                description: 'Scroll right 80% within the "Name field" element',
                 id: 'scrollMe',
                 actionCode: 'scroll',
                 coordinates: {

package/mablscript/steps/AccessibilityCheck.js

@@ -18,8 +18,7 @@ class AccessibilityCheckStep extends MablStep_1.MablStep {
         if (this.actions.length) {
             this.findAction = ActionsUtils_1.ActionsUtils.validateSingleFindAction(this.actions);
         }
-        this.checkConfig =
-            this.getActionArgs()[0];
+        this.checkConfig = this.getActionArgs()[0];
     }
     canContinueOnFailure() {
         return true;
@@ -28,7 +27,6 @@ class AccessibilityCheckStep extends MablStep_1.MablStep {
         return AccessibilityCheckStep.yamlMablScriptNames[0];
     }
     toStepDescriptor() {
-        var _a, _b, _c, _d;
         if (this.findAction) {
             const find = this.findAction.toDescriptor();
             switch (find.findType) {
@@ -47,11 +45,8 @@ class AccessibilityCheckStep extends MablStep_1.MablStep {
             }
         }
         return {
-            tags: (_a = this.checkConfig) === null || _a === void 0 ? void 0 : _a.tags,
-            rules: (_b = this.checkConfig) === null || _b === void 0 ? void 0 : _b.rules,
-            disabledRules: (_c = this.checkConfig) === null || _c === void 0 ? void 0 : _c.disabledRules,
-            failOn: (_d = this.checkConfig) === null || _d === void 0 ? void 0 : _d.failOn,
             actionCode: this.actionCode,
+            ...this.checkConfig,
         };
     }
     getFormattedStep(_fullLocatorsOn) {

package/mablscript/steps/AssertStep.js

@@ -266,6 +266,17 @@ class AssertStep extends MablStep_1.MablStep {
         }
         return `${this.primaryAction.toMablscript()}.${this.conditionAction.toMablscript()}${assertAction}`;
     }
+    toLineDiffFormat() {
+        if (this.primaryAction instanceof MobileFindAction_1.MobileFindAction) {
+            const lineDiffProperties = {
+                annotation: this.annotation,
+                disabled: this.isDisabled(),
+                descriptor: this.toStepDescriptor(),
+            };
+            return this.stringify(lineDiffProperties);
+        }
+        return super.toLineDiffFormat();
+    }
     getInputVariables() {
         var _a, _b, _c, _d;
         return (0, MablAction_1.distinctStrings)([

package/mablscript/types/mobile/ScrollStepDescriptor.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isScrollToElementStepDescriptor = exports.ScrollType = exports.ScrollDirection = void 0;
+exports.isScrollDeviceStepDescriptor = exports.isScrollWithinElementStepDescriptor = exports.isScrollToElementStepDescriptor = exports.ScrollType = exports.ScrollDirection = void 0;
 var ScrollDirection;
 (function (ScrollDirection) {
     ScrollDirection["Down"] = "down";
@@ -20,3 +20,13 @@ function isScrollToElementStepDescriptor(step) {
         !!step.targetElementDescriptor);
 }
 exports.isScrollToElementStepDescriptor = isScrollToElementStepDescriptor;
+function isScrollWithinElementStepDescriptor(step) {
+    return (step.scrollType === ScrollType.ScrollWithinElement &&
+        !!step.scrollDirection &&
+        !!step.find);
+}
+exports.isScrollWithinElementStepDescriptor = isScrollWithinElementStepDescriptor;
+function isScrollDeviceStepDescriptor(step) {
+    return (step.scrollType === ScrollType.ScrollDeviceScreen && !!step.scrollDirection);
+}
+exports.isScrollDeviceStepDescriptor = isScrollDeviceStepDescriptor;