scan directory upward to find project dir

which should be parent of _extensions

Author: gordonwoodhull

src/extension/extension.ts

@@ -17,6 +17,7 @@ import {
 } from "../project/types.ts";
 
 import {
+  basename,
   dirname,
   isAbsolute,
   join,
@@ -158,7 +159,10 @@ export function projectExtensionPathResolver(
   return (href: string, projectOffset: string) => {
     const projectRelativeHref = relative(projectOffset, href);
 
-    if (projectRelativeHref.startsWith("_extensions/") || projectRelativeHref.startsWith("_extensions\\")) {
+    if (
+      projectRelativeHref.startsWith("_extensions/") ||
+      projectRelativeHref.startsWith("_extensions\\")
+    ) {
       const projectTargetHref = projectRelativeHref.replace(
         /^_extensions/,
         `${libDir}/quarto-contrib/quarto-project`,
@@ -809,10 +813,18 @@ async function readExtension(
         );
         if (resolved.include.length > 0) {
           if (key === "brand") {
-            (object.project as Record<string, unknown>)[key] = relative(
-              join(extensionDir, "..", ".."),
-              resolved.include[0],
-            );
+            let projectDir = extensionDir, last;
+            do {
+              last = basename(projectDir);
+              projectDir = dirname(projectDir);
+            } while (projectDir && last !== "_extensions");
+            if (projectDir) {
+              (object.project as Record<string, unknown>)[key] = relative(
+                projectDir,
+                resolved.include[0],
+              );
+              console.log("aslfjasf", projectDir, object.project);
+            }
           } else {
             (object.project as Record<string, unknown>)[key] = resolved.include;
           }

tests/docs/smoke-all/brand/logo/logo-extension-github/.gitignore

@@ -0,0 +1 @@
+/.quarto/

tests/docs/smoke-all/brand/logo/logo-extension-github/_extensions/my-org/my-brand/_extension.yml

@@ -0,0 +1,8 @@
+title: My-brand
+author: Gordon Woodhull
+version: 1.0.0
+quarto-required: ">=99.9.0"
+contributes:
+  metadata:
+    project:
+      brand: mybrand.yml

tests/docs/smoke-all/brand/logo/logo-extension-github/_extensions/my-org/my-brand/images/moon-face.png

@@ -0,0 +1,18 @@
+logo:
+  images:
+    sun:
+      path: images/sun-face.png
+      alt: sun face
+    moon:
+      path: images/moon-face.png
+      alt: moon face
+  medium:
+    light: sun
+    dark: moon
+color:
+  background:
+    light: "#def"
+    dark: "#042"
+  foreground:
+    light: "#411"
+    dark: "#ffe"

tests/docs/smoke-all/brand/logo/logo-extension-github/_extensions/my-org/my-brand/images/sun-face.png

@@ -0,0 +1,13 @@
+project:
+  type: website
+format:
+  html:
+    theme:
+      light: brand
+      dark: [brand, dark-fixups.scss]
+website:
+  sidebar:
+    style: "docked"
+    search: true
+    contents:
+      - test.qmd

tests/docs/smoke-all/brand/logo/logo-extension-github/_extensions/my-org/my-brand/mybrand.yml

@@ -0,0 +1,9 @@
+/*-- scss:rules --*/
+
+nav.sidebar.sidebar-navigation:not(.rollup) {
+  background-color: #282b30;
+}
+
+nav.navbar {
+  background-color: rgba(13, 251, 108, 0.14);
+}

tests/docs/smoke-all/brand/logo/logo-extension-github/_quarto.yml

@@ -0,0 +1,47 @@
+---
+title: test brand extension
+format:
+  html: default
+  dashboard: default
+  revealjs: default
+  typst:
+    output-ext: typ
+_quarto:
+  tests:
+    html:
+      ensureFileRegexMatches:
+        -
+          - '<img src="site_libs(/|\\)quarto-contrib(/|\\)quarto-project(/|\\)my-org(/|\\)my-brand(/|\\)images(/|\\)sun-face\.png" alt="sun face" class=".*light-content.*">'
+          - '<img src="site_libs(/|\\)quarto-contrib(/|\\)quarto-project(/|\\)my-org(/|\\)my-brand(/|\\)images(/|\\)moon-face\.png" alt="moon face" class=".*dark-content.*">'
+        - []
+    dashboard:
+      ensureFileRegexMatches:
+        -
+          - '<img src="site_libs(/|\\)quarto-contrib(/|\\)quarto-project(/|\\)my-org(/|\\)my-brand(/|\\)images(/|\\)sun-face\.png" alt="sun face" class=".*light-content.*">'
+          - '<img src="site_libs(/|\\)quarto-contrib(/|\\)quarto-project(/|\\)my-org(/|\\)my-brand(/|\\)images(/|\\)moon-face\.png" alt="moon face" class=".*dark-content.*">'
+        - []
+    revealjs:
+      ensureFileRegexMatches:
+        -
+          - '<img src="site_libs(/|\\)quarto-contrib(/|\\)quarto-project(/|\\)my-org(/|\\)my-brand(/|\\)images(/|\\)sun-face\.png" alt="sun face".*>'
+        -
+          - 'moon-face'
+    typst:
+      ensureTypstFileRegexMatches:
+        -
+          - 'background: align\(left\+top, box\(inset: 0.75in, image\("_extensions(/|\\\\)my-org(/|\\\\)my-brand(/|\\\\)images(/|\\\\)sun-face.png", width: 1\.5in, alt: "sun face"\)\)'
+        -
+          - 'image\.*moon-face'
+---
+
+# brand.yml extension
+
+Here is some inline code `def foo(x): return x`{.python} and `y`{.python} and `z`{.python}.
+
+
+{{< lipsum 1 >}}
+
+```{.python}
+# | echo: true
+print(1+2)
+```