Parse nested tags with equal name (solves #3)

.travis.yml

@@ -24,7 +24,6 @@ install:
   - npm --version
   - npm install -g elm@$ELM_VERSION
   - npm install -g elm-test
-  - npm install -g elm-doc-test
 
 
 script:

elm-package.json

@@ -1,5 +1,5 @@
 {
-    "version": "2.2.2",
+    "version": "2.2.3",
     "summary": "XML parser, encoder/decoder and queries in Elm",
     "repository": "https://github.com/eeue56/elm-xml.git",
     "license": "BSD3",

run_tests.sh

@@ -1,4 +1,3 @@
 #!/bin/bash
 
-elm-doc-test
-elm-test
+elm-test

src/Xml/Decode.elm

@@ -12,6 +12,7 @@ module Xml.Decode exposing (decode, decodeInt, decodeString, decodeFloat, decode
 import Dict
 import Regex exposing (Regex)
 import Xml exposing (Value(..))
+import Tuple exposing (second)
 
 
 {-| Try and decode the props from a string
@@ -72,12 +73,20 @@ findProps =
         >> Dict.fromList
 
 
+type Tag
+    = OpenTag
+    | CloseTag
+
+
 parseSlice : Int -> Int -> String -> Result String ( Value, Int )
 parseSlice first firstClose trimmed =
     let
         beforeClose =
             String.slice (first + 1) firstClose trimmed
 
+        afterOpen =
+            String.slice (first + 1) (String.length trimmed) trimmed
+
         words =
             beforeClose
                 |> String.words
@@ -92,19 +101,59 @@ parseSlice first firstClose trimmed =
 
         closeTag =
             "</" ++ tagName ++ ">"
+
+        openTag =
+            "<" ++ Regex.escape tagName ++ "[\\s\\n]*[^/]*?>" 
+            |> Regex.regex
+
+        openTags =
+            Regex.find Regex.All openTag afterOpen
+                |> List.map (.index >> (,) OpenTag)
+
+        closeTags =
+            String.indexes closeTag trimmed
+                |> List.map ((,) CloseTag)
+
+        allTags =
+            openTags
+                ++ closeTags
+                |> List.sortBy second
+
+        reduce list =
+            case list of
+                ( OpenTag, i1 ) :: ( CloseTag, i2 ) :: rest ->
+                    reduce rest
+
+                ( OpenTag, i1 ) :: rest ->
+                    case reduce rest of
+                        ( CloseTag, i2 ) :: rest ->
+                            reduce rest
+
+                        rest ->
+                            rest
+
+                _ ->
+                    list
     in
-        case String.indexes closeTag trimmed of
-            [] ->
+        case List.head <| reduce allTags of
+            Nothing ->
                 if String.startsWith "?" tagName then
                     Ok ( DocType tagName props, firstClose + 1 )
-                else if (String.contains "/>" trimmed) then
-                    Ok ( Tag tagName props (Object []), firstClose + 1 )
+                else if String.endsWith "/" beforeClose then
+                    let tag = if String.endsWith "/" tagName then
+                                  String.slice 0 -1 tagName
+                              else
+                                  tagName
+                    in
+                        Ok ( Tag tag props (Object []), firstClose + 1 )
+                else if String.startsWith "!" tagName then
+                    Ok ( Object [], firstClose + 1 )
                 else
                     "Failed to find close tag for "
                         ++ tagName
                         |> Err
 
-            firstCloseTag :: _ ->
+            Just ( _, firstCloseTag ) ->
                 let
                     contents =
                         String.slice (firstClose + 1) (firstCloseTag) trimmed

tests/Tests.elm

@@ -34,6 +34,7 @@ selfClosingExampleAsString =
 <person>
     <name is="me">kitofr</name>
     <here is="false" />
+    <there/>
     <here is="true"/>
     <name is="me">kitofr</name>
 </person>
@@ -48,6 +49,7 @@ selfClosingExample =
           , object
                 [ ( "name", Dict.fromList [ ( "is", string "me" ) ], string "kitofr" )
                 , ( "here", Dict.fromList [ ( "is", bool False ) ], null )
+                , ( "there", Dict.fromList [], null )
                 , ( "here", Dict.fromList [ ( "is", bool True ) ], null )
                 , ( "name", Dict.fromList [ ( "is", string "me" ) ], string "kitofr" )
                 ]
@@ -128,6 +130,50 @@ nestedExampleAsString =
         |> String.trim
 
 
+nestedSelfExample : Value
+nestedSelfExample =
+    object
+        [ ( "g"
+          , Dict.singleton "id" (string "foo")
+          , object
+                [ ( "g", Dict.singleton "id" (string "bla"), string "group" )
+                ]
+          )
+        ]
+
+
+nestedSelfExampleAsString : String
+nestedSelfExampleAsString =
+    """
+<g id="foo">
+    <g id="bla">group</g>
+</g>
+"""
+        |> String.trim
+
+
+nestedSelfExampleWithoutProps : Value
+nestedSelfExampleWithoutProps =
+    object
+        [ ( "g"
+          , Dict.empty
+          , object
+                [ ( "g", Dict.empty, string "group" )
+                ]
+          )
+        ]
+
+
+nestedSelfExampleWithoutPropsAsString : String
+nestedSelfExampleWithoutPropsAsString =
+    """
+<g>
+    <g>group</g>
+</g>
+"""
+        |> String.trim
+
+
 decodedExampleStuff : Result String Value
 decodedExampleStuff =
     decode ExampleStuff.stuff
@@ -154,6 +200,12 @@ all =
         , test "a nested tag is decoded properly" <|
             \_ ->
                 Expect.equal (decode nestedExampleAsString) (Ok nestedExample)
+        , test "a self nested tag is encoded properly" <|
+            \_ ->
+                Expect.equal nestedSelfExampleAsString (encode 4 nestedSelfExample)
+        , test "a self nested tag is decoded properly" <|
+            \_ ->
+                Expect.equal (decode nestedSelfExampleAsString) (Ok nestedSelfExample)
         , test "a self closing tag is decoded properly" <|
             \_ ->
                 Expect.equal (decode selfClosingExampleAsString) (Ok selfClosingExample)
@@ -187,7 +239,7 @@ all =
                         |> List.length
                     )
                     1
-        , test "the XML contains a node we expect" <|
+        , test "the other XML contains a node we expect" <|
             \_ ->
                 Expect.equal
                     (decodedExampleStuff

tests/elm-package.json

@@ -9,13 +9,12 @@
     ],
     "exposed-modules": [],
     "dependencies": {
-        "elm-community/elm-test": "3.0.0 <= v < 4.0.0",
+        "elm-community/elm-test": "4.2.0 <= v < 5.0.0",
         "elm-community/json-extra": "2.0.0 <= v < 3.0.0",
         "elm-lang/core": "5.0.0 <= v < 6.0.0",
         "elm-lang/html": "2.0.0 <= v < 3.0.0",
         "justinmimbs/elm-date-extra": "2.0.3 <= v < 3.0.0",
-        "mgold/elm-random-pcg": "4.0.2 <= v < 5.0.0",
-        "rtfeldman/node-test-runner": "3.0.0 <= v < 4.0.0"
+        "mgold/elm-random-pcg": "4.0.2 <= v < 5.0.0"
     },
     "elm-version": "0.18.0 <= v < 0.19.0"
 }