Fix printer compatibility

Author: SerafimArts

libs/printer/src/PrettyPrinter.php

@@ -5,7 +5,6 @@
 namespace TypeLang\Printer;
 
 use TypeLang\Node\Node;
-use TypeLang\Node\Statement;
 use TypeLang\Node\Type\Attribute\AttributeGroupNode;
 use TypeLang\Node\Type\Attribute\AttributeGroupsListNode;
 use TypeLang\Node\Type\Callable\CallableParameterNode;
@@ -25,6 +24,7 @@
 use TypeLang\Node\Type\LogicalTypeNode;
 use TypeLang\Node\Type\NamedTypeNode;
 use TypeLang\Node\Type\NullableTypeNode;
+use TypeLang\Node\Type\Shape\ClassConstFieldNode;
 use TypeLang\Node\Type\Shape\ClassConstMaskFieldNode;
 use TypeLang\Node\Type\Shape\ConstMaskFieldNode;
 use TypeLang\Node\Type\Shape\FieldNode;
@@ -123,7 +123,7 @@ public function __construct(
     /**
      * @throws NonPrintableNodeException
      */
-    protected function make(Statement $stmt): string
+    protected function make(TypeNode $stmt): string
     {
         return match (true) {
             $stmt instanceof LiteralNode => $this->printLiteralNode($stmt),
@@ -282,6 +282,7 @@ protected function printShapeFieldName(FieldNode $field): string
             $field instanceof NamedFieldNode => $this->printNamedShapeFieldName($field),
             $field instanceof ConstMaskFieldNode => $this->printConstMaskShapeFieldName($field),
             $field instanceof ClassConstMaskFieldNode => $this->printClassConstMaskShapeFieldName($field),
+            $field instanceof ClassConstFieldNode => $this->printClassConstShapeFieldName($field),
             default => $this->printUnknownShapeFieldName($field),
         };
     }
@@ -306,20 +307,20 @@ protected function printConstMaskShapeFieldName(ConstMaskFieldNode $field): stri
         return $field->key->name->toString() . '*';
     }
 
+    protected function printClassConstShapeFieldName(ClassConstFieldNode $field): string
+    {
+        return \sprintf('%s::%s', $field->key->class, $field->key->constant);
+    }
+
     protected function printClassConstMaskShapeFieldName(ClassConstMaskFieldNode $field): string
     {
-        $class = $field->key->class;
         $constant = $field->key->constant;
 
-        if ($field->key instanceof ClassConstNode) {
-            return $class . '::' . $constant;
-        }
-
         if ($constant === null) {
-            return $class . '::*';
+            return \sprintf('%s::*', $field->key->class);
         }
 
-        return $class . '::' . $constant . '*';
+        return \sprintf('%s::%s*', $field->key->class, $constant);
     }
 
     protected function printUnknownShapeFieldName(FieldNode $field): string

libs/printer/src/Printer.php

@@ -4,7 +4,6 @@
 
 namespace TypeLang\Printer;
 
-use TypeLang\Node\Statement;
 use TypeLang\Node\Type\LogicalTypeNode;
 use TypeLang\Node\Type\TypeNode;
 
@@ -13,12 +12,12 @@ abstract class Printer implements PrinterInterface
     /**
      * @var non-empty-string
      */
-    protected const DEFAULT_NEW_LINE_DELIMITER = "\n";
+    protected const string DEFAULT_NEW_LINE_DELIMITER = "\n";
 
     /**
      * @var non-empty-string
      */
-    protected const DEFAULT_INDENTION = '    ';
+    protected const string DEFAULT_INDENTION = '    ';
 
     /**
      * @var int<0, max>
@@ -41,7 +40,7 @@ public function __construct(
         public readonly string $indention = self::DEFAULT_INDENTION,
     ) {}
 
-    public function print(Statement $stmt): string
+    public function print(TypeNode $stmt): string
     {
         $this->nesting = $this->depth = 0;
 
@@ -51,7 +50,7 @@ public function print(Statement $stmt): string
     /**
      * @return non-empty-string
      */
-    abstract protected function make(Statement $stmt): string;
+    abstract protected function make(TypeNode $stmt): string;
 
     /**
      * @param int<0, max>|null $depth
@@ -96,7 +95,7 @@ protected function unwrapAndPrint(LogicalTypeNode $stmt): iterable
     }
 
     /**
-     * @param iterable<mixed, Statement> $stmts
+     * @param iterable<mixed, TypeNode> $stmts
      *
      * @return list<non-empty-string>
      */

libs/printer/src/PrinterInterface.php

@@ -4,12 +4,9 @@
 
 namespace TypeLang\Printer;
 
-use TypeLang\Node\Statement;
+use TypeLang\Node\Type\TypeNode;
 
 interface PrinterInterface
 {
-    /**
-     * @return non-empty-string
-     */
-    public function print(Statement $stmt): string;
+    public function print(TypeNode $stmt): string;
 }