@lage-run/cli 0.5.4 → 0.5.6

package/CHANGELOG.json

@@ -2,7 +2,49 @@
   "name": "@lage-run/cli",
   "entries": [
     {
-      "date": "Tue, 06 Dec 2022 00:47:50 GMT",
+      "date": "Thu, 08 Dec 2022 00:49:16 GMT",
+      "tag": "@lage-run/cli_v0.5.6",
+      "version": "0.5.6",
+      "comments": {
+        "patch": [
+          {
+            "author": "kchau@microsoft.com",
+            "package": "@lage-run/cli",
+            "commit": "ad281dfe8b222d949130821828a680d1c3625154",
+            "comment": "sets the default to progress"
+          },
+          {
+            "author": "beachball",
+            "package": "@lage-run/cli",
+            "comment": "Bump @lage-run/scheduler to v0.7.2",
+            "commit": "ad281dfe8b222d949130821828a680d1c3625154"
+          },
+          {
+            "author": "beachball",
+            "package": "@lage-run/cli",
+            "comment": "Bump @lage-run/reporters to v0.2.43",
+            "commit": "ad281dfe8b222d949130821828a680d1c3625154"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Tue, 06 Dec 2022 23:28:12 GMT",
+      "tag": "@lage-run/cli_v0.5.5",
+      "version": "0.5.5",
+      "comments": {
+        "patch": [
+          {
+            "author": "beachball",
+            "package": "@lage-run/cli",
+            "comment": "Bump @lage-run/reporters to v0.2.42",
+            "commit": "d0ad44eb759503c5642badc5210daf5028886a7c"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Tue, 06 Dec 2022 00:48:02 GMT",
       "tag": "@lage-run/cli_v0.5.4",
       "version": "0.5.4",
       "comments": {

package/CHANGELOG.md

@@ -1,12 +1,30 @@
 # Change Log - @lage-run/cli
 
-This log was last generated on Tue, 06 Dec 2022 00:47:50 GMT and should not be manually modified.
+This log was last generated on Thu, 08 Dec 2022 00:49:16 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 0.5.6
+
+Thu, 08 Dec 2022 00:49:16 GMT
+
+### Patches
+
+- sets the default to progress (kchau@microsoft.com)
+- Bump @lage-run/scheduler to v0.7.2
+- Bump @lage-run/reporters to v0.2.43
+
+## 0.5.5
+
+Tue, 06 Dec 2022 23:28:12 GMT
+
+### Patches
+
+- Bump @lage-run/reporters to v0.2.42
+
 ## 0.5.4
 
-Tue, 06 Dec 2022 00:47:50 GMT
+Tue, 06 Dec 2022 00:48:02 GMT
 
 ### Patches
 

package/lib/cli.js

@@ -3,18 +3,25 @@ Object.defineProperty(exports, "__esModule", {
     value: true
 });
 const _commander = require("commander");
-const _run = require("./commands/run");
-const _cache = require("./commands/cache");
+const _indexJs = require("./commands/run/index.js");
+const _indexJs1 = require("./commands/cache/index.js");
+const _errorsJs = require("./types/errors.js");
 async function main() {
     const program = new _commander.Command();
-    program.addCommand(_run.runCommand, {
+    program.addCommand(_indexJs.runCommand, {
         isDefault: true
     });
-    program.addCommand(_cache.cacheCommand);
+    program.addCommand(_indexJs1.cacheCommand);
     await program.parseAsync(process.argv);
 }
 main().catch((err)=>{
-    // eslint-disable-next-line no-console
-    console.error(err);
-    process.exitCode = 1;
+    /* eslint-disable no-console */ switch(err){
+        case _errorsJs.NoTargetFoundError:
+            console.log("lage: no targets found that matches the given scope.");
+            break;
+        default:
+            console.error(err);
+            break;
+    }
+    /* eslint-enable no-console */ process.exitCode = 1;
 });

package/lib/commands/addLoggerOptions.js

@@ -8,7 +8,8 @@ Object.defineProperty(exports, "addLoggerOptions", {
 });
 const _commander = require("commander");
 function addLoggerOptions(program) {
-    return program.option("--reporter <reporter...>", "reporter", "npmLog").addOption(new _commander.Option("--progress").conflicts("--reporter")).addOption(new _commander.Option("--log-level <level>", "log level").choices([
+    const isCI = process.env.CI || process.env.TF_BUILD;
+    return program.option("--reporter <reporter...>", "reporter", "npmLog").addOption(new _commander.Option("--progress").conflicts("--reporter").default(!isCI)).addOption(new _commander.Option("--log-level <level>", "log level").choices([
         "info",
         "warn",
         "error",

package/lib/commands/run/action.d.ts

@@ -16,6 +16,7 @@ interface RunOptions extends ReporterInitOptions {
     ignore: string[];
     unstableWatch: boolean;
     maxWorkersPerTask: string[];
+    allowNoTargetRuns: boolean;
 }
 export declare function action(options: RunOptions, command: Command): Promise<void>;
 export {};

package/lib/commands/run/createProfileReporter.js

@@ -10,7 +10,7 @@ const _reporters = require("@lage-run/reporters");
 function createProfileReporter(options) {
     const { concurrency , profile  } = options;
     return new _reporters.ChromeTraceEventsReporter({
-        concurrency: concurrency,
+        concurrency,
         outputFile: typeof profile === "string" ? profile : undefined
     });
 }

package/lib/commands/run/index.js

@@ -7,24 +7,12 @@ Object.defineProperty(exports, "runCommand", {
     get: ()=>runCommand
 });
 const _commander = require("commander");
-const _os = /*#__PURE__*/ _interopRequireDefault(require("os"));
 const _actionJs = require("./action.js");
 const _addLoggerOptionsJs = require("../addLoggerOptions.js");
 const _isRunningFromCIJs = require("../isRunningFromCI.js");
-function _interopRequireDefault(obj) {
-    return obj && obj.__esModule ? obj : {
-        default: obj
-    };
-}
 const runCommand = new _commander.Command("run");
-(0, _addLoggerOptionsJs.addLoggerOptions)(runCommand).action(_actionJs.action).option("-c, --concurrency <n>", "concurrency", (value)=>{
-    if (value.endsWith("%")) {
-        return parseInt(value.slice(0, -1)) / 100 * _os.default.cpus().length;
-    } else {
-        return parseInt(value) || _os.default.cpus().length - 1;
-    }
-}, _os.default.cpus().length - 1).option("--max-workers-per-task <maxWorkersPerTarget...>", "set max worker per task, e.g. --max-workers-per-task build=2 test=4", [])// Common Options
-.option("--scope <scope...>", "scopes the run to a subset of packages (by default, includes the dependencies and dependents as well)").option("--no-deps|--no-dependents", "disables running any dependents of the scoped packages").option("--include-dependencies|--dependencies", 'adds the scoped packages dependencies as the "entry points" for the target graph run').option("--since <since>", "only runs packages that have changed since the given commit, tag, or branch").option("--to <scope...>", "runs up to a package (shorthand for --scope=<scope...> --no-dependents)")// Run Command Options
+(0, _addLoggerOptionsJs.addLoggerOptions)(runCommand).action(_actionJs.action).option("-c, --concurrency <n>", "concurrency", (value)=>parseInt(value, 10)).option("--max-workers-per-task <maxWorkersPerTarget...>", "set max worker per task, e.g. --max-workers-per-task build=2 test=4", [])// Common Options
+.option("--scope <scope...>", "scopes the run to a subset of packages (by default, includes the dependencies and dependents as well)").option("--no-deps|--no-dependents", "disables running any dependents of the scoped packages").option("--include-dependencies|--dependencies", 'adds the scoped packages dependencies as the "entry points" for the target graph run').option("--since <since>", "only runs packages that have changed since the given commit, tag, or branch").option("--to <scope...>", "runs up to a package (shorthand for --scope=<scope...> --no-dependents)").option("--allow-no-target-runs")// Run Command Options
 .option("--grouped", "groups the logs", false).option("--no-cache", "disables the cache").option("--reset-cache", "resets the cache, filling it after a run").option("--skip-local-cache", "skips caching locally (defaults to true in CI environments)", _isRunningFromCIJs.isRunningFromCI).option("--profile [profile]", "writes a run profile into a file that can be processed by Chromium devtool").option("--ignore <ignore...>", "ignores files when calculating the scope with `--since` in addition to the files specified in lage.config", []).option("--nodearg|--node-arg <nodeArg>", 'arguments to be passed to node (e.g. --nodearg="--max_old_space_size=1234 --heap-prof" - set via "NODE_OPTIONS" environment variable').option("--continue", "continues the run even on error").option("--unstable-watch", "runs in watch mode").allowUnknownOption(true).addHelpCommand("[run] command1 [command2...commandN] [options]", "run commands").addHelpText("after", `
 Runs a set of commands in a target graph. The targets are defined by packages and their scripts as defined the package.json files.
 

package/lib/commands/run/runAction.d.ts

@@ -15,6 +15,7 @@ interface RunOptions extends ReporterInitOptions {
     resetCache: boolean;
     nodeArg: string;
     ignore: string[];
+    allowNoTargetRuns: boolean;
 }
 export declare function runAction(options: RunOptions, command: Command): Promise<void>;
 export {};

package/lib/commands/run/runAction.js

@@ -18,6 +18,8 @@ const _workspaceTools = require("workspace-tools");
 const _reporters = require("@lage-run/reporters");
 const _scheduler = require("@lage-run/scheduler");
 const _logger = /*#__PURE__*/ _interopRequireDefault(require("@lage-run/logger"));
+const _getConcurrencyJs = require("../../config/getConcurrency.js");
+const _errorsJs = require("../../types/errors.js");
 function _interopRequireDefault(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
@@ -26,11 +28,20 @@ function _interopRequireDefault(obj) {
 async function runAction(options, command) {
     const cwd = process.cwd();
     const config = await (0, _getConfigJs.getConfig)(cwd);
+    // Merged options
+    const concurrency = (0, _getConcurrencyJs.getConcurrency)(options.concurrency, config.concurrency);
+    const allowNoTargetRuns = options.allowNoTargetRuns || config.allowNoTargetRuns;
     // Configure logger
     const logger = (0, _logger.default)();
-    (0, _reporters.initializeReporters)(logger, options);
+    (0, _reporters.initializeReporters)(logger, {
+        ...options,
+        concurrency
+    });
     if (options.profile !== undefined) {
-        const reporter = (0, _createProfileReporterJs.createProfileReporter)(options);
+        const reporter = (0, _createProfileReporterJs.createProfileReporter)({
+            concurrency,
+            profile: options.profile
+        });
         logger.addReporter(reporter);
     }
     // Build Target Graph
@@ -51,25 +62,26 @@ async function runAction(options, command) {
         tasks,
         packageInfos
     });
+    validateTargetGraph(targetGraph, allowNoTargetRuns);
     const { cacheProvider , hasher  } = (0, _createCacheProviderJs.createCache)({
         root,
         logger,
         cacheOptions: config.cacheOptions,
         skipLocalCache: options.skipLocalCache
     });
-    logger.verbose(`Running with ${options.concurrency} workers`);
+    logger.verbose(`Running with ${concurrency} workers`);
     const filteredPipeline = (0, _filterPipelineDefinitionsJs.filterPipelineDefinitions)(targetGraph.targets.values(), config.pipeline);
     const maxWorkersPerTaskMap = (0, _getMaxWorkersPerTaskJs.getMaxWorkersPerTaskFromOptions)(options.maxWorkersPerTask);
     const scheduler = new _scheduler.SimpleScheduler({
         logger,
-        concurrency: options.concurrency,
+        concurrency,
         cacheProvider,
         hasher,
         continueOnError: options.continue,
         shouldCache: options.cache,
         shouldResetCache: options.resetCache,
         maxWorkersPerTask: new Map([
-            ...(0, _getMaxWorkersPerTaskJs.getMaxWorkersPerTask)(filteredPipeline, options.concurrency),
+            ...(0, _getMaxWorkersPerTaskJs.getMaxWorkersPerTask)(filteredPipeline, concurrency),
             ...maxWorkersPerTaskMap
         ]),
         runners: {
@@ -103,3 +115,9 @@ function displaySummaryAndExit(summary, reporters) {
         reporter.summarize(summary);
     }
 }
+function validateTargetGraph(targetGraph, allowNoTargetRuns) {
+    const visibleTargets = Array.from(targetGraph.targets.values()).filter((target)=>!target.hidden);
+    if (visibleTargets.length === 0 && !allowNoTargetRuns) {
+        throw _errorsJs.NoTargetFoundError;
+    }
+}

package/lib/commands/run/watchAction.js

@@ -18,6 +18,7 @@ const _reporters = require("@lage-run/reporters");
 const _scheduler = require("@lage-run/scheduler");
 const _watcherJs = require("./watcher.js");
 const _logger = /*#__PURE__*/ _interopRequireWildcard(require("@lage-run/logger"));
+const _getConcurrencyJs = require("../../config/getConcurrency.js");
 function _getRequireWildcardCache(nodeInterop) {
     if (typeof WeakMap !== "function") return null;
     var cacheBabelInterop = new WeakMap();
@@ -60,6 +61,7 @@ function _interopRequireWildcard(obj, nodeInterop) {
 async function watchAction(options, command) {
     const cwd = process.cwd();
     const config = await (0, _getConfigJs.getConfig)(cwd);
+    const concurrency = (0, _getConcurrencyJs.getConcurrency)(options.concurrency, config.concurrency);
     // Configure logger
     const logger = (0, _logger.default)();
     const reporter = new _reporters.LogReporter({
@@ -96,14 +98,14 @@ async function watchAction(options, command) {
     const maxWorkersPerTaskMap = (0, _getMaxWorkersPerTaskJs.getMaxWorkersPerTaskFromOptions)(options.maxWorkersPerTask);
     const scheduler = new _scheduler.SimpleScheduler({
         logger,
-        concurrency: options.concurrency,
+        concurrency,
         cacheProvider,
         hasher,
         continueOnError: true,
         shouldCache: options.cache,
         shouldResetCache: options.resetCache,
         maxWorkersPerTask: new Map([
-            ...(0, _getMaxWorkersPerTaskJs.getMaxWorkersPerTask)(filteredPipeline, options.concurrency),
+            ...(0, _getMaxWorkersPerTaskJs.getMaxWorkersPerTask)(filteredPipeline, concurrency),
             ...maxWorkersPerTaskMap
         ]),
         runners: {

package/lib/config/getConcurrency.d.ts

@@ -0,0 +1 @@
+export declare function getConcurrency(optionsConcurrency: number | undefined, configConcurrency: number | undefined): number;

package/lib/config/getConcurrency.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "getConcurrency", {
+    enumerable: true,
+    get: ()=>getConcurrency
+});
+const _os = /*#__PURE__*/ _interopRequireDefault(require("os"));
+function _interopRequireDefault(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
+function getConcurrency(optionsConcurrency, configConcurrency) {
+    return optionsConcurrency || configConcurrency || _os.default.cpus().length - 1;
+}

package/lib/config/getConfig.js

@@ -41,6 +41,8 @@ async function getConfig(cwd) {
         ],
         loggerOptions: config?.loggerOptions ?? {},
         runners: config?.runners ?? {},
-        workerIdleMemoryLimit: config?.workerIdleMemoryLimit ?? _os.default.totalmem()
+        workerIdleMemoryLimit: config?.workerIdleMemoryLimit ?? _os.default.totalmem(),
+        concurrency: config?.concurrency ?? _os.default.cpus().length - 1,
+        allowNoTargetRuns: config?.allowNoTargetRuns ?? false
     };
 }

package/lib/types/ConfigOptions.d.ts

@@ -45,4 +45,12 @@ export interface ConfigOptions {
      * Maximum worker idle memory, this would cause workers to restart if they exceed this limit. This is useful to prevent memory leaks.
      */
     workerIdleMemoryLimit: number;
+    /**
+     * Maximum number of concurrent tasks to run
+     */
+    concurrency: number;
+    /**
+     * Allows for no targets run
+     */
+    allowNoTargetRuns: boolean;
 }

package/lib/types/errors.d.ts

@@ -0,0 +1 @@
+export declare const NoTargetFoundError: Error;

package/lib/types/errors.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "NoTargetFoundError", {
+    enumerable: true,
+    get: ()=>NoTargetFoundError
+});
+const NoTargetFoundError = new Error("No target found");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lage-run/cli",
-  "version": "0.5.4",
+  "version": "0.5.6",
   "description": "Command Line Interface for Lage",
   "repository": {
     "url": "https://github.com/microsoft/lage"
@@ -20,11 +20,11 @@
   "dependencies": {
     "@lage-run/find-npm-client": "^0.1.4",
     "@lage-run/logger": "^1.2.2",
-    "@lage-run/scheduler": "^0.7.1",
+    "@lage-run/scheduler": "^0.7.2",
     "@lage-run/scheduler-types": "^0.2.10",
     "@lage-run/target-graph": "^0.6.1",
     "@lage-run/cache": "^0.2.3",
-    "@lage-run/reporters": "^0.2.41",
+    "@lage-run/reporters": "^0.2.43",
     "commander": "^9.4.0",
     "workspace-tools": "^0.29.0",
     "chokidar": "3.5.3",