FEATURE: WIP Enums ensure that match is complete

mhsdesign · mhsdesign · commit 86e1e612f6f5 · 2023-04-08T20:41:13.000+02:00
- reimplement #9 cleaner - enum static will be converted to enum instance in ComponentScope, but enum static is the imported type - Remove global ButtonType hack in the tests and import it correctly in the Match.afx - ModuleScope::lookupTypeFor didnt work for imported enums (IdentifierResolver Failed) Match related: - multiple default arms -> throws - if there is no default arm and not all enum members are listed -> throws - if enum members are listed twice -> throws - if enum is matched against non enum member -> throws - if enum is matched against other enum -> throws
diff --git a/src/Module/Loader/ModuleFile/ModuleFileLoader.php b/src/Module/Loader/ModuleFile/ModuleFileLoader.php
@@ -32,7 +32,7 @@
 use PackageFactory\ComponentEngine\Parser\Source\Source;
 use PackageFactory\ComponentEngine\Parser\Tokenizer\Tokenizer;
 use PackageFactory\ComponentEngine\TypeSystem\Type\ComponentType\ComponentType;
-use PackageFactory\ComponentEngine\TypeSystem\Type\EnumType\EnumType;
+use PackageFactory\ComponentEngine\TypeSystem\Type\EnumType\EnumStaticType;
 use PackageFactory\ComponentEngine\TypeSystem\Type\StructType\StructType;
 use PackageFactory\ComponentEngine\TypeSystem\TypeInterface;
 
@@ -56,7 +56,7 @@ public function resolveTypeOfImport(ImportNode $importNode): TypeInterface
 
         return match ($export->declaration::class) {
             ComponentDeclarationNode::class => ComponentType::fromComponentDeclarationNode($export->declaration),
-            EnumDeclarationNode::class => EnumType::fromEnumDeclarationNode($export->declaration),
+            EnumDeclarationNode::class => EnumStaticType::fromEnumDeclarationNode($export->declaration),
             StructDeclarationNode::class => StructType::fromStructDeclarationNode($export->declaration)
         };
     }
diff --git a/src/Target/Php/Transpiler/ComponentDeclaration/ComponentDeclarationTranspiler.php b/src/Target/Php/Transpiler/ComponentDeclaration/ComponentDeclarationTranspiler.php
@@ -60,7 +60,7 @@ public function transpile(ComponentDeclarationNode $componentDeclarationNode): s
         }
         
         foreach ($this->module->imports->items as $importNode) {
-            // @TODO: Generate Namespaces Dynamically
+            // @TODO: Generate Namespaces + Name via TypeReferenceStrategyInterface Dynamically
             $lines[] = 'use Vendor\\Project\\Component\\' . $importNode->name->value . ';';
         }
 
diff --git a/src/Target/Php/Transpiler/Identifier/IdentifierTranspiler.php b/src/Target/Php/Transpiler/Identifier/IdentifierTranspiler.php
@@ -37,6 +37,7 @@ public function transpile(IdentifierNode $identifierNode): string
         $typeOfIdentifiedValue = $this->scope->lookupTypeFor($identifierNode->value);
 
         return match (true) {
+            // @TODO: Generate Name via TypeReferenceStrategyInterface Dynamically
             $typeOfIdentifiedValue instanceof EnumStaticType => $identifierNode->value,
             default => '$this->' . $identifierNode->value
         };
diff --git a/src/Target/Php/Transpiler/TypeReference/TypeReferenceStrategyInterface.php b/src/Target/Php/Transpiler/TypeReference/TypeReferenceStrategyInterface.php
@@ -24,7 +24,7 @@
 
 use PackageFactory\ComponentEngine\Parser\Ast\TypeReferenceNode;
 use PackageFactory\ComponentEngine\TypeSystem\Type\ComponentType\ComponentType;
-use PackageFactory\ComponentEngine\TypeSystem\Type\EnumType\EnumType;
+use PackageFactory\ComponentEngine\TypeSystem\Type\EnumType\EnumStaticType;
 use PackageFactory\ComponentEngine\TypeSystem\Type\SlotType\SlotType;
 use PackageFactory\ComponentEngine\TypeSystem\Type\StructType\StructType;
 use PackageFactory\ComponentEngine\TypeSystem\TypeInterface;
@@ -33,7 +33,7 @@ interface TypeReferenceStrategyInterface
 {
     public function getPhpTypeReferenceForSlotType(SlotType $slotType, TypeReferenceNode $typeReferenceNode): string;
     public function getPhpTypeReferenceForComponentType(ComponentType $componentType, TypeReferenceNode $typeReferenceNode): string;
-    public function getPhpTypeReferenceForEnumType(EnumType $enumType, TypeReferenceNode $typeReferenceNode): string;
+    public function getPhpTypeReferenceForEnumType(EnumStaticType $enumType, TypeReferenceNode $typeReferenceNode): string;
     public function getPhpTypeReferenceForStructType(StructType $structType, TypeReferenceNode $typeReferenceNode): string;
     public function getPhpTypeReferenceForCustomType(TypeInterface $customType, TypeReferenceNode $typeReferenceNode): string;
 }
diff --git a/src/Target/Php/Transpiler/TypeReference/TypeReferenceTranspiler.php b/src/Target/Php/Transpiler/TypeReference/TypeReferenceTranspiler.php
@@ -26,7 +26,7 @@
 use PackageFactory\ComponentEngine\TypeSystem\ScopeInterface;
 use PackageFactory\ComponentEngine\TypeSystem\Type\BooleanType\BooleanType;
 use PackageFactory\ComponentEngine\TypeSystem\Type\ComponentType\ComponentType;
-use PackageFactory\ComponentEngine\TypeSystem\Type\EnumType\EnumType;
+use PackageFactory\ComponentEngine\TypeSystem\Type\EnumType\EnumStaticType;
 use PackageFactory\ComponentEngine\TypeSystem\Type\NumberType\NumberType;
 use PackageFactory\ComponentEngine\TypeSystem\Type\SlotType\SlotType;
 use PackageFactory\ComponentEngine\TypeSystem\Type\StringType\StringType;
@@ -49,7 +49,7 @@ public function transpile(TypeReferenceNode $typeReferenceNode): string
             BooleanType::class => 'bool',
             SlotType::class => $this->strategy->getPhpTypeReferenceForSlotType($type, $typeReferenceNode),
             ComponentType::class => $this->strategy->getPhpTypeReferenceForComponentType($type, $typeReferenceNode),
-            EnumType::class => $this->strategy->getPhpTypeReferenceForEnumType($type, $typeReferenceNode),
+            EnumStaticType::class => $this->strategy->getPhpTypeReferenceForEnumType($type, $typeReferenceNode),
             StructType::class => $this->strategy->getPhpTypeReferenceForStructType($type, $typeReferenceNode),
             default => $this->strategy->getPhpTypeReferenceForCustomType($type, $typeReferenceNode)
         };
diff --git a/src/TypeSystem/Resolver/Match/MatchTypeResolver.php b/src/TypeSystem/Resolver/Match/MatchTypeResolver.php
@@ -22,11 +22,15 @@
 
 namespace PackageFactory\ComponentEngine\TypeSystem\Resolver\Match;
 
+use PackageFactory\ComponentEngine\Parser\Ast\AccessNode;
 use PackageFactory\ComponentEngine\Parser\Ast\BooleanLiteralNode;
 use PackageFactory\ComponentEngine\Parser\Ast\MatchNode;
+use PackageFactory\ComponentEngine\TypeSystem\Resolver\Access\AccessTypeResolver;
 use PackageFactory\ComponentEngine\TypeSystem\Resolver\Expression\ExpressionTypeResolver;
 use PackageFactory\ComponentEngine\TypeSystem\ScopeInterface;
 use PackageFactory\ComponentEngine\TypeSystem\Type\BooleanType\BooleanType;
+use PackageFactory\ComponentEngine\TypeSystem\Type\EnumType\EnumMemberType;
+use PackageFactory\ComponentEngine\TypeSystem\Type\EnumType\EnumStaticType;
 use PackageFactory\ComponentEngine\TypeSystem\Type\EnumType\EnumType;
 use PackageFactory\ComponentEngine\TypeSystem\Type\UnionType\UnionType;
 use PackageFactory\ComponentEngine\TypeSystem\TypeInterface;
@@ -67,7 +71,14 @@ private function resolveTypeOfBooleanMatch(MatchNode $matchNode): TypeInterface
         } else {
             $types = [];
 
+            $defaultArmPresent = false;
             foreach ($matchNode->arms->items as $matchArmNode) {
+                if ($defaultArmPresent) {
+                    throw new \Exception('@TODO: Multiple illegal default arms');
+                }
+                if ($matchArmNode->left === null) {
+                    $defaultArmPresent = true;
+                }
                 $types[] = $expressionTypeResolver->resolveTypeOf(
                     $matchArmNode->right
                 );
@@ -79,20 +90,60 @@ private function resolveTypeOfBooleanMatch(MatchNode $matchNode): TypeInterface
         }
     }
 
-    private function resolveTypeOfEnumMatch(MatchNode $matchNode): TypeInterface
+    private function resolveTypeOfEnumMatch(MatchNode $matchNode, EnumType $subjectEnumType): TypeInterface
     {
         $expressionTypeResolver = new ExpressionTypeResolver(
             scope: $this->scope
         );
         $types = [];
 
+        $accessTypeResolver = new AccessTypeResolver(scope: $this->scope);
+
+        $defaultArmPresent = false;
+        $referencedEnumMembers = [];
+
         foreach ($matchNode->arms->items as $matchArmNode) {
+            if ($defaultArmPresent) {
+                throw new \Exception('@TODO Error: Multiple illegal default arms');
+            }
+            if ($matchArmNode->left === null) {
+                $defaultArmPresent = true;
+            } else {
+                foreach ($matchArmNode->left->items as $expressionNode) {
+                    $accessNode = $expressionNode->root;
+                    if (!$accessNode instanceof AccessNode
+                        || !($enumMemberType = $accessTypeResolver->resolveTypeOf($accessNode)) instanceof EnumMemberType) {
+                        throw new \Error('@TODO Error: To be matched enum value should be referenced like: `Enum.B`');
+                    }
+                    
+                    if (!$enumMemberType->enumType instanceof EnumStaticType) {
+                        throw new \Exception('@TODO Error: To be matched enum must be referenced static');
+                    }
+
+                    if (!$enumMemberType->enumType->is($subjectEnumType)) {
+                        throw new \Error('@TODO Error: incompatible enum match: got ' . $enumMemberType->enumType->enumName . ' expected ' . $subjectEnumType->enumName);
+                    }
+
+                    if (isset($referencedEnumMembers[$enumMemberType->memberName])) {
+                        throw new \Error('@TODO Error: Enum path ' . $enumMemberType->memberName . ' was already defined once in this match and cannot be used twice');
+                    }
+
+                    $referencedEnumMembers[$enumMemberType->memberName] = true;
+                }
+            }
+
             $types[] = $expressionTypeResolver->resolveTypeOf(
                 $matchArmNode->right
             );
         }
 
-        // @TODO: Ensure that match is complete
+        if (!$defaultArmPresent) {
+            foreach ($subjectEnumType->getMemberNames() as $member) {
+                if (!isset($referencedEnumMembers[$member])) {
+                    throw new \Error('@TODO Error: member ' . $member . ' not checked');
+                }
+            }
+        }
 
         return UnionType::of(...$types);
     }
@@ -108,7 +159,7 @@ public function resolveTypeOf(MatchNode $matchNode): TypeInterface
 
         return match (true) {
             BooleanType::get()->is($typeOfSubject) => $this->resolveTypeOfBooleanMatch($matchNode),
-            $typeOfSubject instanceof EnumType => $this->resolveTypeOfEnumMatch($matchNode),
+            $typeOfSubject instanceof EnumType => $this->resolveTypeOfEnumMatch($matchNode, $typeOfSubject),
             default => throw new \Exception('@TODO: Not handled ' . $typeOfSubject::class)
         };
     }
diff --git a/src/TypeSystem/Scope/ComponentScope/ComponentScope.php b/src/TypeSystem/Scope/ComponentScope/ComponentScope.php
@@ -25,9 +25,7 @@
 use PackageFactory\ComponentEngine\Parser\Ast\ComponentDeclarationNode;
 use PackageFactory\ComponentEngine\Parser\Ast\TypeReferenceNode;
 use PackageFactory\ComponentEngine\TypeSystem\ScopeInterface;
-use PackageFactory\ComponentEngine\TypeSystem\Type\BooleanType\BooleanType;
-use PackageFactory\ComponentEngine\TypeSystem\Type\NumberType\NumberType;
-use PackageFactory\ComponentEngine\TypeSystem\Type\StringType\StringType;
+use PackageFactory\ComponentEngine\TypeSystem\Type\EnumType\EnumStaticType;
 use PackageFactory\ComponentEngine\TypeSystem\TypeInterface;
 
 final class ComponentScope implements ScopeInterface
@@ -43,7 +41,11 @@ public function lookupTypeFor(string $name): ?TypeInterface
         $propertyDeclarationNode = $this->componentDeclarationNode->propertyDeclarations->getPropertyDeclarationNodeOfName($name);
         if ($propertyDeclarationNode) {
             $typeReferenceNode = $propertyDeclarationNode->type;
-            return $this->resolveTypeReference($typeReferenceNode);
+            $type = $this->resolveTypeReference($typeReferenceNode);
+            if ($type instanceof EnumStaticType) {
+                $type = $type->toEnumInstanceType();
+            }
+            return $type;
         }
 
         return $this->parentScope?->lookupTypeFor($name) ?? null;
diff --git a/src/TypeSystem/Scope/ModuleScope/ModuleScope.php b/src/TypeSystem/Scope/ModuleScope/ModuleScope.php
@@ -39,6 +39,9 @@ public function __construct(
 
     public function lookupTypeFor(string $name): ?TypeInterface
     {
+        if ($importNode = $this->moduleNode->imports->get($name)) {
+            return $this->loader->resolveTypeOfImport($importNode);
+        }
         return $this->parentScope?->lookupTypeFor($name) ?? null;
     }
 
diff --git a/src/TypeSystem/Type/EnumType/EnumStaticType.php b/src/TypeSystem/Type/EnumType/EnumStaticType.php
@@ -27,4 +27,9 @@
 final class EnumStaticType implements TypeInterface
 {
     use EnumTrait;
+    
+    public function toEnumInstanceType(): EnumType
+    {
+        return new EnumType($this->enumName, $this->membersWithType);
+    }
 }
diff --git a/src/TypeSystem/Type/EnumType/EnumTrait.php b/src/TypeSystem/Type/EnumType/EnumTrait.php
@@ -25,14 +25,13 @@
 use PackageFactory\ComponentEngine\Parser\Ast\EnumDeclarationNode;
 use PackageFactory\ComponentEngine\Parser\Ast\NumberLiteralNode;
 use PackageFactory\ComponentEngine\Parser\Ast\StringLiteralNode;
-use PackageFactory\ComponentEngine\TypeSystem\Type\EnumType\EnumMemberType;
 use PackageFactory\ComponentEngine\TypeSystem\Type\NumberType\NumberType;
 use PackageFactory\ComponentEngine\TypeSystem\Type\StringType\StringType;
 use PackageFactory\ComponentEngine\TypeSystem\TypeInterface;
 
 trait EnumTrait
 {
-    private function __construct(
+    public function __construct(
         public readonly string $enumName,
         private readonly array $membersWithType,
     ) {
@@ -58,10 +57,15 @@ enumName: $enumDeclarationNode->enumName,
             membersWithType: $membersWithType
         );
     }
+    
+    public function getMemberNames(): array
+    {
+        return array_keys($this->membersWithType);
+    }
 
     public function getMemberType(string $memberName): EnumMemberType
     {
-        if (!isset($this->membersWithType[$memberName])) {
+        if (!array_key_exists($memberName, $this->membersWithType)) {
             throw new \Exception('@TODO cannot access member ' . $memberName . ' of enum ' . $this->enumName);
         }
         return new EnumMemberType(
diff --git a/test/Integration/Examples/Match/ButtonType.afx b/test/Integration/Examples/Match/ButtonType.afx
@@ -0,0 +1,6 @@
+export enum ButtonType {
+  LINK
+  BUTTON
+  SUBMIT
+  NONE
+}
diff --git a/test/Integration/Examples/Match/Match.afx b/test/Integration/Examples/Match/Match.afx
@@ -1,3 +1,5 @@
+from "./ButtonType.afx" import { ButtonType }
+
 export component Button {
   type: ButtonType
   content: slot
diff --git a/test/Integration/Examples/Match/Match.ast.json b/test/Integration/Examples/Match/Match.ast.json
@@ -1,7 +1,15 @@
 {
   "type": "ModuleNode",
   "payload": {
-    "imports": {},
+    "imports": [
+      {
+        "path": "./ButtonType.afx",
+        "name": {
+          "type": "Identifier",
+          "payload": "ButtonType"
+        }
+      }
+    ],
     "exports": [
       {
         "type": "ComponentDeclarationNode",
diff --git a/test/Integration/Examples/Match/Match.php b/test/Integration/Examples/Match/Match.php
@@ -5,6 +5,7 @@
 namespace Vendor\Project\Component;
 
 use Vendor\Project\BaseClass;
+use Vendor\Project\Component\ButtonType;
 
 final class Button extends BaseClass
 {
diff --git a/test/Integration/Examples/Match/Match.tokens.json b/test/Integration/Examples/Match/Match.tokens.json
@@ -1,4 +1,17 @@
 [
+  { "type": "KEYWORD_FROM", "value": "from" },
+  { "type": "SPACE", "value": " " },
+  { "type": "STRING_QUOTED", "value": "./ButtonType.afx" },
+  { "type": "SPACE", "value": " " },
+  { "type": "KEYWORD_IMPORT", "value": "import" },
+  { "type": "SPACE", "value": " " },
+  { "type": "BRACKET_CURLY_OPEN", "value": "{" },
+  { "type": "SPACE", "value": " " },
+  { "type": "STRING", "value": "ButtonType" },
+  { "type": "SPACE", "value": " " },
+  { "type": "BRACKET_CURLY_CLOSE", "value": "}" },
+  { "type": "END_OF_LINE", "value": "\n" },
+  { "type": "END_OF_LINE", "value": "\n" },
   {
     "type": "KEYWORD_EXPORT",
     "value": "export"
diff --git a/test/Integration/PhpTranspilerIntegrationTest.php b/test/Integration/PhpTranspilerIntegrationTest.php
@@ -23,19 +23,12 @@
 namespace PackageFactory\ComponentEngine\Test\Integration;
 
 use PackageFactory\ComponentEngine\Module\Loader\ModuleFile\ModuleFileLoader;
-use PackageFactory\ComponentEngine\Parser\Ast\EnumDeclarationNode;
 use PackageFactory\ComponentEngine\Parser\Ast\ModuleNode;
-use PackageFactory\ComponentEngine\Parser\Tokenizer\Tokenizer;
 use PackageFactory\ComponentEngine\Parser\Source\Source;
-use PackageFactory\ComponentEngine\Test\Unit\TypeSystem\Scope\Fixtures\DummyScope;
+use PackageFactory\ComponentEngine\Parser\Tokenizer\Tokenizer;
 use PackageFactory\ComponentEngine\Target\Php\Transpiler\Module\ModuleTranspiler;
 use PackageFactory\ComponentEngine\Test\Unit\Target\Php\Transpiler\Module\ModuleTestStrategy;
-use PackageFactory\ComponentEngine\TypeSystem\Type\BooleanType\BooleanType;
-use PackageFactory\ComponentEngine\TypeSystem\Type\EnumType\EnumStaticType;
-use PackageFactory\ComponentEngine\TypeSystem\Type\EnumType\EnumType;
-use PackageFactory\ComponentEngine\TypeSystem\Type\NumberType\NumberType;
-use PackageFactory\ComponentEngine\TypeSystem\Type\SlotType\SlotType;
-use PackageFactory\ComponentEngine\TypeSystem\Type\StringType\StringType;
+use PackageFactory\ComponentEngine\TypeSystem\Scope\GlobalScope\GlobalScope;
 use PHPUnit\Framework\TestCase;
 
 final class PhpTranspilerIntegrationTest extends TestCase
@@ -80,23 +73,7 @@ public function testTranspiler(string $example): void
         $transpiler = new ModuleTranspiler(
             loader: new ModuleFileLoader(),
             // Add some assumed types to the global scope
-            globalScope: new DummyScope([
-                'ButtonType' => EnumStaticType::fromEnumDeclarationNode(
-                    EnumDeclarationNode::fromString(
-                        'enum ButtonType { LINK BUTTON SUBMIT NONE }'
-                    )
-                )
-            ], [
-                'string' => StringType::get(),
-                'slot' => SlotType::get(),
-                'number' => NumberType::get(),
-                'boolean' => BooleanType::get(),
-                'ButtonType' => EnumType::fromEnumDeclarationNode(
-                    EnumDeclarationNode::fromString(
-                        'enum ButtonType { LINK BUTTON SUBMIT NONE }'
-                    )
-                )
-            ]),
+            globalScope: GlobalScope::get(),
             strategy: new ModuleTestStrategy()
         );
 
diff --git a/test/Unit/Target/Php/Transpiler/TypeReference/TypeReferenceTestStrategy.php b/test/Unit/Target/Php/Transpiler/TypeReference/TypeReferenceTestStrategy.php
@@ -25,7 +25,7 @@
 use PackageFactory\ComponentEngine\Parser\Ast\TypeReferenceNode;
 use PackageFactory\ComponentEngine\Target\Php\Transpiler\TypeReference\TypeReferenceStrategyInterface;
 use PackageFactory\ComponentEngine\TypeSystem\Type\ComponentType\ComponentType;
-use PackageFactory\ComponentEngine\TypeSystem\Type\EnumType\EnumType;
+use PackageFactory\ComponentEngine\TypeSystem\Type\EnumType\EnumStaticType;
 use PackageFactory\ComponentEngine\TypeSystem\Type\SlotType\SlotType;
 use PackageFactory\ComponentEngine\TypeSystem\Type\StructType\StructType;
 use PackageFactory\ComponentEngine\TypeSystem\TypeInterface;
@@ -42,7 +42,7 @@ public function getPhpTypeReferenceForComponentType(ComponentType $componentType
         return $componentType->componentName . 'Component';
     }
 
-    public function getPhpTypeReferenceForEnumType(EnumType $enumType, TypeReferenceNode $typeReferenceNode): string
+    public function getPhpTypeReferenceForEnumType(EnumStaticType $enumType, TypeReferenceNode $typeReferenceNode): string
     {
         return $enumType->enumName . 'Enum';
     }
diff --git a/test/Unit/Target/Php/Transpiler/TypeReference/TypeReferenceTranspilerTest.php b/test/Unit/Target/Php/Transpiler/TypeReference/TypeReferenceTranspilerTest.php
@@ -30,7 +30,7 @@
 use PackageFactory\ComponentEngine\Test\Unit\TypeSystem\Scope\Fixtures\DummyScope;
 use PackageFactory\ComponentEngine\TypeSystem\Type\BooleanType\BooleanType;
 use PackageFactory\ComponentEngine\TypeSystem\Type\ComponentType\ComponentType;
-use PackageFactory\ComponentEngine\TypeSystem\Type\EnumType\EnumType;
+use PackageFactory\ComponentEngine\TypeSystem\Type\EnumType\EnumStaticType;
 use PackageFactory\ComponentEngine\TypeSystem\Type\NumberType\NumberType;
 use PackageFactory\ComponentEngine\TypeSystem\Type\StringType\StringType;
 use PackageFactory\ComponentEngine\TypeSystem\Type\StructType\StructType;
@@ -49,7 +49,7 @@ protected function getTypeReferenceTranspiler(): TypeReferenceTranspiler
                 'Button' => ComponentType::fromComponentDeclarationNode(
                     ComponentDeclarationNode::fromString('component Button { return "" }')
                 ),
-                'DayOfWeek' => EnumType::fromEnumDeclarationNode(
+                'DayOfWeek' => EnumStaticType::fromEnumDeclarationNode(
                     EnumDeclarationNode::fromString('enum DayOfWeek {}')
                 ),
                 'Link' => StructType::fromStructDeclarationNode(
diff --git a/test/Unit/TypeSystem/Resolver/Match/MatchTypeResolverTest.php b/test/Unit/TypeSystem/Resolver/Match/MatchTypeResolverTest.php

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public function transpile(ComponentDeclarationNode $componentDeclarationNode): s`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`foreach ($this->module->imports->items as $importNode) {`
`63`		`- // @TODO: Generate Namespaces Dynamically`
	`63`	`+ // @TODO: Generate Namespaces + Name via TypeReferenceStrategyInterface Dynamically`
`64`	`64`	`$lines[] = 'use Vendor\\Project\\Component\\' . $importNode->name->value . ';';`
`65`	`65`	`}`
`66`	`66`
Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,9 @@ public function __construct(`
`39`	`39`
`40`	`40`	`public function lookupTypeFor(string $name): ?TypeInterface`
`41`	`41`	`{`
	`42`	`+ if ($importNode = $this->moduleNode->imports->get($name)) {`
	`43`	`+ return $this->loader->resolveTypeOfImport($importNode);`
	`44`	`+ }`
`42`	`45`	`return $this->parentScope?->lookupTypeFor($name) ?? null;`
`43`	`46`	`}`
`44`	`47`
Original file line number	Diff line number	Diff line change
`@@ -27,4 +27,9 @@`
`27`	`27`	`final class EnumStaticType implements TypeInterface`
`28`	`28`	`{`
`29`	`29`	`use EnumTrait;`
	`30`	`+`
	`31`	`+ public function toEnumInstanceType(): EnumType`
	`32`	`+ {`
	`33`	`+ return new EnumType($this->enumName, $this->membersWithType);`
	`34`	`+ }`
`30`	`35`	`}`