Merge pull request #477 from wolfadex/wolfadex/switch-ansi-package

Move from vito/elm-ansi to wolfadex/elm-ansi
dillonkearns · Dec 5, 2024 · 336a7f1 · 336a7f1
2 parents 4dea7ea + 1fde2b8
commit 336a7f1
Show file tree

Hide file tree

Showing 20 changed files with 66 additions and 62 deletions.
diff --git a/elm.json b/elm.json
@@ -77,7 +77,7 @@
         "robinheghan/fnv1a": "1.0.0 <= v < 2.0.0",
         "rtfeldman/elm-css": "18.0.0 <= v < 19.0.0",
         "the-sett/elm-syntax-dsl": "6.0.2 <= v < 7.0.0",
-        "vito/elm-ansi": "10.0.1 <= v < 11.0.0"
+        "wolfadex/elm-ansi": "3.0.0 <= v < 4.0.0"
     },
     "test-dependencies": {
         "avh4/elm-program-test": "4.0.0 <= v < 5.0.0",

diff --git a/examples/base-path/elm.json b/examples/base-path/elm.json
@@ -46,7 +46,7 @@
             "the-sett/elm-syntax-dsl": "6.0.2",
             "tripokey/elm-fuzzy": "5.2.1",
             "turboMaCk/non-empty-list-alias": "1.4.0",
-            "vito/elm-ansi": "10.0.1",
+            "wolfadex/elm-ansi": "3.0.0",
             "zwilias/json-decode-exploration": "6.0.0"
         },
         "indirect": {

diff --git a/examples/blog-engine/elm.json b/examples/blog-engine/elm.json
@@ -50,7 +50,7 @@
             "the-sett/elm-pretty-printer": "3.1.0",
             "the-sett/elm-syntax-dsl": "6.0.2",
             "turboMaCk/non-empty-list-alias": "1.4.0",
-            "vito/elm-ansi": "10.0.1"
+            "wolfadex/elm-ansi": "3.0.0"
         },
         "indirect": {
             "Chadtech/elm-bool-extra": "2.4.2",

diff --git a/examples/blog-engine/script/elm.json b/examples/blog-engine/script/elm.json
@@ -44,7 +44,7 @@
             "the-sett/elm-syntax-dsl": "6.0.3",
             "tripokey/elm-fuzzy": "5.2.1",
             "turboMaCk/non-empty-list-alias": "1.4.0",
-            "vito/elm-ansi": "10.0.1",
+            "wolfadex/elm-ansi": "3.0.0",
             "zwilias/json-decode-exploration": "6.0.0"
         },
         "indirect": {

diff --git a/examples/docs/elm.json b/examples/docs/elm.json
@@ -48,7 +48,7 @@
             "the-sett/elm-pretty-printer": "3.1.0",
             "the-sett/elm-syntax-dsl": "6.0.2",
             "turboMaCk/non-empty-list-alias": "1.4.0",
-            "vito/elm-ansi": "10.0.1"
+            "wolfadex/elm-ansi": "3.0.0"
         },
         "indirect": {
             "Chadtech/elm-bool-extra": "2.4.2",

diff --git a/examples/end-to-end/elm.json b/examples/end-to-end/elm.json
@@ -49,7 +49,7 @@
             "the-sett/elm-pretty-printer": "3.1.0",
             "the-sett/elm-syntax-dsl": "6.0.2",
             "turboMaCk/non-empty-list-alias": "1.4.0",
-            "vito/elm-ansi": "10.0.1",
+            "wolfadex/elm-ansi": "3.0.0",
             "ymtszw/elm-xml-decode": "3.2.1"
         },
         "indirect": {

diff --git a/examples/end-to-end/script/elm.json b/examples/end-to-end/script/elm.json
@@ -36,7 +36,7 @@
             "robinheghan/fnv1a": "1.0.0",
             "rtfeldman/elm-css": "18.0.0",
             "the-sett/elm-syntax-dsl": "6.0.2",
-            "vito/elm-ansi": "10.0.1"
+            "wolfadex/elm-ansi": "3.0.0"
         },
         "indirect": {
             "Chadtech/elm-bool-extra": "2.4.2",

diff --git a/examples/escaping/codegen/elm.json b/examples/escaping/codegen/elm.json
@@ -44,7 +44,7 @@
             "the-sett/elm-syntax-dsl": "6.0.3",
             "tripokey/elm-fuzzy": "5.2.1",
             "turboMaCk/non-empty-list-alias": "1.4.0",
-            "vito/elm-ansi": "10.0.1",
+            "wolfadex/elm-ansi": "3.0.0",
             "zwilias/json-decode-exploration": "6.0.0"
         },
         "indirect": {

diff --git a/examples/escaping/elm.json b/examples/escaping/elm.json
@@ -46,7 +46,7 @@
             "the-sett/elm-syntax-dsl": "6.0.2",
             "tripokey/elm-fuzzy": "5.2.1",
             "turboMaCk/non-empty-list-alias": "1.4.0",
-            "vito/elm-ansi": "10.0.1",
+            "wolfadex/elm-ansi": "3.0.0",
             "zwilias/json-decode-exploration": "6.0.0"
         },
         "indirect": {

diff --git a/examples/escaping/script/elm.json b/examples/escaping/script/elm.json
@@ -44,7 +44,7 @@
             "the-sett/elm-syntax-dsl": "6.0.2",
             "tripokey/elm-fuzzy": "5.2.1",
             "turboMaCk/non-empty-list-alias": "1.4.0",
-            "vito/elm-ansi": "10.0.1",
+            "wolfadex/elm-ansi": "3.0.0",
             "zwilias/json-decode-exploration": "6.0.0"
         },
         "indirect": {

diff --git a/examples/hackernews/elm.json b/examples/hackernews/elm.json
@@ -47,7 +47,7 @@
             "the-sett/elm-syntax-dsl": "6.0.2",
             "tripokey/elm-fuzzy": "5.2.1",
             "turboMaCk/non-empty-list-alias": "1.3.1",
-            "vito/elm-ansi": "10.0.1",
+            "wolfadex/elm-ansi": "3.0.0",
             "zwilias/json-decode-exploration": "6.0.0"
         },
         "indirect": {

diff --git a/examples/hello/elm.json b/examples/hello/elm.json
@@ -38,7 +38,7 @@
             "robinheghan/fnv1a": "1.0.0",
             "rtfeldman/elm-iso8601-date-strings": "1.1.4",
             "turboMaCk/non-empty-list-alias": "1.3.1",
-            "vito/elm-ansi": "10.0.1"
+            "wolfadex/elm-ansi": "3.0.0"
         },
         "indirect": {
             "elm/file": "1.0.5",

diff --git a/examples/pokedex/elm.json b/examples/pokedex/elm.json
@@ -49,7 +49,7 @@
             "the-sett/elm-syntax-dsl": "6.0.2",
             "tripokey/elm-fuzzy": "5.2.1",
             "turboMaCk/non-empty-list-alias": "1.4.0",
-            "vito/elm-ansi": "10.0.1",
+            "wolfadex/elm-ansi": "3.0.0",
             "zwilias/json-decode-exploration": "6.0.0"
         },
         "indirect": {

diff --git a/examples/routing/elm.json b/examples/routing/elm.json
@@ -43,7 +43,7 @@
             "the-sett/elm-pretty-printer": "3.1.0",
             "the-sett/elm-syntax-dsl": "6.0.3",
             "turboMaCk/non-empty-list-alias": "1.4.0",
-            "vito/elm-ansi": "10.0.1"
+            "wolfadex/elm-ansi": "3.0.0"
         },
         "indirect": {
             "Chadtech/elm-bool-extra": "2.4.2",

diff --git a/examples/smoothies/elm.json b/examples/smoothies/elm.json
@@ -47,7 +47,7 @@
             "rtfeldman/elm-iso8601-date-strings": "1.1.4",
             "tripokey/elm-fuzzy": "5.2.1",
             "turboMaCk/non-empty-list-alias": "1.3.1",
-            "vito/elm-ansi": "10.0.1",
+            "wolfadex/elm-ansi": "3.0.0",
             "zwilias/json-decode-exploration": "6.0.0"
         },
         "indirect": {

diff --git a/examples/todos/elm.json b/examples/todos/elm.json
@@ -48,7 +48,7 @@
             "the-sett/elm-pretty-printer": "3.1.0",
             "the-sett/elm-syntax-dsl": "6.0.2",
             "turboMaCk/non-empty-list-alias": "1.4.0",
-            "vito/elm-ansi": "10.0.1"
+            "wolfadex/elm-ansi": "3.0.0"
         },
         "indirect": {
             "Chadtech/elm-bool-extra": "2.4.2",

diff --git a/examples/trails/elm.json b/examples/trails/elm.json
@@ -44,7 +44,7 @@
             "rtfeldman/elm-iso8601-date-strings": "1.1.4",
             "tripokey/elm-fuzzy": "5.2.1",
             "turboMaCk/non-empty-list-alias": "1.3.1",
-            "vito/elm-ansi": "10.0.1",
+            "wolfadex/elm-ansi": "3.0.0",
             "zwilias/json-decode-exploration": "6.0.0"
         },
         "indirect": {

diff --git a/generator/template/elm.json b/generator/template/elm.json
@@ -38,7 +38,7 @@
             "rtfeldman/elm-css": "18.0.0",
             "the-sett/elm-syntax-dsl": "6.0.2",
             "turboMaCk/non-empty-list-alias": "1.4.0",
-            "vito/elm-ansi": "10.0.1"
+            "wolfadex/elm-ansi": "3.0.0"
         },
         "indirect": {
             "Chadtech/elm-bool-extra": "2.4.2",

diff --git a/generator/template/script/elm.json b/generator/template/script/elm.json
@@ -50,7 +50,7 @@
             "stil4m/structured-writer": "1.0.3",
             "the-sett/elm-pretty-printer": "3.1.0",
             "the-sett/elm-syntax-dsl": "6.0.2",
-            "vito/elm-ansi": "10.0.1"
+            "wolfadex/elm-ansi": "3.0.0"
         }
     },
     "test-dependencies": {

diff --git a/src/TerminalText.elm b/src/TerminalText.elm
@@ -17,7 +17,8 @@ module TerminalText exposing
     , yellow
     )
 
-import Ansi
+import Ansi.Color
+import Ansi.Parser
 import Json.Encode as Encode
 
 
@@ -32,27 +33,27 @@ text value =
 
 cyan : String -> Text
 cyan inner =
-    Style { blankStyle | color = Just Ansi.Cyan } inner
+    Style { blankStyle | color = Just Ansi.Color.Cyan } inner
 
 
 green : String -> Text
 green inner =
-    Style { blankStyle | color = Just Ansi.Green } inner
+    Style { blankStyle | color = Just Ansi.Color.Green } inner
 
 
 yellow : String -> Text
 yellow inner =
-    Style { blankStyle | color = Just Ansi.Yellow } inner
+    Style { blankStyle | color = Just Ansi.Color.Yellow } inner
 
 
 red : String -> Text
 red inner =
-    Style { blankStyle | color = Just Ansi.Red } inner
+    Style { blankStyle | color = Just Ansi.Color.Red } inner
 
 
 blue : String -> Text
 blue inner =
-    Style { blankStyle | color = Just Ansi.Blue } inner
+    Style { blankStyle | color = Just Ansi.Color.Blue } inner
 
 
 resetColors : String
@@ -70,23 +71,23 @@ ansiPrefix =
     "\u{001B}"
 
 
-colorToString : Ansi.Color -> String
+colorToString : Ansi.Color.Color -> String
 colorToString color =
     ansi <|
         case color of
-            Ansi.Red ->
+            Ansi.Color.Red ->
                 "[31m"
 
-            Ansi.Blue ->
+            Ansi.Color.Blue ->
                 "[34m"
 
-            Ansi.Green ->
+            Ansi.Color.Green ->
                 "[32m"
 
-            Ansi.Yellow ->
+            Ansi.Color.Yellow ->
                 "[33m"
 
-            Ansi.Cyan ->
+            Ansi.Color.Cyan ->
                 "[36m"
 
             _ ->
@@ -104,7 +105,7 @@ toString list =
 toString_ : Text -> String
 toString_ (Style ansiStyle innerText) =
     String.concat
-        [ ansiStyle.color |> Maybe.withDefault Ansi.White |> colorToString
+        [ ansiStyle.color |> Maybe.withDefault Ansi.Color.White |> colorToString
         , innerText
         , resetColors
         ]
@@ -119,15 +120,15 @@ toPlainString list =
 
 fromAnsiString : String -> List Text
 fromAnsiString ansiString =
-    Ansi.parseInto ( blankStyle, [] ) parseInto ansiString
+    Ansi.Parser.parseInto ( blankStyle, [] ) parseInto ansiString
         |> Tuple.second
         |> List.reverse
 
 
 type alias AnsiStyle =
     { bold : Bool
     , underline : Bool
-    , color : Maybe Ansi.Color
+    , color : Maybe Ansi.Color.Color
     }
 
 
@@ -139,16 +140,16 @@ blankStyle =
     }
 
 
-parseInto : Ansi.Action -> ( AnsiStyle, List Text ) -> ( AnsiStyle, List Text )
+parseInto : Ansi.Parser.Command -> ( AnsiStyle, List Text ) -> ( AnsiStyle, List Text )
 parseInto action ( pendingStyle, soFar ) =
     case action of
-        Ansi.Print string ->
+        Ansi.Parser.Text string ->
             ( blankStyle, Style pendingStyle string :: soFar )
 
-        Ansi.Remainder _ ->
+        Ansi.Parser.Remainder _ ->
             ( pendingStyle, soFar )
 
-        Ansi.SetForeground maybeColor ->
+        Ansi.Parser.SetForeground maybeColor ->
             case maybeColor of
                 Just newColor ->
                     ( { pendingStyle
@@ -160,22 +161,22 @@ parseInto action ( pendingStyle, soFar ) =
                 Nothing ->
                     ( blankStyle, soFar )
 
-        Ansi.SetBold bool ->
+        Ansi.Parser.SetBold bool ->
             ( { pendingStyle | bold = bool }, soFar )
 
-        Ansi.SetFaint _ ->
+        Ansi.Parser.SetFaint _ ->
             ( pendingStyle, soFar )
 
-        Ansi.SetItalic _ ->
+        Ansi.Parser.SetItalic _ ->
             ( pendingStyle, soFar )
 
-        Ansi.SetUnderline bool ->
+        Ansi.Parser.SetUnderline bool ->
             ( { pendingStyle | underline = bool }, soFar )
 
-        Ansi.SetBackground _ ->
+        Ansi.Parser.SetBackground _ ->
             ( pendingStyle, soFar )
 
-        Ansi.Linebreak ->
+        Ansi.Parser.Linebreak ->
             case soFar of
                 next :: rest ->
                     ( pendingStyle, Style blankStyle "\n" :: next :: rest )
@@ -194,56 +195,59 @@ encoder (Style ansiStyle string) =
         , ( "underline", Encode.bool ansiStyle.underline )
         , ( "color"
           , Encode.string <|
-                case ansiStyle.color |> Maybe.withDefault Ansi.White of
-                    Ansi.Red ->
+                case ansiStyle.color |> Maybe.withDefault Ansi.Color.White of
+                    Ansi.Color.Red ->
                         "red"
 
-                    Ansi.Blue ->
+                    Ansi.Color.Blue ->
                         "blue"
 
-                    Ansi.Green ->
+                    Ansi.Color.Green ->
                         "green"
 
-                    Ansi.Yellow ->
+                    Ansi.Color.Yellow ->
                         "yellow"
 
-                    Ansi.Cyan ->
+                    Ansi.Color.Cyan ->
                         "cyan"
 
-                    Ansi.Black ->
+                    Ansi.Color.Black ->
                         "black"
 
-                    Ansi.Magenta ->
+                    Ansi.Color.Magenta ->
                         "magenta"
 
-                    Ansi.White ->
+                    Ansi.Color.White ->
                         "white"
 
-                    Ansi.BrightBlack ->
+                    Ansi.Color.BrightBlack ->
                         "BLACK"
 
-                    Ansi.BrightRed ->
+                    Ansi.Color.BrightRed ->
                         "RED"
 
-                    Ansi.BrightGreen ->
+                    Ansi.Color.BrightGreen ->
                         "GREEN"
 
-                    Ansi.BrightYellow ->
+                    Ansi.Color.BrightYellow ->
                         "YELLOW"
 
-                    Ansi.BrightBlue ->
+                    Ansi.Color.BrightBlue ->
                         "BLUE"
 
-                    Ansi.BrightMagenta ->
+                    Ansi.Color.BrightMagenta ->
                         "MAGENTA"
 
-                    Ansi.BrightCyan ->
+                    Ansi.Color.BrightCyan ->
                         "CYAN"
 
-                    Ansi.BrightWhite ->
+                    Ansi.Color.BrightWhite ->
                         "WHITE"
 
-                    Ansi.Custom _ _ _ ->
+                    Ansi.Color.Custom256 _ ->
+                        ""
+
+                    Ansi.Color.CustomTrueColor _ ->
                         ""
           )
         , ( "string", Encode.string string )