chore - deno 2

cscheid · cscheid · commit b32cd3eafbae · 2025-04-17T12:46:15.000-04:00
diff --git a/src/command/render/pandoc.ts b/src/command/render/pandoc.ts
@@ -207,6 +207,7 @@ import { isWindows } from "../../deno_ral/platform.ts";
 import { appendToCombinedLuaProfile } from "../../core/performance/perfetto-utils.ts";
 import { makeTimedFunctionAsync } from "../../core/performance/function-times.ts";
 import { walkJson } from "../../core/json.ts";
+import { call } from "../../deno_ral/process.ts";
 
 // in case we are running multiple pandoc processes
 // we need to make sure we capture all of the trace files
@@ -1572,9 +1573,9 @@ async function resolveExtras(
       };
       const woff2ttf = async (url: string) => {
         const path = url_to_path(url);
-        await Deno.run({ cmd: ["ttx", join(font_cache, path)] });
-        await Deno.run({
-          cmd: ["ttx", join(font_cache, path.replace(/woff2?$/, "ttx"))],
+        await call("ttx", { args: [join(font_cache, path)] });
+        await call("ttx", {
+          args: [join(font_cache, path.replace(/woff2?$/, "ttx"))],
         });
       };
       const ttf_urls2: Array<string> = [], woff_urls2: Array<string> = [];
diff --git a/src/command/render/render-files.ts b/src/command/render/render-files.ts
@@ -115,6 +115,7 @@ import {
 import { NotebookContext } from "../../render/notebook/notebook-types.ts";
 import { setExecuteEnvironment } from "../../execute/environment.ts";
 import { safeCloneDeep } from "../../core/safe-clone-deep.ts";
+import { warn } from "log";
 
 export async function renderExecute(
   context: RenderContext,
@@ -346,6 +347,10 @@ export async function renderFiles(
 
     return await pandocRenderer.onComplete(false, options.flags?.quiet);
   } catch (error) {
+    if (!(error instanceof Error)) {
+      warn("Should not have arrived here:", error);
+      throw error;
+    }
     return {
       files: (await pandocRenderer.onComplete(true)).files,
       error: error || new Error(),
@@ -399,6 +404,10 @@ export async function renderFile(
     }
     return await pandocRenderer.onComplete(false, options.flags?.quiet);
   } catch (error) {
+    if (!(error instanceof Error)) {
+      warn("Should not have arrived here:", error);
+      throw error;
+    }
     return {
       files: (await pandocRenderer.onComplete(true)).files,
       error: error || new Error(),
diff --git a/src/core/cri/cri.ts b/src/core/cri/cri.ts
@@ -21,6 +21,7 @@ import {
   registerForExitCleanup,
   unregisterForExitCleanup,
 } from "../process.ts";
+import { assert } from "testing/asserts";
 
 async function waitForServer(port: number, timeout = 3000) {
   const interval = 50;
@@ -87,8 +88,7 @@ export async function criClient(appPath?: string, port?: number) {
   // Allow to adapt the headless mode depending on the Chrome version
   const headlessMode = getenv("QUARTO_CHROMIUM_HEADLESS_MODE", "none");
 
-  const cmd = [
-    app,
+  const args = [
     // TODO: Chrome v128 changed the default from --headless=old to --headless=new
     // in 2024-08. Old headless mode was effectively a separate browser render,
     // and while more performant did not share the same browser implementation as
@@ -106,19 +106,27 @@ export async function criClient(appPath?: string, port?: number) {
     "--renderer-process-limit=1",
     `--remote-debugging-port=${port}`,
   ];
-  const browser = Deno.run({ cmd, stdout: "piped", stderr: "piped" });
+  const browser = new Deno.Command(app, {
+    args,
+    stdout: "piped",
+    stderr: "piped",
+  });
 
+  const cmd = browser.spawn();
   // Register for cleanup inside exitWithCleanup() in case something goes wrong
-  const thisProcessId = registerForExitCleanup(browser);
+  const thisProcessId = registerForExitCleanup(cmd);
 
   if (!(await waitForServer(port as number))) {
     let msg = "Couldn't find open server.";
     // Printing more error information if chrome process errored
-    if (!(await browser.status()).success) {
+    if (!(await cmd.status).success) {
       debug(`[CHROMIUM path]   : ${app}`);
       debug(`[CHROMIUM cmd]   : ${cmd}`);
-      const rawError = await browser.stderrOutput();
-      const errorString = new TextDecoder().decode(rawError);
+      const rawError = await cmd.stderr;
+      const reader = rawError.getReader();
+      const readerResult = await reader.read();
+      assert(readerResult.done);
+      const errorString = new TextDecoder().decode(readerResult.value!);
       msg = msg + "\n" + `Chrome process error: ${errorString}`;
     }
 
@@ -135,8 +143,7 @@ export async function criClient(appPath?: string, port?: number) {
       // We have a bug where `client.close()` doesn't return properly and we don't go below
       // meaning the `browser` process is not killed here, and it will be handled in exitWithCleanup().
 
-      browser.kill(); // Chromium headless won't terminate on its own, so we need to send kill signal
-      browser.close(); // Closing the browser Deno process
+      cmd.kill(); // Chromium headless won't terminate on its own, so we need to send kill signal
       unregisterForExitCleanup(thisProcessId); // All went well so not need to cleanup on quarto exit
     },
 
diff --git a/src/core/deno-dom.ts b/src/core/deno-dom.ts
@@ -166,6 +166,9 @@ export async function initDenoDom() {
         return;
       }
     } catch (e) {
+      if (!(e instanceof Error)) {
+        throw e;
+      }
       debug("Error loading deno-dom-native: " + e.message);
     }
   }
diff --git a/src/core/deno/monkey-patch.ts b/src/core/deno/monkey-patch.ts
@@ -27,6 +27,9 @@ function withAttempts<T>(callable: () => T) {
     try {
       return callable();
     } catch (err) {
+      if (!(err instanceof Error)) {
+        throw err;
+      }
       if (err.message) {
         debug("Error attempting to create temp file: " + err.message);
         if (i === maxAttempts - 1) {
@@ -43,6 +46,9 @@ function withAttempts<T>(callable: () => T) {
 function withAttemptsAsync<T>(callable: () => Promise<T>) {
   const inner = (attempt: number): Promise<T> => {
     return callable().catch((err) => {
+      if (!(err instanceof Error)) {
+        throw err;
+      }
       if (err.message) {
         debug("Error attempting to create temp file: " + err.message);
       }
@@ -91,6 +97,9 @@ Deno.readTextFile = async (
     const result = await oldReadTextFile(path, options);
     return result;
   } catch (err) {
+    if (!(err instanceof Error)) {
+      throw err;
+    }
     if (err.message) {
       err.message = err.message + "\n" + "Path: " + path;
     }
@@ -103,6 +112,9 @@ Deno.readTextFileSync = (path: string | URL) => {
     const result = oldReadTextFileSync(path);
     return result;
   } catch (err) {
+    if (!(err instanceof Error)) {
+      throw err;
+    }
     if (err.message) {
       err.message = err.message + "\n" + "Path: " + path;
     }
diff --git a/src/execute/rmd.ts b/src/execute/rmd.ts
@@ -97,6 +97,7 @@ export const knitrEngine: ExecutionEngine = {
     try {
       metadata = readYamlFromMarkdown(markdown.value);
     } catch (e) {
+      if (!(e instanceof Error)) throw e;
       error(`Error reading metadata from ${file}.\n${e.message}`);
       throw e;
     }
@@ -282,8 +283,8 @@ async function callR<T>(
   try {
     const result = await execProcess(
       {
-        cmd: [
-          await rBinaryPath("Rscript"),
+        cmd: await rBinaryPath("Rscript"),
+        args: [
           ...rscriptArgsArray,
           resourcePath("rmd/rmd.R"),
         ],
@@ -317,6 +318,9 @@ async function callR<T>(
       return Promise.reject();
     }
   } catch (e) {
+    if (!(e instanceof Error)) {
+      throw e;
+    }
     if (reportError) {
       if (e?.message) {
         info("");
diff --git a/src/extension/extension-host.ts b/src/extension/extension-host.ts
@@ -62,6 +62,9 @@ export async function extensionSource(
         };
       }
     } catch (err) {
+      if (!(err instanceof Error)) {
+        throw err;
+      }
       err.message =
         `A network error occurred when attempting to inspect the extension '${target}'. Please try again.\n\n` +
         err.message;
diff --git a/src/format/reveal/format-reveal-multiplex.ts b/src/format/reveal/format-reveal-multiplex.ts
@@ -159,6 +159,9 @@ async function revealMultiplexToken(
     };
     return multiplex;
   } catch (e) {
+    if (!(e instanceof Error)) {
+      throw e;
+    }
     throw Error(
       "Error attempting to provision multiplex token from '" + url + "': " +
         e.message,
diff --git a/src/preview/preview-server.ts b/src/preview/preview-server.ts
@@ -34,19 +34,23 @@ export function runExternalPreviewServer(options: {
   env?: { [key: string]: string };
   cwd?: string;
 }): PreviewServer {
+  const { cmd } = options;
   // start the process
-  const process = Deno.run({
+  const denoCommand = new Deno.Command(cmd[0], {
+    args: cmd.slice(1),
     ...options,
     stdout: "piped",
     stderr: "piped",
   });
 
+  const process = denoCommand.spawn();
+
   // merge and stream stdout and stderr
   const multiplexIterator = new MuxAsyncIterator<
     Uint8Array
   >();
-  multiplexIterator.add(iterateReader(process.stdout));
-  multiplexIterator.add(iterateReader(process.stderr));
+  multiplexIterator.add(process.stdout);
+  multiplexIterator.add(process.stderr);
 
   // wait for ready and then return from 'start'
   const decoder = new TextDecoder();
@@ -65,15 +69,14 @@ export function runExternalPreviewServer(options: {
       for await (const chunk of multiplexIterator) {
         Deno.stderr.writeSync(chunk);
       }
-      await process.status();
+      await process.output();
     },
     stop: () => {
       if (!isWindows) {
         Deno.kill(-process.pid, "SIGTERM");
       } else {
         process.kill();
       }
-      process.close();
       return Promise.resolve();
     },
   };
diff --git a/src/preview/preview-text.ts b/src/preview/preview-text.ts
@@ -155,7 +155,8 @@ async function textPreviewHtml(file: string, req: Request) {
   );
   cmd.push("--standalone");
   const result = await execProcess({
-    cmd,
+    cmd: cmd[0],
+    args: cmd.slice(1),
     stdout: "piped",
   }, markdown);
   if (result.success) {
@@ -244,7 +245,7 @@ async function gfmPreview(file: string, request: Request) {
     // Github renders math with MathJax now, so our preview mode does the same
     cmd.push("--mathjax");
     const result = await execProcess(
-      { cmd, stdout: "piped", stderr: "piped" },
+      { cmd: cmd[0], args: cmd.slice(1), stdout: "piped", stderr: "piped" },
       Deno.readTextFileSync(file),
     );
     if (result.success) {
diff --git a/src/project/project-gitignore.ts b/src/project/project-gitignore.ts
@@ -55,7 +55,8 @@ export async function ensureGitignore(
   } else if (await which("git")) {
     // if it doesn't exist then auto-create if we are in a git project or we had the force flag
     const result = await execProcess({
-      cmd: ["git", "rev-parse"],
+      cmd: "git",
+      args: ["rev-parse"],
       cwd: dir,
       stdout: "piped",
       stderr: "piped",
diff --git a/src/project/serve/serve.ts b/src/project/serve/serve.ts
@@ -647,6 +647,7 @@ async function internalPreviewServer(
                 );
               }
             } catch (e) {
+              if (!(e instanceof Error)) throw e;
               logError(e);
               renderError = e;
             } finally {
diff --git a/src/project/types/book/book-bibliography.ts b/src/project/types/book/book-bibliography.ts
@@ -278,8 +278,8 @@ export async function generateBibliography(
   }
   const frontMatter = `---\n${stringify(yaml, { indent: 2 })}\n---\n`;
   const result = await execProcess({
-    cmd: [
-      pandocBinaryPath(),
+    cmd: pandocBinaryPath(),
+    args: [
       "--from",
       "markdown",
       "--to",
diff --git a/src/project/types/book/book-render.ts b/src/project/types/book/book-render.ts
@@ -37,6 +37,7 @@ import { isHtmlOutput } from "../../../config/format.ts";
 import { renderPandoc } from "../../../command/render/render.ts";
 import {
   PandocRenderCompletion,
+  PandocRenderer,
   RenderFile,
 } from "../../../command/render/types.ts";
 
@@ -97,7 +98,7 @@ import { safeCloneDeep } from "../../../core/safe-clone-deep.ts";
 export function bookPandocRenderer(
   options: RenderOptions,
   project: ProjectContext,
-) {
+): PandocRenderer {
   // rendered files to return. some formats need to end up returning all of the individual
   // renderedFiles (e.g. html or asciidoc) and some formats will consolidate all of their
   // files into a single one (e.g. pdf or epub)
@@ -310,6 +311,9 @@ export function bookPandocRenderer(
           files: renderedFiles,
         };
       } catch (error) {
+        if (!(error instanceof Error)) {
+          throw error;
+        }
         cleanupExecutedFiles();
         return {
           files: renderedFiles,
diff --git a/src/project/types/website/listing/website-listing-feed.ts b/src/project/types/website/listing/website-listing-feed.ts
@@ -370,6 +370,9 @@ export function completeStagedFeeds(
               feedContents,
             );
           } catch (error) {
+            if (!(error instanceof Error)) {
+              throw error;
+            }
             const errorMessage = error.message;
             warnOnce(
               `Unable to generate feed '${feedStem}.xml'\n${errorMessage}`,
diff --git a/src/publish/confluence/api/index.ts b/src/publish/confluence/api/index.ts
@@ -152,6 +152,9 @@ export class ConfluenceClient {
         `content/${testContentId}/restriction/byOperation/update/user?accountId=${user.accountId}`,
       );
     } catch (error) {
+      if (!(error instanceof ApiError)) {
+        throw error;
+      }
       trace("lockDownResult Error", error);
       // Note, sometimes a successful call throws a
       // "SyntaxError: Unexpected end of JSON input"
@@ -170,6 +173,9 @@ export class ConfluenceClient {
     try {
       await this.deleteContent(contentDelete);
     } catch (error) {
+      if (!(error instanceof ApiError)) {
+        throw error;
+      }
       trace("delete canSetPermissions Test Error", error);
       if (error?.status === 403) {
         //Delete is disabled for this user, attempt an archive
diff --git a/src/publish/confluence/confluence-helper.ts b/src/publish/confluence/confluence-helper.ts
@@ -301,8 +301,8 @@ export const findPagesToDelete = (
     if (
       !fileMetadataList.find(
         (file) =>
-          pathWithForwardSlashes(file.fileName) === page?.metadata?.fileName ??
-            "",
+          pathWithForwardSlashes(file.fileName) ===
+            (page?.metadata?.fileName ?? ""),
       ) &&
       !isActiveParent(page.id)
     ) {
@@ -844,8 +844,10 @@ export const findAttachments = (
   const pathList = filePath.split("/");
   const parentPath = pathList.slice(0, pathList.length - 1).join("/");
 
-  const imageFinderMatches:RegExpMatchArray | null = bodyValue.match(ATTACHMENT_FINDER);
-  let uniqueFoundImages:string[] = [...new Set(imageFinderMatches)];
+  const imageFinderMatches: RegExpMatchArray | null = bodyValue.match(
+    ATTACHMENT_FINDER,
+  );
+  let uniqueFoundImages: string[] = [...new Set(imageFinderMatches)];
 
   if (publishFiles.length > 0) {
     uniqueFoundImages = uniqueFoundImages.map((assetFileName: string) => {
diff --git a/src/publish/gh-pages/gh-pages.ts b/src/publish/gh-pages/gh-pages.ts
@@ -210,7 +210,8 @@ async function publish(
       );
       const worktreePath = join(projectScratchPath(input), entry.name);
       await execProcess({
-        cmd: ["git", "worktree", "remove", worktreePath],
+        cmd: "git",
+        args: ["worktree", "remove", worktreePath],
         cwd: projectScratchPath(input),
       });
       removeIfExists(worktreePath);

Original file line number	Diff line number	Diff line change
`@@ -166,6 +166,9 @@ export async function initDenoDom() {`
`166`	`166`	`return;`
`167`	`167`	`}`
`168`	`168`	`} catch (e) {`
	`169`	`+ if (!(e instanceof Error)) {`
	`170`	`+ throw e;`
	`171`	`+ }`
`169`	`172`	`debug("Error loading deno-dom-native: " + e.message);`
`170`	`173`	`}`
`171`	`174`	`}`