Close...

Author: anthonyshew

crates/turborepo-lib/src/turbo_json/mod.rs

@@ -575,13 +575,18 @@ impl TurboJson {
             }
         }
 
-        if let Some(tasks_from_turbo) = raw_turbo.tasks {
-            for (task_name, task_def) in tasks_from_turbo {
-                task_def
-                    .inputs
+        let mut tasks = raw_turbo.tasks.clone().unwrap_or_default();
+        for (_, task_def) in tasks.iter_mut() {
+            if let Some(inputs) = &task_def.inputs {
+                let updated_inputs = inputs
                     .iter()
-                    .map(|glob| replace_turbo_root_token(&mut task_def, path_to_repo_root))
-                    .collect()
+                    .map(|glob| {
+                        let updated_value =
+                            replace_turbo_root_token_in_string(&glob.value, path_to_repo_root);
+                        Spanned::new(UnescapedString::from(updated_value))
+                    })
+                    .collect();
+                task_def.inputs = Some(updated_inputs);
             }
         }
 
@@ -611,7 +616,7 @@ impl TurboJson {
 
                 global_deps
             },
-            tasks: raw_turbo.tasks.unwrap_or_default(),
+            tasks,
             // copy these over, we don't need any changes here.
             extends: raw_turbo
                 .extends
@@ -783,27 +788,33 @@ fn gather_env_vars(
     Ok(())
 }
 
+fn replace_turbo_root_token_in_string(
+    input: &str,
+    path_to_repo_root: &AnchoredSystemPath,
+) -> String {
+    input.replacen(TURBO_ROOT, path_to_repo_root.as_str(), 1)
+}
+
 fn replace_turbo_root_token(
     task_definition: &mut TaskDefinition,
     path_to_repo_root: &AnchoredSystemPath,
-) {
-    for input in task_definition.inputs.iter_mut() {
-        let _ = input.replacen(TURBO_ROOT, path_to_repo_root.as_str(), 1);
+) -> TaskDefinition {
+    let mut new_task = task_definition.clone();
+
+    for input in &mut new_task.inputs {
+        *input = input.replacen(TURBO_ROOT, path_to_repo_root.as_str(), 1);
     }
 
-    for output in task_definition.outputs.validated_exclusions().iter_mut() {
-        let _ = output.iter().map(|glob| {
-            glob.as_str()
-                .replacen(TURBO_ROOT, path_to_repo_root.as_str(), 1)
-        });
+    let outputs = &mut new_task.outputs;
+    for output in &mut outputs.exclusions {
+        *output = output.replacen(TURBO_ROOT, path_to_repo_root.as_str(), 1);
     }
 
-    for output in task_definition.outputs.validated_inclusions().iter_mut() {
-        let _ = output.iter().map(|glob| {
-            glob.as_str()
-                .replacen(TURBO_ROOT, path_to_repo_root.as_str(), 1)
-        });
+    for output in &mut outputs.inclusions {
+        *output = output.replacen(TURBO_ROOT, path_to_repo_root.as_str(), 1);
     }
+
+    new_task
 }
 
 #[cfg(test)]
@@ -828,7 +839,7 @@ mod tests {
     #[test_case("{}", "empty boundaries")]
     #[test_case(r#"{"tags": {} }"#, "empty tags")]
     #[test_case(
-        r#"{"tags": { "my-tag": { "dependencies": { "allow": ["my-package"] } } } }"#,
+        r#"{"tags": { "my-tag": { "dependencies": { "allow": ["my-package"] } } }"#,
         "tags and dependencies"
     )]
     #[test_case(