@omnifyjp/omnify 3.2.2 → 3.2.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@omnifyjp/omnify",
-  "version": "3.2.2",
+  "version": "3.2.4",
   "description": "Schema-driven code generation for Laravel, TypeScript, and SQL",
   "license": "MIT",
   "repository": {
@@ -36,10 +36,10 @@
     "zod": "^3.24.0"
   },
   "optionalDependencies": {
-    "@omnifyjp/omnify-darwin-arm64": "3.2.2",
-    "@omnifyjp/omnify-darwin-x64": "3.2.2",
-    "@omnifyjp/omnify-linux-x64": "3.2.2",
-    "@omnifyjp/omnify-linux-arm64": "3.2.2",
-    "@omnifyjp/omnify-win32-x64": "3.2.2"
+    "@omnifyjp/omnify-darwin-arm64": "3.2.4",
+    "@omnifyjp/omnify-darwin-x64": "3.2.4",
+    "@omnifyjp/omnify-linux-x64": "3.2.4",
+    "@omnifyjp/omnify-linux-arm64": "3.2.4",
+    "@omnifyjp/omnify-win32-x64": "3.2.4"
   }
 }

package/ts-dist/php/model-generator.js

@@ -74,6 +74,7 @@ function generateBaseModel(name, schema, reader, config) {
     const relations = buildRelations(name, properties, propertyOrder, modelNamespace, reader);
     const accessors = buildAccessors(expandedProperties);
     const fileAccessors = hasFiles ? buildFileAccessors(properties, propertyOrder, modelNamespace) : '';
+    const auditSection = buildAuditSection(options, reader, modelNamespace);
     const nestedSetMethod = buildNestedSetParentIdMethod(nestedSetParentColumn);
     let keyTypeSection = '';
     if (idType === 'Uuid' || idType === 'Ulid' || idType === 'String') {
@@ -171,7 +172,7 @@ ${appends}    ];
         return [
 ${casts}        ];
     }
-${relations}${accessors}${fileAccessors}${nestedSetMethod}
+${relations}${accessors}${fileAccessors}${auditSection}${nestedSetMethod}
 }
 `;
     return baseFile(resolveModularBasePath(config, name, 'Models', `${modelName}BaseModel.php`, config.models.basePath), content);
@@ -568,6 +569,89 @@ function buildNestedSetParentIdMethod(parentColumn) {
     }
 `;
 }
+function buildAuditSection(options, reader, modelNamespace) {
+    const opts = options;
+    const audit = opts?.['audit'];
+    if (!audit)
+        return '';
+    const hasCreatedBy = audit['createdBy'] ?? false;
+    const hasUpdatedBy = audit['updatedBy'] ?? false;
+    const hasDeletedBy = audit['deletedBy'] ?? false;
+    if (!hasCreatedBy && !hasUpdatedBy && !hasDeletedBy)
+        return '';
+    // Get audit model name from schemas.json auditConfig
+    const auditModel = reader.data?.auditConfig?.model ?? 'User';
+    const fqcn = `\\${modelNamespace}\\${auditModel}`;
+    const parts = [];
+    // Model events (booted)
+    const events = [];
+    if (hasCreatedBy) {
+        events.push(`        static::creating(function ($model) {
+            if (auth()->check() && !$model->created_by_id) {
+                $model->created_by_id = auth()->id();
+            }
+        });`);
+    }
+    if (hasUpdatedBy) {
+        events.push(`        static::updating(function ($model) {
+            if (auth()->check()) {
+                $model->updated_by_id = auth()->id();
+            }
+        });`);
+    }
+    if (hasDeletedBy) {
+        events.push(`        static::deleting(function ($model) {
+            if (auth()->check() && method_exists($model, 'isForceDeleting') && !$model->isForceDeleting()) {
+                $model->deleted_by_id = auth()->id();
+                $model->saveQuietly();
+            }
+        });`);
+    }
+    if (events.length > 0) {
+        parts.push(`
+    /**
+     * Boot audit events.
+     */
+    protected static function booted(): void
+    {
+        parent::booted();
+
+${events.join('\n\n')}
+    }`);
+    }
+    // Relations
+    if (hasCreatedBy) {
+        parts.push(`
+    /**
+     * Get the user who created this record.
+     */
+    public function createdBy(): BelongsTo
+    {
+        return $this->belongsTo(${fqcn}::class, 'created_by_id');
+    }`);
+    }
+    if (hasUpdatedBy) {
+        parts.push(`
+    /**
+     * Get the user who last updated this record.
+     */
+    public function updatedBy(): BelongsTo
+    {
+        return $this->belongsTo(${fqcn}::class, 'updated_by_id');
+    }`);
+    }
+    if (hasDeletedBy) {
+        parts.push(`
+    /**
+     * Get the user who deleted this record.
+     */
+    public function deletedBy(): BelongsTo
+    {
+        return $this->belongsTo(${fqcn}::class, 'deleted_by_id');
+    }`);
+    }
+    return parts.join('\n');
+}
 function buildFileAccessors(properties, propertyOrder, modelNamespace) {
     const methods = [];
     for (const propName of propertyOrder) {

package/ts-dist/php/service-generator.js

@@ -40,14 +40,15 @@ function generateBaseService(name, schema, reader, config) {
         if (!prop)
             continue;
         const colName = toSnakeCase(propName);
+        const translatable = prop.translatable ?? false;
         if (prop.searchable) {
-            searchableFields.push({ propName, colName });
+            searchableFields.push({ propName, colName, translatable });
         }
         if (prop.filterable) {
-            filterableFields.push({ propName, colName, type: prop.type, prop });
+            filterableFields.push({ propName, colName, type: prop.type, prop, translatable });
         }
         if (prop.sortable) {
-            sortableFields.push(colName);
+            sortableFields.push({ colName, translatable });
         }
     }
     // Build search block
@@ -101,7 +102,12 @@ ${searchBlock}${filterBlock}${sortBlock}
         }
 
         if ($search = $filters['search'] ?? null) {
-            $query->where(function ($q) use ($search) {${searchableFields.length > 0 ? `\n${searchableFields.map((f, i) => `                $q->${i === 0 ? 'where' : 'orWhere'}('${f.colName}', 'like', "%{$search}%");`).join('\n')}` : `\n                // No searchable fields defined`}
+            $query->where(function ($q) use ($search) {${searchableFields.length > 0 ? `\n${searchableFields.map((f, i) => {
+            if (f.translatable) {
+                return `                $q->${i === 0 ? 'whereTranslationLike' : 'orWhereTranslationLike'}('${f.colName}', "%{$search}%");`;
+            }
+            return `                $q->${i === 0 ? 'where' : 'orWhere'}('${f.colName}', 'like', "%{$search}%");`;
+        }).join('\n')}` : `\n                // No searchable fields defined`}
             });
         }
 
@@ -196,6 +202,10 @@ function buildSearchBlock(fields) {
         return '';
     const clauses = fields.map((f, i) => {
         const method = i === 0 ? 'where' : 'orWhere';
+        if (f.translatable) {
+            // Astrotomic scope for translatable fields
+            return `                $q->${i === 0 ? 'whereTranslationLike' : 'orWhereTranslationLike'}('${f.colName}', "%{$search}%");`;
+        }
         return `                $q->${method}('${f.colName}', 'like', "%{$search}%");`;
     });
     return `
@@ -214,7 +224,14 @@ function buildFilterBlock(fields) {
     lines.push('');
     lines.push('        // Filters');
     for (const f of fields) {
-        const { colName, type } = f;
+        const { colName, type, translatable } = f;
+        // Translatable fields use Astrotomic scopes
+        if (translatable) {
+            lines.push(`        if (isset($filters['${colName}'])) {`);
+            lines.push(`            $query->whereTranslation('${colName}', $filters['${colName}']);`);
+            lines.push(`        }`);
+            continue;
+        }
         switch (type) {
             case 'Decimal':
             case 'Int':
@@ -264,11 +281,22 @@ function buildSortBlock(sortableFields) {
         $query->orderBy('created_at', 'desc');
 `;
     }
-    const allowedList = sortableFields.map(f => `'${f}'`).join(', ');
+    const allowedList = sortableFields.map(f => `'${f.colName}'`).join(', ');
+    const translatableSorts = sortableFields.filter(f => f.translatable).map(f => `'${f.colName}'`);
+    const translatableCheck = translatableSorts.length > 0
+        ? `\n            $translatableSorts = [${translatableSorts.join(', ')}];`
+        : '';
+    const orderByLine = translatableSorts.length > 0
+        ? `            if (in_array($sortField, $translatableSorts ?? [], true)) {
+                $query->orderByTranslation($sortField, $direction);
+            } else {
+                $query->orderBy($sortField, $direction);
+            }`
+        : `            $query->orderBy($sortField, $direction);`;
     return `
         // Sort
         $sortParam = $filters['sort'] ?? '-created_at';
-        $allowedSorts = [${allowedList}];
+        $allowedSorts = [${allowedList}];${translatableCheck}
 
         foreach (explode(',', $sortParam) as $sortField) {
             $sortField = trim($sortField);
@@ -280,7 +308,7 @@ function buildSortBlock(sortableFields) {
             }
 
             if (in_array($sortField, $allowedSorts, true) || $sortField === 'created_at' || $sortField === 'updated_at') {
-                $query->orderBy($sortField, $direction);
+${orderByLine}
             }
         }
 `;