@omnifyjp/omnify 5.8.5 → 5.8.6

package/package.json

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

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

@@ -581,21 +581,27 @@ function buildCasts(properties, expandedProperties, propertyOrder, reader, confi
 /**
  * Issue #98 v5.8.6: resolve the FQCN namespace of a related Model
  * for inline `belongsTo / hasMany / belongsToMany / morphTo` references.
- * The namespace must match the TARGET's actual file location, not the
- * source schema's. Three knobs:
+ * The namespace must match the TARGET's CANONICAL CLASS LOCATION:
+ *
  *   1. Package schemas — return the package's namespace verbatim
  *      (already handled by reader.resolveModelNamespace).
  *   2. Pivot schemas — always nest under `Pivot/` regardless of any
- *      group / userEditableGroupByFolder setting.
- *   3. Group nesting — only when `userEditableGroupByFolder: true`
- *      (matches where the editable lives so the relation resolves to
- *      the user's customizable class). Default off → flat FQCN
- *      matches the Laravel-canonical flat editable layout.
+ *      group / flat flag (matches the dedicated `Pivot/` folder
+ *      enforced for pivot models).
+ *   3. flatBase: true — the BASE class is the user's canonical class
+ *      (no `*BaseModel` suffix, lives at the grouped path). Nest by
+ *      group so the FQCN matches the grouped base.
+ *   4. flatBase: false + userEditableGroupByFolder: true — the editable
+ *      mirrors the base group. Nest by group so the FQCN matches the
+ *      grouped editable.
+ *   5. flatBase: false + userEditableGroupByFolder: false (Laravel-
+ *      canonical default) — the editable is FLAT. Don't nest; the
+ *      FQCN matches the flat editable's location.
  *
- * Pre-fix every relation emitted `\${modelNamespace}\${target}::class`
- * (flat FQCN) regardless of where the target's file actually lived.
- * For grouped projects this dispatched to a non-existent class at
- * runtime — `ErrorException: include(... no such file)`.
+ * Pre-v5.8.6 every relation emitted `\${modelNamespace}\${target}::class`
+ * (flat) regardless of where the target's file actually lived. Grouped
+ * projects (especially flatBase) hit `ErrorException: include(... no
+ * such file)` on every cross-Model reference.
  */
 function resolveRelatedModelNamespace(target, modelNamespace, config, reader) {
     const baseNs = reader.resolveModelNamespace(target, modelNamespace);
@@ -608,7 +614,10 @@ function resolveRelatedModelNamespace(target, modelNamespace, config, reader) {
     if (targetSchema.kind === 'pivot') {
         return `${baseNs}\\Pivot`;
     }
-    if (config.models.userEditableGroupByFolder && targetSchema.group) {
+    // Nest by group when EITHER flatBase is on (base is canonical, grouped)
+    // OR the editable explicitly mirrors the base group.
+    const shouldNestByGroup = config.models.flatBase || config.models.userEditableGroupByFolder;
+    if (shouldNestByGroup && targetSchema.group) {
         return `${baseNs}\\${toPascalCase(targetSchema.group)}`;
     }
     return baseNs;