From b4f57e61d4cc998233b972be27a7c2d0f5354d83 Mon Sep 17 00:00:00 2001
From: Jonathan Cammisuli <jon@cammisuli.ca>
Date: Fri, 16 Jun 2023 14:09:47 -0400
Subject: [PATCH] feat(core): fix copying single files

---
 packages/nx/src/native/cache/file_ops.rs | 33 +++++++++++++++++++++---
 1 file changed, 29 insertions(+), 4 deletions(-)

diff --git a/packages/nx/src/native/cache/file_ops.rs b/packages/nx/src/native/cache/file_ops.rs
index 05f041ae18680d..384a0340fed421 100644
--- a/packages/nx/src/native/cache/file_ops.rs
+++ b/packages/nx/src/native/cache/file_ops.rs
@@ -1,3 +1,6 @@
+use std::fs;
+use std::path::{Path, PathBuf};
+
 #[napi]
 pub fn remove(src: String) -> anyhow::Result<()> {
     fs_extra::remove_items(&[src]).map_err(anyhow::Error::from)
@@ -7,9 +10,16 @@ pub fn remove(src: String) -> anyhow::Result<()> {
 pub fn copy(src: String, dest: String) -> anyhow::Result<()> {
     let copy_options = fs_extra::dir::CopyOptions::new()
         .overwrite(true)
-        .skip_exist(false)
-        .copy_inside(true);
-    fs_extra::copy_items(&[src], dest, &copy_options)?;
+        .skip_exist(false);
+
+    let dest: PathBuf = dest.into();
+    let dest_parent = dest.parent().unwrap_or(&dest);
+
+    if !dest_parent.exists() {
+        fs::create_dir_all(dest_parent)?;
+    }
+
+    fs_extra::copy_items(&[src], dest_parent, &copy_options)?;
     Ok(())
 }
 
@@ -20,7 +30,7 @@ mod test {
     use assert_fs::TempDir;
 
     #[test]
-    fn should_copy_files() {
+    fn should_copy_directories() {
         let temp = TempDir::new().unwrap();
         temp.child("parent")
             .child("child")
@@ -37,4 +47,19 @@ mod test {
             .child("new-parent/child/grand-child/.config/file.txt")
             .exists());
     }
+
+    #[test]
+    fn should_copy_single_files() {
+        let temp = TempDir::new().unwrap();
+        temp.child("parent")
+            .child("file.txt")
+            .write_str("content")
+            .unwrap();
+
+        let src = temp.join("parent/file.txt");
+        let dest = temp.join("new-parent/file.txt");
+        copy(src.to_string_lossy().into(), dest.to_string_lossy().into()).unwrap();
+
+        assert!(temp.child("new-parent/file.txt").exists());
+    }
 }