chore - deno 2

Author: cscheid

src/core/devconfig.ts

@@ -146,12 +146,12 @@ export async function reconfigureQuarto(
     join(quartoConfig.sharePath(), "..", ".."),
   );
 
-  const process = Deno.run({
-    cmd: configureScript,
+  const process = new Deno.Command(configureScript[0], {
+    args: configureScript.slice(1),
     cwd: quartoDir,
   });
 
-  await process.status();
+  await process.output();
 
   info("");
   error(

src/core/handlers/dot.ts

@@ -75,6 +75,7 @@ const dotHandler: LanguageHandler = {
       console.log = oldConsoleLog;
       console.warn = oldConsoleWarn;
     } catch (e) {
+      if (!(e instanceof Error)) throw e;
       console.log = oldConsoleLog;
       console.warn = oldConsoleWarn;
       const m = (e.message as string).match(

src/core/http-server.ts

@@ -1,9 +1,8 @@
 /*
-* http-server.ts
-*
-* Copyright (C) 2020-2022 Posit Software, PBC
-*
-*/
+ * http-server.ts
+ *
+ * Copyright (C) 2020-2022 Posit Software, PBC
+ */
 
 import { warning } from "../deno_ral/log.ts";
 
@@ -18,6 +17,7 @@ export async function handleHttpRequests(
           await respondWith(handler(request));
         }
       } catch (err) {
+        if (!(err instanceof Error)) throw err;
         warning(err.message);
         try {
           conn.close();

src/core/image.ts

@@ -20,6 +20,7 @@ export function imageSize(path: string) {
             width: png.width,
           };
         } catch (error) {
+          if (!(error instanceof Error)) throw error;
           throw new Error(`Error reading file ${path}\n${error.message}`);
         }
       }

src/core/jupyter/kernels.ts

@@ -80,9 +80,11 @@ async function computeJupyterKernelspecs(): Promise<
   Map<string, JupyterKernelspec>
 > {
   try {
+    const cmd = await jupyterExec();
     const result = await execProcess(
       {
-        cmd: [...(await jupyterExec()), "--paths", "--json"],
+        cmd: cmd[0],
+        args: [...cmd.slice(1), "--paths", "--json"],
         stdout: "piped",
         stderr: "piped",
       },
@@ -125,6 +127,7 @@ async function computeJupyterKernelspecs(): Promise<
       return kDefaultKernelspecs;
     }
   } catch (e) {
+    if (!(e instanceof Error)) throw e;
     debug("Error reading kernelspecs: " + e.message);
     return kDefaultKernelspecs;
   }

src/core/jupyter/venv.ts

@@ -23,7 +23,8 @@ export async function jupyterCreateVenv(dir: string, packages?: string[]) {
   if (caps) {
     const executable = caps.pyLauncher ? "py" : caps.executable;
     const result = await execProcess({
-      cmd: [executable, "-m", "venv", kEnvDir],
+      cmd: executable,
+      args: ["-m", "venv", kEnvDir],
       cwd: dir,
     });
     if (!result.success) {
@@ -36,7 +37,8 @@ export async function jupyterCreateVenv(dir: string, packages?: string[]) {
     );
     packages = ld.uniq(["jupyter"].concat(packages || []));
     const installResult = await execProcess({
-      cmd: [pip3, "install", ...packages],
+      cmd: pip3,
+      args: ["install", ...packages],
       cwd: dir,
     });
     if (!installResult.success) {
@@ -55,7 +57,8 @@ export async function jupyterCreateCondaenv(dir: string, packages?: string[]) {
     info(`Using conda at ${conda}`);
     packages = ld.uniq(["jupyter"].concat(packages || []));
     const installResult = await execProcess({
-      cmd: ["conda", "create", "--yes", "--prefix", "env", ...packages],
+      cmd: "conda",
+      args: ["create", "--yes", "--prefix", "env", ...packages],
       cwd: dir,
     });
     if (!installResult.success) {

src/core/lib/markdown-analysis/level-one-headings.ts

@@ -17,7 +17,8 @@ export async function hasLevelOneHeadings(markdown: string): Promise<boolean> {
     join("filters", "quarto-internals", "leveloneanalysis.lua"),
   );
   const result = await execProcess({
-    cmd: [path, "-f", "markdown", "-t", "markdown", "-L", filterPath],
+    cmd: path,
+    args: ["-f", "markdown", "-t", "markdown", "-L", filterPath],
     stdout: "piped",
   }, markdown);
   return result.stdout?.trim() === "true";

src/core/lib/promise.ts

@@ -1,9 +1,8 @@
 /*
-* promise.ts
-*
-* Copyright (C) 2020-2022 Posit Software, PBC
-*
-*/
+ * promise.ts
+ *
+ * Copyright (C) 2020-2022 Posit Software, PBC
+ */
 
 interface PendingPromise<T> {
   promise: () => Promise<T>;
@@ -56,6 +55,7 @@ export class PromiseQueue<T = unknown> {
           this.dequeue();
         });
     } catch (err) {
+      if (!(err instanceof Error)) throw err;
       this.running = false;
       item.reject(err);
       this.dequeue();

src/core/lib/yaml-intelligence/annotated-yaml.ts

@@ -109,7 +109,8 @@ export function readAnnotatedYamlFromMappedString(
   }
   try {
     return buildJsYamlAnnotation(mappedSource);
-  } catch (e) {
+    // deno-lint-ignore no-explicit-any
+  } catch (e: any) {
     if (e.name === "YAMLError") {
       e.name = "YAML Parsing";
     }
@@ -617,6 +618,7 @@ export function locateCursor(
       annotation: innermostAnnotation!,
     };
   } catch (e) {
+    if (!(e instanceof Error)) throw e;
     if (e.message === kInternalLocateError) {
       return {
         withError: true,

src/core/log.ts

@@ -110,7 +110,7 @@ export function logLevel() {
 }
 
 export class StdErrOutputHandler extends BaseHandler {
-  format(logRecord: LogRecord, prefix = true): string {
+  override format(logRecord: LogRecord, prefix = true): string {
     // Set default options
     const options = {
       newline: true,
@@ -183,7 +183,7 @@ export class LogEventsHandler extends StdErrOutputHandler {
       formatter: (({ msg }) => `${msg}`),
     });
   }
-  handle(logRecord: LogRecord) {
+  override handle(logRecord: LogRecord) {
     if (this.level > logRecord.level) return;
 
     LogEventsHandler.handlers_.forEach((handler) =>
@@ -211,11 +211,11 @@ export class LogFileHandler extends FileHandler {
   }
   msgFormat;
 
-  flush(): void {
+  override flush(): void {
     this.logger.flush();
   }
 
-  format(logRecord: LogRecord): string {
+  override format(logRecord: LogRecord): string {
     // Messages that start with a carriage return are progress messages
     // that rewrite a line, so just ignore these
     if (logRecord.msg.startsWith("\r")) {
@@ -250,7 +250,7 @@ export class LogFileHandler extends FileHandler {
     }
   }
 
-  async log(msg: string) {
+  override async log(msg: string) {
     // Ignore any messages that are blank
     if (msg !== "") {
       this.logger.log(msg);