@mablhq/mabl-cli 2.72.0 → 2.72.4

package/mablscript/steps/DownloadStep.js

@@ -1,111 +1,95 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DownloadStep = void 0;
-const MablStepV2_1 = require("../MablStepV2");
+const MablStep_1 = require("../MablStep");
 const MablAction_1 = require("../MablAction");
 const AwaitDownloadAction_1 = require("../actions/AwaitDownloadAction");
 const AwaitPDFDownloadAction_1 = require("../actions/AwaitPDFDownloadAction");
 const domUtil_1 = require("../../domUtil");
-class DownloadStep extends MablStepV2_1.MablStepV2 {
-    constructor(stepName, descriptor) {
-        super(stepName, descriptor, DownloadStep.actionCode);
-        const isPdfDownload = stepName === DownloadStep.pdfStepName;
-        if (isPdfDownload) {
-            if (!descriptor.tabIdentifier) {
-                throw new Error('DownloadPdfStep must have a tabIdentifier');
-            }
-            this.awaitDownloadAction = new AwaitPDFDownloadAction_1.AwaitPDFDownloadAction('await_pdf', [
-                { uuid: descriptor.tabIdentifier },
-            ]);
-        }
-        else {
-            this.awaitDownloadAction = new AwaitDownloadAction_1.AwaitDownloadAction('await_download', []);
-        }
-        this.fileAttributes =
-            DownloadStep.populateDownloadArgsFromDescriptor(descriptor);
-    }
-    static populateDownloadArgsFromDescriptor(descriptor) {
-        return {
-            file_name: descriptor.fileName,
-            file_mime_type: descriptor.mimeType,
-            file_md5: descriptor.fileMd5,
-            file_sha256: descriptor.fileSha256,
-            file_size_bytes: descriptor.sizeBytes,
-            file_size_bytes_max: descriptor.sizeBytesMax,
-            file_size_bytes_min: descriptor.sizeBytesMin,
-        };
+class DownloadStep extends MablStep_1.MablStep {
+    constructor(name, args, actions) {
+        super(name, args, actions, 'assert_download');
+        this.validate();
+        this.fileAttributes = (this.getActionArgs()[0] ?? {});
+        this.awaitDownloadAction = this.actions[0];
     }
-    validate(actions) {
-        if (actions.length !== 1 && !(actions[0] instanceof AwaitDownloadAction_1.AwaitDownloadAction)) {
+    validate() {
+        if (this.actions.length !== 1 &&
+            !(this.actions[0] instanceof AwaitDownloadAction_1.AwaitDownloadAction)) {
             throw new Error('Download step should contain an await download sub action');
         }
     }
     getStepName() {
         if (this.isPDFDownload()) {
-            return DownloadStep.pdfStepName;
+            return 'DownloadPdfStep';
         }
-        return DownloadStep.stepName;
+        return 'DownloadStep';
     }
     isPDFDownload() {
         return this.awaitDownloadAction instanceof AwaitPDFDownloadAction_1.AwaitPDFDownloadAction;
     }
     toStepDescriptor() {
-        return this.descriptor;
-    }
-    static fromYaml(stepName, stepArgs) {
-        const stepDescriptor = stepArgs;
-        const step = new DownloadStep(stepName, stepDescriptor);
-        step.setStepId(stepArgs.id);
-        return step;
-    }
-    static fromLegacyMablscript(args, actions) {
-        DownloadStep.validateLegacyActions(actions);
-        const fileAttributes = (args[0] ?? {});
-        const awaitDownloadAction = actions[0];
-        const stepDescriptor = {
-            fileName: fileAttributes.file_name,
-            mimeType: fileAttributes.file_mime_type,
-            sizeBytes: fileAttributes.file_size_bytes,
-            sizeBytesMax: fileAttributes.file_size_bytes_max,
-            sizeBytesMin: fileAttributes.file_size_bytes_min,
-            fileMd5: fileAttributes.file_md5,
-            fileSha256: fileAttributes.file_sha256,
-        };
-        const isPdfDownload = awaitDownloadAction instanceof AwaitPDFDownloadAction_1.AwaitPDFDownloadAction;
-        if (isPdfDownload) {
-            stepDescriptor.tabIdentifier = awaitDownloadAction.pdfUUID;
+        const formatted = {};
+        if (this.isPDFDownload()) {
+            formatted.tabIdentifier = this.actions[0].pdfUUID;
+        }
+        if (this.fileAttributes.file_name !== undefined) {
+            formatted.fileName = this.fileAttributes.file_name;
+        }
+        if (this.fileAttributes.file_mime_type !== undefined) {
+            formatted.mimeType = this.fileAttributes.file_mime_type;
         }
-        const stepName = isPdfDownload
-            ? DownloadStep.pdfStepName
-            : DownloadStep.stepName;
-        return new DownloadStep(stepName, stepDescriptor);
+        if (this.fileAttributes.file_md5 !== undefined) {
+            formatted.fileMd5 = this.fileAttributes.file_md5;
+        }
+        if (this.fileAttributes.file_sha256 !== undefined) {
+            formatted.fileSha256 = this.fileAttributes.file_sha256;
+        }
+        if (this.fileAttributes.file_size_bytes !== undefined) {
+            formatted.sizeBytes = this.fileAttributes.file_size_bytes;
+        }
+        if (this.fileAttributes.file_size_bytes_max !== undefined) {
+            formatted.sizeBytesMax = this.fileAttributes.file_size_bytes_max;
+        }
+        if (this.fileAttributes.file_size_bytes_min !== undefined) {
+            formatted.sizeBytesMin = this.fileAttributes.file_size_bytes_min;
+        }
+        return formatted;
     }
-    static validateLegacyActions(actions) {
-        if (actions.length !== 1 && !(actions[0] instanceof AwaitDownloadAction_1.AwaitDownloadAction)) {
-            throw new Error('Download step should contain an await download sub action');
+    static fromYaml(_stepName, stepArgs) {
+        const fileAttributes = {};
+        const assertDownload = stepArgs;
+        fileAttributes.file_name = assertDownload.fileName;
+        fileAttributes.file_mime_type = assertDownload.mimeType;
+        fileAttributes.file_md5 = assertDownload.fileMd5;
+        fileAttributes.file_sha256 = assertDownload.fileSha256;
+        fileAttributes.file_size_bytes = assertDownload.sizeBytes;
+        fileAttributes.file_size_bytes_max = assertDownload.sizeBytesMax;
+        fileAttributes.file_size_bytes_min = assertDownload.sizeBytesMin;
+        let awaitDownloadAction;
+        if (assertDownload.tabIdentifier) {
+            awaitDownloadAction = new AwaitPDFDownloadAction_1.AwaitPDFDownloadAction('await_pdf', [
+                { uuid: assertDownload.tabIdentifier },
+            ]);
+        }
+        else {
+            awaitDownloadAction = new AwaitDownloadAction_1.AwaitDownloadAction('await_download', []);
         }
+        const step = new DownloadStep('assert_download', [fileAttributes], [awaitDownloadAction]);
+        step.setStepId(stepArgs.id);
+        return step;
     }
     toMablscript() {
-        const meaningfulAttributes = DownloadStep.populateDownloadArgsFromDescriptor(this.toStepDescriptor());
         const mablArgs = (0, domUtil_1.buildStepArgumentString)({
-            params: meaningfulAttributes,
+            params: { ...this.fileAttributes },
             legacy: true,
         });
-        return `${this.awaitDownloadAction.toMablscript()}.assert_download(${mablArgs ?? '{}'})`;
+        return `${this.awaitDownloadAction.toMablscript()}.assert_download(${mablArgs ? mablArgs : ''})`;
     }
     getInputVariables() {
-        return MablAction_1.MablAction.findUniqueVariableReferencesInValue(this.descriptor);
-    }
-    stepDescription() {
-        return 'Assert file download';
+        return MablAction_1.MablAction.findUniqueVariableReferencesInValue(this.fileAttributes);
     }
 }
 exports.DownloadStep = DownloadStep;
-DownloadStep.stepName = 'DownloadStep';
-DownloadStep.pdfStepName = 'DownloadPdfStep';
-DownloadStep.actionCode = 'assert_download';
-DownloadStep.mablScriptStepNames = [DownloadStep.actionCode];
-DownloadStep.yamlMablScriptNames = [
-    DownloadStep.stepName,
-    DownloadStep.pdfStepName,
-];
+DownloadStep.mablScriptStepNames = ['assert_download'];
+DownloadStep.yamlMablScriptNames = ['DownloadStep', 'DownloadPdfStep'];

package/mablscript/steps/EchoStep.js

@@ -1,39 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EchoStep = void 0;
+const MablStep_1 = require("../MablStep");
 const domUtil_1 = require("../../domUtil");
 const MablAction_1 = require("../MablAction");
-const MablStepV2_1 = require("../MablStepV2");
-class EchoStep extends MablStepV2_1.MablStepV2 {
-    constructor(descriptor) {
-        super(EchoStep.stepName, descriptor, EchoStep.actionCode);
-        this.echoValue = descriptor.value;
-    }
-    static getStepName() {
-        return EchoStep.stepName;
+class EchoStep extends MablStep_1.MablStep {
+    constructor(name, args, actions) {
+        super(name, args, actions, 'echo');
+        this.echoValue = (0, MablAction_1.parseArgument)(this.getActionArgs()[0]);
     }
     getStepName() {
         return EchoStep.stepName;
     }
     toStepDescriptor() {
-        return { value: this.echoValue, actionCode: this.actionCode };
+        return { value: this.echoValue.toString(), actionCode: this.actionCode };
     }
     static fromYaml(_stepName, stepArgs) {
-        const stepDescriptor = {
-            actionCode: EchoStep.actionCode,
-            value: (0, MablAction_1.parseArgument)(stepArgs.value),
-        };
-        const step = new EchoStep(stepDescriptor);
+        const step = new EchoStep(EchoStep.stepName, [stepArgs.value], []);
         step.setStepId(stepArgs.id);
         return step;
     }
-    static fromLegacyMablscript(args, _actions) {
-        const stepDescriptor = {
-            actionCode: EchoStep.actionCode,
-            value: (0, MablAction_1.parseArgument)(args[0]),
-        };
-        return new EchoStep(stepDescriptor);
-    }
     toMablscript() {
         const stringEchoValue = `${this.echoValue}`;
         return `echo("${(0, domUtil_1.escapeMablscriptString)(stringEchoValue)}")`;
@@ -41,12 +27,8 @@ class EchoStep extends MablStepV2_1.MablStepV2 {
     getInputVariables() {
         return MablAction_1.MablAction.findUniqueVariableReferencesInValue(this.echoValue);
     }
-    stepDescription() {
-        return `Echo: "${this.echoValue}"`;
-    }
 }
 exports.EchoStep = EchoStep;
 EchoStep.stepName = 'Echo';
-EchoStep.actionCode = 'echo';
-EchoStep.mablScriptStepNames = [EchoStep.actionCode];
+EchoStep.mablScriptStepNames = ['echo'];
 EchoStep.yamlMablScriptNames = [EchoStep.stepName];

package/mablscript/steps/ElseIfConditionStep.js

@@ -2,41 +2,30 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ElseIfConditionStep = void 0;
 exports.isElseIfConditionStep = isElseIfConditionStep;
+const MablAction_1 = require("../MablAction");
 const IfConditionStep_1 = require("./IfConditionStep");
 class ElseIfConditionStep extends IfConditionStep_1.IfConditionStep {
-    constructor(descriptor, stepActions) {
-        super(ElseIfConditionStep.stepName, ElseIfConditionStep.actionCode, descriptor, stepActions);
-    }
     getStepName() {
-        return ElseIfConditionStep.stepName;
+        return 'ElseIf';
     }
     static fromYaml(_stepName, stepArgs) {
-        const actions = IfConditionStep_1.IfConditionStep.getActionsFromYamlForCondition(stepArgs);
-        const validatedActions = IfConditionStep_1.IfConditionStep.validateAndParseActions(actions);
-        const stepDescriptor = IfConditionStep_1.IfConditionStep.buildDescriptor(validatedActions);
-        const step = new ElseIfConditionStep(stepDescriptor, validatedActions);
+        const actions = [
+            new MablAction_1.MablAction('conditional_else', 'conditional_else_if', []),
+        ];
+        actions.push(...IfConditionStep_1.IfConditionStep.getActionsFromYamlForCondition(stepArgs));
+        const step = new ElseIfConditionStep('conditional_else_if', [], actions);
         step.setStepId(stepArgs.id);
         return step;
     }
-    static fromLegacyMablscript(_args, actions) {
-        const validatedActions = IfConditionStep_1.IfConditionStep.validateAndParseActions(actions);
-        const stepDescriptor = IfConditionStep_1.IfConditionStep.buildDescriptor(validatedActions);
-        return new ElseIfConditionStep(stepDescriptor, validatedActions);
-    }
     toMablscript() {
-        const actions = [
-            this.primaryAction,
-            this.extractAction,
-            this.conditionAction,
-        ].filter(Boolean);
-        return `conditional_else().${actions.reduce((mablscript, action) => `${mablscript}${action?.toMablscript()}.`, '')}conditional_else_if()`;
+        const actions = this.actions.reduce((mablscript, action) => `${mablscript}${action.toMablscript()}.`, '');
+        return `conditional_else()${actions}conditional_else_if()`;
     }
 }
 exports.ElseIfConditionStep = ElseIfConditionStep;
-ElseIfConditionStep.stepName = 'ElseIf';
-ElseIfConditionStep.actionCode = 'conditional_else_if';
-ElseIfConditionStep.mablScriptStepNames = [ElseIfConditionStep.actionCode];
-ElseIfConditionStep.yamlMablScriptNames = [ElseIfConditionStep.stepName];
+ElseIfConditionStep.stepName = 'conditional_else_if';
+ElseIfConditionStep.mablScriptStepNames = [ElseIfConditionStep.stepName];
+ElseIfConditionStep.yamlMablScriptNames = ['ElseIf'];
 function isElseIfConditionStep(value) {
     return (value?.getStepName &&
         value?.getStepName() === ElseIfConditionStep.yamlMablScriptNames[0]);

package/mablscript/steps/ElseStep.js

@@ -1,40 +1,27 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ElseStep = void 0;
-const MablStepV2_1 = require("../MablStepV2");
-class ElseStep extends MablStepV2_1.MablStepV2 {
-    constructor(descriptor) {
-        super(ElseStep.stepName, descriptor, ElseStep.actionCode);
+const MablStep_1 = require("../MablStep");
+class ElseStep extends MablStep_1.MablStep {
+    constructor(name, args, actions) {
+        super(name, args, actions, 'conditional_else');
     }
     getStepName() {
-        return ElseStep.stepName;
+        return 'Else';
     }
     toStepDescriptor() {
         return { actionCode: this.actionCode };
     }
     static fromYaml(_stepName, stepArgs) {
-        const stepDescriptor = {
-            actionCode: ElseStep.actionCode,
-        };
-        const step = new ElseStep(stepDescriptor);
+        const step = new ElseStep('conditional_else', [], []);
         step.setStepId(stepArgs.id);
         return step;
     }
-    static fromLegacyMablscript(_args, _actions) {
-        const stepDescriptor = {
-            actionCode: ElseStep.actionCode,
-        };
-        return new ElseStep(stepDescriptor);
-    }
     toMablscript() {
         return `conditional_else()`;
     }
-    stepDescription() {
-        return 'ELSE';
-    }
 }
 exports.ElseStep = ElseStep;
-ElseStep.stepName = 'Else';
-ElseStep.actionCode = 'conditional_else';
-ElseStep.mablScriptStepNames = [ElseStep.actionCode];
-ElseStep.yamlMablScriptNames = [ElseStep.stepName];
+ElseStep.stepName = 'conditional_else';
+ElseStep.mablScriptStepNames = [ElseStep.stepName];
+ElseStep.yamlMablScriptNames = ['Else'];

package/mablscript/steps/EndStep.js

@@ -1,40 +1,27 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EndStep = void 0;
-const MablStepV2_1 = require("../MablStepV2");
-class EndStep extends MablStepV2_1.MablStepV2 {
-    constructor(descriptor) {
-        super(EndStep.stepName, descriptor, EndStep.actionCode);
+const MablStep_1 = require("../MablStep");
+class EndStep extends MablStep_1.MablStep {
+    constructor(name, args, actions) {
+        super(name, args, actions, 'conditional_end');
     }
     getStepName() {
-        return EndStep.stepName;
+        return 'End';
     }
     toStepDescriptor() {
         return { actionCode: this.actionCode };
     }
     static fromYaml(_stepName, stepArgs) {
-        const stepDescriptor = {
-            actionCode: EndStep.actionCode,
-        };
-        const step = new EndStep(stepDescriptor);
+        const step = new EndStep('conditional_end', [], []);
         step.setStepId(stepArgs.id);
         return step;
     }
-    static fromLegacyMablscript(_args, _actions) {
-        const stepDescriptor = {
-            actionCode: EndStep.actionCode,
-        };
-        return new EndStep(stepDescriptor);
-    }
     toMablscript() {
         return `conditional_end()`;
     }
-    stepDescription() {
-        return 'END';
-    }
 }
 exports.EndStep = EndStep;
-EndStep.stepName = 'End';
-EndStep.actionCode = 'conditional_end';
-EndStep.mablScriptStepNames = [EndStep.actionCode];
-EndStep.yamlMablScriptNames = [EndStep.stepName];
+EndStep.stepName = 'conditional_end';
+EndStep.mablScriptStepNames = [EndStep.stepName];
+EndStep.yamlMablScriptNames = ['End'];

package/mablscript/steps/EnterAuthCodeStep.js

@@ -6,56 +6,54 @@ const domUtil_1 = require("../../domUtil");
 const ActionsUtils_1 = require("./ActionsUtils");
 const MablStepWithFindAction_1 = require("../MablStepWithFindAction");
 class EnterAuthCodeStep extends MablStepWithFindAction_1.MablStepWithFindAction {
-    constructor(descriptor, findAction) {
-        super(EnterAuthCodeStep.stepName, descriptor, EnterAuthCodeStep.actionCode, findAction);
+    constructor(name, args, actions) {
+        super(name, args, actions, EnterAuthCodeStep.stepName);
+        this.findAction = ActionsUtils_1.ActionsUtils.validateSingleFindAction(this.actions);
     }
     getStepName() {
-        return EnterAuthCodeStep.stepName;
+        return 'EnterAuthCode';
     }
     toStepDescriptor() {
-        return buildStepDescriptor(this.findAction);
+        const find = this.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 {
+                    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) {
+        const step = {
+            EnterAuthCode: {
+                ...super.annotationsAsYml(),
+                ...this.findAction.toYaml(),
+            },
+        };
+        if (this.stepId()) {
+            step.EnterAuthCode.id = this.stepId();
+        }
+        return step;
     }
     static fromYaml(_stepName, stepArgs) {
-        const findAction = FindAction_1.FindAction.findActionFromStepArgs(stepArgs);
-        const stepDescriptor = buildStepDescriptor(findAction);
-        const step = new EnterAuthCodeStep(stepDescriptor, findAction);
+        const step = new EnterAuthCodeStep(EnterAuthCodeStep.stepName, [], [FindAction_1.FindAction.findActionFromStepArgs(stepArgs)]);
         step.setStepId(stepArgs.id);
         return step;
     }
-    static fromLegacyMablscript(_args, actions) {
-        const findAction = ActionsUtils_1.ActionsUtils.validateSingleFindAction(actions);
-        const stepDescriptor = buildStepDescriptor(findAction);
-        return new EnterAuthCodeStep(stepDescriptor, findAction);
-    }
     toMablscript() {
         return `${this.findAction.toMablscript()}.enter_auth_code()`;
     }
     getInputVariables() {
         return this.findAction.getInputVariables();
     }
-    stepDescription() {
-        const elementDescription = this.humanizeFind();
-        return `Enter authentication code into ${elementDescription}`;
-    }
 }
 exports.EnterAuthCodeStep = EnterAuthCodeStep;
-EnterAuthCodeStep.stepName = 'EnterAuthCode';
-EnterAuthCodeStep.actionCode = 'enter_auth_code';
-EnterAuthCodeStep.mablScriptStepNames = [EnterAuthCodeStep.actionCode];
-EnterAuthCodeStep.yamlMablScriptNames = [EnterAuthCodeStep.stepName];
-function buildStepDescriptor(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 {
-                find,
-                descriptorToActionMap: new Map().set(find, findAction),
-                actionCode: EnterAuthCodeStep.actionCode,
-            };
-        default:
-            throw new Error(`Error generating step descriptor for EnterAuthCode: Unexpected find type ${find.findType}`);
-    }
-}
+EnterAuthCodeStep.stepName = 'enter_auth_code';
+EnterAuthCodeStep.mablScriptStepNames = [EnterAuthCodeStep.stepName];
+EnterAuthCodeStep.yamlMablScriptNames = ['EnterAuthCode'];

package/mablscript/steps/EnterTextStep.js

@@ -3,41 +3,80 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.EnterTextStep = void 0;
 const FindAction_1 = require("../actions/FindAction");
 const MablAction_1 = require("../MablAction");
-const MablSymbol_1 = require("../MablSymbol");
 const domUtil_1 = require("../../domUtil");
 const MablStepWithFindAction_1 = require("../MablStepWithFindAction");
-const ActionsUtils_1 = require("./ActionsUtils");
 class EnterTextStep extends MablStepWithFindAction_1.MablStepWithFindAction {
-    constructor(descriptor, findAction) {
-        super(EnterTextStep.stepName, descriptor, EnterTextStep.actionCode, findAction);
-        this.text = descriptor.text;
+    constructor(name, args, actions) {
+        super(name, args, actions, 'enter_text');
+        const arg = this.getActionArgs()[0];
+        this.text = (0, MablAction_1.parseArgument)(arg);
+        this.validate();
+        if ((0, domUtil_1.isFindElementType)(this.actions[0].getActionName())) {
+            this.findAction = this.actions[0];
+        }
+        else {
+            throw new Error(`Unexpected find action for ${name} step: ${JSON.stringify(this.actions[0])}`);
+        }
+    }
+    validate() {
+        if (this.actions.length !== 1 && !(this.actions[0] instanceof FindAction_1.FindAction)) {
+            throw new Error('Enter text steps should have exactly on sub action and it should be a find');
+        }
     }
     getStepName() {
-        return EnterTextStep.stepName;
+        return 'EnterText';
     }
     toStepDescriptor() {
-        return buildStepDescriptor(this.findAction, this.text);
+        const find = this.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 {
+                    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}`);
+        }
+    }
+    getFormattedStep() {
+        const step = this.toStepDescriptor();
+        const stepName = this.getStepName();
+        const formatted = {
+            [stepName]: {},
+        };
+        if (this.annotationsOnStep()) {
+            formatted[stepName].annotation = this.annotation;
+        }
+        if (this.description) {
+            formatted[stepName].description = this.description;
+        }
+        if (step.find.findType === domUtil_1.FindType.FIND_ONE) {
+            formatted[stepName].selector = step.find.findTarget.selector;
+            if (step.find.findTarget.auxiliaryDescriptors?.length) {
+                formatted[stepName].selectorAncestors =
+                    step.find.findTarget.auxiliaryDescriptors.map((descriptor) => descriptor.selector);
+            }
+        }
+        else {
+            formatted[stepName].selector = step.find.findTarget;
+        }
+        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) {
-        const findAction = FindAction_1.FindAction.findActionFromStepArgs(stepArgs);
-        const textArg = stepArgs.text;
-        const text = textArg?.name
-            ? new MablSymbol_1.MablSymbol(textArg.name)
-            : (0, MablAction_1.parseArgument)(textArg);
-        const stepDescriptor = buildStepDescriptor(findAction, text);
-        const step = new EnterTextStep(stepDescriptor, findAction);
+        const step = new EnterTextStep('enter_text', [stepArgs.text], [FindAction_1.FindAction.findActionFromStepArgs(stepArgs)]);
         step.setStepId(stepArgs.id);
         return step;
     }
-    static fromLegacyMablscript(args, actions) {
-        const findAction = ActionsUtils_1.ActionsUtils.validateSingleFindAction(actions);
-        const textArg = args[0];
-        const text = textArg?.name
-            ? new MablSymbol_1.MablSymbol(textArg.name)
-            : (0, MablAction_1.parseArgument)(textArg);
-        const stepDescriptor = buildStepDescriptor(findAction, text);
-        return new EnterTextStep(stepDescriptor, findAction);
-    }
     toMablscript() {
         const enterText = typeof this.text === 'string'
             ? `"${(0, domUtil_1.escapeMablscriptString)(this.text)}"`
@@ -50,33 +89,7 @@ class EnterTextStep extends MablStepWithFindAction_1.MablStepWithFindAction {
             ...MablAction_1.MablAction.findUniqueVariableReferencesInValue(this.text),
         ]);
     }
-    stepDescription() {
-        const displayText = typeof this.text === 'string'
-            ? `"${this.text}"`
-            : `{{${this.text.name}}}`;
-        const elementDescription = this.humanizeFind();
-        return `Enter ${displayText} into ${elementDescription}`;
-    }
 }
 exports.EnterTextStep = EnterTextStep;
-EnterTextStep.stepName = 'EnterText';
-EnterTextStep.actionCode = 'enter_text';
-EnterTextStep.mablScriptStepNames = [EnterTextStep.actionCode];
-EnterTextStep.yamlMablScriptNames = [EnterTextStep.stepName];
-function buildStepDescriptor(findAction, text) {
-    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 {
-                find,
-                descriptorToActionMap: new Map().set(find, findAction),
-                text,
-                actionCode: EnterTextStep.actionCode,
-            };
-        default:
-            throw new Error(`Error generating step descriptor for ${EnterTextStep.stepName}: Unexpected find type ${find.findType}`);
-    }
-}
+EnterTextStep.mablScriptStepNames = ['enter_text'];
+EnterTextStep.yamlMablScriptNames = ['EnterText'];