fix cross links

Author: Mpdreamz

docs/testing/cross-links.md

@@ -1,7 +1,5 @@
 # Cross Links
 
-[Elasticsearch](docs-content://index.md)
-
-[Kibana][1]
+[docs-content](docs-content://index.md)
 
 [1]: docs-content://index.md

src/Elastic.Documentation.Navigation/Elastic.Documentation.Navigation.csproj

@@ -8,6 +8,7 @@
 
     <ItemGroup>
       <ProjectReference Include="..\Elastic.Documentation.Configuration\Elastic.Documentation.Configuration.csproj" />
+      <ProjectReference Include="..\Elastic.Documentation.Links\Elastic.Documentation.Links.csproj" />
     </ItemGroup>
 
 </Project>

src/Elastic.Documentation.Navigation/Isolated/Node/DocumentationSetNavigation.cs

@@ -6,6 +6,7 @@
 using System.IO.Abstractions;
 using Elastic.Documentation.Configuration.DocSet;
 using Elastic.Documentation.Extensions;
+using Elastic.Documentation.Links.CrossLinks;
 using Elastic.Documentation.Navigation.Isolated.Leaf;
 
 namespace Elastic.Documentation.Navigation.Isolated.Node;
@@ -22,18 +23,21 @@ public class DocumentationSetNavigation<TModel>
 	where TModel : class, IDocumentationFile
 {
 	private readonly IDocumentationFileFactory<TModel> _factory;
+	private readonly ICrossLinkResolver _crossLinkResolver;
 
 	public DocumentationSetNavigation(
 		DocumentationSetFile documentationSet,
 		IDocumentationSetContext context,
 		IDocumentationFileFactory<TModel> factory,
 		IRootNavigationItem<INavigationModel, INavigationItem>? parent = null,
 		IRootNavigationItem<INavigationModel, INavigationItem>? root = null,
-		string? pathPrefix = null
+		string? pathPrefix = null,
+		ICrossLinkResolver? crossLinkResolver = null
 	)
 	{
 		_context = context;
 		_factory = factory;
+		_crossLinkResolver = crossLinkResolver ?? NoopCrossLinkResolver.Instance;
 		_pathPrefix = pathPrefix ?? string.Empty;
 		// Initialize root properties
 		_navigationRoot = root ?? this;
@@ -139,7 +143,7 @@ public DocumentationSetNavigation(
 	public IReadOnlyCollection<INavigationItem> NavigationItems { get; private set; }
 
 	void IAssignableChildrenNavigation.SetNavigationItems(IReadOnlyCollection<INavigationItem> navigationItems) => SetNavigationItems(navigationItems);
-	internal void SetNavigationItems(IReadOnlyCollection<INavigationItem> navigationItems)
+	private void SetNavigationItems(IReadOnlyCollection<INavigationItem> navigationItems)
 	{
 		var indexNavigation = navigationItems.QueryIndex<TModel>(this, $"{PathPrefix}/index.md", out navigationItems);
 		Index = indexNavigation;
@@ -280,19 +284,21 @@ INavigationHomeAccessor homeAccessor
 		return fileNavigation;
 	}
 
-	private INavigationItem CreateCrossLinkNavigation(
+	private INavigationItem? CreateCrossLinkNavigation(
 		CrossLinkRef crossLinkRef,
 		int index,
 		INodeNavigationItem<INavigationModel, INavigationItem>? parent,
 		INavigationHomeAccessor homeAccessor
 	)
 	{
 		var title = crossLinkRef.Title ?? crossLinkRef.CrossLinkUri.OriginalString;
-		var model = new CrossLinkModel(crossLinkRef.CrossLinkUri, title);
+		if (!_crossLinkResolver.TryResolve(s => _context.EmitError(_context.ConfigurationPath, s), crossLinkRef.CrossLinkUri, out var resolvedUri))
+			return null;
+		var model = new CrossLinkModel(resolvedUri, title);
 
 		return new CrossLinkNavigationLeaf(
 			model,
-			crossLinkRef.CrossLinkUri.OriginalString,
+			resolvedUri.ToString(),
 			crossLinkRef.Hidden,
 			parent,
 			homeAccessor

src/Elastic.Markdown/IO/DocumentationSet.cs

@@ -13,7 +13,6 @@
 using Elastic.Documentation.Links;
 using Elastic.Documentation.Links.CrossLinks;
 using Elastic.Documentation.Navigation;
-using Elastic.Documentation.Navigation.Isolated;
 using Elastic.Documentation.Navigation.Isolated.Leaf;
 using Elastic.Documentation.Navigation.Isolated.Node;
 using Elastic.Documentation.Site.Navigation;
@@ -22,7 +21,6 @@
 using Elastic.Markdown.IO.NewNavigation;
 using Elastic.Markdown.Myst;
 using Microsoft.Extensions.Logging;
-using YamlDotNet.Serialization.TypeInspectors;
 
 namespace Elastic.Markdown.IO;
 
@@ -77,7 +75,7 @@ ICrossLinkResolver linkResolver
 		MarkdownParser = new MarkdownParser(context, resolver);
 
 		var fileFactory = new MarkdownFileFactory(context, MarkdownParser, EnabledExtensions);
-		Navigation = new DocumentationSetNavigation<MarkdownFile>(context.ConfigurationYaml, context, fileFactory, pathPrefix: context.UrlPathPrefix);
+		Navigation = new DocumentationSetNavigation<MarkdownFile>(context.ConfigurationYaml, context, fileFactory, null, null, context.UrlPathPrefix, CrossLinkResolver);
 
 		Name = Context.Git != GitCheckoutInformation.Unavailable
 			? Context.Git.RepositoryName

src/services/Elastic.Documentation.Assembler/AssembleSources.cs

@@ -86,8 +86,7 @@ IReadOnlySet<Exporter> availableExporters
 		AssembleContext = assembleContext;
 		AssembleSets = checkouts
 			.Where(c => c.Repository is { Skip: false })
-			.Select(c => new AssemblerDocumentationSet(logFactory, assembleContext, c, crossLinkResolver, configurationContext,
-				availableExporters))
+			.Select(c => new AssemblerDocumentationSet(logFactory, assembleContext, c, crossLinkResolver, configurationContext, availableExporters))
 			.ToDictionary(s => s.Checkout.Repository.Name, s => s)
 			.ToFrozenDictionary();
 	}