@omnifyjp/omnify 5.8.0 → 5.8.2

package/package.json

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

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

@@ -42,7 +42,11 @@ function generateForSchema(name, schema, reader, config) {
 }
 function generateBaseRequest(name, schema, reader, config, action) {
     const modelName = toPascalCase(name);
-    const baseNamespace = resolveModularBaseNamespace(config, name, 'Requests', config.requests.baseNamespace);
+    // Issue #98 v5.8.2: nest namespace by group in legacy structure so the
+    // file's `namespace App\Omnify\Requests\Cms;` matches its grouped path.
+    const baseNamespace = config.structure === 'modular'
+        ? resolveModularBaseNamespace(config, name, 'Requests', config.requests.baseNamespace)
+        : nestByGroup({ path: '', namespace: config.requests.baseNamespace }, schema.group).namespace;
     const modelLocalesNamespace = resolveModularBaseNamespace(config, name, 'Locales', config.models.baseNamespace + '\\Locales');
     const properties = (schema.properties ?? {});
     const expandedProperties = reader.getExpandedProperties(name);

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

@@ -17,7 +17,13 @@ export function generateResources(reader, config) {
 }
 function generateBaseResource(name, schema, reader, config) {
     const modelName = toPascalCase(name);
-    const baseNamespace = resolveModularBaseNamespace(config, name, 'Resources', config.resources.baseNamespace);
+    // Issue #98 v5.8.2: nest namespace by group in legacy structure so the
+    // file's `namespace App\Omnify\Resources\Cms;` matches its grouped path.
+    // (Models layer was already correct in v5.8.0; the other 3 base+editable
+    // layers shipped with path nested but namespace ungrouped — broken PSR-4.)
+    const baseNamespace = config.structure === 'modular'
+        ? resolveModularBaseNamespace(config, name, 'Resources', config.resources.baseNamespace)
+        : nestByGroup({ path: '', namespace: config.resources.baseNamespace }, schema.group).namespace;
     const resourceNamespace = config.resources.namespace;
     const modelNamespace = config.models.namespace;
     const properties = (schema.properties ?? {});

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

@@ -500,7 +500,16 @@ function generateBaseService(name, schema, reader, config) {
     const defaults = resolveDefaults(schema, reader, name);
     // Locales (for translatable)
     const locales = reader.getLocales();
-    const baseNs = resolveModularBaseNamespace(config, name, 'Services', config.services.baseNamespace);
+    // Issue #98 v5.8.2: legacy structure must nest by group so the file's
+    // `namespace App\Omnify\Services\Cms;` declaration matches its
+    // grouped path (`app/Omnify/Services/Cms/BannerServiceBase.php`).
+    // Without this, PSR-4 autoload silently breaks: composer dump-autoload
+    // succeeds (it doesn't read the file body) but `App\Omnify\Services\Cms\BannerService`
+    // resolves to nothing at runtime → "Class not found" for every consumer.
+    // Modular structure handled separately below.
+    const baseNs = config.structure === 'modular'
+        ? resolveModularBaseNamespace(config, name, 'Services', config.services.baseNamespace)
+        : nestByGroup({ path: '', namespace: config.services.baseNamespace }, schema.group).namespace;
     const modelNs = config.models.namespace;
     // Build imports
     const imports = [

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

@@ -56,7 +56,17 @@ function castFor(type) {
 function generateTranslationBaseModel(name, translatableFields, enforceLanguageFk, config) {
     const modelName = toPascalCase(name);
     const modelSnake = toSnakeCase(name);
-    const baseNamespace = resolveModularBaseNamespace(config, name, 'Models', config.models.baseNamespace);
+    // Issue #98 v5.8.2: consolidate every Translation model under one
+    // dedicated `Translation/` subfolder + sub-namespace. Reporter's
+    // rationale: 39 translation models flat at the top of `Models/`
+    // (next to the grouped main models) is the worst-of-both-worlds
+    // layout. One consolidated `Translation/` folder lets a project set
+    // Astrotomic's `translation_model_namespace` once globally instead
+    // of per-model `$translationModel` overrides. Modular structure
+    // already isolates per-Schema so this nesting only applies to legacy.
+    const baseNamespace = config.structure === 'modular'
+        ? resolveModularBaseNamespace(config, name, 'Models', config.models.baseNamespace)
+        : `${config.models.baseNamespace}\\Translation`;
     const tableName = `${modelSnake}_translations`;
     // Fillable: every translatable column + the optional `language_id`
     // FK column (added by the migration when locale.enforceLanguageFk is
@@ -119,12 +129,24 @@ ${fillableLines}
     ];${castsBlock}
 }
 `;
-    return baseFile(resolveModularBasePath(config, name, 'Models', `${modelName}TranslationBaseModel.php`, config.models.basePath), content);
+    // Issue #98 v5.8.2: legacy structure routes translation bases to
+    // `<modelsBasePath>/Translation/<Name>TranslationBaseModel.php`.
+    const filePath = config.structure === 'modular'
+        ? resolveModularBasePath(config, name, 'Models', `${modelName}TranslationBaseModel.php`, config.models.basePath)
+        : `${config.models.basePath}/Translation/${modelName}TranslationBaseModel.php`;
+    return baseFile(filePath, content);
 }
 function generateTranslationUserModel(name, config) {
     const modelName = toPascalCase(name);
-    const modelNamespace = config.models.namespace;
-    const baseNamespace = resolveModularBaseNamespace(config, name, 'Models', config.models.baseNamespace);
+    // Issue #98 v5.8.2: editable translation stub also lives under
+    // `Translation/` to mirror the base layout. Astrotomic finds it via
+    // the project-set `translation_model_namespace`.
+    const modelNamespace = config.structure === 'modular'
+        ? config.models.namespace
+        : `${config.models.namespace}\\Translation`;
+    const baseNamespace = config.structure === 'modular'
+        ? resolveModularBaseNamespace(config, name, 'Models', config.models.baseNamespace)
+        : `${config.models.baseNamespace}\\Translation`;
     const content = `<?php
 
 namespace ${modelNamespace};
@@ -142,5 +164,9 @@ class ${modelName}Translation extends ${modelName}TranslationBaseModel
     // Add your custom methods here
 }
 `;
-    return userFile(`${config.models.path}/${modelName}Translation.php`, content);
+    // Editable file path mirrors the namespace nesting.
+    const filePath = config.structure === 'modular'
+        ? `${config.models.path}/${modelName}Translation.php`
+        : `${config.models.userEditablePath}/Translation/${modelName}Translation.php`;
+    return userFile(filePath, content);
 }