Merge branch 'main' into bugfix/issue-11549

Author: cscheid

.github/workflows/test-smokes.yml

@@ -130,8 +130,8 @@ jobs:
           renv::restore()
           # Install dev versions for our testing
           # Use r-universe to avoid github api calls
-          try(install.packages('knitr', repos = 'https://yihui.r-universe.dev'))
-          try(install.packages('rmarkdown', repos = 'https://rstudio.r-universe.dev'))
+          try(install.packages('rmarkdown', repos = c('https://rstudio.r-universe.dev', getOption('repos'))))
+          try(install.packages('knitr', repos = c('https://yihui.r-universe.dev', getOption('repos'))))
           if ('${{ inputs.extra-r-packages }}' != '') {
             cat(sprintf("::notice::Running with the following extra R packages for pak: %s\n", "${{ inputs.extra-r-packages }}"))
             renv::install(strsplit("${{ inputs.extra-r-packages }}", split = ",")[[1]])
@@ -143,7 +143,7 @@ jobs:
       - name: Install uv for Python
         uses: astral-sh/setup-uv@v3
         with:
-          version: "0.4.30"
+          version: "0.5.6"
           enable-cache: true
           cache-dependency-glob: "tests/uv.lock"
 
@@ -183,7 +183,7 @@ jobs:
           export JUPYTER=$(find $(dirname $(uv run --frozen which jupyter))/ -type f -name "jupyter.exe" -o -name "jupyter")
           uv run --frozen julia --color=yes --project=. -e "import Pkg; Pkg.instantiate(); Pkg.build(\"IJulia\"); Pkg.precompile()"
           echo "Julia Jupyter:"
-          julia --project=. -e "import IJulia;println(IJulia.JUPYTER);println(IJulia.find_jupyter_subcommand(\"notebook\"))"
+          uv run julia --project=. -e "import IJulia;println(IJulia.JUPYTER);println(IJulia.find_jupyter_subcommand(\"notebook\"))"
 
       - name: Setup timing file for timed test
         if: ${{ matrix.time-test == true }}

news/changelog-1.7.md

@@ -2,6 +2,32 @@ All changes included in 1.7:
 
 ## Regression fixes
 
-- ([#11532](https://github.com/quarto-dev/quarto-cli/issues/11532)): Fix regression for [#660](https://github.com/quarto-dev/quarto-cli/issues/660), which causes files to have incorrect permissions when Quarto is installed in a location not writable by the current user.
 - ([#11509](https://github.com/quarto-dev/quarto-cli/issues/11509)): Fix link-decoration regression in HTML formats.
+- ([#11532](https://github.com/quarto-dev/quarto-cli/issues/11532)): Fix regression for [#660](https://github.com/quarto-dev/quarto-cli/issues/660), which causes files to have incorrect permissions when Quarto is installed in a location not writable by the current user.
 - ([#11549](https://github.com/quarto-dev/quarto-cli/issues/11549)): Fix regression in rendering `dashboard` tabsets into cards without titles.
+- ([#11580](https://github.com/quarto-dev/quarto-cli/issues/11580)): Fix regression with documents containing `categories` fields that are not strings.
+
+## YAML validation
+
+- ([#11654](https://github.com/quarto-dev/quarto-cli/issues/11654)): Allow `page-inset` as value in `column` key for code cells.
+
+## `quarto check`
+
+- ([#11608](https://github.com/quarto-dev/quarto-cli/pull/11608)): Do not issue error message when calling `quarto check info`.
+
+## `typst` Format
+
+- ([#11578](https://github.com/quarto-dev/quarto-cli/issues/11578)): Typst column layout widths use fractional `fr` units instead of percent `%` units for unitless and default widths in order to fill the enclosing block and not spill outside it.
+
+## Lua Filters and extensions
+
+- ([#11526](https://github.com/quarto-dev/quarto-cli/pull/11526)):
+  General improvements to the style and robustness of Quarto's Lua code.
+  This also provides a new public function `quarto.utils.is_empty_node`
+  that allows to check whether a node is empty, i.e., whether it's an
+  empty list, has no child nodes, and contains no text.
+
+## Other Fixes and Improvements
+
+- ([#11441](https://github.com/quarto-dev/quarto-cli/issues/11441)): Don't add newlines around shortcodes during processing.
+- ([#11643](https://github.com/quarto-dev/quarto-cli/issues/11643)): Improve highlighting of nested code block inside markdown code block, i.e. using ` ```{{python}} ` or ` ```python ` inside ` ````markdown` fenced code block.

package/src/util/utils.ts

@@ -25,7 +25,7 @@ export async function download(src: string, dest: string): Promise<void> {
 
   const file = await Deno.create(dest);
   await writeAll(file, contents);
-  Deno.close(file.rid);
+  file.close();
 }
 
 export async function unzip(

src/command/check/check.ts

@@ -47,16 +47,20 @@ import { notebookContext } from "../../render/notebook/notebook-context.ts";
 import { typstBinaryPath } from "../../core/typst.ts";
 import { quartoCacheDir } from "../../core/appdirs.ts";
 import { isWindows } from "../../deno_ral/platform.ts";
+import { makeStringEnumTypeEnforcer } from "../../typing/dynamic.ts";
 
-const kIndent = "      ";
+export const kTargets = [
+  "install",
+  "info",
+  "jupyter",
+  "knitr",
+  "versions",
+  "all",
+] as const;
+export type Target = typeof kTargets[number];
+export const enforceTargetType = makeStringEnumTypeEnforcer(...kTargets);
 
-export type Target =
-  | "install"
-  | "jupyter"
-  | "knitr"
-  | "versions"
-  | "info"
-  | "all";
+const kIndent = "      ";
 
 export async function check(target: Target): Promise<void> {
   const services = renderServices(notebookContext());
@@ -82,7 +86,9 @@ export async function check(target: Target): Promise<void> {
   }
 }
 
-// Currently this doesn't check anything, but
+// Currently this doesn't check anything
+// but it's a placeholder for future checks
+// and the message is useful for troubleshooting
 async function checkInfo(_services: RenderServices) {
   const cacheDir = quartoCacheDir();
   completeMessage("Checking environment information...");

src/command/check/cmd.ts

@@ -4,12 +4,8 @@
  * Copyright (C) 2021-2022 Posit Software, PBC
  */
 
-import { error } from "../../deno_ral/log.ts";
-
 import { Command } from "cliffy/command/mod.ts";
-import { check, Target } from "./check.ts";
-
-const kTargets = ["install", "jupyter", "knitr", "versions", "all"];
+import { check, enforceTargetType } from "./check.ts";
 
 export const checkCommand = new Command()
   .name("check")
@@ -22,13 +18,7 @@ export const checkCommand = new Command()
   .example("Check Jupyter engine", "quarto check jupyter")
   .example("Check Knitr engine", "quarto check knitr")
   .example("Check installation and all engines", "quarto check all")
-  .action(async (_options: unknown, target?: string) => {
-    target = target || "all";
-    if (!kTargets.includes(target)) {
-      error(
-        "Invalid target '" + target + "' (valid targets are " +
-          kTargets.join(", ") + ").",
-      );
-    }
-    await check(target as Target);
+  .action(async (_options: unknown, targetStr?: string) => {
+    targetStr = targetStr || "all";
+    await check(enforceTargetType(targetStr));
   });

src/command/create/editor.ts

@@ -16,6 +16,12 @@ import {
 import { basename, dirname, join } from "../../deno_ral/path.ts";
 import { existsSync } from "../../deno_ral/fs.ts";
 import { isMac, isWindows } from "../../deno_ral/platform.ts";
+import {
+  enforcer,
+  makeStringEnumTypeFunctions,
+  objectPredicate,
+  stringTypePredicate,
+} from "../../typing/dynamic.ts";
 
 export interface Editor {
   // A short, command line friendly id
@@ -77,11 +83,14 @@ interface EditorInfo {
   open: (path: string, createResult: CreateResult) => () => Promise<void>;
 }
 
-interface ScanAction {
-  action: "path" | "which" | "env";
+const scanActionActions = ["path", "which", "env"] as const;
+type ScanActionAction = typeof scanActionActions[number];
+
+type ScanAction = {
+  action: ScanActionAction;
   arg: string;
   filter?: (path: string) => string;
-}
+};
 
 function vscodeEditorInfo(): EditorInfo {
   const editorInfo: EditorInfo = {
@@ -110,29 +119,26 @@ function vscodeEditorInfo(): EditorInfo {
       action: "which",
       arg: "code.exe",
     });
-    const pathActions = windowsAppPaths("Microsoft VS Code", "code.exe").map(
-      (path) => {
-        return {
-          action: "path",
-          arg: path,
-        } as ScanAction;
-      },
-    );
+    const pathActions: ScanAction[] = windowsAppPaths(
+      "Microsoft VS Code",
+      "code.exe",
+    ).map((path) => ({
+      action: "path",
+      arg: path,
+    }));
     editorInfo.actions.push(...pathActions);
   } else if (isMac) {
     editorInfo.actions.push({
       action: "which",
       arg: "code",
     });
 
-    const pathActions = macosAppPaths(
+    const pathActions: ScanAction[] = macosAppPaths(
       "Visual Studio Code.app/Contents/Resources/app/bin/code",
-    ).map((path) => {
-      return {
-        action: "path",
-        arg: path,
-      } as ScanAction;
-    });
+    ).map((path) => ({
+      action: "path",
+      arg: path,
+    }));
     editorInfo.actions.push(...pathActions);
   } else {
     editorInfo.actions.push({
@@ -174,13 +180,14 @@ function positronEditorInfo(): EditorInfo {
       action: "which",
       arg: "Positron.exe",
     });
-    const pathActions = windowsAppPaths("Positron", "Positron.exe").map(
-      (path) => {
-        return {
-          action: "path",
-          arg: path,
-        } as ScanAction;
-      },
+    const pathActions: ScanAction[] = windowsAppPaths(
+      "Positron",
+      "Positron.exe",
+    ).map(
+      (path) => ({
+        action: "path",
+        arg: path,
+      }),
     );
     editorInfo.actions.push(...pathActions);
   } else if (isMac) {
@@ -189,13 +196,13 @@ function positronEditorInfo(): EditorInfo {
       arg: "positron",
     });
 
-    const pathActions = macosAppPaths(
+    const pathActions: ScanAction[] = macosAppPaths(
       "Positron.app/Contents/Resources/app/bin/code",
     ).map((path) => {
       return {
         action: "path",
         arg: path,
-      } as ScanAction;
+      };
     });
     editorInfo.actions.push(...pathActions);
   } else {
@@ -249,22 +256,19 @@ function rstudioEditorInfo(): EditorInfo {
       },
     });
 
-    const paths = windowsAppPaths(join("RStudio", "bin"), rstudioExe).map(
-      (path) => {
-        return {
-          action: "path",
-          arg: path,
-        } as ScanAction;
-      },
-    );
+    const paths: ScanAction[] = windowsAppPaths(
+      join("RStudio", "bin"),
+      rstudioExe,
+    ).map((path) => ({
+      action: "path",
+      arg: path,
+    }));
     editorInfo.actions.push(...paths);
   } else if (isMac) {
-    const paths = macosAppPaths("RStudio.app").map((path) => {
-      return {
-        action: "path",
-        arg: path,
-      } as ScanAction;
-    });
+    const paths: ScanAction[] = macosAppPaths("RStudio.app").map((path) => ({
+      action: "path",
+      arg: path,
+    }));
     editorInfo.actions.push(...paths);
   } else {
     editorInfo.actions.push({

src/command/render/pandoc.ts

@@ -201,7 +201,6 @@ import {
   MarkdownPipelineHandler,
 } from "../../core/markdown-pipeline.ts";
 import { getEnv } from "../../../package/src/util/utils.ts";
-import { canonicalizeTitlePostprocessor } from "../../format/html/format-html-title.ts";
 import {
   BrandFontBunny,
   BrandFontFile,
@@ -439,11 +438,6 @@ export async function runPandoc(
     // record postprocessors
     postprocessors.push(...(extras.postprocessors || []));
 
-    // Fix H1 title inconsistency
-    if (isHtmlFileOutput(options.format.pandoc)) {
-      htmlPostprocessors.push(canonicalizeTitlePostprocessor);
-    }
-
     // add a keep-source post processor if we need one
     if (
       options.format?.render[kKeepSource] || formatHasCodeTools(options.format)

src/core/console.ts

@@ -174,7 +174,7 @@ export function writeFileToStdout(file: string) {
   const df = Deno.openSync(file, { read: true });
   const contents = readAllSync(df);
   writeAllSync(Deno.stdout, contents);
-  Deno.close(df.rid);
+  df.close();
 }
 
 export function clearLine() {

src/core/handlers/base.ts

@@ -405,9 +405,7 @@ export async function expandIncludes(
   const newCells: MappedString[] = [];
   for (let i = 0; i < mdCells.length; ++i) {
     const cell = mdCells[i];
-    newCells.push(
-      i === 0 ? cell.sourceVerbatim : mappedConcat(["\n", cell.sourceVerbatim]),
-    );
+    newCells.push(cell.sourceVerbatim);
   }
 
   await processMarkdownIncludes(newCells, options, filename);
@@ -437,9 +435,7 @@ export async function handleLanguageCells(
 
   for (let i = 0; i < mdCells.length; ++i) {
     const cell = mdCells[i];
-    newCells.push(
-      i === 0 ? cell.sourceVerbatim : mappedConcat(["\n", cell.sourceVerbatim]),
-    );
+    newCells.push(cell.sourceVerbatim);
     if (
       cell.cell_type === "raw" ||
       cell.cell_type === "markdown"
@@ -483,7 +479,6 @@ export async function handleLanguageCells(
           (innerLanguageHandler.stage !== "any" &&
             innerLanguageHandler.stage !== options.stage)
         ) { // we're in the wrong stage, so we don't actually do anything
-          newCells[cell.index] = mappedConcat([newCells[cell.index], "\n"]);
           continue;
         }
         if (
@@ -492,7 +487,6 @@ export async function handleLanguageCells(
         ) {
           // if no handler is present (or a directive was included for something
           // that responds to cells instead), we're a no-op
-          newCells[cell.index] = mappedConcat([newCells[cell.index], "\n"]);
           continue;
         }
         if (innerLanguageHandler.directive === undefined) {