@mablhq/mabl-cli 1.58.20 → 1.58.25

package/functions/apiTest/utils.js

@@ -17,27 +17,26 @@ function createFileUploadDirectory(testContext) {
 }
 exports.createFileUploadDirectory = createFileUploadDirectory;
 function validateApiTestMessage(request, response) {
-    var _a, _b, _c;
     const authorizationHeader = request.get('authorization');
     if (authorizationHeader === undefined) {
         (0, utils_1.handleExecutionFailure)(response, 'Illegal authorization');
         return false;
     }
     const contentType = request.get('content-type');
-    if ((contentType === null || contentType === void 0 ? void 0 : contentType.toLowerCase()) !== 'application/json') {
+    if (contentType?.toLowerCase() !== 'application/json') {
         (0, utils_1.handleExecutionFailure)(response, 'Illegal content type. Must be application/json');
         return false;
     }
     const pubsubMessage = request.body;
-    if (typeof ((_a = pubsubMessage === null || pubsubMessage === void 0 ? void 0 : pubsubMessage.message) === null || _a === void 0 ? void 0 : _a.data) !== 'string') {
+    if (typeof pubsubMessage?.message?.data !== 'string') {
         (0, utils_1.handleExecutionFailure)(response, 'Illegal message data format');
         return false;
     }
-    if (typeof (pubsubMessage === null || pubsubMessage === void 0 ? void 0 : pubsubMessage.subscription) !== 'string') {
+    if (typeof pubsubMessage?.subscription !== 'string') {
         (0, utils_1.handleExecutionFailure)(response, 'Illegal message subscription format');
         return false;
     }
-    if (((_c = (_b = pubsubMessage === null || pubsubMessage === void 0 ? void 0 : pubsubMessage.message) === null || _b === void 0 ? void 0 : _b.attributes) === null || _c === void 0 ? void 0 : _c.test_type) !==
+    if (pubsubMessage?.message?.attributes?.test_type !==
         mablApi_1.TestTypeEnum.Api.toString()) {
         (0, utils_1.handleExecutionFailure)(response, 'Illegal test type');
         return false;

package/http/MablHttpAgent.js

@@ -48,16 +48,14 @@ class MablHttpAgent extends agent_base_1.Agent {
         return new MablHttpAgent(constructorParameters.httpAgent, constructorParameters.httpsAgent);
     }
     static async getConstructorParameters(httpAgent, httpsAgent) {
-        var _a, _b;
         const proxyConfig = await (0, axiosProxyConfig_1.currentProxyConfig)('test');
         return {
-            httpAgent: (_a = httpAgent !== null && httpAgent !== void 0 ? httpAgent : proxyConfig.httpAgent) !== null && _a !== void 0 ? _a : http_1.default.globalAgent,
-            httpsAgent: (_b = httpsAgent !== null && httpsAgent !== void 0 ? httpsAgent : proxyConfig.httpsAgent) !== null && _b !== void 0 ? _b : https.globalAgent,
+            httpAgent: httpAgent ?? proxyConfig.httpAgent ?? http_1.default.globalAgent,
+            httpsAgent: httpsAgent ?? proxyConfig.httpsAgent ?? https.globalAgent,
         };
     }
     callback(req, opts) {
-        var _a;
-        if ((_a = this.maybeGetFirstStringHeader(req, httpUtil_1.USER_AGENT_HEADER)) === null || _a === void 0 ? void 0 : _a.startsWith('PostmanRuntime/')) {
+        if (this.maybeGetFirstStringHeader(req, httpUtil_1.USER_AGENT_HEADER)?.startsWith('PostmanRuntime/')) {
             req.setHeader(httpUtil_1.USER_AGENT_HEADER, httpUtil_1.USER_AGENT);
         }
         return Promise.resolve(opts.secureEndpoint ? this.httpsAgent : this.httpAgent);
@@ -67,7 +65,7 @@ class MablHttpAgent extends agent_base_1.Agent {
         if (Array.isArray(value)) {
             return value[0].toString();
         }
-        return value === null || value === void 0 ? void 0 : value.toString();
+        return value?.toString();
     }
 }
 exports.MablHttpAgent = MablHttpAgent;

package/http/RequestSecurityError.js

@@ -7,7 +7,7 @@ class RequestSecurityError extends Error {
         this.isRequestSecurityError = true;
     }
     static isInstance(error) {
-        return (error === null || error === void 0 ? void 0 : error.isRequestSecurityError) || false;
+        return error?.isRequestSecurityError || false;
     }
 }
 exports.RequestSecurityError = RequestSecurityError;

package/http/axiosProxyConfig.js

@@ -31,11 +31,10 @@ const hpagent_1 = require("hpagent");
 const httpUtil_1 = require("./httpUtil");
 async function currentProxyConfig(mode = 'mabl') {
     const httpConfig = (await cliConfigProvider_1.CliConfigProvider.getCliConfig()).http;
-    return axiosProxyConfig(mode === 'test' ? httpConfig === null || httpConfig === void 0 ? void 0 : httpConfig.test : httpConfig === null || httpConfig === void 0 ? void 0 : httpConfig.mabl);
+    return axiosProxyConfig(mode === 'test' ? httpConfig?.test : httpConfig?.mabl);
 }
 exports.currentProxyConfig = currentProxyConfig;
 function axiosProxyConfig(httpConfig) {
-    var _a;
     const config = {
         headers: {
             [httpUtil_1.USER_AGENT_HEADER]: httpUtil_1.USER_AGENT,
@@ -46,7 +45,7 @@ function axiosProxyConfig(httpConfig) {
             rejectUnauthorized: false,
         });
     }
-    if ((_a = httpConfig.proxyHost) === null || _a === void 0 ? void 0 : _a.href) {
+    if (httpConfig.proxyHost?.href) {
         config.proxy = proxyUrlToPortConfig(httpConfig.proxyHost);
     }
     return maybeGetModifiedAxiosConfigForHttpProxy(config, httpConfig.sslVerify, httpConfig.proxyType);
@@ -79,9 +78,8 @@ function proxyUrlToPortConfig(proxyUrl) {
 }
 exports.proxyUrlToPortConfig = proxyUrlToPortConfig;
 function maybeGetModifiedAxiosConfigForHttpProxy(config, sslVerify, proxyType) {
-    var _a, _b;
     if (config.proxy &&
-        (((_a = config.proxy) === null || _a === void 0 ? void 0 : _a.protocol) === 'http:' || ((_b = config.proxy) === null || _b === void 0 ? void 0 : _b.protocol) === 'http')) {
+        (config.proxy?.protocol === 'http:' || config.proxy?.protocol === 'http')) {
         const newConfig = {
             ...config,
         };

package/http/httpUtil.js

@@ -39,14 +39,13 @@ function maybeGetSocksAgent(linkServer) {
     return new socks_proxy_agent_1.SocksProxyAgent(agentOptions);
 }
 function postProcessHeaders(response) {
-    var _a, _b, _c;
     const parsed = {};
-    const rawHeaders = (_b = (_a = response.request) === null || _a === void 0 ? void 0 : _a.res) === null || _b === void 0 ? void 0 : _b.rawHeaders;
+    const rawHeaders = response.request?.res?.rawHeaders;
     if (rawHeaders) {
         for (let i = 0; i + 1 < rawHeaders.length; i += 2) {
             const headerName = rawHeaders[i].toLowerCase();
             const headerValue = rawHeaders[i + 1];
-            parsed[headerName] = ((_c = parsed[headerName]) !== null && _c !== void 0 ? _c : []).concat(headerValue);
+            parsed[headerName] = (parsed[headerName] ?? []).concat(headerValue);
         }
     }
     return parsed;

package/http/requestInterceptor.js

@@ -22,10 +22,9 @@ function headerStringToHeaders(rawHeader) {
         .filter((value) => HEADER_EXTRACT_REGEXP.test(value))
         .map((value) => value.match(HEADER_EXTRACT_REGEXP).groups)
         .forEach(({ rawKey, value }) => {
-        var _a;
         const normalizedHeader = rawKey.toLowerCase().trim();
-        const values = (_a = headers[normalizedHeader]) !== null && _a !== void 0 ? _a : [];
-        if (value === null || value === void 0 ? void 0 : value.trim()) {
+        const values = headers[normalizedHeader] ?? [];
+        if (value?.trim()) {
             values.push(value.trim());
         }
         headers[normalizedHeader] = values;
@@ -34,12 +33,11 @@ function headerStringToHeaders(rawHeader) {
 }
 exports.headerStringToHeaders = headerStringToHeaders;
 function headerStringToProtocol(rawHeader) {
-    var _a, _b, _c;
     if (!rawHeader) {
         return;
     }
-    const firstRowTrimmed = (_b = (_a = rawHeader.split(/\r?\n/, 2)) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.trim();
-    return (_c = firstRowTrimmed === null || firstRowTrimmed === void 0 ? void 0 : firstRowTrimmed.match(/\s(\S+)$/)) === null || _c === void 0 ? void 0 : _c[1];
+    const firstRowTrimmed = rawHeader.split(/\r?\n/, 2)?.[0]?.trim();
+    return firstRowTrimmed?.match(/\s(\S+)$/)?.[1];
 }
 exports.headerStringToProtocol = headerStringToProtocol;
 function headerRecordToHeaderMultiMap(input) {
@@ -50,7 +48,7 @@ function headerRecordToHeaderMultiMap(input) {
     return result;
 }
 function handleRawResponseBody(body) {
-    body = body !== null && body !== void 0 ? body : '';
+    body = body ?? '';
     switch (typeof body) {
         case 'number':
             return { body: body.toString(), responseSize: 8 };
@@ -114,16 +112,15 @@ class RequestInterceptor {
         }
     }
     handleRequest(config) {
-        var _a, _b, _c;
         try {
             const requestId = (0, uuid_1.v4)();
             config.mablRequestId = requestId;
             const requestResponseChain = {
                 requestId,
                 request: {
-                    headers: (_a = config.headers) !== null && _a !== void 0 ? _a : {},
-                    url: (_b = config === null || config === void 0 ? void 0 : config.url) !== null && _b !== void 0 ? _b : '<Unknown URL>',
-                    method: (_c = config.method) === null || _c === void 0 ? void 0 : _c.toUpperCase(),
+                    headers: config.headers ?? {},
+                    url: config?.url ?? '<Unknown URL>',
+                    method: config.method?.toUpperCase(),
                     request_sent_time: Date.now(),
                 },
             };
@@ -144,7 +141,7 @@ class RequestInterceptor {
             const request = response.request;
             if (request) {
                 chainEntry.request.headers = headerStringToHeaders(request._header);
-                chainEntry.request.protocol = (request === null || request === void 0 ? void 0 : request._header)
+                chainEntry.request.protocol = request?._header
                     ? headerStringToProtocol(request._header)
                     : '<Unknown protocol>';
             }
@@ -154,7 +151,7 @@ class RequestInterceptor {
                 headers: headerRecordToHeaderMultiMap(response.headers),
                 status: response.status,
                 response_received_time: responseReceivedTime,
-                response_size: contentLength !== null && contentLength !== void 0 ? contentLength : responseSize,
+                response_size: contentLength ?? responseSize,
                 body,
             };
         }
@@ -164,7 +161,6 @@ class RequestInterceptor {
         return response;
     }
     handleError(error) {
-        var _a;
         try {
             const config = error.config;
             let chainEntry;
@@ -177,7 +173,7 @@ class RequestInterceptor {
             }
             if (chainEntry) {
                 chainEntry.error = {
-                    code: (_a = error.code) !== null && _a !== void 0 ? _a : httpUtil_1.GENERAL_API_STEP_EXECUTION_ERROR_CODE,
+                    code: error.code ?? httpUtil_1.GENERAL_API_STEP_EXECUTION_ERROR_CODE,
                     message: error.message,
                     error_received_time: Date.now(),
                 };