chore - deno 2

Author: cscheid

src/core/schema/types-from-schema.ts

@@ -27,9 +27,9 @@ export function typeNameFromSchemaName(schemaName: string) {
 }
 
 function fmtSource(source: string) {
-  return Deno.run({
-    cmd: [Deno.execPath(), "fmt", source],
-  }).status();
+  return new Deno.Command(Deno.execPath(), {
+    args: ["fmt", source],
+  }).output();
 }
 
 export const generatedSrcMessage =

src/core/schema/validate-document.ts

@@ -97,6 +97,7 @@ export async function validateDocumentFromSource(
           }
         });
       } catch (e) {
+        if (!(e instanceof Error)) throw e;
         if (e.name === "NoExprTag") {
           const err = e as NoExprTag;
           error(tidyverseFormatError(err.niceError), { colorize: false });

src/core/temp.ts

@@ -27,6 +27,7 @@ export function initSessionTempDir() {
         ensureDirSync(tmpEnv);
       }
     } catch (err) {
+      if (!(err instanceof Error)) throw err;
       if (err.message) {
         debug("Error attempting to create TMPDIR: " + err.message);
       }

src/core/watch.ts

@@ -99,6 +99,7 @@ export function watchForFileChanges(
           }
         }
       } catch (err) {
+        if (!(err instanceof Error)) throw err;
         error(
           "Unexpected error while scanning for file changes: " + err.message,
         );

src/core/yaml.ts

@@ -61,6 +61,7 @@ export function readYaml(file: string) {
       JSON.stringify(result);
       return result;
     } catch (e) {
+      if (!(e instanceof Error)) throw e;
       throw new Error(
         `Circular structures not allowed.\nFile ${file}\n${
           e.message.split("\n").slice(1).join("\n")
@@ -296,6 +297,9 @@ function parseWithNiceErrors(
   try {
     return parse(content, options || { json: true, schema: QuartoJSONSchema });
   } catch (e) {
+    if (!(e instanceof Error)) {
+      throw e;
+    }
     throw improveYamlParseErrorMessage(e);
   }
 }

src/deno_ral/fs.ts

@@ -84,7 +84,9 @@ export function safeMoveSync(
 ): void {
   try {
     Deno.renameSync(src, dest);
-  } catch (err) {
+    // deno-lint-ignore no-explicit-any
+  } catch (err: any) {
+    // code isn't part of the generic error object, which is why we use `: any`
     if (err.code !== "EXDEV") {
       throw err;
     }

src/execute/engine.ts

@@ -216,6 +216,7 @@ export async function fileExecutionEngine(
         flags,
       );
     } catch (error) {
+      if (!(error instanceof Error)) throw error;
       if (error.name === "YAMLError") {
         error.message = `${file}:\n${error.message}`;
       }

src/execute/jupyter/jupyter-kernel.ts

@@ -72,12 +72,12 @@ export async function executeKernelKeepalive(
   options: JupyterExecuteOptions,
 ): Promise<void> {
   // if we are in debug mode then tail follow the log file
-  let serverLogProcess: Deno.Process | undefined;
+  let serverLogProcess: Deno.ChildProcess | undefined;
   if (options.format.execute[kExecuteDebug]) {
     if (!isWindows) {
-      serverLogProcess = Deno.run({
-        cmd: ["tail", "-F", "-n", "0", kernelLogFile()],
-      });
+      serverLogProcess = new Deno.Command("tail", {
+        args: ["-F", "-n", "0", kernelLogFile()],
+      }).spawn();
     }
   }
 
@@ -156,10 +156,7 @@ export async function executeKernelKeepalive(
   } finally {
     conn.close();
 
-    if (serverLogProcess) {
-      // deno-lint-ignore no-explicit-any
-      (serverLogProcess as any).kill("SIGKILL");
-    }
+    serverLogProcess?.kill("SIGKILL");
   }
 }
 
@@ -191,10 +188,12 @@ async function execJupyter(
   kernelspec: JupyterKernelspec,
 ): Promise<ProcessResult> {
   try {
+    const cmd = await pythonExec(kernelspec);
     const result = await execProcess(
       {
-        cmd: [
-          ...(await pythonExec(kernelspec)),
+        cmd: cmd[0],
+        args: [
+          ...cmd.slice(1),
           resourcePath("jupyter/jupyter.py"),
         ],
         env: {
@@ -218,6 +217,7 @@ async function execJupyter(
     }
     return result;
   } catch (e) {
+    if (!(e instanceof Error)) throw e;
     if (e?.message) {
       info("");
       error(e.message);
@@ -358,6 +358,7 @@ function readKernelTransportFile(
           throw new Error("Invalid file format");
         }
       } catch (e) {
+        if (!(e instanceof Error)) throw e;
         error(
           "Error reading kernel transport file: " + e.toString() +
             "(removing file)",
@@ -454,6 +455,7 @@ async function connectToKernel(
       try {
         return await denoConnectToKernel(kernelTransport);
       } catch (e) {
+        if (!(e instanceof Error)) throw e;
         // remove the transport file
         safeRemoveSync(transportFile);
         error("Error connecting to Jupyter kernel: " + e.toString());

src/execute/ojs/extract-resources.ts

@@ -335,9 +335,8 @@ async function resolveImport(
   projectRoot = projectRoot ?? dirname(referent);
 
   const deno = Deno.execPath();
-  const p = Deno.run({
-    cmd: [
-      deno,
+  const p = new Deno.Command(deno, {
+    args: [
       "check",
       file,
       "-c",
@@ -346,8 +345,9 @@ async function resolveImport(
     ],
     stderr: "piped",
   });
-  const [status, stderr] = await Promise.all([p.status(), p.stderrOutput()]);
-  if (!status.success) {
+  const output = await p.output();
+  const stderr = output.stderr;
+  if (!output.success) {
     error("Compilation of typescript dependencies in ojs cell failed.");
 
     let errStr = new TextDecoder().decode(stderr);
@@ -547,7 +547,7 @@ export async function extractResourceDescriptionsFromOJSChunk(
     const [thisResolvedImportPath, importResource]: [
       string,
       ResourceDescription,
-    ] = imports.entries().next().value;
+    ] = imports.entries().next().value!;
     imports.delete(thisResolvedImportPath);
     if (handled.has(thisResolvedImportPath)) {
       continue;
@@ -580,6 +580,7 @@ export async function extractResourceDescriptionsFromOJSChunk(
             try {
               safeRemoveSync(res.filename);
             } catch (e) {
+              if (!(e instanceof Error)) throw e;
               if (e.name !== "NotFound") {
                 throw e;
               }