Fix config loading precedence for v3 transformers (#884)

Author: mattcompiles

.changeset/fix-config-precedence.md

@@ -0,0 +1,5 @@
+---
+'@atlaspack/rust': patch
+---
+
+Fix config loading precedence for v3 transformer patterns

Cargo.lock

@@ -24,4 +24,5 @@ serde_json5 = { workspace = true }
 
 [dev-dependencies]
 anyhow = { workspace = true }
+atlaspack_test_fixtures = { path = "../atlaspack_test_fixtures" }
 mockall = { workspace = true }

crates/atlaspack_config/Cargo.toml

@@ -3,7 +3,6 @@ use std::sync::Arc;
 
 use atlaspack_core::diagnostic_error;
 use atlaspack_core::types::DiagnosticError;
-use indexmap::IndexMap;
 use serde::Deserialize;
 use serde::Serialize;
 
@@ -38,36 +37,17 @@ impl TryFrom<PartialAtlaspackConfig> for AtlaspackConfig {
   type Error = DiagnosticError;
 
   fn try_from(config: PartialAtlaspackConfig) -> Result<Self, Self::Error> {
-    // The final stage of merging filters out any ... extensions as they are a noop
-    fn filter_out_extends(pipelines: Vec<PluginNode>) -> Vec<PluginNode> {
-      pipelines
-        .into_iter()
-        .filter(|p| p.package_name != "...")
-        .collect()
-    }
-
-    fn filter_out_extends_from_map(
-      map: IndexMap<String, Vec<PluginNode>>,
-    ) -> IndexMap<String, Vec<PluginNode>> {
-      map
-        .into_iter()
-        .map(|(pattern, plugins)| (pattern, filter_out_extends(plugins)))
-        .collect()
-    }
-
     let mut missing_phases = Vec::new();
 
     if config.bundler.is_none() {
       missing_phases.push(String::from("bundler"));
     }
 
-    let namers = filter_out_extends(config.namers);
-    if namers.is_empty() {
+    if config.namers.is_empty() {
       missing_phases.push(String::from("namers"));
     }
 
-    let resolvers = filter_out_extends(config.resolvers);
-    if resolvers.is_empty() {
+    if config.resolvers.is_empty() {
       missing_phases.push(String::from("resolvers"));
     }
 
@@ -80,15 +60,15 @@ impl TryFrom<PartialAtlaspackConfig> for AtlaspackConfig {
 
     Ok(AtlaspackConfig {
       bundler: config.bundler.unwrap(),
-      compressors: PipelinesMap::new(filter_out_extends_from_map(config.compressors)),
-      namers,
-      optimizers: NamedPipelinesMap::new(filter_out_extends_from_map(config.optimizers)),
+      compressors: PipelinesMap::new(config.compressors),
+      namers: config.namers,
+      optimizers: NamedPipelinesMap::new(config.optimizers),
       packagers: PipelineMap::new(config.packagers),
-      reporters: filter_out_extends(config.reporters),
-      resolvers,
-      runtimes: filter_out_extends(config.runtimes),
-      transformers: NamedPipelinesMap::new(filter_out_extends_from_map(config.transformers)),
-      validators: PipelinesMap::new(filter_out_extends_from_map(config.validators)),
+      reporters: config.reporters,
+      resolvers: config.resolvers,
+      runtimes: config.runtimes,
+      transformers: NamedPipelinesMap::new(config.transformers),
+      validators: PipelinesMap::new(config.validators),
     })
   }
 }
@@ -113,33 +93,5 @@ mod tests {
         )
       );
     }
-
-    #[test]
-    fn returns_the_config() {
-      fn plugin() -> PluginNode {
-        PluginNode {
-          package_name: String::from("package"),
-          resolve_from: Arc::new(PathBuf::from("/")),
-        }
-      }
-
-      fn extension() -> PluginNode {
-        PluginNode {
-          package_name: String::from("..."),
-          resolve_from: Arc::new(PathBuf::from("/")),
-        }
-      }
-
-      let partial_config = PartialAtlaspackConfigBuilder::default()
-        .bundler(Some(plugin()))
-        .namers(vec![plugin()])
-        .resolvers(vec![extension(), plugin()])
-        .build()
-        .unwrap();
-
-      let config = AtlaspackConfig::try_from(partial_config);
-
-      assert!(config.is_ok_and(|c| !c.resolvers.contains(&extension())));
-    }
   }
 }