Ensure empty directories are included in folder listing (#454)

Author: ryanmitchell

src/Assets/AssetContainerContents.php

@@ -40,10 +40,20 @@ public function directories()
         }
 
         $this->folders = Cache::remember($this->key(), $this->ttl(), function () {
-            return $this->query()->select(['folder'])
-                ->distinct()
-                ->get()
-                ->map(fn ($model) => ['path' => $model->folder, 'type' => 'dir']);
+            return
+                collect(
+                    $this->query()->select(['folder'])
+                        ->distinct()
+                        ->get()
+                        ->map(fn ($model) => ['path' => $model->folder, 'type' => 'dir'])
+                )
+                    ->merge(
+                        collect($this->container->disk()->getFolders('/', true)
+                            ->filter(fn ($folder) => ! Str::startsWith($folder, '.'))
+                        )
+                            ->map(fn ($folder) => ['path' => $folder, 'type' => 'dir'])
+                    )
+                    ->unique();
         });
 
         return $this->folders;

tests/Assets/AssetContainerContentsTest.php

@@ -3,8 +3,11 @@
 namespace Tests\Assets;
 
 use Illuminate\Http\UploadedFile;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Storage;
 use PHPUnit\Framework\Attributes\Test;
 use Statamic\Facades\AssetContainer;
+use Statamic\Facades\Blink;
 use Statamic\Testing\Concerns\PreventsSavingStacheItemsToDisk;
 use Tests\TestCase;
 
@@ -98,4 +101,20 @@ public function it_doesnt_nest_folders_that_start_with_the_same_name()
         $this->assertCount(1, $filtered);
         $this->assertSame($filtered->keys()->all(), ['one/two']);
     }
+
+    #[Test]
+    public function it_includes_empty_folders_in_the_directory_listing()
+    {
+        $container = tap(AssetContainer::make('test')->disk('test'))->save();
+        $container->makeAsset('one-two/file.txt')->upload(UploadedFile::fake()->create('one.txt'));
+
+        $this->assertCount(1, $container->contents()->directories());
+
+        Cache::flush();
+        Blink::flush();
+
+        Storage::disk('test')->makeDirectory('another');
+
+        $this->assertCount(2, $container->contents()->directories());
+    }
 }