@mablhq/mabl-cli 2.30.0 → 2.31.2

package/mablscript/actions/ConditionAction.js

@@ -7,72 +7,105 @@ const ConditionDescriptor_1 = require("../types/ConditionDescriptor");
 class ConditionAction extends MablAction_1.MablAction {
     constructor(name, args) {
         super(name, name, args);
-        this.conditionAttribute = '';
-        this.conditionValueAttribute = '';
-        this.setConditionAttributes();
+        this.hasOptionsAtInstantiation = false;
         this.conditionDescriptor = this.getConditionDescriptor();
     }
-    setConditionAttributes() {
-        const conditionActionArgs = this.getActionArgs();
-        if (conditionActionArgs) {
-            [this.conditionAttribute, this.conditionValueAttribute, this.options] =
-                this.getActionArgs();
-        }
-    }
     getConditionDescriptor() {
         switch (this.name) {
             case 'evaluate_condition':
                 return this.getEvaluateCondition();
             case 'evaluate_presence':
                 return this.getEvaluatePresence();
+            case 'evaluate_ai_prompt':
+                return this.getEvaluateAIPrompt();
             default:
                 throw new Error(`Unexpected condition name: ${this.name}`);
         }
     }
     getEvaluateCondition() {
-        var _a;
-        if (this.conditionValueAttribute === undefined) {
+        const conditionActionArgs = this.getActionArgs();
+        let conditionAttribute;
+        let conditionValueAttribute;
+        let options;
+        if (conditionActionArgs) {
+            [conditionAttribute, conditionValueAttribute, options] =
+                this.getActionArgs();
+        }
+        if (conditionValueAttribute === undefined) {
             throw new Error('Invalid equality condition. Missing value to compare.');
         }
+        if (conditionAttribute === undefined) {
+            throw new Error('Invalid equality condition. Missing comparison type.');
+        }
+        if (options) {
+            this.hasOptionsAtInstantiation = true;
+        }
         return {
             conditionType: ConditionDescriptor_1.ConditionType.Comparison,
-            comparisonType: ConditionDescriptor_1.ComparisonType.fromString(this.conditionAttribute),
-            comparatorValue: (0, MablAction_1.parseArgument)(this.conditionValueAttribute),
-            caseInsensitive: (_a = this.options) === null || _a === void 0 ? void 0 : _a.caseInsensitive,
+            comparisonType: ConditionDescriptor_1.ComparisonType.fromString(conditionAttribute),
+            comparatorValue: (0, MablAction_1.parseArgument)(conditionValueAttribute),
+            caseInsensitive: options === null || options === void 0 ? void 0 : options.caseInsensitive,
         };
     }
     getEvaluatePresence() {
-        if (!this.conditionAttribute) {
+        const conditionActionArgs = this.getActionArgs();
+        let conditionAttribute;
+        if (conditionActionArgs) {
+            [conditionAttribute] = this.getActionArgs();
+        }
+        if (!conditionAttribute) {
             throw new Error('Invalid evaluate presence condition. Missing evaluation_type.');
         }
         return {
             conditionType: ConditionDescriptor_1.ConditionType.Presence,
-            presenceType: ConditionDescriptor_1.PresenceEvaluationType.fromString(this.conditionAttribute),
+            presenceType: ConditionDescriptor_1.PresenceEvaluationType.fromString(conditionAttribute),
+        };
+    }
+    getEvaluateAIPrompt() {
+        const conditionActionArgs = this.getActionArgs();
+        let userPrompt;
+        let metaPrompt;
+        if (conditionActionArgs) {
+            [userPrompt, metaPrompt] = this.getActionArgs();
+        }
+        if (userPrompt === undefined) {
+            throw new Error('Invalid ai prompt condition. Missing user prompt');
+        }
+        return {
+            conditionType: ConditionDescriptor_1.ConditionType.AIPrompt,
+            userPrompt,
+            metaPrompt,
         };
     }
     generateEvaluateConditionMablscript() {
+        var _a;
+        const comparatorValue = (0, ConditionDescriptor_1.getOptionalComparatorValue)(this.conditionDescriptor);
         let value = '';
-        if (this.conditionValueAttribute !== undefined) {
-            if (!(0, MablAction_1.argumentIsMablVariable)(this.conditionValueAttribute)) {
-                value = `, "${(0, domUtil_1.escapeMablscriptString)(this.conditionValueAttribute)}"`;
+        if (comparatorValue !== undefined) {
+            if (!(0, MablAction_1.argumentIsMablVariable)(comparatorValue)) {
+                value = `, "${(0, domUtil_1.escapeMablscriptString)(comparatorValue)}"`;
             }
             else {
-                value = `, ${this.subVariable(this.conditionValueAttribute)}`;
+                value = `, ${this.subVariable(comparatorValue)}`;
             }
         }
-        const conditionOptionsString = this.options !== undefined
-            ? `, ${(0, MablAction_1.convertObjectToMablscriptArgs)(this.options)}`
+        const conditionOptionsString = this.hasOptionsAtInstantiation
+            ? `, ${(0, MablAction_1.convertObjectToMablscriptArgs)((_a = (0, ConditionDescriptor_1.getOptionalConditionOptions)(this.conditionDescriptor)) !== null && _a !== void 0 ? _a : {})}`
             : '';
-        return `${this.name}("${this.conditionAttribute}"${value}${conditionOptionsString})`;
+        return `${this.name}("${(0, ConditionDescriptor_1.getAssertionConditionFieldFromDescriptor)(this.conditionDescriptor)}"${value}${conditionOptionsString})`;
     }
     toMablscript() {
         return `${this.generateEvaluateConditionMablscript()}`;
     }
     getInputVariables() {
         var _a;
-        return MablAction_1.MablAction.findUniqueVariableReferencesInValue((_a = this.conditionValueAttribute) !== null && _a !== void 0 ? _a : '');
+        return MablAction_1.MablAction.findUniqueVariableReferencesInValue((_a = (0, ConditionDescriptor_1.getOptionalComparatorValue)(this.conditionDescriptor)) !== null && _a !== void 0 ? _a : '');
     }
 }
 exports.ConditionAction = ConditionAction;
-ConditionAction.mablScriptStepNames = ['evaluate_condition', 'evaluate_presence'];
+ConditionAction.mablScriptStepNames = [
+    'evaluate_condition',
+    'evaluate_presence',
+    'evaluate_ai_prompt',
+];
 ConditionAction.yamlMablScriptNames = ['ConditionAction'];

package/mablscript/steps/AssertStep.js

@@ -52,9 +52,14 @@ class AssertStep extends MablStep_1.MablStep {
         else {
             this.conditionAction = actions[1];
         }
-        this.assertionType = this.conditionAction
-            .conditionAttribute;
-        this.assertionValue = this.conditionAction.conditionValueAttribute;
+        this.userPrompt = (0, ConditionDescriptor_1.isAIPromptCondition)(this.conditionAction.conditionDescriptor)
+            ? this.conditionAction.conditionDescriptor.userPrompt
+            : undefined;
+        this.metaPrompt = (0, ConditionDescriptor_1.isAIPromptCondition)(this.conditionAction.conditionDescriptor)
+            ? this.conditionAction.conditionDescriptor.metaPrompt
+            : undefined;
+        this.assertionType = (0, ConditionDescriptor_1.getAssertionConditionFieldFromDescriptor)(this.conditionAction.conditionDescriptor);
+        this.assertionValue = (0, ConditionDescriptor_1.getOptionalComparatorValue)(this.conditionAction.conditionDescriptor);
         this.isWaitUntilStep = this.determineIfWaitUntilStep();
         this.assertArguments =
             args[0] && typeof args[0] === 'object'
@@ -135,6 +140,12 @@ class AssertStep extends MablStep_1.MablStep {
         if (this.assertionValue !== undefined) {
             formatted.assertionValue = this.assertionValue;
         }
+        if (this.userPrompt !== undefined) {
+            formatted.userPrompt = this.userPrompt;
+        }
+        if (this.metaPrompt !== undefined) {
+            formatted.metaPrompt = this.metaPrompt;
+        }
         const targetDescriptor = this.primaryAction.toDescriptor();
         if ((0, GetVariableDescriptor_1.isGetVariableDescriptor)(targetDescriptor)) {
             formatted.target = (0, GetVariableDescriptor_1.convertGetVariableDescriptorToYaml)(targetDescriptor);
@@ -142,8 +153,8 @@ class AssertStep extends MablStep_1.MablStep {
         else {
             formatted.target = targetDescriptor;
         }
-        if (this.conditionAction.options) {
-            formatted.conditionOptions = this.conditionAction.options;
+        if (this.conditionAction.hasOptionsAtInstantiation) {
+            formatted.conditionOptions = (0, ConditionDescriptor_1.getOptionalConditionOptions)(this.conditionAction.conditionDescriptor);
         }
         if (!!((_a = this.assertArguments) === null || _a === void 0 ? void 0 : _a.observationScope) ||
             !!((_b = this.assertArguments) === null || _b === void 0 ? void 0 : _b.onFailure)) {
@@ -191,7 +202,13 @@ class AssertStep extends MablStep_1.MablStep {
             throw new Error(`Error parsing [${stepName}] with incompatible step arguments`);
         }
         actions.push(primaryAction);
-        if (assertionType === 'present' || assertionType === 'not_present') {
+        if (assertionType === 'ai_prompt') {
+            actions.push(new ConditionAction_1.ConditionAction('evaluate_ai_prompt', [
+                stepArgs.userPrompt,
+                stepArgs.metaPrompt,
+            ]));
+        }
+        else if (assertionType === 'present' || assertionType === 'not_present') {
             actions.push(new ConditionAction_1.ConditionAction('evaluate_presence', [assertionType]));
         }
         else if (stepName === 'WaitUntil') {
@@ -241,6 +258,12 @@ class AssertStep extends MablStep_1.MablStep {
             this.assertionType === 'not_present') {
             return `${this.primaryAction.generateFindMablscript()}.evaluate_presence("${this.assertionType}")${assertAction}`;
         }
+        if (this.assertionType === 'ai_prompt') {
+            if (this.metaPrompt === undefined) {
+                return `${this.primaryAction.generateFindMablscript()}.evaluate_ai_prompt("${this.userPrompt}")${assertAction}`;
+            }
+            return `${this.primaryAction.generateFindMablscript()}.evaluate_ai_prompt("${this.userPrompt}", "${this.metaPrompt}")${assertAction}`;
+        }
         return `${this.primaryAction.toMablscript()}.${this.conditionAction.toMablscript()}${assertAction}`;
     }
     getInputVariables() {

package/mablscript/steps/IfConditionStep.js

@@ -61,13 +61,12 @@ class IfConditionStep extends MablStep_1.MablStep {
         };
         if (this.conditionAction) {
             details.condition =
-                ConditionDescriptor_1.AssertionConditionFieldToStepName[this.conditionAction.conditionAttribute];
-            if (this.conditionAction.conditionValueAttribute !== undefined) {
-                details.conditionValue = this.conditionAction.conditionValueAttribute;
-            }
-            if (this.conditionAction.options !== undefined) {
-                details.conditionOptions = this.conditionAction.options;
-            }
+                ConditionDescriptor_1.AssertionConditionFieldToStepName[(0, ConditionDescriptor_1.getAssertionConditionFieldFromDescriptor)(this.conditionAction.conditionDescriptor)];
+            details.conditionValue = (0, ConditionDescriptor_1.getOptionalComparatorValue)(this.conditionAction.conditionDescriptor);
+            const optionalConditionOptions = (0, ConditionDescriptor_1.getOptionalConditionOptions)(this.conditionAction.conditionDescriptor);
+            details.conditionOptions = this.conditionAction.hasOptionsAtInstantiation
+                ? optionalConditionOptions
+                : undefined;
         }
         if (this.primaryAction instanceof GetVariableValue_1.GetVariableValue) {
             details.variableName = this.substituteMablscriptVariable(this.primaryAction.variable);

package/mablscript/types/ConditionDescriptor.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AssertionConditionFieldToStepName = exports.AssertionConditionFieldToCondition = exports.AssertionStepNameToField = exports.PresenceEvaluationType = exports.isAbsenceExpected = exports.isPresenceCondition = exports.ComparisonType = exports.ConditionType = void 0;
+exports.AssertionConditionFieldToStepName = exports.AssertionConditionFieldToCondition = exports.AssertionStepNameToField = exports.getAssertionConditionFieldFromDescriptor = exports.PresenceEvaluationType = exports.isAbsenceExpected = exports.isAIPromptCondition = exports.isPresenceCondition = exports.getOptionalConditionOptions = exports.getOptionalComparatorValue = exports.getOptionalComparisonType = exports.ComparisonType = exports.ConditionType = void 0;
 var ConditionType;
 (function (ConditionType) {
+    ConditionType["AIPrompt"] = "ai_prompt";
     ConditionType["Comparison"] = "comparison";
     ConditionType["Presence"] = "presence";
     ConditionType["Truthy"] = "truthy";
@@ -32,10 +33,45 @@ var ComparisonType;
     }
     ComparisonType.fromString = fromString;
 })(ComparisonType || (exports.ComparisonType = ComparisonType = {}));
+function getOptionalComparisonType(descriptor) {
+    if (descriptor === undefined) {
+        return undefined;
+    }
+    if (descriptor.conditionType === ConditionType.Comparison) {
+        return descriptor.comparisonType;
+    }
+    return undefined;
+}
+exports.getOptionalComparisonType = getOptionalComparisonType;
+function getOptionalComparatorValue(descriptor) {
+    if (descriptor === undefined) {
+        return undefined;
+    }
+    if (descriptor.conditionType === ConditionType.Comparison) {
+        return descriptor.comparatorValue.toString();
+    }
+    return undefined;
+}
+exports.getOptionalComparatorValue = getOptionalComparatorValue;
+function getOptionalConditionOptions(descriptor) {
+    if (descriptor === undefined ||
+        descriptor.conditionType !== ConditionType.Comparison) {
+        return undefined;
+    }
+    if (descriptor.caseInsensitive !== undefined) {
+        return { caseInsensitive: descriptor.caseInsensitive };
+    }
+    return {};
+}
+exports.getOptionalConditionOptions = getOptionalConditionOptions;
 function isPresenceCondition(value) {
     return value.conditionType === ConditionType.Presence;
 }
 exports.isPresenceCondition = isPresenceCondition;
+function isAIPromptCondition(value) {
+    return value.conditionType === ConditionType.AIPrompt;
+}
+exports.isAIPromptCondition = isAIPromptCondition;
 function isAbsenceExpected(value) {
     return (isPresenceCondition(value) &&
         value.presenceType === PresenceEvaluationType.NOT_PRESENT);
@@ -56,6 +92,22 @@ var PresenceEvaluationType;
     }
     PresenceEvaluationType.fromString = fromString;
 })(PresenceEvaluationType || (exports.PresenceEvaluationType = PresenceEvaluationType = {}));
+function getAssertionConditionFieldFromDescriptor(conditionDescriptor) {
+    if (conditionDescriptor === undefined) {
+        return undefined;
+    }
+    if (conditionDescriptor.conditionType === ConditionType.Comparison) {
+        return conditionDescriptor.comparisonType;
+    }
+    if (conditionDescriptor.conditionType === ConditionType.Presence) {
+        return conditionDescriptor.presenceType;
+    }
+    if (conditionDescriptor.conditionType === ConditionType.AIPrompt) {
+        return 'ai_prompt';
+    }
+    return undefined;
+}
+exports.getAssertionConditionFieldFromDescriptor = getAssertionConditionFieldFromDescriptor;
 exports.AssertionStepNameToField = {
     AssertEquals: 'equals',
     AssertPresent: 'present',
@@ -71,6 +123,7 @@ exports.AssertionStepNameToField = {
     AssertLessThan: 'less_than',
     AssertGreaterThanOrEquals: 'greater_than_or_equals',
     AssertLessThanOrEquals: 'less_than_or_equals',
+    AssertAIPrompt: 'ai_prompt',
 };
 exports.AssertionConditionFieldToCondition = Object.fromEntries(Object.entries(exports.AssertionStepNameToField).map(([stepType, field]) => [
     field,

package/mablscript/types/ExtractDescriptor.js

@@ -7,6 +7,7 @@ var ExtractType;
     ExtractType["EXTRACT_CSS_PROPERTIES"] = "extract_css_properties";
     ExtractType["EXTRACT_EMAIL_ATTRIBUTE"] = "extract_email_attribute";
     ExtractType["EXTRACT_INNER_TEXT"] = "extract_inner_text";
+    ExtractType["EXTRACT_PROMPT"] = "extract_prompt";
 })(ExtractType || (exports.ExtractType = ExtractType = {}));
 (function (ExtractType) {
     function fromString(value) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mablhq/mabl-cli",
-  "version": "2.30.0",
+  "version": "2.31.2",
   "license": "SEE LICENSE IN LICENSE.txt",
   "description": "The official mabl command line interface tool",
   "main": "index.js",