@mablhq/mabl-cli 2.72.0 → 2.72.3

package/mablscript/MablStepV2.js

@@ -10,73 +10,43 @@ class MablStepV2 extends MablStep_1.MablStep {
         super(name, [], [], actionCode);
         this.stepVersion = 2;
         this.descriptor = descriptor;
-        this.descriptor.actionCode = actionCode;
-        this.description = descriptor.description;
-        this.disabled = descriptor.disabled;
     }
     stepId() {
-        return this.descriptor.id ?? super.stepId();
+        return this.descriptor.id;
     }
     setStepId(id) {
-        super.setStepId(id);
         this.descriptor.id = id;
     }
     static fromYaml(stepName, stepDescriptor, actionCode) {
         return new MablStepV2(stepName, stepDescriptor, actionCode);
     }
-    static fromLegacyMablscript(_args, _actions) {
-        throw new Error('Legacy mablscript conversion not supported for MablStepV2 base class');
-    }
     getStepName() {
         return this.name;
     }
-    getActionName() {
-        return this.actionCode ?? super.getActionName();
-    }
     toStepDescriptor() {
         return this.descriptor;
     }
     getFormattedStep(_fullLocatorsOn) {
-        const { descriptorToActionMap, ...stepDescriptor } = this.toStepDescriptor();
-        const result = {
-            description: this.getDescription(),
-            ...stepDescriptor,
-        };
-        if (this.annotation?.description || this.annotation?.note) {
-            result.annotation = this.annotation;
-        }
-        if (this.isDisabled()) {
-            result.disabled = true;
-        }
         return {
-            [this.getStepName()]: result,
+            [this.getStepName()]: {
+                description: this.stepDescription(),
+                ...this.descriptor,
+            },
         };
     }
-    getDescription() {
-        return (this.description ?? this.descriptor.description ?? this.stepDescription());
-    }
-    setDescription(description) {
-        this.description = description;
-        this.descriptor.description = description;
-    }
     stepDescription() {
         throw new Error('Step description not implemented');
     }
     isDisabled() {
-        return !!this.disabled;
+        return !!this.descriptor.disabled;
     }
     setDisabled(disabled) {
-        this.disabled = disabled;
         this.descriptor.disabled = disabled;
     }
-    canContinueOnFailure() {
-        return false;
-    }
-    canFailAtEnd() {
-        return false;
-    }
     getDescriptionForLogging() {
-        return this.annotation?.description ?? this.getDescription();
+        return (this.annotation?.description ||
+            this.stepDescription() ||
+            this.getStepName());
     }
     toLineDiffFormat() {
         const lineDiffProperties = {
@@ -91,7 +61,7 @@ exports.MablStepV2 = MablStepV2;
 MablStepV2.mablScriptStepNames = [];
 MablStepV2.yamlMablScriptNames = ['MablStepV2'];
 function isMablStepV2(value) {
-    if (!value) {
+    if (value === undefined || value === null) {
         return false;
     }
     const mablStep = value;

package/mablscript/MablStepWithFindAction.js

@@ -2,134 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MablStepWithFindAction = void 0;
 exports.isStepWithFindAction = isStepWithFindAction;
-exports.humanizeFindDescriptor = humanizeFindDescriptor;
-exports.humanizeCustomFind = humanizeCustomFind;
-exports.humanizeQuery = humanizeQuery;
-exports.humanizeFindEmail = humanizeFindEmail;
-exports.humanizeFindCookie = humanizeFindCookie;
-exports.humanizeFindTab = humanizeFindTab;
-exports.getTagNameFromFoundSelectors = getTagNameFromFoundSelectors;
-exports.isCustomFindDescriptor = isCustomFindDescriptor;
-exports.isEmailFindDescriptor = isEmailFindDescriptor;
-exports.isCookieFindDescriptor = isCookieFindDescriptor;
-exports.isTabFindDescriptor = isTabFindDescriptor;
-const MablStepV2_1 = require("./MablStepV2");
-const domUtil_1 = require("../domUtil");
-const mablscriptFind_1 = require("../mablscriptFind");
-const stepUtil_1 = require("./mobile/steps/stepUtil");
-class MablStepWithFindAction extends MablStepV2_1.MablStepV2 {
-    constructor(name, descriptor, actionCode, findAction) {
-        super(name, descriptor, actionCode);
-        this.findAction = findAction;
-    }
-    humanizeFind() {
-        const findDescriptor = this.findAction.toDescriptor();
-        return humanizeFindDescriptor(findDescriptor);
-    }
+const MablStep_1 = require("./MablStep");
+class MablStepWithFindAction extends MablStep_1.MablStep {
 }
 exports.MablStepWithFindAction = MablStepWithFindAction;
 function isStepWithFindAction(step) {
     return step instanceof MablStepWithFindAction || 'findAction' in step;
 }
-function humanizeFindDescriptor(findDescriptor) {
-    switch (findDescriptor.findType) {
-        case domUtil_1.FindType.FIND_FIRST:
-        case domUtil_1.FindType.FIND_LAST:
-        case domUtil_1.FindType.FIND_ALL:
-            return humanizeCustomFind(findDescriptor);
-        case domUtil_1.FindType.FIND_ONE:
-            const maybeMobileFindDescriptor = (0, domUtil_1.isMobileFindSpecification)(findDescriptor.findTarget)
-                ? {
-                    findTarget: { ...findDescriptor.findTarget },
-                    findType: findDescriptor.findType,
-                }
-                : findDescriptor;
-            if ((0, domUtil_1.isMobileFindDescriptor)(maybeMobileFindDescriptor)) {
-                return (0, stepUtil_1.getElementDescriptionFromMobileFindDescriptor)(maybeMobileFindDescriptor);
-            }
-            return (0, mablscriptFind_1.humanizeFindOneDescriptor)(findDescriptor.findTarget);
-        case domUtil_1.FindType.FIND_EMAIL:
-            return humanizeFindEmail(findDescriptor);
-        case domUtil_1.FindType.FIND_COOKIE:
-            return humanizeFindCookie(findDescriptor);
-        case domUtil_1.FindType.FIND_TAB:
-            return humanizeFindTab(findDescriptor);
-        default:
-            return 'element';
-    }
-}
-function humanizeCustomFind(findDescriptor) {
-    if (!isCustomFindDescriptor(findDescriptor)) {
-        return 'element';
-    }
-    const type = findDescriptor.findType.replace('find_', '');
-    let tagText;
-    const foundElementSelectors = findDescriptor.foundElementSelectors;
-    const tagName = getTagNameFromFoundSelectors(foundElementSelectors);
-    if (tagName) {
-        tagText = `${type} ${tagName.toLowerCase()} element`;
-    }
-    else {
-        const s = findDescriptor.findType === domUtil_1.FindType.FIND_ALL ? 's' : '';
-        tagText = `${type} element${s}`;
-    }
-    return `${tagText} ${humanizeQuery(findDescriptor)}`;
-}
-function humanizeQuery(findDescriptor) {
-    const primarySelectors = findDescriptor.primarySelectors;
-    if ((0, domUtil_1.isCssSelector)(primarySelectors)) {
-        const compactQuery = primarySelectors.css_query.replace(/\s+/g, ' ').trim();
-        return `matching css query "${compactQuery}"`;
-    }
-    else if ((0, domUtil_1.isXPathSelector)(primarySelectors)) {
-        const compactQuery = primarySelectors.xpath.replace(/\s+/g, ' ').trim();
-        return `matching xpath "${compactQuery}"`;
-    }
-    return 'matching "<unrecognized query>"';
-}
-function humanizeFindEmail(findDescriptor) {
-    if (!isEmailFindDescriptor(findDescriptor)) {
-        return 'email';
-    }
-    return (0, mablscriptFind_1.humanizeEmailSelector)(findDescriptor.findTarget.selector);
-}
-function humanizeFindCookie(findDescriptor) {
-    if (!isCookieFindDescriptor(findDescriptor)) {
-        return 'cookie';
-    }
-    return (0, mablscriptFind_1.humanizeCookieSelector)(findDescriptor.findTarget);
-}
-function humanizeFindTab(findDescriptor) {
-    if (!isTabFindDescriptor(findDescriptor)) {
-        return 'tab';
-    }
-    if (findDescriptor.findTarget === 'initial') {
-        return 'the initial tab';
-    }
-    return (0, mablscriptFind_1.humanizeTabSelector)(findDescriptor.findTarget);
-}
-function getTagNameFromFoundSelectors(foundElementSelectors) {
-    if (!foundElementSelectors) {
-        return undefined;
-    }
-    if (typeof foundElementSelectors === 'object' &&
-        'tag_name' in foundElementSelectors) {
-        return foundElementSelectors.tag_name;
-    }
-    return undefined;
-}
-function isCustomFindDescriptor(descriptor) {
-    return ((descriptor.findType === domUtil_1.FindType.FIND_FIRST ||
-        descriptor.findType === domUtil_1.FindType.FIND_LAST ||
-        descriptor.findType === domUtil_1.FindType.FIND_ALL) &&
-        'primarySelectors' in descriptor);
-}
-function isEmailFindDescriptor(descriptor) {
-    return descriptor.findType === domUtil_1.FindType.FIND_EMAIL;
-}
-function isCookieFindDescriptor(descriptor) {
-    return descriptor.findType === domUtil_1.FindType.FIND_COOKIE;
-}
-function isTabFindDescriptor(descriptor) {
-    return descriptor.findType === domUtil_1.FindType.FIND_TAB;
-}

package/mablscript/actions/AwaitDownloadAction.js

@@ -3,13 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AwaitDownloadAction = void 0;
 const MablAction_1 = require("../MablAction");
 class AwaitDownloadAction extends MablAction_1.MablAction {
-    constructor(_name, args) {
-        super(AwaitDownloadAction.actionCode, AwaitDownloadAction.actionCode, args);
+    constructor(name, args) {
+        super(name, 'await_download', args);
     }
     toMablscript() {
         return 'await_download()';
     }
 }
 exports.AwaitDownloadAction = AwaitDownloadAction;
-AwaitDownloadAction.actionCode = 'await_download';
-AwaitDownloadAction.mablScriptStepNames = [AwaitDownloadAction.actionCode];
+AwaitDownloadAction.mablScriptStepNames = ['await_download'];

package/mablscript/actions/AwaitPDFDownloadAction.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AwaitPDFDownloadAction = void 0;
-const MablAction_1 = require("../MablAction");
+const AwaitDownloadAction_1 = require("./AwaitDownloadAction");
 const domUtil_1 = require("../../domUtil");
-class AwaitPDFDownloadAction extends MablAction_1.MablAction {
-    constructor(_name, args) {
-        super(AwaitPDFDownloadAction.actionCode, AwaitPDFDownloadAction.actionCode, args);
+class AwaitPDFDownloadAction extends AwaitDownloadAction_1.AwaitDownloadAction {
+    constructor(name, args) {
+        super(name, args);
         this.pdfUUID = this.getActionArgs()[0].uuid;
     }
     toMablscript() {
@@ -16,5 +16,4 @@ class AwaitPDFDownloadAction extends MablAction_1.MablAction {
     }
 }
 exports.AwaitPDFDownloadAction = AwaitPDFDownloadAction;
-AwaitPDFDownloadAction.actionCode = 'await_pdf';
-AwaitPDFDownloadAction.mablScriptStepNames = [AwaitPDFDownloadAction.actionCode];
+AwaitPDFDownloadAction.mablScriptStepNames = ['await_pdf'];

package/mablscript/actions/ConditionAction.js

@@ -40,8 +40,7 @@ class ConditionAction extends MablAction_1.MablAction {
         if (!(0, ConditionDescriptor_1.isComparisonType)(conditionAttribute)) {
             throw new Error(`Invalid equality condition. Invalid comparison type: ${conditionAttribute}`);
         }
-        if (options &&
-            Object.values(options).some((value) => value !== undefined)) {
+        if (options) {
             this.hasOptionsAtInstantiation = true;
         }
         return {

package/mablscript/actions/ExtractAction.js

@@ -21,25 +21,30 @@ class ExtractAction extends MablAction_1.MablAction {
         else {
             this.extractionAttribute = this.getActionArgs()[0];
         }
-        const actionArgs = this.getActionArgs();
-        if (this.name === ExtractDescriptor_1.ExtractType.EXTRACT_ATTRIBUTE && actionArgs.length > 1) {
-            const extractionOptions = actionArgs[1];
+        if (this.name === ExtractDescriptor_1.ExtractType.EXTRACT_ATTRIBUTE && this.args.length > 1) {
+            const extractionOptions = this.args[1];
             const metaExtractionType = extractionOptions.extraction_type;
             if (metaExtractionType?.toLowerCase() === exports.CSS_EXTRACTION_VALUE) {
-                this.name = ExtractDescriptor_1.ExtractType.EXTRACT_CSS_PROPERTIES;
+                this.extractionType = ExtractDescriptor_1.ExtractType.EXTRACT_CSS_PROPERTIES.toString();
             }
+            else {
+                this.extractionType = this.name;
+            }
+        }
+        else {
+            this.extractionType = this.name;
         }
-        this.extractionType = ExtractDescriptor_1.ExtractType.fromString(this.name);
+        this.extractDescriptor = this.getExtractDescriptor();
+    }
+    getExtractDescriptor() {
         if (!this.extractionAttribute) {
             throw new Error(`Attribute name is required for extract attribute action.`);
         }
         if (typeof this.extractionAttribute !== 'string') {
             throw new Error(`Invalid attribute provided for extract attribute extractor: ${this.extractionAttribute}`);
         }
-    }
-    toDescriptor() {
         return {
-            extractType: this.extractionType,
+            extractType: ExtractDescriptor_1.ExtractType.fromString(this.extractionType),
             attributeName: this.extractionAttribute,
         };
     }

package/mablscript/actions/FindAction.js

@@ -112,26 +112,6 @@ class FindAction extends MablAction_1.MablAction {
     }
     static findActionFromStepArgs(stepArgs, suppliedFindType) {
         let findType;
-        if (stepArgs.find) {
-            findType = stepArgs.find.findType || 'find_one';
-            const findTarget = stepArgs.find.findTarget;
-            const findOptions = stepArgs.find.findOptions;
-            if (findType === 'find_one' && findTarget.selector) {
-                if (findTarget.auxiliaryDescriptors?.length) {
-                    const ancestors = findTarget.auxiliaryDescriptors.map((descriptor) => descriptor.selector);
-                    return new FindAction(findType, [
-                        [findTarget, ...ancestors],
-                        findOptions,
-                    ]);
-                }
-                return new FindAction(findType, [findTarget, findOptions]);
-            }
-            return new FindAction(findType, [
-                findTarget,
-                stepArgs.find.foundElementSelectors,
-                findOptions,
-            ]);
-        }
         if (stepArgs.selector) {
             if (suppliedFindType) {
                 findType = suppliedFindType;

package/mablscript/actions/GetVariableValue.js

@@ -11,23 +11,13 @@ class GetVariableValue extends MablAction_1.MablAction {
         if (typeof arg !== 'string') {
             throw new Error('Expected string argument');
         }
-        const legacyPatternMatches = arg.match(MablSymbol_1.SINGLE_VARIABLE_PATTERN_REGEX);
-        if (legacyPatternMatches) {
-            this.variable = new MablSymbol_1.MablSymbol(legacyPatternMatches[1]);
-        }
-        else {
-            this.variable = new MablSymbol_1.MablSymbol(arg);
-        }
-    }
-    static buildAction(variable) {
-        const variableName = typeof variable === 'string' ? variable : variable.name;
-        return new GetVariableValue(GetVariableValue.actionCode, [variableName]);
+        this.variable = MablSymbol_1.MablSymbol.fromString(arg);
     }
     toMablscript() {
         return `get_variable_value(${this.subVariable(this.variable.toString())})`;
     }
     toDescriptor() {
-        return { kind: GetVariableDescriptor_1.GET_VARIABLE_VALUE, variable: this.variable.name };
+        return (0, GetVariableDescriptor_1.newGetVariableDescriptor)(this.variable);
     }
     generateFindMablscript() {
         return `get_variable_value(${this.variable.name})`;
@@ -37,6 +27,5 @@ class GetVariableValue extends MablAction_1.MablAction {
     }
 }
 exports.GetVariableValue = GetVariableValue;
-GetVariableValue.actionCode = 'get_variable_value';
-GetVariableValue.mablScriptStepNames = [GetVariableValue.actionCode];
-GetVariableValue.yamlMablScriptNames = [GetVariableDescriptor_1.GET_VARIABLE_VALUE];
+GetVariableValue.mablScriptStepNames = ['get_variable_value'];
+GetVariableValue.yamlMablScriptNames = ['GetVariableValueAs'];

package/mablscript/actions/JavaScriptAction.js

@@ -109,44 +109,58 @@ class JavaScriptAction extends MablAction_1.MablAction {
         }
         throw new Error(`Invalid javascript action descriptor: ${JSON.stringify(descriptor)}`);
     }
+    toYaml() {
+        return JavaScriptAction.toYamlFromJavaScriptDescriptor(this.javaScript);
+    }
+    static toYamlFromJavaScriptDescriptor(javaScript) {
+        const actionYaml = {};
+        if ((0, SnippetsDescriptor_1.isReusableSnippetDescriptor)(javaScript)) {
+            actionYaml.snippetId = javaScript.snippetId;
+            actionYaml.snippetInvariantId = javaScript.snippetInvariantId;
+            actionYaml.parameterOverrides = javaScript.parameterOverrides;
+        }
+        else if ((0, SnippetsDescriptor_1.isInlineSnippetDescriptor)(javaScript)) {
+            actionYaml.snippet = { ...actionYaml, ...javaScript.inlineSnippet };
+            actionYaml.parameterOverrides = javaScript.parameterOverrides;
+        }
+        else if ((0, SnippetsDescriptor_1.isLegacyReusableSnippetDescriptor)(javaScript)) {
+            actionYaml.snippetId = javaScript.snippetInvariantId;
+        }
+        else if ((0, SnippetsDescriptor_1.isLegacyInlineJavaScriptDescriptor)(javaScript)) {
+            actionYaml.code = javaScript.encodedJS;
+        }
+        else {
+            throw new Error(`Cannot export action to yaml: ${JSON.stringify(javaScript)}`);
+        }
+        return actionYaml;
+    }
     static fromYaml(formatted) {
-        const jsDescriptor = formatted.javaScript ?? formatted;
         let snippetOptions;
-        if (jsDescriptor.parameterOverrides) {
+        if (formatted.parameterOverrides) {
             snippetOptions = {
-                parameter_overrides: jsDescriptor.parameterOverrides,
+                parameter_overrides: formatted.parameterOverrides,
             };
         }
         const args = [];
-        if (jsDescriptor.code) {
-            args.push(jsDescriptor.code);
-        }
-        else if (jsDescriptor.encodedJS) {
-            args.push(jsDescriptor.encodedJS);
+        if (formatted.code) {
+            args.push(formatted.code);
         }
-        else if (jsDescriptor.body) {
-            args.push(jsDescriptor.body);
+        else if (formatted.body) {
+            delete formatted.parameterOverrides;
+            args.push(formatted);
         }
-        else if (jsDescriptor.inlineSnippet) {
-            args.push(jsDescriptor.inlineSnippet);
-        }
-        else if (jsDescriptor.snippet) {
-            args.push(jsDescriptor.snippet);
-        }
-        else if (jsDescriptor.snippetInvariantId && jsDescriptor.snippetId) {
-            args.push({
-                id: jsDescriptor.snippetId,
-                invariant_id: jsDescriptor.snippetInvariantId,
-            });
+        else if (formatted.snippet) {
+            args.push(formatted.snippet);
         }
-        else if (jsDescriptor.snippetInvariantId) {
+        else if (formatted.snippetInvariantId && formatted.snippetId) {
             args.push({
-                id: jsDescriptor.snippetInvariantId,
+                id: formatted.snippetId,
+                invariant_id: formatted.snippetInvariantId,
             });
         }
-        else if (jsDescriptor.snippetId) {
+        else if (formatted.snippetId) {
             args.push({
-                id: jsDescriptor.snippetId,
+                id: formatted.snippetId,
             });
         }
         else {

package/mablscript/diffing/diffingUtil.js

@@ -62,10 +62,7 @@ function convertFlowToStepList(flow, flowConfig) {
             flow.flow_type === mablApi_1.FlowTypeEnum.Mobile)) {
         return parseFlowIntoStepList(flow);
     }
-    const evaluateFlowStep = new EvaluateFlowStep_1.EvaluateFlowStep({
-        flow: { invariant_id: flow?.invariant_id ?? '' },
-        config: flowConfig,
-    });
+    const evaluateFlowStep = new EvaluateFlowStep_1.EvaluateFlowStep(EvaluateFlowStep_1.EvaluateFlowStep.mablScriptStepNames[0], [{ invariant_id: flow?.invariant_id }, flowConfig], []);
     if (flow.description) {
         evaluateFlowStep.setDescription(flow.description);
     }
@@ -94,9 +91,12 @@ function convertStepListToFlow(steps, flowType = mablApi_1.FlowTypeEnum.Mablscri
         return annotations;
     }, {});
     const flow = {
-        json_steps: flowType === mablApi_1.FlowTypeEnum.Mablscript || flowType === mablApi_1.FlowTypeEnum.Mobile
+        json_steps: flowType === mablApi_1.FlowTypeEnum.Mobile
             ? { steps: steps.map((step) => step.getFormattedStep(true)) }
             : undefined,
+        script: flowType === mablApi_1.FlowTypeEnum.Mablscript
+            ? addTrailingNewline((0, importer_1.mablscriptTheLoadedSteps)(steps))
+            : undefined,
         script_description: steps.map(getStepDescription).join('\n'),
         step_annotations: stepAnnotations,
     };