@omnifyjp/ts 5.8.14 → 5.8.16

package/dist/php/policy-generator.js

@@ -65,7 +65,16 @@ function generateForSchema(name, schema, reader, config) {
 }
 function generateBasePolicyClass(name, schema, reader, config) {
     const modelName = toPascalCase(name);
-    const baseNamespace = resolveModularBaseNamespace(config, name, 'Policies', config.policies.baseNamespace);
+    // Issue #98 v5.8.15: legacy structure must nest the policy base's
+    // `namespace ...;` declaration by group folder so it matches the
+    // grouped path on disk. Pre-fix every base emitted
+    // `namespace App\\Omnify\\Policies;` (FLAT) while the file lived at
+    // `app/Omnify/Policies/<Group>/<Name>Policy.php` — PSR-4 autoload
+    // failed at runtime for every grouped policy. Same template fix
+    // that v5.8.2 applied to Requests / Resources / Services.
+    const baseNamespace = config.structure === 'modular'
+        ? resolveModularBaseNamespace(config, name, 'Policies', config.policies.baseNamespace)
+        : nestByGroup({ path: '', namespace: config.policies.baseNamespace }, schema.group).namespace;
     // Issue #98 v5.8.13: policy method signatures (`view(User $user,
     // <Model> $record): bool`) must type-hint the USER-EDITABLE Model
     // class. Same root cause + fix as the v5.8.11 service / controller

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.14",
+  "version": "5.8.16",
   "description": "TypeScript model type generator from Omnify schemas.json",
   "type": "module",
   "main": "dist/index.js",