@mablhq/mabl-cli 1.48.7 → 1.48.26

package/commands/datatables/datatables_cmds/create.js

@@ -0,0 +1,148 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseCsvRows = exports.parseJsonRows = void 0;
+const path_1 = require("path");
+const mablApiClientFactory_1 = require("../../../api/mablApiClientFactory");
+const util_1 = require("../../commandUtil/util");
+const constants_1 = require("../../constants");
+const fs = __importStar(require("fs"));
+const csv_parser_1 = __importDefault(require("csv-parser"));
+const describe_1 = require("../../commandUtil/describe");
+const csvUtil_1 = require("../../../util/csvUtil");
+exports.command = `create <${constants_1.CommandArgInput}>`;
+exports.describe = 'Create a new mabl DataTable';
+exports.builder = (yargs) => {
+    yargs
+        .positional(constants_1.CommandArgInput, {
+        alias: 'file',
+        describe: 'Relative path file to create DataTable from',
+    })
+        .option(constants_1.CommandArgWorkspaceId, {
+        alias: constants_1.CommandArgAliases.WorkspaceId,
+        describe: `Workspace to create DataTable in`,
+        type: 'string',
+    })
+        .option(constants_1.CommandArgName, {
+        alias: 'table-name',
+        describe: `The name for your new DataTable`,
+        type: 'string',
+    })
+        .option(constants_1.CommandArgFormat, {
+        alias: 'fmt',
+        describe: `Specify the format of your input file`,
+        choices: [constants_1.OutputFormats.Json, constants_1.OutputFormats.Csv, undefined],
+    });
+};
+exports.handler = (0, util_1.failWrapper)(createDataTable);
+var AllowedExtensions;
+(function (AllowedExtensions) {
+    AllowedExtensions["Csv"] = ".csv";
+    AllowedExtensions["Json"] = ".json";
+})(AllowedExtensions || (AllowedExtensions = {}));
+async function createDataTable(parsed) {
+    const input = parsed.input;
+    const format = parsed.format || tryInferFormat(input);
+    const name = parsed.name || (0, path_1.basename)((0, path_1.resolve)(input));
+    const workspaceId = await (0, util_1.getWorkspaceId)(parsed);
+    let rows = [];
+    switch (format) {
+        case constants_1.OutputFormats.Json:
+            const jsonInput = fs.readFileSync(input, 'utf-8');
+            rows = parseJsonRows(jsonInput);
+            break;
+        case constants_1.OutputFormats.Csv:
+            const csvInput = [];
+            await new Promise((resolve) => {
+                fs.createReadStream(input)
+                    .pipe((0, csv_parser_1.default)())
+                    .on('data', (data) => csvInput.push(data))
+                    .on('end', () => resolve());
+            });
+            rows = parseCsvRows(csvInput);
+            break;
+        default:
+            throw Error(`${format} is not a valid option.`);
+    }
+    const options = {
+        prototype: {
+            name,
+            organization_id: workspaceId,
+        },
+        mappings: rows.map((datatableRow) => ({
+            scenario_id: datatableRow.scenario,
+            row: datatableRow.columns.map((column) => ({
+                name: column.name,
+                value: column.value,
+            })),
+        })),
+    };
+    const apiClient = await mablApiClientFactory_1.MablApiClientFactory.createApiClient();
+    const datatableRows = await apiClient.createDatatable(workspaceId, options);
+    (0, describe_1.outputEntity)(datatableRows, constants_1.OutputFormats.Json);
+}
+function tryInferFormat(input) {
+    const extension = (0, path_1.extname)(input);
+    switch (extension) {
+        case AllowedExtensions.Csv:
+            return constants_1.OutputFormats.Csv;
+        case AllowedExtensions.Json:
+            return constants_1.OutputFormats.Json;
+        default:
+            throw new Error('No format could be inferred, please specify a format for your input data.');
+    }
+}
+function parseJsonRows(input) {
+    const parsedJson = JSON.parse(input);
+    if (isDataTableRowArray(parsedJson)) {
+        return parsedJson;
+    }
+    throw Error('Json input was not formatted correctly');
+}
+exports.parseJsonRows = parseJsonRows;
+function isDataTableRowArray(arg) {
+    return (Array.isArray(arg) &&
+        arg.every((row) => typeof row.scenario === 'string' &&
+            Array.isArray(row.columns) &&
+            row.columns.every((col) => typeof col.name === 'string' && typeof col.value === 'string')));
+}
+function parseCsvRows(input) {
+    if (input.length === 0) {
+        return [];
+    }
+    return input.map((rows) => ({
+        scenario: (0, csvUtil_1.desanitizeCellOutput)(rows[constants_1.SCENARIO_NAME_HEADER]),
+        columns: Object.entries(rows)
+            .filter(([key, _]) => key !== constants_1.SCENARIO_NAME_HEADER)
+            .map(([key, value]) => ({
+            name: (0, csvUtil_1.desanitizeCellOutput)(key),
+            value: (0, csvUtil_1.desanitizeCellOutput)(value),
+        })),
+    }));
+}
+exports.parseCsvRows = parseCsvRows;

package/commands/datatables/datatables_cmds/export.js

@@ -8,7 +8,6 @@ const fileUtil_1 = require("../../commandUtil/fileUtil");
 const js_yaml_1 = require("js-yaml");
 const csvUtil_1 = require("../../../util/csvUtil");
 const sync_1 = require("csv-stringify/sync");
-const SCENARIO_NAME_HEADER = 'Scenario name';
 exports.command = `export <${constants_1.CommandArgId}>`;
 exports.describe = 'Export a mabl test in a specified file format';
 exports.builder = (yargs) => {
@@ -62,7 +61,7 @@ function dumpToCsv(datatableRows) {
         return '';
     }
     const headers = [
-        SCENARIO_NAME_HEADER,
+        constants_1.SCENARIO_NAME_HEADER,
         ...(datatableRows[0].row || []).map((variable) => (0, csvUtil_1.sanitizeCellInput)(variable.name || '')),
     ];
     output.push(headers);

package/commands/tests/testsUtil.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toBasicHttpAuthenticationCredentials = exports.logTestInfoIfPresent = exports.milliSecondsToSeconds = exports.calculateTotalTimeSeconds = exports.extractTestRunConfig = exports.pullDownTestRunConfig = exports.validateRunCommandWithLabels = exports.validateRunEditCommand = exports.cleanupTestResources = exports.sleep = exports.editTheTest = exports.runTheTest = exports.prepareTrainerForSplitPlayback = exports.cleanUpInitialPages = exports.getExtensionBackgroundPageWithCliTool = exports.createBrowserForExecutionEngine = exports.createBrowser = exports.getFinalUrl = void 0;
+exports.parseBrowserType = exports.toBasicHttpAuthenticationCredentials = exports.logTestInfoIfPresent = exports.milliSecondsToSeconds = exports.calculateTotalTimeSeconds = exports.extractTestRunConfig = exports.pullDownTestRunConfig = exports.validateRunCommandWithLabels = exports.validateRunEditCommand = exports.cleanupTestResources = exports.sleep = exports.editTheTest = exports.runTheTest = exports.prepareTrainerForSplitPlayback = exports.cleanUpInitialPages = exports.getExtensionBackgroundPageWithCliTool = exports.createBrowserForExecutionEngine = exports.createBrowser = exports.getFinalUrl = void 0;
 const cli_table3_1 = __importDefault(require("cli-table3"));
 const fs = __importStar(require("fs-extra"));
 const os = __importStar(require("os"));
@@ -39,6 +39,7 @@ const cliConfigProvider_1 = require("../../providers/cliConfigProvider");
 const loggingProvider_1 = require("../../providers/logging/loggingProvider");
 const fileUploadUtil_1 = require("../../util/fileUploadUtil");
 const logUtils_1 = require("../../util/logUtils");
+const browserTypes_1 = require("../browserTypes");
 const constants_1 = require("../constants");
 const trainerUtil_1 = require("./tests_cmds/trainerUtil");
 const chalk = require('chalk');
@@ -127,9 +128,11 @@ exports.createBrowser = createBrowser;
 async function createBrowserForExecutionEngine(engine, proxyInfo, options) {
     const userDataDir = await engine.prepareBrowserPreferencesDirectory(undefined, proxyInfo);
     const launchOptions = engine.getExecutionEngineBrowserLaunchOptions(options, proxyInfo);
+    const proxy = engine.getProxySpec(proxyInfo);
     const maybeBrowser = await maybeLaunchBrowser({
         ...options,
         ...launchOptions,
+        proxy,
         downloadPath: createDownloadDirectory(),
         userDataDir,
     });
@@ -469,3 +472,18 @@ function toBasicHttpAuthenticationCredentials(credentials) {
     };
 }
 exports.toBasicHttpAuthenticationCredentials = toBasicHttpAuthenticationCredentials;
+function parseBrowserType(browserType) {
+    switch (browserType) {
+        case 'edge':
+            return browserTypes_1.BrowserType.Edge;
+        case 'firefox':
+            return browserTypes_1.BrowserType.Firefox;
+        case 'chrome':
+            return browserTypes_1.BrowserType.Chrome;
+        case 'webkit':
+            return browserTypes_1.BrowserType.Webkit;
+        default:
+            return constants_1.DefaultBrowserType;
+    }
+}
+exports.parseBrowserType = parseBrowserType;

package/commands/tests/tests_cmds/run.js

@@ -7,7 +7,6 @@ const constants_1 = require("../../constants");
 const loggingProvider_1 = require("../../../providers/logging/loggingProvider");
 const mablApi_1 = require("../../../mablApi");
 const reporter_1 = require("../../../reporters/reporter");
-const browserTypes_1 = require("../../browserTypes");
 const execution_1 = require("../../../execution");
 const defaultEnv_1 = require("../../../env/defaultEnv");
 const chalk = require('chalk');
@@ -194,20 +193,7 @@ async function run(parsed) {
             extraHttpHeaders[headerParts[0].toLowerCase()] = headerParts[1];
         }
     });
-    let browserType;
-    switch (parsed[constants_1.CommandArgBrowser]) {
-        case 'edge':
-            browserType = browserTypes_1.BrowserType.Edge;
-            break;
-        case 'firefox':
-            browserType = browserTypes_1.BrowserType.Firefox;
-            break;
-        case 'chrome':
-            browserType = browserTypes_1.BrowserType.Chrome;
-            break;
-        default:
-            browserType = constants_1.DefaultBrowserType;
-    }
+    const browserType = (0, testsUtil_1.parseBrowserType)(parsed[constants_1.CommandArgBrowser]);
     const testRunnerConfig = {
         _cliCreated: true,
         basicAuthCredentialsId: parsed[constants_1.CommandArgBasicAuthCredentials],