@mablhq/mabl-cli 1.62.1 → 2.1.0

package/mablscript/steps/ReleaseStep.js

@@ -9,7 +9,7 @@ const ActionsUtils_1 = require("./ActionsUtils");
 class ReleaseStep extends MablStep_1.MablStep {
     constructor(name, args, actions) {
         var _a;
-        super(name, args, actions);
+        super(name, args, actions, 'release');
         this.findAction = ActionsUtils_1.ActionsUtils.validateSingleFindAction(this.actions);
         this.releaseArgs = (_a = this.parseArgs(args)) !== null && _a !== void 0 ? _a : { isHtml5: false };
     }
@@ -39,21 +39,28 @@ class ReleaseStep extends MablStep_1.MablStep {
                     find,
                     isHtml5: this.releaseArgs.isHtml5,
                     descriptorToActionMap: new Map().set(find, this.findAction),
+                    actionCode: this.actionCode,
                 };
             default:
                 throw new Error(`Error generating step descriptor for ${this.getStepName()}: Unexpected find type ${find.findType}`);
         }
     }
     getFormattedStep(_fullLocatorsOn) {
-        return {
+        const step = {
             Release: {
                 ...super.annotationsAsYml(),
                 ...this.findAction.toYaml(),
             },
         };
+        if (this.stepId()) {
+            step.Release.id = this.stepId();
+        }
+        return step;
     }
     static fromYaml(_stepName, stepArgs) {
-        return new ReleaseStep('release', [], [FindAction_1.FindAction.findActionFromStepArgs(stepArgs)]);
+        const step = new ReleaseStep('release', [], [FindAction_1.FindAction.findActionFromStepArgs(stepArgs)]);
+        step.setStepId(stepArgs.id);
+        return step;
     }
     toMablscript() {
         const args = (0, MablAction_1.convertObjectToMablscriptArgs)(this.releaseArgs);

package/mablscript/steps/RemoveCookieStep.js

@@ -7,7 +7,7 @@ const CookieUtils_1 = require("./CookieUtils");
 const domUtil_1 = require("../../domUtil");
 class RemoveCookieStep extends MablStep_1.MablStep {
     constructor(name, args, actions) {
-        super(name, args, actions);
+        super(name, args, actions, 'remove_cookie');
         this.cookieName = CookieUtils_1.CookieUtils.normalizeName(this.getActionArgs()[0].name);
     }
     getStepName() {
@@ -16,10 +16,13 @@ class RemoveCookieStep extends MablStep_1.MablStep {
     toStepDescriptor() {
         return {
             name: this.cookieName,
+            actionCode: this.actionCode,
         };
     }
     static fromYaml(_stepName, stepArgs) {
-        return new RemoveCookieStep('remove_cookie', [stepArgs], []);
+        const step = new RemoveCookieStep('remove_cookie', [stepArgs], []);
+        step.setStepId(stepArgs.id);
+        return step;
     }
     toMablscript() {
         return `remove_cookie({ name : "${(0, domUtil_1.escapeMablscriptString)(this.cookieName)}" })`;

package/mablscript/steps/RightClickStep.js

@@ -7,7 +7,7 @@ const domUtil_1 = require("../../domUtil");
 const ActionsUtils_1 = require("./ActionsUtils");
 class RightClickStep extends MablStep_1.MablStep {
     constructor(name, args, actions) {
-        super(name, args, actions);
+        super(name, args, actions, 'right_click');
         this.findAction = ActionsUtils_1.ActionsUtils.validateSingleFindAction(this.actions);
     }
     getStepName() {
@@ -23,21 +23,28 @@ class RightClickStep extends MablStep_1.MablStep {
                 return {
                     find,
                     descriptorToActionMap: new Map().set(find, this.findAction),
+                    actionCode: this.actionCode,
                 };
             default:
                 throw new Error(`Error generating step descriptor for ${this.getStepName()}: Unexpected find type ${find.findType}`);
         }
     }
     getFormattedStep(_fullLocatorsOn) {
-        return {
+        const step = {
             RightClick: {
                 ...super.annotationsAsYml(),
                 ...this.findAction.toYaml(),
             },
         };
+        if (this.stepId()) {
+            step.RightClick.id = this.stepId();
+        }
+        return step;
     }
     static fromYaml(_stepName, stepArgs) {
-        return new RightClickStep('right_click', [], [FindAction_1.FindAction.findActionFromStepArgs(stepArgs)]);
+        const step = new RightClickStep('right_click', [], [FindAction_1.FindAction.findActionFromStepArgs(stepArgs)]);
+        step.setStepId(stepArgs.id);
+        return step;
     }
     toMablscript() {
         return `${this.findAction.toMablscript()}.right_click()`;

package/mablscript/steps/SelectStep.js

@@ -7,7 +7,7 @@ const MablStep_1 = require("../MablStep");
 const domUtil_1 = require("../../domUtil");
 class SelectStep extends MablStep_1.MablStep {
     constructor(name, args, actions) {
-        super(name, args, actions);
+        super(name, args, actions, 'select');
         this.selectOptions = this.getActionArgs()[0];
         this.selectOptionType = this.getActionArgs()[1];
         this.validate();
@@ -45,18 +45,24 @@ class SelectStep extends MablStep_1.MablStep {
         delete stepArgs.selectorAncestors;
         delete stepArgs.selectOptionType;
         const selectOptions = stepArgs;
-        return new SelectStep('select', [selectOptions, selectOptionType], [findAction]);
+        const step = new SelectStep('select', [selectOptions, selectOptionType], [findAction]);
+        step.setStepId(stepArgs.id);
+        return step;
     }
     getFormattedStep(_fullLocatorsOn) {
         const step = this.selectOptions;
         const { find, ...ymlStep } = step;
-        return {
+        const finalStep = {
             Select: {
                 ...ymlStep,
                 ...super.annotationsAsYml(),
                 ...this.findAction.toYaml(),
             },
         };
+        if (this.stepId()) {
+            finalStep.Select.id = this.stepId();
+        }
+        return finalStep;
     }
     toMablscript() {
         const selectOptionType = this.selectOptionType

package/mablscript/steps/SendHttpRequestStep.js

@@ -10,11 +10,11 @@ const evalAssertionType = {};
 Object.entries(AssertStep_1.assertionStepToField).forEach(([stepType, field]) => (evalAssertionType[field] = `${stepType.split('Assert')[1]}`));
 class SendHttpRequestStep extends MablStep_1.MablStep {
     constructor(name, args, actions) {
-        super(name, args, actions);
+        super(name, args, actions, 'send_http_request');
         this.sendRequest = this.getActionArgs()[0];
     }
     getStepName() {
-        return 'SendHttpRequest';
+        return SendHttpRequestStep.stepName;
     }
     toStepDescriptor() {
         const formatted = JSON.parse(JSON.stringify(this.sendRequest));
@@ -24,6 +24,7 @@ class SendHttpRequestStep extends MablStep_1.MablStep {
                 assertion: evalAssertionType[assertion.assertion],
             }));
         }
+        formatted.actionCode = this.actionCode;
         return formatted;
     }
     static fromYaml(_stepName, stepArgs) {
@@ -35,7 +36,9 @@ class SendHttpRequestStep extends MablStep_1.MablStep {
                 assertion: AssertStep_1.assertionStepToField[`Assert${assertion.assertion}`],
             }));
         }
-        return new SendHttpRequestStep('send_http_request', [formatted], []);
+        const step = new SendHttpRequestStep(SendHttpRequestStep.stepName, [formatted], []);
+        step.setStepId(stepArgs.id);
+        return step;
     }
     toMablscript() {
         return `send_http_request(${(0, domUtil_1.buildStepArgumentString)({
@@ -52,8 +55,9 @@ class SendHttpRequestStep extends MablStep_1.MablStep {
     }
 }
 exports.SendHttpRequestStep = SendHttpRequestStep;
+SendHttpRequestStep.stepName = 'SendHttpRequest';
 SendHttpRequestStep.mablScriptStepNames = ['send_http_request'];
-SendHttpRequestStep.yamlMablScriptNames = ['SendHttpRequest'];
+SendHttpRequestStep.yamlMablScriptNames = [SendHttpRequestStep.stepName];
 var HttpResponseAssertion;
 (function (HttpResponseAssertion) {
     function toComparisonDescriptor(assertion) {

package/mablscript/steps/SendKeyStep.js

@@ -8,7 +8,7 @@ const SendKeyStepDescriptor_1 = require("../types/SendKeyStepDescriptor");
 const STEP_NAME = 'SendKeys';
 class SendKeyStep extends MablStep_1.MablStep {
     constructor(name, args, actions) {
-        super(name, args, actions);
+        super(name, args, actions, 'send_keys');
         if (this.actions.length !== 1 && !(this.actions[0] instanceof FindAction_1.FindAction)) {
             throw new Error(`${name} step should have one sub-action and it should be a find`);
         }
@@ -43,24 +43,31 @@ class SendKeyStep extends MablStep_1.MablStep {
                     find,
                     keys: this.keys,
                     descriptorToActionMap: new Map().set(find, this.findAction),
+                    actionCode: this.actionCode,
                 };
             default:
                 throw new Error(`Error generating step descriptor for ${this.getStepName()}: Unexpected find type ${find.findType}`);
         }
     }
     getFormattedStep() {
-        return {
+        const step = {
             [STEP_NAME]: {
                 ...super.annotationsAsYml(),
                 sendKeys: this.keys,
                 ...this.findAction.toYaml(),
             },
         };
+        if (this.stepId()) {
+            step[STEP_NAME].id = this.stepId();
+        }
+        return step;
     }
     static fromYaml(_stepName, stepArgs) {
-        return new SendKeyStep('send_keys', stepArgs.sendKeys, [
+        const step = new SendKeyStep('send_keys', stepArgs.sendKeys, [
             FindAction_1.FindAction.findActionFromStepArgs(stepArgs),
         ]);
+        step.setStepId(stepArgs.id);
+        return step;
     }
     toMablscript() {
         const keysToSend = this.keys

package/mablscript/steps/SetCookieStep.js

@@ -7,7 +7,7 @@ const CookieUtils_1 = require("./CookieUtils");
 const domUtil_1 = require("../../domUtil");
 class SetCookieStep extends MablStep_1.MablStep {
     constructor(name, args, actions) {
-        super(name, args, actions);
+        super(name, args, actions, 'set_cookie');
         const cookieSelector = this.getActionArgs()[0];
         this.cookieName = CookieUtils_1.CookieUtils.normalizeName(cookieSelector.name);
         this.cookieValue = CookieUtils_1.CookieUtils.normalizeValue(cookieSelector.value);
@@ -32,10 +32,13 @@ class SetCookieStep extends MablStep_1.MablStep {
             name: this.cookieName,
             value: this.cookieValue,
             options: this.cookieOptions,
+            actionCode: this.actionCode,
         };
     }
     static fromYaml(_stepName, stepArgs) {
-        return new SetCookieStep('set_cookie', [stepArgs], []);
+        const step = new SetCookieStep('set_cookie', [stepArgs], []);
+        step.setStepId(stepArgs.id);
+        return step;
     }
     toMablscript() {
         var _a, _b, _c, _d, _e, _f, _g;

package/mablscript/steps/SetFilesStep.js

@@ -7,7 +7,7 @@ const MablStep_1 = require("../MablStep");
 const domUtil_1 = require("../../domUtil");
 class SetFilesStep extends MablStep_1.MablStep {
     constructor(name, args, actions) {
-        super(name, args, actions);
+        super(name, args, actions, 'set_files');
         this.files = this.getActionArgs();
         this.validate();
         this.findAction = this.actions[0];
@@ -37,18 +37,24 @@ class SetFilesStep extends MablStep_1.MablStep {
         }
     }
     getFormattedStep(_fullLocatorsOn) {
-        return {
+        const step = {
             SetFiles: {
                 ...super.annotationsAsYml(),
                 ...this.findAction.toYaml(),
                 files: this.files,
             },
         };
+        if (this.stepId()) {
+            step.SetFiles.id = this.stepId();
+        }
+        return step;
     }
     static fromYaml(_stepName, stepArgs) {
-        return new SetFilesStep('set_files', stepArgs.files, [
+        const step = new SetFilesStep('set_files', stepArgs.files, [
             FindAction_1.FindAction.findActionFromStepArgs(stepArgs),
         ]);
+        step.setStepId(stepArgs.id);
+        return step;
     }
     toMablscript() {
         const files = this.files

package/mablscript/steps/SetViewportStep.js

@@ -4,7 +4,7 @@ exports.SetViewportStep = void 0;
 const MablStep_1 = require("../MablStep");
 class SetViewportStep extends MablStep_1.MablStep {
     constructor(name, args, actions) {
-        super(name, args, actions);
+        super(name, args, actions, 'set_viewport');
         const viewportArg = this.getActionArgs()[0];
         this.size = viewportArg === null || viewportArg === void 0 ? void 0 : viewportArg.size;
     }
@@ -12,10 +12,12 @@ class SetViewportStep extends MablStep_1.MablStep {
         return 'SetViewport';
     }
     toStepDescriptor() {
-        return { size: this.size };
+        return { size: this.size, actionCode: this.actionCode };
     }
     static fromYaml(_stepName, stepArgs) {
-        return new SetViewportStep('set_viewport', [stepArgs], []);
+        const step = new SetViewportStep('set_viewport', [stepArgs], []);
+        step.setStepId(stepArgs.id);
+        return step;
     }
     toMablscript() {
         let sizeArg;

package/mablscript/steps/SwitchContextStep.js

@@ -7,7 +7,7 @@ const SwitchContextStepDescriptor_1 = require("../types/SwitchContextStepDescrip
 const domUtil_1 = require("../../domUtil");
 class SwitchContextStep extends MablStep_1.MablStep {
     constructor(name, args, actions) {
-        super(name, args, actions);
+        super(name, args, actions, 'switch_context_to');
         const maybeRoot = this.getActionArgs()[0];
         if (maybeRoot !== undefined && maybeRoot !== 'root') {
             throw new Error(`Unexpected argument for ${name} step: ${JSON.stringify(maybeRoot)}`);
@@ -15,6 +15,7 @@ class SwitchContextStep extends MablStep_1.MablStep {
         if (maybeRoot === 'root') {
             this.switch = {
                 frame: 'root',
+                actionCode: this.actionCode,
             };
             Object.freeze(this.switch);
             return;
@@ -32,6 +33,7 @@ class SwitchContextStep extends MablStep_1.MablStep {
                 tab: findDescriptor,
                 find: findDescriptor,
                 descriptorToActionMap: new Map().set(findDescriptor, this.findAction),
+                actionCode: this.actionCode,
             };
             Object.freeze(this.switch);
             return;
@@ -41,6 +43,7 @@ class SwitchContextStep extends MablStep_1.MablStep {
                 frame: findDescriptor,
                 find: findDescriptor,
                 descriptorToActionMap: new Map().set(findDescriptor, this.findAction),
+                actionCode: this.actionCode,
             };
             Object.freeze(this.switch);
             return;
@@ -86,13 +89,21 @@ class SwitchContextStep extends MablStep_1.MablStep {
         if ((0, SwitchContextStepDescriptor_1.isSwitchRoot)(step) && step.frame === 'root') {
             formatted[stepName].switch = 'root';
         }
+        if (this.stepId()) {
+            formatted[stepName].id = this.stepId();
+        }
         return formatted;
     }
     static fromYaml(_stepName, stepArgs) {
+        let step;
         if (stepArgs.switch) {
-            return new SwitchContextStep('switch_context_to', [stepArgs.switch], []);
+            step = new SwitchContextStep('switch_context_to', [stepArgs.switch], []);
+        }
+        else {
+            step = new SwitchContextStep('switch_context_to', [], [FindAction_1.FindAction.findActionFromStepArgs(stepArgs)]);
         }
-        return new SwitchContextStep('switch_context_to', [], [FindAction_1.FindAction.findActionFromStepArgs(stepArgs)]);
+        step.setStepId(stepArgs.id);
+        return step;
     }
     toMablscript() {
         var _a;

package/mablscript/steps/SyntheticStep.js

@@ -5,7 +5,7 @@ const MablStep_1 = require("../MablStep");
 exports.DEFAULT_STEP_SOURCE_INDEX_IN_FLOW = -1;
 class SyntheticStep extends MablStep_1.MablStep {
     constructor(name, args = [], actions = [], stepSourceIndexInFlow = exports.DEFAULT_STEP_SOURCE_INDEX_IN_FLOW) {
-        super(name, args, actions);
+        super(name, args, actions, name);
         this.stepSourceIndexInFlow = stepSourceIndexInFlow;
         this.actionSourceIndexInStep = 0;
     }

package/mablscript/steps/VisitUrlStep.js

@@ -6,7 +6,7 @@ const MablAction_1 = require("../MablAction");
 const domUtil_1 = require("../../domUtil");
 class VisitUrlStep extends MablStep_1.MablStep {
     constructor(name, args, actions) {
-        super(name, args, actions);
+        super(name, args, actions, 'visit_url');
         const arg = this.getActionArgs()[0];
         this.url = VisitUrlStep.normalizeUrl(arg);
     }
@@ -16,10 +16,13 @@ class VisitUrlStep extends MablStep_1.MablStep {
     toStepDescriptor() {
         return {
             url: this.url,
+            actionCode: this.actionCode,
         };
     }
     static fromYaml(_stepName, stepArgs) {
-        return new VisitUrlStep('visit_url', [stepArgs.url], []);
+        const step = new VisitUrlStep('visit_url', [stepArgs.url], []);
+        step.setStepId(stepArgs.id);
+        return step;
     }
     toMablscript() {
         const resolvedUrl = this.substituteMablscriptVariable((0, domUtil_1.escapeMablscriptString)(this.url.toString()));

package/mablscript/steps/WaitStep.js

@@ -4,19 +4,22 @@ exports.WaitStep = void 0;
 const MablStep_1 = require("../MablStep");
 class WaitStep extends MablStep_1.MablStep {
     constructor(name, args, actions) {
-        super(name, args, actions);
+        super(name, args, actions, 'wait');
         this.milliseconds = WaitStep.validateWait(this.getActionArgs()[0]);
     }
     getStepName() {
-        return 'Wait';
+        return WaitStep.stepName;
     }
     toStepDescriptor() {
         return {
             milliseconds: this.milliseconds,
+            actionCode: this.actionCode,
         };
     }
     static fromYaml(_stepName, stepArgs) {
-        return new WaitStep('wait', [stepArgs.milliseconds], []);
+        const step = new WaitStep(WaitStep.stepName, [stepArgs.milliseconds], []);
+        step.setStepId(stepArgs.id);
+        return step;
     }
     toMablscript() {
         return `wait(${this.milliseconds})`;
@@ -29,5 +32,6 @@ class WaitStep extends MablStep_1.MablStep {
     }
 }
 exports.WaitStep = WaitStep;
+WaitStep.stepName = 'Wait';
 WaitStep.mablScriptStepNames = ['wait'];
-WaitStep.yamlMablScriptNames = ['Wait'];
+WaitStep.yamlMablScriptNames = [WaitStep.stepName];

package/mablscript/steps/WaitUntilStep.js

@@ -5,7 +5,7 @@ const MablStep_1 = require("../MablStep");
 const domUtil_1 = require("../../domUtil");
 class WaitUntilStep extends MablStep_1.MablStep {
     constructor(name, args, actions) {
-        super(name, args, actions);
+        super(name, args, actions, 'wait_until');
         if ((0, domUtil_1.isFindElementType)(this.actions[0].getActionName())) {
             this.findAction = this.actions[0];
         }
@@ -23,13 +23,16 @@ class WaitUntilStep extends MablStep_1.MablStep {
                 return {
                     find,
                     descriptorToActionMap: new Map().set(find, this.findAction),
+                    actionCode: this.actionCode,
                 };
             default:
                 throw new Error(`Error generating step descriptor for ${this.getStepName()}: Unexpected find type ${find.findType} is not supported`);
         }
     }
-    static fromYaml(_stepName, _stepArgs) {
-        return new WaitUntilStep('wait', [], []);
+    static fromYaml(_stepName, stepArgs) {
+        const step = new WaitUntilStep('wait', [], []);
+        step.setStepId(stepArgs.id);
+        return step;
     }
     toMablscript() {
         return `${this.findAction.toMablscript()}.evaluate_presence("present").assert()`;

package/mablscript/types/GetVariableDescriptor.js

@@ -1,11 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.newGetVariableDescriptor = exports.isGetVariableDescriptor = void 0;
+exports.convertGetVariableDescriptorToYaml = exports.newGetVariableDescriptor = exports.isGetVariableDescriptor = exports.GET_VARIABLE_VALUE = void 0;
+exports.GET_VARIABLE_VALUE = 'GetVariable';
 function isGetVariableDescriptor(value) {
-    return value.kind === 'GetVariable';
+    return value.kind === exports.GET_VARIABLE_VALUE;
 }
 exports.isGetVariableDescriptor = isGetVariableDescriptor;
 function newGetVariableDescriptor(variable) {
-    return { kind: 'GetVariable', variable };
+    return { kind: exports.GET_VARIABLE_VALUE, variable };
 }
 exports.newGetVariableDescriptor = newGetVariableDescriptor;
+function convertGetVariableDescriptorToYaml(descriptor) {
+    return { ...descriptor, variable: descriptor.variable.toString() };
+}
+exports.convertGetVariableDescriptorToYaml = convertGetVariableDescriptorToYaml;

package/mablscript/types/mobile/CreateVariableMobileStepDescriptor.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isCreateVariableMobileFindStepDescriptor = void 0;
+function isCreateVariableMobileFindStepDescriptor(value) {
+    var _a, _b, _c, _d, _e, _f;
+    return !!(((_c = (_b = (_a = value.find) === null || _a === void 0 ? void 0 : _a.findTarget) === null || _b === void 0 ? void 0 : _b.selector) === null || _c === void 0 ? void 0 : _c.iOS) ||
+        ((_f = (_e = (_d = value.find) === null || _d === void 0 ? void 0 : _d.findTarget) === null || _e === void 0 ? void 0 : _e.selector) === null || _f === void 0 ? void 0 : _f.android));
+}
+exports.isCreateVariableMobileFindStepDescriptor = isCreateVariableMobileFindStepDescriptor;

package/mablscript/types/mobile/EnterTextStepDescriptor.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/mablscript/types/mobile/NavigateBackStepDescriptor.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/mablscript/types/mobile/NavigateHomeStepDescriptor.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/mablscript/types/mobile/ScrollStepDescriptor.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/mablscript/types/mobile/SetOrientationStepDescriptor.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Orientation = void 0;
+var Orientation;
+(function (Orientation) {
+    Orientation["Landscape"] = "LANDSCAPE";
+    Orientation["Portrait"] = "PORTRAIT";
+})(Orientation = exports.Orientation || (exports.Orientation = {}));

package/mablscript/types/mobile/StepWithMobileFindDescriptor.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/mablscript/types/mobile/TapStepDescriptor.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TapType = void 0;
+var TapType;
+(function (TapType) {
+    TapType["long"] = "long";
+    TapType["tap"] = "tap";
+})(TapType = exports.TapType || (exports.TapType = {}));