Revert "Add AtomicType interface"

This reverts commit 2178887.

Revert "Add TermType and NormType"

This reverts commit 68eeea6.

Author: vudaltsov

generator/Generator.php

@@ -12,7 +12,6 @@
 use Nette\PhpGenerator\PhpNamespace;
 use Nette\PhpGenerator\PsrPrinter;
 use Symfony\Component\Finder\Finder;
-use Typhoon\Type\Internal\TermType;
 use Typhoon\Type\Type;
 use Typhoon\Type\TypeVisitor;
 
@@ -49,9 +48,9 @@ private static function generateTypes(): void
     {
         foreach (self::types() as $type) {
             if ($type->properties === []) {
-                self::writeClass(self::generateEnumType($type));
+                self::writeClass(self::generateAtomicType($type));
             } else {
-                self::writeClass(self::generateClassType($type));
+                self::writeClass(self::generateComplexType($type));
             }
         }
     }
@@ -100,11 +99,11 @@ private static function generateDefaultVisitor(): void
         self::writeClass($visitor, 'Visitor');
     }
 
-    private static function generateEnumType(TypeSpec $type): EnumType
+    private static function generateAtomicType(TypeSpec $type): EnumType
     {
         $enum = (new EnumType($type->shortClassName()))
-            ->setComment(self::GENERATED_NOTICE . "\n@api\n@implements {$type->shortInterfaceName()}<{$type->type}>")
-            ->addImplement($type->interface);
+            ->setComment(self::GENERATED_NOTICE . "\n@api\n@implements Type<{$type->type}>")
+            ->addImplement(Type::class);
         $enum->addCase('T');
         $enum->addMethod('accept')
             ->setReturnType('mixed')
@@ -114,11 +113,11 @@ private static function generateEnumType(TypeSpec $type): EnumType
         return $enum;
     }
 
-    private static function generateClassType(TypeSpec $type): ClassType
+    private static function generateComplexType(TypeSpec $typeSpec): ClassType
     {
         $typeComment = self::GENERATED_NOTICE . "\n@api";
 
-        foreach ($type->templates as $templateSpec) {
+        foreach ($typeSpec->templates as $templateSpec) {
             $typeComment .= \sprintf(
                 "\n@template %s%s%s",
                 $templateSpec->name,
@@ -127,18 +126,18 @@ private static function generateClassType(TypeSpec $type): ClassType
             );
         }
 
-        $typeComment .= "\n@implements {$type->shortInterfaceName()}<{$type->type}>";
+        $typeComment .= "\n@implements Type<{$typeSpec->type}>";
 
-        $class = (new ClassType($type->shortClassName()))
+        $class = (new ClassType($typeSpec->shortClassName()))
             ->setFinal()
             ->setComment($typeComment)
-            ->addImplement($type->interface);
+            ->addImplement(Type::class);
 
         $constructorComment = "@internal\n@psalm-internal Typhoon\\Type";
         $constructorParams = [];
         $constructorBody = '';
 
-        foreach ($type->properties as $propertySpec) {
+        foreach ($typeSpec->properties as $propertySpec) {
             $nativeType = $propertySpec->nativeType();
             $class->addProperty($propertySpec->name)
                 ->setReadOnly()
@@ -158,7 +157,7 @@ private static function generateClassType(TypeSpec $type): ClassType
         $class
             ->addMethod('accept')
             ->setReturnType('mixed')
-            ->addBody(\sprintf('return $visitor->%s($this);', $type->name))
+            ->addBody(\sprintf('return $visitor->%s($this);', $typeSpec->name))
             ->addParameter('visitor')->setType(TypeVisitor::class);
 
         return $class;
@@ -186,7 +185,6 @@ private static function writeClass(ClassType|InterfaceType|EnumType $class, ?str
         $namespace = $file->addNamespace(new PhpNamespace(self::NAMESPACE . ($namespace === null ? '' : '\\' . $namespace)));
         $namespace->add($class);
         $namespace->addUse(Type::class);
-        $namespace->addUse(TermType::class);
 
         file_put_contents($fileName, (new PsrPrinter())->printFile($file));
     }

generator/TypeSpec.php

@@ -12,14 +12,12 @@ final class TypeSpec
     /**
      * @param non-empty-string $name
      * @param non-empty-string $type
-     * @param class-string<Type> $interface
      * @param list<TemplateSpec> $templates
      * @param list<PropertySpec> $properties
      */
     public function __construct(
         public readonly string $name,
         public readonly string $type,
-        public readonly string $interface,
         public readonly array $templates = [],
         public readonly array $properties = [],
     ) {}
@@ -40,13 +38,6 @@ public function className(): string
         return 'Typhoon\Type\\' . $this->shortClassName();
     }
 
-    public function shortInterfaceName(): string
-    {
-        $interfaceParts = explode('\\', $this->interface);
-
-        return end($interfaceParts);
-    }
-
     /**
      * @param non-empty-string $name
      * @param ?non-empty-string $of
@@ -57,7 +48,6 @@ public function tpl(string $name, ?string $of = null, ?string $default = null):
         return new self(
             name: $this->name,
             type: $this->type,
-            interface: $this->interface,
             templates: [
                 ...$this->templates,
                 new TemplateSpec($name, $of, $default),
@@ -75,7 +65,6 @@ public function prop(string $name, string $type): self
         return new self(
             name: $this->name,
             type: $this->type,
-            interface: $this->interface,
             templates: $this->templates,
             properties: [
                 ...$this->properties,
@@ -132,9 +121,8 @@ public function nativeType(): string
 /**
  * @param non-empty-string $name
  * @param non-empty-string $type
- * @param class-string<Type> $interface
  */
-function type(string $name, string $type, string $interface = Type::class): TypeSpec
+function type(string $name, string $type): TypeSpec
 {
-    return new TypeSpec($name, $type, $interface);
+    return new TypeSpec($name, $type);
 }

generator/types.php

@@ -4,25 +4,23 @@
 
 namespace Typhoon\TypeGenerator;
 
-use Typhoon\Type\Internal\TermType;
-
 require_once __DIR__ . '/TypeSpec.php';
 
 return [
     // trivial
-    type('never', 'never', TermType::class),
-    type('void', 'void', TermType::class),
-    type('null', 'null', TermType::class),
-    type('false', 'false', TermType::class),
-    type('true', 'true', TermType::class),
+    type('never', 'never'),
+    type('void', 'void'),
+    type('null', 'null'),
+    type('false', 'false'),
+    type('true', 'true'),
     type('intRange', 'int')->prop('min', '?numeric-string')->prop('max', '?numeric-string'),
     type('floatRange', 'float')->prop('min', '?numeric-string')->prop('max', '?numeric-string'),
-    type('stringValue', 'string', TermType::class)->prop('value', 'string'),
-    type('numericString', 'numeric-string', TermType::class),
-    type('lowercaseString', 'lowercase-string', TermType::class),
-    type('nonEmptyString', 'non-empty-string', TermType::class),
-    type('string', 'string', TermType::class),
-    type('resource', 'resource', TermType::class),
+    type('stringValue', 'string')->prop('value', 'string'),
+    type('numericString', 'numeric-string'),
+    type('lowercaseString', 'lowercase-string'),
+    type('nonEmptyString', 'non-empty-string'),
+    type('string', 'string'),
+    type('resource', 'resource'),
     // compound
     type('list', 'list<mixed>')->prop('valueType', 'Type')->prop('elements', 'array<non-negative-int, ArrayElement>'),
     type('array', 'array<mixed>')->prop('keyType', 'Type')->prop('valueType', 'Type')->prop('elements', 'array<ArrayElement>'),

src/FalseT.php

@@ -4,15 +4,13 @@
 
 namespace Typhoon\Type;
 
-use Typhoon\Type\Internal\TermType;
-
 /**
  * This code is generated, do not edit it.
  *
  * @api
- * @implements TermType<false>
+ * @implements Type<false>
  */
-enum FalseT implements TermType
+enum FalseT implements Type
 {
     case T;
 

src/Internal/NormType.php

@@ -4,15 +4,13 @@
 
 namespace Typhoon\Type;
 
-use Typhoon\Type\Internal\TermType;
-
 /**
  * This code is generated, do not edit it.
  *
  * @api
- * @implements TermType<lowercase-string>
+ * @implements Type<lowercase-string>
  */
-enum LowercaseStringT implements TermType
+enum LowercaseStringT implements Type
 {
     case T;
 

src/Internal/TermType.php

@@ -4,15 +4,13 @@
 
 namespace Typhoon\Type;
 
-use Typhoon\Type\Internal\TermType;
-
 /**
  * This code is generated, do not edit it.
  *
  * @api
- * @implements TermType<never>
+ * @implements Type<never>
  */
-enum NeverT implements TermType
+enum NeverT implements Type
 {
     case T;
 

src/LowercaseStringT.php

@@ -4,15 +4,13 @@
 
 namespace Typhoon\Type;
 
-use Typhoon\Type\Internal\TermType;
-
 /**
  * This code is generated, do not edit it.
  *
  * @api
- * @implements TermType<non-empty-string>
+ * @implements Type<non-empty-string>
  */
-enum NonEmptyStringT implements TermType
+enum NonEmptyStringT implements Type
 {
     case T;
 

src/NeverT.php

@@ -4,15 +4,13 @@
 
 namespace Typhoon\Type;
 
-use Typhoon\Type\Internal\TermType;
-
 /**
  * This code is generated, do not edit it.
  *
  * @api
- * @implements TermType<null>
+ * @implements Type<null>
  */
-enum NullT implements TermType
+enum NullT implements Type
 {
     case T;