@lage-run/cli 0.8.6 → 0.9.0

package/CHANGELOG.json

@@ -2,7 +2,34 @@
   "name": "@lage-run/cli",
   "entries": [
     {
-      "date": "Sat, 18 Feb 2023 00:43:24 GMT",
+      "date": "Tue, 21 Feb 2023 21:30:26 GMT",
+      "tag": "@lage-run/cli_v0.9.0",
+      "version": "0.9.0",
+      "comments": {
+        "minor": [
+          {
+            "author": "kchau@microsoft.com",
+            "package": "@lage-run/cli",
+            "commit": "d7a8a3fa2bcf434c59bea26d5964dd7235998ad2",
+            "comment": "cache directory to be centralized"
+          },
+          {
+            "author": "beachball",
+            "package": "@lage-run/cli",
+            "comment": "Bump @lage-run/scheduler to v0.9.0",
+            "commit": "d7a8a3fa2bcf434c59bea26d5964dd7235998ad2"
+          },
+          {
+            "author": "beachball",
+            "package": "@lage-run/cli",
+            "comment": "Bump @lage-run/cache to v0.3.0",
+            "commit": "d7a8a3fa2bcf434c59bea26d5964dd7235998ad2"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Sat, 18 Feb 2023 00:43:33 GMT",
       "tag": "@lage-run/cli_v0.8.6",
       "version": "0.8.6",
       "comments": {

package/CHANGELOG.md

@@ -1,12 +1,22 @@
 # Change Log - @lage-run/cli
 
-This log was last generated on Sat, 18 Feb 2023 00:43:24 GMT and should not be manually modified.
+This log was last generated on Tue, 21 Feb 2023 21:30:26 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 0.9.0
+
+Tue, 21 Feb 2023 21:30:26 GMT
+
+### Minor changes
+
+- cache directory to be centralized (kchau@microsoft.com)
+- Bump @lage-run/scheduler to v0.9.0
+- Bump @lage-run/cache to v0.3.0
+
 ## 0.8.6
 
-Sat, 18 Feb 2023 00:43:24 GMT
+Sat, 18 Feb 2023 00:43:33 GMT
 
 ### Patches
 

package/lib/commands/cache/action.js

@@ -10,7 +10,6 @@ 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 _initializeReportersJs = require("../initializeReporters.js");
 function _interopRequireDefault(obj) {
     return obj && obj.__esModule ? obj : {
         default: obj
@@ -20,7 +19,6 @@ async function cacheAction(options, command) {
     const cwd = process.cwd();
     const config = await (0, _getConfigJs.getConfig)(cwd);
     const logger = (0, _logger.default)();
-    (0, _initializeReportersJs.initializeReporters)(logger, options);
     if (options.clear) {
         return await (0, _clearCacheJs.clearCache)({
             cwd: process.cwd(),

package/lib/commands/cache/clearCache.js

@@ -6,68 +6,26 @@ Object.defineProperty(exports, "clearCache", {
     enumerable: true,
     get: ()=>clearCache
 });
-const _cacheDirJs = require("./cacheDir.js");
 const _getConfigJs = require("../../config/getConfig.js");
 const _workspaceTools = require("workspace-tools");
-const _scheduler = require("@lage-run/scheduler");
-const _targetGraph = require("@lage-run/target-graph");
-const _path = /*#__PURE__*/ _interopRequireDefault(require("path"));
 const _getConcurrencyJs = require("../../config/getConcurrency.js");
-function _interopRequireDefault(obj) {
-    return obj && obj.__esModule ? obj : {
-        default: obj
-    };
-}
+const _cache = require("@lage-run/cache");
 async function clearCache(options) {
-    const { logger , cwd , internalCacheFolder  } = options;
+    const { logger , cwd  } = options;
     const config = await (0, _getConfigJs.getConfig)(cwd);
     const workspaceRoot = (0, _workspaceTools.getWorkspaceRoot)(cwd);
     const concurrency = (0, _getConcurrencyJs.getConcurrency)(options.concurrency, config.concurrency);
     if (!workspaceRoot) {
         return;
     }
-    const graphBuilder = new _targetGraph.TargetGraphBuilder();
-    const workspaces = (0, _workspaceTools.getWorkspaces)(workspaceRoot);
-    for (const workspace of workspaces){
-        const cachePath = (0, _cacheDirJs.getCacheDir)(workspace.path, internalCacheFolder);
-        const logOutputCachePath = _path.default.join(workspace.path, "node_modules/.cache/lage/output/");
-        graphBuilder.addTarget({
-            packageName: workspace.name,
-            cwd: workspace.path,
-            dependencies: [],
-            dependents: [],
-            id: `${workspace.name}#clearCache`,
-            label: `Clearing Cache for ${workspace.name}`,
-            task: "clearCache",
-            type: "worker",
-            depSpecs: [],
-            options: {
-                clearPaths: [
-                    cachePath,
-                    logOutputCachePath
-                ]
-            }
-        });
-    }
-    const graph = graphBuilder.build();
-    const scheduler = new _scheduler.SimpleScheduler({
-        logger,
-        concurrency,
-        continueOnError: true,
-        shouldCache: false,
-        shouldResetCache: false,
-        maxWorkersPerTask: new Map(),
-        runners: {
-            worker: {
-                script: require.resolve("./runners/ClearCacheRunner.js"),
-                options: {}
-            }
-        },
-        workerIdleMemoryLimit: config.workerIdleMemoryLimit
-    });
-    const summary = await scheduler.run(workspaceRoot, graph);
-    await scheduler.cleanup();
-    logger.reporters.forEach((reporter)=>{
-        reporter.summarize(summary);
+    const cacheProvider = new _cache.BackfillCacheProvider({
+        root: cwd,
+        cacheOptions: config.cacheOptions,
+        logger
     });
+    // eslint-disable-next-line no-console
+    console.log("Clearing Cache");
+    cacheProvider.clear(concurrency);
+    // eslint-disable-next-line no-console
+    console.log("Cache Cleared");
 }

package/lib/commands/cache/pruneCache.js

@@ -6,72 +6,27 @@ Object.defineProperty(exports, "pruneCache", {
     enumerable: true,
     get: ()=>pruneCache
 });
-const _path = /*#__PURE__*/ _interopRequireDefault(require("path"));
-const _cacheDirJs = require("./cacheDir.js");
 const _workspaceTools = require("workspace-tools");
 const _getConfigJs = require("../../config/getConfig.js");
 const _getConcurrencyJs = require("../../config/getConcurrency.js");
-const _targetGraph = require("@lage-run/target-graph");
-const _scheduler = require("@lage-run/scheduler");
-function _interopRequireDefault(obj) {
-    return obj && obj.__esModule ? obj : {
-        default: obj
-    };
-}
+const _cache = require("@lage-run/cache");
 async function pruneCache(options) {
-    const { logger , cwd , pruneDays , internalCacheFolder  } = options;
+    const { logger , cwd , pruneDays  } = options;
     const config = await (0, _getConfigJs.getConfig)(cwd);
     const workspaceRoot = (0, _workspaceTools.getWorkspaceRoot)(cwd);
     const concurrency = (0, _getConcurrencyJs.getConcurrency)(options.concurrency, config.concurrency);
     if (!workspaceRoot) {
         return;
     }
-    const graphBuilder = new _targetGraph.TargetGraphBuilder();
-    const workspaces = (0, _workspaceTools.getWorkspaces)(workspaceRoot);
     const prunePeriod = pruneDays || 30;
-    const now = new Date().getTime();
-    for (const workspace of workspaces){
-        const cachePath = (0, _cacheDirJs.getCacheDir)(workspace.path, internalCacheFolder);
-        const logOutputCachePath = _path.default.join(workspace.path, "node_modules/.cache/lage/output/");
-        graphBuilder.addTarget({
-            packageName: workspace.name,
-            cwd: workspace.path,
-            dependencies: [],
-            dependents: [],
-            id: `${workspace.name}#pruneCache`,
-            label: `Pruning Cache for ${workspace.name}`,
-            task: "pruneCache",
-            type: "worker",
-            depSpecs: [],
-            options: {
-                clearPaths: [
-                    cachePath,
-                    logOutputCachePath
-                ],
-                now,
-                prunePeriod
-            }
-        });
-    }
-    const graph = graphBuilder.build();
-    const scheduler = new _scheduler.SimpleScheduler({
-        logger,
-        concurrency,
-        continueOnError: true,
-        shouldCache: false,
-        shouldResetCache: false,
-        maxWorkersPerTask: new Map(),
-        runners: {
-            worker: {
-                script: require.resolve("./runners/PruneCacheRunner.js"),
-                options: {}
-            }
-        },
-        workerIdleMemoryLimit: config.workerIdleMemoryLimit
-    });
-    const summary = await scheduler.run(workspaceRoot, graph);
-    await scheduler.cleanup();
-    logger.reporters.forEach((reporter)=>{
-        reporter.summarize(summary);
+    const cacheProvider = new _cache.BackfillCacheProvider({
+        root: cwd,
+        cacheOptions: config.cacheOptions,
+        logger
     });
+    // eslint-disable-next-line no-console
+    console.log("Clearing Cache");
+    cacheProvider.purge(prunePeriod, concurrency);
+    // eslint-disable-next-line no-console
+    console.log("Cache Cleared");
 }

package/lib/commands/createReporter.d.ts

@@ -1,3 +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 | ProgressReporter | LogReporter;
+export declare function createReporter(reporter: string, options: ReporterInitOptions): ChromeTraceEventsReporter | JsonReporter | AdoReporter | LogReporter | ProgressReporter;

package/lib/commands/createReporter.js

@@ -27,8 +27,14 @@ function createReporter(reporter, options) {
                 grouped,
                 logLevel: verbose ? _logger.LogLevel.verbose : logLevel
             });
+        case "npmLog":
+        case "old":
+            return new _reporters.LogReporter({
+                grouped,
+                logLevel: verbose ? _logger.LogLevel.verbose : logLevel
+            });
         default:
-            if (progress && !(verbose || grouped)) {
+            if (progress && !(logLevel >= _logger.LogLevel.verbose || verbose || grouped)) {
                 return new _reporters.ProgressReporter({
                     concurrency
                 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lage-run/cli",
-  "version": "0.8.6",
+  "version": "0.9.0",
   "description": "Command Line Interface for Lage",
   "repository": {
     "url": "https://github.com/microsoft/lage"
@@ -20,10 +20,10 @@
   "dependencies": {
     "@lage-run/find-npm-client": "^0.1.4",
     "@lage-run/logger": "^1.2.2",
-    "@lage-run/scheduler": "^0.8.5",
+    "@lage-run/scheduler": "^0.9.0",
     "@lage-run/scheduler-types": "^0.3.1",
     "@lage-run/target-graph": "^0.6.2",
-    "@lage-run/cache": "^0.2.5",
+    "@lage-run/cache": "^0.3.0",
     "@lage-run/reporters": "^1.0.3",
     "commander": "^9.4.0",
     "workspace-tools": "^0.30.0",

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

@@ -1 +0,0 @@
-export declare function getCacheDir(workspace: string, internalCacheFolder: string): string;

package/lib/commands/cache/cacheDir.js

@@ -1,18 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-Object.defineProperty(exports, "getCacheDir", {
-    enumerable: true,
-    get: ()=>getCacheDir
-});
-const _path = /*#__PURE__*/ _interopRequireDefault(require("path"));
-function _interopRequireDefault(obj) {
-    return obj && obj.__esModule ? obj : {
-        default: obj
-    };
-}
-function getCacheDir(workspace, internalCacheFolder) {
-    const cacheFolder = !internalCacheFolder ? undefined : internalCacheFolder;
-    return _path.default.join(workspace, cacheFolder ?? "node_modules/.cache/backfill");
-}