feat: support parse nested color tags

Author: inhere

phpunit.xml.dist renamed to phpunit.xml

@@ -141,10 +141,11 @@ class Color extends ANSICode
         // option
         'b'              => '0;1',
         'bold'           => '0;1',
-        'fuzzy'          => '2',
+        'fuzzy'          => '0;2',
         'i'              => '0;3',
         'italic'         => '0;3',
-        'underscore'     => '4',
+        'us'             => '0;4',
+        'underscore'     => '0;4',
         'blink'          => '5',
         'reverse'        => '7',
         'concealed'      => '8',
@@ -292,12 +293,13 @@ public static function render(string $text, $style = null): string
      * parse color tag e.g: <info>message</info>
      *
      * @param string $text
+     * @param bool   $recursive
      *
      * @return string
      */
-    public static function parseTag(string $text): string
+    public static function parseTag(string $text, bool $recursive = false): string
     {
-        return ColorTag::parse($text);
+        return ColorTag::parse($text, $recursive);
     }
 
     /**

src/Color.php

@@ -12,6 +12,7 @@
 use Toolkit\Cli\Color;
 use function preg_match_all;
 use function preg_replace;
+use function preg_replace_callback;
 use function sprintf;
 use function str_replace;
 use function strpos;
@@ -27,7 +28,7 @@ class ColorTag
     public const STRIP_TAG = '/<[\/]?[a-zA-Z0-9=;]+>/';
 
     // Regex to match tags/
-    public const MATCH_TAG = '/<([a-zA-Z0-9=;_]+)>(.*?)<\/\\1>/s';
+    public const MATCH_TAG = '/<([a-zA-Z0-9=;_]+)>(.*)<\/\\1>/s';
 
     // color
     public const BLACK = 'black';
@@ -109,10 +110,11 @@ public static function matchAll(string $text): array
 
     /**
      * @param string $text
+     * @param bool   $recursive parse nested tags
      *
      * @return string
      */
-    public static function parse(string $text): string
+    public static function parse(string $text, bool $recursive = false): string
     {
         if (!$text || false === strpos($text, '</')) {
             return $text;
@@ -123,24 +125,41 @@ public static function parse(string $text): string
             return self::strip($text);
         }
 
-        // match color tags
-        if (!$matches = self::matchAll($text)) {
-            return $text;
-        }
+        return self::pregReplaceTags($text, $recursive);
+    }
 
-        foreach ((array)$matches[0] as $i => $m) {
-            $key = $matches[1][$i];
+    /**
+     * @param string $text
+     * @param bool   $recursive
+     *
+     * @return string
+     */
+    public static function pregReplaceTags(string $text, bool $recursive = false): string
+    {
+        return preg_replace_callback(self::MATCH_TAG, static function (array $match) use ($recursive) {
+            $colorCode = '';
+            $tagName   = $match[1];
+
+            if (isset(Color::STYLES[$tagName])) {
+                $colorCode = Color::STYLES[$tagName];
+            } elseif (strpos($tagName, '=')) {
+                $colorCode = Color::stringToCode($tagName);
+            }
 
-            if (isset(Color::STYLES[$key])) {
-                $text = self::replaceColor($text, $key, $matches[2][$i], Color::STYLES[$key]);
+            // enhance: support parse nested tags
+            $body = $match[2];
+            if ($recursive && false !== strpos($body, '</')) {
+                $body = self::pregReplaceTags($body, $recursive);
+            }
 
-                /** Custom style format @see Color::stringToCode() */
-            } elseif (strpos($key, '=')) {
-                $text = self::replaceColor($text, $key, $matches[2][$i], Color::stringToCode($key));
+            // wrap body with color codes
+            if ($colorCode) {
+                return sprintf("\033[%sm%s\033[0m", $colorCode, $body);
             }
-        }
 
-        return $text;
+            // return raw contents.
+            return $match[0];
+        }, $text);
     }
 
     /**

src/Color/ColorTag.php

@@ -12,6 +12,8 @@
 use PHPUnit\Framework\TestCase;
 use Toolkit\Cli\Color;
 use Toolkit\Cli\ColorTag;
+use function vdump;
+use const PHP_EOL;
 
 /**
  * Class ColorTagTest
@@ -80,8 +82,26 @@ public function testParse(): void
         Color::setForceColor(true);
 
         $text = ColorTag::parse('<info>INFO</info>');
+        echo $text, PHP_EOL;
         $this->assertSame("\033[0;32mINFO\033[0m", $text);
 
+        // nested Tags
+        $text = ColorTag::parse('<info>INFO <cyan>CYAN</cyan></info>');
+        echo $text, PHP_EOL;
+        $this->assertSame("\033[0;32mINFO <cyan>CYAN</cyan>\033[0m", $text);
+
+        Color::resetConfig();
+    }
+
+    public function testParseNestTag(): void
+    {
+        Color::setForceColor(true);
+
+        // nested Tags
+        $text = ColorTag::parse('<info>INFO <cyan>CYAN mess</cyan>age</info>', true);
+        echo $text, PHP_EOL;
+        $this->assertSame("\033[0;32mINFO \033[0;36mCYAN mess\033[0mage\033[0m", $text);
+
         Color::resetConfig();
     }
 }