@lage-run/cli 0.7.1 → 0.7.2

package/CHANGELOG.json

@@ -2,7 +2,28 @@
   "name": "@lage-run/cli",
   "entries": [
     {
-      "date": "Mon, 30 Jan 2023 17:26:37 GMT",
+      "date": "Tue, 31 Jan 2023 18:24:29 GMT",
+      "tag": "@lage-run/cli_v0.7.2",
+      "version": "0.7.2",
+      "comments": {
+        "patch": [
+          {
+            "author": "kchau@microsoft.com",
+            "package": "@lage-run/cli",
+            "commit": "ac2bf4264854e06e86236a54421374b2c2602f7b",
+            "comment": "switch back to old log reporter when \"verbose\" or \"grouped\" are used"
+          },
+          {
+            "author": "beachball",
+            "package": "@lage-run/cli",
+            "comment": "Bump @lage-run/reporters to v1.0.0",
+            "commit": "ac2bf4264854e06e86236a54421374b2c2602f7b"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Mon, 30 Jan 2023 17:26:59 GMT",
       "tag": "@lage-run/cli_v0.7.1",
       "version": "0.7.1",
       "comments": {

package/CHANGELOG.md

@@ -1,12 +1,21 @@
 # Change Log - @lage-run/cli
 
-This log was last generated on Mon, 30 Jan 2023 17:26:37 GMT and should not be manually modified.
+This log was last generated on Tue, 31 Jan 2023 18:24:29 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 0.7.2
+
+Tue, 31 Jan 2023 18:24:29 GMT
+
+### Patches
+
+- switch back to old log reporter when "verbose" or "grouped" are used (kchau@microsoft.com)
+- Bump @lage-run/reporters to v1.0.0
+
 ## 0.7.1
 
-Mon, 30 Jan 2023 17:26:37 GMT
+Mon, 30 Jan 2023 17:26:59 GMT
 
 ### Patches
 

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

@@ -1,5 +1,5 @@
 import type { Command } from "commander";
-import type { ReporterInitOptions } from "@lage-run/reporters";
+import type { ReporterInitOptions } from "../../types/ReporterInitOptions.js";
 interface CacheOptions extends ReporterInitOptions {
     prune?: number;
     clear?: boolean;

package/lib/commands/cache/action.js

@@ -10,7 +10,7 @@ const _clearCacheJs = require("./clearCache.js");
 const _getConfigJs = require("../../config/getConfig.js");
 const _pruneCacheJs = require("./pruneCache.js");
 const _logger = /*#__PURE__*/ _interopRequireDefault(require("@lage-run/logger"));
-const _reporters = require("@lage-run/reporters");
+const _initializeReportersJs = require("../initializeReporters.js");
 function _interopRequireDefault(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
@@ -20,7 +20,7 @@ async function cacheAction(options, command) {
     const cwd = process.cwd();
     const config = await (0, _getConfigJs.getConfig)(cwd);
     const logger = (0, _logger.default)();
-    (0, _reporters.initializeReporters)(logger, options);
+    (0, _initializeReportersJs.initializeReporters)(logger, options);
     if (options.clear) {
         return await (0, _clearCacheJs.clearCache)({
             cwd: process.cwd(),

package/lib/commands/createReporter.d.ts

@@ -0,0 +1,3 @@
+import { JsonReporter, AdoReporter, LogReporter, ProgressReporter, ChromeTraceEventsReporter } from "@lage-run/reporters";
+import type { ReporterInitOptions } from "../types/ReporterInitOptions.js";
+export declare function createReporter(reporter: string, options: ReporterInitOptions): ChromeTraceEventsReporter | JsonReporter | AdoReporter | LogReporter | ProgressReporter;

package/lib/commands/createReporter.js

@@ -0,0 +1,46 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "createReporter", {
+    enumerable: true,
+    get: ()=>createReporter
+});
+const _logger = require("@lage-run/logger");
+const _reporters = require("@lage-run/reporters");
+function createReporter(reporter, options) {
+    const { verbose , grouped , logLevel: logLevelName , concurrency , profile  } = options;
+    const logLevel = _logger.LogLevel[logLevelName];
+    switch(reporter){
+        case "profile":
+            return new _reporters.ChromeTraceEventsReporter({
+                concurrency,
+                outputFile: typeof profile === "string" ? profile : undefined
+            });
+        case "json":
+            return new _reporters.JsonReporter({
+                logLevel
+            });
+        case "azureDevops":
+        case "adoLog":
+            return new _reporters.AdoReporter({
+                grouped,
+                logLevel: verbose ? _logger.LogLevel.verbose : logLevel
+            });
+        case "old":
+            return new _reporters.LogReporter({
+                grouped,
+                logLevel: verbose ? _logger.LogLevel.verbose : logLevel
+            });
+        default:
+            if (verbose || grouped) {
+                return new _reporters.LogReporter({
+                    grouped,
+                    logLevel: verbose ? _logger.LogLevel.verbose : logLevel
+                });
+            }
+            return new _reporters.ProgressReporter({
+                concurrency
+            });
+    }
+}

package/lib/commands/initializeReporters.d.ts

@@ -0,0 +1,3 @@
+import type { Logger } from "@lage-run/logger";
+import type { ReporterInitOptions } from "../types/ReporterInitOptions.js";
+export declare function initializeReporters(logger: Logger, options: ReporterInitOptions): import("@lage-run/logger").Reporter<import("@lage-run/logger").LogStructuredData>[];

package/lib/commands/initializeReporters.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "initializeReporters", {
+    enumerable: true,
+    get: ()=>initializeReporters
+});
+const _createReporterJs = require("./createReporter.js");
+function initializeReporters(logger, options) {
+    const { reporter  } = options;
+    // filter out falsy values (e.g. undefined) from the reporter array
+    const reporterOptions = (Array.isArray(reporter) ? reporter : [
+        reporter
+    ]).filter(Boolean);
+    if (reporterOptions.length === 0) {
+        // "default" is just a dummy name to trigger the default case in createReporter
+        reporterOptions.push("default");
+    }
+    // add profile reporter if --profile is passed
+    if (options.profile) {
+        reporterOptions.push("profile");
+    }
+    for (const reporterName of reporterOptions){
+        const reporterInstance = (0, _createReporterJs.createReporter)(reporterName, options);
+        logger.addReporter(reporterInstance);
+    }
+    return logger.reporters;
+}

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

@@ -1,5 +1,5 @@
 import type { Command } from "commander";
-import type { ReporterInitOptions } from "@lage-run/reporters";
+import type { ReporterInitOptions } from "../../types/ReporterInitOptions.js";
 interface RunOptions extends ReporterInitOptions {
     concurrency: number;
     profile: string | boolean | undefined;

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

@@ -1,5 +1,5 @@
 import type { Command } from "commander";
-import type { ReporterInitOptions } from "@lage-run/reporters";
+import type { ReporterInitOptions } from "../../types/ReporterInitOptions.js";
 interface RunOptions extends ReporterInitOptions {
     dependencies: boolean;
     dependents: boolean;

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

@@ -1,5 +1,5 @@
 import type { Command } from "commander";
-import type { ReporterInitOptions } from "@lage-run/reporters";
+import type { ReporterInitOptions } from "../../types/ReporterInitOptions.js";
 interface RunOptions extends ReporterInitOptions {
     concurrency: number;
     maxWorkersPerTask: string[];

package/lib/commands/run/runAction.js

@@ -7,7 +7,6 @@ Object.defineProperty(exports, "runAction", {
     get: ()=>runAction
 });
 const _createCacheProviderJs = require("./createCacheProvider.js");
-const _createProfileReporterJs = require("./createProfileReporter.js");
 const _createTargetGraphJs = require("./createTargetGraph.js");
 const _filterArgsForTasksJs = require("./filterArgsForTasks.js");
 const _filterPipelineDefinitionsJs = require("./filterPipelineDefinitions.js");
@@ -15,7 +14,7 @@ const _findNpmClient = require("@lage-run/find-npm-client");
 const _getConfigJs = require("../../config/getConfig.js");
 const _getMaxWorkersPerTaskJs = require("../../config/getMaxWorkersPerTask.js");
 const _workspaceTools = require("workspace-tools");
-const _reporters = require("@lage-run/reporters");
+const _initializeReportersJs = require("../initializeReporters.js");
 const _scheduler = require("@lage-run/scheduler");
 const _logger = /*#__PURE__*/ _interopRequireDefault(require("@lage-run/logger"));
 const _getConcurrencyJs = require("../../config/getConcurrency.js");
@@ -33,17 +32,10 @@ async function runAction(options, command) {
     const allowNoTargetRuns = options.allowNoTargetRuns || config.allowNoTargetRuns;
     // Configure logger
     const logger = (0, _logger.default)();
-    (0, _reporters.initializeReporters)(logger, {
+    (0, _initializeReportersJs.initializeReporters)(logger, {
         ...options,
         concurrency
     });
-    if (options.profile !== undefined) {
-        const reporter = (0, _createProfileReporterJs.createProfileReporter)({
-            concurrency,
-            profile: options.profile
-        });
-        logger.addReporter(reporter);
-    }
     // Build Target Graph
     const root = (0, _workspaceTools.getWorkspaceRoot)(process.cwd());
     const packageInfos = (0, _workspaceTools.getPackageInfos)(root);

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

@@ -1,5 +1,5 @@
 import type { Command } from "commander";
-import type { ReporterInitOptions } from "@lage-run/reporters";
+import type { ReporterInitOptions } from "../../types/ReporterInitOptions.js";
 interface RunOptions extends ReporterInitOptions {
     concurrency: number;
     maxWorkersPerTask: string[];

package/lib/types/ReporterInitOptions.d.ts

@@ -0,0 +1,10 @@
+import type { LogLevel } from "@lage-run/logger";
+export interface ReporterInitOptions {
+    reporter: string[] | string;
+    progress: boolean;
+    verbose: boolean;
+    grouped: boolean;
+    concurrency: number;
+    logLevel: keyof typeof LogLevel;
+    profile?: boolean | string;
+}

package/lib/types/ReporterInitOptions.js

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lage-run/cli",
-  "version": "0.7.1",
+  "version": "0.7.2",
   "description": "Command Line Interface for Lage",
   "repository": {
     "url": "https://github.com/microsoft/lage"
@@ -24,7 +24,7 @@
     "@lage-run/scheduler-types": "^0.3.0",
     "@lage-run/target-graph": "^0.6.1",
     "@lage-run/cache": "^0.2.3",
-    "@lage-run/reporters": "^0.3.2",
+    "@lage-run/reporters": "^1.0.0",
     "commander": "^9.4.0",
     "workspace-tools": "^0.29.0",
     "chokidar": "3.5.3",

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

@@ -1,5 +0,0 @@
-import { ChromeTraceEventsReporter } from "@lage-run/reporters";
-export declare function createProfileReporter(options: {
-    concurrency: number;
-    profile: string | boolean | undefined;
-}): ChromeTraceEventsReporter;

package/lib/commands/run/createProfileReporter.js

@@ -1,16 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-Object.defineProperty(exports, "createProfileReporter", {
-    enumerable: true,
-    get: ()=>createProfileReporter
-});
-const _reporters = require("@lage-run/reporters");
-function createProfileReporter(options) {
-    const { concurrency , profile  } = options;
-    return new _reporters.ChromeTraceEventsReporter({
-        concurrency,
-        outputFile: typeof profile === "string" ? profile : undefined
-    });
-}