@omnifyjp/ts 2.1.1 → 2.1.3

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

@@ -1,11 +1,11 @@
 /**
- * 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
+ * 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';
 import type { GeneratedFile, PhpConfig } from './types.js';
-/** Generate the cleanup commands (only when tempFlow is enabled). */
+/** Generate the cleanup command (only when tempFlow is enabled). */
 export declare function generateFileCleanup(reader: SchemaReader, config: PhpConfig): GeneratedFile[];

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

@@ -1,23 +1,21 @@
 /**
- * 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
+ * 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';
-/** Generate the cleanup commands (only when tempFlow is enabled). */
+/** Generate the cleanup command (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;
+    const purgeHours = parseDurationHours(fileConfig.purgeAfter ?? '72h');
+    return [generateCommand(modelNamespace, purgeHours)];
 }
-/** Parse a duration string like "72h" to hours. */
+/** Parse a duration string like "72h" or "3d" to hours. */
 function parseDurationHours(duration) {
     const match = duration.match(/^(\d+)(h|d)$/);
     if (!match)
@@ -26,14 +24,21 @@ function parseDurationHours(duration) {
     const unit = match[2];
     return unit === 'd' ? value * 24 : value;
 }
-function generateCleanupCommand(modelNamespace) {
+function generateCommand(modelNamespace, purgeHours) {
     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.
+ * 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.
@@ -42,101 +47,82 @@ namespace App\\Console\\Commands;
  */
 
 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}';
 
-    /**
-     * The console command description.
-     */
-    protected $description = 'Soft-delete expired temporary file records (keeps physical files)';
+    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;
+    }
 
     /**
-     * Execute the console command.
+     * Phase 1: Soft-delete expired temporary file records.
+     * Physical files remain on disk for the grace period.
      */
-    public function handle(): int
+    private function phase1SoftDelete(bool $dryRun): int
     {
         $query = File::expired();
         $count = $query->count();
 
         if ($count === 0) {
-            $this->info('No expired files found.');
+            $this->info('[Phase 1] No expired temp files.');
             return self::SUCCESS;
         }
 
-        if ($this->option('dry-run')) {
-            $this->info("Would soft-delete {$count} expired file record(s).");
+        if ($dryRun) {
+            $this->info("[Phase 1] Would soft-delete {$count} expired file(s).");
             return self::SUCCESS;
         }
 
-        // Soft-delete only — physical files stay on disk
         $deleted = $query->delete();
+        $this->info("[Phase 1] Soft-deleted {$deleted} expired file(s). Physical files retained.");
 
-        $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.
+     * Phase 2: Force-delete soft-deleted records past grace period
+     * and remove physical files from storage.
      */
-    protected $description = 'Force-delete old soft-deleted file records and remove physical files from disk';
-
-    /**
-     * Execute the console command.
-     */
-    public function handle(): int
+    private function phase2Purge(bool $dryRun): int
     {
-        $hours = (int) $this->option('hours');
+        $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 soft-deleted files older than {$hours}h found.");
+            $this->info("[Phase 2] No soft-deleted files older than {$hours}h.");
             return self::SUCCESS;
         }
 
-        if ($this->option('dry-run')) {
-            $this->info("Would purge {$count} file(s) older than {$hours}h.");
+        if ($dryRun) {
+            $this->info("[Phase 2] Would purge {$count} file(s) older than {$hours}h.");
             return self::SUCCESS;
         }
 
@@ -146,11 +132,9 @@ class PurgeDeletedFiles extends Command
         $query->chunkById(100, function ($files) use (&$purged, &$errors) {
             foreach ($files as $file) {
                 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) {
@@ -160,7 +144,7 @@ class PurgeDeletedFiles extends Command
             }
         });
 
-        $this->info("Purged {$purged} file(s). Physical files removed from disk.");
+        $this->info("[Phase 2] Purged {$purged} file(s). Physical files removed.");
         if ($errors > 0) {
             $this->warn("{$errors} file(s) failed to purge.");
         }
@@ -169,5 +153,5 @@ class PurgeDeletedFiles extends Command
     }
 }
 `;
-    return baseFile('app/Console/Commands/PurgeDeletedFiles.php', content);
+    return baseFile('app/Console/Commands/CleanupFiles.php', content);
 }

package/dist/php/model-generator.js

@@ -276,6 +276,13 @@ function buildDocProperties(properties, expandedProperties, propertyOrder) {
                 const phpType = nullable ? 'int|null' : 'int';
                 lines.push(` * @property ${phpType} $${snakeName}`);
             }
+            else if (relation === 'MorphTo') {
+                const morphName = prop['morphName'] || toSnakeCase(propName);
+                const nullable = prop['nullable'] ?? true;
+                const nullSuffix = nullable ? '|null' : '';
+                lines.push(` * @property string${nullSuffix} $${morphName}_type`);
+                lines.push(` * @property string${nullSuffix} $${morphName}_id`);
+            }
             continue;
         }
         if (expandedProperties[propName]) {
@@ -329,6 +336,11 @@ function buildFillable(properties, expandedProperties, propertyOrder) {
             if (relation === 'ManyToOne') {
                 fields.push(toSnakeCase(propName) + '_id');
             }
+            else if (relation === 'MorphTo') {
+                const morphName = prop['morphName'] || toSnakeCase(propName);
+                fields.push(morphName + '_type');
+                fields.push(morphName + '_id');
+            }
             continue;
         }
         if (expandedProperties[propName]) {

package/dist/php/request-generator.js

@@ -73,17 +73,34 @@ function generateBaseRequest(name, schema, reader, config, action) {
             }
             continue;
         }
-        // Skip non-fillable associations except ManyToOne
+        // Association handling
         if (type === 'Association') {
             const relation = prop['relation'] ?? '';
-            if (relation !== 'ManyToOne')
-                continue;
-            const snakeName = toSnakeCase(propName) + '_id';
-            const rules = isUpdate
-                ? toUpdateRules(prop, tableName, modelRouteParam)
-                : toStoreRules(prop, tableName);
-            rulesLines.push(`            '${snakeName}' => ${formatRules(rules)},`);
-            attributeKeys.push(snakeName);
+            if (relation === 'ManyToOne') {
+                const snakeName = toSnakeCase(propName) + '_id';
+                const rules = isUpdate
+                    ? toUpdateRules(prop, tableName, modelRouteParam)
+                    : toStoreRules(prop, tableName);
+                rulesLines.push(`            '${snakeName}' => ${formatRules(rules)},`);
+                attributeKeys.push(snakeName);
+            }
+            else if (relation === 'MorphTo') {
+                const morphName = prop['morphName'] || toSnakeCase(propName);
+                const nullable = prop['nullable'] ?? true;
+                const requiredRule = nullable ? 'nullable' : 'required';
+                const targets = prop['targets'] ?? [];
+                // {morphName}_type rules
+                const typeRules = [requiredRule, 'string'];
+                if (targets.length > 0) {
+                    typeRules.push(`in:${targets.join(',')}`);
+                }
+                rulesLines.push(`            '${morphName}_type' => [${typeRules.map(r => `'${r}'`).join(', ')}],`);
+                attributeKeys.push(morphName + '_type');
+                // {morphName}_id rules
+                const idRules = [requiredRule, 'string'];
+                rulesLines.push(`            '${morphName}_id' => [${idRules.map(r => `'${r}'`).join(', ')}],`);
+                attributeKeys.push(morphName + '_id');
+            }
             continue;
         }
         // File type: generate array item rules for multiple files

package/package.json

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