Devlink multi-vendor and version fix

Author: adrolli

packages/devlink/src/Console/Traits/Link.php

@@ -229,7 +229,13 @@ private function updateComposerJson(): void
                 continue;
             }
 
-            $packageName = "moox/{$name}";
+            $packageName = $this->getPackageName($name, $package);
+            if (! $packageName) {
+                info("Skipping $name: no composer.json found or invalid");
+
+                continue;
+            }
+
             $isLocal = ($package['type'] ?? '') === 'local';
             $isPrivate = ($package['type'] ?? '') === 'private';
             $isDev = ($package['dev'] ?? false);
@@ -311,6 +317,28 @@ private function updateComposerJson(): void
         }
     }
 
+    private function getPackageName(string $name, array $package): ?string
+    {
+        $isLocal = ($package['type'] ?? '') === 'local';
+        $path = $isLocal ? "packages/$name" : ($package['path'] ?? '');
+
+        if (! $path || ! is_dir($path)) {
+            return null;
+        }
+
+        $composerJson = "$path/composer.json";
+        if (! file_exists($composerJson)) {
+            return null;
+        }
+
+        $data = json_decode(file_get_contents($composerJson), true);
+        if (! isset($data['name'])) {
+            return null;
+        }
+
+        return $data['name'];
+    }
+
     private function createLinkedComposerJson(): void
     {
         if (! file_exists($this->composerJsonPath)) {

packages/devlink/src/Console/Traits/Show.php

@@ -24,7 +24,7 @@ private function show(): void
                 default => $row['type'],
             };
 
-            $version = $this->getInstalledVersion('moox/'.$row['name']);
+            $version = $this->getInstalledVersion($row['name'], $row);
             $path = $this->getShortPath($row);
 
             return [
@@ -70,8 +70,13 @@ private function show(): void
         info(' ');
     }
 
-    private function getInstalledVersion(string $package): ?string
+    private function getInstalledVersion(string $name, array $package): ?string
     {
+        $packageName = $this->getPackageName($name, $package);
+        if (! $packageName) {
+            return null;
+        }
+
         $composerLock = base_path('composer.lock');
         if (! file_exists($composerLock)) {
             return null;
@@ -80,7 +85,7 @@ private function getInstalledVersion(string $package): ?string
         $lockData = json_decode(file_get_contents($composerLock), true);
         foreach ([$lockData['packages'] ?? [], $lockData['packages-dev'] ?? []] as $packages) {
             foreach ($packages as $pkg) {
-                if ($pkg['name'] === $package) {
+                if ($pkg['name'] === $packageName) {
                     return $pkg['version'];
                 }
             }
@@ -116,4 +121,26 @@ private function getShortPath(array $row): string
 
         return $path;
     }
+
+    private function getPackageName(string $name, array $package): ?string
+    {
+        $isLocal = ($package['type'] ?? '') === 'local';
+        $path = $isLocal ? "packages/$name" : ($package['path'] ?? '');
+
+        if (! $path || ! is_dir($path)) {
+            return null;
+        }
+
+        $composerJson = "$path/composer.json";
+        if (! file_exists($composerJson)) {
+            return null;
+        }
+
+        $data = json_decode(file_get_contents($composerJson), true);
+        if (! isset($data['name'])) {
+            return null;
+        }
+
+        return $data['name'];
+    }
 }