@omnifyjp/ts 2.1.0 → 2.1.1

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

@@ -1,8 +1,11 @@
 /**
- * Generates the CleanupExpiredFiles artisan command.
+ * Generates two-phase file cleanup commands:
+ * - Phase 1 (CleanupExpiredFiles): Soft-delete expired temp records — keeps physical files
+ * - Phase 2 (PurgeDeletedFiles): Force-delete old soft-deleted records + remove physical files
+ *
  * Only generated when fileConfig.tempFlow is enabled.
  */
 import { SchemaReader } from './schema-reader.js';
 import type { GeneratedFile, PhpConfig } from './types.js';
-/** Generate the cleanup command (only when tempFlow is enabled). */
+/** Generate the cleanup commands (only when tempFlow is enabled). */
 export declare function generateFileCleanup(reader: SchemaReader, config: PhpConfig): GeneratedFile[];

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

@@ -1,19 +1,40 @@
 /**
- * Generates the CleanupExpiredFiles artisan command.
+ * Generates two-phase file cleanup commands:
+ * - Phase 1 (CleanupExpiredFiles): Soft-delete expired temp records — keeps physical files
+ * - Phase 2 (PurgeDeletedFiles): Force-delete old soft-deleted records + remove physical files
+ *
  * Only generated when fileConfig.tempFlow is enabled.
  */
 import { baseFile } from './types.js';
-/** Generate the cleanup command (only when tempFlow is enabled). */
+/** Generate the cleanup commands (only when tempFlow is enabled). */
 export function generateFileCleanup(reader, config) {
     const fileConfig = reader.getFileConfig();
     if (!fileConfig?.tempFlow)
         return [];
     const modelNamespace = config.models.namespace;
+    const files = [];
+    files.push(generateCleanupCommand(modelNamespace));
+    files.push(generatePurgeCommand(modelNamespace, fileConfig.purgeAfter ?? '72h'));
+    return files;
+}
+/** Parse a duration string like "72h" 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 generateCleanupCommand(modelNamespace) {
     const content = `<?php
 
 namespace App\\Console\\Commands;
 
 /**
+ * Phase 1: Soft-delete expired temporary file records.
+ * Physical files are kept on disk for the grace period.
+ *
  * DO NOT EDIT - This file is auto-generated by Omnify.
  * Any changes will be overwritten on next generation.
  *
@@ -21,7 +42,6 @@ namespace App\\Console\\Commands;
  */
 
 use Illuminate\\Console\\Command;
-use Illuminate\\Support\\Facades\\Storage;
 use ${modelNamespace}\\File;
 
 class CleanupExpiredFiles extends Command
@@ -35,7 +55,7 @@ class CleanupExpiredFiles extends Command
     /**
      * The console command description.
      */
-    protected $description = 'Delete expired temporary files';
+    protected $description = 'Soft-delete expired temporary file records (keeps physical files)';
 
     /**
      * Execute the console command.
@@ -51,29 +71,103 @@ class CleanupExpiredFiles extends Command
         }
 
         if ($this->option('dry-run')) {
-            $this->info("Would delete {$count} expired file(s).");
+            $this->info("Would soft-delete {$count} expired file record(s).");
+            return self::SUCCESS;
+        }
+
+        // Soft-delete only — physical files stay on disk
+        $deleted = $query->delete();
+
+        $this->info("Soft-deleted {$deleted} expired file record(s). Physical files retained.");
+        return self::SUCCESS;
+    }
+}
+`;
+    return baseFile('app/Console/Commands/CleanupExpiredFiles.php', content);
+}
+function generatePurgeCommand(modelNamespace, purgeAfter) {
+    const hours = parseDurationHours(purgeAfter);
+    const content = `<?php
+
+namespace App\\Console\\Commands;
+
+/**
+ * Phase 2: Force-delete soft-deleted file records older than the grace period
+ * and remove their physical files from storage.
+ *
+ * DO NOT EDIT - This file is auto-generated by Omnify.
+ * Any changes will be overwritten on next generation.
+ *
+ * @generated by omnify
+ */
+
+use Illuminate\\Console\\Command;
+use Illuminate\\Support\\Facades\\Storage;
+use ${modelNamespace}\\File;
+
+class PurgeDeletedFiles extends Command
+{
+    /**
+     * The name and signature of the console command.
+     */
+    protected $signature = 'omnify:purge-deleted-files
+                            {--hours=${hours} : Grace period in hours before physical deletion}
+                            {--dry-run : Show what would be purged without actually purging}';
+
+    /**
+     * The console command description.
+     */
+    protected $description = 'Force-delete old soft-deleted file records and remove physical files from disk';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle(): int
+    {
+        $hours = (int) $this->option('hours');
+        $cutoff = now()->subHours($hours);
+
+        $query = File::onlyTrashed()->where('deleted_at', '<', $cutoff);
+        $count = $query->count();
+
+        if ($count === 0) {
+            $this->info("No soft-deleted files older than {$hours}h found.");
+            return self::SUCCESS;
+        }
+
+        if ($this->option('dry-run')) {
+            $this->info("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 {
+                    // Remove physical file from storage
+                    if ($file->path && Storage::disk($file->disk)->exists($file->path)) {
+                        Storage::disk($file->disk)->delete($file->path);
+                    }
+                    // Force-delete the database record
+                    $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("Purged {$purged} file(s). Physical files removed from disk.");
+        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/PurgeDeletedFiles.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.1",
   "description": "TypeScript model type generator from Omnify schemas.json",
   "type": "module",
   "main": "dist/index.js",