chore: sync files from source repo

Author: gnpaone

CHANGELOG.md

@@ -1,6 +1,13 @@
 Changelog
 =========
 
+[1.42.4](https://github.com/casey/just/releases/tag/1.42.4) - 2025-07-24
+------------------------------------------------------------------------
+
+### Fixed
+- Run imported recipes in correct scope ([#2835](https://github.com/casey/just/pull/2835) by [casey](https://github.com/casey))
+- Fix alias doc comment ([#2833](https://github.com/casey/just/pull/2833) by [casey](https://github.com/casey))
+
 [1.42.3](https://github.com/casey/just/releases/tag/1.42.3) - 2025-07-18
 ------------------------------------------------------------------------
 

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "just"
-version = "1.42.3"
+version = "1.42.4"
 authors = ["Casey Rodarmor <casey@rodarmor.com>"]
 autotests = false
 categories = ["command-line-utilities", "development-tools"]

Cargo.toml

@@ -14,7 +14,7 @@ pub(crate) struct Alias<'src, T = Arc<Recipe<'src>>> {
 
 impl<'src> Alias<'src, Namepath<'src>> {
   pub(crate) fn resolve(self, target: Arc<Recipe<'src>>) -> Alias<'src> {
-    assert!(self.target.last().lexeme() == target.namepath.last().lexeme());
+    assert!(self.target.last().lexeme() == target.name());
 
     Alias {
       attributes: self.attributes,

src/alias.rs

@@ -147,6 +147,7 @@ impl<'run, 'src> Analyzer<'run, 'src> {
 
     let recipes = RecipeResolver::resolve_recipes(
       &assignments,
+      &ast.module_path,
       &self.modules,
       &settings,
       deduplicated_recipes,

src/analyzer.rs

@@ -16,8 +16,13 @@ impl Compiler {
     stack.push(Source::root(root));
 
     while let Some(current) = stack.pop() {
+      if paths.contains_key(&current.path) {
+        continue;
+      }
+
       let (relative, src) = loader.load(root, &current.path)?;
       loaded.push(relative.into());
+
       let tokens = Lexer::lex(relative, src)?;
       let mut ast = Parser::parse(
         current.file_depth,

src/compiler.rs

@@ -303,12 +303,12 @@ impl<'src> Justfile<'src> {
     config: &Config,
     dotenv: &BTreeMap<String, String>,
     is_dependency: bool,
-    ran: &Ran<'src>,
+    ran: &Ran,
     recipe: &Recipe<'src>,
     scopes: &BTreeMap<String, (&Justfile<'src>, &Scope<'src, '_>)>,
     search: &Search,
   ) -> RunResult<'src> {
-    let mutex = ran.mutex(&recipe.namepath, arguments);
+    let mutex = ran.mutex(recipe, arguments);
 
     let mut guard = mutex.lock().unwrap();
 
@@ -323,7 +323,7 @@ impl<'src> Justfile<'src> {
     }
 
     let (module, scope) = scopes
-      .get(&recipe.module_path())
+      .get(recipe.module_path())
       .expect("failed to retrieve scope for module");
 
     let context = ExecutionContext {
@@ -382,7 +382,7 @@ impl<'src> Justfile<'src> {
     dependencies: &[Dependency<'src>],
     dotenv: &BTreeMap<String, String>,
     evaluator: &mut Evaluator<'src, 'run>,
-    ran: &Ran<'src>,
+    ran: &Ran,
     recipe: &Recipe<'src>,
     scopes: &BTreeMap<String, (&Justfile<'src>, &Scope<'src, 'run>)>,
     search: &Search,

src/justfile.rs

@@ -8,13 +8,6 @@ impl<'src> Namepath<'src> {
     Self(self.0.iter().copied().chain(iter::once(name)).collect())
   }
 
-  pub(crate) fn spaced(&self) -> ModulePath {
-    ModulePath {
-      path: self.0.iter().map(|name| name.lexeme().into()).collect(),
-      spaced: true,
-    }
-  }
-
   pub(crate) fn push(&mut self, name: Name<'src>) {
     self.0.push(name);
   }

src/namepath.rs

@@ -1013,9 +1013,7 @@ impl<'run, 'src> Parser<'run, 'src> {
       file_depth: self.file_depth,
       import_offsets: self.import_offsets.clone(),
       name,
-      namepath: self
-        .module_namepath
-        .map_or_else(|| name.into(), |module_namepath| module_namepath.join(name)),
+      namepath: None,
       parameters: positional.into_iter().chain(variadic).collect(),
       priors,
       private,

src/parser.rs

@@ -1,17 +1,15 @@
 use super::*;
 
 #[derive(Default)]
-pub(crate) struct Ran<'src>(
-  Mutex<BTreeMap<Namepath<'src>, BTreeMap<Vec<String>, Arc<Mutex<bool>>>>>,
-);
+pub(crate) struct Ran(Mutex<BTreeMap<String, BTreeMap<Vec<String>, Arc<Mutex<bool>>>>>);
 
-impl<'src> Ran<'src> {
-  pub(crate) fn mutex(&self, recipe: &Namepath<'src>, arguments: &[String]) -> Arc<Mutex<bool>> {
+impl Ran {
+  pub(crate) fn mutex(&self, recipe: &Recipe, arguments: &[String]) -> Arc<Mutex<bool>> {
     self
       .0
       .lock()
       .unwrap()
-      .entry(recipe.clone())
+      .entry(recipe.namepath().into())
       .or_default()
       .entry(arguments.into())
       .or_default()