@mablhq/mabl-cli 2.46.4 → 2.49.0

package/mablscript/actions/ConditionAction.js

@@ -103,7 +103,15 @@ class ConditionAction extends MablAction_1.MablAction {
     }
     getInputVariables() {
         var _a;
-        return MablAction_1.MablAction.findUniqueVariableReferencesInValue((_a = (0, ConditionDescriptor_1.getOptionalComparatorValue)(this.conditionDescriptor)) !== null && _a !== void 0 ? _a : '');
+        const fields = [];
+        fields.push((_a = (0, ConditionDescriptor_1.getOptionalComparatorValue)(this.conditionDescriptor)) !== null && _a !== void 0 ? _a : '');
+        if ((0, ConditionDescriptor_1.isAIPromptCondition)(this.conditionDescriptor)) {
+            if (this.conditionDescriptor.criteria) {
+                fields.push(...this.conditionDescriptor.criteria);
+            }
+            fields.push(this.conditionDescriptor.userPrompt);
+        }
+        return MablAction_1.MablAction.findUniqueVariableReferencesInValue(fields);
     }
 }
 exports.ConditionAction = ConditionAction;

package/mablscript/actions/GetViewportAction.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GetViewportAction = void 0;
+const MablAction_1 = require("../MablAction");
+const GetViewportDescriptor_1 = require("../types/GetViewportDescriptor");
+class GetViewportAction extends MablAction_1.MablAction {
+    constructor() {
+        super('get_viewport', 'get_viewport', []);
+    }
+    toDescriptor() {
+        return (0, GetViewportDescriptor_1.newGetViewportDescriptor)();
+    }
+    generateFindMablscript() {
+        return '';
+    }
+}
+exports.GetViewportAction = GetViewportAction;

package/mablscript/steps/AssertStep.js

@@ -14,6 +14,8 @@ const GetVariableValue_1 = require("../actions/GetVariableValue");
 const GetVariableDescriptor_1 = require("../types/GetVariableDescriptor");
 const CountAction_1 = require("../actions/CountAction");
 const MobileFindAction_1 = require("../mobile/steps/actions/MobileFindAction");
+const GetViewportDescriptor_1 = require("../types/GetViewportDescriptor");
+const GetViewportAction_1 = require("../actions/GetViewportAction");
 var OnFailure;
 (function (OnFailure) {
     OnFailure["ContinueWithWarning"] = "continue";
@@ -34,9 +36,14 @@ class AssertStep extends MablStep_1.MablStep {
         if (firstAction instanceof FindAction_1.FindAction ||
             firstAction instanceof MobileFindAction_1.MobileFindAction ||
             firstAction instanceof GetUrlAction_1.GetUrlAction ||
-            firstAction instanceof GetVariableValue_1.GetVariableValue) {
+            firstAction instanceof GetVariableValue_1.GetVariableValue ||
+            firstAction instanceof GetViewportAction_1.GetViewportAction) {
             this.primaryAction = firstAction;
         }
+        else if (firstAction instanceof ConditionAction_1.ConditionAction &&
+            (0, ConditionDescriptor_1.isAIPromptCondition)(firstAction.conditionDescriptor)) {
+            this.primaryAction = new GetViewportAction_1.GetViewportAction();
+        }
         else {
             throw new Error(`Unexpected action type. Expected FindAction|MobileFindAction|GetUrlAction|GetVariableValue but got: ${firstAction.constructor.name}`);
         }
@@ -49,6 +56,9 @@ class AssertStep extends MablStep_1.MablStep {
             }
             this.conditionAction = actions[2];
         }
+        else if (firstAction instanceof ConditionAction_1.ConditionAction) {
+            this.conditionAction = firstAction;
+        }
         else {
             this.conditionAction = actions[1];
         }
@@ -178,6 +188,9 @@ class AssertStep extends MablStep_1.MablStep {
         else if (((_b = stepArgs.target) === null || _b === void 0 ? void 0 : _b.kind) === GetVariableDescriptor_1.GET_VARIABLE_VALUE) {
             primaryAction = new GetVariableValue_1.GetVariableValue(GetVariableValue_1.GetVariableValue.mablScriptStepNames[0], [(_c = stepArgs.target) === null || _c === void 0 ? void 0 : _c.variable]);
         }
+        else if ((0, GetViewportDescriptor_1.isGetViewportDescriptor)(stepArgs.target)) {
+            primaryAction = new GetViewportAction_1.GetViewportAction();
+        }
         else if ((0, domUtil_1.isNormalizedFindEmailDescriptor)((_d = stepArgs.target) === null || _d === void 0 ? void 0 : _d.findTarget) ||
             (0, domUtil_1.isCookieSelector)((_e = stepArgs.target) === null || _e === void 0 ? void 0 : _e.findTarget) ||
             (0, domUtil_1.isTabSelector)((_f = stepArgs.target) === null || _f === void 0 ? void 0 : _f.findTarget)) {
@@ -240,6 +253,14 @@ class AssertStep extends MablStep_1.MablStep {
         if (this.primaryAction instanceof MobileFindAction_1.MobileFindAction) {
             throw new Error('Mobile steps do not generate mablscript');
         }
+        let primaryActionMablscriptPrefix = this.primaryAction.toMablscript();
+        if (primaryActionMablscriptPrefix.length > 0) {
+            primaryActionMablscriptPrefix += '.';
+        }
+        let primaryActionFindMablscriptPrefix = this.primaryAction.generateFindMablscript();
+        if (primaryActionFindMablscriptPrefix.length > 0) {
+            primaryActionFindMablscriptPrefix += '.';
+        }
         const assertAction = `.assert(${!!(((_a = this.assertArguments) === null || _a === void 0 ? void 0 : _a.onFailure) ||
             ((_b = this.assertArguments) === null || _b === void 0 ? void 0 : _b.observationScope))
             ? (0, MablAction_1.convertObjectToMablscriptArgs)({
@@ -250,14 +271,14 @@ class AssertStep extends MablStep_1.MablStep {
             })
             : ''})`;
         if (this.countAction) {
-            return `${this.primaryAction.toMablscript()}.${this.countAction.toMablscript()}.${this.conditionAction.toMablscript()}${assertAction}`;
+            return `${primaryActionMablscriptPrefix}${this.countAction.toMablscript()}.${this.conditionAction.toMablscript()}${assertAction}`;
         }
         if (this.extractAction) {
-            return `${this.primaryAction.toMablscript()}.${this.extractAction.toMablscript()}.${this.conditionAction.toMablscript()}${assertAction}`;
+            return `${primaryActionMablscriptPrefix}${this.extractAction.toMablscript()}.${this.conditionAction.toMablscript()}${assertAction}`;
         }
         if (this.assertionType === 'present' ||
             this.assertionType === 'not_present') {
-            return `${this.primaryAction.generateFindMablscript()}.evaluate_presence("${this.assertionType}")${assertAction}`;
+            return `${primaryActionFindMablscriptPrefix}evaluate_presence("${this.assertionType}")${assertAction}`;
         }
         if (this.assertionType === 'ai_prompt') {
             const aiOptions = {};
@@ -267,9 +288,9 @@ class AssertStep extends MablStep_1.MablStep {
             if (((_f = this.aiPrompt) === null || _f === void 0 ? void 0 : _f.criteria) && this.aiPrompt.criteria.length > 0) {
                 aiOptions.criteria = (_g = this.aiPrompt) === null || _g === void 0 ? void 0 : _g.criteria;
             }
-            return `${this.primaryAction.generateFindMablscript()}.evaluate_ai_prompt("${(_h = this.aiPrompt) === null || _h === void 0 ? void 0 : _h.userPrompt}", ${JSON.stringify(aiOptions)})${assertAction}`;
+            return `${primaryActionFindMablscriptPrefix}evaluate_ai_prompt("${(_h = this.aiPrompt) === null || _h === void 0 ? void 0 : _h.userPrompt}", ${JSON.stringify(aiOptions)})${assertAction}`;
         }
-        return `${this.primaryAction.toMablscript()}.${this.conditionAction.toMablscript()}${assertAction}`;
+        return `${primaryActionMablscriptPrefix}${this.conditionAction.toMablscript()}${assertAction}`;
     }
     toLineDiffFormat() {
         if (this.primaryAction instanceof MobileFindAction_1.MobileFindAction) {

package/mablscript/steps/AssertStepOld.js

@@ -8,6 +8,7 @@ const domUtil_1 = require("../../domUtil");
 const importer_1 = require("../importer");
 const GetCurrentLocationDescriptor_1 = require("../types/GetCurrentLocationDescriptor");
 const GetVariableDescriptor_1 = require("../types/GetVariableDescriptor");
+const GetViewportDescriptor_1 = require("../types/GetViewportDescriptor");
 const oldToNewAssertionTypes = {
     assert_contains: 'AssertContains',
     assert_does_not_contain: 'AssertDoesNotContain',
@@ -73,7 +74,9 @@ class AssertStepOld extends MablStep_1.MablStep {
         }
         const find = this.primaryAction.toDescriptor();
         formatted.findOptions = find.selectorFindOption;
-        if ((0, GetCurrentLocationDescriptor_1.isGetCurrentLocationDescriptor)(find) || (0, GetVariableDescriptor_1.isGetVariableDescriptor)(find)) {
+        if ((0, GetCurrentLocationDescriptor_1.isGetCurrentLocationDescriptor)(find) ||
+            (0, GetVariableDescriptor_1.isGetVariableDescriptor)(find) ||
+            (0, GetViewportDescriptor_1.isGetViewportDescriptor)(find)) {
             formatted.kind = find.kind;
         }
         else {

package/mablscript/types/ConditionDescriptor.js

@@ -21,6 +21,7 @@ exports.AssertionConditionField = {
     EndsWithout: 'ends_without',
     GreaterThan: 'greater_than',
     LessThan: 'less_than',
+    MatchesRegex: 'matches_regex',
     GreaterThanOrEquals: 'greater_than_or_equals',
     LessThanOrEquals: 'less_than_or_equals',
     AIPrompt: 'ai_prompt',
@@ -123,6 +124,7 @@ exports.AssertionStepNameToField = {
     AssertLessThan: 'less_than',
     AssertGreaterThanOrEquals: 'greater_than_or_equals',
     AssertLessThanOrEquals: 'less_than_or_equals',
+    AssertMatchesRegex: 'matches_regex',
     AssertAIPrompt: 'ai_prompt',
 };
 exports.AssertionConditionFieldToStepName = Object.fromEntries(Object.entries(exports.AssertionStepNameToField).map(([stepType, field]) => [

package/mablscript/types/GetViewportDescriptor.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.newGetViewportDescriptor = exports.isGetViewportDescriptor = exports.GET_VIEWPORT_KIND = void 0;
+exports.GET_VIEWPORT_KIND = 'Viewport';
+function isGetViewportDescriptor(value) {
+    return value.kind === exports.GET_VIEWPORT_KIND;
+}
+exports.isGetViewportDescriptor = isGetViewportDescriptor;
+function newGetViewportDescriptor() {
+    return { kind: exports.GET_VIEWPORT_KIND };
+}
+exports.newGetViewportDescriptor = newGetViewportDescriptor;