@mablhq/mabl-cli 2.41.1 → 2.45.2

package/mablscript/actions/ConditionAction.js

@@ -67,9 +67,9 @@ class ConditionAction extends MablAction_1.MablAction {
     getEvaluateAIPrompt() {
         const conditionActionArgs = this.getActionArgs();
         let userPrompt;
-        let metaPrompt;
+        let options;
         if (conditionActionArgs) {
-            [userPrompt, metaPrompt] = this.getActionArgs();
+            [userPrompt, options] = this.getActionArgs();
         }
         if (userPrompt === undefined) {
             throw new Error('Invalid ai prompt condition. Missing user prompt');
@@ -77,7 +77,8 @@ class ConditionAction extends MablAction_1.MablAction {
         return {
             conditionType: ConditionDescriptor_1.ConditionType.AIPrompt,
             userPrompt,
-            metaPrompt,
+            metaPrompt: typeof options === 'string' ? options : options === null || options === void 0 ? void 0 : options.metaPrompt,
+            criteria: options === null || options === void 0 ? void 0 : options.criteria,
         };
     }
     generateEvaluateConditionMablscript() {

package/mablscript/steps/AssertStep.js

@@ -52,11 +52,12 @@ class AssertStep extends MablStep_1.MablStep {
         else {
             this.conditionAction = actions[1];
         }
-        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
+        this.aiPrompt = (0, ConditionDescriptor_1.isAIPromptCondition)(this.conditionAction.conditionDescriptor)
+            ? {
+                userPrompt: this.conditionAction.conditionDescriptor.userPrompt,
+                metaPrompt: this.conditionAction.conditionDescriptor.metaPrompt,
+                criteria: this.conditionAction.conditionDescriptor.criteria,
+            }
             : undefined;
         this.assertionType = (0, ConditionDescriptor_1.getAssertionConditionFieldFromDescriptor)(this.conditionAction.conditionDescriptor);
         this.assertionValue = (0, ConditionDescriptor_1.getOptionalComparatorValue)(this.conditionAction.conditionDescriptor);
@@ -140,11 +141,8 @@ 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;
+        if (this.aiPrompt !== undefined) {
+            formatted.aiPrompt = this.aiPrompt;
         }
         const targetDescriptor = this.primaryAction.toDescriptor();
         if ((0, GetVariableDescriptor_1.isGetVariableDescriptor)(targetDescriptor)) {
@@ -168,7 +166,7 @@ class AssertStep extends MablStep_1.MablStep {
         return result;
     }
     static fromYaml(stepName, stepArgs) {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
         const actions = [];
         const assertionType = ConditionDescriptor_1.AssertionStepNameToField[stepName];
         const assertionValue = stepArgs.assertionValue;
@@ -204,8 +202,11 @@ class AssertStep extends MablStep_1.MablStep {
         actions.push(primaryAction);
         if (assertionType === 'ai_prompt') {
             actions.push(new ConditionAction_1.ConditionAction('evaluate_ai_prompt', [
-                stepArgs.userPrompt,
-                stepArgs.metaPrompt,
+                (_h = (_g = stepArgs.aiPrompt) === null || _g === void 0 ? void 0 : _g.userPrompt) !== null && _h !== void 0 ? _h : stepArgs.userPrompt,
+                {
+                    metaPrompt: (_k = (_j = stepArgs.aiPrompt) === null || _j === void 0 ? void 0 : _j.metaPrompt) !== null && _k !== void 0 ? _k : stepArgs.metaPrompt,
+                    criteria: (_l = stepArgs.aiPrompt) === null || _l === void 0 ? void 0 : _l.criteria,
+                },
             ]));
         }
         else if (assertionType === 'present' || assertionType === 'not_present') {
@@ -218,7 +219,7 @@ class AssertStep extends MablStep_1.MablStep {
             if (stepArgs.attribute === 'count') {
                 actions.push(new CountAction_1.CountAction('count', [stepArgs.attribute]));
             }
-            else if (((_g = stepArgs.target) === null || _g === void 0 ? void 0 : _g.kind) !== GetVariableDescriptor_1.GET_VARIABLE_VALUE) {
+            else if (((_m = stepArgs.target) === null || _m === void 0 ? void 0 : _m.kind) !== GetVariableDescriptor_1.GET_VARIABLE_VALUE) {
                 actions.push(new ExtractAction_1.ExtractAction(ExtractAction_1.ExtractAction.mablScriptTypeFromYamlType(stepArgs.extractType), [stepArgs.attribute]));
             }
             actions.push(new ConditionAction_1.ConditionAction('evaluate_condition', [
@@ -235,7 +236,7 @@ class AssertStep extends MablStep_1.MablStep {
         return assertStep;
     }
     toMablscript() {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         if (this.primaryAction instanceof MobileFindAction_1.MobileFindAction) {
             throw new Error('Mobile steps do not generate mablscript');
         }
@@ -259,10 +260,14 @@ class AssertStep extends MablStep_1.MablStep {
             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}`;
+            const aiOptions = {};
+            if ((_e = this.aiPrompt) === null || _e === void 0 ? void 0 : _e.metaPrompt) {
+                aiOptions.metaPrompt = this.aiPrompt.metaPrompt;
+            }
+            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("${this.userPrompt}", "${this.metaPrompt}")${assertAction}`;
+            return `${this.primaryAction.generateFindMablscript()}.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}`;
     }

package/mablscript/steps/IfConditionStep.js

@@ -69,10 +69,11 @@ class IfConditionStep extends MablStep_1.MablStep {
                 : undefined;
             if (this.conditionAction.conditionDescriptor.conditionType ===
                 ConditionDescriptor_1.ConditionType.AIPrompt) {
-                details.userPrompt =
-                    this.conditionAction.conditionDescriptor.userPrompt;
-                details.metaPrompt =
-                    this.conditionAction.conditionDescriptor.metaPrompt;
+                details.aiPrompt = {
+                    userPrompt: this.conditionAction.conditionDescriptor.userPrompt,
+                    metaPrompt: this.conditionAction.conditionDescriptor.metaPrompt,
+                    criteria: this.conditionAction.conditionDescriptor.criteria,
+                };
             }
         }
         if (this.primaryAction instanceof GetVariableValue_1.GetVariableValue) {
@@ -111,6 +112,7 @@ class IfConditionStep extends MablStep_1.MablStep {
         return details;
     }
     static getActionsFromYamlForCondition(stepArgs) {
+        var _a, _b, _c, _d, _e;
         const actions = [];
         if (stepArgs.selector) {
             const findAction = FindAction_1.FindAction.findActionFromStepArgs(stepArgs);
@@ -133,7 +135,13 @@ class IfConditionStep extends MablStep_1.MablStep {
         if (stepArgs.condition) {
             const conditionType = ConditionDescriptor_1.AssertionStepNameToField[stepArgs.condition];
             if (conditionType === 'ai_prompt') {
-                actions.push(new ConditionAction_1.ConditionAction(this.getConditionActionNameForConditionType(conditionType), [stepArgs.userPrompt, stepArgs.metaPrompt]));
+                actions.push(new ConditionAction_1.ConditionAction(this.getConditionActionNameForConditionType(conditionType), [
+                    (_b = (_a = stepArgs.aiPrompt) === null || _a === void 0 ? void 0 : _a.userPrompt) !== null && _b !== void 0 ? _b : stepArgs.userPrompt,
+                    {
+                        metaPrompt: (_d = (_c = stepArgs.aiPrompt) === null || _c === void 0 ? void 0 : _c.metaPrompt) !== null && _d !== void 0 ? _d : stepArgs.metaPrompt,
+                        criteria: (_e = stepArgs.aiPrompt) === null || _e === void 0 ? void 0 : _e.criteria,
+                    },
+                ]));
             }
             else {
                 actions.push(new ConditionAction_1.ConditionAction(this.getConditionActionNameForConditionType(conditionType), [

package/mobile/types.js

@@ -1,2 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.MobileAutomationName = void 0;
+var MobileAutomationName;
+(function (MobileAutomationName) {
+    MobileAutomationName["UiAutomator2"] = "UiAutomator2";
+    MobileAutomationName["XCUITest"] = "XCUITest";
+})(MobileAutomationName || (exports.MobileAutomationName = MobileAutomationName = {}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mablhq/mabl-cli",
-  "version": "2.41.1",
+  "version": "2.45.2",
   "license": "SEE LICENSE IN LICENSE.txt",
   "description": "The official mabl command line interface tool",
   "main": "index.js",
@@ -32,7 +32,7 @@
     "adm-zip": "0.5.10",
     "agent-base": "6.0.2",
     "analytics-node": "6.2.0",
-    "appium": "2.3.0",
+    "appium": "2.11.3",
     "async-mutex": "0.3.1",
     "async-retry": "1.3.3",
     "axe-core": "4.8.3",
@@ -98,8 +98,7 @@
     "tough-cookie": "4.0.0",
     "triple-beam": "1.3.0",
     "uuid": "9.0.0",
-    "v8-compile-cache": "2.1.1",
-    "webdriverio": "7.30.0",
+    "webdriverio": "8.39.1",
     "winston": "3.13.0",
     "winston-transport": "4.7.0",
     "xpath": "0.0.32",

package/providers/exportRequestProvider.js

@@ -75,6 +75,11 @@ class ExportRequestProvider {
     }
     async processExport() {
         try {
+            const testRun = await this.apiClient.getTestRun(this.targetEntityId);
+            if (testRun.test_type === mablApi_1.TestTypeEnum.Api) {
+                loggingProvider_1.logger.error(chalk.red(`Test run export not supported for API test runs: ${this.targetEntityId}`));
+                process.exit(1);
+            }
             loggingProvider_1.logger.info(`Export ${this.targetEntityType} [${chalk.magenta.bold(this.targetEntityId)}]`);
             this.createExportSpinner = ora({
                 prefixText: ' ',