normalize sidebar logo

and logo-alt to LightDarkLogo
makes me wonder if it is a good idea to have a normalized internal type

we will also need to support dark logo and logo-alt in the logo document option

Author: gordonwoodhull

src/project/types/website/website-navigation.ts

@@ -1012,6 +1012,7 @@ async function sidebarEjsData(project: ProjectContext, sidebar: Sidebar) {
 
   // ensure title and search are present
   sidebar.title = await sidebarTitle(sidebar, project) as string | undefined;
+  console.log("sidebar.logo", sidebar.logo);
   if (sidebar.logo?.light) {
     sidebar.logo.light.path = resolveLogo(sidebar.logo.light.path)!;
   }

src/project/types/website/website-shared.ts

@@ -148,6 +148,17 @@ export async function websiteNavigationConfig(project: ProjectContext) {
       sidebars[0].tools = [];
     }
 
+    if (sidebars[0].logo) { // normalize to LightDarkLogo
+      if (typeof (sidebars[0].logo) === "string") {
+        sidebars[0].logo = {
+          light: {
+            path: sidebars[0].logo,
+            alt: (sidebars[0] as unknown as { "logo-alt": string })["logo-alt"],
+          },
+        };
+      }
+    }
+
     // convert contents: auto into items
     for (const sb of sidebars) {
       if (sb.contents && !Array.isArray(sb.contents)) {

tests/docs/smoke-all/2024/07/09/issue-10251/index.qmd

@@ -3,11 +3,11 @@ title: "issue-10251"
 _quarto:
   tests:
     html:
-      ensureFileRegexMatches:
-        - [
-            '<img src="https://quarto.org/quarto.png" alt="this is the alt text that for the logo in the sidebar" class="sidebar-logo py-0 d-lg-inline d-none">',
-            '<img src="https://quarto.org/quarto.png" alt="this is the alt text that for the logo in the navbar" class="navbar-logo">'
-          ]
+      ensureHtmlElements:
+        -
+          - 'img[src="https://quarto.org/quarto.png"][alt="this is the alt text that for the logo in the sidebar"][class="sidebar-logo light-content py-0 d-lg-inline d-none"]'
+          - 'img[src="https://quarto.org/quarto.png"][alt="this is the alt text that for the logo in the navbar"][class="navbar-logo"]'
+        - []
 ---
 
 This is a Quarto website.