refactor single-file field

Author: cscheid

src/core/jupyter/jupyter-embed.ts

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

src/project/project-context.ts

@@ -287,7 +287,7 @@ export async function projectContext(
               force,
             );
           },
-          projectType: "multi-file",
+          isSingleFile: false,
         };
         if (type.formatExtras) {
           result.formatExtras = async (
@@ -327,7 +327,7 @@ export async function projectContext(
             );
           },
           notebookContext,
-          projectType: "multi-file",
+          isSingleFile: false,
         };
         return result;
       }
@@ -366,7 +366,7 @@ export async function projectContext(
                 force,
               );
             },
-            projectType: "multi-file",
+            isSingleFile: false,
           };
           if (Deno.statSync(path).isDirectory) {
             const { files, engines } = projectInputFiles(originalDir);

src/project/types.ts

@@ -76,7 +76,7 @@ export interface ProjectContext {
 
   environment: () => Promise<ProjectEnvironment>;
 
-  projectType: "single-file" | "multi-file";
+  isSingleFile: boolean;
 }
 
 export interface ProjectFiles {

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

@@ -49,38 +49,7 @@ export function singleFileProjectContext(
         force,
       );
     },
-    projectType: "single-file",
+    isSingleFile: true,
   };
   return result;
 }
-
-// export interface ProjectContext {
-//   dir: string;
-//   engines: string[];
-//   files: ProjectFiles;
-//   config?: ProjectConfig;
-//   notebookContext: NotebookContext;
-//   outputNameIndex?: Map<string, { file: string; format: Format } | undefined>;
-
-//   // This is a cache of the engine and target for a given filename
-//   engineAndTargetCache?: Map<
-//     string,
-//     { engine: ExecutionEngine; target: ExecutionTarget }
-//   >;
-
-//   formatExtras?: (
-//     source: string,
-//     flags: PandocFlags,
-//     format: Format,
-//     services: RenderServices,
-//   ) => Promise<FormatExtras>;
-
-//   renderFormats: (
-//     file: string,
-//     services: RenderServices,
-//     to?: string,
-//     project?: ProjectContext,
-//   ) => Promise<Record<string, Format>>;
-
-//   environment: () => Promise<ProjectEnvironment>;
-// }