@omnifyjp/ts 5.8.9 → 5.8.11

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/model-generator.js

@@ -579,48 +579,46 @@ function buildCasts(properties, expandedProperties, propertyOrder, reader, confi
     return casts.map(c => `            ${c}`).join('\n') + '\n';
 }
 /**
- * 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:
+ * Issue #98 v5.8.10: resolve the FQCN namespace of a related Model for
+ * inline `belongsTo / hasMany / belongsToMany / morphTo` references.
+ * Relations must resolve to the USER-EDITABLE class — that's what
+ * services / controllers / tests / seeders type-hint against, and what
+ * `<Target>::factory()` returns since v5.8.9. Pre-fix relations pointed
+ * at the BASE class FQN, so loaded relations were base instances and
+ * every downstream type-hinted call failed with `TypeError`. Same root
+ * cause + fix as the factory `$model` issue.
  *
- *   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.
+ * Resolution rules (mirror `factory-generator.ts:resolveEditableModelNamespace`):
+ *   1. Package schemas — return the package's model namespace verbatim
+ *      (we don't generate editable stubs for package schemas).
+ *   2. Pivot schemas — nest under `<editableNs>\Pivot` regardless of
+ *      any group / flag (matches the dedicated `Pivot/` subfolder).
+ *   3. `userEditableGroupByFolder: true` + target has group → nest by
+ *      group so the FQCN matches where the editable file lives.
+ *   4. Default — flat editable namespace (Laravel-canonical
+ *      `App\Models\<Name>`).
  */
 function resolveRelatedModelNamespace(target, modelNamespace, config, reader) {
-    const baseNs = reader.resolveModelNamespace(target, modelNamespace);
-    // Package schemas — leave as-is.
-    if (baseNs !== modelNamespace)
-        return baseNs;
+    // Package schemas use their own model namespace (we don't generate
+    // editable stubs for them — relations dispatch to the package class).
+    const packageNs = reader.resolveModelNamespace(target, modelNamespace);
+    if (packageNs !== modelNamespace)
+        return packageNs;
+    // Modular structure: editable shares per-Schema modular path.
+    if (config.structure === 'modular') {
+        return config.models.namespace;
+    }
     const targetSchema = reader.getSchema(target);
     if (!targetSchema)
-        return baseNs;
+        return config.models.userEditableNamespace;
+    const editableNs = config.models.userEditableNamespace;
     if (targetSchema.kind === 'pivot') {
-        return `${baseNs}\\Pivot`;
+        return `${editableNs}\\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)}`;
+    if (config.models.userEditableGroupByFolder && targetSchema.group) {
+        return `${editableNs}\\${toPascalCase(targetSchema.group)}`;
     }
-    return baseNs;
+    return editableNs;
 }
 function buildRelations(schemaName, properties, propertyOrder, modelNamespace, reader, config) {
     const methods = [];

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