@omnifyjp/omnify 5.8.4 → 5.8.6

package/package.json

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

@@ -111,7 +111,7 @@ function generateBaseModel(name, schema, reader, config) {
     const hidden = buildHidden(properties, expandedProperties, propertyOrder);
     const appends = buildAppends(expandedProperties);
     const casts = buildCasts(properties, expandedProperties, propertyOrder, reader, config);
-    const relations = buildRelations(name, properties, propertyOrder, modelNamespace, reader);
+    const relations = buildRelations(name, properties, propertyOrder, modelNamespace, reader, config);
     const accessors = buildAccessors(expandedProperties);
     const fileAccessors = hasFiles ? buildFileAccessors(properties, propertyOrder, modelNamespace) : '';
     const auditSection = buildAuditSection(options, reader, modelNamespace);
@@ -578,7 +578,51 @@ function buildCasts(properties, expandedProperties, propertyOrder, reader, confi
         return '';
     return casts.map(c => `            ${c}`).join('\n') + '\n';
 }
-function buildRelations(schemaName, properties, propertyOrder, modelNamespace, reader) {
+/**
+ * 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 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 / 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-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);
+    // Package schemas — leave as-is.
+    if (baseNs !== modelNamespace)
+        return baseNs;
+    const targetSchema = reader.getSchema(target);
+    if (!targetSchema)
+        return baseNs;
+    if (targetSchema.kind === 'pivot') {
+        return `${baseNs}\\Pivot`;
+    }
+    // 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;
+}
+function buildRelations(schemaName, properties, propertyOrder, modelNamespace, reader, config) {
     const methods = [];
     const sourceTableName = reader.getTableName(schemaName);
     // Track method names already declared on this model so reverse-relation
@@ -591,9 +635,11 @@ function buildRelations(schemaName, properties, propertyOrder, modelNamespace, r
         const prop = properties[propName];
         if (!prop || prop['type'] !== 'Association')
             continue;
-        // Resolve namespace per-target (package schemas use their own namespace)
+        // Resolve namespace per-target (package schemas use their own namespace).
+        // Issue #98 v5.8.6: also nest by target's group / Pivot/ so the
+        // FQCN matches the target file's actual location.
         const target = prop['target'] ?? '';
-        const ns = target ? reader.resolveModelNamespace(target, modelNamespace) : modelNamespace;
+        const ns = target ? resolveRelatedModelNamespace(target, modelNamespace, config, reader) : modelNamespace;
         const targetTableName = target ? reader.getTableName(target) : '';
         // For ManyToMany, look up the explicit `kind: pivot` schema (the
         // sorted PascalCase concat of source + target — auto-created on
@@ -623,7 +669,7 @@ function buildRelations(schemaName, properties, propertyOrder, modelNamespace, r
     // Auto-generate reverse HasMany/HasOne for any child schema that declares a
     // ManyToOne/OneToOne pointing at this schema, unless the user has already
     // declared a relation method with the same name. Issue #39.
-    const inverseRelations = buildInverseRelations(schemaName, modelNamespace, reader, declaredMethods, explicitInverses);
+    const inverseRelations = buildInverseRelations(schemaName, modelNamespace, reader, declaredMethods, explicitInverses, config);
     if (inverseRelations) {
         methods.push(inverseRelations);
     }
@@ -666,7 +712,7 @@ const LARAVEL_RESERVED_RELATION_NAMES = new Set([
  * a unique method name, or add `mappedBy: <customName>` to the child schema
  * so the derived method name changes.
  */
-function buildInverseRelations(parentName, modelNamespace, reader, declaredMethods, explicitInverses) {
+function buildInverseRelations(parentName, modelNamespace, reader, declaredMethods, explicitInverses, config) {
     const methods = [];
     const allSchemas = reader.getSchemas();
     // Stable iteration order — sort child names so output is deterministic
@@ -714,7 +760,11 @@ function buildInverseRelations(parentName, modelNamespace, reader, declaredMetho
             // Here we're emitting the *parent* accessor, so the child's ManyToOne
             // (or owning OneToOne) is what we react to.
             const fkColumn = `${toSnakeCase(childPropName)}_id`;
-            const childNs = reader.resolveModelNamespace(childName, modelNamespace);
+            // Issue #98 v5.8.6: nest the inverse-side FQCN by the CHILD's
+            // group / Pivot/ so the relation resolves to the child's actual
+            // file location (which lives in `<childGroup>/<Child>.php` or
+            // `Pivot/<Child>.php`, not flat).
+            const childNs = resolveRelatedModelNamespace(childName, modelNamespace, config, reader);
             const fqcn = `\\${childNs}\\${childName}`;
             const returnType = isOneToOne ? 'HasOne' : 'HasMany';
             const eloquentMethod = isOneToOne ? 'hasOne' : 'hasMany';