Test inheritance.

nextgen/project-expander/src/project_expander.rs

@@ -1,10 +1,12 @@
 use crate::expander_context::{ExpanderContext, ExpansionBoundaries};
 use crate::tasks_expander::TasksExpander;
+use moon_common::color;
 use moon_config::DependencyConfig;
 use moon_project::Project;
 use rustc_hash::FxHashMap;
 use std::collections::BTreeMap;
 use std::mem;
+use tracing::debug;
 
 pub struct ProjectExpander<'graph, 'query> {
     context: ExpanderContext<'graph, 'query>,
@@ -19,6 +21,12 @@ impl<'graph, 'query> ProjectExpander<'graph, 'query> {
         // Clone before expanding!
         let mut project = self.context.project.to_owned();
 
+        debug!(
+            id = project.id.as_str(),
+            "Expanding project {}",
+            color::id(&project.id)
+        );
+
         self.expand_deps(&mut project)?;
         self.expand_tasks(&mut project, boundaries)?;
 
@@ -59,6 +67,12 @@ impl<'graph, 'query> ProjectExpander<'graph, 'query> {
         let mut expander = TasksExpander::new(&self.context);
 
         for (task_id, mut task) in mem::take(&mut project.tasks) {
+            debug!(
+                target = task.target.as_str(),
+                "Expanding task {}",
+                color::label(&task.target)
+            );
+
             // Resolve in this order!
             expander.expand_env(&mut task)?;
             expander.expand_deps(&mut task)?;

nextgen/project-graph/src/project_graph.rs

@@ -112,8 +112,8 @@ impl ProjectGraph {
 
     /// Return all projects from the graph.
     pub fn get_all(&self) -> miette::Result<Vec<Arc<Project>>> {
-        let mut all = vec![];
         let mut boundaries = ExpansionBoundaries::default();
+        let mut all = vec![];
 
         for id in self.nodes.keys() {
             all.push(self.internal_get(id, &mut boundaries)?);
@@ -185,7 +185,7 @@ impl ProjectGraph {
     pub fn query<Q: AsRef<Criteria>>(&self, query: Q) -> miette::Result<Vec<Arc<Project>>> {
         let mut projects = vec![];
 
-        for id in self.raw_query(query)? {
+        for id in self.internal_query(query)? {
             projects.push(self.get(id)?);
         }
 
@@ -262,15 +262,13 @@ impl ProjectGraph {
 
         // Otherwise expand the project and cache it with an Arc
         {
-            debug!(id = id.as_str(), "Expanding project {}", color::id(&id));
-
             let query = |input: String| {
                 let mut results = vec![];
 
                 // Don't use get() for expanded projects, since it'll overflow the
                 // stack trying to recursively expand projects! Using unexpanded
                 // dependent projects works just fine for the this entire process.
-                for result_id in self.raw_query(build_query(input)?)? {
+                for result_id in self.internal_query(build_query(input)?)? {
                     results.push(self.get_unexpanded(result_id)?);
                 }
 
@@ -291,7 +289,7 @@ impl ProjectGraph {
         Ok(Arc::clone(self.read_cache().get(&id).unwrap()))
     }
 
-    fn raw_query<Q: AsRef<Criteria>>(&self, query: Q) -> miette::Result<&[Id]> {
+    fn internal_query<Q: AsRef<Criteria>>(&self, query: Q) -> miette::Result<&[Id]> {
         let query = query.as_ref();
         let query_input = query
             .input

nextgen/project-graph/tests/__fixtures__/aliases/dupes-task-deps/moon.yml

@@ -1,5 +1,5 @@
 tasks:
   no-dupes:
     deps:
-      - '@one:noop'
-      - 'alias-one:noop'
+      - '@one:global'
+      - 'alias-one:global'

nextgen/project-graph/tests/__fixtures__/aliases/tasks/moon.yml

@@ -1,6 +1,6 @@
 tasks:
   with-aliases:
     deps:
-      - '@one:noop'
-      - '@three:noop'
-      - 'implicit:noop'
+      - '@one:global'
+      - '@three:global'
+      - 'implicit:global'

nextgen/project-graph/tests/__fixtures__/inheritance/file-groups/.moon/tasks.yml

@@ -0,0 +1,5 @@
+fileGroups:
+  sources:
+    - 'sources/**/*'
+  tests:
+    - 'tests/**/*'

nextgen/project-graph/tests/__fixtures__/inheritance/file-groups/project/moon.yml

@@ -0,0 +1,5 @@
+fileGroups:
+  sources:
+    - 'src/**/*'
+  configs:
+    - 'config.*'

nextgen/project-graph/tests/__fixtures__/inheritance/implicits/.moon/tasks.yml

@@ -0,0 +1,5 @@
+implicitDeps:
+  - base:local
+
+implicitInputs:
+  - global.*

nextgen/project-graph/tests/__fixtures__/inheritance/implicits/base/moon.yml

@@ -0,0 +1,2 @@
+tasks:
+  local: {}

nextgen/project-graph/tests/__fixtures__/inheritance/implicits/project/moon.yml

@@ -0,0 +1,7 @@
+tasks:
+  example:
+    deps:
+      - 'other'
+    inputs:
+      - 'local.txt'
+  other: {}

nextgen/project-graph/tests/__fixtures__/inheritance/scoped/.moon/tasks.yml

@@ -0,0 +1,3 @@
+tasks:
+  global:
+    command: global

nextgen/project-graph/tests/__fixtures__/inheritance/scoped/.moon/tasks/node-library.yml

@@ -0,0 +1,3 @@
+tasks:
+  global-node-library:
+    command: global-node-library

nextgen/project-graph/tests/__fixtures__/inheritance/scoped/.moon/tasks/node.yml

@@ -0,0 +1,3 @@
+tasks:
+  global-node:
+    command: global-node