inverse-relations and bugs-fixing

Author: siggi-k

src/generator/default/dbmodel.php

@@ -4,9 +4,52 @@
  * @var string $namespace
  * @var string $relationNamespace
  **/
+use cebe\yii2openapi\lib\items\AttributeRelation;
 use yii\helpers\Inflector;
 use yii\helpers\VarDumper;
 
+$allCoveredClasses = array_merge(
+    array_map(fn($r) => $r->getClassName(), (array)$model->relations),
+    array_map(fn($r) => $r->relatedClassName, (array)$model->many2many),
+    array_map(fn($r) => $r->getClassName(), (array)$model->nonDbRelations)
+);
+/**
+ * Resolve inverse relation method names from the FK column name of the other model.
+ * Relations already covered by $model->relations, many2many, or nonDbRelations are skipped.
+ * Relations from models declared with "x-table: false" are skipped (no real table, no FK).
+ *
+ * Naming logic (model being generated = e.g. "Lead", $modelSnake = "lead"):
+ *   1. Take the FK column name from the other model (e.g. Order.customer_lead_id)
+ *   2. Strip trailing "_id"              → "customer_lead"
+ *   3. Strip trailing "_<modelSnake>"    → "customer"
+ *   4. If a prefix remains, prepend it to the pluralized class name:
+ *        "customer" + "Orders"           → getCustomerOrders()
+ *      If no prefix remains (plain FK like "lead_id"):
+ *        "" + "Orders"                   → getOrders()
+ *
+ * Examples: Order has three FK columns pointing to Lead ($model->name = "Lead"):
+ *
+ *   FK column (on Order)      | generated on Order      | generated on Lead (inverse)
+ *   --------------------------|-------------------------|----------------------------
+ *   lead_id                   | getLead()               | getOrders()
+ *   customer_lead_id          | getCustomerLead()       | getCustomerOrders()
+ *   billing_lead_id           | getBillingLead()        | getBillingOrders()
+ */
+$modelSnake = Inflector::underscore($model->name);
+$inverseRelations = array_map(function (AttributeRelation $relation) use ($modelSnake): array {
+    $inverseMethod = $relation->getMethod() === 'hasOne' ? 'hasMany' : 'hasOne';
+    $classBase = $inverseMethod === 'hasMany' ? Inflector::pluralize($relation->getCamelName()) : $relation->getCamelName();
+    $fkBase = preg_replace('/_id$/', '', $relation->getForeignName());
+    $prefix = preg_replace('/_?' . preg_quote($modelSnake, '/') . '$/', '', $fkBase);
+    return [
+        'relation' => $relation,
+        'inverseMethod' => $inverseMethod,
+        'inverseName' => $prefix !== '' ? Inflector::camelize($prefix) . $classBase : $classBase,
+    ];
+}, array_filter(
+    (array)$model->belongsToRelations,
+    fn(AttributeRelation $r) => !in_array($r->getClassName(), $allCoveredClasses) && $r->getTableName() !== ''
+));
 ?>
 <?= '<?php' ?>
 
@@ -45,6 +88,15 @@
 <?php foreach ($model->many2many as $relation): ?>
  * @property array|\<?= trim($relationNamespace, '\\') ?>\<?= $relation->relatedClassName ?>[] $<?= Inflector::variablize($relation->name) ?>
 
+<?php endforeach; ?>
+<?php foreach ($inverseRelations as $inverse): ?>
+<?php if ($inverse['inverseMethod'] === 'hasOne'):?>
+ * @property \<?= trim($relationNamespace, '\\') ?>\<?= $inverse['relation']->getClassName() ?> $<?= Inflector::variablize($inverse['inverseName']) ?>
+
+<?php else:?>
+ * @property array|\<?= trim($relationNamespace, '\\') ?>\<?= $inverse['relation']->getClassName() ?>[] $<?= Inflector::variablize($inverse['inverseName']) ?>
+
+<?php endif?>
 <?php endforeach; ?>
  */
 abstract class <?= $model->getClassName() ?> extends \yii\db\ActiveRecord
@@ -146,14 +198,17 @@ public function get<?= $relation->getCamelName() ?>()
 <?php endif;?>
     }
 <?php endforeach; ?>
-<?php $i = 1; $usedRelationNames = [];
-foreach ($model->belongsToRelations as $relationName => $relation): ?><?php $number = in_array($relation->getCamelName(), $usedRelationNames) ? $i : '' ?>
+<?php foreach ($model->nonDbRelations as $nonDbRelation): ?>
 
-    # belongs to relation
-    public function get<?= $relation->getCamelName() . ($number) ?>()
+    abstract public function get<?= $nonDbRelation->getCamelName() ?>(): \yii\db\ActiveQuery;
+<?php endforeach; ?>
+<?php foreach ($inverseRelations as $inverse): ?>
+
+    # inverse relation
+    public function get<?= $inverse['inverseName'] ?>()
     {
-        return $this-><?= $relation->getMethod() ?>(\<?= trim($relationNamespace, '\\') ?>\<?= $relation->getClassName() ?>::class, <?php
-    echo $relation->linkToString() ?>);
+        return $this-><?= $inverse['inverseMethod'] ?>(\<?= trim($relationNamespace, '\\') ?>\<?= $inverse['relation']->getClassName() ?>::class, <?php
+    echo $inverse['relation']->linkToString() ?>);
     }
-<?php $i++; $usedRelationNames[] = $relation->getCamelName(); endforeach; ?>
+<?php endforeach; ?>
 }

src/lib/FakerStubResolver.php

@@ -284,7 +284,7 @@ private function fakeForArray(SpecObjectInterface $property, int $count = 4): st
         $items = $property->items;
 
         if (!$items) {
-            return $this->arbitraryArray();
+            return '[]';
         }
 
         if ($items instanceof Reference) {
@@ -306,6 +306,9 @@ private function fakeForArray(SpecObjectInterface $property, int $count = 4): st
 
         if ($type === 'object') {
             $result = $this->fakeForObject($items);
+            if ($result === '[]') {
+                return '[]';
+            }
             return $this->wrapInArray($result, $uniqueItems, $count);
         }
 
@@ -315,26 +318,28 @@ private function fakeForArray(SpecObjectInterface $property, int $count = 4): st
     /**
      * @internal
      */
-    public function fakeForObject(SpecObjectInterface $items): string
+    public function fakeForObject(SpecObjectInterface $items, int $depth = 1): string
     {
         if (!$items->properties) {
-            return $this->arbitraryArray();
+            return '[]';
         }
 
-        $props = '[' . PHP_EOL;
+        $indent = str_repeat('    ', $depth + 3);
+        $closingIndent = str_repeat('    ', $depth + 2);
+        $parts = [];
 
         foreach ($items->properties as $name => $prop) {
             /** @var SpecObjectInterface $prop */
 
             if (!empty($prop->properties)) { // nested object
-                $result = $this->{__FUNCTION__}($prop);
+                $result = $this->fakeForObject($prop, $depth + 1);
             } else {
                 $result = $this->aElementFaker(['items' => $prop->getSerializableData()], $name);
             }
-            $props .= '\'' . $name . '\' => ' . $result . ',' . PHP_EOL;
+            $parts[] = $indent . '\'' . $name . '\' => ' . $result . ',';
         }
 
-        $props .= ']';
+        $props = '[' . PHP_EOL . implode(PHP_EOL, $parts) . PHP_EOL . $closingIndent . ']';
 
         return $props;
     }

src/lib/openapi/PropertySchema.php

@@ -100,6 +100,7 @@ public function __construct(SpecObjectInterface $property, string $name, Compone
         $this->isPk = $name === $schema->getPkName();
 
         $onUpdate = $onDelete = $xFaker = $reference = $fkColName = null;
+        $xDbTypeFalse = false;
 
         foreach ($property->allOf ?? [] as $element) {
             // x-fk-on-delete | x-fk-on-update
@@ -122,6 +123,11 @@ public function __construct(SpecObjectInterface $property, string $name, Compone
             if (!empty($element->{CustomSpecAttr::FK_COLUMN_NAME})) {
                 $fkColName = $element->{CustomSpecAttr::FK_COLUMN_NAME};
             }
+
+            // x-db-type: false → treat as non-DB reference (no FK column, no migration)
+            if (isset($element->{CustomSpecAttr::DB_TYPE}) && $element->{CustomSpecAttr::DB_TYPE} === false) {
+                $xDbTypeFalse = true;
+            }
         }
 
         if (
@@ -143,6 +149,9 @@ public function __construct(SpecObjectInterface $property, string $name, Compone
             $this->xFaker = $xFaker;
             $this->property = $reference;
             $property = $this->property;
+        } elseif ($xDbTypeFalse && $reference instanceof Reference) {
+            $this->property = $reference;
+            $property = $this->property;
         }
 
         // don't go reference part if `x-no-relation` is true
@@ -152,6 +161,9 @@ public function __construct(SpecObjectInterface $property, string $name, Compone
 
         if ($property instanceof Reference) {
             $this->initReference();
+            if ($xDbTypeFalse) {
+                $this->isNonDbReference = true;
+            }
         } elseif (
             isset($property->type, $property->items) && $property->type === 'array'
             && $property->items instanceof Reference