@omnifyjp/ts 5.8.1 → 5.8.3

package/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/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/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/dist/php/translation-model-generator.js

@@ -56,7 +56,23 @@ 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.
+    // Issue #98 v5.8.3: when `flatBase: true`, the model layer drops
+    // the `Base/` subfolder + `BaseModel` suffix everywhere else; the
+    // translation base must follow the same convention so naming
+    // stays consistent across layers (a class extending `Model` named
+    // `CategoryTranslationBaseModel` while siblings drop the suffix is
+    // the bug the reporter flagged).
+    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
@@ -83,6 +99,12 @@ function generateTranslationBaseModel(name, translatableFields, enforceLanguageF
     protected $casts = [
 ${castEntries.join('\n')}
     ];`;
+    // Issue #98 v5.8.3: honor flatBase. With flatBase=true the base
+    // class drops the `BaseModel` suffix and lives at the bare name,
+    // matching how every other Models-layer base behaves under flatBase.
+    // Modular structure ignores flatBase (per-Schema isolation already).
+    const flatBase = config.structure !== 'modular' && config.models.flatBase === true;
+    const baseClassName = flatBase ? `${modelName}Translation` : `${modelName}TranslationBaseModel`;
     const content = `<?php
 
 namespace ${baseNamespace};
@@ -97,9 +119,9 @@ namespace ${baseNamespace};
 use Illuminate\\Database\\Eloquent\\Model;
 
 /**
- * ${modelName}TranslationBaseModel
+ * ${baseClassName}
  */
-class ${modelName}TranslationBaseModel extends Model
+class ${baseClassName} extends Model
 {
     /**
      * The table associated with the model.
@@ -119,28 +141,64 @@ ${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`
+    // (or `${modelName}Translation.php` when flatBase drops the suffix).
+    const filePath = config.structure === 'modular'
+        ? resolveModularBasePath(config, name, 'Models', `${baseClassName}.php`, config.models.basePath)
+        : `${config.models.basePath}/Translation/${baseClassName}.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`.
+    // Issue #98 v5.8.3 (Bug 1): when `userEditablePath` points elsewhere
+    // (e.g. canonical Laravel `app/Models/`), the namespace must match
+    // the FILE LOCATION, not the base namespace — otherwise PSR-4 fails
+    // at runtime. Use `userEditableNamespace` (resolved from the config
+    // override) instead of the base `models.namespace`.
+    const modelNamespace = config.structure === 'modular'
+        ? config.models.namespace
+        : `${config.models.userEditableNamespace}\\Translation`;
+    const baseNamespace = config.structure === 'modular'
+        ? resolveModularBaseNamespace(config, name, 'Models', config.models.baseNamespace)
+        : `${config.models.baseNamespace}\\Translation`;
+    // Issue #98 v5.8.3 (Bug 2): honor flatBase + alias on class-name
+    // collision. With flatBase the base class is also named
+    // `<Model>Translation` (no suffix); the editable stub then needs
+    // an alias to avoid a self-collision when extending. Mirrors the
+    // pattern used by resource / service / request user generators.
+    const flatBase = config.structure !== 'modular' && config.models.flatBase === true;
+    const baseClassName = flatBase ? `${modelName}Translation` : `${modelName}TranslationBaseModel`;
+    const editableClassName = `${modelName}Translation`;
+    const baseAlias = baseClassName === editableClassName
+        ? `${editableClassName}Base`
+        : baseClassName;
+    const baseImport = baseAlias === baseClassName
+        ? `use ${baseNamespace}\\${baseClassName};`
+        : `use ${baseNamespace}\\${baseClassName} as ${baseAlias};`;
     const content = `<?php
 
 namespace ${modelNamespace};
 
-use ${baseNamespace}\\${modelName}TranslationBaseModel;
+${baseImport}
 
 /**
- * ${modelName}Translation Model
+ * ${editableClassName} Model
  *
  * This file is generated once and can be customized.
  * Add your custom methods and logic here.
  */
-class ${modelName}Translation extends ${modelName}TranslationBaseModel
+class ${editableClassName} extends ${baseAlias}
 {
     // 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}/${editableClassName}.php`
+        : `${config.models.userEditablePath}/Translation/${editableClassName}.php`;
+    return userFile(filePath, content);
 }

package/dist/php/types.js

@@ -184,10 +184,19 @@ nsFromPath) {
     const baseNamespace = flatBase ? namespace : `${namespace}\\${baseSubfolder}`;
     // User-editable: defaults to the same dir as base (legacy behavior),
     // overridable to e.g. canonical Laravel paths (`app/Models/`).
+    // Issue #98 v5.8.3: when only `userEditablePath` is overridden,
+    // derive the namespace from the editable PATH (not the base
+    // namespace) so the file's `namespace ...;` declaration matches
+    // its physical location and PSR-4 autoload doesn't break at
+    // runtime. Reporter hit this with `userEditablePath: app/Models`
+    // and the base path defaulting to `app/Omnify/Models/`: the
+    // editable stub claimed the base namespace and Laravel couldn't
+    // load it.
     const userEditablePath = override?.userEditablePath
         ? withRoot(rootPath, override.userEditablePath)
         : path;
-    const userEditableNamespace = override?.userEditableNamespace ?? namespace;
+    const userEditableNamespace = override?.userEditableNamespace
+        ?? (override?.userEditablePath ? nsFromPath(userEditablePath) : namespace);
     return { namespace, baseNamespace, path, basePath, userEditablePath, userEditableNamespace, flatBase };
 }
 /**

package/package.json

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