fix: don't overwrite existing files

.vscode/launch.json

@@ -11,7 +11,7 @@
         "--runInBand",
         "end-to-end",
         "-t",
-        "linked-files"
+        "dir-and-file-same-name"
       ],
       "console": "integratedTerminal",
       "internalConsoleOptions": "neverOpen"

src/index/formatFileStructure/moveFiles.ts

@@ -20,7 +20,14 @@ export async function moveFiles(
 ) {
   const git = Git(parentFolder);
   const isFolderGitTracked = await git.checkIsRepo();
-  for (const [oldPath, newPath] of Object.entries(tree)) {
+  const entries = Object.entries(tree);
+  const fileAlreadyExistsEntries = [] as typeof entries;
+  while (entries.length || fileAlreadyExistsEntries.length) {
+    /* eslint-disable @typescript-eslint/no-non-null-assertion */
+    const [oldPath, newPath] = entries.length
+      ? entries.pop()!
+      : fileAlreadyExistsEntries.pop()!;
+    /* eslint-enable */
     // skip globals
     if (oldPath.includes("..")) continue;
 
@@ -33,6 +40,18 @@ export async function moveFiles(
     const newDirname = path.dirname(newAbsolutePath);
     fs.ensureDirSync(newDirname);
 
+    if (fs.existsSync(newAbsolutePath)) {
+      if (entries.length) {
+        // try moving this file later after the other files have been moved
+        fileAlreadyExistsEntries.push([oldPath, newPath]);
+      } else {
+        logger.warn(
+          `not moving "${oldAbsolutePath}" to "${newAbsolutePath}" because "${newAbsolutePath}" already exists`
+        );
+      }
+      continue;
+    }
+
     const shouldGitMv =
       isFolderGitTracked && (await isFileGitTracked(git, oldAbsolutePath));
 

tests/__snapshots__/end-to-end.test.ts.snap

@@ -336,6 +336,17 @@ import \\"@testing-library/jest-dom/extend-expect\\";
 "
 `;
 
+exports[`end-to-end --avoid-single-file dir-and-file-same-name 1`] = `
+"dir-and-file-same-name
+├── cost-of-living
+│   └── cost-of-living.js
+└── cost-of-living.js"
+`;
+
+exports[`end-to-end --avoid-single-file dir-and-file-same-name: dir-and-file-same-name/cost-of-living.js 1`] = `"require('./cost-of-living')"`;
+
+exports[`end-to-end --avoid-single-file dir-and-file-same-name: dir-and-file-same-name/cost-of-living/cost-of-living.js 1`] = `""`;
+
 exports[`end-to-end --avoid-single-file duplicate-imports 1`] = `
 "duplicate-imports
 ├── index
@@ -992,6 +1003,17 @@ import \\"@testing-library/jest-dom/extend-expect\\";
 "
 `;
 
+exports[`end-to-end dir-and-file-same-name 1`] = `
+"dir-and-file-same-name
+├── cost-of-living
+│   └── cost-of-living.js
+└── cost-of-living.js"
+`;
+
+exports[`end-to-end dir-and-file-same-name: dir-and-file-same-name/cost-of-living.js 1`] = `"require('./cost-of-living/cost-of-living')"`;
+
+exports[`end-to-end dir-and-file-same-name: dir-and-file-same-name/cost-of-living/cost-of-living.js 1`] = `""`;
+
 exports[`end-to-end duplicate-imports 1`] = `
 "duplicate-imports
 ├── index

tests/fixtures/dir-and-file-same-name/cost-of-living/index.js

@@ -0,0 +1 @@
+require('../cost-of-living')