fix authoring tests

Author: Mpdreamz

src/Elastic.Documentation/Extensions/IFileInfoExtensions.cs

@@ -28,6 +28,22 @@ public static bool IsSubPathOf(this IFileInfo file, IDirectoryInfo parentDirecto
 		return parent is not null && parent.IsSubPathOf(parentDirectory);
 	}
 
+	public static IFileInfo EnsureSubPathOf(this IFileInfo file, IDirectoryInfo parentDirectory, string relativePath)
+	{
+		var fs = file.FileSystem;
+		var path = Path.GetFullPath(fs.Path.Combine(parentDirectory.FullName, relativePath));
+		var pathInfo = fs.FileInfo.New(path);
+		List<string> intermediaryDirectories = ["x"];
+		while (!pathInfo.IsSubPathOf(parentDirectory))
+		{
+			path = Path.GetFullPath(fs.Path.Combine([parentDirectory.FullName, .. intermediaryDirectories, relativePath]));
+			pathInfo = fs.FileInfo.New(path);
+			intermediaryDirectories.Add("x");
+		}
+
+		return pathInfo;
+	}
+
 	/// Checks if <paramref name="file"/> has parent directory <paramref name="parentName"/>, defaults to OrdinalIgnoreCase comparison
 	public static bool HasParent(this IFileInfo file, string parentName)
 	{

src/Elastic.Markdown/IO/DocumentationSet.cs

@@ -272,12 +272,18 @@ public RepositoryLinks CreateLinkReference()
 	{
 		var redirects = Configuration.Redirects;
 		var crossLinks = Context.Collector.CrossLinks.ToHashSet().ToArray();
-		var markdownInNavigation = NavigationIndexedByOrder.Values
-			.OfType<ILeafNavigationItem<MarkdownFile>>()
+
+		var leafs = NavigationIndexedByOrder.Values
+			.OfType<ILeafNavigationItem<MarkdownFile>>().ToArray();
+		var nodes = NavigationIndexedByOrder.Values
+			.OfType<INodeNavigationItem<INavigationModel, INavigationItem>>()
+			.ToArray();
+
+		var markdownInNavigation =
+			leafs
 			.Select(m => (Markdown: m.Model, Navigation: (INavigationItem)m))
-			.Concat(NavigationIndexedByOrder.Values
-				.OfType<INodeNavigationItem<MarkdownFile, INavigationItem>>()
-				.Select(g => (Markdown: g.Index.Model, Navigation: (INavigationItem)g))
+			.Concat(nodes
+				.Select(g => (Markdown: (MarkdownFile)g.Index.Model, Navigation: (INavigationItem)g))
 			)
 			.ToList();
 

src/Elastic.Markdown/Myst/InlineParsers/DiagnosticLinkInlineParser.cs

@@ -6,6 +6,7 @@
 using System.IO.Abstractions;
 using System.Runtime.InteropServices;
 using System.Text.RegularExpressions;
+using Elastic.Documentation.Extensions;
 using Elastic.Documentation.Links;
 using Elastic.Markdown.Diagnostics;
 using Elastic.Markdown.Helpers;
@@ -359,12 +360,16 @@ private static void UpdateLinkUrl(LinkInline link, MarkdownFile? linkMarkdown, s
 	public static string UpdateRelativeUrl(ParserContext context, string url)
 	{
 		var urlPathPrefix = context.Build.UrlPathPrefix ?? string.Empty;
+
+		var fi = context.MarkdownSourcePath;
+
 		var newUrl = url;
 		if (!newUrl.StartsWith('/') && !string.IsNullOrEmpty(newUrl))
 		{
-			var subPrefix = context.CurrentUrlPath.Length >= urlPathPrefix.Length
-				? context.CurrentUrlPath[urlPathPrefix.Length..]
-				: urlPathPrefix;
+			var path = Path.GetFullPath(fi.FileSystem.Path.Combine(fi.Directory!.FullName, newUrl));
+			var pathInfo = fi.FileSystem.FileInfo.New(path);
+			pathInfo = pathInfo.EnsureSubPathOf(context.Configuration.ScopeDirectory, newUrl);
+			var relativePath = fi.FileSystem.Path.GetRelativePath(context.Configuration.ScopeDirectory.FullName, pathInfo.FullName);
 
 			// if we are trying to resolve a relative url from a _snippet folder ensure we eat the _snippet folder
 			// as it's not part of url by chopping of the extra parent navigation
@@ -387,17 +392,8 @@ public static string UpdateRelativeUrl(ParserContext context, string url)
 					offset--;
 				}
 			}
-
-			// TODO check through context.DocumentationFileLookup if file is index vs "index.md" check
-			var markdownPath = context.MarkdownSourcePath;
-			// if the current path is an index e.g /reference/cloud-k8s/
-			// './' current path lookups should be relative to sub-path.
-			// If it's not e.g /reference/cloud-k8s/api-docs/ these links should resolve on folder up.
-			var lastIndexPath = subPrefix.LastIndexOf('/');
-			if (lastIndexPath >= 0 && markdownPath.Name != "index.md")
-				subPrefix = subPrefix[..lastIndexPath];
-			var combined = '/' + Path.Combine(subPrefix, newUrl).TrimStart('/');
-			newUrl = Path.GetFullPath(combined);
+			else
+				newUrl = $"/{Path.Combine(urlPathPrefix, relativePath).TrimStart('/')}";
 
 		}
 		// When running on Windows, path traversal results must be normalized prior to being used in a URL

tests/authoring/Generator/LinkReferenceFile.fs

@@ -63,7 +63,6 @@ Through various means $$$including-this-inline-syntax$$$
          },
          "url_path_prefix": "",
          "links": {
-           "file.md": {},
            "index.md": {
              "anchors": [
                "including-this-inline-syntax",
@@ -82,7 +81,8 @@ Through various means $$$including-this-inline-syntax$$$
            },
            "testing/redirects/first-page.md": {
              "anchors": [ "has-an-anchor-as-well" ]
-           }
+           },
+           "file.md": {}
          },
          "cross_links": [],
          "redirects": {

tests/authoring/Inline/RelativeLinks.fs

@@ -47,9 +47,9 @@ Through various means $$$including-this-inline-syntax$$$
     let ``validate index.md HTML`` () =
         generator |> converts "deeply/nested/file.md" |> toHtml """
              <p><a href="/#and-anchored">link to root</a></p>
-             <p><a href="/deeply/parent">link to parent</a></p>
-             <p><a href="/deeply/parent#some-header">link to parent</a></p>
-             <p><a href="/deeply/nested/file2">link to sibling</a></p>
+             <p><a href="/deeply/parent/">link to parent</a></p>
+             <p><a href="/deeply/parent/#some-header">link to parent</a></p>
+             <p><a href="/deeply/nested/file2/">link to sibling</a></p>
          """
 
     [<Fact>]