Improve discovery performance

Author: ogorzalka

src/Discovery/Infrastructure/Services/DiscoveryEngine.php

@@ -6,6 +6,7 @@
 
 use Illuminate\Container\Container;
 use Illuminate\Support\Collection;
+use Pollora\Application\Domain\Contracts\DebugDetectorInterface;
 use Pollora\Discovery\Domain\Contracts\DiscoversPathInterface;
 use Pollora\Discovery\Domain\Contracts\DiscoveryEngineInterface;
 use Pollora\Discovery\Domain\Contracts\DiscoveryInterface;
@@ -17,8 +18,10 @@
 use RecursiveDirectoryIterator;
 use RecursiveIteratorIterator;
 use Spatie\StructureDiscoverer\Cache\LaravelDiscoverCacheDriver;
+use Spatie\StructureDiscoverer\Cache\NullDiscoverCacheDriver;
 use Spatie\StructureDiscoverer\Discover;
 use SplFileInfo;
+use function WP_CLI\Dispatcher\get_path;
 
 /**
  * Discovery Engine
@@ -34,6 +37,13 @@
  */
 final class DiscoveryEngine implements DiscoveryEngineInterface
 {
+    /**
+     * Static cache for discovered structures to avoid repeated scans
+     *
+     * @var array<string, mixed>
+     */
+    private static array $structuresCache = [];
+
     /**
      * Collection of discovery locations
      *
@@ -54,7 +64,8 @@ final class DiscoveryEngine implements DiscoveryEngineInterface
      * @param  Container  $container  The service container for dependency injection
      */
     public function __construct(
-        private readonly Container $container
+        private readonly Container $container,
+        private readonly DebugDetectorInterface $debugDetector
     ) {
         $this->locations = new Collection;
         $this->discoveries = new Collection;
@@ -212,13 +223,22 @@ private function discoverStructures(DiscoveryInterface $discovery): void
             // Use Spatie's native caching with a cache identifier based on location and discovery type
             $cacheId = 'discovery_'.$discovery->getIdentifier().'_'.md5($location->getPath());
 
-            $discoveredStructures = Discover::in($location->getPath())
-                ->full()
-                ->withCache(
-                    $cacheId,
-                    new LaravelDiscoverCacheDriver
-                )
-                ->get();
+            // Check if we already have the structures cached in memory
+            if (isset(self::$structuresCache[$cacheId])) {
+                $discoveredStructures = self::$structuresCache[$cacheId];
+            } else {
+                // Discover and cache the structures
+                $discoveredStructures = Discover::in($location->getPath())
+                    ->full()
+                    ->withCache(
+                        $cacheId,
+                        $this->debugDetector->isDebugMode() ? new NullDiscoverCacheDriver() : new LaravelDiscoverCacheDriver
+                    )
+                    ->get();
+
+                // Cache the results in memory for future use
+                self::$structuresCache[$cacheId] = $discoveredStructures;
+            }
 
             foreach ($discoveredStructures as $structure) {
                 $discovery->discover($location, $structure);
@@ -240,9 +260,6 @@ private function discoverPaths(DiscoversPathInterface $discovery): void
 
             /** @var SplFileInfo $file */
             foreach ($iterator as $file) {
-                echo '<pre>';
-                var_dump($file);
-                echo '</pre>';
                 if ($file->isFile()) {
                     $discovery->discoverPath($location, $file->getPathname());
                 }
@@ -260,6 +277,14 @@ public function clearLocations(): static
         return $this;
     }
 
+    /**
+     * Clear the static structures cache
+     */
+    public static function clearStructuresCache(): void
+    {
+        self::$structuresCache = [];
+    }
+
     /**
      * Run a specific discovery
      *