@lage-run/cli 0.16.5 → 0.16.7

package/CHANGELOG.json

@@ -2,7 +2,49 @@
   "name": "@lage-run/cli",
   "entries": [
     {
-      "date": "Thu, 21 Dec 2023 09:48:33 GMT",
+      "date": "Fri, 15 Mar 2024 04:34:52 GMT",
+      "version": "0.16.7",
+      "tag": "@lage-run/cli_v0.16.7",
+      "comments": {
+        "patch": [
+          {
+            "author": "kchau@microsoft.com",
+            "package": "@lage-run/cli",
+            "commit": "71283d4af8888454c953e5228c97bfbb471c15ba",
+            "comment": "perf optimizations"
+          },
+          {
+            "author": "beachball",
+            "package": "@lage-run/cli",
+            "comment": "Bump @lage-run/hasher to v1.1.0",
+            "commit": "not available"
+          },
+          {
+            "author": "beachball",
+            "package": "@lage-run/cli",
+            "comment": "Bump @lage-run/scheduler to v1.1.13",
+            "commit": "not available"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Mon, 26 Feb 2024 16:18:50 GMT",
+      "version": "0.16.6",
+      "tag": "@lage-run/cli_v0.16.6",
+      "comments": {
+        "patch": [
+          {
+            "author": "sverre.johansen@gmail.com",
+            "package": "@lage-run/cli",
+            "commit": "9346c9d5b06973485c23cd3269228f91b0d79cbb",
+            "comment": "Fix undefined dependencies in info output"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Thu, 21 Dec 2023 09:49:09 GMT",
       "version": "0.16.5",
       "tag": "@lage-run/cli_v0.16.5",
       "comments": {

package/CHANGELOG.md

@@ -1,12 +1,30 @@
 # Change Log - @lage-run/cli
 
-This log was last generated on Thu, 21 Dec 2023 09:48:33 GMT and should not be manually modified.
+This log was last generated on Fri, 15 Mar 2024 04:34:52 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 0.16.7
+
+Fri, 15 Mar 2024 04:34:52 GMT
+
+### Patches
+
+- perf optimizations (kchau@microsoft.com)
+- Bump @lage-run/hasher to v1.1.0
+- Bump @lage-run/scheduler to v1.1.13
+
+## 0.16.6
+
+Mon, 26 Feb 2024 16:18:50 GMT
+
+### Patches
+
+- Fix undefined dependencies in info output (sverre.johansen@gmail.com)
+
 ## 0.16.5
 
-Thu, 21 Dec 2023 09:48:33 GMT
+Thu, 21 Dec 2023 09:49:09 GMT
 
 ### Patches
 

package/lib/commands/info/action.js

@@ -30,7 +30,7 @@ async function infoAction(options, command) {
     options.reporter = options.reporter ?? "json";
     (0, _initializeReporters.initializeReporters)(logger, options);
     const root = (0, _workspacetools.getWorkspaceRoot)(cwd);
-    const packageInfos = await (0, _workspacetools.getPackageInfosAsync)(root);
+    const packageInfos = (0, _workspacetools.getPackageInfos)(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);
@@ -76,13 +76,12 @@ function prepareAndGetFilteredPackages(config, logger, root, options, packageInf
 }
 function processTargets(targets, packageInfos, config) {
     const packageTasks = new Map(); // Initialize the map with the correct type
+    const dependenciesCache = new Map();
     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);
+        const packageTask = generatePackageTask(target, targets, packageInfos, dependenciesCache, config);
         if (packageTask) {
             // Check if the packageTask is defined before accessing its properties
             const packageName = packageTask.package;
@@ -94,22 +93,48 @@ function processTargets(targets, packageInfos, config) {
     }
     return packageTasks;
 }
+function isTargetNoop(target, packageInfos) {
+    return !packageInfos[target.packageName]?.scripts?.[target.task];
+}
 function shouldSkipTarget(target, packageInfos) {
-    return target.id === (0, _targetgraph.getStartTargetId)() || !packageInfos[target.packageName ?? ""]?.scripts?.[target.task];
+    return target.id === (0, _targetgraph.getStartTargetId)() || isTargetNoop(target, packageInfos);
 }
-function generatePackageTask(target, config) {
+function generatePackageTask(target, targets, packageInfos, dependenciesCache, config) {
     const command = generateCommand(target, config);
     const workingDirectory = getWorkingDirectory(target);
+    const dependenciesSet = resolveDependencies(target.dependencies, targets, packageInfos, dependenciesCache);
     const packageTask = {
         id: target.id,
         command,
-        dependencies: target.dependencies,
+        dependencies: [
+            ...dependenciesSet
+        ],
         workingDirectory,
         package: target.packageName,
         task: target.task
     };
     return packageTask;
 }
+function resolveDependencies(dependencies, targets, packageInfos, dependenciesCache) {
+    const result = new Set();
+    for (const dependency of dependencies){
+        if (dependency === (0, _targetgraph.getStartTargetId)()) {
+            continue;
+        }
+        if (!dependenciesCache.has(dependency)) {
+            const dependencyTarget = targets.get(dependency);
+            if (isTargetNoop(dependencyTarget, packageInfos)) {
+                dependenciesCache.set(dependency, resolveDependencies(dependencyTarget.dependencies, targets, packageInfos, dependenciesCache));
+            } else {
+                dependenciesCache.set(dependency, new Set([
+                    dependency
+                ]));
+            }
+        }
+        dependenciesCache.get(dependency)?.forEach((dependency)=>result.add(dependency));
+    }
+    return result;
+}
 function generateCommand(target, config) {
     const npmClient = config.npmClient ?? "npm";
     const command = [

package/lib/commands/run/runAction.js

@@ -38,7 +38,7 @@ async function runAction(options, command) {
     });
     // Build Target Graph
     const root = (0, _workspacetools.getWorkspaceRoot)(process.cwd());
-    const packageInfos = await (0, _workspacetools.getPackageInfosAsync)(root);
+    const packageInfos = (0, _workspacetools.getPackageInfos)(root);
     const { tasks , taskArgs  } = (0, _filterArgsForTasks.filterArgsForTasks)(command.args);
     const targetGraph = (0, _createTargetGraph.createTargetGraph)({
         logger,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lage-run/cli",
-  "version": "0.16.5",
+  "version": "0.16.7",
   "description": "Command Line Interface for Lage",
   "repository": {
     "type": "git",
@@ -23,10 +23,10 @@
     "@lage-run/cache": "^1.1.5",
     "@lage-run/config": "^0.3.5",
     "@lage-run/find-npm-client": "^0.1.4",
-    "@lage-run/hasher": "^1.0.7",
+    "@lage-run/hasher": "^1.1.0",
     "@lage-run/logger": "^1.3.0",
     "@lage-run/reporters": "^1.2.7",
-    "@lage-run/scheduler": "^1.1.12",
+    "@lage-run/scheduler": "^1.1.13",
     "@lage-run/scheduler-types": "^0.3.13",
     "@lage-run/target-graph": "^0.8.9",
     "chokidar": "3.5.3",