fixes

elastic · Feb 6, 2025 · 2f3b26c · 2f3b26c
1 parent c313647
commit 2f3b26c
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 18 deletions.
diff --git a/src/Elastic.Markdown/Myst/InlineParsers/DiagnosticLinkInlineParser.cs b/src/Elastic.Markdown/Myst/InlineParsers/DiagnosticLinkInlineParser.cs
@@ -239,11 +239,14 @@ private static void UpdateLinkUrl(LinkInline link, string url, ParserContext con
 	{
 		var newUrl = url;
 		var urlPathPrefix = context.Build.UrlPathPrefix ?? string.Empty;
-		if (url.EndsWith(".md"))
-			newUrl = Path.ChangeExtension(newUrl, ".html");
 
-		if (!url.StartsWith('/'))
+		if (!url.StartsWith('/') && !string.IsNullOrEmpty(url))
+		{
 			newUrl = GetRootRelativePath(context, file);
+		}
+
+		if (url.EndsWith(".md"))
+			newUrl = Path.ChangeExtension(newUrl, ".html");
 
 		if (!string.IsNullOrWhiteSpace(urlPathPrefix))
 			newUrl = $"{urlPathPrefix.TrimEnd('/')}{newUrl}";

diff --git a/tests/Elastic.Markdown.Tests/Inline/AnchorLinkTests.cs b/tests/Elastic.Markdown.Tests/Inline/AnchorLinkTests.cs
@@ -76,7 +76,7 @@ [Sub Requirements](testing/req.md#sub-requirements)
 	public void GeneratesHtml() =>
 		// language=html
 		Html.Should().Contain(
-			"""<p><a href="testing/req.html#sub-requirements">Sub Requirements</a></p>"""
+			"""<p><a href="/testing/req.html#sub-requirements">Sub Requirements</a></p>"""
 		);
 
 	[Fact]
@@ -94,7 +94,7 @@ [Sub Requirements](testing/req.md#new-reqs)
 	public void GeneratesHtml() =>
 		// language=html
 		Html.Should().Contain(
-			"""<p><a href="testing/req.html#new-reqs">Sub Requirements</a></p>"""
+			"""<p><a href="/testing/req.html#new-reqs">Sub Requirements</a></p>"""
 		);
 
 	[Fact]
@@ -111,7 +111,7 @@ public class ExternalPageAnchorAutoTitleTests(ITestOutputHelper output) : Anchor
 	public void GeneratesHtml() =>
 		// language=html
 		Html.Should().Contain(
-			"""<p><a href="testing/req.html#sub-requirements">Special Requirements &gt; Sub Requirements</a></p>"""
+			"""<p><a href="/testing/req.html#sub-requirements">Special Requirements &gt; Sub Requirements</a></p>"""
 		);
 
 	[Fact]
@@ -147,7 +147,7 @@ [Sub Requirements](testing/req.md#sub-requirements2)
 	public void GeneratesHtml() =>
 		// language=html
 		Html.Should().Contain(
-			"""<p><a href="testing/req.html#sub-requirements2">Sub Requirements</a></p>"""
+			"""<p><a href="/testing/req.html#sub-requirements2">Sub Requirements</a></p>"""
 		);
 
 	[Fact]
@@ -166,7 +166,7 @@ [Heading inside dropdown](testing/req.md#heading-inside-dropdown)
 	public void GeneratesHtml() =>
 		// language=html
 		Html.Should().Contain(
-			"""<a href="/testing/req#heading-inside-dropdown">Heading inside dropdown</a>"""
+			"""<a href="/testing/req.html#heading-inside-dropdown">Heading inside dropdown</a>"""
 		);
 	[Fact]
 	public void HasError() => Collector.Diagnostics.Should().HaveCount(0);

diff --git a/tests/Elastic.Markdown.Tests/Inline/DirectiveBlockLinkTests.cs b/tests/Elastic.Markdown.Tests/Inline/DirectiveBlockLinkTests.cs
@@ -67,7 +67,7 @@ [Sub Requirements](testing/req.md#hint_ref)
 	public void GeneratesHtml() =>
 		// language=html
 		Html.Should().Contain(
-			"""<p><a href="testing/req.html#hint_ref">Sub Requirements</a></p>"""
+			"""<p><a href="/testing/req.html#hint_ref">Sub Requirements</a></p>"""
 		);
 
 	[Fact]

diff --git a/tests/Elastic.Markdown.Tests/Inline/InlineAnchorTests.cs b/tests/Elastic.Markdown.Tests/Inline/InlineAnchorTests.cs
@@ -203,7 +203,7 @@ [Sub Requirements](testing/req.md#custom-anchor)
 	public void GeneratesHtml() =>
 		// language=html
 		Html.Should().Contain(
-			"""<p><a href="testing/req.html#custom-anchor">Sub Requirements</a></p>"""
+			"""<p><a href="/testing/req.html#custom-anchor">Sub Requirements</a></p>"""
 		);
 
 	[Fact]

diff --git a/tests/Elastic.Markdown.Tests/Inline/InlineLinkTests.cs b/tests/Elastic.Markdown.Tests/Inline/InlineLinkTests.cs
@@ -58,7 +58,7 @@ public class LinkToPageTests(ITestOutputHelper output) : LinkTestBase(output,
 	public void GeneratesHtml() =>
 		// language=html
 		Html.Should().Contain(
-			"""<p><a href="/testing/req">Requirements</a></p>"""
+			"""<p><a href="/testing/req.html">Requirements</a></p>"""
 		);
 
 	[Fact]
@@ -81,7 +81,7 @@ public class InsertPageTitleTests(ITestOutputHelper output) : LinkTestBase(outpu
 	public void GeneratesHtml() =>
 		// language=html
 		Html.Should().Contain(
-			"""<p><a href="/testing/req">Special Requirements</a></p>"""
+			"""<p><a href="/testing/req.html">Special Requirements</a></p>"""
 		);
 
 	[Fact]
@@ -106,7 +106,7 @@ public class LinkReferenceTest(ITestOutputHelper output) : LinkTestBase(output,
 	public void GeneratesHtml() =>
 		// language=html
 		Html.Should().Contain(
-			"""<p><a href="/testing/req">test</a></p>"""
+			"""<p><a href="/testing/req.html">test</a></p>"""
 		);
 
 	[Fact]

diff --git a/tests/authoring/Inline/InlineImages.fs b/tests/authoring/Inline/InlineImages.fs
@@ -26,7 +26,7 @@ type ``relative path to image`` () =
     [<Fact>]
     let ``validate HTML: preserves relative path`` () =
         markdown |> convertsToHtml """
-            <p><img src="_static/img/observability.png" alt="Elasticsearch" /></p>
+            <p><img src="/_static/img/observability.png" alt="Elasticsearch" /></p>
         """
 
 type ``supplying a tittle`` () =
@@ -37,7 +37,7 @@ type ``supplying a tittle`` () =
     [<Fact>]
     let ``validate HTML: includes title`` () =
         markdown |> convertsToHtml """
-            <p><img src="_static/img/observability.png" alt="Elasticsearch" title="Hello world" /></p>
+            <p><img src="/_static/img/observability.png" alt="Elasticsearch" title="Hello world" /></p>
         """
 
 type ``supplying a tittle with width and height`` () =
@@ -48,7 +48,7 @@ type ``supplying a tittle with width and height`` () =
     [<Fact>]
     let ``validate HTML: does not include width and height in title`` () =
         markdown |> convertsToHtml """
-            <p><img src="obs.png" width="250px" height="400px" alt="o" title="Title"/></p>
+            <p><img src="/obs.png" width="250px" height="400px" alt="o" title="Title"/></p>
         """
 
 type ``supplying a tittle with width and height in percentage`` () =
@@ -59,7 +59,7 @@ type ``supplying a tittle with width and height in percentage`` () =
     [<Fact>]
     let ``validate HTML: does not include width and height in title`` () =
         markdown |> convertsToHtml """
-            <p><img src="obs.png" width="50%" height="40%" alt="o" title="Title"/></p>
+            <p><img src="/obs.png" width="50%" height="40%" alt="o" title="Title"/></p>
         """
 type ``supplying a tittle with width only`` () =
     static let markdown = Setup.Markdown """
@@ -69,5 +69,5 @@ type ``supplying a tittle with width only`` () =
     [<Fact>]
     let ``validate HTML: sets height to width if not supplied`` () =
         markdown |> convertsToHtml """
-            <p><img src="obs.png" width="30%" height="30%" alt="o" title="Title"/></p>
+            <p><img src="/obs.png" width="30%" height="30%" alt="o" title="Title"/></p>
         """