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

Author: dragonstyle

src/execute/rmd.ts

@@ -160,7 +160,7 @@ export const knitrEngine: ExecutionEngine = {
         return Promise.resolve();
       }, () => {
         warning(
-          `Unable to perform code-link (code-link requires R and the downlit package)`,
+          `Unable to perform code-link (code-link requires R packages rmarkdown, downlit, and xml2)`,
         );
         return Promise.resolve();
       });

src/extension/extension.ts

@@ -411,15 +411,16 @@ function readExtension(
 function toExtensionId(extension: string) {
   if (extension.indexOf("/") > -1) {
     const extParts = extension.split("/");
-    if (extParts.length > 2) {
-      throw new Error(
-        "Invalid extension name - this extension name includes the illegal character '/' in its name.",
-      );
-    } else {
+    // Names with organization have exactly 1 slash
+    if (extParts.length === 2) {
       return {
         name: extParts[1],
         organization: extParts[0],
       };
+    } else {
+      return {
+        name: extension,
+      };
     }
   } else {
     return {

src/resources/editor/tools/vs-code.mjs

@@ -7170,7 +7170,10 @@ var require_yaml_intelligence_resources = __commonJS({
           },
           schema: "boolean",
           default: true,
-          description: "Evaluate code cells (if `false` just echos the code into output)."
+          description: {
+            short: "Evaluate code cells (if `false` just echos the code into output).",
+            long: "Evaluate code cells (if `false` just echos the code into output).\n\n- `true` (default): evaluate code cell\n- `false`: don't evaluate code cell\n- `[...]`: A list of positive or negative line numbers to selectively include or exclude lines \n  (explicit inclusion/excusion of lines is available only when using the knitr engine)\n"
+          }
         },
         {
           name: "echo",
@@ -7191,7 +7194,10 @@ var require_yaml_intelligence_resources = __commonJS({
             ],
             errorDescription: "be `true`, `false`, or `fenced`"
           },
-          description: "Include cell source code in rendered output.\n\n- `true` (default): include source code in output\n- `false`: do not include source code in output\n- `fenced`: in addition to echoing, include the cell delimiter as part of the output.\n"
+          description: {
+            short: "Include cell source code in rendered output.",
+            long: "Include cell source code in rendered output.\n\n- `true` (default): include source code in output\n- `false`: do not include source code in output\n- `fenced`: in addition to echoing, include the cell delimiter as part of the output.\n- `[...]`: A list of positive or negative line numbers to selectively include or exclude lines\n  (explicit inclusion/excusion of lines is available only when using the knitr engine)\n"
+          }
         },
         {
           name: "code-fold",
@@ -18530,7 +18536,7 @@ var require_yaml_intelligence_resources = __commonJS({
         "Make speaker notes visible to all viewers",
         "Change the presentation direction to be RTL",
         {
-          short: "Method used to print tables in Knitr engine documents\n(<code>default</code>, <code>kable</code>, <code>tibble</code>, or\n<code>paged</code>). Defaults to <code>kable</code>.",
+          short: "Method used to print tables in Knitr engine documents\n(<code>default</code>, <code>kable</code>, <code>tibble</code>, or\n<code>paged</code>). Uses <code>default</code> if not specified.",
           long: "Method used to print tables in Knitr engine documents:"
         },
         {

src/resources/editor/tools/yaml/web-worker.js

@@ -149,7 +149,10 @@
       },
       "schema": "boolean",
       "default": true,
-      "description": "Evaluate code cells (if `false` just echos the code into output)."
+      "description": {
+        "short": "Evaluate code cells (if `false` just echos the code into output).",
+        "long": "Evaluate code cells (if `false` just echos the code into output).\n\n- `true` (default): evaluate code cell\n- `false`: don't evaluate code cell\n- `[...]`: A list of positive or negative line numbers to selectively include or exclude lines \n  (explicit inclusion/excusion of lines is available only when using the knitr engine)\n"
+      }
     },
     {
       "name": "echo",
@@ -170,7 +173,10 @@
         ],
         "errorDescription": "be `true`, `false`, or `fenced`"
       },
-      "description": "Include cell source code in rendered output.\n\n- `true` (default): include source code in output\n- `false`: do not include source code in output\n- `fenced`: in addition to echoing, include the cell delimiter as part of the output.\n"
+      "description": {
+        "short": "Include cell source code in rendered output.",
+        "long": "Include cell source code in rendered output.\n\n- `true` (default): include source code in output\n- `false`: do not include source code in output\n- `fenced`: in addition to echoing, include the cell delimiter as part of the output.\n- `[...]`: A list of positive or negative line numbers to selectively include or exclude lines\n  (explicit inclusion/excusion of lines is available only when using the knitr engine)\n"
+      }
     },
     {
       "name": "code-fold",
@@ -11509,7 +11515,7 @@
     "Make speaker notes visible to all viewers",
     "Change the presentation direction to be RTL",
     {
-      "short": "Method used to print tables in Knitr engine documents\n(<code>default</code>, <code>kable</code>, <code>tibble</code>, or\n<code>paged</code>). Defaults to <code>kable</code>.",
+      "short": "Method used to print tables in Knitr engine documents\n(<code>default</code>, <code>kable</code>, <code>tibble</code>, or\n<code>paged</code>). Uses <code>default</code> if not specified.",
       "long": "Method used to print tables in Knitr engine documents:"
     },
     {

src/resources/editor/tools/yaml/yaml-intelligence-resources.json

@@ -19,7 +19,7 @@ function ipynb()
         local renderedBlocks = compileTemplate(titleBlockTemplate, doc.meta)
 
         -- prepend the blocks to the notebook
-        tprepend(doc.blocks, renderedBlocks.blocks )
+        tprepend(doc.blocks, renderedBlocks)
 
         return doc
 

src/resources/filters/quarto-post/ipynb.lua

@@ -140,6 +140,7 @@ h6:hover > .anchorjs-link,
 #title-block-header {
   margin-block-end: 1rem;
   position: relative;
+  margin-top: -1px; // Chrome draws 1px white line between navbar and title block
 }
 
 #title-block-header .abstract {

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

@@ -1549,6 +1549,9 @@ nav[role="doc-toc"].slow > * {
     padding: 1em;
     border: solid 1px $border-color;
     margin-bottom: 1em;
+    code.sourceCode {
+      white-space: pre-wrap;
+    }
   }
 
   .quarto-appendix-citeas {

src/resources/formats/html/bootstrap/_bootstrap-rules.scss

@@ -17343,15 +17343,34 @@ class EmptyInspector {
 
 // here we need to convert from an ES6 module to an observable module
 // in, well, a best-effort kind of way.
-function es6ImportAsObservableModule(m) {
+function es6ImportAsObservableModule(modulePromise, specs) {
+  const promiseMap = {};
+  const resolveMap = {};
+  specs.forEach(spec => {
+    promiseMap[spec] = new Promise((resolve, reject) => { resolveMap[spec] = { resolve, reject }; });
+  });
+  modulePromise.then(m => {
+    specs.forEach(spec => {
+      resolveMap[spec].resolve(m[spec]);
+    });
+  }).catch(error => {
+    specs.forEach(spec => {
+      resolveMap[spec].reject(error);
+    });
+  });
   return function (runtime, observer) {
     const main = runtime.module();
 
+    specs.forEach(key => {
+      main.variable(observer(key)).define(key, [], () => promiseMap[key]);
+    });
+/* 
     Object.keys(m).forEach((key) => {
       const v = m[key];
-      main.variable(observer(key)).define(key, [], () => v);
-    });
 
+      main.variable(observer(key)).define(key, [], () => promiseMap[key]v);
+    });
+ */
     return main;
   };
 }
@@ -17512,7 +17531,7 @@ function importPathResolver(paths, localResolverMap) {
     return path;
   }
 
-  return async (path) => {
+  return async (path, specs) => {
     const isLocalModule = path.startsWith("/") || path.startsWith(".");
     const isImportFromObservableWebsite = path.match(
       /^https:\/\/(api\.|beta\.|)observablehq\.com\//i,
@@ -17562,8 +17581,8 @@ function importPathResolver(paths, localResolverMap) {
 
     if (moduleType === "ts" || moduleType === "tsx") {
       try {
-        const m = await import(importPath.replace(/\.ts$/, ".js").replace(/\.tsx$/, ".js"));
-        return es6ImportAsObservableModule(m);
+        const modulePromise = import(importPath.replace(/\.ts$/, ".js").replace(/\.tsx$/, ".js"));
+        return es6ImportAsObservableModule(modulePromise, specs);
       } catch (e) {
         // record the error on the browser console to make debugging
         // slightly more convenient.
@@ -17572,8 +17591,8 @@ function importPathResolver(paths, localResolverMap) {
       }
     } else if (moduleType === "js") {
       try {
-        const m = await import(importPath);
-        return es6ImportAsObservableModule(m);
+        const modulePromise = import(importPath);
+        return es6ImportAsObservableModule(modulePromise, specs);
       } catch (e) {
         // record the error on the browser console to make debugging
         // slightly more convenient.