@mablhq/mabl-cli 2.22.7 → 2.23.4

package/mablscript/importer.js

@@ -68,6 +68,7 @@ const InstallAppStep_1 = require("./mobile/steps/InstallAppStep");
 const UninstallAppStep_1 = require("./mobile/steps/UninstallAppStep");
 const PrepareSessionStep_1 = require("./mobile/steps/PrepareSessionStep");
 const OpenLinkStep_1 = require("./mobile/steps/OpenLinkStep");
+const DatabaseCallStep_1 = require("./steps/DatabaseCallStep");
 const ActionTypes = [
     AwaitDownloadAction_1.AwaitDownloadAction,
     AwaitPDFDownloadAction_1.AwaitPDFDownloadAction,
@@ -91,6 +92,7 @@ const StepTypes = [
     ClickStep_1.ClickStep,
     ClickAndHoldStep_1.ClickAndHoldStep,
     CreateVariableStep_1.CreateVariableStep,
+    DatabaseCallStep_1.DatabaseCallStep,
     DoubleClickStep_1.DoubleClickStep,
     DownloadStep_1.DownloadStep,
     EchoStep_1.EchoStep,

package/mablscript/mobile/tests/TestMobileFindDescriptors.js

@@ -7,7 +7,6 @@ exports.iOSWebViewTextFieldMobileFindDescriptor = {
     findTarget: {
         selector: {
             iOS: {
-                accessible: false,
                 rect: {
                     width: 390,
                     x: 0,
@@ -59,10 +58,10 @@ exports.AndroidWebViewTextFieldMobileFindDescriptor = {
                 displayed: true,
                 checkable: false,
                 clickable: false,
-                index: 0,
                 focusable: false,
                 alternateXPaths: [],
                 enabled: true,
+                index: 0,
                 longClickable: false,
                 rect: {
                     width: 1440,
@@ -115,7 +114,6 @@ exports.iOSTestLabWebViewClickCounterMobileFindDescriptor = {
     findTarget: {
         selector: {
             iOS: {
-                accessible: false,
                 rect: {
                     width: 390,
                     x: 0,
@@ -164,10 +162,10 @@ exports.AndroidTestLabWebViewClickCounterMobileFindDescriptor = {
                 displayed: true,
                 checkable: false,
                 clickable: false,
-                index: 0,
                 focusable: false,
                 alternateXPaths: [],
                 enabled: true,
+                index: 0,
                 longClickable: false,
                 rect: {
                     width: 1000,
@@ -219,7 +217,6 @@ exports.iOSVerticalGridContainerMobileFindDescriptor = {
             iOS: {
                 type: 'XCUIElementTypeOther',
                 enabled: true,
-                accessible: false,
                 rect: {
                     x: 0,
                     y: 143,
@@ -269,7 +266,6 @@ exports.iOSTwoHorizontalScrollGrid2MobileFindDescriptor = {
                 type: 'XCUIElementTypeOther',
                 name: 'grid-2',
                 enabled: true,
-                accessible: false,
                 rect: {
                     x: 0,
                     y: 517,

package/mablscript/steps/AbstractAssertionsAndVariablesStep.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AbstractAssertionsAndVariablesStep = void 0;
+const domUtil_1 = require("../../domUtil");
+const MablAction_1 = require("../MablAction");
+const MablStep_1 = require("../MablStep");
+class AbstractAssertionsAndVariablesStep extends MablStep_1.MablStep {
+    constructor(name, args, actions, mablScriptName, stepName, descriptor) {
+        super(name, args, actions, mablScriptName);
+        this.stepName = stepName;
+        this.descriptor = descriptor;
+    }
+    getStepName() {
+        return this.stepName;
+    }
+    toStepDescriptor() {
+        const formatted = JSON.parse(JSON.stringify(this.descriptor));
+        formatted.actionCode = this.actionCode;
+        return formatted;
+    }
+    toMablscript() {
+        return `${this.getActionCode()}(${(0, domUtil_1.buildStepArgumentString)({
+            params: { ...this.descriptor },
+            legacy: true,
+        })})`;
+    }
+    getInputVariables() {
+        return MablAction_1.MablAction.findUniqueVariableReferencesInValue(this.descriptor);
+    }
+    getOutputVariables() {
+        var _a, _b;
+        return (_b = (_a = this.descriptor.variables) === null || _a === void 0 ? void 0 : _a.map((variable) => variable.name)) !== null && _b !== void 0 ? _b : [];
+    }
+}
+exports.AbstractAssertionsAndVariablesStep = AbstractAssertionsAndVariablesStep;

package/mablscript/steps/AssertStep.js

@@ -1,12 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AssertStep = exports.fieldToAssertionStep = exports.assertionStepToField = exports.OnFailure = void 0;
+exports.AssertStep = exports.assertStepYamlMablscriptNames = exports.OnFailure = void 0;
 const ConditionAction_1 = require("../actions/ConditionAction");
 const FindAction_1 = require("../actions/FindAction");
 const MablStep_1 = require("../MablStep");
 const MablAction_1 = require("../MablAction");
 const ExtractAction_1 = require("../actions/ExtractAction");
 const domUtil_1 = require("../../domUtil");
+const ConditionDescriptor_1 = require("../types/ConditionDescriptor");
 const GetUrlAction_1 = require("../actions/GetUrlAction");
 const GetCurrentLocationDescriptor_1 = require("../types/GetCurrentLocationDescriptor");
 const GetVariableValue_1 = require("../actions/GetVariableValue");
@@ -19,29 +20,12 @@ var OnFailure;
     OnFailure["FailImmediately"] = "terminate";
     OnFailure["FailTestAtEnd"] = "failAtEnd";
 })(OnFailure = exports.OnFailure || (exports.OnFailure = {}));
-exports.assertionStepToField = {
-    AssertEquals: 'equals',
-    AssertPresent: 'present',
-    AssertNotPresent: 'not_present',
-    AssertDoesNotEqual: 'does_not_equal',
-    AssertContains: 'contains',
-    AssertDoesNotContain: 'does_not_contain',
-    AssertStartsWith: 'starts_with',
-    AssertStartsWithout: 'starts_without',
-    AssertEndsWith: 'ends_with',
-    AssertEndsWithout: 'ends_without',
-    AssertGreaterThan: 'greater_than',
-    AssertLessThan: 'less_than',
-    AssertGreaterThanOrEquals: 'greater_than_or_equals',
-    AssertLessThanOrEquals: 'less_than_or_equals',
-};
-const yamlMablScriptNames = () => {
-    const assertionNames = Object.keys(exports.assertionStepToField);
+const assertStepYamlMablscriptNames = () => {
+    const assertionNames = Object.keys(ConditionDescriptor_1.AssertionStepNameToField);
     assertionNames.push('WaitUntil');
     return assertionNames;
 };
-exports.fieldToAssertionStep = {};
-Object.entries(exports.assertionStepToField).forEach(([stepType, field]) => (exports.fieldToAssertionStep[field] = stepType));
+exports.assertStepYamlMablscriptNames = assertStepYamlMablscriptNames;
 class AssertStep extends MablStep_1.MablStep {
     constructor(name, args, actions) {
         var _a, _b;
@@ -68,7 +52,8 @@ class AssertStep extends MablStep_1.MablStep {
         else {
             this.conditionAction = actions[1];
         }
-        this.assertionType = this.conditionAction.conditionAttribute;
+        this.assertionType = this.conditionAction
+            .conditionAttribute;
         this.assertionValue = this.conditionAction.conditionValueAttribute;
         this.isWaitUntilStep = this.determineIfWaitUntilStep();
         this.assertArguments =
@@ -96,7 +81,8 @@ class AssertStep extends MablStep_1.MablStep {
     determineIfWaitUntilStep() {
         var _a, _b;
         const find = this.primaryAction.toDescriptor();
-        if (exports.fieldToAssertionStep[this.assertionType] === 'AssertPresent' &&
+        if (ConditionDescriptor_1.AssertionConditionFieldToStepName[this.assertionType] ===
+            'AssertPresent' &&
             (0, domUtil_1.isFindElementDescriptor)(find)) {
             if ((_b = (_a = find.findOptions) === null || _a === void 0 ? void 0 : _a.waitUntil) === null || _b === void 0 ? void 0 : _b.timeoutSeconds) {
                 return true;
@@ -108,7 +94,7 @@ class AssertStep extends MablStep_1.MablStep {
         if (this.isWaitUntilStep) {
             return 'WaitUntil';
         }
-        return exports.fieldToAssertionStep[this.assertionType];
+        return ConditionDescriptor_1.AssertionConditionFieldToStepName[this.assertionType];
     }
     toStepDescriptor() {
         var _a, _b;
@@ -173,7 +159,7 @@ class AssertStep extends MablStep_1.MablStep {
     static fromYaml(stepName, stepArgs) {
         var _a, _b, _c, _d, _e, _f, _g;
         const actions = [];
-        const assertionType = exports.assertionStepToField[stepName];
+        const assertionType = ConditionDescriptor_1.AssertionStepNameToField[stepName];
         const assertionValue = stepArgs.assertionValue;
         const conditionOptions = stepArgs.conditionOptions;
         let primaryAction;
@@ -269,4 +255,4 @@ class AssertStep extends MablStep_1.MablStep {
 }
 exports.AssertStep = AssertStep;
 AssertStep.mablScriptStepNames = ['assert'];
-AssertStep.yamlMablScriptNames = yamlMablScriptNames();
+AssertStep.yamlMablScriptNames = (0, exports.assertStepYamlMablscriptNames)();

package/mablscript/steps/AssertStepOld.js

@@ -128,7 +128,7 @@ class AssertStepOld extends MablStep_1.MablStep {
             observationScope: this.observationScope,
         };
         if (this.stepId()) {
-            result[this.getStepName()].id = this.stepId();
+            formatted.id = this.stepId();
         }
         return result;
     }

package/mablscript/steps/DatabaseCallStep.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DatabaseCallVariableSource = exports.DatabaseCallStep = void 0;
+const AbstractAssertionsAndVariablesStep_1 = require("./AbstractAssertionsAndVariablesStep");
+class DatabaseCallStep extends AbstractAssertionsAndVariablesStep_1.AbstractAssertionsAndVariablesStep {
+    constructor(name, args, actions) {
+        super(name, args, actions, DatabaseCallStep.mablScriptStepNames[0], DatabaseCallStep.stepName, args[0]);
+    }
+    static fromYaml(_stepName, stepArgs) {
+        const formatted = stepArgs;
+        const step = new DatabaseCallStep(DatabaseCallStep.stepName, [formatted], []);
+        step.setStepId(stepArgs.id);
+        return step;
+    }
+}
+exports.DatabaseCallStep = DatabaseCallStep;
+DatabaseCallStep.stepName = 'DatabaseCall';
+DatabaseCallStep.mablScriptStepNames = ['database_call'];
+DatabaseCallStep.yamlMablScriptNames = [DatabaseCallStep.stepName];
+var DatabaseCallVariableSource;
+(function (DatabaseCallVariableSource) {
+    DatabaseCallVariableSource["Metadata"] = "metadata";
+    DatabaseCallVariableSource["Result"] = "result";
+})(DatabaseCallVariableSource = exports.DatabaseCallVariableSource || (exports.DatabaseCallVariableSource = {}));

package/mablscript/steps/IfConditionStep.js

@@ -61,7 +61,7 @@ class IfConditionStep extends MablStep_1.MablStep {
         };
         if (this.conditionAction) {
             details.condition =
-                AssertStep_1.fieldToAssertionStep[this.conditionAction.conditionAttribute];
+                ConditionDescriptor_1.AssertionConditionFieldToStepName[this.conditionAction.conditionAttribute];
             if (this.conditionAction.conditionValueAttribute !== undefined) {
                 details.conditionValue = this.conditionAction.conditionValueAttribute;
             }
@@ -125,11 +125,11 @@ class IfConditionStep extends MablStep_1.MablStep {
             actions.push(JavaScriptAction_1.JavaScriptAction.fromYaml(stepArgs.snippet));
         }
         if (stepArgs.condition) {
-            const conditionType = AssertStep_1.assertionStepToField[stepArgs.condition];
+            const conditionType = ConditionDescriptor_1.AssertionStepNameToField[stepArgs.condition];
             actions.push(new ConditionAction_1.ConditionAction(conditionType === 'present' || conditionType === 'not_present'
                 ? 'evaluate_presence'
                 : 'evaluate_condition', [
-                AssertStep_1.assertionStepToField[stepArgs.condition],
+                ConditionDescriptor_1.AssertionStepNameToField[stepArgs.condition],
                 stepArgs.conditionValue,
                 stepArgs.conditionOptions,
             ]));

package/mablscript/steps/SendHttpRequestStep.js

@@ -1,31 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.VariableSource = exports.HttpResponseAssertion = exports.SendHttpRequestStep = void 0;
-const MablAction_1 = require("../MablAction");
-const MablStep_1 = require("../MablStep");
+exports.SendHttpRequestVariableSource = exports.SendHttpRequestStep = void 0;
+const AbstractAssertionsAndVariablesStep_1 = require("./AbstractAssertionsAndVariablesStep");
 const ConditionDescriptor_1 = require("../types/ConditionDescriptor");
-const AssertStep_1 = require("./AssertStep");
-const domUtil_1 = require("../../domUtil");
-const evalAssertionType = {};
-Object.entries(AssertStep_1.assertionStepToField).forEach(([stepType, field]) => (evalAssertionType[field] = `${stepType.split('Assert')[1]}`));
-class SendHttpRequestStep extends MablStep_1.MablStep {
+class SendHttpRequestStep extends AbstractAssertionsAndVariablesStep_1.AbstractAssertionsAndVariablesStep {
     constructor(name, args, actions) {
-        super(name, args, actions, 'send_http_request');
-        this.sendRequest = this.getActionArgs()[0];
-    }
-    getStepName() {
-        return SendHttpRequestStep.stepName;
-    }
-    toStepDescriptor() {
-        const formatted = JSON.parse(JSON.stringify(this.sendRequest));
-        if (formatted.assertions) {
-            formatted.assertions = formatted.assertions.map((assertion) => ({
-                ...assertion,
-                assertion: evalAssertionType[assertion.assertion],
-            }));
-        }
-        formatted.actionCode = this.actionCode;
-        return formatted;
+        super(name, args, actions, 'send_http_request', SendHttpRequestStep.stepName, args[0]);
     }
     static fromYaml(_stepName, stepArgs) {
         var _a;
@@ -35,7 +15,7 @@ class SendHttpRequestStep extends MablStep_1.MablStep {
                 var _a;
                 return ({
                     ...assertion,
-                    assertion: (_a = AssertStep_1.assertionStepToField[`Assert${assertion.assertion}`]) !== null && _a !== void 0 ? _a : assertion.assertion,
+                    assertion: (_a = ConditionDescriptor_1.AssertionStepNameToField[`Assert${assertion.assertion}`]) !== null && _a !== void 0 ? _a : assertion.assertion,
                 });
             });
         }
@@ -43,41 +23,29 @@ class SendHttpRequestStep extends MablStep_1.MablStep {
         step.setStepId(stepArgs.id);
         return step;
     }
-    toMablscript() {
-        return `send_http_request(${(0, domUtil_1.buildStepArgumentString)({
-            params: { ...this.sendRequest },
-            legacy: true,
-        })})`;
-    }
-    getInputVariables() {
-        return MablAction_1.MablAction.findUniqueVariableReferencesInValue(this.sendRequest);
-    }
-    getOutputVariables() {
-        var _a, _b;
-        return (_b = (_a = this.sendRequest.variables) === null || _a === void 0 ? void 0 : _a.map((variable) => variable.name)) !== null && _b !== void 0 ? _b : [];
+    toStepDescriptor() {
+        const internalDescriptor = this
+            .descriptor;
+        const formatted = JSON.parse(JSON.stringify(internalDescriptor));
+        if (internalDescriptor.assertions) {
+            formatted.assertions = internalDescriptor.assertions.map((assertion) => ({
+                ...assertion,
+                assertion: ConditionDescriptor_1.AssertionConditionFieldToCondition[assertion.assertion],
+            }));
+        }
+        formatted.actionCode = this.actionCode;
+        return formatted;
     }
 }
 exports.SendHttpRequestStep = SendHttpRequestStep;
 SendHttpRequestStep.stepName = 'SendHttpRequest';
 SendHttpRequestStep.mablScriptStepNames = ['send_http_request'];
 SendHttpRequestStep.yamlMablScriptNames = [SendHttpRequestStep.stepName];
-var HttpResponseAssertion;
-(function (HttpResponseAssertion) {
-    function toComparisonDescriptor(assertion) {
-        const convertedAssertion = AssertStep_1.assertionStepToField[`Assert${assertion.assertion}`];
-        return {
-            conditionType: ConditionDescriptor_1.ConditionType.Comparison,
-            comparisonType: ConditionDescriptor_1.ComparisonType.fromString(convertedAssertion),
-            comparatorValue: assertion.value,
-        };
-    }
-    HttpResponseAssertion.toComparisonDescriptor = toComparisonDescriptor;
-})(HttpResponseAssertion = exports.HttpResponseAssertion || (exports.HttpResponseAssertion = {}));
-var VariableSource;
-(function (VariableSource) {
-    VariableSource["Body"] = "body";
-    VariableSource["Header"] = "header";
-    VariableSource["Json"] = "json";
-    VariableSource["Response"] = "response";
-    VariableSource["Status"] = "status";
-})(VariableSource = exports.VariableSource || (exports.VariableSource = {}));
+var SendHttpRequestVariableSource;
+(function (SendHttpRequestVariableSource) {
+    SendHttpRequestVariableSource["Body"] = "body";
+    SendHttpRequestVariableSource["Header"] = "header";
+    SendHttpRequestVariableSource["Json"] = "json";
+    SendHttpRequestVariableSource["Response"] = "response";
+    SendHttpRequestVariableSource["Status"] = "status";
+})(SendHttpRequestVariableSource = exports.SendHttpRequestVariableSource || (exports.SendHttpRequestVariableSource = {}));

package/mablscript/types/AssertionsAndVariablesStepDescriptor.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/mablscript/types/ConditionDescriptor.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PresenceEvaluationType = exports.isAbsenceExpected = exports.isPresenceCondition = exports.ComparisonType = exports.ConditionType = void 0;
+exports.AssertionConditionFieldToStepName = exports.AssertionConditionFieldToCondition = exports.AssertionStepNameToField = exports.PresenceEvaluationType = exports.isAbsenceExpected = exports.isPresenceCondition = exports.ComparisonType = exports.ConditionType = void 0;
 var ConditionType;
 (function (ConditionType) {
     ConditionType["Comparison"] = "comparison";
@@ -56,3 +56,27 @@ var PresenceEvaluationType;
     }
     PresenceEvaluationType.fromString = fromString;
 })(PresenceEvaluationType = exports.PresenceEvaluationType || (exports.PresenceEvaluationType = {}));
+exports.AssertionStepNameToField = {
+    AssertEquals: 'equals',
+    AssertPresent: 'present',
+    AssertNotPresent: 'not_present',
+    AssertDoesNotEqual: 'does_not_equal',
+    AssertContains: 'contains',
+    AssertDoesNotContain: 'does_not_contain',
+    AssertStartsWith: 'starts_with',
+    AssertStartsWithout: 'starts_without',
+    AssertEndsWith: 'ends_with',
+    AssertEndsWithout: 'ends_without',
+    AssertGreaterThan: 'greater_than',
+    AssertLessThan: 'less_than',
+    AssertGreaterThanOrEquals: 'greater_than_or_equals',
+    AssertLessThanOrEquals: 'less_than_or_equals',
+};
+exports.AssertionConditionFieldToCondition = Object.fromEntries(Object.entries(exports.AssertionStepNameToField).map(([stepType, field]) => [
+    field,
+    `${stepType.split('Assert')[1]}`,
+]));
+exports.AssertionConditionFieldToStepName = Object.fromEntries(Object.entries(exports.AssertionStepNameToField).map(([stepType, field]) => [
+    field,
+    stepType,
+]));