more convert work

Author: jjallaire

src/command/convert/cmd.ts

@@ -26,7 +26,7 @@ export const convertCommand = new Command()
     "Convert between markdown and notebook representations of documents.",
   )
   .option(
-    "-t, --to <format:string>",
+    "-t, --to [format:string]",
     "Format to convert to (markdown or notebook)",
   )
   .option(
@@ -65,8 +65,10 @@ export const convertCommand = new Command()
       : kMarkdownFormat;
 
     // determine and validate target format
-    const targetFormat = options.to ||
-      (srcFormat === kNotebookFormat ? kMarkdownFormat : kNotebookFormat);
+    const targetFormat = options.to;
+    if (!targetFormat) {
+      throw new Error("Target format (--to) not specified");
+    }
     if (![kNotebookFormat, kMarkdownFormat].includes(targetFormat)) {
       throw new Error("Invalid target format: " + targetFormat);
     }

src/command/convert/convert.ts

@@ -7,24 +7,27 @@
 
 import { stringify } from "encoding/yaml.ts";
 
+import { ld } from "lodash/mod.ts";
+
 import {
   partitionYamlFrontMatter,
   readYamlFromMarkdown,
 } from "../../core/yaml.ts";
 import {
   jupyterAutoIdentifier,
+  JupyterCell,
+  JupyterCellOptions,
   jupyterCellOptionsAsComment,
-  JupyterCellWithOptions,
-  jupyterCellWithOptions,
   jupyterFromFile,
   kCellId,
   kCellLabel,
   mdEnsureTrailingNewline,
   mdFromContentCell,
   mdFromRawCell,
+  partitionJupyterCellOptions,
   quartoMdToJupyter,
 } from "../../core/jupyter/jupyter.ts";
-import { cellLabelValidator } from "../../core/jupyter/labels.ts";
+import { Metadata } from "../../config/metadata.ts";
 
 export async function convertMarkdownToNotebook(
   file: string,
@@ -42,19 +45,10 @@ export function convertNotebookToMarkdown(file: string, includeIds: boolean) {
   // generate markdown
   const md: string[] = [];
 
-  // validate unique cell labels as we go
-  const validateCellLabel = cellLabelValidator();
-
   for (let i = 0; i < notebook.cells.length; i++) {
     {
-      // convert cell yaml to cell metadata
-      const cell = jupyterCellWithOptions(
-        kernelspec.language,
-        notebook.cells[i],
-      );
-
-      // validate unique cell labels
-      validateCellLabel(cell);
+      // alias cell
+      const cell = notebook.cells[i];
 
       // write markdown
       switch (cell.cell_type) {
@@ -94,7 +88,7 @@ export function convertNotebookToMarkdown(file: string, includeIds: boolean) {
 
 function mdFromCodeCell(
   language: string,
-  cell: JupyterCellWithOptions,
+  cell: JupyterCell,
   includeIds: boolean,
 ) {
   // redact if the cell has no source
@@ -105,26 +99,70 @@ function mdFromCodeCell(
   // begin code cell
   const md: string[] = ["```{" + language + "}\n"];
 
-  // remove the id if requested or if it matches what would be auto-generated from the label
-  if (cell.options[kCellId]) {
+  // partition
+  const { yaml, source } = partitionJupyterCellOptions(language, cell.source);
+  const options = yaml ? yaml as JupyterCellOptions : {};
+  console.log(options);
+
+  // handle id
+  if (cell.id) {
     if (!includeIds) {
-      delete cell.options[kCellId];
-    } else if (cell.options[kCellLabel]) {
-      const label = String(cell.options[kCellLabel]);
-      if (jupyterAutoIdentifier(label) === cell.options[kCellId]) {
-        delete cell.options[kCellId];
+      cell.id = undefined;
+    } else if (options[kCellLabel]) {
+      const label = String(options[kCellLabel]);
+      if (jupyterAutoIdentifier(label) === cell.id) {
+        cell.id = undefined;
+      }
+    }
+  }
+
+  // prepare the options for writing
+  let yamlOptions: Metadata = {};
+  if (cell.id) {
+    yamlOptions[kCellId] = cell.id;
+  }
+  yamlOptions = {
+    ...cell.metadata,
+    ...yaml,
+    ...yamlOptions,
+  };
+
+  // cell id first
+  if (yamlOptions[kCellId]) {
+    md.push(
+      ...jupyterCellOptionsAsComment(language, { id: yamlOptions[kCellId] }),
+    );
+    delete yamlOptions[kCellId];
+  }
+
+  // yaml
+  if (yaml) {
+    const yamlOutput: Metadata = {};
+    for (const key in yaml) {
+      const value = yamlOptions[key];
+      if (value !== undefined) {
+        yamlOutput[key] = value;
+        delete yamlOptions[key];
       }
     }
+    md.push(...jupyterCellOptionsAsComment(language, yamlOutput));
   }
 
-  // write cell options
-  if (Object.keys(cell.options).length > 0) {
-    const yamlOptions = jupyterCellOptionsAsComment(language, cell.options);
-    md.push(...yamlOptions);
+  // metadata
+  const metadataOutput: Metadata = {};
+  for (const key in cell.metadata) {
+    const value = cell.metadata[key];
+    if (value !== undefined) {
+      metadataOutput[key] = value;
+      delete yamlOptions[key];
+    }
   }
+  md.push(
+    ...jupyterCellOptionsAsComment(language, metadataOutput, { flowLevel: 1 }),
+  );
 
   // write cell code
-  md.push(...mdEnsureTrailingNewline(cell.source));
+  md.push(...mdEnsureTrailingNewline(source));
 
   // end code cell
   md.push("```\n");

src/core/jupyter/jupyter.ts

@@ -11,7 +11,7 @@ import { ensureDirSync } from "fs/ensure_dir.ts";
 import { dirname, extname, join, relative } from "path/mod.ts";
 import { walkSync } from "fs/walk.ts";
 import { decode as base64decode } from "encoding/base64.ts";
-import { stringify } from "encoding/yaml.ts";
+import { stringify, StringifyOptions } from "encoding/yaml.ts";
 
 import { ld } from "lodash/mod.ts";
 
@@ -689,26 +689,32 @@ export function jupyterCellWithOptions(
 export function jupyterCellOptionsAsComment(
   language: string,
   options: Record<string, unknown>,
+  stringifyOptions?: StringifyOptions,
 ) {
-  const cellYaml = stringify(options, {
-    indent: 2,
-    sortKeys: false,
-    skipInvalid: true,
-  });
-  const commentChars = langCommentChars(language);
-  const yamlOutput = lines(cellYaml).map((line) => {
-    line = optionCommentPrefix(commentChars[0]) + line +
-      optionCommentSuffix(commentChars[1]);
-    return line + "\n";
-  }).concat([""]);
-  return yamlOutput;
+  if (Object.keys(options).length > 0) {
+    const cellYaml = stringify(options, {
+      indent: 2,
+      sortKeys: false,
+      skipInvalid: true,
+      ...stringifyOptions,
+    });
+    const commentChars = langCommentChars(language);
+    const yamlOutput = mdTrimEmptyLines(lines(cellYaml)).map((line) => {
+      line = optionCommentPrefix(commentChars[0]) + line +
+        optionCommentSuffix(commentChars[1]);
+      return line + "\n";
+    });
+    return yamlOutput;
+  } else {
+    return [];
+  }
 }
 
-export function mdFromContentCell(cell: JupyterCellWithOptions) {
+export function mdFromContentCell(cell: JupyterCell) {
   return mdEnsureTrailingNewline(cell.source);
 }
 
-export function mdFromRawCell(cell: JupyterCellWithOptions) {
+export function mdFromRawCell(cell: JupyterCell) {
   const mimeType = cell.metadata?.[kRawMimeType];
   if (mimeType) {
     switch (mimeType) {
@@ -738,7 +744,10 @@ export function mdEnsureTrailingNewline(source: string[]) {
   }
 }
 
-function partitionJupyterCellOptions(language: string, source: string[]) {
+export function partitionJupyterCellOptions(
+  language: string,
+  source: string[],
+) {
   const commentChars = langCommentChars(language);
   const optionPrefix = optionCommentPrefix(commentChars[0]);
   const optionSuffix = commentChars[1] || "";