Make plugin selection in CLI easier

Author: LukeTowers

modules/system/console/PluginList.php

@@ -1,7 +1,5 @@
 <?php namespace System\Console;
 
-use Symfony\Component\Console\Helper\Table;
-use Symfony\Component\Console\Helper\TableSeparator;
 use System\Models\PluginVersion;
 use Winter\Storm\Console\Command;
 
@@ -43,7 +41,7 @@ public function handle()
         }
 
         $rows = [];
-        foreach ($allPlugins as $plugin) {
+        foreach ($allPlugins->sortBy('code') as $plugin) {
             $rows[] = [
                 $plugin->code,
                 $plugin->version,

modules/system/console/traits/HasPluginArgument.php

@@ -3,6 +3,11 @@
 use InvalidArgumentException;
 use System\Classes\PluginBase;
 use System\Classes\PluginManager;
+use Throwable;
+use Winter\Storm\Support\Arr;
+
+use function Laravel\Prompts\search;
+use function Laravel\Prompts\select;
 
 /**
  * Console Command Trait that provides autocompletion for the "plugin" argument
@@ -22,6 +27,8 @@ trait HasPluginArgument
      */
     // protected $validatePluginInput = true;
 
+    protected ?PluginBase $plugin = null;
+
     /**
      * Return available plugins for autocompletion of the "plugin" argument
      */
@@ -45,7 +52,33 @@ public function suggestPluginValues()
             }
         }
 
-        return $plugins;
+        return Arr::sort($plugins);
+    }
+
+    /**
+     * Prompt for which provider or tag to publish.
+     */
+    protected function promptForPlugin(): ?string
+    {
+        $choices = $this->suggestPluginValues();
+
+        $choice = windows_os()
+            ? select(
+                "Which plugin would you like to select?",
+                $choices,
+                scroll: 15,
+            )
+            : search(
+                label: "Which plugin would you like to select?",
+                placeholder: 'Search...',
+                options: fn ($search) => array_values(array_filter(
+                    $choices,
+                    fn ($choice) => str_contains(strtolower($choice), strtolower($search))
+                )),
+                scroll: 15,
+            );
+
+        return $choice;
     }
 
     /**
@@ -55,7 +88,7 @@ public function suggestPluginValues()
     public function getPluginIdentifier($identifier = null): string
     {
         $pluginManager = PluginManager::instance();
-        $pluginName = $identifier ?? $this->argument('plugin');
+        $pluginName = $identifier ?? $this->argument('plugin') ?? $this->promptForPlugin();
         $pluginName = $pluginManager->normalizeIdentifier($pluginName);
 
         if (
@@ -76,4 +109,24 @@ public function getPlugin($identifier = null): ?PluginBase
     {
         return PluginManager::instance()->findByIdentifier($this->getPluginIdentifier($identifier));
     }
+
+    /**
+     * Validates that the provided plugin can be accessed
+     *
+     * @throws InvalidArgumentException if it cannot be
+     */
+    public function validateProvidedPlugin()
+    {
+        if (!$this->plugin) {
+            try {
+                $this->plugin = $this->getPlugin();
+            } catch (Throwable $e) {
+                throw new InvalidArgumentException(sprintf(
+                    'Provided plugin "%s" failed to load: %s',
+                    $this->argument('plugin'),
+                    $e->getMessage()
+                ));
+            }
+        }
+    }
 }