explicitly encode single-file vs multi-file to allow disambiguating at usage site

Author: cscheid

src/core/jupyter/jupyter-embed.ts

@@ -353,9 +353,9 @@ export async function replaceNotebookPlaceholders(
   };
 }
 
-function resolveNbPath(input: string, path: string, context?: ProjectContext) {
+function resolveNbPath(input: string, path: string, context: ProjectContext) {
   // If this is a project, absolute means project relative
-  if (context) {
+  if (context.projectType === "multi-file") {
     const projectMatch = path.match(/^[\\/](.*)/);
     if (projectMatch) {
       return join(context.dir, projectMatch[1]);
@@ -368,8 +368,11 @@ function resolveNbPath(input: string, path: string, context?: ProjectContext) {
     if (isAbsolute(input)) {
       return join(dirname(input), path);
     } else {
-      const baseDir = context ? context.dir : Deno.cwd();
-      return join(baseDir, dirname(input), path);
+      const baseDir = context.projectType === "multi-file"
+        ? context.dir
+        : Deno.cwd();
+      const result = join(baseDir, dirname(input), path);
+      return result;
     }
   }
 }

src/project/project-context.ts

@@ -287,6 +287,7 @@ export async function projectContext(
               force,
             );
           },
+          projectType: "multi-file",
         };
         if (type.formatExtras) {
           result.formatExtras = async (
@@ -300,7 +301,7 @@ export async function projectContext(
       } else {
         const { files, engines } = projectInputFiles(dir);
         debug(`projectContext: Found Quarto project in ${dir}`);
-        const result = {
+        const result: ProjectContext = {
           dir,
           engines,
           config: projectConfig,
@@ -326,6 +327,7 @@ export async function projectContext(
             );
           },
           notebookContext,
+          projectType: "multi-file",
         };
         return result;
       }
@@ -364,6 +366,7 @@ export async function projectContext(
                 force,
               );
             },
+            projectType: "multi-file",
           };
           if (Deno.statSync(path).isDirectory) {
             const { files, engines } = projectInputFiles(originalDir);

src/project/types.ts

@@ -75,6 +75,8 @@ export interface ProjectContext {
   ) => Promise<Record<string, Format>>;
 
   environment: () => Promise<ProjectEnvironment>;
+
+  projectType: "single-file" | "multi-file";
 }
 
 export interface ProjectFiles {

src/project/types/single-file/single-file.ts

@@ -49,6 +49,7 @@ export function singleFileProjectContext(
         force,
       );
     },
+    projectType: "single-file",
   };
   return result;
 }