Implement cache directory exclusion in FileFilter and update tests

Author: rcalicdan

src/Contract/FileFilter.php

@@ -4,6 +4,7 @@
 
 namespace TypePHP\Contract;
 
+use TypePHP\Internal\CacheManager;
 use TypePHP\Internal\Config;
 
 /**
@@ -28,6 +29,11 @@ public static function isFileExcluded(string|false|null $fileName): bool
             return true;
         }
 
+        $normalizedCacheDir = rtrim(str_replace('\\', '/', CacheManager::getCacheDir()), '/') . '/';
+        if (str_starts_with($normalizedPath, $normalizedCacheDir)) {
+            return true;
+        }
+
         $config = Config::get();
         /** @var array<mixed> $includes */
         $includes = \is_array($config['include'] ?? null) ? $config['include'] : ['**'];
@@ -62,7 +68,7 @@ public static function isFileExcluded(string|false|null $fileName): bool
         // Equal specificity tie-breaker: Exclude wins!
         return $longestExcludeMatch >= $longestIncludeMatch;
     }
-
+    
     /**
      * Converts a glob pattern into an absolute regex pattern.
      */

src/Internal/StreamWrapper.php

@@ -117,6 +117,8 @@ public static function transformSource(string $source, string $filePath = ''): s
             return $source;
         }
 
+        $originalLineCount = substr_count($source, "\n");
+
         $parser = (new ParserFactory())->createForNewestSupportedVersion();
 
         try {
@@ -150,9 +152,26 @@ public static function transformSource(string $source, string $filePath = ''): s
         $printer = new TypePHPPrinter();
         $transformed = $printer->printFormatPreserving($newStmts, $oldStmts, $oldTokens);
 
-        // Critical: Remove the newline and indentation preceding any injected statement.
-        $transformed = preg_replace('/[ \t]*\r?\n[ \t]*\/\*__TYPEPHP_INJECTED__\*\//', ' /*__TYPEPHP_INJECTED__*/', $transformed) ?? $transformed;
-        $transformed = str_replace('/*__TYPEPHP_INJECTED__*/', '', $transformed);
+        $transformed = preg_replace('/[ \t]*\r?\n[ \t]*\/\*__TYPEPHP_INJECTED_START__\*\//', ' /*__TYPEPHP_INJECTED_START__*/', $transformed) ?? $transformed;
+
+        $transformedLineCount = substr_count($transformed, "\n");
+        $drift = $transformedLineCount - $originalLineCount;
+
+        if ($drift > 0) {
+            $transformed = preg_replace('/[ \t]*\r?\n[ \t]*\{[ \t]*\/\*__TYPEPHP_INJECTED_START__\*\//', ' { /*__TYPEPHP_INJECTED_START__*/', $transformed, $drift, $count1) ?? $transformed;
+            $drift -= $count1;
+        }
+
+        if ($drift > 0) {
+            $transformed = preg_replace('/\/\*__TYPEPHP_INJECTED_END__\*\/[ \t]*\r?\n[ \t]*\}/', '/*__TYPEPHP_INJECTED_END__*/ }', $transformed, $drift, $count2) ?? $transformed;
+            $drift -= $count2;
+        }
+
+        if ($drift > 0) {
+            $transformed = preg_replace('/\/\*__TYPEPHP_INJECTED_END__\*\/[ \t]*\r?\n[ \t]*/', '/*__TYPEPHP_INJECTED_END__*/ ', $transformed, $drift) ?? $transformed;
+        }
+
+        $transformed = str_replace(['/*__TYPEPHP_INJECTED_START__*/', '/*__TYPEPHP_INJECTED_END__*/'], '', $transformed);
 
         return $transformed;
     }
@@ -485,7 +504,7 @@ private static function isReadOnlyCall(): bool
         return \in_array($callerFunc, ['file_get_contents', 'file', 'readfile', 'highlight_file', 'show_source', 'token_get_all'], true);
     }
 
-    /**
+   /**
      * Determines whether a target PHP file path should be intercepted using Pattern Specificity.
      */
     private static function isApplicationFile(string $path, string|false $resolvedPath): bool
@@ -500,13 +519,20 @@ private static function isApplicationFile(string $path, string|false $resolvedPa
 
         $normalizedPath = str_replace('\\', '/', $resolvedPath);
 
+        // Prevent parsing TypePHP's own source code
         $parentDir = realpath(__DIR__ . '/..');
         $libSrcDir = $parentDir !== false ? str_replace('\\', '/', $parentDir) : '';
 
         if ($libSrcDir !== '' && str_starts_with($normalizedPath, $libSrcDir)) {
             return false;
         }
 
+        // Unconditionally prevent double-parsing cached files!
+        $normalizedCacheDir = rtrim(str_replace('\\', '/', self::$cacheDir), '/') . '/';
+        if (str_starts_with($normalizedPath, $normalizedCacheDir)) {
+            return false;
+        }
+
         $longestIncludeMatch = 0;
         foreach (self::$includeRawPatterns as $pattern => $regex) {
             if (preg_match($regex, $normalizedPath) === 1) {

src/Internal/TypePHPPrinter.php

@@ -18,7 +18,7 @@ final class TypePHPPrinter extends Standard
 {
     /**
      * Overrides base node printing to intercept injected statements, squash their
-     * formatting, and tag them with a unique marker for post-processing.
+     * formatting, and tag them with unique markers for post-processing.
      */
     protected function p(
         Node $node,
@@ -31,7 +31,7 @@ protected function p(
         if ($node instanceof Node\Stmt && $node->getAttribute('typephp_injected') === true) {
             $output = preg_replace('/\s+/', ' ', trim($output)) ?? $output;
 
-            return '/*__TYPEPHP_INJECTED__*/' . $output;
+            return '/*__TYPEPHP_INJECTED_START__*/' . $output . '/*__TYPEPHP_INJECTED_END__*/';
         }
 
         return $output;

tests/Contract/FileFilterTest.php

@@ -137,4 +137,24 @@
 
         Config::reset();
     });
+
+    test('unconditionally excludes the configured cache directory even if include pattern is **', function () {
+        $customCacheDir = getcwd() . '/storage/typephp-cache';
+
+        Config::set([
+            'cache_dir' => $customCacheDir,
+            'include' => [
+                '**',
+            ],
+            'exclude' => [],
+        ]);
+
+        $cachedFilePath = str_replace('\\', '/', $customCacheDir . '/v0.1_hash123.php');
+        $normalFilePath = str_replace('\\', '/', getcwd() . '/app/Models/User.php');
+
+        expect(FileFilter::isFileExcluded($cachedFilePath))->toBeTrue()
+            ->and(FileFilter::isFileExcluded($normalFilePath))->toBeFalse();
+
+        Config::reset();
+    });
 });