@lage-run/cli 0.15.12 → 0.16.0

package/CHANGELOG.json

@@ -2,7 +2,79 @@
   "name": "@lage-run/cli",
   "entries": [
     {
-      "date": "Tue, 11 Jul 2023 14:51:38 GMT",
+      "date": "Wed, 09 Aug 2023 18:41:10 GMT",
+      "tag": "@lage-run/cli_v0.16.0",
+      "version": "0.16.0",
+      "comments": {
+        "minor": [
+          {
+            "author": "unpervertedkid@gmail.com",
+            "package": "@lage-run/cli",
+            "commit": "228357ca14429835006fe0bf7018e52ad551243e",
+            "comment": "Implemented info command in lage v2"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Mon, 17 Jul 2023 15:14:04 GMT",
+      "tag": "@lage-run/cli_v0.15.13",
+      "version": "0.15.13",
+      "comments": {
+        "patch": [
+          {
+            "author": "email not defined",
+            "package": "@lage-run/cli",
+            "commit": "5f41b1db342b6d7a8492a46b68ca328a21e61ee6",
+            "comment": "Update lage core deps"
+          },
+          {
+            "author": "beachball",
+            "package": "@lage-run/cli",
+            "comment": "Bump @lage-run/cache to v1.1.2",
+            "commit": "5f41b1db342b6d7a8492a46b68ca328a21e61ee6"
+          },
+          {
+            "author": "beachball",
+            "package": "@lage-run/cli",
+            "comment": "Bump @lage-run/config to v0.3.2",
+            "commit": "5f41b1db342b6d7a8492a46b68ca328a21e61ee6"
+          },
+          {
+            "author": "beachball",
+            "package": "@lage-run/cli",
+            "comment": "Bump @lage-run/hasher to v1.0.4",
+            "commit": "5f41b1db342b6d7a8492a46b68ca328a21e61ee6"
+          },
+          {
+            "author": "beachball",
+            "package": "@lage-run/cli",
+            "comment": "Bump @lage-run/reporters to v1.2.5",
+            "commit": "5f41b1db342b6d7a8492a46b68ca328a21e61ee6"
+          },
+          {
+            "author": "beachball",
+            "package": "@lage-run/cli",
+            "comment": "Bump @lage-run/scheduler to v1.1.7",
+            "commit": "5f41b1db342b6d7a8492a46b68ca328a21e61ee6"
+          },
+          {
+            "author": "beachball",
+            "package": "@lage-run/cli",
+            "comment": "Bump @lage-run/scheduler-types to v0.3.11",
+            "commit": "5f41b1db342b6d7a8492a46b68ca328a21e61ee6"
+          },
+          {
+            "author": "beachball",
+            "package": "@lage-run/cli",
+            "comment": "Bump @lage-run/target-graph to v0.8.7",
+            "commit": "5f41b1db342b6d7a8492a46b68ca328a21e61ee6"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Tue, 11 Jul 2023 14:51:52 GMT",
       "tag": "@lage-run/cli_v0.15.12",
       "version": "0.15.12",
       "comments": {

package/CHANGELOG.md

@@ -1,12 +1,35 @@
 # Change Log - @lage-run/cli
 
-This log was last generated on Tue, 11 Jul 2023 14:51:38 GMT and should not be manually modified.
+This log was last generated on Wed, 09 Aug 2023 18:41:10 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 0.16.0
+
+Wed, 09 Aug 2023 18:41:10 GMT
+
+### Minor changes
+
+- Implemented info command in lage v2 (unpervertedkid@gmail.com)
+
+## 0.15.13
+
+Mon, 17 Jul 2023 15:14:04 GMT
+
+### Patches
+
+- Update lage core deps (email not defined)
+- Bump @lage-run/cache to v1.1.2
+- Bump @lage-run/config to v0.3.2
+- Bump @lage-run/hasher to v1.0.4
+- Bump @lage-run/reporters to v1.2.5
+- Bump @lage-run/scheduler to v1.1.7
+- Bump @lage-run/scheduler-types to v0.3.11
+- Bump @lage-run/target-graph to v0.8.7
+
 ## 0.15.12
 
-Tue, 11 Jul 2023 14:51:38 GMT
+Tue, 11 Jul 2023 14:51:52 GMT
 
 ### Patches
 

package/lib/cli.js

@@ -8,6 +8,7 @@ const _index1 = require("./commands/cache/index.js");
 const _errors = require("./types/errors.js");
 const _index2 = require("./commands/affected/index.js");
 const _index3 = require("./commands/init/index.js");
+const _index4 = require("./commands/info/index.js");
 async function main() {
     const program = new _commander.Command();
     program.addCommand(_index.runCommand, {
@@ -16,6 +17,7 @@ async function main() {
     program.addCommand(_index1.cacheCommand);
     program.addCommand(_index2.affectedCommand);
     program.addCommand(_index3.initCommand);
+    program.addCommand(_index4.infoCommand);
     await program.parseAsync(process.argv);
 }
 main().catch((err)=>{

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

@@ -0,0 +1,51 @@
+import type { Command } from "commander";
+import type { ReporterInitOptions } from "../../types/ReporterInitOptions.js";
+interface RunOptions extends ReporterInitOptions {
+    dependencies: boolean;
+    dependents: boolean;
+    since: string;
+    scope: string[];
+    to: string[];
+    cache: boolean;
+    nodeArg: string;
+    ignore: string[];
+}
+/**
+ * (UNSTABLE) The info command displays information about a target graph in a workspace.
+ * The generated output can be read and used by other task runners, such as BuildXL.
+ *
+ * Expected format:
+ * [
+ *   {
+ *       "id": "bar##build",
+ *       "package": "bar",
+ *       "task": "build",
+ *       "command": "npm run build --blah",
+ *       "workingDirectory": "packages/bar",
+ *       "dependencies": []
+ *   },
+ *   {
+ *       "id": "foo##build",
+ *       "package": "foo",
+ *       "task": "build",
+ *       "command": "npm run build --blah",
+ *       "workingDirectory": "packages/foo",
+ *       "dependencies": [
+ *           "bar##build"
+ *       ]
+ *   },
+ *   {
+ *       "id": "foo##test",
+ *       "package": "foo",
+ *       "task": "test",
+ *       "command": "npm run test --blah",
+ *       "workingDirectory": "packages/foo",
+ *       "dependencies": [
+ *           "foo##build"
+ *       ]
+ *   },
+ *   ...
+ * ]
+ */
+export declare function infoAction(options: RunOptions, command: Command): Promise<void>;
+export {};

package/lib/commands/info/action.js

@@ -0,0 +1,136 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "infoAction", {
+    enumerable: true,
+    get: function() {
+        return infoAction;
+    }
+});
+const _createTargetGraph = require("../run/createTargetGraph.js");
+const _filterArgsForTasks = require("../run/filterArgsForTasks.js");
+const _config = require("@lage-run/config");
+const _workspacetools = require("workspace-tools");
+const _getFilteredPackages = require("../../filter/getFilteredPackages.js");
+const _logger = /*#__PURE__*/ _interop_require_default(require("@lage-run/logger"));
+const _path = /*#__PURE__*/ _interop_require_default(require("path"));
+const _targetgraph = require("@lage-run/target-graph");
+const _initializeReporters = require("../initializeReporters.js");
+function _interop_require_default(obj) {
+    return obj && obj.__esModule ? obj : {
+        default: obj
+    };
+}
+async function infoAction(options, command) {
+    const cwd = process.cwd();
+    const config = await (0, _config.getConfig)(cwd);
+    const logger = (0, _logger.default)();
+    options.logLevel = options.logLevel ?? "info";
+    options.reporter = options.reporter ?? "json";
+    (0, _initializeReporters.initializeReporters)(logger, options);
+    const root = (0, _workspacetools.getWorkspaceRoot)(cwd);
+    const packageInfos = await (0, _workspacetools.getPackageInfosAsync)(root);
+    const targetGraph = prepareAndCreateTargetGraph(config, logger, root, options, packageInfos, command);
+    const scope = prepareAndGetFilteredPackages(config, logger, root, options, packageInfos);
+    const packageTasks = processTargets(targetGraph.targets, packageInfos, config);
+    logger.info("info", {
+        command: command.args,
+        scope,
+        packageTasks: [
+            ...packageTasks.values()
+        ].flat()
+    });
+}
+function prepareAndCreateTargetGraph(config, logger, root, options, packageInfos, command) {
+    const { tasks  } = (0, _filterArgsForTasks.filterArgsForTasks)(command.args);
+    const targetGraph = (0, _createTargetGraph.createTargetGraph)({
+        logger,
+        root,
+        dependencies: options.dependencies,
+        dependents: options.dependents && !options.to,
+        ignore: options.ignore.concat(config.ignore),
+        pipeline: config.pipeline,
+        repoWideChanges: config.repoWideChanges,
+        scope: (options.scope ?? []).concat(options.to ?? []),
+        since: options.since,
+        outputs: config.cacheOptions.outputGlob,
+        tasks,
+        packageInfos
+    });
+    return targetGraph;
+}
+function prepareAndGetFilteredPackages(config, logger, root, options, packageInfos) {
+    const scope = (0, _getFilteredPackages.getFilteredPackages)({
+        root,
+        packageInfos,
+        logger,
+        includeDependencies: options.dependencies,
+        includeDependents: options.dependents && !options.to,
+        since: options.since,
+        scope: (options.scope ?? []).concat(options.to ?? []),
+        repoWideChanges: config.repoWideChanges,
+        sinceIgnoreGlobs: options.ignore.concat(config.ignore)
+    });
+    return scope;
+}
+function processTargets(targets, packageInfos, config) {
+    const packageTasks = new Map(); // Initialize the map with the correct type
+    for (const target of targets.values()){
+        if (shouldSkipTarget(target, packageInfos)) {
+            continue;
+        }
+        const startIdIndex = target.dependencies.indexOf((0, _targetgraph.getStartTargetId)());
+        target.dependencies.splice(startIdIndex, 1);
+        const packageTask = generatePackageTask(target, config);
+        if (packageTask) {
+            // Check if the packageTask is defined before accessing its properties
+            const packageName = packageTask.package;
+            if (!packageTasks.has(packageName)) {
+                packageTasks.set(packageName, []);
+            }
+            packageTasks.get(packageName).push(packageTask); // Use the non-null assertion operator to avoid type errors
+        }
+    }
+    return packageTasks;
+}
+function shouldSkipTarget(target, packageInfos) {
+    return target.id === (0, _targetgraph.getStartTargetId)() || !packageInfos[target.packageName ?? ""]?.scripts?.[target.task];
+}
+function generatePackageTask(target, config) {
+    const command = generateCommand(target, config);
+    const workingDirectory = getWorkingDirectory(target);
+    const packageTask = {
+        id: target.id,
+        command,
+        dependencies: target.dependencies,
+        workingDirectory,
+        package: target.packageName,
+        task: target.task
+    };
+    return packageTask;
+}
+function generateCommand(target, config) {
+    const npmClient = config.npmClient ?? "npm";
+    const command = [
+        npmClient,
+        ...getNpmArgs(target.task, target.taskArgs)
+    ];
+    return command;
+}
+function getWorkingDirectory(target) {
+    const cwd = process.cwd();
+    const workingDirectory = _path.default.relative((0, _workspacetools.getWorkspaceRoot)(cwd) ?? "", target.cwd).replace(/\\/g, "/");
+    return workingDirectory;
+}
+function getNpmArgs(task, taskTargs) {
+    const extraArgs = taskTargs != undefined && taskTargs.length > 0 ? [
+        "--",
+        ...taskTargs
+    ] : [];
+    return [
+        "run",
+        task,
+        ...extraArgs
+    ];
+}

package/lib/commands/info/index.d.ts

@@ -0,0 +1,3 @@
+import { Command } from "commander";
+declare const infoCommand: Command;
+export { infoCommand };

package/lib/commands/info/index.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "infoCommand", {
+    enumerable: true,
+    get: function() {
+        return infoCommand;
+    }
+});
+const _commander = require("commander");
+const _action = require("./action.js");
+const _addFilterOptions = require("../addFilterOptions.js");
+const _addLoggerOptions = require("../addLoggerOptions.js");
+const infoCommand = new _commander.Command("info");
+(0, _addFilterOptions.addFilterOptions)((0, _addLoggerOptions.addLoggerOptions)(infoCommand)).action(_action.infoAction);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lage-run/cli",
-  "version": "0.15.12",
+  "version": "0.16.0",
   "description": "Command Line Interface for Lage",
   "repository": {
     "type": "git",
@@ -20,20 +20,20 @@
     "lint": "monorepo-scripts lint"
   },
   "dependencies": {
-    "@lage-run/cache": "^1.1.1",
-    "@lage-run/config": "^0.3.1",
+    "@lage-run/cache": "^1.1.2",
+    "@lage-run/config": "^0.3.2",
     "@lage-run/find-npm-client": "^0.1.4",
-    "@lage-run/hasher": "^1.0.3",
+    "@lage-run/hasher": "^1.0.4",
     "@lage-run/logger": "^1.3.0",
-    "@lage-run/reporters": "^1.2.4",
-    "@lage-run/scheduler": "^1.1.6",
-    "@lage-run/scheduler-types": "^0.3.10",
-    "@lage-run/target-graph": "^0.8.6",
+    "@lage-run/reporters": "^1.2.5",
+    "@lage-run/scheduler": "^1.1.7",
+    "@lage-run/scheduler-types": "^0.3.11",
+    "@lage-run/target-graph": "^0.8.7",
     "chokidar": "3.5.3",
     "commander": "^9.4.0",
     "execa": "5.1.1",
     "fast-glob": "^3.2.11",
-    "workspace-tools": "^0.34.0"
+    "workspace-tools": "^0.35.0"
   },
   "devDependencies": {
     "@lage-run/monorepo-fixture": "*",