up: update the cmd, flags help render logic

Author: inhere

src/CliApp.php

@@ -313,13 +313,17 @@ protected function doHandle(array $args): int
     protected function initCommandFlags(string $command, $handler): FlagsParser
     {
         $cFlags = SFlags::new();
+        /** @var $config = COMMAND_CONFIG */
         $config = $this->metadata[$command] ?? [];
 
         $cFlags->setDesc($config['desc']);
         if (!empty($config['help'])) {
             $cFlags->setHelp($config['help']);
         }
 
+        // update script name.
+        $cFlags->setScriptName($cFlags->getScriptName() . ' ' . $command);
+
         $cFlags->addOptsByRules($config['options'] ?? []);
         $cFlags->addArgsByRules($config['arguments'] ?? []);
 

src/Concern/HelperRenderTrait.php

@@ -113,38 +113,11 @@ protected function doBuildHelp(array $argDefines, array $optDefines, bool $withC
         $hasOpts = count($optDefines) > 0;
 
         // ------- usage -------
-        $binName = $this->scriptName ?: FlagUtil::getBinName();
+        $binName = $this->getScriptName();
         if ($hasArgs || $hasOpts) {
             $buf->writeln("<ylw>Usage:</ylw> $binName [--Options ...] [Arguments ...]\n");
         }
 
-        // ------- args -------
-        $nameTag = 'info';
-        $fmtArgs = $this->buildArgsForHelp($argDefines);
-
-        if ($hasArgs) {
-            $buf->writeln('<ylw>Arguments:</ylw>');
-        }
-
-        $nameLen = $this->settings['argNameLen'];
-        foreach ($fmtArgs as $hName => $arg) {
-            [$desc, $lines] = $this->formatDesc($arg);
-
-            // write to buffer.
-            $hName = Str::padRight($hName, $nameLen);
-            $buf->writef("  <%s>%s</%s>    %s\n", $nameTag, $hName, $nameTag, $desc);
-
-            // remaining desc lines
-            if ($lines) {
-                $indent = Str::repeat(' ', $nameLen);
-                foreach ($lines as $line) {
-                    $buf->writef("      %s%s\n", $indent, $line);
-                }
-            }
-        }
-
-        $hasArgs && $buf->writeln('');
-
         // ------- opts -------
         if ($hasOpts) {
             $buf->writeln('<ylw>Options:</ylw>');
@@ -176,6 +149,33 @@ protected function doBuildHelp(array $argDefines, array $optDefines, bool $withC
             }
         }
 
+        $hasOpts && $buf->writeln('');
+
+        // ------- args -------
+        // $nameTag = 'info';
+        $fmtArgs = $this->buildArgsForHelp($argDefines);
+
+        if ($hasArgs) {
+            $buf->writeln('<ylw>Arguments:</ylw>');
+        }
+
+        $nameLen = $this->settings['argNameLen'];
+        foreach ($fmtArgs as $hName => $arg) {
+            [$desc, $lines] = $this->formatDesc($arg);
+
+            // write to buffer.
+            $hName = Str::padRight($hName, $nameLen);
+            $buf->writef("  <%s>%s</%s>    %s\n", $nameTag, $hName, $nameTag, $desc);
+
+            // remaining desc lines
+            if ($lines) {
+                $indent = Str::repeat(' ', $nameLen);
+                foreach ($lines as $line) {
+                    $buf->writef("      %s%s\n", $indent, $line);
+                }
+            }
+        }
+
         // --------------- extra: moreHelp, example -----------------
         if ($this->exampleHelp) {
             $buf->writeln("\n<ylw>Examples:</ylw>");

src/FlagsParser.php

@@ -699,7 +699,7 @@ public function setSettings(array $settings): void
      */
     public function getScriptName(): string
     {
-        return $this->scriptName;
+        return $this->scriptName ?: FlagUtil::getBinName();
     }
 
     /**