trying to solve circular reference when creating entity

Author: Spamercz

src/Entity/STIElasticEntityInterface.php

@@ -0,0 +1,8 @@
+<?php declare(strict_types = 1);
+
+namespace Spameri\Elastic\Entity;
+
+interface STIElasticEntityInterface
+{
+
+}

src/Factory/EntityFactory.php

@@ -38,6 +38,8 @@ class: $class,
 			return $entity;
 		}
 
+		$this->identityMap->creatingEntityList[$class][$hit->id()] = true;
+
 		$properties = $this->resolveProperties(
 			hit: $hit,
 			class: $class,
@@ -52,6 +54,15 @@ class: $class,
 
 		$this->identityMap->add($entity);
 
+		if (isset($this->identityMap->uninitializedEntityList[$class][$hit->id()]) === true) {
+			foreach ($this->identityMap->uninitializedEntityList[$class][$hit->id()] as $propertyName => $notCompletedEntity) {
+				$notCompletedEntity->$propertyName = $entity;
+				unset($this->identityMap->uninitializedEntityList[$class][$hit->id()]);
+			}
+
+			unset($this->identityMap->creatingEntityList[$class][$hit->id()]);
+		}
+
 		return $entity;
 	}
 
@@ -192,10 +203,17 @@ class: $propertyTypeName,
                     } elseif (
                         $attribute->getName() === \Spameri\Elastic\Mapping\STIElasticEntity::class
                     ) {
-                        $propertyValue = $entityManager->find(
-							id: $value[\Spameri\Elastic\Model\Insert\PrepareEntityArray::ENTITY_ID],
-	                        class: $value[\Spameri\Elastic\Model\Insert\PrepareEntityArray::ENTITY_CLASS],
-                        );
+						if (isset($this->identityMap->creatingEntityList[$value[\Spameri\Elastic\Model\Insert\PrepareEntityArray::ENTITY_CLASS]][$value[\Spameri\Elastic\Model\Insert\PrepareEntityArray::ENTITY_ID]])) {
+							$parentClass = $value[\Spameri\Elastic\Model\Insert\PrepareEntityArray::ENTITY_CLASS];
+							$propertyValue = eval("return (new class() extends $parentClass {public function __construct(){}});");
+							$this->identityMap->uninitializedEntityList[$parentClass][$value[\Spameri\Elastic\Model\Insert\PrepareEntityArray::ENTITY_ID]][$property->getName()] = $propertyValue;
+
+						} else {
+							$propertyValue = $entityManager->find(
+								id: $value[\Spameri\Elastic\Model\Insert\PrepareEntityArray::ENTITY_ID],
+								class: $value[\Spameri\Elastic\Model\Insert\PrepareEntityArray::ENTITY_CLASS],
+							);
+						}
 
                         $this->changeSet->markExisting($propertyValue);
 
@@ -218,10 +236,16 @@ class: $value[\Spameri\Elastic\Model\Insert\PrepareEntityArray::ENTITY_CLASS],
 					isset(\class_implements($propertyTypeName)[\Spameri\Elastic\Entity\ElasticEntityInterface::class]) === true
 					&& \is_string($value) === true
 				) {
-					$propertyValue = $entityManager->find(
-						id: $value,
-						class: $propertyTypeName,
-					);
+					if (isset($this->identityMap->creatingEntityList[$propertyTypeName][$value])) {
+						$propertyValue = eval("return (new class() extends $propertyTypeName {public function __construct(){}});");
+						$this->identityMap->uninitializedEntityList[$propertyTypeName][$value][$property->getName()] = $propertyValue;
+
+					} else {
+						$propertyValue = $entityManager->find(
+							id: $value,
+							class: $propertyTypeName,
+						);
+					}
 
 				} elseif ($this->container->getByType($propertyTypeName, false) !== null) {
 					$propertyValue = $this->container->getByType($propertyTypeName);

src/Mapping/STIElasticEntity.php

@@ -0,0 +1,9 @@
+<?php declare(strict_types = 1);
+
+namespace Spameri\Elastic\Mapping;
+
+#[\Attribute(\Attribute::TARGET_PROPERTY|\Attribute::TARGET_PARAMETER)]
+class STIElasticEntity
+{
+
+}

src/Model/IdentityMap.php

@@ -6,15 +6,27 @@ class IdentityMap
 {
 
 	/**
-	 * @var array<string, array<string, \Spameri\Elastic\Entity\AbstractElasticEntity>>
+	 * @var array<class-string, array<string, \Spameri\Elastic\Entity\AbstractElasticEntity>>
 	 */
 	public array $identityMap = [];
 
 	/**
-	 * @var array<string, array<string, string>>
+	 * @var array<class-string, array<string, string>>
 	 */
 	public array $persisted = [];
 
+	/**
+	 * @var array<class-string, array<string, bool>>
+	 */
+	public array $creatingEntityList = [];
+
+	/**
+	 * entity that is missing, id, propertyName, entity that has missing entity in property
+	 *
+	 * @var array<class-string, array<string, array<string, \Spameri\Elastic\Entity\AbstractElasticEntity>>>
+	 */
+	public array $uninitializedEntityList = [];
+
 
 	public function add(
 		\Spameri\Elastic\Entity\AbstractElasticEntity $entity,