Merge branch 'main' into copilot/fix-54

Author: matt-goldman

assets/blake.png

@@ -45,4 +45,4 @@ public class BlakeContext
 }
 
 public record MarkdownPage(string MdPath, string TemplatePath, string Slug, string RawMarkdown);
-public record GeneratedPage(PageModel Page, string OutputPath, string RazorHtml);
+public record GeneratedPage(PageModel Page, string OutputPath, string RazorHtml, string RawHtml);

src/Blake.BuildTools/BlakeContext.cs

@@ -337,7 +337,7 @@ private static async Task BakeContent(
 
                 logger.LogInformation("✅ Generated page: {OutputPath}", outputPath);
 
-                context.GeneratedPages.Add(new GeneratedPage(page, outputPath, generatedRazor));
+                context.GeneratedPages.Add(new GeneratedPage(page, outputPath, generatedRazor, renderedHtml));
             }
             catch (Exception e)
             {

src/Blake.BuildTools/Generator/SiteGenerator.cs

@@ -178,10 +178,15 @@ private static bool IsNuGetPluginValid(NuGetPluginInfo plugin, ILogger? logger)
                 plugin.PackageName, plugin.Version, fileVersion);
             return false;
         }
+        catch (NotSupportedException ex)
+        {
+            logger?.LogWarning(ex, "File format not supported when checking version for NuGet plugin: {dllPath}. Assuming valid.", plugin.DllPath);
+            return true; // Assume valid if file format is not supported
+        }
         catch (Exception ex)
         {
-            logger?.LogDebug(ex, "Error checking version for NuGet plugin: {dllPath}", plugin.DllPath);
-            return false; // Assume invalid if we can't check version
+            logger?.LogError(ex, "Unexpected error checking version for NuGet plugin: {dllPath}. Assuming invalid.", plugin.DllPath);
+            return false; // Assume invalid for other exceptions
         }
     }
 

src/Blake.BuildTools/Utils/PluginLoader.cs

@@ -1,30 +1,54 @@
-using System.Text;
 using Markdig.Renderers;
 using Markdig.Renderers.Html;
 using Markdig.Syntax.Inlines;
+using System.Text;
+using System.Text.RegularExpressions;
 
 namespace Blake.MarkdownParser;
 
-
-public class ImageCaptionRenderer : HtmlObjectRenderer<LinkInline>
+public partial class ImageCaptionRenderer : HtmlObjectRenderer<LinkInline>
 {
+    private static readonly Regex _shorthandDimensionsRegex = ShorthandRegex();
+
     protected override void Write(HtmlRenderer renderer, LinkInline link)
     {
         if (link.IsImage)
         {
-
             var caption = link.FirstChild?.ToString() ?? "";
-            var src = link.Url?.Trim() ?? "";
+            var originalSrc = link.Url?.Trim() ?? "";
+
+            // Parse shorthand dimensions from URL (e.g., "/image.png =200x300")
+            var (src, shorthandWidth, shorthandHeight) = ParseShorthandDimensions(originalSrc);
 
             // Read GenericAttributes
             var attrs = link.TryGetAttributes();
 
+            // Apply shorthand dimensions if no explicit width/height attributes are present
+            if (attrs == null)
+            {
+                attrs = new HtmlAttributes();
+            }
+
+            // Only apply shorthand if no explicit dimensions are set via generic attributes
+            var hasExplicitWidth = attrs.Properties?.Any(p => p.Key == "width") ?? false;
+            var hasExplicitHeight = attrs.Properties?.Any(p => p.Key == "height") ?? false;
+
+            if (!hasExplicitWidth && shorthandWidth.HasValue)
+            {
+                attrs.AddProperty("width", shorthandWidth.Value.ToString());
+            }
+
+            if (!hasExplicitHeight && shorthandHeight.HasValue)
+            {
+                attrs.AddProperty("height", shorthandHeight.Value.ToString());
+            }
+
             // Build attribute string
             var attrString = BuildAttributeString(attrs);
 
             // Fallback style if no explicit width or style
-            var hasWidth = attrs?.Properties?.Any(p => p.Key == "width") ?? false;
-            var hasStyle = attrs?.Properties?.Any(p => p.Key == "style") ?? false;
+            var hasWidth = attrs.Properties?.Any(p => p.Key == "width") ?? false;
+            var hasStyle = attrs.Properties?.Any(p => p.Key == "style") ?? false;
             if (!hasWidth && !hasStyle)
             {
                 attrString += " style=\"max-width:100%;height:auto;\"";
@@ -52,7 +76,7 @@ private string BuildAttributeString(HtmlAttributes? attrs)
 
         var sb = new StringBuilder();
 
-        foreach (var prop in attrs?.Properties?? [])
+        foreach (var prop in attrs?.Properties ?? [])
         {
             var safeName = HtmlEscape(prop.Key);
             var safeValue = HtmlEscape(prop.Value ?? "");
@@ -62,6 +86,44 @@ private string BuildAttributeString(HtmlAttributes? attrs)
         return sb.ToString();
     }
 
+    private static (string cleanUrl, int? width, int? height) ParseShorthandDimensions(string url)
+    {
+        var match = _shorthandDimensionsRegex.Match(url);
+        if (!match.Success)
+        {
+            return (url, null, null);
+        }
+
+        var cleanUrl = url.Substring(0, match.Index).Trim();
+
+        var widthGroup = match.Groups[1];
+        var heightGroup = match.Groups[2];
+
+        int? width = null;
+        int? height = null;
+
+        if (widthGroup.Success && !string.IsNullOrEmpty(widthGroup.Value))
+        {
+            if (int.TryParse(widthGroup.Value, out var w))
+            {
+                width = w;
+            }
+        }
+
+        if (heightGroup.Success && !string.IsNullOrEmpty(heightGroup.Value))
+        {
+            if (int.TryParse(heightGroup.Value, out var h))
+            {
+                height = h;
+            }
+        }
+
+        return (cleanUrl, width, height);
+    }
+
     private static string HtmlEscape(string input) =>
         System.Net.WebUtility.HtmlEncode(input);
-}
+
+    [GeneratedRegex(@"\s*=(\d*)?x(\d*)?\s*$", RegexOptions.Compiled)]
+    private static partial Regex ShorthandRegex();
+}

src/Blake.MarkdownParser/ImageCaptionRenderer.cs

@@ -363,6 +363,7 @@ private class TestLogger : ILogger
         public List<string> ErrorMessages { get; } = new List<string>();
         public List<string> InfoMessages { get; } = new List<string>();
         public List<string> DebugMessages { get; } = new List<string>();
+        public List<string> WarningMessages { get; } = new List<string>();
 
         public IDisposable? BeginScope<TState>(TState state) where TState : notnull => null;
         public bool IsEnabled(LogLevel logLevel) => true;
@@ -382,6 +383,10 @@ public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Except
             {
                 DebugMessages.Add(message);
             }
+            else if (logLevel == LogLevel.Warning)
+            {
+                WarningMessages.Add(message);
+            }
         }
     }
 }