Custom Downloader to allow for people running Laravel Vapor to suppor…

packages/actions/src/Exports/Downloaders/CsvDownloader.php

@@ -17,21 +17,9 @@ public function __invoke(Export $export): StreamedResponse
             abort(404);
         }
 
-        return response()->streamDownload(function () use ($disk, $directory): void {
-            echo $disk->get($directory . DIRECTORY_SEPARATOR . 'headers.csv');
-
-            flush();
-
-            foreach ($disk->files($directory) as $file) {
-                if (str($file)->endsWith('headers.csv')) {
-                    continue;
-                }
-
-                if (! str($file)->endsWith('.csv')) {
-                    continue;
-                }
-
-                echo $disk->get($file);
+        return response()->streamDownload(function () use ($export): void {
+            foreach (app(CsvExportContent::class)($export) as $chunk) {
+                echo $chunk;
 
                 flush();
             }

packages/actions/src/Exports/Downloaders/CsvExportContent.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace Filament\Actions\Exports\Downloaders;
+
+use Filament\Actions\Exports\Models\Export;
+use Generator;
+
+class CsvExportContent
+{
+    /**
+     * @return Generator<string>
+     */
+    public function __invoke(Export $export): Generator
+    {
+        $disk = $export->getFileDisk();
+        $directory = $export->getFileDirectory();
+
+        yield $disk->get($directory . DIRECTORY_SEPARATOR . 'headers.csv');
+
+        foreach ($disk->files($directory) as $file) {
+            if (str($file)->endsWith('headers.csv')) {
+                continue;
+            }
+
+            if (! str($file)->endsWith('.csv')) {
+                continue;
+            }
+
+            yield $disk->get($file);
+        }
+    }
+}

packages/actions/src/Exports/Downloaders/XlsxDownloader.php

@@ -4,9 +4,6 @@
 
 use Filament\Actions\Exports\Downloaders\Contracts\Downloader;
 use Filament\Actions\Exports\Models\Export;
-use League\Csv\Reader as CsvReader;
-use League\Csv\Statement;
-use OpenSpout\Common\Entity\Row;
 use OpenSpout\Writer\XLSX\Writer;
 use Symfony\Component\HttpFoundation\StreamedResponse;
 
@@ -37,34 +34,10 @@ public function __invoke(Export $export): StreamedResponse
 
         $writer = app(Writer::class);
 
-        $csvDelimiter = $export->exporter::getCsvDelimiter();
-
-        $writeRowsFromFile = function (string $file) use ($csvDelimiter, $disk, $writer): void {
-            $csvReader = CsvReader::from($disk->readStream($file));
-            $csvReader->setDelimiter($csvDelimiter);
-            $csvResults = (new Statement)->process($csvReader);
-
-            foreach ($csvResults->getRecords() as $row) {
-                $writer->addRow(Row::fromValues($row));
-            }
-        };
-
-        return response()->streamDownload(function () use ($disk, $directory, $fileName, $writer, $writeRowsFromFile): void {
+        return response()->streamDownload(function () use ($export, $fileName, $writer): void {
             $writer->openToBrowser($fileName);
 
-            $writeRowsFromFile($directory . DIRECTORY_SEPARATOR . 'headers.csv');
-
-            foreach ($disk->files($directory) as $file) {
-                if (str($file)->endsWith('headers.csv')) {
-                    continue;
-                }
-
-                if (! str($file)->endsWith('.csv')) {
-                    continue;
-                }
-
-                $writeRowsFromFile($file);
-            }
+            app(XlsxExportContent::class)($export, $writer);
 
             $writer->close();
         }, $fileName, [

packages/actions/src/Exports/Downloaders/XlsxExportContent.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace Filament\Actions\Exports\Downloaders;
+
+use Filament\Actions\Exports\Models\Export;
+use League\Csv\Reader as CsvReader;
+use League\Csv\Statement;
+use OpenSpout\Common\Entity\Row;
+use OpenSpout\Writer\XLSX\Writer;
+
+class XlsxExportContent
+{
+    public function __invoke(Export $export, Writer $writer): void
+    {
+        $disk = $export->getFileDisk();
+        $directory = $export->getFileDirectory();
+        $csvDelimiter = $export->exporter::getCsvDelimiter();
+
+        $writeRowsFromFile = function (string $file) use ($csvDelimiter, $disk, $writer): void {
+            $csvReader = CsvReader::from($disk->readStream($file));
+            $csvReader->setDelimiter($csvDelimiter);
+            $csvResults = (new Statement)->process($csvReader);
+
+            foreach ($csvResults->getRecords() as $row) {
+                $writer->addRow(Row::fromValues($row));
+            }
+        };
+
+        $writeRowsFromFile($directory . DIRECTORY_SEPARATOR . 'headers.csv');
+
+        foreach ($disk->files($directory) as $file) {
+            if (str($file)->endsWith('headers.csv')) {
+                continue;
+            }
+
+            if (! str($file)->endsWith('.csv')) {
+                continue;
+            }
+
+            $writeRowsFromFile($file);
+        }
+    }
+}

packages/actions/src/Exports/Exporter.php

@@ -5,6 +5,7 @@
 use Carbon\CarbonInterface;
 use Filament\Actions\Action;
 use Filament\Actions\ActionGroup;
+use Filament\Actions\Exports\Downloaders\Contracts\Downloader;
 use Filament\Actions\Exports\Enums\Contracts\ExportFormat as ExportFormatInterface;
 use Filament\Actions\Exports\Enums\ExportFormat;
 use Filament\Actions\Exports\Models\Export;
@@ -222,6 +223,11 @@ public function getFormats(): array
         return [ExportFormat::Csv, ExportFormat::Xlsx];
     }
 
+    public static function getDownloader(ExportFormatInterface $format): Downloader
+    {
+        return $format->getDownloader();
+    }
+
     public function getXlsxCellStyle(): ?Style
     {
         return null;

packages/actions/src/Exports/Http/Controllers/DownloadExport.php

@@ -38,7 +38,7 @@ public function __invoke(Request $request, Export $export): StreamedResponse
 
         abort_unless($format !== null, 404);
 
-        return $format->getDownloader()($export);
+        return $export->exporter::getDownloader($format)($export);
     }
 
     protected function resolveFormatFromRequest(Request $request): ?ExportFormatInterface

tests/src/Actions/Exports/Http/Controllers/DownloadExportTest.php

@@ -1,5 +1,9 @@
 <?php
 
+use Filament\Actions\Exports\Downloaders\Contracts\Downloader;
+use Filament\Actions\Exports\Enums\Contracts\ExportFormat as ExportFormatInterface;
+use Filament\Actions\Exports\ExportColumn;
+use Filament\Actions\Exports\Exporter;
 use Filament\Actions\Exports\Models\Export;
 use Filament\Tests\Fixtures\Models\User;
 use Filament\Tests\TestCase;
@@ -8,6 +12,7 @@
 use Illuminate\Support\Facades\Gate;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Facades\URL;
+use Symfony\Component\HttpFoundation\StreamedResponse;
 
 uses(TestCase::class, RefreshDatabase::class);
 
@@ -29,12 +34,57 @@ public function view(Authenticatable $user, Export $export): bool
     }
 }
 
-function createExportForOwner(User $owner): Export
+class TestDownloadExportExporter extends Exporter
+{
+    public static function getColumns(): array
+    {
+        return [
+            ExportColumn::make('name'),
+        ];
+    }
+
+    public static function getCompletedNotificationBody(Export $export): string
+    {
+        return 'Export completed';
+    }
+}
+
+class TestCustomDownloader implements Downloader
+{
+    public function __invoke(Export $export): StreamedResponse
+    {
+        return response()->streamDownload(function (): void {
+            echo 'custom downloader content';
+        }, 'custom.csv');
+    }
+}
+
+class TestCustomDownloaderExporter extends Exporter
+{
+    public static function getColumns(): array
+    {
+        return [
+            ExportColumn::make('name'),
+        ];
+    }
+
+    public static function getCompletedNotificationBody(Export $export): string
+    {
+        return 'Export completed';
+    }
+
+    public static function getDownloader(ExportFormatInterface $format): Downloader
+    {
+        return app(TestCustomDownloader::class);
+    }
+}
+
+function createExportForOwner(User $owner, string $exporter = TestDownloadExportExporter::class): Export
 {
     return Export::create([
         'file_disk' => 'local',
         'file_name' => 'export',
-        'exporter' => 'App\\Filament\\Exports\\TestExporter',
+        'exporter' => $exporter,
         'total_rows' => 1,
         'successful_rows' => 1,
         'user_id' => $owner->getKey(),
@@ -131,3 +181,17 @@ function fakeExportFile(Export $export): void
         ->get(signedExportDownloadUrl($export, format: 'unknown'))
         ->assertStatus(404);
 });
+
+it('uses the exporter\'s `getDownloader()` override instead of the format\'s default downloader', function (): void {
+    $owner = User::factory()->create();
+
+    $export = createExportForOwner($owner, exporter: TestCustomDownloaderExporter::class);
+
+    fakeExportFile($export);
+
+    $response = $this->actingAs($owner)
+        ->get(signedExportDownloadUrl($export))
+        ->assertStatus(200);
+
+    expect($response->streamedContent())->toBe('custom downloader content');
+});