partial work

Author: cscheid

package/src/common/archive-binary-dependencies.ts

@@ -164,9 +164,10 @@ export async function archiveBinaryDependency(
 }
 
 async function s3cmd(cmd: string, args: string[]) {
-  const s3Command = ["aws", "s3", cmd, ...args];
+  const s3Args = ["s3", cmd, ...args];
   const p = await execProcess({
-    cmd: s3Command,
+    cmd: "aws",
+    args: s3Args,
     stdout: "piped",
   });
 

package/src/common/validate-bundle.ts

@@ -32,7 +32,8 @@ export async function validateBundle(
     // NPM Install
     info("Installing Dependencies");
     const npm = await execProcess({
-      cmd: ["npm", "install"],
+      cmd: "npm",
+      args: ["install"],
       stderr: "piped"
     }); 
     if (!npm.success) {
@@ -53,7 +54,8 @@ export async function validateBundle(
     // Test the bundled output
     info("Testing Bundled output");
     const npx = await execProcess({
-      cmd: ["npx", "eslint", "bundle.js"],
+      cmd: "npx",
+      args: ["eslint", "bundle.js"],
       stderr: "piped"
 
     });

package/src/windows/installer.ts

@@ -157,8 +157,8 @@ export async function makeInstallerWindows(configuration: Configuration) {
 
 export function zip(input: string, output: string) {
   const dir = dirname(input);
-  const cmd = [
-    "powershell",
+  const cmd = "powershell";
+  const args = [
     "Compress-Archive",
     "-Force",
     input,
@@ -169,6 +169,7 @@ export function zip(input: string, output: string) {
   return execProcess(
     {
       cmd,
+      args,
       cwd: dir,
       stdout: "piped",
     },

src/command/create/artifacts/artifact-shared.ts

@@ -150,7 +150,8 @@ export async function ejsData(
 
 async function gitAuthor() {
   const result = await execProcess({
-    cmd: ["git", "config", "--global", "user.name"],
+    cmd: "git",
+    args: ["config", "--global", "user.name"],
     stdout: "piped",
     stderr: "piped",
   });

src/command/editor-support/crossref.ts

@@ -92,8 +92,9 @@ const makeCrossrefCommand = () => {
       Deno.env.set("QUARTO_CROSSREF_INPUT_TYPE", "qmd");
 
       // build command
-      const cmd = [pandocBinaryPath(), "+RTS", "-K512m", "-RTS"];
-      cmd.push(...[
+      const cmd = pandocBinaryPath();
+      const cmdArgs = ["+RTS", "-K512m", "-RTS"];
+      cmdArgs.push(...[
         "--from",
         resourcePath("filters/qmd-reader.lua"),
         "--to",
@@ -118,6 +119,7 @@ const makeCrossrefCommand = () => {
       const result = await execProcess(
         {
           cmd,
+          args: cmdArgs,
           cwd: indexingDir,
           env: {
             "QUARTO_FILTER_PARAMS": filterParams,

src/command/render/latexmk/latex.ts

@@ -11,7 +11,7 @@ import { error, info } from "../../../deno_ral/log.ts";
 import { PdfEngine } from "../../../config/types.ts";
 
 import { dirAndStem } from "../../../core/path.ts";
-import { execProcess } from "../../../core/process.ts";
+import { execProcess, ExecProcessOptions } from "../../../core/process.ts";
 import { ProcessResult } from "../../../core/process-types.ts";
 
 import { PackageManager } from "./pkgmgr.ts";
@@ -29,7 +29,8 @@ export interface LatexCommandReponse {
 export async function hasLatexDistribution() {
   try {
     const result = await execProcess({
-      cmd: ["pdftex", "--version"],
+      cmd: "pdftex",
+      args: ["--version"],
       stdout: "piped",
       stderr: "piped",
     });
@@ -211,8 +212,9 @@ async function runLatexCommand(
 ): Promise<ProcessResult> {
   const fullLatexCmd = texLiveCmd(latexCmd, context.texLive);
 
-  const runOptions: Deno.RunOptions = {
-    cmd: [fullLatexCmd.fullPath, ...args],
+  const runOptions: ExecProcessOptions = {
+    cmd: fullLatexCmd.fullPath,
+    args,
     stdout: "piped",
     stderr: "piped",
   };

src/command/render/latexmk/texlive.ts

@@ -427,7 +427,8 @@ function tlmgrCommand(
   const execTlmgr = (tlmgrCmd: string[]) => {
     return execProcess(
       {
-        cmd: tlmgrCmd,
+        cmd: tlmgrCmd[0],
+        args: tlmgrCmd.slice(1),
         stdout: "piped",
         stderr: "piped",
       },
@@ -457,7 +458,8 @@ function fmtutilCommand(context: TexLiveContext) {
   const fmtutil = texLiveCmd("fmtutil-sys", context);
   return execProcess(
     {
-      cmd: [fmtutil.fullPath, "--all"],
+      cmd: fmtutil.fullPath,
+      args: ["--all"],
       stdout: "piped",
       stderr: "piped",
     },

src/command/render/output-tex.ts

@@ -179,11 +179,12 @@ export function contextPdfOutputRecipe(
     const engine = pdfEngine(format.pandoc, format.render, pandocOptions.flags);
 
     // build context command
-    const cmd = ["context", input];
+    const cmd = "context";
+    const args = [input];
     if (engine.pdfEngineOpts) {
-      cmd.push(...engine.pdfEngineOpts);
+      args.push(...engine.pdfEngineOpts);
     }
-    cmd.push(
+    args.push(
       // ConTeXt produces some auxiliary files:
       // direct PDF generation by Pandoc never produces these auxiliary
       // files because Pandoc runs ConTeXt in a temporary directory.
@@ -194,7 +195,10 @@ export function contextPdfOutputRecipe(
     );
 
     // run context
-    const result = await execProcess({ cmd });
+    const result = await execProcess({
+      cmd,
+      args,
+    });
     if (result.success) {
       const [dir, stem] = dirAndStem(input);
       return computePath(stem, dir, format);

src/command/render/pandoc.ts

@@ -241,42 +241,38 @@ const handleCombinedLuaProfiles = (
 };
 
 function captureRenderCommand(
-  args: Deno.RunOptions,
+  args: Deno.CommandOptions,
   temp: TempContext,
   outputDir: string,
 ) {
   Deno.mkdirSync(outputDir, { recursive: true });
-  const newArgs = [
-    args.cmd[0],
-    ...args.cmd.slice(1).map((_arg) => {
-      const arg = _arg as string; // we know it's a string, TypeScript doesn't somehow
-      if (!arg.startsWith(temp.baseDir)) {
-        return arg;
-      }
-      const newArg = join(outputDir, basename(arg));
-      if (arg.match(/^.*quarto\-defaults.*.yml$/)) {
-        // we need to correct the defaults YML because it contains a reference to a template in a temp directory
-        const ymlDefaults = Deno.readTextFileSync(arg);
-        const defaults = parseYml(ymlDefaults);
-
-        const templateDirectory = dirname(defaults.template);
-        const newTemplateDirectory = join(
-          outputDir,
-          basename(templateDirectory),
-        );
-        copyTo(templateDirectory, newTemplateDirectory);
-        defaults.template = join(
-          newTemplateDirectory,
-          basename(defaults.template),
-        );
-        const defaultsOutputFile = join(outputDir, basename(arg));
-        Deno.writeTextFileSync(defaultsOutputFile, stringify(defaults));
-        return defaultsOutputFile;
-      }
-      Deno.copyFileSync(arg, newArg);
-      return newArg;
-    }),
-  ] as typeof args.cmd;
+  const newArgs: typeof args.args = (args.args ?? []).map((_arg) => {
+    const arg = _arg as string; // we know it's a string, TypeScript doesn't somehow
+    if (!arg.startsWith(temp.baseDir)) {
+      return arg;
+    }
+    const newArg = join(outputDir, basename(arg));
+    if (arg.match(/^.*quarto\-defaults.*.yml$/)) {
+      // we need to correct the defaults YML because it contains a reference to a template in a temp directory
+      const ymlDefaults = Deno.readTextFileSync(arg);
+      const defaults = parseYml(ymlDefaults);
+      const templateDirectory = dirname(defaults.template);
+      const newTemplateDirectory = join(
+        outputDir,
+        basename(templateDirectory),
+      );
+      copyTo(templateDirectory, newTemplateDirectory);
+      defaults.template = join(
+        newTemplateDirectory,
+        basename(defaults.template),
+      );
+      const defaultsOutputFile = join(outputDir, basename(arg));
+      Deno.writeTextFileSync(defaultsOutputFile, stringify(defaults));
+      return defaultsOutputFile;
+    }
+    Deno.copyFileSync(arg, newArg);
+    return newArg;
+  });
 
   // now we need to correct entries in filterParams
   const filterParams = JSON.parse(
@@ -1322,7 +1318,8 @@ export async function runPandoc(
   setupPandocEnv();
 
   const params = {
-    cmd,
+    cmd: cmd[0],
+    args: cmd.slice(1),
     cwd,
     env: pandocEnv,
     ourEnv: Deno.env.toObject(),

src/command/render/project.ts

@@ -994,7 +994,8 @@ async function runScripts(
       }
     } else {
       const result = await execProcess({
-        cmd: args,
+        cmd: args[0],
+        args: args.slice(1),
         cwd: projDir,
         stdout: quiet ? "piped" : "inherit",
         env,