chore - deno 2

Author: cscheid

src/core/pandoc/pandoc-formats.ts

@@ -31,7 +31,8 @@ export async function pandocListFormatDefaultExtensions(format: string) {
     return [];
   }
   const result = await execProcess({
-    cmd: [pandocBinaryPath(), `--list-extensions=${format}`],
+    cmd: pandocBinaryPath(),
+    args: [`--list-extensions=${format}`],
     stdout: "piped",
   });
   if (result.success) {

src/core/pandoc/self-contained.ts

@@ -72,7 +72,8 @@ export const pandocIngestSelfContainedContent = async (
     cmd.push("--resource-path", resourcePath.join(":"));
   }
   const result = await execProcess({
-    cmd,
+    cmd: cmd[0],
+    args: cmd.slice(1),
     stdout: "piped",
     cwd: workingDir,
   }, input.join("\n"));

src/core/performance/metrics.ts

@@ -10,7 +10,7 @@ import { Stats } from "./stats.ts";
 
 type FileReadRecord = {
   path: string;
-  stack: string;
+  stack: string[];
 };
 
 let fileReads: FileReadRecord[] | undefined = undefined;
@@ -24,6 +24,7 @@ export function captureFileReads() {
     try {
       throw new Error("File read");
     } catch (e) {
+      if (!(e instanceof Error)) throw e;
       const stack = e.stack!.split("\n").slice(2);
       fileReads!.push({ path: String(path), stack });
     }

src/core/puppeteer.ts

@@ -125,6 +125,7 @@ export async function withPuppeteerBrowserAndPage<T>(
         return result!;
       }
     } catch (error) {
+      if (!(error instanceof Error)) throw error;
       if (
         (allowedErrorMessages.indexOf(error.message) !== -1) &&
         (attempts < maxAttempts)
@@ -166,6 +167,7 @@ export async function inPuppeteer(
         return clientSideResult;
       });
     } catch (error) {
+      if (!(error instanceof Error)) throw error;
       if (
         (allowedErrorMessages.indexOf(error.message) !== -1) &&
         (attempts < maxAttempts)

src/core/retry.ts

@@ -1,9 +1,8 @@
 /*
-* retry.ts
-*
-* Copyright (C) 2020-2022 Posit Software, PBC
-*
-*/
+ * retry.ts
+ *
+ * Copyright (C) 2020-2022 Posit Software, PBC
+ */
 
 import { sleep } from "./wait.ts";
 
@@ -23,12 +22,13 @@ export async function withRetry<T = void>(
     minWait = 1000,
     maxWait = 4000,
     retry = () => true,
-  } = (options || {});
+  } = options || {};
   let attempt = 0;
   while (true) {
     try {
       return fn();
     } catch (err) {
+      if (!(err instanceof Error)) throw err;
       if ((attempt++ >= attempts) || (retry && !retry(err))) {
         throw err;
       }

src/core/run/deno.ts

@@ -43,8 +43,8 @@ export const denoRunHandler: RunHandler = {
 
     return await execProcess(
       {
-        cmd: [
-          architectureToolsPath("deno"),
+        cmd: architectureToolsPath("deno"),
+        args: [
           "run",
           "--import-map",
           importMap,

src/core/run/lua.ts

@@ -43,7 +43,8 @@ export const luaRunHandler: RunHandler = {
 
     return await execProcess(
       {
-        cmd,
+        cmd: cmd[0],
+        args: cmd.slice(1),
         ...options,
       },
       "",
@@ -96,8 +97,8 @@ setmetatable(_G, meta)
   // call pandoc w/ temp script as --to
   try {
     return await execProcess({
-      cmd: [
-        pandocBinaryPath(),
+      cmd: pandocBinaryPath(),
+      args: [
         "--from",
         "markdown",
         "--to",

src/core/run/python.ts

@@ -20,10 +20,12 @@ export const pythonRunHandler: RunHandler = {
     stdin?: string,
     options?: RunHandlerOptions,
   ) => {
+    const pythonCmd = await pythonExec();
     return await execProcess(
       {
-        cmd: [
-          ...(await pythonExec()),
+        cmd: pythonCmd[0],
+        args: [
+          ...pythonCmd.slice(1),
           script,
           ...args,
         ],

src/core/run/r.ts

@@ -22,8 +22,8 @@ export const rRunHandler: RunHandler = {
   ) => {
     return await execProcess(
       {
-        cmd: [
-          await rBinaryPath("Rscript"),
+        cmd: (await rBinaryPath("Rscript")),
+        args: [
           script,
           ...args,
         ],

src/core/run/types.ts

@@ -11,7 +11,7 @@ export interface RunHandlerOptions {
   env?: {
     [key: string]: string;
   };
-  stdout?: "inherit" | "piped" | "null" | number;
+  stdout?: "inherit" | "piped" | "null";
 }
 
 export interface RunHandler {