@mablhq/mabl-cli 2.0.3 → 2.1.0

package/mablscript/steps/ElseStep.js

@@ -4,16 +4,18 @@ exports.ElseStep = void 0;
 const MablStep_1 = require("../MablStep");
 class ElseStep extends MablStep_1.MablStep {
     constructor(name, args, actions) {
-        super(name, args, actions);
+        super(name, args, actions, 'conditional_else');
     }
     getStepName() {
         return 'Else';
     }
     toStepDescriptor() {
-        return {};
+        return { actionCode: this.actionCode };
     }
-    static fromYaml(_stepName, _stepArgs) {
-        return new ElseStep('conditional_else', [], []);
+    static fromYaml(_stepName, stepArgs) {
+        const step = new ElseStep('conditional_else', [], []);
+        step.setStepId(stepArgs.id);
+        return step;
     }
     toMablscript() {
         return `conditional_else()`;

package/mablscript/steps/EndStep.js

@@ -4,16 +4,18 @@ exports.EndStep = void 0;
 const MablStep_1 = require("../MablStep");
 class EndStep extends MablStep_1.MablStep {
     constructor(name, args, actions) {
-        super(name, args, actions);
+        super(name, args, actions, 'conditional_end');
     }
     getStepName() {
         return 'End';
     }
     toStepDescriptor() {
-        return {};
+        return { actionCode: this.actionCode };
     }
-    static fromYaml(_stepName, _stepArgs) {
-        return new EndStep('conditional_end', [], []);
+    static fromYaml(_stepName, stepArgs) {
+        const step = new EndStep('conditional_end', [], []);
+        step.setStepId(stepArgs.id);
+        return step;
     }
     toMablscript() {
         return `conditional_end()`;

package/mablscript/steps/EnterAuthCodeStep.js

@@ -7,7 +7,7 @@ const domUtil_1 = require("../../domUtil");
 const ActionsUtils_1 = require("./ActionsUtils");
 class EnterAuthCodeStep extends MablStep_1.MablStep {
     constructor(name, args, actions) {
-        super(name, args, actions);
+        super(name, args, actions, 'enter_auth_code');
         this.findAction = ActionsUtils_1.ActionsUtils.validateSingleFindAction(this.actions);
     }
     getStepName() {
@@ -23,21 +23,28 @@ class EnterAuthCodeStep 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 = {
             EnterAuthCode: {
                 ...super.annotationsAsYml(),
                 ...this.findAction.toYaml(),
             },
         };
+        if (this.stepId()) {
+            step.EnterAuthCode.id = this.stepId();
+        }
+        return step;
     }
     static fromYaml(_stepName, stepArgs) {
-        return new EnterAuthCodeStep('enter_auth_code', [], [FindAction_1.FindAction.findActionFromStepArgs(stepArgs)]);
+        const step = new EnterAuthCodeStep('enter_auth_code', [], [FindAction_1.FindAction.findActionFromStepArgs(stepArgs)]);
+        step.setStepId(stepArgs.id);
+        return step;
     }
     toMablscript() {
         return `${this.findAction.toMablscript()}.enter_auth_code()`;

package/mablscript/steps/EnterTextStep.js

@@ -7,7 +7,7 @@ const MablStep_1 = require("../MablStep");
 const domUtil_1 = require("../../domUtil");
 class EnterTextStep extends MablStep_1.MablStep {
     constructor(name, args, actions) {
-        super(name, args, actions);
+        super(name, args, actions, 'enter_text');
         const arg = this.getActionArgs()[0];
         this.text = (0, MablAction_1.parseArgument)(arg);
         this.validate();
@@ -37,6 +37,7 @@ class EnterTextStep extends MablStep_1.MablStep {
                     find,
                     descriptorToActionMap: new Map().set(find, this.findAction),
                     text: this.text,
+                    actionCode: this.actionCode,
                 };
             default:
                 throw new Error(`Error generating step descriptor for ${this.getStepName()}: Unexpected find type ${find.findType}`);
@@ -67,10 +68,15 @@ class EnterTextStep extends MablStep_1.MablStep {
         }
         formatted[stepName].findType = FindAction_1.findTypesToFormattedType[step.find.findType];
         formatted[stepName].text = this.text.toString();
+        if (this.stepId()) {
+            formatted[stepName].id = this.stepId();
+        }
         return formatted;
     }
     static fromYaml(_stepName, stepArgs) {
-        return new EnterTextStep('enter_text', [stepArgs.text], [FindAction_1.FindAction.findActionFromStepArgs(stepArgs)]);
+        const step = new EnterTextStep('enter_text', [stepArgs.text], [FindAction_1.FindAction.findActionFromStepArgs(stepArgs)]);
+        step.setStepId(stepArgs.id);
+        return step;
     }
     toMablscript() {
         const enterText = typeof this.text === 'string'

package/mablscript/steps/EvaluateFlowStep.js

@@ -6,7 +6,7 @@ const MablStep_1 = require("../MablStep");
 exports.EVALUATE_FLOW_STEP_NAME = 'EvaluateFlow';
 class EvaluateFlowStep extends MablStep_1.MablStep {
     constructor(name, args, actions) {
-        super(name, args, actions);
+        super(name, args, actions, 'evaluate_flow');
         if (args.length < 1 || args.length > 2) {
             throw new Error('EvaluateFlowStep expects 1 or 2 arguments');
         }
@@ -22,11 +22,14 @@ class EvaluateFlowStep extends MablStep_1.MablStep {
         return {
             descriptor: this.flowDescriptor,
             config: this.config,
+            actionCode: this.actionCode,
         };
     }
     static fromYaml(_stepName, stepArgs) {
         const { descriptor, config } = stepArgs;
-        return new EvaluateFlowStep(EvaluateFlowStep.mablScriptStepNames[0], [descriptor, config], []);
+        const step = new EvaluateFlowStep(EvaluateFlowStep.mablScriptStepNames[0], [descriptor, config], []);
+        step.setStepId(stepArgs.id);
+        return step;
     }
     toMablscript() {
         const flowReference = (0, domUtil_1.buildStepArgumentString)({

package/mablscript/steps/EvaluateJavaScriptStep.js

@@ -6,7 +6,7 @@ const JavaScriptAction_1 = require("../actions/JavaScriptAction");
 const STEP_NAME = 'EvaluateJavaScript';
 class EvaluateJavaScriptStep extends MablStep_1.MablStep {
     constructor(name, args, actions) {
-        super(name, args, actions || []);
+        super(name, args, actions || [], 'evaluate_js');
         this.evaluateJsAction = new JavaScriptAction_1.JavaScriptAction(JavaScriptAction_1.JavaScriptAction.mablscriptName, args);
     }
     getStepName() {
@@ -16,16 +16,22 @@ class EvaluateJavaScriptStep extends MablStep_1.MablStep {
         return this.evaluateJsAction.toDescriptor();
     }
     getFormattedStep() {
-        return {
+        const step = {
             [STEP_NAME]: {
                 ...super.annotationsAsYml(),
                 ...this.evaluateJsAction.toYaml(),
             },
         };
+        if (this.stepId()) {
+            step[STEP_NAME].id = this.stepId();
+        }
+        return step;
     }
     static fromYaml(_stepName, stepArgs) {
         const evaluateJsAction = JavaScriptAction_1.JavaScriptAction.fromYaml(stepArgs);
-        return new EvaluateJavaScriptStep(evaluateJsAction.name, evaluateJsAction.args);
+        const step = new EvaluateJavaScriptStep(evaluateJsAction.name, evaluateJsAction.args);
+        step.setStepId(stepArgs.id);
+        return step;
     }
     toMablscript() {
         return this.evaluateJsAction.toMablscript();

package/mablscript/steps/HoverStep.js

@@ -6,7 +6,7 @@ const MablStep_1 = require("../MablStep");
 const domUtil_1 = require("../../domUtil");
 class HoverStep extends MablStep_1.MablStep {
     constructor(name, args, actions) {
-        super(name, args, actions);
+        super(name, args, actions, 'hover');
         this.validate();
         this.findAction = this.actions[0];
     }
@@ -28,21 +28,28 @@ class HoverStep 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 = {
             Hover: {
                 ...super.annotationsAsYml(),
                 ...this.findAction.toYaml(),
             },
         };
+        if (this.stepId()) {
+            step.Hover.id = this.stepId();
+        }
+        return step;
     }
     static fromYaml(_stepName, stepArgs) {
-        return new HoverStep('hover', [], [FindAction_1.FindAction.findActionFromStepArgs(stepArgs)]);
+        const step = new HoverStep('hover', [], [FindAction_1.FindAction.findActionFromStepArgs(stepArgs)]);
+        step.setStepId(stepArgs.id);
+        return step;
     }
     toMablscript() {
         return `${this.findAction.toMablscript()}.hover()`;

package/mablscript/steps/IfConditionStep.js

@@ -14,7 +14,7 @@ const GetUrlAction_1 = require("../actions/GetUrlAction");
 const ConditionDescriptor_1 = require("../types/ConditionDescriptor");
 class IfConditionStep extends MablStep_1.MablStep {
     constructor(name, args, actions) {
-        super(name, args, actions);
+        super(name, args, actions, 'conditional_if');
         const candidatePrimaryActions = actions.filter((action) => action instanceof FindAction_1.FindAction ||
             action instanceof GetVariableValue_1.GetVariableValue ||
             action instanceof GetUrlAction_1.GetUrlAction ||
@@ -44,11 +44,15 @@ class IfConditionStep extends MablStep_1.MablStep {
             conditionDescriptor,
             onFailure: AssertStep_1.OnFailure.FailImmediately,
             descriptorToActionMap: new Map().set(find, this.primaryAction),
+            actionCode: this.actionCode,
         };
     }
     getFormattedStep(_fullLocatorsOn) {
         const result = {};
         result[this.getStepName()] = this.toYamlConditionDetails();
+        if (this.stepId()) {
+            result[this.getStepName()].id = this.stepId();
+        }
         return result;
     }
     toYamlConditionDetails() {
@@ -132,7 +136,9 @@ class IfConditionStep extends MablStep_1.MablStep {
     }
     static fromYaml(_stepName, stepArgs) {
         const actions = IfConditionStep.getActionsFromYamlForCondition(stepArgs);
-        return new IfConditionStep('conditional_if', [], actions);
+        const step = new IfConditionStep('conditional_if', [], actions);
+        step.setStepId(stepArgs.id);
+        return step;
     }
     toMablscript() {
         return `${this.actions.reduce((mablscript, action) => `${mablscript}${action.toMablscript()}.`, '')}conditional_if()`;

package/mablscript/steps/NavigateStep.js

@@ -4,7 +4,7 @@ exports.NavigateStep = void 0;
 const MablStep_1 = require("../MablStep");
 class NavigateStep extends MablStep_1.MablStep {
     constructor(name, args, actions) {
-        super(name, args, actions);
+        super(name, args, actions, 'navigate');
         this.navigation = this.getActionArgs()[0];
     }
     getStepName() {
@@ -13,10 +13,13 @@ class NavigateStep extends MablStep_1.MablStep {
     toStepDescriptor() {
         return {
             navigation: this.navigation,
+            actionCode: this.actionCode,
         };
     }
     static fromYaml(_stepName, stepArgs) {
-        return new NavigateStep('navigate', [stepArgs.navigation], []);
+        const step = new NavigateStep('navigate', [stepArgs.navigation], []);
+        step.setStepId(stepArgs.id);
+        return step;
     }
     toMablscript() {
         return `navigate("${this.navigation}")`;

package/mablscript/steps/OpenEmailStep.js

@@ -5,7 +5,7 @@ const FindAction_1 = require("../actions/FindAction");
 const MablStep_1 = require("../MablStep");
 class OpenEmailStep extends MablStep_1.MablStep {
     constructor(name, args, actions) {
-        super(name, args, actions);
+        super(name, args, actions, 'open_email');
         this.tabUuid = this.getActionArgs()[0] || {};
         this.validate();
         this.findAction = this.actions[0];
@@ -25,10 +25,13 @@ class OpenEmailStep extends MablStep_1.MablStep {
             selector: find.findTarget.selector,
             findType: 'FindEmail',
             configuration: find.findTarget.configuration,
+            actionCode: this.actionCode,
         };
     }
     static fromYaml(_stepName, stepArgs) {
-        return new OpenEmailStep('open_email', [stepArgs.tab], [FindAction_1.FindAction.findActionFromStepArgs(stepArgs)]);
+        const step = new OpenEmailStep('open_email', [stepArgs.tab], [FindAction_1.FindAction.findActionFromStepArgs(stepArgs)]);
+        step.setStepId(stepArgs.id);
+        return step;
     }
     toMablscript() {
         return `${this.findAction.toMablscript()}.open_email("${this.tabUuid}")`;

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,7 +10,7 @@ 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() {
@@ -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(SendHttpRequestStep.stepName, [formatted], []);
+        const step = new SendHttpRequestStep(SendHttpRequestStep.stepName, [formatted], []);
+        step.setStepId(stepArgs.id);
+        return step;
     }
     toMablscript() {
         return `send_http_request(${(0, domUtil_1.buildStepArgumentString)({

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;