Merge branch 'main' into bugfix/quarto-check-info

Author: cscheid

news/changelog-1.7.md

@@ -2,9 +2,10 @@ 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`.
+- ([#11608](https://github.com/quarto-dev/quarto-cli/pull/11608)): Do not issue error message when calling `quarto check info`.

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/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/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() {

src/core/process.ts

@@ -6,6 +6,7 @@
 
 import { MuxAsyncIterator, pooledMap } from "async";
 import { iterateReader } from "io/iterate-reader";
+import { type Closer, type Reader } from "io/types";
 import { debug, info } from "../deno_ral/log.ts";
 import { onCleanup } from "./cleanup.ts";
 import { ProcessResult } from "./process-types.ts";
@@ -104,7 +105,7 @@ export async function execProcess(
 
       // Add streams to the multiplexer
       const addStream = (
-        stream: (Deno.Reader & Deno.Closer) | null,
+        stream: (Reader & Closer) | null,
         filter?: (output: string) => string,
       ) => {
         if (stream !== null) {
@@ -131,7 +132,7 @@ export async function execProcess(
       }
 
       // Close the streams
-      const closeStream = (stream: (Deno.Reader & Deno.Closer) | null) => {
+      const closeStream = (stream: (Reader & Closer) | null) => {
         if (stream) {
           stream.close();
         }

src/project/types/website/listing/website-listing-feed.ts

@@ -517,7 +517,7 @@ async function generateFeed(
         escape,
       },
     );
-    await Deno.write(feedFile.rid, textEncoder.encode(preamble));
+    await feedFile.write(textEncoder.encode(preamble));
 
     for (const feedItem of feedItems) {
       const item = renderEjs(
@@ -527,7 +527,7 @@ async function generateFeed(
           escape,
         },
       );
-      await Deno.write(feedFile.rid, textEncoder.encode(item));
+      await feedFile.write(textEncoder.encode(item));
     }
 
     // Render the postamble
@@ -538,9 +538,9 @@ async function generateFeed(
         escape,
       },
     );
-    await Deno.write(feedFile.rid, textEncoder.encode(postamble));
+    await feedFile.write(textEncoder.encode(postamble));
   } finally {
-    Deno.close(feedFile.rid);
+    feedFile.close();
   }
 }
 

src/project/types/website/website.ts

@@ -89,6 +89,7 @@ import { projectDraftMode } from "./website-utils.ts";
 import { kFieldCategories } from "./listing/website-listing-shared.ts";
 import { pandocNativeStr } from "../../../core/pandoc/codegen.ts";
 import { asArray } from "../../../core/array.ts";
+import { InternalError } from "../../../core/lib/error.ts";
 
 export const kSiteTemplateDefault = "default";
 export const kSiteTemplateBlog = "blog";
@@ -207,8 +208,12 @@ export const websiteProjectType: ProjectType = {
         extras.metadataOverride[kFieldCategories] = asArray(
           format.metadata[kFieldCategories],
         ).map(
-          (category) =>
-            pandocNativeStr(category as string).mappedString().value,
+          (category) => {
+            const strCategory: string = typeof category === "string"
+              ? category
+              : category.toString();
+            return pandocNativeStr(strCategory).mappedString().value;
+          },
         );
       }
 

src/publish/common/publish.ts

@@ -267,7 +267,7 @@ function stageDocumentPublish(title: string, publishFiles: PublishFiles) {
   const publishDir = globalTempContext().createDir();
 
   // copy all files to it
-  const stagedFiles = window.structuredClone(publishFiles) as PublishFiles;
+  const stagedFiles = globalThis.structuredClone(publishFiles) as PublishFiles;
   stagedFiles.baseDir = publishDir;
   for (const file of publishFiles.files) {
     const src = join(publishFiles.baseDir, file);

tests/docs/smoke-all/2024/12/03/issue-11580/.gitignore

@@ -0,0 +1 @@
+/.quarto/