[FIX] extras for publish nested packages

Author: Dmi3yy

core/src/Console/Packages/ExtrasCommand.php

@@ -102,6 +102,11 @@ class ExtrasCommand extends Command
      */
     protected $catalogError = '';
 
+    /**
+     * @var array|null
+     */
+    protected $extrasCatalogPackages = null;
+
     /**
      * PackageCommand constructor.
      */
@@ -678,27 +683,46 @@ protected function getDependencyProviders($packageName)
         }
 
         $providers = [];
-        foreach (array_keys($requires) as $dependency) {
+        $visited = [$packageName => true];
+        $queue = array_keys($requires);
+        $catalogPackages = $this->getExtrasCatalogPackages();
+        $useCatalog = $catalogPackages !== [];
+        while ($queue !== []) {
+            $dependency = array_pop($queue);
             if (!is_string($dependency)) {
                 continue;
             }
             $dependency = trim($dependency);
             if (!$this->isComposerDependencyName($dependency)) {
                 continue;
             }
-            if ($dependency === $packageName) {
+            if (isset($visited[$dependency])) {
                 continue;
             }
+            $visited[$dependency] = true;
 
             $depComposer = $this->getPackageComposer($dependency);
             if (!$depComposer) {
                 continue;
             }
-            if (!$this->isEvoPackageType($depComposer['type'] ?? null)) {
+            if ($useCatalog) {
+                if (!isset($catalogPackages[strtolower($dependency)])) {
+                    continue;
+                }
+            } elseif (!$this->isEvoPackageType($depComposer['type'] ?? null)) {
                 continue;
             }
 
             $providers = array_merge($providers, $this->extractProviders($depComposer));
+
+            $depRequires = $depComposer['require'] ?? [];
+            if (is_array($depRequires) && $depRequires !== []) {
+                foreach (array_keys($depRequires) as $childDependency) {
+                    if (is_string($childDependency)) {
+                        $queue[] = $childDependency;
+                    }
+                }
+            }
         }
 
         $providers = array_filter($providers, 'is_string');
@@ -747,6 +771,47 @@ protected function isComposerDependencyName(string $name): bool
         return true;
     }
 
+    protected function isExtrasCatalogPackage(string $packageName): bool
+    {
+        if ($packageName === '') {
+            return false;
+        }
+        $packages = $this->getExtrasCatalogPackages();
+        return isset($packages[strtolower($packageName)]);
+    }
+
+    protected function getExtrasCatalogPackages(): array
+    {
+        if ($this->extrasCatalogPackages !== null) {
+            return $this->extrasCatalogPackages;
+        }
+
+        $catalog = $this->loadExtrasCatalog();
+        if ($catalog === null) {
+            $this->extrasCatalogPackages = [];
+            return $this->extrasCatalogPackages;
+        }
+
+        $packages = [];
+        foreach ($catalog['packages'] ?? [] as $pkg) {
+            if (!is_array($pkg)) {
+                continue;
+            }
+            $composerName = $pkg['composer_name'] ?? '';
+            if (is_string($composerName) && $composerName !== '') {
+                $packages[strtolower($composerName)] = true;
+                continue;
+            }
+            $fullName = $pkg['full_name'] ?? '';
+            if (is_string($fullName) && $fullName !== '') {
+                $packages[strtolower($fullName)] = true;
+            }
+        }
+
+        $this->extrasCatalogPackages = $packages;
+        return $this->extrasCatalogPackages;
+    }
+
     protected function getPackageComposerPath($packageName)
     {
         if (class_exists('\\Composer\\InstalledVersions')) {