Cleanup

Author: dragonstyle

src/command/render/render.ts

@@ -50,7 +50,7 @@ import {
   withTimingAsync,
 } from "../../core/timing.ts";
 import { filesDirMediabagDir } from "./render-paths.ts";
-import { replaceNotebookPlaceholders } from "../../core/handlers/include-notebook.ts";
+import { replaceNotebookPlaceholders } from "../../core/jupyter/jupyter-embed.ts";
 
 export async function renderPandoc(
   file: ExecutedFile,

src/core/handlers/embed.ts

@@ -14,11 +14,10 @@ import {
 } from "../lib/mapped-text.ts";
 
 import { DirectiveCell } from "../lib/break-quarto-md-types.ts";
-
 import {
   notebookMarkdownPlaceholder,
-  parseNotebookPath,
-} from "./include-notebook.ts";
+  parseNotebookAddress,
+} from "../jupyter/jupyter-embed.ts";
 
 interface EmbedHandler {
   name: string;
@@ -40,7 +39,7 @@ const kHandlers: EmbedHandler[] = [
       // Resolve the filename into a path
       const path = handlerContext.resolvePath(filename);
 
-      const notebookAddress = parseNotebookPath(path);
+      const notebookAddress = parseNotebookAddress(path);
       if (notebookAddress) {
         const placeHolder = notebookMarkdownPlaceholder(path, {
           echo: false,

src/core/handlers/include.ts

@@ -18,11 +18,10 @@ import {
 import { rangedLines } from "../lib/ranged-text.ts";
 import { isBlockShortcode } from "../lib/parse-shortcode.ts";
 import { DirectiveCell } from "../lib/break-quarto-md-types.ts";
-
 import {
   notebookMarkdownPlaceholder,
-  parseNotebookPath,
-} from "./include-notebook.ts";
+  parseNotebookAddress,
+} from "../jupyter/jupyter-embed.ts";
 
 const includeHandler: LanguageHandler = {
   ...baseHandler,
@@ -50,7 +49,7 @@ const includeHandler: LanguageHandler = {
         );
       }
 
-      const notebookAddress = parseNotebookPath(path);
+      const notebookAddress = parseNotebookAddress(path);
       if (notebookAddress) {
         const placeHolder = notebookMarkdownPlaceholder(path, {});
         textFragments.push(placeHolder);