Reorganize src folders and Major Performance Optimization

bin/typephp

@@ -15,7 +15,7 @@ foreach ($autoloadFiles as $file) {
     }
 }
 
-use TypePHP\Command\CommandRunner;
+use TypePHP\Internal\Cli\CommandRunner;
 
 $exitCode = CommandRunner::run(array_slice($argv, 1));
 exit($exitCode);

composer.json

@@ -26,7 +26,7 @@
     ],
     "require": {
         "php": "^8.1",
-        "phpstan/phpdoc-parser": "^2.0",
+        "phpstan/phpdoc-parser": "^2.3",
         "nikic/php-parser": "^5.3"
     },
     "require-dev": {

src/Internal/ContractVisitor.php → src/Internal/Ast/ContractVisitor.php

@@ -2,15 +2,11 @@
 
 declare(strict_types=1);
 
-namespace TypePHP\Internal;
+namespace TypePHP\Internal\Ast;
 
 use PhpParser\Node;
 use PhpParser\NodeVisitorAbstract;
-use TypePHP\Contract\DocblockExtractor;
-use TypePHP\Internal\Visitor\FunctionContractInjector;
-use TypePHP\Internal\Visitor\NodeBuilder;
-use TypePHP\Internal\Visitor\PropertyHookInjector;
-use TypePHP\Internal\Visitor\ScopeManager;
+use TypePHP\Internal\Docblock\DocblockExtractor;
 
 /**
  * @internal AST Node Visitor that injects contract checks, scope tracking, property hook validation, and parameter/return wrappers into functions and methods.
@@ -31,7 +27,8 @@ public function __construct()
      */
     public function enterNode(Node $node): ?array
     {
-        if ($node instanceof Node\Stmt\Function_
+        if (
+            $node instanceof Node\Stmt\Function_
             || $node instanceof Node\Stmt\ClassMethod
             || $node instanceof Node\Expr\Closure
             || $node instanceof Node\Expr\ArrowFunction
@@ -165,12 +162,12 @@ public function leaveNode(Node $node): Node|null
             $node->setAttribute('typephp_wrapped', value: true);
 
             return new Node\Expr\FuncCall(
-                new Node\Name('\TypePHP\Internal\RuntimeTypeChecker::cloneInstance'),
+                new Node\Name\FullyQualified('TypePHP\Internal\RuntimeTypeChecker::cloneInstance'),
                 [
                     new Node\Arg(
                         new Node\Expr\Clone_(
                             new Node\Expr\FuncCall(
-                                new Node\Name('\TypePHP\Internal\RuntimeTypeChecker::prepareClone'),
+                                new Node\Name\FullyQualified('TypePHP\Internal\RuntimeTypeChecker::prepareClone'),
                                 [new Node\Arg($node->expr)]
                             )
                         )
@@ -180,7 +177,8 @@ public function leaveNode(Node $node): Node|null
             );
         }
 
-        if ($node instanceof Node\Stmt\Function_
+        if (
+            $node instanceof Node\Stmt\Function_
             || $node instanceof Node\Stmt\ClassMethod
             || $node instanceof Node\Expr\Closure
             || $node instanceof Node\Expr\ArrowFunction

src/Internal/Visitor/FunctionContractInjector.php → src/Internal/Ast/FunctionContractInjector.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace TypePHP\Internal\Visitor;
+namespace TypePHP\Internal\Ast;
 
 use PhpParser\Node;
 use PhpParser\NodeTraverser;
@@ -204,7 +204,7 @@ private static function buildSetupScopeStmt(array $params, Node\Expr $thisArg):
         );
 
         $checkCall = new Node\Expr\FuncCall(
-            new Node\Name('\TypePHP\Internal\RuntimeTypeChecker::setupScope'),
+            new Node\Name\FullyQualified('TypePHP\Internal\RuntimeTypeChecker::setupScope'),
             [
                 new Node\Arg(new Node\Scalar\MagicConst\Method()),
                 new Node\Arg($argsExpr),
@@ -217,7 +217,7 @@ private static function buildSetupScopeStmt(array $params, Node\Expr $thisArg):
         $ifStmt = new Node\Stmt\If_(
             new Node\Expr\Instanceof_(
                 new Node\Expr\Assign(new Node\Expr\Variable('__typephpErr'), $checkCall),
-                new Node\Name('\TypePHP\Internal\ErrorMessage')
+                new Node\Name\FullyQualified('TypePHP\Internal\Diagnostic\ErrorMessage')
             ),
             ['stmts' => [$throwStmt]]
         );
@@ -242,7 +242,7 @@ private static function buildCallableParamWrappers(array $params, string $docTex
                     new Node\Expr\Assign(
                         new Node\Expr\Variable($paramName),
                         new Node\Expr\FuncCall(
-                            new Node\Name('\TypePHP\Internal\RuntimeTypeChecker::wrapCallable'),
+                            new Node\Name\FullyQualified('TypePHP\Internal\RuntimeTypeChecker::wrapCallable'),
                             [
                                 new Node\Arg(new Node\Scalar\MagicConst\Method()),
                                 new Node\Arg(new Node\Scalar\String_($paramName)),
@@ -275,7 +275,7 @@ private static function buildIterableParamWrappers(array $params, string $docTex
                     new Node\Expr\Assign(
                         new Node\Expr\Variable($paramName),
                         new Node\Expr\FuncCall(
-                            new Node\Name('\TypePHP\Internal\RuntimeTypeChecker::wrapIterable'),
+                            new Node\Name\FullyQualified('TypePHP\Internal\RuntimeTypeChecker::wrapIterable'),
                             [
                                 new Node\Arg(new Node\Scalar\MagicConst\Method()),
                                 new Node\Arg(new Node\Scalar\String_($paramName)),
@@ -373,12 +373,12 @@ public static function buildTypeErrorThrowStmt(Node\Expr $errorVar): Node\Stmt\E
         return new Node\Stmt\Expression(
             new Node\Expr\Throw_(
                 new Node\Expr\StaticCall(
-                    new Node\Name('\TypePHP\Internal\ErrorFactory'),
+                    new Node\Name\FullyQualified('TypePHP\Internal\Diagnostic\ErrorFactory'),
                     'prepareException',
                     [
                         new Node\Arg(
                             new Node\Expr\New_(
-                                new Node\Name('\TypePHP\Exception\TypeError'),
+                                new Node\Name\FullyQualified('TypePHP\Exception\TypeError'),
                                 [
                                     new Node\Arg(
                                         new Node\Expr\MethodCall($errorVar, 'getMessage')
@@ -399,7 +399,7 @@ public static function buildReturnCheckCall(Node\Expr $exprToWrap, Node\Expr $th
             : new Node\Expr\Array_();
 
         return new Node\Expr\FuncCall(
-            new Node\Name('\TypePHP\Internal\RuntimeTypeChecker::checkReturn'),
+            new Node\Name\FullyQualified('TypePHP\Internal\RuntimeTypeChecker::checkReturn'),
             [
                 new Node\Arg(new Node\Scalar\MagicConst\Method()),
                 new Node\Arg($exprToWrap),
@@ -417,7 +417,7 @@ public static function buildVoidReturnGuard(Node\Expr\FuncCall $checkCall): arra
         $ifStmt = new Node\Stmt\If_(
             new Node\Expr\Instanceof_(
                 new Node\Expr\Assign(new Node\Expr\Variable('__typephpRet'), $checkCall),
-                new Node\Name('\TypePHP\Internal\ErrorMessage')
+                new Node\Name\FullyQualified('TypePHP\Internal\Diagnostic\ErrorMessage')
             ),
             ['stmts' => [self::buildTypeErrorThrowStmt(new Node\Expr\Variable('__typephpRet'))]]
         );
@@ -434,16 +434,16 @@ public static function buildTernaryReturnExpr(Node\Expr\FuncCall $checkCall): No
         return new Node\Expr\Ternary(
             new Node\Expr\Instanceof_(
                 new Node\Expr\Assign(new Node\Expr\Variable('__typephpRet'), $checkCall),
-                new Node\Name('\TypePHP\Internal\ErrorMessage')
+                new Node\Name\FullyQualified('TypePHP\Internal\Diagnostic\ErrorMessage')
             ),
             new Node\Expr\Throw_(
                 new Node\Expr\StaticCall(
-                    new Node\Name('\TypePHP\Internal\ErrorFactory'),
+                    new Node\Name\FullyQualified('TypePHP\Internal\Diagnostic\ErrorFactory'),
                     'prepareException',
                     [
                         new Node\Arg(
                             new Node\Expr\New_(
-                                new Node\Name('\TypePHP\Exception\TypeError'),
+                                new Node\Name\FullyQualified('TypePHP\Exception\TypeError'),
                                 [
                                     new Node\Arg(
                                         new Node\Expr\MethodCall(new Node\Expr\Variable('__typephpRet'), 'getMessage')
@@ -461,7 +461,7 @@ public static function buildTernaryReturnExpr(Node\Expr\FuncCall $checkCall): No
     public static function buildWrappedYieldNode(Node\Expr\Yield_ $n, Node\Expr $thisArg): Node\Expr\Ternary
     {
         $checkYieldCall = new Node\Expr\FuncCall(
-            new Node\Name('\TypePHP\Internal\RuntimeTypeChecker::checkYield'),
+            new Node\Name\FullyQualified('TypePHP\Internal\RuntimeTypeChecker::checkYield'),
             [
                 new Node\Arg(new Node\Scalar\MagicConst\Method()),
                 new Node\Arg($n->key ?? new Node\Expr\ConstFetch(new Node\Name('null'))),
@@ -473,16 +473,16 @@ public static function buildWrappedYieldNode(Node\Expr\Yield_ $n, Node\Expr $thi
         $n->value = new Node\Expr\Ternary(
             new Node\Expr\Instanceof_(
                 new Node\Expr\Assign(new Node\Expr\Variable('__typephpYld'), $checkYieldCall),
-                new Node\Name('\TypePHP\Internal\ErrorMessage')
+                new Node\Name\FullyQualified('TypePHP\Internal\Diagnostic\ErrorMessage')
             ),
             new Node\Expr\Throw_(
                 new Node\Expr\StaticCall(
-                    new Node\Name('\TypePHP\Internal\ErrorFactory'),
+                    new Node\Name\FullyQualified('TypePHP\Internal\Diagnostic\ErrorFactory'),
                     'prepareException',
                     [
                         new Node\Arg(
                             new Node\Expr\New_(
-                                new Node\Name('\TypePHP\Exception\TypeError'),
+                                new Node\Name\FullyQualified('TypePHP\Exception\TypeError'),
                                 [
                                     new Node\Arg(
                                         new Node\Expr\MethodCall(new Node\Expr\Variable('__typephpYld'), 'getMessage')
@@ -498,7 +498,7 @@ public static function buildWrappedYieldNode(Node\Expr\Yield_ $n, Node\Expr $thi
         );
 
         $checkSendCall = new Node\Expr\FuncCall(
-            new Node\Name('\TypePHP\Internal\RuntimeTypeChecker::checkSend'),
+            new Node\Name\FullyQualified('TypePHP\Internal\RuntimeTypeChecker::checkSend'),
             [
                 new Node\Arg(new Node\Scalar\MagicConst\Method()),
                 new Node\Arg($n),
@@ -509,16 +509,16 @@ public static function buildWrappedYieldNode(Node\Expr\Yield_ $n, Node\Expr $thi
         return new Node\Expr\Ternary(
             new Node\Expr\Instanceof_(
                 new Node\Expr\Assign(new Node\Expr\Variable('__typephpSnd'), $checkSendCall),
-                new Node\Name('\TypePHP\Internal\ErrorMessage')
+                new Node\Name\FullyQualified('TypePHP\Internal\Diagnostic\ErrorMessage')
             ),
             new Node\Expr\Throw_(
                 new Node\Expr\StaticCall(
-                    new Node\Name('\TypePHP\Internal\ErrorFactory'),
+                    new Node\Name\FullyQualified('TypePHP\Internal\Diagnostic\ErrorFactory'),
                     'prepareException',
                     [
                         new Node\Arg(
                             new Node\Expr\New_(
-                                new Node\Name('\TypePHP\Exception\TypeError'),
+                                new Node\Name\FullyQualified('TypePHP\Exception\TypeError'),
                                 [
                                     new Node\Arg(
                                         new Node\Expr\MethodCall(new Node\Expr\Variable('__typephpSnd'), 'getMessage')
@@ -570,7 +570,7 @@ public function enterNode(Node $n): int|Node|null
                     $n->setAttribute('typephp_wrapped', true);
 
                     $n->expr = new Node\Expr\FuncCall(
-                        new Node\Name('\TypePHP\Internal\RuntimeTypeChecker::wrapIterable'),
+                        new Node\Name\FullyQualified('TypePHP\Internal\RuntimeTypeChecker::wrapIterable'),
                         [
                             new Node\Arg(new Node\Scalar\MagicConst\Method()),
                             new Node\Arg(new Node\Scalar\String_('return')),
@@ -649,4 +649,4 @@ public function enterNode(Node $n): int|array|null
 
         return $newStmts;
     }
-}
+}

src/Internal/Visitor/NodeBuilder.php → src/Internal/Ast/NodeBuilder.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace TypePHP\Internal\Visitor;
+namespace TypePHP\Internal\Ast;
 
 use PhpParser\Node;
 
@@ -42,7 +42,7 @@ public static function createTernaryThrowExpr(Node\Expr\FuncCall $checkCall, int
         $args = [
             new Node\Arg(
                 new Node\Expr\New_(
-                    new Node\Name('\TypePHP\Exception\TypeError'),
+                    new Node\Name\FullyQualified('TypePHP\Exception\TypeError'),
                     [
                         new Node\Arg(
                             new Node\Expr\MethodCall(
@@ -65,11 +65,11 @@ public static function createTernaryThrowExpr(Node\Expr\FuncCall $checkCall, int
                     new Node\Expr\Variable('__typephpVal'),
                     $checkCall
                 ),
-                new Node\Name('\TypePHP\Internal\ErrorMessage')
+                new Node\Name\FullyQualified('TypePHP\Internal\Diagnostic\ErrorMessage')
             ),
             new Node\Expr\Throw_(
                 new Node\Expr\StaticCall(
-                    new Node\Name('\TypePHP\Internal\ErrorFactory'),
+                    new Node\Name\FullyQualified('TypePHP\Internal\Diagnostic\ErrorFactory'),
                     'prepareException',
                     $args
                 )

src/Internal/Visitor/PropertyHookInjector.php → src/Internal/Ast/PropertyHookInjector.php

@@ -2,12 +2,12 @@
 
 declare(strict_types=1);
 
-namespace TypePHP\Internal\Visitor;
+namespace TypePHP\Internal\Ast;
 
 use PhpParser\Node;
 use PhpParser\NodeTraverser;
 use PhpParser\NodeVisitorAbstract;
-use TypePHP\Internal\Config;
+use TypePHP\Internal\Util\Config;
 
 /**
  * @internal Injects property contract checks into PHP 8.4 get and set property hooks.
@@ -90,16 +90,16 @@ private static function buildExpressionSetHookTernary(Node\Expr\FuncCall $checkC
         return new Node\Expr\Ternary(
             new Node\Expr\Instanceof_(
                 new Node\Expr\Assign(new Node\Expr\Variable('__typephpVal'), $checkCall),
-                new Node\Name('\TypePHP\Internal\ErrorMessage')
+                new Node\Name\FullyQualified('TypePHP\Internal\Diagnostic\ErrorMessage')
             ),
             new Node\Expr\Throw_(
                 new Node\Expr\StaticCall(
-                    new Node\Name('\TypePHP\Internal\ErrorFactory'),
+                    new Node\Name\FullyQualified('TypePHP\Internal\Diagnostic\ErrorFactory'),
                     'prepareException',
                     [
                         new Node\Arg(
                             new Node\Expr\New_(
-                                new Node\Name('\TypePHP\Exception\TypeError'),
+                                new Node\Name\FullyQualified('TypePHP\Exception\TypeError'),
                                 [
                                     new Node\Arg(
                                         new Node\Expr\MethodCall(new Node\Expr\Variable('__typephpVal'), 'getMessage')

src/Internal/ScopeCleaner.php → src/Internal/Ast/ScopeCleaner.php

@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace TypePHP\Internal;
+namespace TypePHP\Internal\Ast;
 
-use TypePHP\Resolver\TemplateManager;
+use TypePHP\Internal\Generics\TemplateManager;
 
 /**
  * @internal ensures proper scope cleanup for variable tracking.

src/Internal/Visitor/ScopeManager.php → src/Internal/Ast/ScopeManager.php

@@ -2,12 +2,12 @@
 
 declare(strict_types=1);
 
-namespace TypePHP\Internal\Visitor;
+namespace TypePHP\Internal\Ast;
 
 use PhpParser\Node;
 use PHPStan\PhpDocParser\Parser\TokenIterator;
-use TypePHP\Contract\DocblockExtractor;
-use TypePHP\Internal\DocblockNormalizer;
+use TypePHP\Internal\Docblock\DocblockExtractor;
+use TypePHP\Internal\Docblock\DocblockNormalizer;
 
 /**
  * @internal Manages lexical scope stack frames and extracts local @var variable annotations.

src/Internal/TypePHPPrinter.php → src/Internal/Ast/TypePHPPrinter.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace TypePHP\Internal;
+namespace TypePHP\Internal\Ast;
 
 use PhpParser\Node;
 use PhpParser\PrettyPrinter\Standard;

src/Internal/Checker/GeneratorChecker.php

@@ -8,11 +8,11 @@
 use PHPStan\PhpDocParser\Ast\Type\GenericTypeNode;
 use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode;
 use PHPStan\PhpDocParser\Ast\Type\TypeNode;
-use TypePHP\Contract\ContractParser;
-use TypePHP\Resolver\SpecialTypeResolver;
-use TypePHP\Resolver\TemplateManager;
-use TypePHP\Resolver\TemplateSubstitutor;
-use TypePHP\Validator\TypeValidatorRegistry;
+use TypePHP\Internal\Docblock\DocblockParser;
+use TypePHP\Internal\Generics\TemplateManager;
+use TypePHP\Internal\Generics\TemplateSubstitutor;
+use TypePHP\Internal\Resolver\SpecialTypeResolver;
+use TypePHP\Internal\Validator\TypeValidatorRegistry;
 
 /**
  * @internal Evaluates generator yield and send (TSend) type validations.
@@ -86,7 +86,7 @@ public static function checkYield(
      */
     private static function resolveGeneratorReturnType(string $function, object|string|null $thisOrClass): ?TypeNode
     {
-        $contract = ContractParser::parse($function);
+        $contract = DocblockParser::parse($function);
         $returnTypeNode = $contract['return'] ?? null;
 
         if ($returnTypeNode === null) {