@omnifyjp/ts 5.8.15 → 5.8.17

package/dist/php/resource-generator.js

@@ -46,7 +46,7 @@ function generateBaseResource(name, schema, reader, config) {
         if (isHiddenByDefault(type) || hidden)
             continue;
         if (type === 'Association') {
-            addAssociationFields(propName, prop, fields, resourceNamespace, modelNamespace, reader);
+            addAssociationFields(propName, prop, fields, resourceNamespace, modelNamespace, reader, config);
             continue;
         }
         if (expandedProperties[propName]) {
@@ -193,27 +193,38 @@ class ${editable.className} extends ${baseAlias}
 `;
     return userFile(`${editable.path}/${editable.fileName}`, content);
 }
-function addAssociationFields(propName, prop, fields, resourceNamespace, modelNamespace, reader) {
+function addAssociationFields(propName, prop, fields, resourceNamespace, modelNamespace, reader, config) {
     const relation = prop['relation'] ?? '';
     const target = prop['target'] ?? '';
     const methodName = toCamelCase(propName);
-    // Resolve resource namespace for the target (null if package without resource ns)
-    // Issue #98 v5.8.12: nest the resource FQCN by the TARGET schema's
-    // group folder so the inline `new \<ns>\<Name>Resource(...)` ref
-    // matches where the target Resource file actually lives. Pre-fix
-    // every cross-resource ref emitted FLAT (`use App\Omnify\Resources\PaymentProviderResource`)
-    // while the file lived at `App\Omnify\Resources\Payments\PaymentProviderResource` —
-    // PHP autoload failed at runtime on every base resource that
-    // referenced a sibling resource (whenLoaded relation).
-    const rawTargetResNs = target ? reader.resolveResourceNamespace(target, resourceNamespace) : resourceNamespace;
-    let targetResNs = rawTargetResNs;
-    if (rawTargetResNs && rawTargetResNs === resourceNamespace) {
-        // Project-owned target: nest by the target's group so the FQCN
-        // matches the grouped base resource. Package targets keep their
-        // own namespace.
+    // Resolve resource namespace for the target.
+    // Issue #98 v5.8.12 / #99 v5.8.17: cross-resource refs match where
+    // the target Resource file actually lives. Same pattern as the
+    // v5.8.10/11 model + service / controller fixes — point at the
+    // EDITABLE so app code consistently resolves the same class:
+    //   1. Package target → keep the package's resource namespace.
+    //   2. Project target on modular structure → use the resource
+    //      namespace as-is (modular has its own per-schema isolation).
+    //   3. `userEditableGroupByFolder: true` → nest editable namespace
+    //      by group so the FQCN matches the grouped editable file.
+    //   4. Default (flat editable) → use the editable namespace as-is.
+    //      v4 projects with `resource.namespace: App\\Http\\Resources`
+    //      single-tier flat layout (#99) hit this path and stay flat.
+    const packageResNs = target ? reader.resolveResourceNamespace(target, resourceNamespace) : resourceNamespace;
+    let targetResNs = packageResNs;
+    if (packageResNs && packageResNs === resourceNamespace) {
+        // Project-owned target: switch to editable namespace + apply
+        // optional group nesting. Modular structure aligns base + editable
+        // on the same namespace so this is a no-op.
+        const editableNs = config.resources.userEditableNamespace || resourceNamespace;
         const targetSchema = target ? reader.getSchema(target) : undefined;
-        if (targetSchema?.group) {
-            targetResNs = `${rawTargetResNs}\\${toPascalCase(targetSchema.group)}`;
+        if (config.structure !== 'modular'
+            && config.resources.userEditableGroupByFolder
+            && targetSchema?.group) {
+            targetResNs = `${editableNs}\\${toPascalCase(targetSchema.group)}`;
+        }
+        else {
+            targetResNs = editableNs;
         }
     }
     // If target is a package schema without a resource namespace, use simple whenLoaded

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

@@ -5,24 +5,42 @@ import { toPascalCase } from './naming-helper.js';
 import { baseFile, nestByGroup } from './types.js';
 /** Generate the OmnifyServiceProvider for the application. */
 export function generateServiceProvider(reader, config) {
+    // Issue #98 v5.8.16: morph map entries point at the USER-EDITABLE
+    // class FQN, NOT the BASE. Same fix as v5.8.9 factory \$model,
+    // v5.8.10 model relations, v5.8.11 service / controller signatures —
+    // every layer that produces / type-hints model instances now uses
+    // the editable. Without this, Eloquent's `getMorphClass()` lookup
+    // misses (factory + relation output is `App\Models\<Name>`, but
+    // morph map keys point at `App\Omnify\Models\<Group>\<Name>`)
+    // and the runtime throws ClassMorphViolationException on every
+    // polymorphic relation in the project.
     const modelNamespace = config.models.namespace;
-    // Build morph map entries (project-owned schemas only). Issue #98 v5.8.4:
-    // each schema's actual model FQN includes its group folder, so the
-    // morph map must echo that — pre-fix every entry pointed to the flat
-    // `App\Omnify\Models\<Name>::class` and Laravel's morphMap resolved to
-    // a non-existent class for every grouped schema, breaking polymorphic
-    // relationships project-wide.
+    const editableNamespace = config.models.userEditableNamespace;
+    const editableGrouped = config.models.userEditableGroupByFolder;
+    // Build morph map entries (project-owned schemas only).
     const morphEntries = [];
     for (const [name, schema] of Object.entries(reader.getProjectVisibleObjectSchemas())) {
         const modelName = toPascalCase(name);
-        const ns = config.structure === 'modular'
-            ? modelNamespace
-            : nestByGroup({ path: '', namespace: modelNamespace }, schema.group).namespace;
+        let ns;
+        if (config.structure === 'modular') {
+            ns = modelNamespace;
+        }
+        else if (schema.kind === 'pivot') {
+            // Pivot models always live under `<editableNs>\Pivot` (issue #98 v5.8.5).
+            ns = `${editableNamespace}\\Pivot`;
+        }
+        else if (editableGrouped) {
+            ns = nestByGroup({ path: '', namespace: editableNamespace }, schema.group).namespace;
+        }
+        else {
+            ns = editableNamespace;
+        }
         morphEntries.push(`            '${modelName}' => \\${ns}\\${modelName}::class,`);
     }
-    // Add File to morph map when any schema uses File type
+    // Add File to morph map when any schema uses File type. File is a
+    // shared / global model — uses the editable namespace too.
     if (reader.hasFileProperties()) {
-        morphEntries.push(`            'File' => \\${modelNamespace}\\File::class,`);
+        morphEntries.push(`            'File' => \\${editableNamespace}\\File::class,`);
     }
     morphEntries.sort();
     const morphMapContent = morphEntries.join('\n');

package/package.json

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