Fix 2 bugs when handling anchors

- An anchor in a nested structure would break indentation state and
therefore parsing of the anchored structure
- An anchor outide the top-level would not be found while traversing
the AST (that is, traversing the AST was broken)

CHANGELOG.md

@@ -5,6 +5,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Fixed
+- A bug causing references in nested structures to break parsing
+- A bug resolving aliases
 
 ## [2.0.1]
 ### Changed

src/Yaml/Parser.elm

@@ -197,7 +197,7 @@ listElementValue indent =
         , larger =
             \indent_ ->
                 P.oneOf
-                    [ anchor (elVal indent_)
+                    [ anchor elVal
                     , reference
                     , elVal indent_
                     ]
@@ -251,7 +251,7 @@ listInlineValue =
                 ]
     in
     P.oneOf
-        [ anchor inlineVal
+        [ anchor (always inlineVal)
         , reference
         , inlineVal
         ]
@@ -435,7 +435,7 @@ recordElementValue indent =
         , larger =
             \indent_ ->
                 P.oneOf
-                    [ anchor (elVal indent_)
+                    [ anchor elVal
                     , reference
                     , elVal indent_
                     ]
@@ -525,7 +525,7 @@ recordInlinePropertyValue =
                 ]
     in
     P.oneOf
-        [ anchor propVal
+        [ anchor (always propVal)
         , reference
         , propVal
         ]
@@ -568,21 +568,20 @@ recordInlineOnDone elements element =
 -- ANCHOR and REFERENCE
 
 
-anchor : P.Parser Ast.Value -> P.Parser Ast.Value
+anchor : (Int -> P.Parser Ast.Value) -> P.Parser Ast.Value
 anchor valParser =
     P.succeed Ast.Anchor_
         |. P.symbol "&"
         |= refName
         |. U.whitespace
-        |= valParser
+        |= (P.getCol |> P.andThen valParser)
 
 
 reference : P.Parser Ast.Value
 reference =
     P.succeed Ast.Alias_
         |. P.symbol "*"
         |= refName
-        |. U.whitespace
 
 
 refName : P.Parser String
@@ -591,8 +590,19 @@ refName =
         |= (P.getChompedString <|
                 P.chompWhile
                     (\c ->
-                        not <|
-                            List.member c [ ' ', ',', '[', ']', '{', '}' ]
+                        not
+                            (List.member c
+                                [ '\u{000D}'
+                                , '\n'
+                                , ' '
+                                , '\t'
+                                , ','
+                                , '['
+                                , ']'
+                                , '{'
+                                , '}'
+                                ]
+                            )
                     )
            )
 
@@ -611,8 +621,8 @@ deref ast =
                         _ ->
                             d
                 )
-                Dict.empty
                 ast
+                Dict.empty
 
         replaceAnchors : Ast.Value -> Ast.Value
         replaceAnchors v =

src/Yaml/Parser/Ast.elm

@@ -103,8 +103,8 @@ toStringProperty ( name, value ) =
     name ++ ": " ++ toString value
 
 
-fold : (Value -> b -> b) -> b -> Value -> b
-fold f z value =
+fold : (Value -> b -> b) -> Value -> b -> b
+fold f value z =
     case value of
         String_ _ ->
             f value z
@@ -125,13 +125,13 @@ fold f z value =
             f value z
 
         List_ l ->
-            List.foldl f (f value z) l
+            f value (List.foldl (fold f) z l)
 
         Record_ r ->
-            List.foldl f (f value z) (Dict.values r)
+            f value (List.foldl (fold f) z (Dict.values r))
 
-        Anchor_ _ a ->
-            fold f (f value z) a
+        Anchor_ nm a ->
+            f value (fold f a z)
 
 
 map : (Value -> Value) -> Value -> Value

tests/TestParser.elm

@@ -480,6 +480,55 @@ suite =
                             , ( "b", Ast.Record_ (Dict.singleton "foo" (Ast.String_ "bar")) )
                             ]
                         )
+        , Test.test "Real data with anchor and alias" <|
+            \_ ->
+                expectValue testYamlData <|
+                    Ast.Record_
+                        (Dict.singleton
+                            "graph"
+                            (Ast.Record_
+                                (Dict.singleton
+                                    "processors"
+                                    (Ast.Record_
+                                        (Dict.fromList
+                                            [ ( "ripple_filter1"
+                                              , Ast.Record_
+                                                    (Dict.singleton "options"
+                                                        (Ast.Record_
+                                                            (Dict.singleton
+                                                                "filter"
+                                                                (Ast.Record_
+                                                                    (Dict.singleton
+                                                                        "file"
+                                                                        (Ast.String_ "path/test/f.ext")
+                                                                    )
+                                                                )
+                                                            )
+                                                        )
+                                                    )
+                                              )
+                                            , ( "ripple_filter2"
+                                              , Ast.Record_
+                                                    (Dict.singleton "options"
+                                                        (Ast.Record_
+                                                            (Dict.singleton
+                                                                "filter"
+                                                                (Ast.Record_
+                                                                    (Dict.singleton
+                                                                        "file"
+                                                                        (Ast.String_ "path/test/f.ext")
+                                                                    )
+                                                                )
+                                                            )
+                                                        )
+                                                    )
+                                              )
+                                            ]
+                                        )
+                                    )
+                                )
+                            )
+                        )
 
         -- TODO: This is temporarily removed because it is a valid test case that should pass
         -- , Test.test "weird colon record" <|
@@ -504,3 +553,17 @@ expectErr : String -> Expect.Expectation
 expectErr subject =
     Parser.fromString subject
         |> Expect.err
+
+
+testYamlData : String
+testYamlData =
+    """
+graph:
+  processors:
+    ripple_filter1:
+      options: &1
+        filter:
+          file: path/test/f.ext
+    ripple_filter2:
+      options: *1
+"""