@mablhq/mabl-cli 2.45.2 → 2.45.5

package/api/featureSet.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FeatureSet = exports.FindImplementationVersion = exports.PRIVATE_BETA_AI_ASSERTIONS_FEATURE_FLAG = exports.AI_ASSERTIONS_FEATURE_FLAG = exports.ADVANCED_AUTO_HEALING_FEATURE_FLAG = exports.GENERATIVE_AI_FEATURE_FLAG = void 0;
+exports.FeatureSet = exports.FindImplementationVersion = exports.AI_ASSERTIONS_FEATURE_FLAG = exports.ADVANCED_AUTO_HEALING_FEATURE_FLAG = exports.GENERATIVE_AI_FEATURE_FLAG = void 0;
 const types_1 = require("../browserLauncher/types");
 const ACCESSIBILITY_CHECK_FEATURE_FLAG = 'accessibility_checks';
 const PERFORMANCE_TESTING_FEATURE_FLAG = 'performance_testing';
@@ -8,7 +8,6 @@ const SMARTER_WAIT_FEATURE_FLAG = 'smarter_wait';
 exports.GENERATIVE_AI_FEATURE_FLAG = 'generative_ai';
 exports.ADVANCED_AUTO_HEALING_FEATURE_FLAG = 'advanced_auto_healing';
 exports.AI_ASSERTIONS_FEATURE_FLAG = 'ai_assertion_steps';
-exports.PRIVATE_BETA_AI_ASSERTIONS_FEATURE_FLAG = 'ai_assertions';
 var FindImplementationVersion;
 (function (FindImplementationVersion) {
     FindImplementationVersion[FindImplementationVersion["V1"] = 0] = "V1";
@@ -35,9 +34,6 @@ class FeatureSet {
     hasAiAssertions() {
         return this.featureFlags.has(exports.AI_ASSERTIONS_FEATURE_FLAG);
     }
-    hasPrivateBetaAiAssertions() {
-        return this.featureFlags.has(exports.PRIVATE_BETA_AI_ASSERTIONS_FEATURE_FLAG);
-    }
     allowGenerativeAi() {
         return this.featureFlags.has(exports.GENERATIVE_AI_FEATURE_FLAG);
     }

package/api/mablApiClient.js

@@ -418,7 +418,8 @@ class MablApiClient extends basicApiClient_1.BasicApiClient {
             throw toApiError(`Failed to get Flows`, error);
         }
     }
-    async getSnippet(snippetId, preferLatestIfReusable, workspaceId) {
+    async getSnippet(snippetId, isQuery, preferLatestIfReusable, workspaceId) {
+        const entity = isQuery ? 'query' : 'snippet';
         try {
             const queryParameter = typeof preferLatestIfReusable === 'boolean'
                 ? `?=preferLatestIfReusable=${preferLatestIfReusable}`
@@ -426,9 +427,9 @@ class MablApiClient extends basicApiClient_1.BasicApiClient {
             return await this.makeGetRequest(`${this.baseApiUrl}/snippets/${snippetId}${queryParameter}`);
         }
         catch (error) {
-            throw toApiError(`Failed to get Snippet [${snippetId}]. ${workspaceId
-                ? `The Snippet was likely deleted. To recover this snippet, visit the activity feed [workspaces/${workspaceId}/settings/activity-log?activityLogEntity=snippet&activityLogEvent=delete]`
-                : 'The Snippet was likely deleted. To recover this snippet, visit the activity feed.'}`, error);
+            throw toApiError(`Failed to get ${entity} [${snippetId}]. ${workspaceId
+                ? `The ${entity} was likely deleted. To recover this ${entity}, visit the activity feed [workspaces/${workspaceId}/settings/activity-log?activityLogEntity=${entity}&activityLogEvent=delete]`
+                : `The ${entity} was likely deleted. To recover this ${entity}, visit the activity feed.`}`, error);
         }
     }
     async getBranchById(branchId) {

package/core/execution/ApiTestUtils.js

@@ -3,8 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createEmptyRequestEventArray = exports.splitLines = exports.PRE_REQUEST_LISTEN = exports.convertMablAssertionsToExecArray = exports.convertMablVariableAssignmentsToExecArray = exports.createMablGeneratedScripts = exports.insertMablAssertionScripts = exports.toPostmanScript = exports.replaceVariables = exports.getActualValue = exports.readBody = exports.getResponseContentType = exports.valueToUnquotedString = exports.assertionTypeSupportsCaseSensitivity = exports.assertionTargetSupportsCaseSensitivity = exports.humanizeAssertion = exports.getAssertionTargetArgument = exports.assertionHasTest = exports.isValidMablAssertion = exports.normalizeExpectedValue = exports.assertionRequiresValue = exports.filterValidMablAssertions = exports.filterValidMablVariableAssignments = exports.isValidMablVariableAssignment = exports.removeMablGeneratedScripts = exports.createEmptyRequestEvent = exports.findFirstMatchingEvent = exports.restoreCustomRequestFields = exports.deduplicateApiTestExecutionResults = exports.createEmptyVariable = exports.createEmptyAssertion = exports.humanizeAssertionType = exports.getAssertionTypesForTarget = exports.caseInsensitiveEquals = exports.compareStringsCaseInsensitive = exports.ASSERT_TYPES = exports.ASSERT_TARGETS = exports.COLLECTION_WITH_FOLDERS_ERROR = exports.HMAC_SHA1_SIGNATURE = exports.DEFAULT_ADD_OAUTH1_TO_HEADER_VALUE = exports.DEFAULT_OAUTH1_VERSION = exports.OAUTH1_AUTH = exports.NO_AUTH = exports.BEARER_TOKEN_AUTH = exports.BASIC_AUTH = exports.API_KEY_AUTH = exports.INHERIT_AUTH_FROM_PARENT_VALUE = exports.MABL_GENERATED_COMMENT = exports.MABL_GENERATED_ASSERTION_TOKEN = exports.TEST_LISTEN = void 0;
-exports.uuid = exports.createCommentForApiTestSnippet = exports.convertMablSnippetsToExecArray = exports.createPostmanScript = exports.insertMablScriptsIntoCollection = exports.processPostmanItem = exports.replaceRawScriptWithExecArray = exports.removeInvalidHeaders = exports.processItemAuth = exports.mablAuthToPostman = exports.formatContent = exports.getRequestMode = exports.getFormDataArray = exports.isText = exports.isXML = exports.isJson = exports.isSupportedAuthType = exports.isItemDefinition = exports.isCollectionDefinition = exports.isItemGroupDefinition = exports.isFolder = exports.validateCollectionFeaturesForApiTestEditor = exports.generateRawScriptField = exports.processPostmanItems = exports.createEmptyRequest = void 0;
+exports.PRE_REQUEST_LISTEN = exports.convertMablAssertionsToExecArray = exports.convertMablVariableAssignmentsToExecArray = exports.createMablGeneratedScripts = exports.insertMablAssertionScripts = exports.toPostmanScript = exports.replaceVariables = exports.getActualValue = exports.readBody = exports.getResponseContentType = exports.valueToUnquotedString = exports.assertionTypeSupportsCaseSensitivity = exports.assertionTargetSupportsCaseSensitivity = exports.humanizeAssertion = exports.getAssertionTargetArgument = exports.assertionHasTest = exports.isValidMablAssertion = exports.normalizeRegExpExpectedValue = exports.normalizeExpectedValue = exports.normalizeAssertionValue = exports.assertionRequiresValue = exports.filterValidMablAssertions = exports.filterValidMablVariableAssignments = exports.isValidMablVariableAssignment = exports.removeMablGeneratedScripts = exports.createEmptyRequestEvent = exports.findFirstMatchingEvent = exports.restoreCustomRequestFields = exports.deduplicateApiTestExecutionResults = exports.createEmptyVariable = exports.createEmptyAssertion = exports.humanizeAssertionType = exports.getAssertionTypesForTarget = exports.caseInsensitiveEquals = exports.compareStringsCaseInsensitive = exports.ASSERT_TYPES = exports.ASSERT_TARGETS = exports.COLLECTION_WITH_FOLDERS_ERROR = exports.HMAC_SHA1_SIGNATURE = exports.DEFAULT_ADD_OAUTH1_TO_HEADER_VALUE = exports.DEFAULT_OAUTH1_VERSION = exports.OAUTH1_AUTH = exports.NO_AUTH = exports.BEARER_TOKEN_AUTH = exports.BASIC_AUTH = exports.API_KEY_AUTH = exports.INHERIT_AUTH_FROM_PARENT_VALUE = exports.MABL_GENERATED_COMMENT = exports.MABL_GENERATED_ASSERTION_TOKEN = exports.TEST_LISTEN = void 0;
+exports.uuid = exports.createCommentForApiTestSnippet = exports.convertMablSnippetsToExecArray = exports.createPostmanScript = exports.insertMablScriptsIntoCollection = exports.processPostmanItem = exports.replaceRawScriptWithExecArray = exports.removeInvalidHeaders = exports.processItemAuth = exports.mablAuthToPostman = exports.formatContent = exports.getRequestMode = exports.getFormDataArray = exports.isText = exports.isXML = exports.isJson = exports.isSupportedAuthType = exports.isItemDefinition = exports.isCollectionDefinition = exports.isItemGroupDefinition = exports.isFolder = exports.validateCollectionFeaturesForApiTestEditor = exports.generateRawScriptField = exports.processPostmanItems = exports.createEmptyRequest = exports.createEmptyRequestEventArray = exports.splitLines = void 0;
 const newman_types_1 = require("./newman-types");
 const lodash_1 = __importDefault(require("lodash"));
 const uuid_1 = require("uuid");
@@ -266,6 +266,15 @@ function assertionRequiresValue(assertion) {
     }
 }
 exports.assertionRequiresValue = assertionRequiresValue;
+function normalizeAssertionValue(assertion) {
+    switch (assertion.assertType) {
+        case 'MatchesRegExp':
+            return normalizeRegExpExpectedValue(assertion.value);
+        default:
+            return normalizeExpectedValue(assertion.value);
+    }
+}
+exports.normalizeAssertionValue = normalizeAssertionValue;
 function normalizeExpectedValue(value) {
     if (value === undefined) {
         return;
@@ -281,27 +290,38 @@ function normalizeExpectedValue(value) {
     return `pm.variables.replaceIn(${JSON.stringify(value)})`;
 }
 exports.normalizeExpectedValue = normalizeExpectedValue;
+function normalizeRegExpExpectedValue(value) {
+    if (value === undefined) {
+        return;
+    }
+    value = value.trim();
+    if (value.match(/^\/.*\/[a-z]*$/)) {
+        return value;
+    }
+    return `new RegExp(${JSON.stringify(value)})`;
+}
+exports.normalizeRegExpExpectedValue = normalizeRegExpExpectedValue;
 function isValidMablAssertion(assertion) {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e;
     if (!assertion.assertType) {
         return false;
     }
     const assertTarget = assertion.assertTarget;
     const requiresValue = assertionRequiresValue(assertion);
-    const expectedValue = normalizeExpectedValue(assertion.value);
-    const hasExpectedValue = ((_a = expectedValue === null || expectedValue === void 0 ? void 0 : expectedValue.length) !== null && _a !== void 0 ? _a : 0) > 0;
+    const expectedValue = normalizeAssertionValue(assertion);
+    const hasExpectedValue = !!expectedValue;
     const hasRequiredValue = !requiresValue || hasExpectedValue;
     let valid = false;
     switch (assertTarget) {
         case 'JSONBody':
-            const hasBodyPath = ((_d = (_c = (_b = assertion.bodyPath) === null || _b === void 0 ? void 0 : _b.trim()) === null || _c === void 0 ? void 0 : _c.length) !== null && _d !== void 0 ? _d : 0) > 0;
+            const hasBodyPath = ((_c = (_b = (_a = assertion.bodyPath) === null || _a === void 0 ? void 0 : _a.trim()) === null || _b === void 0 ? void 0 : _b.length) !== null && _c !== void 0 ? _c : 0) > 0;
             valid = hasBodyPath && hasRequiredValue;
             break;
         case 'Status':
             valid = hasExpectedValue;
             break;
         case 'Header':
-            const hasHeaderName = ((_f = (_e = assertion.headerName) === null || _e === void 0 ? void 0 : _e.length) !== null && _f !== void 0 ? _f : 0) > 0;
+            const hasHeaderName = ((_e = (_d = assertion.headerName) === null || _d === void 0 ? void 0 : _d.length) !== null && _e !== void 0 ? _e : 0) > 0;
             valid = hasHeaderName && hasRequiredValue;
             break;
         case 'Size':
@@ -372,7 +392,7 @@ function generateAssertionScript(assertion) {
     const assertType = assertion.assertType;
     const description = humanizeAssertion(assertion);
     const requiresValue = assertionRequiresValue(assertion);
-    const expectedValue = normalizeExpectedValue(assertion.value);
+    const expectedValue = normalizeAssertionValue(assertion);
     const caseSensitive = assertion.caseSensitive !== false;
     switch (assertTarget) {
         case 'JSONBody':
@@ -408,9 +428,6 @@ function generateJsonBodyAssertion(description, assertType, requiresValues, path
     if (requiresValues) {
         propertyAccessor = valueToUnquotedString(propertyAccessor);
     }
-    if (assertType === newman_types_1.AssertionType.MatchesRegExp) {
-        expectedValue = `new RegExp(${expectedValue})`;
-    }
     return generatePostmanAssertion(description, propertyAccessor, assertType, expectedValue, caseSensitive);
 }
 function generateJsonBodyVariableAssignment(variableName, path) {
@@ -448,6 +465,7 @@ function generateStatusAssertion(description, assertType, expectedValue) {
         case 'DoesNotContain':
         case 'StartsWith':
         case 'EndsWith':
+        case 'MatchesRegExp':
             target += '.toString()';
             break;
         case 'GreaterThan':
@@ -456,10 +474,6 @@ function generateStatusAssertion(description, assertType, expectedValue) {
         case 'LessThanOrEqualTo':
             expectedValue = `parseInt(${expectedValue})`;
             break;
-        case 'MatchesRegExp':
-            target += '.toString()';
-            expectedValue = `new RegExp(${expectedValue})`;
-            break;
         default:
             throw new Error(`Unexpected status assert type: ${assertType}`);
     }
@@ -484,9 +498,7 @@ function generateHeaderAssertion(description, assertType, headerName, expectedVa
         case 'DoesNotContain':
         case 'StartsWith':
         case 'EndsWith':
-            break;
         case 'MatchesRegExp':
-            expectedValue = `new RegExp(${expectedValue})`;
             break;
         case 'GreaterThan':
         case 'GreaterThanOrEqualTo':
@@ -502,10 +514,7 @@ function generateSizeAssertion(description, target, type, expectedValue) {
     if (!(expectedValue === null || expectedValue === void 0 ? void 0 : expectedValue.length)) {
         return;
     }
-    if (type === newman_types_1.AssertionType.MatchesRegExp) {
-        expectedValue = `new RegExp(${expectedValue})`;
-    }
-    else {
+    if (type !== newman_types_1.AssertionType.MatchesRegExp) {
         expectedValue = `parseInt(${expectedValue})`;
     }
     return generateSimpleAssertion(description, target, type, expectedValue);