@softwarefactory-project/re-ansi 0.5.0 → 0.6.0

package/README.md

@@ -81,6 +81,10 @@ Make sure to read about [React][reason-react] and [Reason][rescript-lang] too.
 
 ## Changes
 
+### 0.6.0
+
+- Fix support for bright colors.
+
 ### 0.5.0
 
 - Add support for `[m` and `[K`.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@softwarefactory-project/re-ansi",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "description": "ANSI code to HTML",
   "files": ["README.md", "LICENSE", "bsconfig.json", "src"],
   "main": "./src/Ansi.bs.js",

package/src/Ansi.bs.js

@@ -50,6 +50,30 @@ function fourBitColors(code) {
   }
 }
 
+function threeBitColors(code) {
+  switch (code) {
+    case 0 :
+        return "grey";
+    case 1 :
+        return "red";
+    case 2 :
+        return "green";
+    case 3 :
+        return "yellow";
+    case 4 :
+        return "blue";
+    case 5 :
+        return "magenta";
+    case 6 :
+        return "cyan";
+    case 7 :
+        return "white";
+    default:
+      console.log("Unknown color value:", code);
+      return ;
+  }
+}
+
 function combine(css1, css2) {
   return Object.assign({}, css1, css2);
 }
@@ -78,10 +102,15 @@ function int_of_cp(c) {
 
 function getColorStyle(colorMode, colorValue) {
   switch (colorMode) {
+    case 3 :
+        return {
+                TAG: /* Foreground */0,
+                _0: colorValue
+              };
     case 0 :
     case 4 :
         return {
-                TAG: /* Background */1,
+                TAG: /* Background */2,
                 _0: colorValue
               };
     case 1 :
@@ -91,10 +120,9 @@ function getColorStyle(colorMode, colorValue) {
     case 7 :
     case 8 :
         break;
-    case 3 :
     case 9 :
         return {
-                TAG: /* Foreground */0,
+                TAG: /* BrightForeground */1,
                 _0: colorValue
               };
     default:
@@ -105,18 +133,27 @@ function getColorStyle(colorMode, colorValue) {
 }
 
 function getColorStyleCss(color) {
-  if (color.TAG) {
-    return Belt_Option.flatMap(fourBitColors(color._0), (function (background) {
-                  return {
-                          background: background
-                        };
-                }));
-  } else {
-    return Belt_Option.flatMap(fourBitColors(color._0), (function (color) {
-                  return {
-                          color: color
-                        };
-                }));
+  switch (color.TAG | 0) {
+    case /* Foreground */0 :
+        return Belt_Option.flatMap(fourBitColors(color._0), (function (color) {
+                      return {
+                              color: color
+                            };
+                    }));
+    case /* BrightForeground */1 :
+        return Belt_Option.flatMap(threeBitColors(color._0), (function (color) {
+                      return {
+                              color: color,
+                              fontWeight: "bold"
+                            };
+                    }));
+    case /* Background */2 :
+        return Belt_Option.flatMap(fourBitColors(color._0), (function (background) {
+                      return {
+                              background: background
+                            };
+                    }));
+    
   }
 }
 
@@ -718,6 +755,7 @@ function parse(txt, pos) {
 
 var AnsiCode = {
   fourBitColors: fourBitColors,
+  threeBitColors: threeBitColors,
   combine: combine,
   addWeight: addWeight,
   addStyle: addStyle,

package/src/Ansi.re

@@ -59,6 +59,21 @@ module AnsiCode = {
       None;
     };
 
+  let threeBitColors = (code: int): option(string) =>
+    switch (code) {
+    | 00 => "grey"->Some
+    | 01 => "red"->Some
+    | 02 => "green"->Some
+    | 03 => "yellow"->Some
+    | 04 => "blue"->Some
+    | 05 => "magenta"->Some
+    | 06 => "cyan"->Some
+    | 07 => "white"->Some
+    | _ =>
+      Js.log2("Unknown color value:", code);
+      None;
+    };
+
   // Css utility
   let combine = (css1, css2) => ReactDOM.Style.combine(css1, css2);
   let addWeight = fontWeight => ReactDOM.Style.make(~fontWeight, ());
@@ -70,11 +85,12 @@ module AnsiCode = {
   module ColorCss = {
     type t =
       | Foreground(int)
+      | BrightForeground(int)
       | Background(int);
     let getColorStyle = (colorMode: int, colorValue: int): option(t) =>
       switch (colorMode) {
-      | 3
-      | 9 => colorValue->Foreground->Some
+      | 3 => colorValue->Foreground->Some
+      | 9 => colorValue->BrightForeground->Some
       | 4
       | 0 => colorValue->Background->Some
       | _ =>
@@ -88,6 +104,10 @@ module AnsiCode = {
         v
         ->fourBitColors
         ->Option.flatMap(color => ReactDOM.Style.make(~color, ())->Some)
+      | BrightForeground(v) =>
+        v
+        ->threeBitColors
+        ->Option.flatMap(color => ReactDOM.Style.make(~color, ~fontWeight="bold", ())->Some)
       | Background(v) =>
         v
         ->fourBitColors