refactor: update the sub command alias logic for controller

Author: inhere

src/Controller.php

@@ -28,7 +28,6 @@
 use Toolkit\Stdlib\Obj\ObjectHelper;
 use Toolkit\Stdlib\Str;
 use function array_flip;
-use function array_keys;
 use function array_shift;
 use function implode;
 use function is_array;
@@ -48,19 +47,6 @@ abstract class Controller extends AbstractHandler implements ControllerInterface
 {
     use ControllerHelpTrait;
 
-    /**
-     * The sub-command aliases mapping
-     *
-     * eg: [
-     *  alias => command,
-     *  alias1 => command1,
-     *  alias2 => command1,
-     * ]
-     *
-     * @var array
-     */
-    private static array $commandAliases = [];
-
     /**
      * @var array global options for the group command
      */
@@ -153,7 +139,9 @@ abstract class Controller extends AbstractHandler implements ControllerInterface
     /**
      * Define command alias mapping. please rewrite it on sub-class.
      *
-     * @return array
+     * - key is command name, value is aliases.
+     *
+     * @return array{string: list<string>}
      */
     protected static function commandAliases(): array
     {
@@ -177,7 +165,8 @@ protected function init(): void
     {
         parent::init();
 
-        self::loadCommandAliases();
+        // up: load sub-commands alias
+        $this->loadCommandAliases();
 
         $list = $this->disabledCommands();
 
@@ -475,6 +464,7 @@ protected function handleNotFound(string $group, string $command, array $args):
     protected function newActionFlags(string $action = ''): FlagsParser
     {
         $action = $action ?: $this->action;
+
         if (!$fs = $this->getActionFlags($action)) {
             $fs = new SFlags(['name' => $action]);
             $fs->setStopOnFistArg(false);
@@ -553,21 +543,6 @@ protected function getAllCommandMethods(ReflectionClass $ref = null, bool $onlyN
         }
     }
 
-    /**
-     * @param string $alias
-     *
-     * @return string
-     */
-    public function resolveAlias(string $alias): string
-    {
-        if (!$alias) {
-            return '';
-        }
-
-        $map = $this->getCommandAliases();
-        return $map[$alias] ?? $alias;
-    }
-
     /**
      * @param string $name
      *
@@ -581,27 +556,22 @@ public function isDisabled(string $name): bool
     /**
      * load sub-commands aliases from sub-class::commandAliases()
      */
-    public static function loadCommandAliases(): void
+    public function loadCommandAliases(): void
     {
         $cmdAliases = static::commandAliases();
         if (!$cmdAliases) {
             return;
         }
 
-        $fmtAliases = [];
         foreach ($cmdAliases as $name => $item) {
             // $name is command, $item is alias list
             // eg: ['command1' => ['alias1', 'alias2']]
             if (is_array($item)) {
-                foreach ($item as $alias) {
-                    $fmtAliases[$alias] = $name;
-                }
+                $this->setAlias($name, $item, true);
             } elseif (is_string($item)) { // $item is command, $name is alias name
-                $fmtAliases[$name] = $item;
+                $this->setAlias($item, $name, true);
             }
         }
-
-        self::$commandAliases = $fmtAliases;
     }
 
     /**************************************************************************
@@ -616,20 +586,6 @@ public function getDisabledCommands(): array
         return $this->disabledCommands;
     }
 
-    /**
-     * @param string $name
-     *
-     * @return array
-     */
-    public function getCommandAliases(string $name = ''): array
-    {
-        if ($name) {
-            return self::$commandAliases ? array_keys(self::$commandAliases, $name, true) : [];
-        }
-
-        return self::$commandAliases;
-    }
-
     /**
      * @return string
      */

src/Decorate/ControllerHelpTrait.php

@@ -59,7 +59,7 @@ public function helpCommand(): int
 
         $action  = Str::camelCase($action);
         $method  = $this->actionSuffix ? $action . ucfirst($this->actionSuffix) : $action;
-        $aliases = $this->getCommandAliases($action);
+        $aliases = $this->getNameAliases($action);
 
         // up: find global aliases from app
         if ($this->app) {
@@ -133,7 +133,7 @@ public function showCommandList(): void
                 $desc .= '(<red>DISABLED</red>)';
             }
 
-            $aliases = $this->getCommandAliases($cmd);
+            $aliases = $this->getNameAliases($cmd);
             $desc    .= $aliases ? ColorTag::wrap(' (alias: ' . implode(',', $aliases) . ')', 'info') : '';
 
             $commands[$cmd] = $desc;

src/Decorate/SubCommandsWareTrait.php

@@ -411,6 +411,14 @@ public function getCommands(): array
         return $this->commands;
     }
 
+    /**
+     * @return array
+     */
+    public function getSubAliasMap(): array
+    {
+        return $this->aliases;
+    }
+
     /**
      * @return array
      */

src/Handler/AbstractHandler.php

@@ -239,6 +239,7 @@ protected function initForRun(): void
         }
 
         $this->addPathNode($this->commandName);
+        $this->commentsVars['binWithCmd'] = $this->getPath();
     }
 
     /**
@@ -337,12 +338,12 @@ public function run(array $args): mixed
     protected function doRun(array $args): mixed
     {
         // some prepare check
-        if (true !== $this->prepare()) {
+        if (!$this->prepare()) {
             return -1;
         }
 
         // return False to deny goon run.
-        if (false === $this->beforeExecute()) {
+        if (!$this->beforeExecute()) {
             return -1;
         }
 
@@ -425,7 +426,7 @@ protected function afterExecute(): void
     }
 
     /**
-     * prepare run
+     * prepare run, return false to stop run.
      */
     protected function prepare(): bool
     {