claude: wip jupyter discovery port 6/n

Author: gordonwoodhull

packages/quarto-types/src/quarto-api.ts

@@ -17,6 +17,7 @@ import type {
 } from './jupyter-types.ts';
 import { PandocIncludes } from './execution-engine.ts';
 import { Format } from './metadata-types.ts';
+import { EngineProjectContext } from './project-context.ts';
 
 /**
  * Process execution result
@@ -231,19 +232,15 @@ export interface QuartoAPI {
      * Convert Quarto markdown to Jupyter notebook
      *
      * @param markdown - Markdown content with YAML frontmatter
-     * @param kernelspec - Jupyter kernelspec for the notebook
-     * @param title - Optional title for the notebook
-     * @param format - Optional format information
-     * @param options - Optional conversion options
-     * @returns Jupyter notebook generated from markdown
+     * @param includeIds - Whether to include cell IDs
+     * @param project - Optional project context for config merging
+     * @returns Promise resolving to Jupyter notebook generated from markdown
      */
     quartoMdToJupyter: (
       markdown: string,
-      kernelspec: JupyterKernelspec,
-      title?: string,
-      format?: Format,
-      options?: QuartoMdToJupyterOptions
-    ) => JupyterNotebook;
+      includeIds: boolean,
+      project?: EngineProjectContext
+    ) => Promise<JupyterNotebook>;
 
     // 3. Notebook Processing & Assets
 

src/core/jupyter/jupyter.ts

@@ -153,7 +153,7 @@ import {
   removeIfEmptyDir,
 } from "../path.ts";
 import { convertToHtmlSpans, hasAnsiEscapeCodes } from "../ansi-colors.ts";
-import { kProjectType, ProjectContext } from "../../project/types.ts";
+import { kProjectType, EngineProjectContext } from "../../project/types.ts";
 import { mergeConfigs } from "../config.ts";
 import { encodeBase64 } from "encoding/base64";
 import {
@@ -290,7 +290,7 @@ const ticksForCode = (code: string[]) => {
 export async function quartoMdToJupyter(
   markdown: string,
   includeIds: boolean,
-  project?: ProjectContext,
+  project?: EngineProjectContext,
 ): Promise<JupyterNotebook> {
   const [kernelspec, metadata] = await jupyterKernelspecFromMarkdown(
     markdown,
@@ -500,7 +500,7 @@ export async function quartoMdToJupyter(
 
 export async function jupyterKernelspecFromMarkdown(
   markdown: string,
-  project?: ProjectContext,
+  project?: EngineProjectContext,
 ): Promise<[JupyterKernelspec, Metadata]> {
   const config = project?.config;
   const yaml = config

src/core/quarto-api.ts

@@ -4,7 +4,7 @@
 import { MappedString } from "./lib/text-types.ts";
 import { Format, Metadata, FormatPandoc } from "../config/types.ts";
 import { PartitionedMarkdown } from "./pandoc/types.ts";
-import type { ProjectContext } from "../project/types.ts";
+import type { EngineProjectContext } from "../project/types.ts";
 import type {
   JupyterNotebook,
   JupyterToMarkdownOptions,
@@ -144,7 +144,7 @@ export interface QuartoAPI {
     isJupyterNotebook: (file: string) => boolean;
     isPercentScript: (file: string, extensions?: string[]) => boolean;
     notebookExtensions: string[];
-    kernelspecFromMarkdown: (markdown: string, project?: ProjectContext) => Promise<[JupyterKernelspec, Metadata]>;
+    kernelspecFromMarkdown: (markdown: string, project?: EngineProjectContext) => Promise<[JupyterKernelspec, Metadata]>;
     fromJSON: (nbJson: string) => JupyterNotebook;
 
     // 2. Notebook Conversion
@@ -155,7 +155,7 @@ export interface QuartoAPI {
     markdownFromNotebookFile: (file: string, format?: Format) => Promise<string>;
     markdownFromNotebookJSON: (nb: JupyterNotebook) => string;
     percentScriptToMarkdown: (file: string) => string;
-    quartoMdToJupyter: (markdown: string, includeIds: boolean, project?: ProjectContext) => Promise<JupyterNotebook>;
+    quartoMdToJupyter: (markdown: string, includeIds: boolean, project?: EngineProjectContext) => Promise<JupyterNotebook>;
 
     // 3. Notebook Processing & Assets
     notebookFiltered: (input: string, filters: string[]) => Promise<string>;

src/execute/jupyter/jupyter.ts

@@ -70,7 +70,6 @@ interface JupyterTargetData {
 import { quartoAPI as quarto } from "../../core/quarto-api.ts";
 import { postProcessRestorePreservedHtml } from "../engine-shared.ts";
 import { MappedString } from "../../core/mapped-text.ts";
-import { ProjectContext } from "../../project/types.ts";
 import { isQmdFile } from "../qmd.ts";
 import { kJupyterPercentScriptExtensions } from "./percent.ts";
 import {
@@ -670,7 +669,7 @@ function fixupShinyliveCodeCells(nb: JupyterNotebook) {
 
 async function createNotebookforTarget(
   target: ExecutionTarget,
-  project?: ProjectContext,
+  project?: EngineProjectContext,
 ) {
   const nb = await quarto.jupyter.quartoMdToJupyter(target.markdown.value, true, project);
   Deno.writeTextFileSync(target.input, JSON.stringify(nb, null, 2));

src/project/types.ts

@@ -168,12 +168,14 @@ export interface EngineProjectContext {
   /**
    * Config object containing project configuration
    * Used primarily for config?.engines access
+   * Can contain arbitrary configuration properties
    */
   config?: {
     engines?: string[];
     project?: {
       [kProjectOutputDir]?: string;
     };
+    [key: string]: unknown;
   };
 
   /**