@omnifyjp/ts 2.1.0 → 2.1.2

package/dist/php/file-cleanup-generator.d.ts

@@ -1,5 +1,8 @@
 /**
- * Generates the CleanupExpiredFiles artisan command.
+ * Generates a single file cleanup command with two phases:
+ * 1. Soft-delete expired temp records (keeps physical files)
+ * 2. Force-delete soft-deleted records past grace period + remove physical files
+ *
  * Only generated when fileConfig.tempFlow is enabled.
  */
 import { SchemaReader } from './schema-reader.js';

package/dist/php/file-cleanup-generator.js

@@ -1,5 +1,8 @@
 /**
- * Generates the CleanupExpiredFiles artisan command.
+ * Generates a single file cleanup command with two phases:
+ * 1. Soft-delete expired temp records (keeps physical files)
+ * 2. Force-delete soft-deleted records past grace period + remove physical files
+ *
  * Only generated when fileConfig.tempFlow is enabled.
  */
 import { baseFile } from './types.js';
@@ -9,11 +12,34 @@ export function generateFileCleanup(reader, config) {
     if (!fileConfig?.tempFlow)
         return [];
     const modelNamespace = config.models.namespace;
+    const purgeHours = parseDurationHours(fileConfig.purgeAfter ?? '72h');
+    return [generateCommand(modelNamespace, purgeHours)];
+}
+/** Parse a duration string like "72h" or "3d" to hours. */
+function parseDurationHours(duration) {
+    const match = duration.match(/^(\d+)(h|d)$/);
+    if (!match)
+        return 72;
+    const value = parseInt(match[1], 10);
+    const unit = match[2];
+    return unit === 'd' ? value * 24 : value;
+}
+function generateCommand(modelNamespace, purgeHours) {
     const content = `<?php
 
 namespace App\\Console\\Commands;
 
 /**
+ * Two-phase file cleanup:
+ *   Phase 1: Soft-delete expired temp records (physical files stay on disk)
+ *   Phase 2: Force-delete soft-deleted records past grace period + remove physical files
+ *
+ * Usage:
+ *   php artisan omnify:cleanup-files               # run both phases
+ *   php artisan omnify:cleanup-files --phase=1      # soft-delete only
+ *   php artisan omnify:cleanup-files --phase=2      # purge only
+ *   php artisan omnify:cleanup-files --dry-run      # preview without changes
+ *
  * DO NOT EDIT - This file is auto-generated by Omnify.
  * Any changes will be overwritten on next generation.
  *
@@ -24,56 +50,108 @@ use Illuminate\\Console\\Command;
 use Illuminate\\Support\\Facades\\Storage;
 use ${modelNamespace}\\File;
 
-class CleanupExpiredFiles extends Command
+class CleanupFiles extends Command
 {
-    /**
-     * The name and signature of the console command.
-     */
-    protected $signature = 'omnify:cleanup-expired-files
-                            {--dry-run : Show what would be deleted without actually deleting}';
+    protected $signature = 'omnify:cleanup-files
+                            {--phase= : Run specific phase only (1=soft-delete, 2=purge)}
+                            {--purge-hours=${purgeHours} : Grace period in hours before physical deletion}
+                            {--dry-run : Preview what would happen without making changes}';
+
+    protected $description = 'Clean up expired and deleted file attachments';
+
+    public function handle(): int
+    {
+        $phase = $this->option('phase');
+        $dryRun = (bool) $this->option('dry-run');
+
+        $result = self::SUCCESS;
+
+        if ($phase === null || $phase === '1') {
+            $r = $this->phase1SoftDelete($dryRun);
+            if ($r !== self::SUCCESS) $result = $r;
+        }
+
+        if ($phase === null || $phase === '2') {
+            $r = $this->phase2Purge($dryRun);
+            if ($r !== self::SUCCESS) $result = $r;
+        }
+
+        return $result;
+    }
 
     /**
-     * The console command description.
+     * Phase 1: Soft-delete expired temporary file records.
+     * Physical files remain on disk for the grace period.
      */
-    protected $description = 'Delete expired temporary files';
+    private function phase1SoftDelete(bool $dryRun): int
+    {
+        $query = File::expired();
+        $count = $query->count();
+
+        if ($count === 0) {
+            $this->info('[Phase 1] No expired temp files.');
+            return self::SUCCESS;
+        }
+
+        if ($dryRun) {
+            $this->info("[Phase 1] Would soft-delete {$count} expired file(s).");
+            return self::SUCCESS;
+        }
+
+        $deleted = $query->delete();
+        $this->info("[Phase 1] Soft-deleted {$deleted} expired file(s). Physical files retained.");
+
+        return self::SUCCESS;
+    }
 
     /**
-     * Execute the console command.
+     * Phase 2: Force-delete soft-deleted records past grace period
+     * and remove physical files from storage.
      */
-    public function handle(): int
+    private function phase2Purge(bool $dryRun): int
     {
-        $query = File::expired();
+        $hours = (int) $this->option('purge-hours');
+        $cutoff = now()->subHours($hours);
+
+        $query = File::onlyTrashed()->where('deleted_at', '<', $cutoff);
         $count = $query->count();
 
         if ($count === 0) {
-            $this->info('No expired files found.');
+            $this->info("[Phase 2] No soft-deleted files older than {$hours}h.");
             return self::SUCCESS;
         }
 
-        if ($this->option('dry-run')) {
-            $this->info("Would delete {$count} expired file(s).");
+        if ($dryRun) {
+            $this->info("[Phase 2] Would purge {$count} file(s) older than {$hours}h.");
             return self::SUCCESS;
         }
 
-        $deleted = 0;
-        $query->chunkById(100, function ($files) use (&$deleted) {
+        $purged = 0;
+        $errors = 0;
+
+        $query->chunkById(100, function ($files) use (&$purged, &$errors) {
             foreach ($files as $file) {
-                // Delete from storage
-                if ($file->path && Storage::disk($file->disk)->exists($file->path)) {
-                    Storage::disk($file->disk)->delete($file->path);
+                try {
+                    if ($file->path && Storage::disk($file->disk)->exists($file->path)) {
+                        Storage::disk($file->disk)->delete($file->path);
+                    }
+                    $file->forceDelete();
+                    $purged++;
+                } catch (\\Throwable $e) {
+                    $this->error("Failed to purge file {$file->id}: {$e->getMessage()}");
+                    $errors++;
                 }
-                // Soft delete the record
-                $file->delete();
-                $deleted++;
             }
         });
 
-        $this->info("Deleted {$deleted} expired file(s).");
-        return self::SUCCESS;
+        $this->info("[Phase 2] Purged {$purged} file(s). Physical files removed.");
+        if ($errors > 0) {
+            $this->warn("{$errors} file(s) failed to purge.");
+        }
+
+        return $errors > 0 ? self::FAILURE : self::SUCCESS;
     }
 }
 `;
-    return [
-        baseFile('app/Console/Commands/CleanupExpiredFiles.php', content),
-    ];
+    return baseFile('app/Console/Commands/CleanupFiles.php', content);
 }

package/dist/types.d.ts

@@ -10,6 +10,8 @@ export interface FileConfigExport {
     readonly tempFlow?: boolean;
     readonly tempTtl?: string;
     readonly cleanupSchedule?: string;
+    readonly purgeAfter?: string;
+    readonly purgeSchedule?: string;
     readonly defaultDisk?: string;
 }
 /** Top-level schemas.json structure. */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@omnifyjp/ts",
-  "version": "2.1.0",
+  "version": "2.1.2",
   "description": "TypeScript model type generator from Omnify schemas.json",
   "type": "module",
   "main": "dist/index.js",