Optimize traversal while avoiding duplicates

smnandre · smnandre · commit bac4f0710d9e · 2023-11-25T04:06:44.000+01:00
diff --git a/src/Symfony/Component/AssetMapper/ImportMap/ImportMapGenerator.php b/src/Symfony/Component/AssetMapper/ImportMap/ImportMapGenerator.php
@@ -225,23 +225,28 @@ private function findAsset(string $path): ?MappedAsset
     private function findEagerImports(MappedAsset $asset): array
     {
         $dependencies = [];
-        foreach ($asset->getJavaScriptImports() as $javaScriptImport) {
-            if ($javaScriptImport->isLazy) {
-                continue;
-            }
+        $queue = [$asset];
 
-            $dependencies[] = $javaScriptImport->importName;
+        while ($asset = array_shift($queue)) {
+            foreach ($asset->getJavaScriptImports() as $javaScriptImport) {
+                if ($javaScriptImport->isLazy) {
+                    continue;
+                }
+                if (isset($dependencies[$javaScriptImport->importName])) {
+                    continue;
+                }
+                $dependencies[$javaScriptImport->importName] = true;
 
-            // Follow its imports!
-            if (!$nextAsset = $this->assetMapper->getAsset($javaScriptImport->assetLogicalPath)) {
-                // should not happen at this point, unless something added a bogus JavaScriptImport to this asset
-                throw new LogicException(sprintf('Cannot find imported JavaScript asset "%s" in asset mapper.', $javaScriptImport->assetLogicalPath));
+                // Follow its imports!
+                if (!$javaScriptAsset = $this->assetMapper->getAsset($javaScriptImport->assetLogicalPath)) {
+                    // should not happen at this point, unless something added a bogus JavaScriptImport to this asset
+                    throw new LogicException(sprintf('Cannot find JavaScript asset "%s" (imported in "%s") in asset mapper.', $javaScriptImport->assetLogicalPath, $asset->logicalPath));
+                }
+                $queue[] = $javaScriptAsset;
             }
-
-            $dependencies = array_merge($dependencies, $this->findEagerImports($nextAsset));
         }
 
-        return array_unique($dependencies);
+        return array_keys($dependencies);
     }
 
     private function createMissingImportMapAssetException(ImportMapEntry $entry): \InvalidArgumentException
diff --git a/src/Symfony/Component/AssetMapper/Tests/ImportMap/ImportMapGeneratorTest.php b/src/Symfony/Component/AssetMapper/Tests/ImportMap/ImportMapGeneratorTest.php
@@ -687,7 +687,7 @@ public function getEagerEntrypointImportsTests(): iterable
                     new JavaScriptImport('/assets/imports_simple2.js', assetLogicalPath: $importsSimpleAsset2->logicalPath, assetSourcePath: $importsSimpleAsset2->sourcePath, isLazy: false),
                 ]
             ),
-            ['/assets/imports_simple.js', '/assets/simple.js', '/assets/imports_simple2.js'],
+            ['/assets/imports_simple.js', '/assets/imports_simple2.js', '/assets/simple.js'],
             [$simpleAsset, $importsSimpleAsset, $importsSimpleAsset2],
         ];
     }

Original file line number	Diff line number	Diff line change
`@@ -687,7 +687,7 @@ public function getEagerEntrypointImportsTests(): iterable`
`687`	`687`	`new JavaScriptImport('/assets/imports_simple2.js', assetLogicalPath: $importsSimpleAsset2->logicalPath, assetSourcePath: $importsSimpleAsset2->sourcePath, isLazy: false),`
`688`	`688`	`]`
`689`	`689`	`),`
`690`		`- ['/assets/imports_simple.js', '/assets/simple.js', '/assets/imports_simple2.js'],`
	`690`	`+ ['/assets/imports_simple.js', '/assets/imports_simple2.js', '/assets/simple.js'],`
`691`	`691`	`[$simpleAsset, $importsSimpleAsset, $importsSimpleAsset2],`
`692`	`692`	`];`
`693`	`693`	`}`