Improve type decorators logic

Author: Kirill Nesmeyanov

src/Runtime/Repository/LoggableTypeRepository.php

@@ -6,6 +6,7 @@
 
 use Psr\Log\LoggerInterface;
 use TypeLang\Mapper\Runtime\Repository\TypeDecorator\LoggableType;
+use TypeLang\Mapper\Runtime\Repository\TypeDecorator\TypeDecoratorInterface;
 use TypeLang\Mapper\Type\TypeInterface;
 use TypeLang\Parser\Node\Stmt\TypeStatement;
 
@@ -27,13 +28,17 @@ public function getTypeByStatement(TypeStatement $statement, ?\ReflectionClass $
             'context' => $context,
         ]);
 
-        $result = parent::getTypeByStatement($statement, $context);
+        $type = $result = parent::getTypeByStatement($statement, $context);
+
+        if ($type instanceof TypeDecoratorInterface) {
+            $type = $type->getDecoratedType();
+        }
 
         $this->logger->info('The {type_name} was fetched by the AST statement {statement_name}', [
             'statement' => $statement,
             'statement_name' => $statement::class . '#' . \spl_object_id($statement),
-            'type' => $result,
-            'type_name' => $result::class . '#' . \spl_object_id($result),
+            'type' => $type,
+            'type_name' => $type::class . '#' . \spl_object_id($type),
             'context' => $context,
         ]);
 

src/Runtime/Repository/TraceableTypeRepository.php

@@ -21,7 +21,10 @@ public function __construct(
     ) {
         parent::__construct($delegate);
 
-        $this->printer = new PrettyPrinter();
+        $this->printer = new PrettyPrinter(
+            wrapUnionType: false,
+            multilineShape: \PHP_INT_MAX,
+        );
     }
 
     public function getTypeByStatement(TypeStatement $statement, ?\ReflectionClass $context = null): TypeInterface
@@ -44,6 +47,10 @@ public function getTypeByStatement(TypeStatement $statement, ?\ReflectionClass $
             return $result;
         }
 
-        return new TraceableType($this->tracer, $result);
+        return new TraceableType(
+            definition: $this->printer->print($statement),
+            tracer: $this->tracer,
+            delegate: $result,
+        );
     }
 }

src/Runtime/Repository/TypeDecorator/TraceableType.php

@@ -21,6 +21,7 @@ final class TraceableType extends TypeDecorator
     private readonly string $name;
 
     public function __construct(
+        private readonly string $definition,
         private readonly TracerInterface $tracer,
         TypeInterface $delegate,
     ) {
@@ -29,7 +30,8 @@ public function __construct(
         $inner = $this->getDecoratedType();
 
         $this->name = self::getShortName($inner::class)
-            . '#' . \spl_object_id($inner);
+            . '#' . \spl_object_id($inner)
+            . ' as "' . $this->definition . '"';
     }
 
     /**