@omnifyjp/ts 3.2.8 → 3.2.10

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

@@ -16,11 +16,83 @@ export function generateFileModels(reader, config) {
     files.push(generateFileBaseModel(config, defaultDisk));
     files.push(generateFileUserModel(config));
     files.push(generateFileStatusEnum(config));
+    files.push(generateFileResourceBase(config));
+    files.push(generateFileResourceUser(config));
     if (locale) {
         files.push(generateFileLocales(config, locale.locales));
     }
     return files;
 }
+function generateFileResourceBase(config) {
+    const baseNamespace = resolveModularBaseNamespace(config, 'File', 'Resources', config.resources.baseNamespace);
+    const content = `<?php
+
+namespace ${baseNamespace};
+
+/**
+ * DO NOT EDIT - This file is auto-generated by Omnify.
+ * Any changes will be overwritten on next generation.
+ *
+ * @generated by omnify
+ */
+
+use Illuminate\\Http\\Request;
+use Illuminate\\Http\\Resources\\Json\\JsonResource;
+
+class FileResourceBase extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @return array<string, mixed>
+     */
+    public function toArray(Request $request): array
+    {
+        return [
+            'id' => $this->id,
+            'collection' => $this->collection,
+            'disk' => $this->disk,
+            'path' => $this->path,
+            'original_name' => $this->original_name,
+            'mime_type' => $this->mime_type,
+            'size' => $this->size,
+            'status' => $this->status?->value,
+            'url' => $this->url ?? null,
+            'expires_at' => $this->expires_at?->toISOString(),
+            'sort_order' => $this->sort_order,
+            'created_at' => $this->created_at?->toISOString(),
+            'updated_at' => $this->updated_at?->toISOString(),
+        ];
+    }
+}
+`;
+    return baseFile(resolveModularBasePath(config, 'File', 'Resources', 'FileResourceBase.php', config.resources.basePath), content);
+}
+function generateFileResourceUser(config) {
+    const resourceNamespace = config.resources.namespace;
+    const baseNamespace = resolveModularBaseNamespace(config, 'File', 'Resources', config.resources.baseNamespace);
+    const content = `<?php
+
+/**
+ * File Resource
+ *
+ * SAFE TO EDIT - This file is never overwritten by Omnify.
+ */
+
+namespace ${resourceNamespace};
+
+use ${baseNamespace}\\FileResourceBase;
+
+/**
+ * FileResource — add project-specific serialization here.
+ */
+class FileResource extends FileResourceBase
+{
+    //
+}
+`;
+    return userFile(`${config.resources.path}/FileResource.php`, content);
+}
 function generateFileBaseModel(config, defaultDisk) {
     const baseNamespace = resolveModularBaseNamespace(config, 'File', 'Models', config.models.baseNamespace);
     const localesNamespace = resolveModularBaseNamespace(config, 'File', 'Locales', config.models.baseNamespace + '\\Locales');

package/dist/php/service-generator.js

@@ -31,7 +31,8 @@ function generateBaseService(name, schema, reader, config) {
     const modelNs = config.models.namespace;
     const properties = schema.properties ?? {};
     const propertyOrder = reader.getPropertyOrder(name);
-    // Collect searchable, filterable, sortable fields
+    const expandedProperties = reader.getExpandedProperties(name);
+    // Collect searchable, filterable, sortable fields (compound types expand to sub-columns)
     const searchableFields = [];
     const filterableFields = [];
     const sortableFields = [];
@@ -41,14 +42,44 @@ function generateBaseService(name, schema, reader, config) {
             continue;
         const colName = toSnakeCase(propName);
         const translatable = prop.translatable ?? false;
+        const expansion = expandedProperties[propName];
         if (prop.searchable) {
-            searchableFields.push({ propName, colName, translatable });
+            if (expansion && expansion.columns.length > 0) {
+                // Compound type: search all sub-columns
+                for (const col of expansion.columns) {
+                    if (col.name) {
+                        searchableFields.push({ propName: col.name, colName: col.name, translatable });
+                    }
+                }
+            }
+            else {
+                searchableFields.push({ propName, colName, translatable });
+            }
         }
         if (prop.filterable) {
-            filterableFields.push({ propName, colName, type: prop.type, prop, translatable });
+            if (expansion && expansion.columns.length > 0) {
+                // Compound type: filter on each sub-column
+                for (const col of expansion.columns) {
+                    if (col.name) {
+                        filterableFields.push({ propName: col.name, colName: col.name, type: col.type ?? 'String', prop, translatable });
+                    }
+                }
+            }
+            else {
+                filterableFields.push({ propName, colName, type: prop.type, prop, translatable });
+            }
         }
         if (prop.sortable) {
-            sortableFields.push({ colName, translatable });
+            if (expansion && expansion.columns.length > 0) {
+                // Compound type: sort by primary sub-column (first one)
+                const primaryCol = expansion.columns[0];
+                if (primaryCol?.name) {
+                    sortableFields.push({ propName: colName, colName: primaryCol.name, translatable });
+                }
+            }
+            else {
+                sortableFields.push({ propName: colName, colName, translatable });
+            }
         }
     }
     // Build search block
@@ -281,22 +312,31 @@ function buildSortBlock(sortableFields) {
         $query->orderBy('created_at', 'desc');
 `;
     }
-    const allowedList = sortableFields.map(f => `'${f.colName}'`).join(', ');
-    const translatableSorts = sortableFields.filter(f => f.translatable).map(f => `'${f.colName}'`);
+    // allowedSorts uses logical propName (what user sends in ?sort=)
+    const allowedList = sortableFields.map(f => `'${f.propName}'`).join(', ');
+    // sortMap: logical name → actual column name (compound types map to sub-column)
+    const needsMap = sortableFields.some(f => f.propName !== f.colName);
+    const sortMapEntries = sortableFields
+        .filter(f => f.propName !== f.colName)
+        .map(f => `            '${f.propName}' => '${f.colName}',`)
+        .join('\n');
+    const sortMapDecl = needsMap ? `\n        $sortMap = [\n${sortMapEntries}\n        ];` : '';
+    const sortColResolve = needsMap ? `\n                $sortCol = $sortMap[$sortField] ?? $sortField;` : `\n                $sortCol = $sortField;`;
+    const translatableSorts = sortableFields.filter(f => f.translatable).map(f => `'${f.propName}'`);
     const translatableCheck = translatableSorts.length > 0
-        ? `\n            $translatableSorts = [${translatableSorts.join(', ')}];`
+        ? `\n        $translatableSorts = [${translatableSorts.join(', ')}];`
         : '';
     const orderByLine = translatableSorts.length > 0
         ? `            if (in_array($sortField, $translatableSorts ?? [], true)) {
-                $query->orderByTranslation($sortField, $direction);
+                $query->orderByTranslation($sortCol, $direction);
             } else {
-                $query->orderBy($sortField, $direction);
+                $query->orderBy($sortCol, $direction);
             }`
-        : `            $query->orderBy($sortField, $direction);`;
+        : `            $query->orderBy($sortCol, $direction);`;
     return `
         // Sort
         $sortParam = $filters['sort'] ?? '-created_at';
-        $allowedSorts = [${allowedList}];${translatableCheck}
+        $allowedSorts = [${allowedList}];${sortMapDecl}${translatableCheck}
 
         foreach (explode(',', $sortParam) as $sortField) {
             $sortField = trim($sortField);
@@ -307,7 +347,7 @@ function buildSortBlock(sortableFields) {
                 $sortField = substr($sortField, 1);
             }
 
-            if (in_array($sortField, $allowedSorts, true) || $sortField === 'created_at' || $sortField === 'updated_at') {
+            if (in_array($sortField, $allowedSorts, true) || $sortField === 'created_at' || $sortField === 'updated_at') {${sortColResolve}
 ${orderByLine}
             }
         }

package/package.json

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