chore: update some for cli json render

inhere · Nov 1, 2021 · 8c5eb38 · 8c5eb38
1 parent 907e556
commit 8c5eb38
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 7 deletions.
diff --git a/src/Component/Formatter/JSONPretty.php b/src/Component/Formatter/JSONPretty.php
@@ -23,6 +23,7 @@
 use function str_contains;
 use function str_ends_with;
 use function trim;
+use function vdump;
 
 /**
  * class JSONPretty
@@ -36,6 +37,21 @@ class JSONPretty extends AbstractObj
         'boolVal' => 'red',
     ];
 
+    public const THEME_ONE = [
+        'keyName' => 'blue',
+        'strVal'  => 'cyan',
+        'intVal'  => 'red',
+        'boolVal' => 'green',
+    ];
+
+    // json.cn
+    public const THEME_TWO = [
+        'keyName' => 'mga1',
+        'strVal'  => 'info',
+        'intVal'  => 'hiBlue',
+        'boolVal' => 'red',
+    ];
+
     /**
      * @var array{keyName: string, strVal: string, intVal: string, boolVal: string}
      */
@@ -91,16 +107,16 @@ public function renderData(array $data): string
                 $val = rtrim($val, ',');
             }
 
-            // bool val
-            if ($val === 'true' || $val === 'false') {
+            // NULL or BOOL val
+            if ($val === 'null' || $val === 'true' || $val === 'false') {
                 $val = ColorTag::wrap($val, $this->theme['boolVal']);
             } elseif (is_numeric($val)) { // number
                 $val = ColorTag::wrap($val, $this->theme['intVal']);
             } else { // string
                 $val = ColorTag::wrap($val, $this->theme['strVal']);
             }
 
-            $buf->writeln($key . ': ' . $val . ($hasEndComma ?  ',' : ''));
+            $buf->writeln($key . ': ' . $val . ($hasEndComma ? ',' : ''));
         }
 
         return $buf->getAndClear();

diff --git a/src/Concern/CommandHelpTrait.php b/src/Concern/CommandHelpTrait.php
@@ -88,7 +88,7 @@ protected function setCommentsVar(string $name, $value): void
     public function parseCommentsVars(string $str): string
     {
         // not use vars
-        if (false === strpos($str, self::HELP_VAR_LEFT)) {
+        if (!str_contains($str, self::HELP_VAR_LEFT)) {
             return $str;
         }
 

diff --git a/src/Concern/FormatOutputAwareTrait.php b/src/Concern/FormatOutputAwareTrait.php
@@ -13,6 +13,7 @@
 use Toolkit\Stdlib\Helper\JsonHelper;
 use Toolkit\Stdlib\Php;
 use function array_merge;
+use function count;
 use function json_encode;
 
 /**
@@ -36,6 +37,20 @@ public function write($messages, $nl = true, $quit = false, array $opts = []): i
         ], $opts));
     }
 
+    // public function print(...$args): void
+    // {
+    //     if (count($args) > 1) {
+    //         echo ;
+    //     }
+    //
+    //
+    // }
+    //
+    // public function echo(...$args): void
+    // {
+    //     Console::printf($format, ...$args);
+    // }
+
     /**
      * @param string $format
      * @param mixed  ...$args
@@ -56,7 +71,7 @@ public function printf(string $format, ...$args): void
 
     /**
      * @param string|mixed $text
-     * @param bool         $quit
+     * @param bool|int     $quit
      * @param array        $opts
      *
      * @return int
@@ -130,14 +145,14 @@ public function prettyJSON($data, string $title = 'JSON:'): void
      */
     public function dump(...$vars): void
     {
-        Console::write(Php::dumpVars(...$vars));
+        Console::writeRaw(Php::dumpVars(...$vars));
     }
 
     /**
      * @param mixed ...$vars
      */
     public function prints(...$vars): void
     {
-        Console::write(Php::printVars(...$vars));
+        Console::writeRaw(Php::printVars(...$vars));
     }
 }