Edits

Author: theletterf

src/Elastic.Markdown/DocumentationGenerator.cs

@@ -147,25 +147,38 @@ public async Task<GenerationResult> GenerateAll(Cancel ctx)
 		_logger.LogInformation($"Generating links.json");
 		var linkReference = await GenerateLinkReference(ctx);
 
-		// Download diagram files in parallel
+		await CreateDiagramCachedFiles();
+		CleanupUnusedDiagrams();
+
+		// ReSharper disable once WithExpressionModifiesAllMembers
+		return result with
+		{
+			Redirects = linkReference.Redirects ?? []
+		};
+	}
+
+	/// <summary>
+	/// Downloads diagram files in parallel from Kroki
+	/// </summary>
+	public async Task CreateDiagramCachedFiles()
+	{
 		var downloadedCount = await DocumentationSet.Context.DiagramRegistry.CreateDiagramCachedFiles(_logger, DocumentationSet.Context.ReadFileSystem);
 		if (downloadedCount > 0)
 		{
 			_logger.LogInformation("Downloaded {DownloadedCount} diagram files from Kroki", downloadedCount);
 		}
+	}
 
-		// Clean up unused diagram files
+	/// <summary>
+	/// Cleans up unused diagram files from the output directory
+	/// </summary>
+	public void CleanupUnusedDiagrams()
+	{
 		var cleanedCount = DocumentationSet.Context.DiagramRegistry.CleanupUnusedDiagrams(DocumentationSet.OutputDirectory);
 		if (cleanedCount > 0)
 		{
 			_logger.LogInformation("Cleaned up {CleanedCount} unused diagram files", cleanedCount);
 		}
-
-		// ReSharper disable once WithExpressionModifiesAllMembers
-		return result with
-		{
-			Redirects = linkReference.Redirects ?? []
-		};
 	}
 
 	private async Task ProcessDocumentationFiles(HashSet<string> offendingFiles, DateTimeOffset outputSeenChanges, Cancel ctx)

src/Elastic.Markdown/Myst/Directives/Diagram/DiagramBlock.cs

@@ -6,6 +6,7 @@
 using System.Text;
 using Elastic.Documentation.Configuration.Diagram;
 using Elastic.Markdown.Diagnostics;
+using Elastic.Markdown.IO;
 
 namespace Elastic.Markdown.Myst.Directives.Diagram;
 
@@ -70,7 +71,12 @@ public override void FinalizeAndValidate(ParserContext context)
 		}
 
 		// Register diagram for tracking, cleanup, and batch caching
+		// Use the markdown file's scope directory for proper relative path resolution
 		var outputDirectory = context.Build.DocumentationOutputDirectory.FullName;
+		if (context.DocumentationFileLookup(context.MarkdownSourcePath) is MarkdownFile currentMarkdown)
+		{
+			outputDirectory = currentMarkdown.ScopeDirectory.FullName;
+		}
 		context.DiagramRegistry.RegisterDiagramForCaching(LocalSvgPath, EncodedUrl, outputDirectory);
 	}
 

src/tooling/docs-builder/Http/DocumentationWebHost.cs

@@ -2,6 +2,7 @@
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information
 
+using System.IO;
 using System.IO.Abstractions;
 using System.Net;
 using System.Runtime.InteropServices;
@@ -153,12 +154,6 @@ await context.Response.WriteAsync(@"
 					FileProvider = new EmbeddedOrPhysicalFileProvider(Context),
 					RequestPath = "/_static"
 				})
-			.UseStaticFiles(
-				new StaticFileOptions
-				{
-					FileProvider = new PhysicalFileProvider(Context.DocumentationOutputDirectory.FullName),
-					RequestPath = ""
-				})
 			.UseRouting();
 
 		_ = _webApplication.MapGet("/", (ReloadableGeneratorState holder, Cancel ctx) =>
@@ -258,6 +253,16 @@ private static async Task<IResult> ServeDocumentationFile(ReloadableGeneratorSta
 				if (s == "index.md")
 					return Results.Redirect(generator.DocumentationSet.MarkdownFiles.First().Url);
 
+				// Check for cached SVG files (e.g., generated diagrams) in the output directory
+				if (Path.GetExtension(slug).Equals(".svg", StringComparison.OrdinalIgnoreCase))
+				{
+					var svgPath = Path.Combine(generator.DocumentationSet.OutputDirectory.FullName, slug.TrimStart('/'));
+					if (File.Exists(svgPath))
+					{
+						return Results.File(svgPath, "image/svg+xml");
+					}
+				}
+
 				if (!generator.DocumentationSet.FlatMappedFiles.TryGetValue("404.md", out var notFoundDocumentationFile))
 					return Results.NotFound();