@omnifyjp/ts 5.8.11 → 5.8.13

package/dist/php/policy-generator.js

@@ -46,13 +46,19 @@ 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.4: legacy structure groups Models by folder. The
-    // policy's `use ${modelNamespace}\\${modelName}` import must include
-    // the schema's group too, otherwise the policy fails to autoload at
-    // runtime when Laravel resolves it from the gate registration.
+    // 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
+    // signature fix — when the user-editable policy child overrides a
+    // base method with the editable Model type, PHP signature
+    // contravariance fires with a Fatal compile error if the parent
+    // typed against the BASE Model. Modular structure: per-Schema
+    // isolation already aligns base + editable on one namespace.
     const modelNamespace = config.structure === 'modular'
         ? config.models.namespace
-        : nestByGroup({ path: '', namespace: config.models.namespace }, schema.group).namespace;
+        : (config.models.userEditableGroupByFolder
+            ? nestByGroup({ path: '', namespace: config.models.userEditableNamespace }, schema.group).namespace
+            : config.models.userEditableNamespace);
     const policies = schema.policies;
     const hasSoftDelete = schema.options?.softDelete ?? false;
     const needsCidrHelper = policiesUseCidr(policies);

package/dist/php/resource-generator.js

@@ -198,7 +198,24 @@ function addAssociationFields(propName, prop, fields, resourceNamespace, modelNa
     const target = prop['target'] ?? '';
     const methodName = toCamelCase(propName);
     // Resolve resource namespace for the target (null if package without resource ns)
-    const targetResNs = target ? reader.resolveResourceNamespace(target, resourceNamespace) : resourceNamespace;
+    // 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.
+        const targetSchema = target ? reader.getSchema(target) : undefined;
+        if (targetSchema?.group) {
+            targetResNs = `${rawTargetResNs}\\${toPascalCase(targetSchema.group)}`;
+        }
+    }
     // If target is a package schema without a resource namespace, use simple whenLoaded
     if (!targetResNs && relation !== 'MorphTo') {
         if (relation === 'ManyToOne') {

package/package.json

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