Devlink fixes

Author: mooxbot

src/Console/Traits/Check.php

@@ -127,14 +127,18 @@ private function checkUpdated(): bool
     {
         $composerJson = json_decode(file_get_contents($this->composerJsonPath), true);
         $devlinkConfig = config('devlink.packages');
+        $composerRequire = array_merge(
+            $composerJson['require'] ?? [],
+            $composerJson['require-dev'] ?? []
+        );
 
         foreach ($devlinkConfig as $package => $config) {
             if (! ($config['active'] ?? false)) {
                 continue;
             }
 
-            $packageName = 'moox/'.$package;
-            if (! isset($composerJson['require'][$packageName]) && ! isset($composerJson['require-dev'][$packageName])) {
+            $packageName = $this->getPackageName($package, $config);
+            if (! $packageName || ! isset($composerRequire[$packageName])) {
                 return false;
             }
         }

src/Console/Traits/Link.php

@@ -15,6 +15,7 @@ private function link(): void
         $this->createSymlinks();
         $this->updateComposerJson();
         $this->createLinkedComposerJson();
+        $this->removeDeployComposerJson();
     }
 
     private function prepare(): void
@@ -148,12 +149,14 @@ private function composerRemovePackages(): void
         foreach ($composerJson['repositories'] ?? [] as $key => $repo) {
             if ($repo['type'] === 'path' && str_starts_with($repo['url'], $packagesBaseName.'/')) {
                 $package = basename($repo['url']);
+                $packageName = $this->getPackageName($package, $configuredPackages[$package] ?? []);
 
-                if (! isset($configuredPackages[$package]) || ! ($configuredPackages[$package]['active'] ?? false)) {
+                if (! isset($configuredPackages[$package]) ||
+                    ! ($configuredPackages[$package]['active'] ?? false)) {
                     $removedPackages[] = [
                         'key' => $key,
                         'package' => $package,
-                        'name' => "moox/$package",
+                        'name' => $packageName ?? $package,
                     ];
                 }
             }
@@ -206,24 +209,25 @@ private function updateComposerJson(): void
         $removedRepos = [];
         $removedRequires = [];
 
-        // First, remove inactive packages
         foreach ($repositories as $key => $repo) {
             if (($repo['type'] ?? '') === 'path') {
                 $name = basename($repo['url']);
                 $package = $this->packages[$name] ?? null;
 
                 if (! $package || ! ($package['active'] ?? false)) {
                     unset($repositories[$key]);
-                    unset($require["moox/$name"]);
-                    unset($requireDev["moox/$name"]);
-                    $removedRepos[] = $name;
-                    $removedRequires[] = "moox/$name";
-                    $updated = true;
+                    $packageName = $this->getPackageName($name, $package ?? []);
+                    if ($packageName) {
+                        unset($require[$packageName]);
+                        unset($requireDev[$packageName]);
+                        $removedRepos[] = $name;
+                        $removedRequires[] = $packageName;
+                        $updated = true;
+                    }
                 }
             }
         }
 
-        // Then add or update active packages
         foreach ($this->packages as $name => $package) {
             if (! ($package['active'] ?? false)) {
                 continue;
@@ -270,7 +274,6 @@ private function updateComposerJson(): void
                 $updated = true;
             }
 
-            // Remove from the other section if it exists
             if ($isDev && isset($require[$packageName])) {
                 unset($require[$packageName]);
                 $updated = true;
@@ -279,7 +282,6 @@ private function updateComposerJson(): void
                 $updated = true;
             }
 
-            // Add to the correct section if not present
             if ($isDev && ! isset($requireDev[$packageName])) {
                 $requireDev[$packageName] = '*';
                 $addedRequires[] = $packageName.' (dev)';
@@ -383,4 +385,13 @@ private function createLinkedComposerJson(): void
 
         info('Created composer.json-linked with local package repositories');
     }
+
+    private function removeDeployComposerJson(): void
+    {
+        $deployPath = dirname($this->composerJsonPath).'/composer.json-deploy';
+        if (file_exists($deployPath)) {
+            unlink($deployPath);
+            info('Removed composer.json-deploy');
+        }
+    }
 }

src/Console/Traits/Show.php

@@ -63,7 +63,7 @@ private function show(): void
         }
 
         info('  '.$badge.strtoupper($fullStatus['status']).' </> '.$fullStatus['message']);
-        info('  '.$updateBadge.' UPDATE </> '.($isInSync ? 'All packages are in sync with composer.json' : 'You need to run `php artisan devlink:link` to update the packages'));
+        info('  '.$updateBadge.'UPDATE </> '.($isInSync ? 'All packages are in sync with composer.json' : 'You need to run `php artisan devlink:link` to update the packages'));
         info(' ');
     }