Include module_path field in JSON (#3288)

Author: casey

src/analyzer.rs

@@ -196,16 +196,16 @@ impl<'run, 'src> Analyzer<'run, 'src> {
     let mut unknown_overrides = Vec::new();
 
     for ((path, name), value) in &config.overrides {
-      if *path == ast.modulepath {
+      if *path == ast.module_path {
         if let Some(assignment) = assignments.get(name) {
           overrides.insert(assignment.number, value.clone());
         } else {
           unknown_overrides.push(path.join(name));
         }
-      } else if path.starts_with(&ast.modulepath)
+      } else if path.starts_with(&ast.module_path)
         && !self
           .modules
-          .contains_key(&path.components[ast.modulepath.components.len()])
+          .contains_key(&path.components[ast.module_path.components.len()])
       {
         unknown_overrides.push(format!("{path}::{name}"));
       }
@@ -257,7 +257,7 @@ impl<'run, 'src> Analyzer<'run, 'src> {
     let recipes = RecipeResolver::resolve_recipes(
       &assignments,
       &functions,
-      &ast.modulepath,
+      &ast.module_path,
       &self.modules,
       &settings,
       deduplicated_recipes,
@@ -311,7 +311,7 @@ impl<'run, 'src> Analyzer<'run, 'src> {
       functions,
       groups: groups.into(),
       loaded: loaded.into(),
-      modulepath: ast.modulepath.clone(),
+      module_path: ast.module_path.clone(),
       modules: self.modules,
       name,
       private,

src/ast.rs

@@ -6,7 +6,7 @@ use super::*;
 #[derive(Debug, Clone)]
 pub(crate) struct Ast<'src> {
   pub(crate) items: Vec<Item<'src>>,
-  pub(crate) modulepath: Modulepath,
+  pub(crate) module_path: Modulepath,
   pub(crate) unstable_features: BTreeSet<UnstableFeature>,
   pub(crate) warnings: Vec<Warning>,
   pub(crate) working_directory: PathBuf,

src/function.rs

@@ -465,7 +465,7 @@ fn module_file(context: Context) -> FunctionResult {
 }
 
 fn module_path(context: Context) -> FunctionResult {
-  Ok(context.execution_context.module.modulepath.to_string())
+  Ok(context.execution_context.module.module_path.to_string())
 }
 
 fn num_cpus(_context: Context) -> FunctionResult {

src/justfile.rs

@@ -21,8 +21,7 @@ pub(crate) struct Justfile<'src> {
   pub(crate) groups: Vec<StringLiteral<'src>>,
   #[serde(skip)]
   pub(crate) loaded: Vec<PathBuf>,
-  #[serde(skip)]
-  pub(crate) modulepath: Modulepath,
+  pub(crate) module_path: Modulepath,
   pub(crate) modules: Table<'src, Self>,
   #[serde(skip)]
   pub(crate) name: Option<Name<'src>>,
@@ -142,7 +141,7 @@ impl<'src> Justfile<'src> {
     )?;
 
     let scope = scope_arena.alloc(scope);
-    scopes.insert(self.modulepath.clone(), (self, scope, dotenv));
+    scopes.insert(self.module_path.clone(), (self, scope, dotenv));
 
     for module in self.modules.values() {
       module.evaluate_scopes(
@@ -260,7 +259,7 @@ impl<'src> Justfile<'src> {
           Some(HashSet::new()).as_ref(),
         )?;
 
-        let (_module, scope, dotenv) = scopes.get(&self.modulepath).unwrap();
+        let (_module, scope, dotenv) = scopes.get(&self.module_path).unwrap();
         let scope = scope.child();
 
         command.export(&self.settings, dotenv, &scope, &self.unexports);
@@ -302,7 +301,7 @@ impl<'src> Justfile<'src> {
           Some(&variable_references),
         )?;
 
-        let scope = scopes.get(&module.modulepath).unwrap().1;
+        let scope = scopes.get(&module.module_path).unwrap().1;
 
         if let Some(variable) = variable {
           print!("{}", scope.value(variable).unwrap());
@@ -601,7 +600,7 @@ impl<'src> Justfile<'src> {
     while let Some(current) = stack.pop() {
       for alias in current.aliases.values() {
         if alias.is_public() {
-          aliases.push((alias, &current.modulepath));
+          aliases.push((alias, &current.module_path));
         }
       }
 

src/parser.rs

@@ -444,7 +444,7 @@ impl<'run, 'src> Parser<'run, 'src> {
 
     Ok(Ast {
       items: self.items,
-      modulepath: self.module_namepath.map(Into::into).unwrap_or_default(),
+      module_path: self.module_namepath.map(Into::into).unwrap_or_default(),
       unstable_features: self.unstable_features,
       warnings: Vec::new(),
       working_directory: self.working_directory.into(),

tests/json.rs

@@ -40,6 +40,7 @@ struct Module<'a> {
   doc: Option<&'a str>,
   first: Option<&'a str>,
   groups: Vec<&'a str>,
+  module_path: &'a str,
   modules: BTreeMap<&'a str, Module<'a>>,
   recipes: BTreeMap<&'a str, Recipe<'a>>,
   settings: Settings<'a>,
@@ -887,6 +888,7 @@ fn module() {
         Module {
           doc: Some("hello"),
           first: Some("bar"),
+          module_path: "foo",
           source: "foo.just".into(),
           recipes: [(
             "bar",
@@ -920,6 +922,7 @@ fn module_group() {
         Module {
           first: Some("bar"),
           groups: ["alpha"].into(),
+          module_path: "foo",
           source: "foo.just".into(),
           recipes: [(
             "bar",