@omnifyjp/ts 5.8.10 → 5.8.12

package/dist/php/controller-generator.js

@@ -42,7 +42,13 @@ function generateBaseController(name, schema, reader, config) {
     const baseNs = config.structure === 'modular'
         ? resolveModularBaseNamespace(config, name, 'Controllers', config.controllers.baseNamespace)
         : groupNestBase(config.controllers.baseNamespace);
-    const modelNs = groupNestBase(config.models.namespace);
+    // Issue #98 v5.8.11: controller base methods type-hint the
+    // USER-EDITABLE Model — same reasoning as the service-generator
+    // signature fix. Without this, the controller's `show` /
+    // `update` / `destroy` route bindings resolve as base instances
+    // and every project-owned service / policy that takes the
+    // editable type fails with TypeError.
+    const modelNs = groupNestEditable(config.models.userEditableNamespace, config.models);
     const serviceBaseNs = config.structure === 'modular'
         ? resolveModularBaseNamespace(config, name, 'Services', config.services.baseNamespace)
         : groupNestBase(config.services.baseNamespace);

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/dist/php/service-generator.js

@@ -510,15 +510,24 @@ function generateBaseService(name, schema, reader, config) {
     const baseNs = config.structure === 'modular'
         ? resolveModularBaseNamespace(config, name, 'Services', config.services.baseNamespace)
         : nestByGroup({ path: '', namespace: config.services.baseNamespace }, schema.group).namespace;
-    // Issue #98 v5.8.4: cross-layer Model imports must include the
-    // schema's group folder so they resolve to where Models actually
-    // live now. Pre-fix the service base emitted
-    // `use App\Omnify\Models\Banner;` while the model file was at
-    // `app/Omnify/Models/Cms/Banner.php` — autoload failed at runtime
-    // for every consumer (TypeError + missing-file include).
+    // Issue #98 v5.8.11: service base methods type-hint the USER-EDITABLE
+    // Model class (`App\Models\Banner`), NOT the grouped base
+    // (`App\Omnify\Models\Cms\Banner`). PHP signature contravariance:
+    // when the user-editable child service overrides a base method,
+    // PHP requires the override's parameter type to be the SAME or
+    // WIDER than the parent's. The user-editable class is what app code
+    // type-hints against everywhere else (factory $model since v5.8.9,
+    // relations since v5.8.10, controllers, tests). Without this fix,
+    // every override of `find / create / update / delete` on every
+    // editable service blew up with a Fatal compile error.
+    // Modular structure: per-Schema isolation — base + editable share ns.
+    // Pivot schemas don't have services (kind:object only), so the only
+    // shape adjustment is `userEditableGroupByFolder` group nesting.
     const modelNs = 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);
     // Build imports
     const imports = [
         `use ${modelNs}\\${modelName};`,

package/package.json

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