chore: update some style, add some util methods

inhere · Nov 5, 2021 · 466ddff · 466ddff
1 parent af72751
commit 466ddff
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 8 deletions.
diff --git a/app/Console/Command/ExprCommand.php b/app/Console/Command/ExprCommand.php
@@ -103,18 +103,18 @@ public function getFunctions(): array
      * @options
      *  -i, --interactive     bool;Start an interactive shell environment
      *
+     * @param Input  $input
+     * @param Output $output
+     *
+     * @return int
+     * @throws Throwable
      * @example
      *  <code>$ {binWithCmd} -i</code>
      *  Expr > 45 + 45
      *  90
      *  Expr > ret * 2
      *  180
      *
-     * @param Input  $input
-     * @param Output $output
-     *
-     * @return int
-     * @throws Throwable
      */
     protected function execute(Input $input, Output $output): int
     {

diff --git a/app/Helper/KiteUtil.php b/app/Helper/KiteUtil.php
@@ -7,13 +7,38 @@
 use Toolkit\Stdlib\OS;
 use Toolkit\Stdlib\Str;
 use function dirname;
+use function in_array;
 use function is_file;
 
 /**
  * class KiteUtil
  */
 class KiteUtil
 {
+    public const STDIN_ALIAS = ['@i','@stdin',];
+    public const STDOUT_ALIAS = ['@o','@stdout',];
+
+    public const CLIPBOARD_ALIAS = ['@c','@cb','@clip','@clipboard',];
+
+    /**
+     * @param string $str
+     *
+     * @return bool
+     */
+    public static function isStdinAlias(string $str): bool
+    {
+        return in_array($str, self::CLIPBOARD_ALIAS, true);
+    }
+
+    /**
+     * @param string $str
+     *
+     * @return bool
+     */
+    public static function isClipboardAlias(string $str): bool
+    {
+        return in_array($str, self::CLIPBOARD_ALIAS, true);
+    }
 
     /**
      * @param string $path

diff --git a/app/Lib/Generate/AbstractJsonToCode.php b/app/Lib/Generate/AbstractJsonToCode.php
@@ -234,9 +234,13 @@ protected function readSourceFromFile(): string
         // check from tplDir
         if ($this->tplDir && !is_file($tplFile)) {
             $tplDir  = $this->resolvePath($this->tplDir);
-            $tplFile = File::joinPath($tplDir, $tplFile);
+            $dirFile = File::joinPath($tplDir, $tplFile);
 
-            File::assertIsFile($tplFile);
+            if (!is_file($dirFile)) {
+                throw new InvalidArgumentException("No such file: $tplFile");
+            }
+
+            $tplFile = $dirFile;
         }
 
         return File::readAll($tplFile);

diff --git a/app/Lib/Stream/ListStream.php b/app/Lib/Stream/ListStream.php
@@ -65,6 +65,21 @@ public function eachTo(callable $func, BaseStream $new): BaseStream
         return $new;
     }
 
+    /**
+     * @param callable(array): array $func
+     *
+     * @return array
+     */
+    public function eachToArray(callable $func): array
+    {
+        $arr = [];
+        foreach ($this as $item) {
+            $arr[] = $func($item);
+        }
+
+        return $arr;
+    }
+
     /**
      * @param callable(array): array $func
      * @param MapStream $new

diff --git a/config/config.cli.php b/config/config.cli.php
@@ -30,7 +30,7 @@
     ],
     // @see app/Console/Controller/PhpController.php
     'php:serve'      => [
-        'hce-file' => 'test/clienttest/http-client.env.json',
+        'hce-file' => 'test/httptest/http-client.env.json',
         'hce-env'  => getenv('APP_ENV') ?: 'development',
         // 'entry'     => 'public/index.php',
         // document root