brand extension: find project dir

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;
           }

src/resources/editor/tools/vs-code.mjs

@@ -13050,6 +13050,22 @@ var require_yaml_intelligence_resources = __commonJS({
             }
           }
         },
+        {
+          id: "brand-path-only-light-dark",
+          anyOf: [
+            "string",
+            {
+              object: {
+                closed: true,
+                properties: {
+                  light: "string",
+                  dark: "string"
+                }
+              }
+            }
+          ],
+          description: "A path to a brand.yml file, or an object with light and dark paths to brand.yml\n"
+        },
         {
           id: "brand-path-bool-light-dark",
           anyOf: [
@@ -20452,9 +20468,9 @@ var require_yaml_intelligence_resources = __commonJS({
                 },
                 brand: {
                   schema: {
-                    ref: "brand-path-bool-light-dark"
+                    ref: "brand-path-only-light-dark"
                   },
-                  description: "Branding information to use for this document. If a string, the path to a brand file.\nIf false, don't use branding on this document. If an object, an inline brand\ndefinition, or an object with light and dark brand paths or definitions.\n"
+                  description: "Path to brand.yml or object with light and dark paths to brand.yml\n"
                 },
                 preview: {
                   description: "Options for `quarto preview`",
@@ -23995,6 +24011,7 @@ var require_yaml_intelligence_resources = __commonJS({
         "HTML library (JS/CSS/etc.) directory",
         "Additional file resources to be copied to output directory",
         "Additional file resources to be copied to output directory",
+        "Branding information to use for this document. If a string, the path\nto a brand file. If false, don\u2019t use branding on this document. If an\nobject, an inline brand definition, or an object with light and dark\nbrand paths or definitions.",
         "Options for <code>quarto preview</code>",
         "Scripts to run as a pre-render step",
         "Scripts to run as a post-render step",
@@ -24344,6 +24361,7 @@ var require_yaml_intelligence_resources = __commonJS({
         "HTML library (JS/CSS/etc.) directory",
         "Additional file resources to be copied to output directory",
         "Additional file resources to be copied to output directory",
+        "Branding information to use for this document. If a string, the path\nto a brand file. If false, don\u2019t use branding on this document. If an\nobject, an inline brand definition, or an object with light and dark\nbrand paths or definitions.",
         "Options for <code>quarto preview</code>",
         "Scripts to run as a pre-render step",
         "Scripts to run as a post-render step",
@@ -24678,7 +24696,8 @@ var require_yaml_intelligence_resources = __commonJS({
         "Disambiguating year suffix in author-date styles (e.g.&nbsp;\u201Ca\u201D in \u201CDoe,\n1999a\u201D).",
         "Manuscript configuration",
         "internal-schema-hack",
-        "List execution engines you want to give priority when determining\nwhich engine should render a notebook. If two engines have support for a\nnotebook, the one listed earlier will be chosen. Quarto\u2019s default order\nis \u2018knitr\u2019, \u2018jupyter\u2019, \u2018markdown\u2019, \u2018julia\u2019."
+        "List execution engines you want to give priority when determining\nwhich engine should render a notebook. If two engines have support for a\nnotebook, the one listed earlier will be chosen. Quarto\u2019s default order\nis \u2018knitr\u2019, \u2018jupyter\u2019, \u2018markdown\u2019, \u2018julia\u2019.",
+        "A path to a brand.yml file, or an object with light and dark paths to\nbrand.yml"
       ],
       "schema/external-schemas.yml": [
         {
@@ -24907,12 +24926,12 @@ var require_yaml_intelligence_resources = __commonJS({
         mermaid: "%%"
       },
       "handlers/mermaid/schema.yml": {
-        _internalId: 197505,
+        _internalId: 197527,
         type: "object",
         description: "be an object",
         properties: {
           "mermaid-format": {
-            _internalId: 197497,
+            _internalId: 197519,
             type: "enum",
             enum: [
               "png",
@@ -24928,7 +24947,7 @@ var require_yaml_intelligence_resources = __commonJS({
             exhaustiveCompletions: true
           },
           theme: {
-            _internalId: 197504,
+            _internalId: 197526,
             type: "anyOf",
             anyOf: [
               {

src/resources/editor/tools/yaml/yaml-intelligence-resources.json

@@ -6022,6 +6022,22 @@
         }
       }
     },
+    {
+      "id": "brand-path-only-light-dark",
+      "anyOf": [
+        "string",
+        {
+          "object": {
+            "closed": true,
+            "properties": {
+              "light": "string",
+              "dark": "string"
+            }
+          }
+        }
+      ],
+      "description": "A path to a brand.yml file, or an object with light and dark paths to brand.yml\n"
+    },
     {
       "id": "brand-path-bool-light-dark",
       "anyOf": [
@@ -13424,9 +13440,9 @@
             },
             "brand": {
               "schema": {
-                "ref": "brand-path-bool-light-dark"
+                "ref": "brand-path-only-light-dark"
               },
-              "description": "Branding information to use for this document. If a string, the path to a brand file.\nIf false, don't use branding on this document. If an object, an inline brand\ndefinition, or an object with light and dark brand paths or definitions.\n"
+              "description": "Path to brand.yml or object with light and dark paths to brand.yml\n"
             },
             "preview": {
               "description": "Options for `quarto preview`",
@@ -16967,6 +16983,7 @@
     "HTML library (JS/CSS/etc.) directory",
     "Additional file resources to be copied to output directory",
     "Additional file resources to be copied to output directory",
+    "Branding information to use for this document. If a string, the path\nto a brand file. If false, don’t use branding on this document. If an\nobject, an inline brand definition, or an object with light and dark\nbrand paths or definitions.",
     "Options for <code>quarto preview</code>",
     "Scripts to run as a pre-render step",
     "Scripts to run as a post-render step",
@@ -17316,6 +17333,7 @@
     "HTML library (JS/CSS/etc.) directory",
     "Additional file resources to be copied to output directory",
     "Additional file resources to be copied to output directory",
+    "Branding information to use for this document. If a string, the path\nto a brand file. If false, don’t use branding on this document. If an\nobject, an inline brand definition, or an object with light and dark\nbrand paths or definitions.",
     "Options for <code>quarto preview</code>",
     "Scripts to run as a pre-render step",
     "Scripts to run as a post-render step",
@@ -17650,7 +17668,8 @@
     "Disambiguating year suffix in author-date styles (e.g.&nbsp;“a” in “Doe,\n1999a”).",
     "Manuscript configuration",
     "internal-schema-hack",
-    "List execution engines you want to give priority when determining\nwhich engine should render a notebook. If two engines have support for a\nnotebook, the one listed earlier will be chosen. Quarto’s default order\nis ‘knitr’, ‘jupyter’, ‘markdown’, ‘julia’."
+    "List execution engines you want to give priority when determining\nwhich engine should render a notebook. If two engines have support for a\nnotebook, the one listed earlier will be chosen. Quarto’s default order\nis ‘knitr’, ‘jupyter’, ‘markdown’, ‘julia’.",
+    "A path to a brand.yml file, or an object with light and dark paths to\nbrand.yml"
   ],
   "schema/external-schemas.yml": [
     {
@@ -17879,12 +17898,12 @@
     "mermaid": "%%"
   },
   "handlers/mermaid/schema.yml": {
-    "_internalId": 197505,
+    "_internalId": 197527,
     "type": "object",
     "description": "be an object",
     "properties": {
       "mermaid-format": {
-        "_internalId": 197497,
+        "_internalId": 197519,
         "type": "enum",
         "enum": [
           "png",
@@ -17900,7 +17919,7 @@
         "exhaustiveCompletions": true
       },
       "theme": {
-        "_internalId": 197504,
+        "_internalId": 197526,
         "type": "anyOf",
         "anyOf": [
           {

src/resources/schema/definitions.yml

@@ -3343,6 +3343,17 @@
       defaults:
         ref: brand-defaults
 
+- id: brand-path-only-light-dark
+  anyOf:
+    - string
+    - object:
+        closed: true
+        properties:
+          light: string
+          dark: string
+  description: |
+    A path to a brand.yml file, or an object with light and dark paths to brand.yml
+
 - id: brand-path-bool-light-dark
   anyOf:
     - string # a file path

src/resources/schema/json-schemas.json

@@ -4077,6 +4077,25 @@
         }
       }
     },
+    "BrandPathOnlyLightDark": {
+      "anyOf": [
+        {
+          "type": "string"
+        },
+        {
+          "object": {
+            "properties": {
+              "light": {
+                "type": "string"
+              },
+              "dark": {
+                "type": "string"
+              }
+            }
+          }
+        }
+      ]
+    },
     "BrandPathBoolLightDark": {
       "anyOf": [
         {
@@ -4180,7 +4199,7 @@
             ]
           },
           "brand": {
-            "$ref": "#/$defs/BrandPathBoolLightDark"
+            "$ref": "#/$defs/BrandPathOnlyLightDark"
           },
           "preview": {
             "$ref": "#/$defs/ProjectPreview"

src/resources/schema/project.yml

@@ -34,11 +34,9 @@
             description: "Additional file resources to be copied to output directory"
         brand:
           schema:
-            ref: brand-path-bool-light-dark
+            ref: brand-path-only-light-dark
           description: |
-            Branding information to use for this document. If a string, the path to a brand file.
-            If false, don't use branding on this document. If an object, an inline brand
-            definition, or an object with light and dark brand paths or definitions.
+            Path to brand.yml or object with light and dark paths to brand.yml
         preview:
           description: Options for `quarto preview`
           schema:

src/resources/types/schema-types.ts

@@ -1553,6 +1553,11 @@ export type BrandUnified = {
   typography?: BrandTypographyUnified;
 };
 
+export type BrandPathOnlyLightDark = string | {
+  dark?: string;
+  light?: string;
+}; /* A path to a brand.yml file, or an object with light and dark paths to brand.yml */
+
 export type BrandPathBoolLightDark =
   | string
   | boolean
@@ -1588,7 +1593,7 @@ export type ProjectConfig = {
   "lib-dir"?: string /* HTML library (JS/CSS/etc.) directory */;
   "pre-render"?: MaybeArrayOf<string>;
   "post-render"?: MaybeArrayOf<string>;
-  brand?: BrandPathBoolLightDark;
+  brand?: BrandPathOnlyLightDark;
   detect?: ((string)[])[];
   preview?: ProjectPreview;
   render?: (string)[] /* Files to render (defaults to all files) */;