@memlab/cli 1.0.25 → 1.0.26

package/dist/commands/heap/DiffLeakCommand.d.ts

@@ -13,7 +13,7 @@ import type { CheckLeakCommandOptions } from './CheckLeakCommand';
 import BaseCommand, { CommandCategory } from '../../BaseCommand';
 export declare type WorkDirSettings = {
     controlWorkDirs: Array<string>;
-    treatmentWorkDir: string;
+    treatmentWorkDirs: Array<string>;
 };
 export default class CheckLeakCommand extends BaseCommand {
     private isMLClustering;

package/dist/commands/heap/DiffLeakCommand.js

@@ -103,30 +103,30 @@ class CheckLeakCommand extends BaseCommand_1.default {
         var _a, _b;
         // double check parameters
         if (!((_a = options.configFromOptions) === null || _a === void 0 ? void 0 : _a.controlWorkDirs) ||
-            !((_b = options.configFromOptions) === null || _b === void 0 ? void 0 : _b.treatmentWorkDir)) {
+            !((_b = options.configFromOptions) === null || _b === void 0 ? void 0 : _b.treatmentWorkDirs)) {
             core_1.info.error('Please specify control and test working directory');
             throw core_1.utils.haltOrThrow('No control or test working directory specified');
         }
         // get parameters
         const controlWorkDirs = options.configFromOptions['controlWorkDirs'];
-        const treatmentWorkDir = options.configFromOptions['treatmentWorkDir'];
+        const treatmentWorkDirs = options.configFromOptions['treatmentWorkDirs'];
         return {
             controlWorkDirs,
-            treatmentWorkDir,
+            treatmentWorkDirs,
         };
     }
     run(options) {
         return __awaiter(this, void 0, void 0, function* () {
             core_1.config.chaseWeakMapEdge = false;
-            const { controlWorkDirs, treatmentWorkDir } = this.getWorkDirs(options);
+            const { controlWorkDirs, treatmentWorkDirs } = this.getWorkDirs(options);
             const { runMetaInfoManager } = core_1.runInfoUtils;
             runMetaInfoManager.setConfigFromRunMeta({
-                workDir: treatmentWorkDir,
+                workDir: treatmentWorkDirs[0],
                 silentFail: true,
             });
             // diff memory leaks
             this.useDefaultMLClusteringSetting(options.cliArgs);
-            yield core_1.analysis.diffLeakByWorkDir({ controlWorkDirs, treatmentWorkDir });
+            yield core_1.analysis.diffLeakByWorkDir({ controlWorkDirs, treatmentWorkDirs });
             this.restoreDefaultMLClusteringSetting(options.cliArgs);
         });
     }

package/dist/lib/CLIUtils.js

@@ -39,6 +39,19 @@ function filterAndGetUndefinedArgs(cliArgs) {
     return ret;
 }
 exports.filterAndGetUndefinedArgs = filterAndGetUndefinedArgs;
+function quoteIfNecessary(v) {
+    if (typeof v !== 'string') {
+        return v;
+    }
+    // if the string contains any whitespace character
+    if (/\s/.test(v)) {
+        // escape any existing " character
+        v = v.replace(/"/g, '\\"');
+        // wrap the string with "
+        v = `"${v}"`;
+    }
+    return v;
+}
 function argsToString(args) {
     let ret = '';
     for (const optionName of Object.keys(args)) {
@@ -51,11 +64,11 @@ function argsToString(args) {
         }
         else if (Array.isArray(value)) {
             value.forEach(v => {
-                ret += `--${optionName}=${v} `;
+                ret += `--${optionName}=${quoteIfNecessary(v)} `;
             });
         }
         else {
-            ret += `--${optionName}=${value} `;
+            ret += `--${optionName}=${quoteIfNecessary(value)} `;
         }
     }
     return ret.trim();

package/dist/options/experiment/ExperimentOptionUtils.d.ts

@@ -0,0 +1,13 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @format
+ * @oncall web_perf_infra
+ */
+import type { ParsedArgs } from 'minimist';
+import type { Nullable } from '@memlab/core';
+export declare function extractAndCheckWorkDirs(optionName: string, args: ParsedArgs): Nullable<string[]>;
+//# sourceMappingURL=ExperimentOptionUtils.d.ts.map

package/dist/options/experiment/ExperimentOptionUtils.js

@@ -0,0 +1,39 @@
+"use strict";
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @format
+ * @oncall web_perf_infra
+ */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.extractAndCheckWorkDirs = void 0;
+const fs_1 = __importDefault(require("fs"));
+const core_1 = require("@memlab/core");
+function extractAndCheckWorkDirs(optionName, args) {
+    let dirs = [];
+    const flagValue = args[optionName];
+    if (!flagValue) {
+        return null;
+    }
+    if (Array.isArray(flagValue)) {
+        dirs = flagValue;
+    }
+    else {
+        dirs = [flagValue];
+    }
+    for (const dir of dirs) {
+        if (fs_1.default.existsSync(dir)) {
+            core_1.fileManager.createDefaultVisitOrderMetaFile({
+                workDir: dir,
+            });
+        }
+    }
+    return dirs;
+}
+exports.extractAndCheckWorkDirs = extractAndCheckWorkDirs;

package/dist/options/experiment/SetControlWorkDirOption.d.ts

@@ -13,8 +13,7 @@ import { BaseOption } from '@memlab/core';
 export default class SetControlWorkDirOption extends BaseOption {
     getOptionName(): string;
     getDescription(): string;
-    protected extractAndCheckWorkDirs(args: ParsedArgs): Nullable<string[]>;
-    parse(config: MemLabConfig, args: ParsedArgs): Promise<{
+    parse(_config: MemLabConfig, args: ParsedArgs): Promise<{
         controlWorkDirs?: Nullable<string[]>;
     }>;
 }

package/dist/options/experiment/SetControlWorkDirOption.js

@@ -21,9 +21,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const fs_1 = __importDefault(require("fs"));
 const core_1 = require("@memlab/core");
 const OptionConstant_1 = __importDefault(require("../lib/OptionConstant"));
+const ExperimentOptionUtils_1 = require("./ExperimentOptionUtils");
 class SetControlWorkDirOption extends core_1.BaseOption {
     getOptionName() {
         return OptionConstant_1.default.optionNames.CONTROL_WORK_DIR;
@@ -31,31 +31,9 @@ class SetControlWorkDirOption extends core_1.BaseOption {
     getDescription() {
         return 'set the working directory of the control run';
     }
-    extractAndCheckWorkDirs(args) {
-        let dirs = [];
-        const name = this.getOptionName();
-        const flagValue = args[name];
-        if (!flagValue) {
-            return null;
-        }
-        if (Array.isArray(flagValue)) {
-            dirs = flagValue;
-        }
-        else {
-            dirs = [flagValue];
-        }
-        for (const dir of dirs) {
-            if (fs_1.default.existsSync(dir)) {
-                core_1.fileManager.createDefaultVisitOrderMetaFile({
-                    workDir: dir,
-                });
-            }
-        }
-        return dirs;
-    }
-    parse(config, args) {
+    parse(_config, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const dirs = this.extractAndCheckWorkDirs(args);
+            const dirs = (0, ExperimentOptionUtils_1.extractAndCheckWorkDirs)(this.getOptionName(), args);
             return { controlWorkDirs: dirs };
         });
     }

package/dist/options/experiment/SetTreatmentWorkDirOption.d.ts

@@ -8,13 +8,13 @@
  * @oncall web_perf_infra
  */
 import type { ParsedArgs } from 'minimist';
-import type { MemLabConfig } from '@memlab/core';
+import type { MemLabConfig, Nullable } from '@memlab/core';
 import { BaseOption } from '@memlab/core';
 export default class SetTreatmentWorkDirOption extends BaseOption {
     getOptionName(): string;
     getDescription(): string;
     parse(config: MemLabConfig, args: ParsedArgs): Promise<{
-        treatmentWorkDir?: string;
+        treatmentWorkDirs?: Nullable<string[]>;
     }>;
 }
 //# sourceMappingURL=SetTreatmentWorkDirOption.d.ts.map

package/dist/options/experiment/SetTreatmentWorkDirOption.js

@@ -21,29 +21,20 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const fs_1 = __importDefault(require("fs"));
 const core_1 = require("@memlab/core");
 const OptionConstant_1 = __importDefault(require("../lib/OptionConstant"));
+const ExperimentOptionUtils_1 = require("./ExperimentOptionUtils");
 class SetTreatmentWorkDirOption extends core_1.BaseOption {
     getOptionName() {
         return OptionConstant_1.default.optionNames.TREATMENT_WORK_DIR;
     }
     getDescription() {
-        return 'set the working directory of the test (treatment) run';
+        return 'set the working directory of the treatment run';
     }
     parse(config, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const name = this.getOptionName();
-            const ret = {};
-            if (args[name]) {
-                ret.treatmentWorkDir = args[name];
-                if (fs_1.default.existsSync(ret.treatmentWorkDir)) {
-                    core_1.fileManager.createDefaultVisitOrderMetaFile({
-                        workDir: ret.treatmentWorkDir,
-                    });
-                }
-            }
-            return ret;
+            const dirs = (0, ExperimentOptionUtils_1.extractAndCheckWorkDirs)(this.getOptionName(), args);
+            return { treatmentWorkDirs: dirs };
         });
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@memlab/cli",
-  "version": "1.0.25",
+  "version": "1.0.26",
   "license": "MIT",
   "description": "command line interface for memlab",
   "author": "Liang Gong <lgong@fb.com>",