internal: Task fixes and improvements. (#1974)

* Move impl.

* Add tests.

* Hash action data.

* Rework via.

* Rework env substitution.

* Fixes.

* Fixes.

Author: milesj

CHANGELOG.md

@@ -42,6 +42,10 @@
 - Fixed an issue where terminal prompt validation would not trigger.
 - Fixed an issue with remote cache hydration where multiple files with the same blob hash would fail
   to write them all.
+- Fixed an issue where changing `args` or `env` of a task dependency would not invalidate its cache.
+- Fixed an issue where environment variables passed on the command line would not overwrite task
+  `env`.
+- Fixed tag-based task dependencies not creating implicit project dependencies.
 - Fixed some task/command argument quoting issues.
 
 #### 🧩 Plugins

crates/app/src/commands/project.rs

@@ -169,10 +169,13 @@ pub async fn project(session: MoonSession, args: ProjectArgs) -> AppResult {
                                 ListItem {
                                     StyledText(
                                         content: format!(
-                                            "{} <mutedlight>({}, {})</mutedlight>",
+                                            "{} <mutedlight>({})</mutedlight>",
                                             dep.id,
-                                            dep.source,
-                                            dep.scope,
+                                            if let Some(via) = &dep.via {
+                                                format!("{} via {via}", dep.scope)
+                                            } else {
+                                                dep.scope.to_string()
+                                            },
                                         ),
                                         style: Style::Id
                                     )

crates/cli/tests/snapshots/project_test__basic_config.snap

@@ -11,7 +11,7 @@ About ──────────────────
   Stack: unknown
   Type: unknown
   Depends on:
-    - noConfig (explicit, production)
+    - noConfig (production)
 
 Configuation ───────────
 

crates/cli/tests/snapshots/project_test__depends_on_paths.snap

@@ -11,8 +11,8 @@ About ──────────────────
   Stack: unknown
   Type: application
   Depends on:
-    - baz (explicit, production)
-    - bar (explicit, production)
+    - baz (production)
+    - bar (production)
 
 Configuation ───────────
 

crates/env-var/src/env_scanner.rs

@@ -0,0 +1,43 @@
+use crate::env_substitutor::ENV_VAR_SUBSTITUTE;
+use rustc_hash::FxHashSet;
+
+#[derive(Default)]
+pub struct EnvScanner {
+    pub found: FxHashSet<String>,
+}
+
+impl EnvScanner {
+    pub fn scan(&mut self, value: impl AsRef<str>) -> String {
+        self.do_scan(value)
+    }
+
+    fn do_scan(&mut self, value: impl AsRef<str>) -> String {
+        let value = value.as_ref();
+
+        if !value.contains('$') {
+            self.found.clear();
+
+            return value.to_owned();
+        }
+
+        let mut found = FxHashSet::default();
+
+        let result = ENV_VAR_SUBSTITUTE.replace_all(value, |caps: &regex::Captures| {
+            let Some(name) = caps
+                .name("name1")
+                .or_else(|| caps.name("name2"))
+                .map(|cap| cap.as_str())
+            else {
+                return String::new();
+            };
+
+            found.insert(name.to_owned());
+
+            format!("${name}")
+        });
+
+        self.found = found;
+
+        result.to_string()
+    }
+}

crates/env-var/src/lib.rs

@@ -1,5 +1,7 @@
+mod env_scanner;
 mod env_substitutor;
 mod global_bag;
 
+pub use env_scanner::*;
 pub use env_substitutor::*;
 pub use global_bag::*;

crates/process/src/command.rs

@@ -4,6 +4,7 @@
 use crate::shell::Shell;
 use moon_common::{color, is_test_env};
 use moon_console::Console;
+use moon_env_var::GlobalEnvBag;
 use rustc_hash::{FxHashMap, FxHasher};
 use std::collections::VecDeque;
 use std::env;
@@ -143,6 +144,25 @@ impl Command {
         self
     }
 
+    pub fn envs_if_not_global<I, K, V>(&mut self, vars: I) -> &mut Self
+    where
+        I: IntoIterator<Item = (K, V)>,
+        K: AsRef<OsStr>,
+        V: AsRef<OsStr>,
+    {
+        let bag = GlobalEnvBag::instance();
+
+        for (k, v) in vars {
+            let k = k.as_ref();
+
+            if !bag.has(k) {
+                self.env(k, v);
+            }
+        }
+
+        self
+    }
+
     pub fn inherit_colors(&mut self) -> &mut Self {
         // Don't show colors in our own tests, as it disrupts snapshots
         if !is_test_env() {

crates/project-builder/src/project_builder.rs

@@ -1,14 +1,13 @@
 use moon_common::path::WorkspaceRelativePath;
 use moon_common::{Id, color};
 use moon_config::{
-    ConfigLoader, DependencyConfig, DependencyScope, DependencySource, InheritedTasksManager,
-    InheritedTasksResult, LanguageType, ProjectConfig, ProjectDependsOn, TaskConfig,
-    ToolchainConfig,
+    ConfigLoader, DependencyConfig, DependencySource, InheritedTasksManager, InheritedTasksResult,
+    LanguageType, ProjectConfig, ProjectDependsOn, TaskConfig, ToolchainConfig,
 };
 use moon_file_group::FileGroup;
 use moon_project::Project;
-use moon_task::{TargetScope, Task};
-use moon_task_builder::{TasksBuilder, TasksBuilderContext};
+use moon_task::Task;
+use moon_task_builder::{TasksBuilder, TasksBuilderContext, create_project_dep_from_task_dep};
 use moon_toolchain::detect::{
     detect_project_language, detect_project_toolchains, get_project_toolchains,
 };
@@ -312,35 +311,19 @@ impl<'app> ProjectBuilder<'app> {
         // Tasks can depend on arbitrary projects, so include them also
         for task_config in tasks.values() {
             for task_dep in &task_config.deps {
-                if let TargetScope::Project(dep_id) = &task_dep.target.scope {
-                    // Already a dependency, or references self
-                    if deps.contains_key(dep_id)
-                        || self.id == dep_id
-                        || self.alias.as_ref().is_some_and(|a| *a == dep_id.as_str())
-                    {
-                        continue;
-                    }
-
-                    trace!(
-                        project_id = self.id.as_str(),
-                        dep_id = dep_id.as_str(),
-                        task_target = task_config.target.as_str(),
-                        "Marking arbitrary project as an implicit dependency because of a task dependency"
-                    );
-
-                    deps.insert(
-                        dep_id.to_owned(),
-                        DependencyConfig {
-                            id: dep_id.to_owned(),
-                            scope: if self.context.root_project_id.is_some_and(|id| id == dep_id) {
-                                DependencyScope::Root
-                            } else {
-                                DependencyScope::Build
-                            },
-                            source: DependencySource::Implicit,
-                            via: Some(task_config.target.to_string()),
-                        },
-                    );
+                if let Some(dep_config) = create_project_dep_from_task_dep(
+                    task_dep,
+                    self.id,
+                    self.context.root_project_id,
+                    |dep_project_id| {
+                        deps.contains_key(dep_project_id)
+                            || self
+                                .alias
+                                .as_ref()
+                                .is_some_and(|alias| alias.as_str() == dep_project_id.as_str())
+                    },
+                ) {
+                    deps.insert(dep_config.id.clone(), dep_config);
                 }
             }
         }

crates/task-builder/Cargo.toml

@@ -11,6 +11,7 @@ publish = false
 [dependencies]
 moon_common = { path = "../common" }
 moon_config = { path = "../config", features = ["loader"] }
+moon_project = { path = "../project" }
 moon_target = { path = "../target" }
 moon_task = { path = "../task" }
 moon_task_args = { path = "../task-args" }