mkdirp edge case

cloverich · Dec 9, 2024 · 37cc19b · 37cc19b
1 parent 2a9a035
commit 37cc19b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/electron/ensureDir.js b/src/electron/ensureDir.js
@@ -4,7 +4,7 @@ const fs = require("fs");
  * Borrowed from api files, since its typescript and this is not
  * Reconcile that later
  */
-exports.ensureDir = function ensureDir(directory) {
+exports.ensureDir = function ensureDir(directory, create = true) {
   if (!directory) {
     throw new Error("ensureDir called with no directory path");
   }

diff --git a/src/preload/files.ts b/src/preload/files.ts
@@ -42,9 +42,15 @@ export class Files {
     try {
       await fs.promises.mkdir(dir, { recursive: true });
     } catch (err) {
-      // If it already exists, good to go
       // note: ts can't find this type: instanceof ErrnoException
       if ((err as any).code === "EEXIST") {
+        // confirm it's a directory
+        const stats = await fs.promises.stat(dir);
+        if (!stats.isDirectory()) {
+          throw new Error(`[Files.mkdirp] ${dir} already exists as a file`);
+        }
+
+        // already exists, good to go
         return dir;
       } else {
         throw err;