Merge branch 'main' into bugfix/issue-11596

Author: cderv

.github/workflows/test-smokes.yml

@@ -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"
 

news/changelog-1.7.md

@@ -2,5 +2,18 @@ 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.
+- ([#11580](https://github.com/quarto-dev/quarto-cli/issues/11580)): Fix regression with documents containing `categories` fields that are not strings.
+
+## `quarto check`
+
+- ([#11608](https://github.com/quarto-dev/quarto-cli/pull/11608)): Do not issue error message when calling `quarto check info`.
+
+## 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.

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/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/lib/error.ts

@@ -5,6 +5,22 @@
  * Copyright (C) 2020-2022 Posit Software, PBC
  */
 
+export class DynamicTypeCheckError extends Error {
+  constructor(
+    message: string,
+    printName = true,
+    printStack = true,
+  ) {
+    super(message);
+    this.name = "Dynamic Type-Checking Error";
+    this.printName = printName;
+    this.printStack = printStack;
+  }
+
+  public readonly printName: boolean;
+  public readonly printStack: boolean;
+}
+
 export class InternalError extends Error {
   constructor(
     message: string,

src/core/performance/metrics.ts

@@ -41,37 +41,4 @@ export function reportPeformanceMetrics() {
   console.log("Performance metrics");
   console.log("Quarto:");
   console.log(JSON.stringify(quartoPerformanceMetrics(), null, 2));
-  console.log();
-  // denoMetrics is some kind of fancy object that doesn't respond
-  // to a bunch of the normal methods.  So we have to do this
-  // the JSON-round-trip way.
-  console.log("Deno:");
-  const denoMetrics = JSON.parse(JSON.stringify(Deno.metrics() as any));
-  denoMetrics.ops = Object.fromEntries(
-    Object.entries(denoMetrics.ops).map(
-      ([key, opMetrics]: any) => {
-        for (const key of Object.keys(opMetrics)) {
-          if (opMetrics[key] === 0) {
-            delete opMetrics[key];
-          }
-        }
-        return [key, opMetrics];
-      },
-    ).filter(([_key, opMetrics]: any) => Object.keys(opMetrics).length > 0)
-      .map(([key, opMetrics]: any) => {
-        if (
-          (opMetrics.opsDispatched === opMetrics.opsDispatchedSync &&
-            opMetrics.opsDispatched === opMetrics.opsCompleted &&
-            opMetrics.opsDispatched === opMetrics.opsCompletedSync) ||
-          (opMetrics.opsDispatched === opMetrics.opsDispatchedAsync &&
-            opMetrics.opsDispatched === opMetrics.opsCompleted &&
-            opMetrics.opsDispatched === opMetrics.opsCompletedAsync)
-        ) {
-          return [key, opMetrics.opsDispatched];
-        } else {
-          return [key, opMetrics];
-        }
-      }),
-  );
-  console.log(JSON.stringify(denoMetrics, null, 2));
 }

src/core/platform.ts

@@ -87,7 +87,7 @@ export function jupyterHubServicePrefix() {
 }
 
 export function isInteractiveTerminal() {
-  return Deno.isatty(Deno.stderr.rid);
+  return Deno.stderr.isTerminal();
 }
 
 export function isInteractiveSession() {