Merge branch 'main' of github.com:quarto-dev/quarto-cli into main

Author: jjallaire

package/src/import_map.json

@@ -22,6 +22,7 @@
     "observablehq/parser": "https://cdn.skypack.dev/@observablehq/[email protected]",
     "events/": "https://deno.land/x/[email protected]/",
     "xmlp/": "https://deno.land/x/[email protected]/",
+    "ansi_up": "https://cdn.skypack.dev/[email protected]",
     "ajv": "https://cdn.skypack.dev/[email protected]",
     "blueimpMd5": "https://cdn.skypack.dev/[email protected]",
     "diff": "https://cdn.skypack.dev/[email protected]",

src/core/ansi-colors.ts

@@ -0,0 +1,31 @@
+/*
+* ansi-colors.ts
+*
+* Copyright (C) 2020 by RStudio, PBC
+*
+*/
+
+import ansiUp from "ansi_up";
+import { Element, parseHtml } from "./deno-dom.ts";
+
+export function hasAnsiEscapeCodes(str: string) {
+  // deno-lint-ignore no-control-regex
+  return !!str.match(/\x1b\[\d+(?:;\d+)*m/);
+}
+
+export async function convertToHtmlSpans(str: string) {
+  const a = new ansiUp();
+  a.use_classes = true;
+  const html = a.ansi_to_html(str);
+
+  // wrap in pre so deno-dom preserves whitespace
+  const doc = await parseHtml(`<pre>${html}</pre>`);
+  for (const node of doc.querySelectorAll("span")) {
+    const el = node as Element;
+    if (el.getAttribute("style") === "font-weight:bold") {
+      el.removeAttribute("style");
+      el.classList.add("ansi-bold");
+    }
+  }
+  return doc.querySelector("pre")!.innerHTML;
+}

src/core/jupyter/jupyter.ts

@@ -144,6 +144,7 @@ import { lines } from "../text.ts";
 import { readYamlFromMarkdown } from "../yaml.ts";
 import { languagesInMarkdown } from "../../execute/engine-shared.ts";
 import { pathWithForwardSlashes } from "../path.ts";
+import { convertToHtmlSpans, hasAnsiEscapeCodes } from "../ansi-colors.ts";
 
 export const kJupyterNotebookExtensions = [
   ".ipynb",
@@ -581,10 +582,10 @@ export function jupyterAssets(input: string, to?: string) {
   };
 }
 
-export function jupyterToMarkdown(
+export async function jupyterToMarkdown(
   nb: JupyterNotebook,
   options: JupyterToMarkdownOptions,
-): JupyterToMarkdownResult {
+): Promise<JupyterToMarkdownResult> {
   // optional content injection / html preservation for html output
   // that isn't an ipynb
   const isHtml = options.toHtml && !options.toIpynb;
@@ -638,7 +639,7 @@ export function jupyterToMarkdown(
         md.push(...mdFromRawCell(cell));
         break;
       case "code":
-        md.push(...mdFromCodeCell(cell, ++codeCellIndex, options));
+        md.push(...(await mdFromCodeCell(cell, ++codeCellIndex, options)));
         break;
       default:
         throw new Error("Unexpected cell type " + cell.cell_type);
@@ -881,7 +882,7 @@ const kLangCommentChars: Record<string, string | string[]> = {
   dot: "//",
 };
 
-function mdFromCodeCell(
+async function mdFromCodeCell(
   cell: JupyterCellWithOptions,
   cellIndex: number,
   options: JupyterToMarkdownOptions,
@@ -1200,14 +1201,16 @@ function mdFromCodeCell(
         const caption = isCaptionableData(output)
           ? (outputCaptions.shift() || null)
           : null;
-        md.push(mdOutputDisplayData(
-          outputLabel,
-          caption,
-          outputName + "-" + (index + 1),
-          output as JupyterOutputDisplayData,
-          options,
-          figureOptions,
-        ));
+        md.push(
+          await mdOutputDisplayData(
+            outputLabel,
+            caption,
+            outputName + "-" + (index + 1),
+            output as JupyterOutputDisplayData,
+            options,
+            figureOptions,
+          ),
+        );
         // if this isn't an image and we have a caption, place it at the bottom of the div
         if (caption && !isImage(output, options)) {
           md.push(`\n${caption}\n`);
@@ -1322,7 +1325,7 @@ function mdOutputError(output: JupyterOutputError) {
   return mdCodeOutput([output.ename + ": " + output.evalue]);
 }
 
-function mdOutputDisplayData(
+async function mdOutputDisplayData(
   label: string | null,
   caption: string | null,
   filename: string,
@@ -1367,7 +1370,24 @@ function mdOutputDisplayData(
         lines[0] = lines[0].slice(1, -1);
         return mdMarkdownOutput(lines);
       } else {
-        return mdCodeOutput(lines.map(colors.stripColor));
+        if (options.toHtml) {
+          if (lines.some(hasAnsiEscapeCodes)) {
+            const html = (await Promise.all(
+              lines.map(convertToHtmlSpans),
+            ));
+            return mdMarkdownOutput(
+              [
+                "\n::: {.ansi-escaped-output}\n```{=html}\n<pre>",
+                ...html,
+                "</pre>\n```\n:::\n",
+              ],
+            );
+          } else {
+            return mdCodeOutput(lines);
+          }
+        } else {
+          return mdCodeOutput(lines.map(colors.stripColor));
+        }
       }
     }
   }

src/core/jupyter/types.ts

@@ -49,6 +49,7 @@ import {
   kWarning,
 } from "../../config/constants.ts";
 import { FormatExecute, FormatPandoc, Metadata } from "../../config/types.ts";
+import { ExecuteOptions } from "../../execute/types.ts";
 
 // deno-lint-ignore-file camelcase
 
@@ -193,6 +194,7 @@ export interface JupyterOutputFigureOptions {
 }
 
 export interface JupyterToMarkdownOptions {
+  executeOptions: ExecuteOptions;
   language: string;
   assets: JupyterAssets;
   execute: FormatExecute;

src/execute/jupyter/jupyter.ts

@@ -285,9 +285,10 @@ export const jupyterEngine: ExecutionEngine = {
     // by jupyterToMarkdown (we don't want to make a copy of a
     // potentially very large notebook) so should not be relied
     // on subseuqent to this call
-    const result = jupyterToMarkdown(
+    const result = await jupyterToMarkdown(
       nb,
       {
+        executeOptions: options,
         language: nb.metadata.kernelspec.language.toLowerCase(),
         assets,
         execute: options.format.execute,

src/import_map.json

@@ -29,6 +29,7 @@
     "deno_dom/": "https://deno.land/x/[email protected]/",
     "media_types/": "https://deno.land/x/[email protected]/",
     "xmlp/": "https://deno.land/x/[email protected]/",
+    "ansi_up": "https://cdn.skypack.dev/[email protected]",
     "lodash/": "https://cdn.skypack.dev/[email protected]/",
     "acorn/acorn": "https://cdn.skypack.dev/[email protected]",
     "acorn/walk": "https://cdn.skypack.dev/[email protected]",
@@ -115,4 +116,4 @@
       "/npm:[email protected]?dew": "./resources/vendor/dev.jspm.io/[email protected]"
     }
   }
-}
+}

src/resources/formats/html/_quarto-rules.scss

@@ -361,3 +361,127 @@ div.sourceCode > iframe {
     border: $code-preview-border-color;
   }
 }
+
+// ansi escaping
+div.ansi-escaped-output {
+  font-family: monospace;
+  display: block;
+}
+
+/*!
+*
+* ansi colors from IPython notebook's
+*
+*/
+/* CSS font colors for translated ANSI escape sequences */
+/* The color values are a mix of
+   http://www.xcolors.net/dl/baskerville-ivorylight and
+   http://www.xcolors.net/dl/euphrasia */
+.ansi-black-fg {
+  color: #3e424d;
+}
+.ansi-black-bg {
+  background-color: #3e424d;
+}
+.ansi-black-intense-fg {
+  color: #282c36;
+}
+.ansi-black-intense-bg {
+  background-color: #282c36;
+}
+.ansi-red-fg {
+  color: #e75c58;
+}
+.ansi-red-bg {
+  background-color: #e75c58;
+}
+.ansi-red-intense-fg {
+  color: #b22b31;
+}
+.ansi-red-intense-bg {
+  background-color: #b22b31;
+}
+.ansi-green-fg {
+  color: #00a250;
+}
+.ansi-green-bg {
+  background-color: #00a250;
+}
+.ansi-green-intense-fg {
+  color: #007427;
+}
+.ansi-green-intense-bg {
+  background-color: #007427;
+}
+.ansi-yellow-fg {
+  color: #ddb62b;
+}
+.ansi-yellow-bg {
+  background-color: #ddb62b;
+}
+.ansi-yellow-intense-fg {
+  color: #b27d12;
+}
+.ansi-yellow-intense-bg {
+  background-color: #b27d12;
+}
+.ansi-blue-fg {
+  color: #208ffb;
+}
+.ansi-blue-bg {
+  background-color: #208ffb;
+}
+.ansi-blue-intense-fg {
+  color: #0065ca;
+}
+.ansi-blue-intense-bg {
+  background-color: #0065ca;
+}
+.ansi-magenta-fg {
+  color: #d160c4;
+}
+.ansi-magenta-bg {
+  background-color: #d160c4;
+}
+.ansi-magenta-intense-fg {
+  color: #a03196;
+}
+.ansi-magenta-intense-bg {
+  background-color: #a03196;
+}
+.ansi-cyan-fg {
+  color: #60c6c8;
+}
+.ansi-cyan-bg {
+  background-color: #60c6c8;
+}
+.ansi-cyan-intense-fg {
+  color: #258f8f;
+}
+.ansi-cyan-intense-bg {
+  background-color: #258f8f;
+}
+.ansi-white-fg {
+  color: #c5c1b4;
+}
+.ansi-white-bg {
+  background-color: #c5c1b4;
+}
+.ansi-white-intense-fg {
+  color: #a1a6b2;
+}
+.ansi-white-intense-bg {
+  background-color: #a1a6b2;
+}
+.ansi-default-inverse-fg {
+  color: #ffffff;
+}
+.ansi-default-inverse-bg {
+  background-color: #000000;
+}
+.ansi-bold {
+  font-weight: bold;
+}
+.ansi-underline {
+  text-decoration: underline;
+}