Header nesting working

Author: alfredbaudisch

lib/pardall_markdown/content/html_utils.ex

@@ -1,8 +1,5 @@
 defmodule PardallMarkdown.Content.HtmlUtils do
-  alias PardallMarkdown.Content.{
-    Utils,
-    TOC
-  }
+  alias PardallMarkdown.Content.Utils
 
   def generate_summary_from_html(html, expected_length \\ 157)
   def generate_summary_from_html(html, _) when html == nil or html == "", do: nil
@@ -104,7 +101,7 @@ defmodule PardallMarkdown.Content.HtmlUtils do
   def generate_anchors_and_toc(html, %{slug: slug}) do
     {updated_tree, %{toc: toc}} =
       Floki.parse_fragment!(html)
-      |> Floki.traverse_and_update(%{counters: %{}, toc_links: [], toc: [], toc_positions: %{}}, fn
+      |> Floki.traverse_and_update(%{counters: %{}, toc: [], toc_positions: %{}}, fn
         {"h" <> header_level, attrs, children} = el, acc ->
           case find_node_text(children) do
             nil ->
@@ -138,15 +135,7 @@ defmodule PardallMarkdown.Content.HtmlUtils do
                 title: title
               }
 
-              # toc_link = %TOC.Link{
-              #   id: link_id,
-              #   header: int_header_level,
-              #   parent_slug: slug,
-              #   title: title
-              # }
-
               acc = put_in(acc[:counters][id], increase_id_count(count))
-              # acc = put_in(acc[:toc_links], acc.toc_links ++ [toc_link])
               acc = put_in(acc[:toc], acc.toc ++ [link])
               acc = put_in(acc[:toc_positions], positions)
 
@@ -157,9 +146,6 @@ defmodule PardallMarkdown.Content.HtmlUtils do
           {el, acc}
       end)
 
-    # toc = TOC.generate(toc_links)
-    # toc = toc |> PardallMarkdown.Utils.StructUtils.struct_to_map()
-
     {:ok, updated_tree |> Floki.raw_html(), toc}
   end
 
@@ -170,27 +156,28 @@ defmodule PardallMarkdown.Content.HtmlUtils do
   when header == curr_header, do:
     {:level, curr_level, :positions, %{level: curr_level, header: curr_header, index: idx + 1}}
 
-  # defp get_toc_level(_, header, %{level: curr_level, header: curr_header, index: idx})
-  # when header > curr_header, do:
-  #   {:level, curr_level, :positions, %{level: curr_level, header: curr_header, index: idx + 1}}
-
   defp get_toc_level(toc, header, %{level: curr_level, header: curr_header, index: idx})
   when header < curr_header do
-    level =
-      toc
-      |> Enum.reverse()
-      |> Enum.reduce(curr_level, fn
+    [_|reversed_toc] = toc |> Enum.reverse()
+
+    {_, level} =
+      reversed_toc
+      |> Enum.reduce({curr_header, curr_level}, fn
+        _, {acc_header, _} = acc
+        when acc_header <= header ->
+          acc
+
+        %{header: i_header, level: i_level}, _acc
+        when i_header < header ->
+          {i_header, i_level + 1}
+
         %{header: i_header, level: i_level}, _acc
         when i_header == header ->
-          i_level
+          {i_header, i_level}
 
         %{header: i_header}, acc
         when i_header > header ->
           acc
-
-        %{header: i_header, level: i_level}, _acc
-        when i_header < header ->
-          i_level + 1
       end)
 
     {:level, level, :positions, %{level: level, header: header, index: idx + 1}}

lib/pardall_markdown/content/toc.ex

@@ -212,7 +212,7 @@ defmodule PardallMarkdown.HtmlTest do
       %{
         header: 2,
         id: "#h2-level-2",
-        level: 1,
+        level: 2,
         parent_slug: "/headers",
         title: "H2 Level 2"
       },
@@ -372,14 +372,15 @@ defmodule PardallMarkdown.HtmlTest do
     assert toc == [
              %{
                id: "#this-item-should-be-level-1-in-the-toc",
-               level: 3,
+               level: 1,
+               header: 3,
                parent_slug: "/foo",
                title: "This item should be level 1 in the TOC"
              },
-             %{id: "#first-section", level: 1, parent_slug: "/foo", title: "First Section"},
-             %{id: "#inner-title", level: 2, parent_slug: "/foo", title: "Inner- \"Title\""},
-             %{id: "#second-section", level: 1, parent_slug: "/foo", title: "Second Section"},
-             %{id: "#inner-title-1", level: 2, parent_slug: "/foo", title: "Inner- \"Title\""}
+             %{id: "#first-section", level: 1, header: 1, parent_slug: "/foo", title: "First Section"},
+             %{id: "#inner-title", level: 2, header: 2, parent_slug: "/foo", title: "Inner- \"Title\""},
+             %{id: "#second-section", level: 1, header: 1, parent_slug: "/foo", title: "Second Section"},
+             %{id: "#inner-title-1", level: 2, header: 2, parent_slug: "/foo", title: "Inner- \"Title\""}
            ]
 
     assert Enum.count(toc) == 5