@omnifyjp/omnify 3.2.3 → 3.2.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@omnifyjp/omnify",
-  "version": "3.2.3",
+  "version": "3.2.5",
   "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.3",
-    "@omnifyjp/omnify-darwin-x64": "3.2.3",
-    "@omnifyjp/omnify-linux-x64": "3.2.3",
-    "@omnifyjp/omnify-linux-arm64": "3.2.3",
-    "@omnifyjp/omnify-win32-x64": "3.2.3"
+    "@omnifyjp/omnify-darwin-arm64": "3.2.5",
+    "@omnifyjp/omnify-darwin-x64": "3.2.5",
+    "@omnifyjp/omnify-linux-x64": "3.2.5",
+    "@omnifyjp/omnify-linux-arm64": "3.2.5",
+    "@omnifyjp/omnify-win32-x64": "3.2.5"
   }
 }

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

@@ -62,7 +62,7 @@ function generateBaseModel(name, schema, reader, config) {
         const prop = properties[p];
         return prop && prop['type'] === 'File';
     });
-    const imports = buildImports(baseNamespace, modelName, hasSoftDelete, isAuthenticatable, hasTranslatable, properties, needsUuidTrait, needsUlidTrait, hasNestedSet, config.nestedset.namespace, hasFiles, modelNamespace, localesNamespace, traitsNamespace, sharedModelsNamespace);
+    const imports = buildImports(baseNamespace, modelName, hasSoftDelete, isAuthenticatable, hasTranslatable, properties, needsUuidTrait, needsUlidTrait, hasNestedSet, config.nestedset.namespace, hasFiles, modelNamespace, localesNamespace, traitsNamespace, sharedModelsNamespace, config);
     const docProperties = buildDocProperties(properties, expandedProperties, propertyOrder);
     const baseClass = isAuthenticatable ? 'Authenticatable' : 'BaseModel';
     const implementsClause = hasTranslatable ? ' implements TranslatableContract' : '';
@@ -227,7 +227,7 @@ ${traits.join('\n')}
 `;
     return userFile(`${config.models.path}/${modelName}.php`, content);
 }
-function buildImports(baseNamespace, modelName, hasSoftDelete, isAuthenticatable, hasTranslatable, properties, needsUuidTrait = false, needsUlidTrait = false, hasNestedSet = false, nestedSetNamespace = 'Aimeos\\Nestedset', hasFiles = false, modelNamespace = '', localesNamespace = '', traitsNamespace = '', sharedModelsNamespace = '') {
+function buildImports(baseNamespace, modelName, hasSoftDelete, isAuthenticatable, hasTranslatable, properties, needsUuidTrait = false, needsUlidTrait = false, hasNestedSet = false, nestedSetNamespace = 'Aimeos\\Nestedset', hasFiles = false, modelNamespace = '', localesNamespace = '', traitsNamespace = '', sharedModelsNamespace = '', config) {
     const lines = [];
     // Import BaseModel from shared namespace when in modular mode
     if (sharedModelsNamespace && sharedModelsNamespace !== baseNamespace && !isAuthenticatable) {
@@ -252,7 +252,11 @@ function buildImports(baseNamespace, modelName, hasSoftDelete, isAuthenticatable
     lines.push(`use ${traitsNamespace || baseNamespace + '\\Traits'}\\HasLocalizedDisplayName;`);
     lines.push(`use ${localesNamespace || baseNamespace + '\\Locales'}\\${modelName}Locales;`);
     if (hasFiles) {
-        lines.push(`use ${traitsNamespace || baseNamespace + '\\Traits'}\\HasFiles;`);
+        // HasFiles lives in File module, not Shared
+        const fileTraitsNs = config
+            ? resolveModularBaseNamespace(config, 'File', 'Traits', baseNamespace + '\\Traits')
+            : (traitsNamespace || baseNamespace + '\\Traits');
+        lines.push(`use ${fileTraitsNs}\\HasFiles;`);
         if (modelNamespace) {
             lines.push(`use ${modelNamespace}\\File;`);
         }

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

@@ -134,6 +134,21 @@ function generateBaseRequest(name, schema, reader, config, action) {
             needsRuleImport = true;
         rulesLines.push(`            '${snakeName}' => ${formatRules(rules)},`);
         attributeKeys.push(snakeName);
+        // Translatable: add locale-nested rules (Astrotomic expects {locale}.{field})
+        const isTranslatable = prop['translatable'] ?? false;
+        if (isTranslatable) {
+            const locales = reader.getLocales();
+            // Build nullable version of the same rules
+            const localeRules = rules.map(r => {
+                if (r === 'required')
+                    return 'nullable';
+                return r;
+            });
+            for (const locale of locales) {
+                rulesLines.push(`            '${locale}' => ['nullable', 'array'],`);
+                rulesLines.push(`            '${locale}.${snakeName}' => ${formatRules(localeRules)},`);
+            }
+        }
     }
     const rulesContent = rulesLines.join('\n');
     const localesClass = `${modelLocalesNamespace}\\${modelName}Locales`;

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

@@ -67,6 +67,11 @@ function generateBaseResource(name, schema, reader, config) {
         const expr = toResourceExpression(snakeName, type);
         fields.push(`            '${snakeName}' => ${expr},`);
     }
+    // Include translations for translatable models
+    const translatableFields = reader.getTranslatableFields(name);
+    if (translatableFields.length > 0) {
+        fields.push("            'translations' => $this->getTranslationsArray(),");
+    }
     if (hasTimestamps) {
         fields.push("            'created_at' => $this->created_at?->toISOString(),");
         fields.push("            'updated_at' => $this->updated_at?->toISOString(),");

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}
             }
         }
 `;