Remove empty hash directories

Author: mjackson

packages/file-storage/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 This is the changelog for [`file-storage`](https://github.com/remix-run/remix/tree/v3/packages/file-storage). It follows [semantic versioning](https://semver.org/).
 
+## HEAD
+
+- Remove hash directories when they are empty in `LocalFileStorage`
+
 ## v0.8.0 (2025-07-21)
 
 - Renamed package from `@mjackson/file-storage` to `@remix-run/file-storage`

packages/file-storage/src/lib/local-file-storage.test.ts

@@ -45,6 +45,29 @@ describe('LocalFileStorage', () => {
     assert.equal(await storage.get('hello'), null);
   });
 
+  it('removes empty hash directories after removing files', async () => {
+    let storage = new LocalFileStorage(directory);
+    let file = new File(['Test content'], 'test.txt', { type: 'text/plain' });
+
+    // Set a file
+    await storage.set('test-key', file);
+
+    // Verify subdirectories exist
+    let subdirs = fs.readdirSync(directory).filter((name) => {
+      return fs.statSync(path.join(directory, name)).isDirectory();
+    });
+    assert.ok(subdirs.length > 0);
+
+    // Remove the file
+    await storage.remove('test-key');
+
+    // Verify no subdirectories remain
+    let subdirsAfter = fs.readdirSync(directory).filter((name) => {
+      return fs.statSync(path.join(directory, name)).isDirectory();
+    });
+    assert.equal(subdirsAfter.length, 0);
+  });
+
   it('lists files with pagination', async () => {
     let storage = new LocalFileStorage(directory);
     let allKeys = ['a', 'b', 'c', 'd', 'e'];

packages/file-storage/src/lib/local-file-storage.ts

@@ -127,10 +127,16 @@ export class LocalFileStorage implements FileStorage {
   }
 
   async remove(key: string): Promise<void> {
-    let { filePath, metaPath } = await this.#getPaths(key);
+    let { directory, filePath, metaPath } = await this.#getPaths(key);
 
     try {
       await Promise.all([fsp.unlink(filePath), fsp.unlink(metaPath)]);
+
+      // Check if directory is empty and remove it if so
+      let files = await fsp.readdir(directory);
+      if (files.length === 0) {
+        await fsp.rmdir(directory);
+      }
     } catch (error) {
       if (!isNoEntityError(error)) {
         throw error;

packages/file-storage/src/lib/memory-file-storage.ts

@@ -2,9 +2,6 @@ import type { FileStorage, ListOptions, ListResult } from './file-storage.ts';
 
 /**
  * A simple, in-memory implementation of the `FileStorage` interface.
- *
- * Note: Any files you put in storage will have their entire contents buffered in memory, so this is not suitable for large files
- * in production scenarios.
  */
 export class MemoryFileStorage implements FileStorage {
   #map = new Map<string, File>();