@mablhq/mabl-cli 2.31.41 → 2.34.5

package/mablscript/actions/ConditionAction.js

@@ -37,12 +37,15 @@ class ConditionAction extends MablAction_1.MablAction {
         if (conditionAttribute === undefined) {
             throw new Error('Invalid equality condition. Missing comparison type.');
         }
+        if (!(0, ConditionDescriptor_1.isComparisonType)(conditionAttribute)) {
+            throw new Error(`Invalid equality condition. Invalid comparison type: ${conditionAttribute}`);
+        }
         if (options) {
             this.hasOptionsAtInstantiation = true;
         }
         return {
             conditionType: ConditionDescriptor_1.ConditionType.Comparison,
-            comparisonType: ConditionDescriptor_1.ComparisonType.fromString(conditionAttribute),
+            comparisonType: conditionAttribute,
             comparatorValue: (0, MablAction_1.parseArgument)(conditionValueAttribute),
             caseInsensitive: options === null || options === void 0 ? void 0 : options.caseInsensitive,
         };

package/mablscript/steps/AbstractAssertionsAndVariablesStep.js

@@ -4,6 +4,7 @@ exports.AbstractAssertionsAndVariablesStep = void 0;
 const domUtil_1 = require("../../domUtil");
 const MablAction_1 = require("../MablAction");
 const MablStep_1 = require("../MablStep");
+const ConditionDescriptor_1 = require("../types/ConditionDescriptor");
 const AssertStep_1 = require("./AssertStep");
 class AbstractAssertionsAndVariablesStep extends MablStep_1.MablStep {
     constructor(name, args, actions, mablScriptName, stepName, descriptor) {
@@ -15,8 +16,14 @@ class AbstractAssertionsAndVariablesStep extends MablStep_1.MablStep {
         return this.stepName;
     }
     toStepDescriptor() {
+        var _a;
         const formatted = JSON.parse(JSON.stringify(this.descriptor));
         formatted.actionCode = this.actionCode;
+        (_a = formatted.assertions) === null || _a === void 0 ? void 0 : _a.forEach((assertion) => {
+            if (!(0, ConditionDescriptor_1.isComparisonType)(assertion.assertion)) {
+                throw new Error(`Invalid comparison type: ${assertion.assertion}`);
+            }
+        });
         return formatted;
     }
     toMablscript() {

package/mablscript/steps/SendHttpRequestStep.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SendHttpRequestVariableSource = exports.SendHttpRequestStep = void 0;
-const AbstractAssertionsAndVariablesStep_1 = require("./AbstractAssertionsAndVariablesStep");
 const ConditionDescriptor_1 = require("../types/ConditionDescriptor");
+const AbstractAssertionsAndVariablesStep_1 = require("./AbstractAssertionsAndVariablesStep");
 class SendHttpRequestStep extends AbstractAssertionsAndVariablesStep_1.AbstractAssertionsAndVariablesStep {
     constructor(name, args, actions) {
         super(name, args, actions, 'send_http_request', SendHttpRequestStep.stepName, args[0]);
@@ -10,32 +10,29 @@ class SendHttpRequestStep extends AbstractAssertionsAndVariablesStep_1.AbstractA
     static fromYaml(_stepName, stepArgs) {
         var _a;
         const formatted = stepArgs;
-        if (formatted.assertions) {
-            formatted.assertions = (_a = formatted.assertions) === null || _a === void 0 ? void 0 : _a.map((assertion) => {
-                var _a;
-                return ({
-                    ...assertion,
-                    assertion: (_a = ConditionDescriptor_1.AssertionStepNameToField[`Assert${assertion.assertion}`]) !== null && _a !== void 0 ? _a : assertion.assertion,
-                });
-            });
-        }
+        const comparisonTypeConverter = {
+            Equals: ConditionDescriptor_1.AssertionConditionField.Equals,
+            DoesNotEqual: ConditionDescriptor_1.AssertionConditionField.DoesNotEqual,
+            Contains: ConditionDescriptor_1.AssertionConditionField.Contains,
+            DoesNotContain: ConditionDescriptor_1.AssertionConditionField.DoesNotContain,
+            StartsWith: ConditionDescriptor_1.AssertionConditionField.StartsWith,
+            StartsWithout: ConditionDescriptor_1.AssertionConditionField.StartsWithout,
+            EndsWith: ConditionDescriptor_1.AssertionConditionField.EndsWith,
+            EndsWithout: ConditionDescriptor_1.AssertionConditionField.EndsWithout,
+            GreaterThan: ConditionDescriptor_1.AssertionConditionField.GreaterThan,
+            LessThan: ConditionDescriptor_1.AssertionConditionField.LessThan,
+            GreaterThanOrEquals: ConditionDescriptor_1.AssertionConditionField.GreaterThanOrEquals,
+            LessThanOrEquals: ConditionDescriptor_1.AssertionConditionField.LessThanOrEquals,
+        };
+        (_a = formatted.assertions) === null || _a === void 0 ? void 0 : _a.forEach((assertion) => {
+            if (assertion.assertion in comparisonTypeConverter) {
+                assertion.assertion = comparisonTypeConverter[assertion.assertion];
+            }
+        });
         const step = new SendHttpRequestStep(SendHttpRequestStep.stepName, [formatted], []);
         step.setStepId(stepArgs.id);
         return step;
     }
-    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';

package/mablscript/types/ConditionDescriptor.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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;
+exports.AssertionConditionFieldToStepName = exports.AssertionStepNameToField = exports.getAssertionConditionFieldFromDescriptor = exports.PresenceEvaluationType = exports.isAbsenceExpected = exports.isAIPromptCondition = exports.isPresenceCondition = exports.getOptionalConditionOptions = exports.getOptionalComparatorValue = exports.getOptionalComparisonType = exports.isComparisonType = exports.AssertionConditionField = exports.ConditionType = void 0;
 var ConditionType;
 (function (ConditionType) {
     ConditionType["AIPrompt"] = "ai_prompt";
@@ -8,31 +8,31 @@ var ConditionType;
     ConditionType["Presence"] = "presence";
     ConditionType["Truthy"] = "truthy";
 })(ConditionType || (exports.ConditionType = ConditionType = {}));
-var ComparisonType;
-(function (ComparisonType) {
-    ComparisonType["CONTAINS"] = "contains";
-    ComparisonType["DOES_NOT_CONTAIN"] = "does_not_contain";
-    ComparisonType["DOES_NOT_EQUAL"] = "does_not_equal";
-    ComparisonType["ENDS_WITH"] = "ends_with";
-    ComparisonType["ENDS_WITHOUT"] = "ends_without";
-    ComparisonType["EQUALS"] = "equals";
-    ComparisonType["GREATER_THAN"] = "greater_than";
-    ComparisonType["GREATER_THAN_OR_EQUALS"] = "greater_than_or_equals";
-    ComparisonType["LESS_THAN"] = "less_than";
-    ComparisonType["LESS_THAN_OR_EQUALS"] = "less_than_or_equals";
-    ComparisonType["STARTS_WITH"] = "starts_with";
-    ComparisonType["STARTS_WITHOUT"] = "starts_without";
-})(ComparisonType || (exports.ComparisonType = ComparisonType = {}));
-(function (ComparisonType) {
-    function fromString(value) {
-        const result = value;
-        if (!Object.values(ComparisonType).includes(result)) {
-            throw new Error(`No ComparisonType match found for value: ${value}`);
-        }
-        return result;
-    }
-    ComparisonType.fromString = fromString;
-})(ComparisonType || (exports.ComparisonType = ComparisonType = {}));
+exports.AssertionConditionField = {
+    Equals: 'equals',
+    Present: 'present',
+    NotPresent: 'not_present',
+    DoesNotEqual: 'does_not_equal',
+    Contains: 'contains',
+    DoesNotContain: 'does_not_contain',
+    StartsWith: 'starts_with',
+    StartsWithout: 'starts_without',
+    EndsWith: 'ends_with',
+    EndsWithout: 'ends_without',
+    GreaterThan: 'greater_than',
+    LessThan: 'less_than',
+    GreaterThanOrEquals: 'greater_than_or_equals',
+    LessThanOrEquals: 'less_than_or_equals',
+    AIPrompt: 'ai_prompt',
+};
+function isComparisonType(text) {
+    return Object.values(exports.AssertionConditionField)
+        .filter((field) => field !== exports.AssertionConditionField.Present &&
+        field !== exports.AssertionConditionField.NotPresent &&
+        field !== exports.AssertionConditionField.AIPrompt)
+        .includes(text);
+}
+exports.isComparisonType = isComparisonType;
 function getOptionalComparisonType(descriptor) {
     if (descriptor === undefined) {
         return undefined;
@@ -125,10 +125,6 @@ exports.AssertionStepNameToField = {
     AssertLessThanOrEquals: 'less_than_or_equals',
     AssertAIPrompt: 'ai_prompt',
 };
-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,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mablhq/mabl-cli",
-  "version": "2.31.41",
+  "version": "2.34.5",
   "license": "SEE LICENSE IN LICENSE.txt",
   "description": "The official mabl command line interface tool",
   "main": "index.js",
@@ -76,8 +76,8 @@
     "newman": "6.0.0",
     "open": "6.4.0",
     "ora": "4.0.4",
-    "playwright": "1.44.0",
-    "playwright-core": "1.44.0",
+    "playwright": "1.44.1",
+    "playwright-core": "1.44.1",
     "pluralize": "8.0.0",
     "pngjs": "6.0.0",
     "portfinder": "1.0.28",

package/providers/scmContextInterfaces.js

@@ -6,7 +6,7 @@ var BuildTypes;
     BuildTypes["AzureDevOps"] = "azure_devops";
     BuildTypes["BitbucketPipe"] = "bitbucket_pipe";
     BuildTypes["CircleCi"] = "circle_ci";
-    BuildTypes["CloudBuild"] = "cloud_build";
+    BuildTypes["CloudBuild"] = "cloudbuild";
     BuildTypes["Codeship"] = "codeship";
     BuildTypes["GithubAction"] = "github_action";
     BuildTypes["Jenkins"] = "jenkins";

package/providers/scmContextProviderV2.js

@@ -0,0 +1,122 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ScmContextProviderV2 = void 0;
+const scmContextInterfaces_1 = require("./scmContextInterfaces");
+const loggingProvider_1 = require("./logging/loggingProvider");
+function processBuildEnv(envVariables, mapper, confidenceCheck) {
+    const results = {};
+    envVariables.forEach((value, key) => {
+        mapper(key, value, results);
+    });
+    results.isCorrectType = confidenceCheck(results);
+    if (results.isCorrectType) {
+        return results;
+    }
+    return;
+}
+class ScmContextProviderV2 {
+    constructor(processRef) {
+        this.envVariables = this.extractEnvVariables(processRef);
+    }
+    extractScmAndBuildInfo() {
+        try {
+            return this.innerExtractScmAndBuildInfo();
+        }
+        catch (error) {
+            loggingProvider_1.logger.error('Unable to collect build information. Using defaults.');
+            return;
+        }
+    }
+    innerExtractScmAndBuildInfo() {
+        const maybeBuildInfo = this.attemptExtractBuildInfo();
+        return {
+            buildInfo: maybeBuildInfo,
+        };
+    }
+    attemptExtractBuildInfo() {
+        const processors = [
+            () => this.getForCloudBuild(),
+        ];
+        return processors
+            .map((processor) => processor())
+            .find((result) => result !== undefined);
+    }
+    extractEnvVariables(processRef) {
+        const result = new Map();
+        Object.entries(processRef).forEach(([key, value]) => {
+            if (value && value !== '') {
+                result.set(key, value);
+            }
+        });
+        return result;
+    }
+    getForCloudBuild() {
+        function mapper(key, value, result) {
+            switch (key) {
+                case '_HEAD_BRANCH':
+                    result.pullRequestHeadBranch = value;
+                    break;
+                case '_BASE_BRANCH':
+                    result.pullRequestBaseBranch = value;
+                    break;
+                case '_HEAD_REPO_URL':
+                    result.pullRequestHeadRepo = value;
+                    break;
+                case '_PR_NUMBER':
+                    result.pullRequestId = value;
+                    break;
+                case 'PROJECT_ID':
+                    result.projectId = value;
+                    break;
+                case 'PROJECT_NUMBER':
+                    result.projectNumber = value;
+                    break;
+                case 'SERVICE_ACCOUNT':
+                case 'SERVICE_ACCOUNT_EMAIL':
+                    result.hasServiceAccount = true;
+                    break;
+                case 'LOCATION':
+                    result.cloudRegion = value;
+                    break;
+                case 'BUILD_ID':
+                    result.buildId = value;
+                    break;
+                case 'COMMIT_SHA':
+                    result.commitSha = value;
+                    break;
+                case 'SHORT_SHA':
+                    result.shortSha = value;
+                    break;
+                case 'REPO_NAME':
+                    result.repoName = value;
+                    break;
+                case 'BRANCH_NAME':
+                    result.branchName = value;
+                    break;
+                case 'TAG_NAME':
+                    result.tagName = value;
+                    break;
+                case 'REVISION_ID':
+                    result.revisionId = value;
+                    break;
+                case 'MABL_CLI_NAME':
+                    result.isCliDockerContainer = true;
+                    break;
+                default:
+            }
+        }
+        function confidenceCheck(result) {
+            const checksOut = (result === null || result === void 0 ? void 0 : result.projectId) !== undefined &&
+                result.projectNumber !== undefined &&
+                result.cloudRegion !== undefined &&
+                result.buildId !== undefined;
+            if (checksOut) {
+                result.buildType = scmContextInterfaces_1.BuildTypes.CloudBuild;
+                result.buildInfoUrl = `https://console.cloud.google.com/cloud-build/builds;region=${result.cloudRegion}/${result.buildId}?project=${result.projectId}`;
+            }
+            return checksOut;
+        }
+        return processBuildEnv(this.envVariables, mapper, confidenceCheck);
+    }
+}
+exports.ScmContextProviderV2 = ScmContextProviderV2;