@softwarefactory-project/re-ansi 0.4.0 → 0.6.0

package/README.md

@@ -7,9 +7,11 @@ Ansi code to HTML
 re-ansi supports:
 
 * Cursor movement: `\n`, line erase and `\r` line erase
-* SGR parameter: italic and bold
+* SGR parameter: italic, bold, underline and line-through
 * 3/4 bits [color code][ansi-color-code]
 
+re-ansi removes styles on new lines, so that a `<br />` can't be nested inside `<span style>` elements.
+
 For details, see the `AnsiCode.parse` function.
 
 ## Install
@@ -79,27 +81,36 @@ 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`.
+
 ### 0.4.0
 
-- Add support for underline and line-through text decoration
-- Add support for lighter font style
+- Add support for underline and line-through text decoration.
+- Add support for lighter font style.
+- Add initial support for color reset.
 
 ### 0.3.0
 
-- Add unique keys to react list elements
-- Create a href elements for http links
+- Add unique keys to react list elements.
+- Create a href elements for http links.
 
 ### 0.2.1
 
-- Fix Ansi.parse to return the full document instead of the last line
+- Fix Ansi.parse to return the full document instead of the last line.
 
 ### 0.2.0
 
-- Fix a recursion limit in Ansi.parse for log bigger than 10MB
+- Fix a recursion limit in Ansi.parse for log bigger than 10MB.
 
 ### 0.1.3
 
-- Initial release
+- Initial release.
 
 [ansi-color-code]: https://en.wikipedia.org/wiki/ANSI_escape_code#3-bit_and_4-bit
 [reason-react]: https://reasonml.github.io/reason-react/docs/en/components

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@softwarefactory-project/re-ansi",
-  "version": "0.4.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 === /* Foreground */0) {
-    return Belt_Option.flatMap(fourBitColors(color._0), (function (color) {
-                  return {
-                          color: color
-                        };
-                }));
-  } else {
-    return Belt_Option.flatMap(fourBitColors(color._0), (function (background) {
-                  return {
-                          background: background
-                        };
-                }));
+  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
+                            };
+                    }));
+    
   }
 }
 
@@ -296,138 +333,154 @@ function parse(txt, pos) {
       var match$2 = codePoints.tl;
       if (!match$2) {
         return [
-                1,
-                undefined
+                length,
+                /* Clear */0
               ];
       }
       var style$2 = match$2.hd;
       var exit$2 = 0;
-      if (style$2 !== 48) {
-        if (style$2 !== 49) {
-          exit$2 = 5;
-        } else {
-          var match$3 = match$2.tl;
-          if (match$3) {
-            var match$4 = match$3.tl;
-            if (match$4 && !match$4.tl) {
-              colorMode = match$3.hd;
-              colorValue = match$4.hd;
-              xs = codePoints;
-              exit$1 = 2;
+      var exit$3 = 0;
+      var match$3 = match$2.tl;
+      if (match$3) {
+        if (match$3.hd === 75) {
+          return [
+                  4,
+                  /* EraseLine */1
+                ];
+        }
+        exit$3 = 6;
+      } else {
+        exit$3 = 6;
+      }
+      if (exit$3 === 6) {
+        var switcher = style$2 - 48 | 0;
+        if (switcher === 0 || switcher === 1) {
+          if (switcher !== 0) {
+            var match$4 = match$2.tl;
+            if (match$4) {
+              var match$5 = match$4.tl;
+              if (match$5 && !match$5.tl) {
+                colorMode = match$4.hd;
+                colorValue = match$5.hd;
+                xs = codePoints;
+                exit$1 = 2;
+              } else {
+                exit$2 = 5;
+              }
             } else {
               exit$2 = 5;
             }
           } else {
-            exit$2 = 5;
-          }
-        }
-      } else {
-        var match$5 = match$2.tl;
-        if (!match$5) {
-          return [
-                  length,
-                  /* Clear */0
-                ];
-        }
-        var style$3 = match$5.hd;
-        var exit$3 = 0;
-        if (style$3 !== 48) {
-          if (style$3 === 75) {
-            return [
-                    4,
-                    /* EraseLine */1
-                  ];
-          }
-          exit$3 = 6;
-        } else {
-          if (!match$5.tl) {
-            return [
-                    length,
-                    /* Clear */0
-                  ];
-          }
-          exit$3 = 6;
-        }
-        if (exit$3 === 6) {
-          var match$6 = match$5.tl;
-          if (match$6 && match$6.hd === 59) {
-            var match$7 = match$6.tl;
-            if (!match$7) {
+            var match$6 = match$2.tl;
+            if (!match$6) {
               return [
-                      1,
-                      undefined
+                      length,
+                      /* Clear */0
                     ];
             }
-            var match$8 = match$7.tl;
-            if (match$8) {
-              var match$9 = match$8.tl;
-              var colorValue$2 = match$8.hd;
-              var colorMode$2 = match$7.hd;
-              if (match$9) {
-                if (match$9.hd !== 59) {
-                  exit$2 = 5;
-                } else {
+            var style$3 = match$6.hd;
+            var exit$4 = 0;
+            if (style$3 !== 48) {
+              exit$4 = 7;
+            } else {
+              if (!match$6.tl) {
+                return [
+                        length,
+                        /* Clear */0
+                      ];
+              }
+              exit$4 = 7;
+            }
+            if (exit$4 === 7) {
+              var match$7 = match$6.tl;
+              if (match$7 && match$7.hd === 59) {
+                var match$8 = match$7.tl;
+                if (!match$8) {
+                  return [
+                          1,
+                          undefined
+                        ];
+                }
+                var match$9 = match$8.tl;
+                if (match$9) {
                   var match$10 = match$9.tl;
-                  if (!match$10) {
-                    return [
-                            1,
-                            undefined
-                          ];
-                  }
-                  var cm2$1 = match$10.hd;
-                  var match$11 = match$10.tl;
-                  if (match$11) {
-                    if (match$11.tl) {
-                      if (cm2$1 !== 49) {
-                        exit$2 = 5;
-                      } else {
-                        var match$12 = match$10.tl;
-                        var match$13 = match$12.tl;
-                        if (match$13.tl) {
-                          return [
-                                  1,
-                                  undefined
-                                ];
+                  var colorValue$2 = match$9.hd;
+                  var colorMode$2 = match$8.hd;
+                  if (match$10) {
+                    if (match$10.hd !== 59) {
+                      exit$2 = 5;
+                    } else {
+                      var match$11 = match$10.tl;
+                      if (!match$11) {
+                        return [
+                                1,
+                                undefined
+                              ];
+                      }
+                      var cm2$1 = match$11.hd;
+                      var match$12 = match$11.tl;
+                      if (match$12) {
+                        if (match$12.tl) {
+                          if (cm2$1 !== 49) {
+                            exit$2 = 5;
+                          } else {
+                            var match$13 = match$11.tl;
+                            var match$14 = match$13.tl;
+                            if (match$14.tl) {
+                              return [
+                                      1,
+                                      undefined
+                                    ];
+                            }
+                            style$1 = style$3;
+                            cm1 = colorMode$2;
+                            cv1 = colorValue$2;
+                            cm2 = match$13.hd;
+                            cv2 = match$14.hd;
+                            xs$1 = codePoints;
+                            exit$1 = 4;
+                          }
+                        } else {
+                          style$1 = style$3;
+                          cm1 = colorMode$2;
+                          cv1 = colorValue$2;
+                          cm2 = cm2$1;
+                          cv2 = match$12.hd;
+                          xs$1 = codePoints;
+                          exit$1 = 4;
                         }
-                        style$1 = style$3;
-                        cm1 = colorMode$2;
-                        cv1 = colorValue$2;
-                        cm2 = match$12.hd;
-                        cv2 = match$13.hd;
-                        xs$1 = codePoints;
-                        exit$1 = 4;
+                      } else {
+                        exit$2 = 5;
                       }
-                    } else {
-                      style$1 = style$3;
-                      cm1 = colorMode$2;
-                      cv1 = colorValue$2;
-                      cm2 = cm2$1;
-                      cv2 = match$11.hd;
-                      xs$1 = codePoints;
-                      exit$1 = 4;
                     }
                   } else {
-                    exit$2 = 5;
+                    colorMode$1 = colorMode$2;
+                    colorValue$1 = colorValue$2;
+                    style = style$3;
+                    exit$1 = 3;
                   }
+                } else {
+                  exit$2 = 5;
                 }
               } else {
-                colorMode$1 = colorMode$2;
-                colorValue$1 = colorValue$2;
-                style = style$3;
-                exit$1 = 3;
+                exit$2 = 5;
               }
-            } else {
-              exit$2 = 5;
             }
-          } else {
-            exit$2 = 5;
+            
           }
+        } else {
+          if (switcher === 27) {
+            return [
+                    3,
+                    /* EraseLine */1
+                  ];
+          }
+          exit$2 = 5;
         }
-        
       }
       if (exit$2 === 5) {
-        var match$14 = match$2.tl;
-        if (!match$14) {
+        var match$15 = match$2.tl;
+        if (!match$15) {
           return [
                   length,
                   Belt_Option.flatMap(get$1(style$2), (function (style) {
@@ -438,26 +491,26 @@ function parse(txt, pos) {
                         }))
                 ];
         }
-        var colorValue$3 = match$14.hd;
-        var exit$4 = 0;
-        var match$15 = match$14.tl;
-        if (match$15) {
-          if (match$15.hd !== 59) {
-            exit$4 = 6;
+        var colorValue$3 = match$15.hd;
+        var exit$5 = 0;
+        var match$16 = match$15.tl;
+        if (match$16) {
+          if (match$16.hd !== 59) {
+            exit$5 = 6;
           } else {
-            var match$16 = match$15.tl;
-            if (!match$16) {
+            var match$17 = match$16.tl;
+            if (!match$17) {
               return [
                       1,
                       undefined
                     ];
             }
-            if (match$16.tl) {
-              exit$4 = 6;
+            if (match$17.tl) {
+              exit$5 = 6;
             } else {
               colorMode$1 = style$2;
               colorValue$1 = colorValue$3;
-              style = match$16.hd;
+              style = match$17.hd;
               exit$1 = 3;
             }
           }
@@ -467,56 +520,56 @@ function parse(txt, pos) {
           xs = codePoints;
           exit$1 = 2;
         }
-        if (exit$4 === 6) {
+        if (exit$5 === 6) {
           if (colorValue$3 !== 59) {
             return [
                     1,
                     undefined
                   ];
           }
-          var match$17 = match$14.tl;
-          var match$18 = match$17.tl;
-          if (!match$18) {
+          var match$18 = match$15.tl;
+          var match$19 = match$18.tl;
+          if (!match$19) {
             return [
                     1,
                     undefined
                   ];
           }
-          var match$19 = match$18.tl;
-          var colorValue$4 = match$18.hd;
-          var colorMode$3 = match$17.hd;
-          if (match$19) {
-            if (match$19.hd !== 59) {
+          var match$20 = match$19.tl;
+          var colorValue$4 = match$19.hd;
+          var colorMode$3 = match$18.hd;
+          if (match$20) {
+            if (match$20.hd !== 59) {
               return [
                       1,
                       undefined
                     ];
             }
-            var match$20 = match$19.tl;
-            if (!match$20) {
+            var match$21 = match$20.tl;
+            if (!match$21) {
               return [
                       1,
                       undefined
                     ];
             }
-            var cm2$2 = match$20.hd;
-            var match$21 = match$20.tl;
-            if (!match$21) {
+            var cm2$2 = match$21.hd;
+            var match$22 = match$21.tl;
+            if (!match$22) {
               return [
                       1,
                       undefined
                     ];
             }
-            if (match$21.tl) {
+            if (match$22.tl) {
               if (cm2$2 !== 49) {
                 return [
                         1,
                         undefined
                       ];
               }
-              var match$22 = match$20.tl;
-              var match$23 = match$22.tl;
-              if (match$23.tl) {
+              var match$23 = match$21.tl;
+              var match$24 = match$23.tl;
+              if (match$24.tl) {
                 return [
                         1,
                         undefined
@@ -525,8 +578,8 @@ function parse(txt, pos) {
               style$1 = style$2;
               cm1 = colorMode$3;
               cv1 = colorValue$4;
-              cm2 = match$22.hd;
-              cv2 = match$23.hd;
+              cm2 = match$23.hd;
+              cv2 = match$24.hd;
               xs$1 = codePoints;
               exit$1 = 4;
             } else {
@@ -534,7 +587,7 @@ function parse(txt, pos) {
               cm1 = colorMode$3;
               cv1 = colorValue$4;
               cm2 = cm2$2;
-              cv2 = match$21.hd;
+              cv2 = match$22.hd;
               xs$1 = codePoints;
               exit$1 = 4;
             }
@@ -549,27 +602,14 @@ function parse(txt, pos) {
       }
       
     } else {
-      var match$24 = codePoints.tl;
-      if (!match$24) {
-        return [
-                1,
-                undefined
-              ];
-      }
-      if (match$24.hd !== 27) {
-        return [
-                1,
-                undefined
-              ];
-      }
-      var match$25 = match$24.tl;
+      var match$25 = codePoints.tl;
       if (!match$25) {
         return [
                 1,
                 undefined
               ];
       }
-      if (match$25.hd !== 91) {
+      if (match$25.hd !== 27) {
         return [
                 1,
                 undefined
@@ -582,7 +622,7 @@ function parse(txt, pos) {
                 undefined
               ];
       }
-      if (match$26.hd !== 49) {
+      if (match$26.hd !== 91) {
         return [
                 1,
                 undefined
@@ -595,7 +635,7 @@ function parse(txt, pos) {
                 undefined
               ];
       }
-      if (match$27.hd !== 65) {
+      if (match$27.hd !== 49) {
         return [
                 1,
                 undefined
@@ -608,7 +648,7 @@ function parse(txt, pos) {
                 undefined
               ];
       }
-      if (match$28.hd !== 27) {
+      if (match$28.hd !== 65) {
         return [
                 1,
                 undefined
@@ -621,14 +661,27 @@ function parse(txt, pos) {
                 undefined
               ];
       }
-      if (match$29.hd !== 91) {
+      if (match$29.hd !== 27) {
         return [
                 1,
                 undefined
               ];
       }
       var match$30 = match$29.tl;
-      if (match$30 && match$30.hd === 74) {
+      if (!match$30) {
+        return [
+                1,
+                undefined
+              ];
+      }
+      if (match$30.hd !== 91) {
+        return [
+                1,
+                undefined
+              ];
+      }
+      var match$31 = match$30.tl;
+      if (match$31 && match$31.hd === 74) {
         return [
                 9,
                 /* EraseLine */1
@@ -702,6 +755,7 @@ function parse(txt, pos) {
 
 var AnsiCode = {
   fourBitColors: fourBitColors,
+  threeBitColors: threeBitColors,
   combine: combine,
   addWeight: addWeight,
   addStyle: addStyle,
@@ -771,7 +825,7 @@ function parse$1(txt, length, pos) {
             
           }
         } else {
-          if (code.TAG === /* HRef */0) {
+          if (!code.TAG) {
             return [
                     pos$1,
                     {

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
@@ -174,12 +194,16 @@ module AnsiCode = {
       switch (codePoints) {
       // \n\x0d[1A\x0d[J
       | [10, 27, 91, 49, 65, 27, 91, 74, ..._] => (9, EraseLine->Some)
-      // [1K
-      | [91, 48, 75, ..._] => (4, EraseLine->Some)
+      // [_K
+      | [91, _, 75, ..._] => (4, EraseLine->Some)
+      // [K
+      | [91, 75, ..._] => (3, EraseLine->Some)
       // [00m
       | [91, 48, 48]
       // [0m
-      | [91, 48] => (length, Clear->Some)
+      | [91, 48]
+      // [m
+      | [91] => (length, Clear->Some)
       // [_m
       | [91, style] => (
           length,