@mablhq/mabl-cli 1.20.1 → 1.20.9

package/mablscript/diffing/diffingUtil.js

@@ -63,9 +63,7 @@ function flattenTestFlowsIntoSteps(flows, flowConfig) {
 }
 function flattenTestFlowsIntoLineDiffingFormat(flows, flowConfig) {
     const flattenedSteps = flattenTestFlowsIntoSteps(flows, flowConfig);
-    const diffingFormat = flattenedSteps
-        .map((step) => step.toLineDiffFormat())
-        .join('\n');
+    const diffingFormat = formatLineDiffString(flattenedSteps.map((step) => step.toLineDiffFormat()).join('\n'));
     return { flattenedSteps, diffingFormat };
 }
 exports.flattenTestFlowsIntoLineDiffingFormat = flattenTestFlowsIntoLineDiffingFormat;
@@ -112,13 +110,9 @@ exports.diffTests = diffTests;
 function diffFlows(flow1, flow2) {
     var _a, _b;
     const flow1Steps = (0, importer_1.parseMablScriptIntoSteps)(flow1);
-    const formattedFlow1Steps = flow1Steps
-        .map((step) => step.toLineDiffFormat())
-        .join('\n');
+    const formattedFlow1Steps = formatLineDiffString(flow1Steps.map((step) => step.toLineDiffFormat()).join('\n'));
     const flow2Steps = (0, importer_1.parseMablScriptIntoSteps)(flow2);
-    const formattedFlow2Steps = flow2Steps
-        .map((step) => step.toLineDiffFormat())
-        .join('\n');
+    const formattedFlow2Steps = formatLineDiffString(flow2Steps.map((step) => step.toLineDiffFormat()).join('\n'));
     const flattenedDiffs = lineModeDiff(formattedFlow1Steps, formattedFlow2Steps);
     const stepDiffs = convertDiffingFormatIntoDiffingSteps(flattenedDiffs, flow1Steps, flow2Steps);
     const parametersDiff = diffFlowVariables(flow1.parameters, flow2.parameters);
@@ -144,3 +138,9 @@ function flattenFlowVariables(flowVariables) {
     var _a;
     return ((_a = flowVariables === null || flowVariables === void 0 ? void 0 : flowVariables.sort((a, b) => a.name.localeCompare(b.name)).map((parameter) => (0, fast_json_stable_stringify_1.default)(parameter)).join('\n')) !== null && _a !== void 0 ? _a : '');
 }
+function formatLineDiffString(lineDiff) {
+    if (!lineDiff) {
+        return lineDiff;
+    }
+    return lineDiff + '\n';
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mablhq/mabl-cli",
-  "version": "1.20.1",
+  "version": "1.20.9",
   "license": "SEE LICENSE IN LICENSE.txt",
   "description": "The official mabl command line interface tool",
   "main": "index.js",
@@ -78,7 +78,7 @@
     "retry": "0.13.1",
     "sanitize-html": "2.3.3",
     "serve-handler": "6.1.3",
-    "socks-proxy-agent": "5.0.0",
+    "socks-proxy-agent": "6.1.1",
     "stoppable": "1.1.0",
     "strip-ansi": "6.0.0",
     "tmp-promise": "3.0.2",

package/providers/cliConfigProvider.js

@@ -78,7 +78,7 @@ async function getEncryptionKey() {
             }
         }
         catch (error) {
-            loggingProvider_1.logger.warn(`Couldn't access the system's key storage. Token renewal will be disabled.`);
+            loggingProvider_1.logger.warn(`Creating finite login session because login auto-renewal is unsupported on this system.`);
             isKeytarAvailable = false;
         }
     }

package/util/httpUtil.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.maybeGetModifiedAxiosConfigForHttpProxy = exports.proxyUrlToPortConfig = exports.axiosProxyConfig = exports.currentProxyConfig = exports.setAgentSslVerification = exports.EXECUTION_ENGINE_SSL_VERIFY = exports.USER_AGENT_HEADER = exports.USER_AGENT = void 0;
+exports.maybeGetModifiedAxiosConfigForHttpProxy = exports.proxyUrlToPortConfig = exports.axiosProxyConfig = exports.currentProxyConfig = exports.EXECUTION_ENGINE_SSL_VERIFY = exports.USER_AGENT_HEADER = exports.USER_AGENT = void 0;
 const cliConfigProvider_1 = require("../providers/cliConfigProvider");
 const https = __importStar(require("https"));
 const pureUtil_1 = require("./pureUtil");
@@ -31,10 +31,6 @@ const https_proxy_agent_1 = require("https-proxy-agent");
 exports.USER_AGENT = `${(0, pureUtil_1.getCliName)()}@${(0, pureUtil_1.getCliVersion)()}`;
 exports.USER_AGENT_HEADER = 'User-Agent';
 exports.EXECUTION_ENGINE_SSL_VERIFY = false;
-function setAgentSslVerification(agent, verifySsl) {
-    agent.options.rejectUnauthorized = verifySsl;
-}
-exports.setAgentSslVerification = setAgentSslVerification;
 async function currentProxyConfig() {
     return axiosProxyConfig((await cliConfigProvider_1.CliConfigProvider.getCliConfig()).http);
 }
@@ -47,8 +43,9 @@ function axiosProxyConfig(httpConfig) {
         },
     };
     if (!httpConfig.sslVerify) {
-        config.httpsAgent = new https.Agent();
-        setAgentSslVerification(config.httpsAgent, false);
+        config.httpsAgent = new https.Agent({
+            rejectUnauthorized: false,
+        });
     }
     if ((_a = httpConfig.proxyHost) === null || _a === void 0 ? void 0 : _a.href) {
         config.proxy = proxyUrlToPortConfig(httpConfig.proxyHost);