Simplify pattern matching

pinata-llc · May 15, 2024 · f4564de · f4564de
1 parent 3c7bf04
commit f4564de
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 21 deletions.
diff --git a/elm.json b/elm.json
@@ -7,6 +7,7 @@
     "dependencies": {
         "direct": {
             "Garados007/elm-svg-parser": "1.0.0",
+            "elm-community/maybe-extra": "5.3.0",
             "elm/core": "1.0.4",
             "elm/json": "1.1.3",
             "elm/regex": "1.0.0",
@@ -27,4 +28,4 @@
         "direct": {},
         "indirect": {}
     }
-}
+}
diff --git a/src/Svg2Elm/Generator.elm b/src/Svg2Elm/Generator.elm
@@ -3,6 +3,7 @@ module Svg2Elm.Generator exposing (compileFunction)
 import Regex
 import String.Case exposing (toCamelCaseLower)
 import SvgParser exposing (SvgAttribute, SvgNode(..), parseToNode)
+import Maybe.Extra as Maybe
 
 
 quote : String -> String
@@ -49,26 +50,14 @@ compileChildren mbKey children =
 
 compileNode : Maybe String -> Bool -> SvgNode -> String
 compileNode mbKey attrs node =
-    case ( node, mbKey ) of
-        ( SvgElement { name, attributes, children }, Just key ) ->
+    case node of
+        SvgElement { name, attributes, children } ->
             String.concat
-                [ "Svg.Keyed.node "
-                , quote name
-                , " (["
-                , compileAttributes attributes
-                , if attrs then
-                    "] ++ attrs) "
+                [ if Maybe.isJust mbKey then
+                    "Svg.Keyed.node "
 
                   else
-                    "]) "
-                , "["
-                , compileChildren (Just key) children
-                , "]"
-                ]
-
-        ( SvgElement { name, attributes, children }, Nothing ) ->
-            String.concat
-                [ "Svg.node "
+                    "Svg.node "
                 , quote name
                 , " (["
                 , compileAttributes attributes
@@ -78,14 +67,14 @@ compileNode mbKey attrs node =
                   else
                     "]) "
                 , "["
-                , compileChildren Nothing children
+                , compileChildren mbKey children
                 , "]"
                 ]
 
-        ( SvgText text, _ ) ->
+        SvgText text ->
             "Svg.text(" ++ quote text ++ ")"
 
-        ( SvgComment comment, _ ) ->
+        SvgComment comment ->
             "{-" ++ comment ++ "-}"