WIP

Author: BenjaminMichaelis

EssentialCSharp.Web.Tests/SiteMappingTests.cs

@@ -5,7 +5,7 @@ namespace EssentialCSharp.Web.Tests;
 public class SiteMappingTests
 {
     static SiteMapping HelloWorldSiteMapping => new(
-            key: "hello-world",
+            keys: ["hello-world"],
             pagePath:
             [
                 "Chapters",
@@ -22,7 +22,7 @@ public class SiteMappingTests
     );
 
     static SiteMapping CSyntaxFundamentalsSiteMapping => new(
-            key: "c-syntax-fundamentals",
+            keys: ["c-syntax-fundamentals"],
             pagePath:
             [
                 "Chapters",
@@ -52,30 +52,30 @@ public void FindHelloWorldWithAnchorSlugReturnsCorrectSiteMap()
     {
         SiteMapping? foundSiteMap = GetSiteMap().Find("hello-world#hello-world");
         Assert.NotNull(foundSiteMap);
-        Assert.Equal(HelloWorldSiteMapping, foundSiteMap);
+        Assert.Equivalent(HelloWorldSiteMapping, foundSiteMap);
     }
 
     [Fact]
     public void FindCSyntaxFundamentalsWithSpacesReturnsCorrectSiteMap()
     {
         SiteMapping? foundSiteMap = GetSiteMap().Find("C# Syntax Fundamentals");
         Assert.NotNull(foundSiteMap);
-        Assert.Equal(CSyntaxFundamentalsSiteMapping, foundSiteMap);
+        Assert.Equivalent(CSyntaxFundamentalsSiteMapping, foundSiteMap);
     }
 
     [Fact]
     public void FindCSyntaxFundamentalsWithSpacesAndAnchorReturnsCorrectSiteMap()
     {
         SiteMapping? foundSiteMap = GetSiteMap().Find("C# Syntax Fundamentals#hello-world");
         Assert.NotNull(foundSiteMap);
-        Assert.Equal(CSyntaxFundamentalsSiteMapping, foundSiteMap);
+        Assert.Equivalent(CSyntaxFundamentalsSiteMapping, foundSiteMap);
     }
 
     [Fact]
     public void FindCSyntaxFundamentalsSanitizedWithAnchorReturnsCorrectSiteMap()
     {
         SiteMapping? foundSiteMap = GetSiteMap().Find("c-syntax-fundamentals#hello-world");
         Assert.NotNull(foundSiteMap);
-        Assert.Equal(CSyntaxFundamentalsSiteMapping, foundSiteMap);
+        Assert.Equivalent(CSyntaxFundamentalsSiteMapping, foundSiteMap);
     }
 }

EssentialCSharp.Web/Controllers/HomeController.cs

@@ -125,7 +125,7 @@ private string FlipPage(int currentChapter, int currentPage, bool next)
                 return "";
             }
         }
-        return $"{siteMap.Key}#{siteMap.AnchorId}";
+        return $"{siteMap.Keys.First()}#{siteMap.AnchorId}";
     }
 
     [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]

EssentialCSharp.Web/Extensions/SiteMappingListExtensions.cs

@@ -16,7 +16,7 @@ public static class SiteMappingListExtensions
         }
         foreach (string? potentialMatch in key.GetPotentialMatches())
         {
-            if (siteMappings.FirstOrDefault(x => x.Key == potentialMatch) is { } siteMap)
+            if (siteMappings.FirstOrDefault(x => x.Keys.Any(x => x == potentialMatch)) is { } siteMap)
             {
                 return siteMap;
             }

EssentialCSharp.Web/Views/Shared/_Layout.cshtml

@@ -277,18 +277,18 @@
             .Select(i => new
             {
                 Level = indentLevel,
-                Key = i.Key,
-                Href = $"{i.Key}#{i.AnchorId}",
+                Key = i.Keys.First(),
+                Href = $"{i.Keys.First()}#{i.AnchorId}",
                 Title = i.RawHeading,
                 // Any children of this node will be /after/ this node,
                 // so skip any items that are /before/ the current node.
-                Items = GetItems(chapterItems.SkipWhile(q => i.Key != q.Key), indentLevel + 1)
+                Items = GetItems(chapterItems.SkipWhile(q => i.Keys.First() != q.Keys.First()), indentLevel + 1)
             });
             var tocData = _SiteMappings.SiteMappings.GroupBy(x => x.ChapterNumber).OrderBy(x => x.Key).Select(x => new
             {
                 Level = 0,
-                Key = x.First().Key,
-                Href = $"{x.First().Key}#{x.First().AnchorId}",
+                Key = x.First().Keys.First(),
+                Href = $"{x.First().Keys.First()}#{x.First().AnchorId}",
                 Title = $"Chapter {x.Key}: {x.First().ChapterTitle}",
                 Items = GetItems(x, 1)
             });