TASK: Introduce TernaryBranchScope

Author: mhsdesign

src/TypeSystem/Resolver/TernaryOperation/TernaryOperationTypeResolver.php

@@ -23,12 +23,10 @@
 namespace PackageFactory\ComponentEngine\TypeSystem\Resolver\TernaryOperation;
 
 use PackageFactory\ComponentEngine\Parser\Ast\BooleanLiteralNode;
-use PackageFactory\ComponentEngine\Parser\Ast\IdentifierNode;
 use PackageFactory\ComponentEngine\Parser\Ast\TernaryOperationNode;
 use PackageFactory\ComponentEngine\TypeSystem\Resolver\Expression\ExpressionTypeResolver;
-use PackageFactory\ComponentEngine\TypeSystem\Scope\ShallowScope\ShallowScope;
+use PackageFactory\ComponentEngine\TypeSystem\Scope\ShallowScope\TernaryBranchScope;
 use PackageFactory\ComponentEngine\TypeSystem\ScopeInterface;
-use PackageFactory\ComponentEngine\TypeSystem\Type\NullType\NullType;
 use PackageFactory\ComponentEngine\TypeSystem\Type\UnionType\UnionType;
 use PackageFactory\ComponentEngine\TypeSystem\TypeInterface;
 
@@ -54,32 +52,27 @@ public function resolveTypeOf(TernaryOperationNode $ternaryOperationNode): TypeI
                 : $expressionTypeResolver->resolveTypeOf($ternaryOperationNode->false);
         }
 
-        if ($conditionNode->root instanceof IdentifierNode && $conditionType instanceof UnionType && $conditionType->containsNull()) {
-            $trueExpressionTypeResolver = new ExpressionTypeResolver(
-                scope: new ShallowScope(
-                    $conditionNode->root->value,
-                    $conditionType->withoutNull(),
-                    $this->scope
-                )
-            );
-
-            $falseExpressionTypeResolver = new ExpressionTypeResolver(
-                scope: new ShallowScope(
-                    $conditionNode->root->value,
-                    NullType::get(),
-                    $this->scope
-                )
-            );
+        $trueExpressionTypeResolver = new ExpressionTypeResolver(
+            scope: new TernaryBranchScope(
+                $ternaryOperationNode->condition,
+                $conditionType,
+                true,
+                $this->scope
+            )
+        );
 
-            return UnionType::of(
-                $trueExpressionTypeResolver->resolveTypeOf($ternaryOperationNode->true),
-                $falseExpressionTypeResolver->resolveTypeOf($ternaryOperationNode->false)
-            );
-        }
+        $falseExpressionTypeResolver = new ExpressionTypeResolver(
+            scope: new TernaryBranchScope(
+                $ternaryOperationNode->condition,
+                $conditionType,
+                false,
+                $this->scope
+            )
+        );
 
         return UnionType::of(
-            $expressionTypeResolver->resolveTypeOf($ternaryOperationNode->true),
-            $expressionTypeResolver->resolveTypeOf($ternaryOperationNode->false)
+            $trueExpressionTypeResolver->resolveTypeOf($ternaryOperationNode->true),
+            $falseExpressionTypeResolver->resolveTypeOf($ternaryOperationNode->false)
         );
     }
 }

…stem/Scope/ShallowScope/ShallowScope.php …cope/ShallowScope/TernaryBranchScope.phpsrc/TypeSystem/Scope/ShallowScope/ShallowScope.php renamed to src/TypeSystem/Scope/ShallowScope/TernaryBranchScope.php src/TypeSystem/Scope/ShallowScope/ShallowScope.php renamed to src/TypeSystem/Scope/ShallowScope/TernaryBranchScope.php

@@ -22,23 +22,30 @@
 
 namespace PackageFactory\ComponentEngine\TypeSystem\Scope\ShallowScope;
 
+use PackageFactory\ComponentEngine\Parser\Ast\ExpressionNode;
+use PackageFactory\ComponentEngine\Parser\Ast\IdentifierNode;
 use PackageFactory\ComponentEngine\Parser\Ast\TypeReferenceNode;
 use PackageFactory\ComponentEngine\TypeSystem\ScopeInterface;
+use PackageFactory\ComponentEngine\TypeSystem\Type\NullType\NullType;
+use PackageFactory\ComponentEngine\TypeSystem\Type\UnionType\UnionType;
 use PackageFactory\ComponentEngine\TypeSystem\TypeInterface;
 
-final class ShallowScope implements ScopeInterface
+final class TernaryBranchScope implements ScopeInterface
 {
     public function __construct(
-        private readonly string $overriddenName,
-        private readonly TypeInterface $overriddenType,
+        private readonly ExpressionNode $conditionNode,
+        private readonly TypeInterface $conditionType,
+        private readonly bool $isBranchLeft,
         private readonly ScopeInterface $parentScope
     ) {
     }
 
     public function lookupTypeFor(string $name): ?TypeInterface
     {
-        if ($this->overriddenName === $name) {
-            return $this->overriddenType;
+        if ($this->conditionNode->root instanceof IdentifierNode && $this->conditionNode->root->value === $name) {
+            if ($this->conditionType instanceof UnionType && $this->conditionType->containsNull()) {
+                return $this->isBranchLeft ? $this->conditionType->withoutNull() : NullType::get();
+            }
         }
 
         return $this->parentScope->lookupTypeFor($name);