keep no-cd as is, introduce new attr/setting

Author: hans-d

README.md

@@ -941,6 +941,11 @@ it can't appear alongside `set working-directory` in the same `justfile`.
 Recipe-level attributes still take precedence: `[working-directory(...)]`
 overrides both, and `[no-cd]` on a recipe overrides `set working-directory`.
 
+Path resolution remains the same by default: backticks, functions like
+`read()`, and shell() calls use the module's working directory even if `no-cd`
+is set. To also resolve these relative to the invocation directory when
+skipping `cd`, turn on `set no-cd-strict := true`.
+
 You can override the working directory for all recipes with
 `set working-directory := '…'`:
 
@@ -1033,6 +1038,7 @@ foo:
 | `fallback` | boolean | `false` | Search `justfile` in parent directory if the first recipe on the command line is not found. |
 | `ignore-comments` | boolean | `false` | Ignore recipe lines beginning with `#`. |
 | `no-cd` | boolean | `false` | Don't change directory before executing recipes and evaluating backticks, unless overridden by recipe attributes. |
+| `no-cd-strict` | boolean | `false` | When `no-cd` is set, also resolve backticks, shell functions, and path helpers relative to the invocation directory instead of the module directory. |
 | `positional-arguments` | boolean | `false` | Pass positional arguments. |
 | `quiet` | boolean | `false` | Disable echoing recipe lines before executing. |
 | `script-interpreter`<sup>1.33.0</sup> | `[COMMAND, ARGS…]` | `['sh', '-eu']` | Set command used to invoke recipes with empty `[script]` attribute. |

src/evaluator.rs

@@ -1,25 +1,13 @@
-use {super::*, std::path::Path};
+use super::*;
 
 pub(crate) struct Evaluator<'src: 'run, 'run> {
   pub(crate) assignments: Option<&'run Table<'src, Assignment<'src>>>,
   pub(crate) context: ExecutionContext<'src, 'run>,
   pub(crate) is_dependency: bool,
   pub(crate) scope: Scope<'src, 'run>,
-  pub(crate) working_directory: Option<PathBuf>,
 }
 
 impl<'src, 'run> Evaluator<'src, 'run> {
-  pub(crate) fn working_directory(&self) -> Option<&Path> {
-    self.working_directory.as_deref()
-  }
-
-  pub(crate) fn working_directory_or_invocation(&self) -> PathBuf {
-    self
-      .working_directory
-      .clone()
-      .unwrap_or_else(|| self.context.config.invocation_directory.clone())
-  }
-
   pub(crate) fn evaluate_assignments(
     config: &'run Config,
     dotenv: &'run BTreeMap<String, String>,
@@ -67,7 +55,6 @@ impl<'src, 'run> Evaluator<'src, 'run> {
       assignments: Some(&module.assignments),
       scope,
       is_dependency: false,
-      working_directory: context.module_default_working_directory(),
     };
 
     for assignment in module.assignments.values() {
@@ -288,9 +275,7 @@ impl<'src, 'run> Evaluator<'src, 'run> {
 
     cmd.arg(command).args(args);
 
-    if let Some(working_directory) = self.working_directory() {
-      cmd.current_dir(working_directory);
-    }
+    cmd.current_dir(self.context.path_working_directory());
 
     cmd
       .export(
@@ -341,9 +326,8 @@ impl<'src, 'run> Evaluator<'src, 'run> {
     arguments: &[String],
     parameters: &[Parameter<'src>],
     scope: &'run Scope<'src, 'run>,
-    working_directory: Option<PathBuf>,
   ) -> RunResult<'src, (Scope<'src, 'run>, Vec<String>)> {
-    let mut evaluator = Self::new(context, is_dependency, scope, working_directory);
+    let mut evaluator = Self::new(context, is_dependency, scope);
 
     let mut positional = Vec::new();
 
@@ -391,14 +375,12 @@ impl<'src, 'run> Evaluator<'src, 'run> {
     context: &ExecutionContext<'src, 'run>,
     is_dependency: bool,
     scope: &'run Scope<'src, 'run>,
-    working_directory: Option<PathBuf>,
   ) -> Self {
     Self {
       assignments: None,
       context: *context,
       is_dependency,
       scope: scope.child(),
-      working_directory: working_directory.or_else(|| context.module_default_working_directory()),
     }
   }
 }

src/execution_context.rs

@@ -39,8 +39,8 @@ impl<'src: 'run, 'run> ExecutionContext<'src, 'run> {
     })
   }
 
-  pub(crate) fn module_base_directory(&self) -> PathBuf {
-    if self.module.is_submodule() {
+  pub(crate) fn working_directory(&self) -> PathBuf {
+    let base = if self.module.is_submodule() {
       self
         .module
         .source
@@ -49,11 +49,7 @@ impl<'src: 'run, 'run> ExecutionContext<'src, 'run> {
         .unwrap_or_else(|| self.search.working_directory.clone())
     } else {
       self.search.working_directory.clone()
-    }
-  }
-
-  pub(crate) fn module_working_directory(&self) -> PathBuf {
-    let base = self.module_base_directory();
+    };
 
     if let Some(setting) = &self.module.settings.working_directory {
       base.join(setting)
@@ -62,11 +58,11 @@ impl<'src: 'run, 'run> ExecutionContext<'src, 'run> {
     }
   }
 
-  pub(crate) fn module_default_working_directory(&self) -> Option<PathBuf> {
-    if self.module.settings.no_cd {
-      None
+  pub(crate) fn path_working_directory(&self) -> PathBuf {
+    if self.module.settings.no_cd && self.module.settings.no_cd_strict {
+      self.config.invocation_directory.clone()
     } else {
-      Some(self.module_working_directory())
+      self.working_directory()
     }
   }
 }

src/function.rs

@@ -134,7 +134,7 @@ impl Function {
 }
 
 fn absolute_path(context: Context, path: &str) -> FunctionResult {
-  let working_directory = context.evaluator.working_directory_or_invocation();
+  let working_directory = context.evaluator.context.path_working_directory();
   let abs_path_unchecked = working_directory.join(path).lexiclean();
   match abs_path_unchecked.to_str() {
     Some(absolute_path) => Ok(absolute_path.to_owned()),
@@ -165,7 +165,8 @@ fn blake3(_context: Context, s: &str) -> FunctionResult {
 fn blake3_file(context: Context, path: &str) -> FunctionResult {
   let path = context
     .evaluator
-    .working_directory_or_invocation()
+    .context
+    .path_working_directory()
     .join(path);
   let mut hasher = blake3::Hasher::new();
   hasher
@@ -178,7 +179,8 @@ fn canonicalize(context: Context, path: &str) -> FunctionResult {
   let canonical = std::fs::canonicalize(
     context
       .evaluator
-      .working_directory_or_invocation()
+      .context
+      .path_working_directory()
       .join(path),
   )
   .map_err(|err| format!("I/O error canonicalizing path: {err}"))?;
@@ -499,7 +501,8 @@ fn path_exists(context: Context, path: &str) -> FunctionResult {
   Ok(
     context
       .evaluator
-      .working_directory_or_invocation()
+      .context
+      .path_working_directory()
       .join(path)
       .exists()
       .to_string(),
@@ -514,7 +517,8 @@ fn read(context: Context, filename: &str) -> FunctionResult {
   fs::read_to_string(
     context
       .evaluator
-      .working_directory_or_invocation()
+      .context
+      .path_working_directory()
       .join(filename),
   )
   .map_err(|err| format!("I/O error reading `{filename}`: {err}"))
@@ -549,7 +553,8 @@ fn sha256_file(context: Context, path: &str) -> FunctionResult {
   use sha2::{Digest, Sha256};
   let path = context
     .evaluator
-    .working_directory_or_invocation()
+    .context
+    .path_working_directory()
     .join(path);
   let mut hasher = Sha256::new();
   let mut file =

src/justfile.rs

@@ -343,20 +343,17 @@ impl<'src> Justfile<'src> {
       search,
     };
 
-    let recipe_working_directory = recipe.working_directory(&context);
-
     let (outer, positional) = Evaluator::evaluate_parameters(
       &context,
       is_dependency,
       arguments,
       &recipe.parameters,
       scope,
-      recipe_working_directory.clone(),
     )?;
 
     let scope = outer.child();
 
-    let mut evaluator = Evaluator::new(&context, true, &scope, recipe_working_directory.clone());
+    let mut evaluator = Evaluator::new(&context, true, &scope);
 
     Self::run_dependencies(
       config,

src/keyword.rs

@@ -21,6 +21,7 @@ pub(crate) enum Keyword {
   Import,
   Mod,
   NoCd,
+  NoCdStrict,
   NoExitMessage,
   PositionalArguments,
   Quiet,

src/node.rs

@@ -308,6 +308,7 @@ impl<'src> Node<'src> for Set<'src> {
       | Setting::Export(value)
       | Setting::Fallback(value)
       | Setting::NoCd(value)
+      | Setting::NoCdStrict(value)
       | Setting::NoExitMessage(value)
       | Setting::PositionalArguments(value)
       | Setting::Quiet(value)

src/parser.rs

@@ -1127,6 +1127,7 @@ impl<'run, 'src> Parser<'run, 'src> {
       Keyword::Fallback => Some(Setting::Fallback(self.parse_set_bool()?)),
       Keyword::IgnoreComments => Some(Setting::IgnoreComments(self.parse_set_bool()?)),
       Keyword::NoCd => Some(Setting::NoCd(self.parse_set_bool()?)),
+      Keyword::NoCdStrict => Some(Setting::NoCdStrict(self.parse_set_bool()?)),
       Keyword::NoExitMessage => Some(Setting::NoExitMessage(self.parse_set_bool()?)),
       Keyword::PositionalArguments => Some(Setting::PositionalArguments(self.parse_set_bool()?)),
       Keyword::Quiet => Some(Setting::Quiet(self.parse_set_bool()?)),
@@ -2308,6 +2309,12 @@ mod tests {
     tree: (justfile (set no_cd true)),
   }
 
+  test! {
+    name: set_no_cd_strict,
+    text: "set no-cd-strict := true",
+    tree: (justfile (set no_cd_strict true)),
+  }
+
   test! {
     name: set_positional_arguments_false,
     text: "set positional-arguments := false",

src/recipe.rs

@@ -1,4 +1,4 @@
-use {super::*, std::path::Path};
+use super::*;
 
 /// Return a `Error::Signal` if the process was terminated by a signal,
 /// otherwise return an `Error::UnknownFailure`
@@ -173,11 +173,7 @@ impl<'src, D> Recipe<'src, D> {
   }
 
   pub(crate) fn working_directory<'a>(&'a self, context: &'a ExecutionContext) -> Option<PathBuf> {
-    let module_default = context.module_default_working_directory();
-    let module_working_directory = module_default
-      .as_deref()
-      .map(Path::to_path_buf)
-      .unwrap_or_else(|| context.module_working_directory());
+    let module_working_directory = context.working_directory();
 
     for attribute in &self.attributes {
       if let Attribute::WorkingDirectory(dir) = attribute {
@@ -189,7 +185,7 @@ impl<'src, D> Recipe<'src, D> {
       return None;
     }
 
-    module_default
+    Some(module_working_directory)
   }
 
   fn no_quiet(&self) -> bool {
@@ -217,14 +213,12 @@ impl<'src, D> Recipe<'src, D> {
       }
     }
 
-    let working_directory = self.working_directory(context);
-
-    let evaluator = Evaluator::new(context, is_dependency, scope, working_directory.clone());
+    let evaluator = Evaluator::new(context, is_dependency, scope);
 
     if self.is_script() {
-      self.run_script(context, scope, positional, evaluator, working_directory)
+      self.run_script(context, scope, positional, evaluator)
     } else {
-      self.run_linewise(context, scope, positional, evaluator, working_directory)
+      self.run_linewise(context, scope, positional, evaluator)
     }
   }
 
@@ -234,7 +228,6 @@ impl<'src, D> Recipe<'src, D> {
     scope: &Scope<'src, 'run>,
     positional: &[String],
     mut evaluator: Evaluator<'src, 'run>,
-    working_directory: Option<PathBuf>,
   ) -> RunResult<'src, ()> {
     let config = &context.config;
 
@@ -316,7 +309,7 @@ impl<'src, D> Recipe<'src, D> {
 
       let mut cmd = context.module.settings.shell_command(config);
 
-      if let Some(working_directory) = working_directory.as_deref() {
+      if let Some(working_directory) = self.working_directory(context) {
         cmd.current_dir(working_directory);
       }
 
@@ -382,7 +375,6 @@ impl<'src, D> Recipe<'src, D> {
     scope: &Scope<'src, 'run>,
     positional: &[String],
     mut evaluator: Evaluator<'src, 'run>,
-    working_directory: Option<PathBuf>,
   ) -> RunResult<'src, ()> {
     let config = &context.config;
 
@@ -453,7 +445,12 @@ impl<'src, D> Recipe<'src, D> {
       io_error: error,
     })?;
 
-    let mut command = executor.command(config, &path, self.name(), working_directory.as_deref())?;
+    let mut command = executor.command(
+      config,
+      &path,
+      self.name(),
+      self.working_directory(context).as_deref(),
+    )?;
 
     if self.takes_positional_arguments(&context.module.settings) {
       command.args(positional);

src/setting.rs

@@ -13,6 +13,7 @@ pub(crate) enum Setting<'src> {
   Fallback(bool),
   IgnoreComments(bool),
   NoCd(bool),
+  NoCdStrict(bool),
   NoExitMessage(bool),
   PositionalArguments(bool),
   Quiet(bool),
@@ -37,6 +38,7 @@ impl Display for Setting<'_> {
       | Self::Fallback(value)
       | Self::IgnoreComments(value)
       | Self::NoCd(value)
+      | Self::NoCdStrict(value)
       | Self::NoExitMessage(value)
       | Self::PositionalArguments(value)
       | Self::Quiet(value)