Run inline parser within Inline HTML

spec-results.json

@@ -1309,12 +1309,18 @@
     "auto_links": [
       null
     ],
+    "backslash_escapes": [
+      null
+    ],
     "blockquotes_with_code_blocks": [
       null
     ],
     "code_blocks": [
       null
     ],
+    "code_spans": [
+      null
+    ],
     "horizontal_rules": [
       null
     ],

spec-tests/OutputMarkdownHtml.elm

@@ -174,7 +174,7 @@ renderMarkdown markdown =
                         classes =
                             -- Only the first word is used in the class
                             case Maybe.map String.words language of
-                                Just (actualLanguage::_) ->
+                                Just (actualLanguage :: _) ->
                                     [ Attr.class <| "language-" ++ actualLanguage ]
 
                                 _ ->
@@ -282,7 +282,7 @@ passThroughNode nodeName =
 
 {-| TODO come up with an API to provide a solution to do this sort of thing publicly
 -}
-passthrough : (String -> List Markdown.HtmlRenderer.Attribute -> List Block -> Result String view) -> Markdown.HtmlRenderer.HtmlRenderer view
+passthrough : (String -> List Markdown.HtmlRenderer.Attribute -> Markdown.HtmlRenderer.InlinesOrBlocks -> Result String view) -> Markdown.HtmlRenderer.HtmlRenderer view
 passthrough renderFn =
     Markdown.HtmlRenderer.HtmlRenderer renderFn
 

src/Markdown/Block.elm

@@ -141,7 +141,7 @@ type HeadingLevel
 {-| An Inline block. Note that `HtmlInline`s can contain Blocks, not just nested `Inline`s.
 -}
 type Inline
-    = HtmlInline (Html Block)
+    = HtmlInline (Html Inline)
     | Link String (Maybe String) (List Inline)
     | Image String (Maybe String) (List Inline)
     | Emphasis (List Inline)
@@ -217,13 +217,8 @@ extractTextHelp inline text =
 
         HtmlInline html ->
             case html of
-                HtmlElement _ _ blocks ->
-                    blocks
-                        |> foldl
-                            (\block soFar ->
-                                soFar ++ extractInlineBlockText block
-                            )
-                            text
+                HtmlElement _ _ inlines ->
+                    text ++ extractInlineText inlines
 
                 _ ->
                     text
@@ -303,22 +298,6 @@ extractInlineBlockText block =
             ""
 
 
-
---BlockQuote blocks ->
---
---
---Heading headingLevel inlines ->
---
---
---Table list lists ->
---
---
---CodeBlock record ->
---
---
---ThematicBreak ->
-
-
 {-| The way HTML is handled is one of the core ideas of this library.
 
 You get the full HTML structure that you can use to process the Blocks before rendering them. Once you render them,
@@ -501,7 +480,7 @@ inlineParserWalk function inline =
         HtmlInline html ->
             case html of
                 HtmlElement string htmlAttributes children ->
-                    HtmlElement string htmlAttributes (List.map (walkInlines function) children)
+                    HtmlElement string htmlAttributes (List.map function children)
                         |> HtmlInline
 
                 _ ->
@@ -583,16 +562,16 @@ inlineParserValidateWalk function inline =
 
         HtmlInline html ->
             case html of
-                HtmlElement tagName htmlAttributes blocks ->
-                    blocks
-                        |> traverse (inlineParserValidateWalkBlock function)
+                HtmlElement tagName htmlAttributes inlines ->
+                    inlines
+                        |> traverse function
                         |> Result.andThen
-                            (\transformedBlocks ->
-                                HtmlElement tagName htmlAttributes transformedBlocks
+                            (\transformedInlines ->
+                                HtmlElement tagName htmlAttributes transformedInlines
                                     |> HtmlInline
                                     |> function
-                                    |> Result.mapError List.singleton
                             )
+                        |> Result.mapError List.singleton
 
                 _ ->
                     function inline
@@ -978,8 +957,8 @@ inlineFoldl ifunction top_acc list =
                                 ifn inline acc
                         in
                         case hblock of
-                            HtmlElement _ _ blocks ->
-                                inlineFoldl ifn hiacc blocks
+                            HtmlElement _ _ inlines ->
+                                List.foldl ifn hiacc inlines
 
                             HtmlComment _ ->
                                 ifn inline hiacc

src/Markdown/HtmlRenderer.elm

@@ -1,11 +1,16 @@
-module Markdown.HtmlRenderer exposing (Attribute, HtmlRenderer(..))
+module Markdown.HtmlRenderer exposing (Attribute, HtmlRenderer(..), InlinesOrBlocks(..))
 
-import Markdown.Block exposing (Block)
+import Markdown.Block exposing (Block, Inline)
 
 
 type alias Attribute =
     { name : String, value : String }
 
 
+type InlinesOrBlocks
+    = Inlines (List Inline)
+    | Blocks (List Block)
+
+
 type HtmlRenderer a
-    = HtmlRenderer (String -> List Attribute -> List Block -> Result String a)
+    = HtmlRenderer (String -> List Attribute -> InlinesOrBlocks -> Result String a)

src/Markdown/Parser.elm

@@ -177,7 +177,7 @@ mapInline inline =
 
         Inline.HtmlInline node ->
             node
-                |> nodeToRawBlock
+                |> nodeToRawInline
                 |> Block.HtmlInline
 
         Inline.Emphasis level inlines ->
@@ -536,6 +536,11 @@ textNodeToBlocks textNodeValue =
         |> Result.withDefault []
 
 
+textNodeToInlines : String -> List Inline
+textNodeToInlines textNodeValue =
+    inlineParseHelper [] (UnparsedInlines textNodeValue)
+
+
 nodeToRawBlock : Node -> Block.Html Block
 nodeToRawBlock node =
     case node of
@@ -569,6 +574,39 @@ nodeToRawBlock node =
             Block.HtmlDeclaration declarationType content
 
 
+nodeToRawInline : Node -> Block.Html Inline
+nodeToRawInline node =
+    case node of
+        HtmlParser.Text innerText ->
+            Block.HtmlComment "TODO this never happens, but use types to drop this case."
+
+        HtmlParser.Element tag attributes children ->
+            let
+                parseChild child =
+                    case child of
+                        HtmlParser.Text text ->
+                            textNodeToInlines text
+
+                        _ ->
+                            [ nodeToRawInline child |> Block.HtmlInline ]
+            in
+            Block.HtmlElement tag
+                attributes
+                (List.concatMap parseChild children)
+
+        Comment string ->
+            Block.HtmlComment string
+
+        Cdata string ->
+            Block.Cdata string
+
+        ProcessingInstruction string ->
+            Block.ProcessingInstruction string
+
+        Declaration declarationType content ->
+            Block.HtmlDeclaration declarationType content
+
+
 nodesToBlocks : List Node -> Result Parser.Problem (List Block)
 nodesToBlocks children =
     nodesToBlocksHelp children []

src/Markdown/Renderer.elm

@@ -309,7 +309,9 @@ renderHtml tagName attributes children (Markdown.HtmlRenderer.HtmlRenderer htmlR
         |> combineResults
         |> Result.andThen
             (\okChildren ->
-                htmlRenderer tagName attributes children
+                children
+                    |> Markdown.HtmlRenderer.Blocks
+                    |> htmlRenderer tagName attributes
                     |> Result.map
                         (\myRenderer -> myRenderer okChildren)
             )
@@ -579,7 +581,7 @@ renderSingleInline renderer inline =
         Block.HtmlInline html ->
             case html of
                 Block.HtmlElement tag attributes children ->
-                    renderHtmlNode renderer tag attributes children
+                    renderInlineHtmlNode renderer tag attributes children
                         |> Just
 
                 _ ->
@@ -593,3 +595,39 @@ renderHtmlNode renderer tag attributes children =
         children
         renderer.html
         (renderHelper renderer children)
+
+
+renderInlineHtmlNode : Renderer view -> String -> List Attribute -> List Inline -> Result String view
+renderInlineHtmlNode renderer tag attributes children =
+    renderInlineHtml tag
+        attributes
+        children
+        renderer.html
+        (renderHelperInline renderer children)
+
+
+renderInlineHtml :
+    String
+    -> List Attribute
+    -> List Inline
+    -> Markdown.Html.Renderer (List view -> view)
+    -> Result String (List view)
+    -> Result String view
+renderInlineHtml tagName attributes children (Markdown.HtmlRenderer.HtmlRenderer htmlRenderer) renderedChildren =
+    renderedChildren
+        |> Result.andThen
+            (\okChildren ->
+                children
+                    |> Markdown.HtmlRenderer.Inlines
+                    |> htmlRenderer tagName attributes
+                    |> Result.map
+                        (\myRenderer -> myRenderer okChildren)
+            )
+
+
+renderHelperInline :
+    Renderer view
+    -> List Inline
+    -> Result String (List view)
+renderHelperInline renderer blocks =
+    renderStyled renderer blocks

test-results/failing/New/double_link.md

@@ -22,5 +22,5 @@ Should give output:
 But instead was:
 
 ````````````html
-<p><p>Already linked:</p><a href="http://example.com/"><p>http://example.com/</p></a><p>.</p></p><p>Already linked:<a href="http://example.com/">http://example.com/</a>.</p><p>Already linked:<a href="http://example.com/"><p><strong>http://example.com/</strong></p></a>.</p>
+<p><p>Already linked:</p><a href="http://example.com/"><p>http://example.com/</p></a><p>.</p></p><p>Already linked:<a href="http://example.com/">http://example.com/</a>.</p><p>Already linked:<a href="http://example.com/"><strong>http://example.com/</strong></a>.</p>
 ````````````