chore - deno 2: use esbuild bundlers

Author: cscheid

package/scripts/deno_std/download.sh

@@ -10,4 +10,4 @@ fi
 
 
 export DENO_DIR="$QUARTO_SRC_PATH/resources/deno_std/cache"
-"$QUARTO_DENO" cache --allow-all --no-config --unstable-ffi --lock "$QUARTO_SRC_PATH/resources/deno_std/deno_std.lock" "$@" "$QUARTO_PACKAGE_PATH/scripts/deno_std/deno_std.ts"
+"$QUARTO_DENO" cache --allow-import --no-config --unstable-ffi --lock "$QUARTO_SRC_PATH/resources/deno_std/deno_std.lock" "$@" "$QUARTO_PACKAGE_PATH/scripts/deno_std/deno_std.ts"

package/src/common/prepare-dist.ts

@@ -90,6 +90,7 @@ export async function prepareDist(
     try {
       await configArchDependency(dependency, targetDir, config)
     } catch (e) {
+      if (!(e instanceof Error)) { throw e; }
       if (
         e.message ===
           "The architecture aarch64 is missing the dependency deno_dom"
@@ -121,13 +122,11 @@ export async function prepareDist(
   info("");
 
   // Create the deno bundle
-  const input = join(config.directoryInfo.src, "quarto.ts");
+  // const input = join(config.directoryInfo.src, "quarto.ts");
   const output = join(config.directoryInfo.pkgWorking.bin, "quarto.js");
   info("\nCreating Deno Bundle");
   info(output);
   await bundle(
-    input,
-    output,
     config,
   );
   info("");

package/src/util/deno.ts

@@ -4,13 +4,14 @@
 * Copyright (C) 2020-2022 Posit Software, PBC
 *
 */
+import { execProcess } from "../../../src/core/process.ts";
 import { info } from "../../../src/deno_ral/log.ts";
 import { isWindows } from "../../../src/deno_ral/platform.ts";
 import { Configuration } from "../common/config.ts";
 
+// TODO in we only use the bundler for quarto.ts
+// so we hardcode it in the new esbuild-based bundler
 export async function bundle(
-  input: string,
-  output: string,
   configuration: Configuration,
 ) {
   // Bundle source code
@@ -19,28 +20,23 @@ export async function bundle(
   if (!denoExecPath) {
     throw Error("QUARTO_DENO is not defined");
   }
-  denoBundleCmd.push(denoExecPath);
-  denoBundleCmd.push("bundle");
-  denoBundleCmd.push("--no-check");
-  denoBundleCmd.push("--unstable-kv");
-  denoBundleCmd.push("--unstable-ffi");
-  denoBundleCmd.push(
-    "--importmap=" + configuration.importmap,
-  );
+  denoBundleCmd.push("run");
+  denoBundleCmd.push("--allow-all");
+  denoBundleCmd.push("../tools/deno-esbuild-bundle.ts");
   /*
   denoBundleCmd.push("--log-level");
   denoBundleCmd.push("debug");
   */
+  // denoBundleCmd.push(input);
+  // denoBundleCmd.push(output);
 
-  denoBundleCmd.push(input);
-  denoBundleCmd.push(output);
-
-  const p = Deno.run({
-    cmd: denoBundleCmd,
+  const status = await execProcess({
+    cmd: denoExecPath,
+    args: denoBundleCmd,
+    cwd: configuration.directoryInfo.src,
   });
-  const status = await p.status();
   if (status.code !== 0) {
-    throw Error(`Failure to bundle ${input}`);
+    throw Error(`Failure to bundle src/quarto.ts`);
   }
 }
 
@@ -50,31 +46,7 @@ export async function compile(
   flags: string[],
   configuration: Configuration,
 ) {
-  const denoBundleCmd: string[] = [];
-  const denoExecPath = Deno.env.get("QUARTO_DENO");
-  if (!denoExecPath) {
-    throw Error("QUARTO_DENO is not defined");
-  }
-  denoBundleCmd.push(denoExecPath);
-  denoBundleCmd.push("compile");
-  denoBundleCmd.push("--unstable-kv");
-  denoBundleCmd.push("--unstable-ffi");
-  denoBundleCmd.push(
-    "--importmap=" + configuration.importmap,
-  );
-  denoBundleCmd.push("--output");
-  denoBundleCmd.push(output);
-  denoBundleCmd.push(...flags);
-
-  denoBundleCmd.push(input);
-
-  const p = Deno.run({
-    cmd: denoBundleCmd,
-  });
-  const status = await p.status();
-  if (status.code !== 0) {
-    throw Error(`Failure to compile ${input}`);
-  }
+  throw new Error("Not implemented");
 }
 
 export async function install(
@@ -87,7 +59,6 @@ export async function install(
   if (!denoExecPath) {
     throw Error("QUARTO_DENO is not defined");
   }
-  denoBundleCmd.push(denoExecPath);
   denoBundleCmd.push("install");
   denoBundleCmd.push("--unstable-kv");
   denoBundleCmd.push("--unstable-ffi");
@@ -98,24 +69,19 @@ export async function install(
 
   denoBundleCmd.push(input);
 
-  const p = Deno.run({
-    cmd: denoBundleCmd,
+  const status = await execProcess({
+    cmd: denoExecPath,
+    args: denoBundleCmd,
     stdout: "piped",
   });
-  const status = await p.status();
   if (status.code !== 0) {
     throw Error(`Failure to install ${input}`);
   }
-  const output = await p.output();
-
-  if (output) {
-    // Try to read the installation path and return it
-    const outputTxt = new TextDecoder().decode(output);
-
+  if (status.stdout) {
     // Forward the output
-    info(outputTxt);
+    info(status.stdout);
 
-    const match = outputTxt.match(/Successfully installed.*\n(.*)/);
+    const match = status.stdout.match(/Successfully installed.*\n(.*)/);
     if (match) {
       return match[1];
     }

src/resources/editor/tools/vs-code.mjs

@@ -22964,7 +22964,6 @@ var require_yaml_intelligence_resources = __commonJS({
         "The light theme name, theme scss file, or a mix of both.",
         "The dark theme name, theme scss file, or a mix of both.",
         "The dark theme name, theme scss file, or a mix of both.",
-        "Array of rendering names, e.g.&nbsp;<code>[light, dark]</code>",
         "Classes to apply to the body of the document.",
         "Disables the built in html features like theming, anchor sections,\ncode block behavior, and more.",
         "Enables inclusion of Pandoc default CSS for this document.",
@@ -23716,14 +23715,6 @@ var require_yaml_intelligence_resources = __commonJS({
         "Manuscript configuration",
         "internal-schema-hack",
         "List execution engines you want to give priority when determining\nwhich engine should render a notebook. If two engines have support for a\nnotebook, the one listed earlier will be chosen. Quarto\u2019s default order\nis \u2018knitr\u2019, \u2018jupyter\u2019, \u2018markdown\u2019, \u2018julia\u2019.",
-        {
-          short: "Include an automatically generated table of contents",
-          long: ""
-        },
-        {
-          short: "Use smart quotes in document output. Defaults to true.",
-          long: ""
-        },
         "Project configuration.",
         "Project type (<code>default</code>, <code>website</code>,\n<code>book</code>, or <code>manuscript</code>)",
         "Files to render (defaults to all files)",
@@ -24298,12 +24289,12 @@ var require_yaml_intelligence_resources = __commonJS({
         mermaid: "%%"
       },
       "handlers/mermaid/schema.yml": {
-        _internalId: 195e3,
+        _internalId: 193834,
         type: "object",
         description: "be an object",
         properties: {
           "mermaid-format": {
-            _internalId: 194992,
+            _internalId: 193826,
             type: "enum",
             enum: [
               "png",
@@ -24319,7 +24310,7 @@ var require_yaml_intelligence_resources = __commonJS({
             exhaustiveCompletions: true
           },
           theme: {
-            _internalId: 194999,
+            _internalId: 193833,
             type: "anyOf",
             anyOf: [
               {
@@ -24359,42 +24350,7 @@ var require_yaml_intelligence_resources = __commonJS({
           "case-detection": true
         },
         $id: "handlers/mermaid"
-      },
-      "schema/document-typst.yml": [
-        {
-          name: "page-numbering",
-          tags: {
-            formats: [
-              "typst"
-            ]
-          },
-          schema: {
-            anyOf: [
-              "string",
-              {
-                enum: [
-                  false
-                ]
-              }
-            ]
-          },
-          description: {
-            short: "Include an automatically generated table of contents"
-          }
-        },
-        {
-          name: "smart",
-          tags: {
-            formats: [
-              "typst"
-            ]
-          },
-          schema: "boolean",
-          description: {
-            short: "Use smart quotes in document output. Defaults to true."
-          }
-        }
-      ]
+      }
     };
   }
 });
@@ -31317,6 +31273,8 @@ function locateCursor(annotation, position) {
       annotation: innermostAnnotation
     };
   } catch (e) {
+    if (!(e instanceof Error))
+      throw e;
     if (e.message === kInternalLocateError) {
       return {
         withError: true