@omnifyjp/omnify 3.2.4 → 3.2.6

package/package.json

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

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(),");