Merge branch 'main' into fix/issue14249

Author: mcanouil

news/changelog-1.10.md

@@ -1,7 +1,25 @@
 All changes included in 1.10:
 
+## Regression fixes
+
+- ([#14267](https://github.com/quarto-dev/quarto-cli/issues/14267)): Fix Windows paths with accented characters (e.g., `C:\Users\Sébastien\`) breaking dart-sass compilation.
+
 ## Formats
 
+### `typst`
+
+- ([#14261](https://github.com/quarto-dev/quarto-cli/issues/14261)): Fix theorem/example block titles containing inline code producing invalid Typst markup when syntax highlighting is applied.
+
 ### `revealjs`
 
 - ([#14249](https://github.com/quarto-dev/quarto-cli/issues/14249)): Add `aria-label` to slide-menu button link for screen reader accessibility. (author: @mcanouil)
+
+## Commands
+
+### `quarto create`
+
+- ([#14250](https://github.com/quarto-dev/quarto-cli/issues/14250)): Fix `quarto create` producing read-only files when Quarto is installed via system packages (e.g., `.deb`). Files copied from installed resources now have user-write permission ensured.
+
+## Other fixes and improvements
+
+- ([#6651](https://github.com/quarto-dev/quarto-cli/issues/6651)): Fix dart-sass compilation failing in enterprise environments where `.bat` files are blocked by group policy.

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

@@ -12,7 +12,11 @@ import { gfmAutoIdentifier } from "../../../core/pandoc/pandoc-id.ts";
 import { coerce } from "semver/mod.ts";
 import { info } from "../../../deno_ral/log.ts";
 import { basename, dirname, join, relative } from "../../../deno_ral/path.ts";
-import { ensureDirSync, walkSync } from "../../../deno_ral/fs.ts";
+import {
+  ensureDirSync,
+  ensureUserWritable,
+  walkSync,
+} from "../../../deno_ral/fs.ts";
 import { renderEjs } from "../../../core/ejs.ts";
 import { safeExistsSync } from "../../../core/path.ts";
 import { CreateDirective, CreateDirectiveData } from "../cmd-types.ts";
@@ -116,6 +120,7 @@ const renderArtifact = (
     }
     ensureDirSync(dirname(target));
     Deno.copyFileSync(src, target);
+    ensureUserWritable(target);
     return target;
   }
 };

src/core/dart-sass.ts

@@ -1,20 +1,18 @@
 /*
  * dart-sass.ts
  *
- * Copyright (C) 2020-2022 Posit Software, PBC
+ * Copyright (C) 2020-2025 Posit Software, PBC
  */
 import { join } from "../deno_ral/path.ts";
 
 import { architectureToolsPath } from "./resources.ts";
 import { execProcess } from "./process.ts";
-import { ProcessResult } from "./process-types.ts";
 import { TempContext } from "./temp.ts";
 import { lines } from "./text.ts";
 import { debug, info } from "../deno_ral/log.ts";
 import { existsSync } from "../deno_ral/fs.ts";
 import { warnOnce } from "./log.ts";
 import { isWindows } from "../deno_ral/platform.ts";
-import { requireQuoting, safeWindowsExec } from "./windows.ts";
 
 export function dartSassInstallDir() {
   return architectureToolsPath("dart-sass");
@@ -60,80 +58,91 @@ export async function dartCompile(
  */
 export interface DartCommandOptions {
   /**
-   * Override the sass executable path.
-   * Primarily used for testing with spaced paths.
+   * Override the dart-sass install directory.
+   * Used for testing with non-standard paths (spaces, accented characters).
    */
-  sassPath?: string;
+  installDir?: string;
 }
 
-export async function dartCommand(
-  args: string[],
-  options?: DartCommandOptions,
-) {
-  const resolvePath = () => {
+/**
+ * Resolve the dart-sass command and its base arguments.
+ *
+ * On Windows, calls dart.exe + sass.snapshot directly instead of going
+ * through sass.bat. The bundled sass.bat is a thin wrapper generated by
+ * dart_cli_pkg that just runs:
+ *   "%SCRIPTPATH%\src\dart.exe" "%SCRIPTPATH%\src\sass.snapshot" %arguments%
+ *
+ * Template source:
+ *   https://github.com/google/dart_cli_pkg/blob/main/lib/src/templates/standalone/executable.bat.mustache
+ * Upstream issue to ship standalone .exe instead of .bat + dart.exe:
+ *   https://github.com/google/dart_cli_pkg/issues/67
+ *
+ * Bypassing sass.bat avoids multiple .bat file issues on Windows:
+ * - Deno quoting bugs with spaced paths (#13997)
+ * - cmd.exe OEM code page misreading UTF-8 accented paths (#14267)
+ * - Enterprise group policy blocking .bat execution (#6651)
+ */
+function resolveSassCommand(options?: DartCommandOptions): {
+  cmd: string;
+  baseArgs: string[];
+} {
+  const installDir = options?.installDir;
+  if (installDir == null) {
+    // Only check env var override when no explicit installDir is provided.
+    // If QUARTO_DART_SASS doesn't exist on disk, fall through to use the
+    // bundled dart-sass at the default architectureToolsPath.
     const dartOverrideCmd = Deno.env.get("QUARTO_DART_SASS");
     if (dartOverrideCmd) {
       if (!existsSync(dartOverrideCmd)) {
         warnOnce(
           `Specified QUARTO_DART_SASS does not exist, using built in dart sass.`,
         );
       } else {
-        return dartOverrideCmd;
+        return { cmd: dartOverrideCmd, baseArgs: [] };
       }
     }
+  }
 
-    const command = isWindows ? "sass.bat" : "sass";
-    return architectureToolsPath(join("dart-sass", command));
-  };
-  const sass = options?.sassPath ?? resolvePath();
-
-  // Process result helper (shared by Windows and non-Windows paths)
-  const processResult = (result: ProcessResult): string | undefined => {
-    if (result.success) {
-      if (result.stderr) {
-        info(result.stderr);
-      }
-      return result.stdout;
-    } else {
-      debug(`[DART path]   : ${sass}`);
-      debug(`[DART args]   : ${args.join(" ")}`);
-      debug(`[DART stdout] : ${result.stdout}`);
-      debug(`[DART stderr] : ${result.stderr}`);
-
-      const errLines = lines(result.stderr || "");
-      // truncate the last 2 lines (they include a pointer to the temp file containing
-      // all of the concatenated sass, which is more or less incomprehensible for users.
-      const errMsg = errLines.slice(0, errLines.length - 2).join("\n");
-      throw new Error("Theme file compilation failed:\n\n" + errMsg);
-    }
-  };
+  const sassDir = installDir ?? architectureToolsPath("dart-sass");
 
-  // On Windows, use safeWindowsExec to handle paths with spaces
-  // (e.g., when Quarto is installed in C:\Program Files\)
-  // See https://github.com/quarto-dev/quarto-cli/issues/13997
   if (isWindows) {
-    const quoted = requireQuoting([sass, ...args]);
-    const result = await safeWindowsExec(
-      quoted.args[0],
-      quoted.args.slice(1),
-      (cmd: string[]) => {
-        return execProcess({
-          cmd: cmd[0],
-          args: cmd.slice(1),
-          stdout: "piped",
-          stderr: "piped",
-        });
-      },
-    );
-    return processResult(result);
+    return {
+      cmd: join(sassDir, "src", "dart.exe"),
+      baseArgs: [join(sassDir, "src", "sass.snapshot")],
+    };
   }
 
-  // Non-Windows: direct execution
+  return { cmd: join(sassDir, "sass"), baseArgs: [] };
+}
+
+export async function dartCommand(
+  args: string[],
+  options?: DartCommandOptions,
+) {
+  const { cmd, baseArgs } = resolveSassCommand(options);
+
   const result = await execProcess({
-    cmd: sass,
-    args,
+    cmd,
+    args: [...baseArgs, ...args],
     stdout: "piped",
     stderr: "piped",
   });
-  return processResult(result);
+
+  if (result.success) {
+    if (result.stderr) {
+      info(result.stderr);
+    }
+    return result.stdout;
+  } else {
+    debug(`[DART cmd]    : ${cmd}`);
+    debug(`[DART args]   : ${[...baseArgs, ...args].join(" ")}`);
+    debug(`[DART stdout] : ${result.stdout}`);
+    debug(`[DART stderr] : ${result.stderr}`);
+
+    const errLines = lines(result.stderr || "");
+    // truncate the last 2 lines (they include a pointer to the temp file containing
+    // all of the concatenated sass, which is more or less incomprehensible for users.
+    const errMsg = errLines.slice(0, errLines.length - 2).join("\n");
+    throw new Error("Theme file compilation failed:\n\n" + errMsg);
+  }
 }

src/core/windows.ts

@@ -156,7 +156,7 @@ export async function safeWindowsExec(
   try {
     Deno.writeTextFileSync(
       tempFile,
-      ["@echo off", [program, ...args].join(" ")].join("\n"),
+      ["@echo off", "chcp 65001 >nul", [program, ...args].join(" ")].join("\r\n"),
     );
     return await fnExec(["cmd", "/c", tempFile]);
   } finally {

src/deno_ral/fs.ts

@@ -191,3 +191,15 @@ export function safeChmodSync(path: string, mode: number): void {
     }
   }
 }
+
+/**
+ * Ensure a file has user write permission. Files copied from installed
+ * resources (e.g. system packages) may be read-only, but users expect
+ * to edit files created by `quarto create`. No-op on Windows.
+ */
+export function ensureUserWritable(path: string): void {
+  const mode = safeModeFromFile(path);
+  if (mode !== undefined && !(mode & 0o200)) {
+    safeChmodSync(path, mode | 0o200);
+  }
+}

src/project/project-create.ts

@@ -5,7 +5,11 @@
  */
 
 import * as ld from "../core/lodash.ts";
-import { ensureDirSync, existsSync } from "../deno_ral/fs.ts";
+import {
+  ensureDirSync,
+  ensureUserWritable,
+  existsSync,
+} from "../deno_ral/fs.ts";
 import { basename, dirname, join } from "../deno_ral/path.ts";
 import { info } from "../deno_ral/log.ts";
 
@@ -139,6 +143,7 @@ export async function projectCreate(options: ProjectCreateOptions) {
       if (!existsSync(dest)) {
         ensureDirSync(dirname(dest));
         copyTo(src, dest);
+        ensureUserWritable(dest);
         if (!options.quiet) {
           info("- Created " + displayName, { indent: 2 });
         }
@@ -256,6 +261,7 @@ function projectMarkdownFile(
       const name = basename(from);
       const target = join(dirname(path), name);
       copyTo(from, target);
+      ensureUserWritable(target);
     });
 
     return subdirectory ? join(subdirectory, name) : name;

src/quarto.ts

@@ -196,13 +196,6 @@ export async function quarto(
 
   try {
     await promise;
-    for (const [key, value] of Object.entries(oldEnv)) {
-      if (value === undefined) {
-        Deno.env.delete(key);
-      } else {
-        Deno.env.set(key, value);
-      }
-    }
     if (commandFailed()) {
       exitWithCleanup(1);
     }
@@ -213,6 +206,14 @@ export async function quarto(
     } else {
       throw e;
     }
+  } finally {
+    for (const [key, value] of Object.entries(oldEnv)) {
+      if (value === undefined) {
+        Deno.env.delete(key);
+      } else {
+        Deno.env.set(key, value);
+      }
+    }
   }
 }
 

src/resources/filters/customnodes/theorem.lua

@@ -259,9 +259,9 @@ end, function(thm)
     ensure_typst_theorems(type)
     local preamble = pandoc.Plain({pandoc.RawInline("typst", "#" .. theorem_type.env .. "(")})
     if name and #name > 0 then
-      preamble.content:insert(pandoc.RawInline("typst", 'title: "'))
+      preamble.content:insert(pandoc.RawInline("typst", 'title: ['))
       tappend(preamble.content, name)
-      preamble.content:insert(pandoc.RawInline("typst", '"'))
+      preamble.content:insert(pandoc.RawInline("typst", ']'))
     end
     preamble.content:insert(pandoc.RawInline("typst", ")["))
     local callthm = make_scaffold(pandoc.Div, preamble)

tests/docs/smoke-all/crossrefs/theorem/algorithm.qmd

@@ -22,7 +22,7 @@ _quarto:
         -
           - "#ref\\(<alg-gcd>, supplement: \\[alg.\\]\\)"
           - "#ref\\(<alg-gcd>, supplement: \\[Alg.\\]\\)"
-          - "#algorithm\\(title: \"Euclid\"\\)"
+          - "#algorithm\\(title: \\[Euclid\\]\\)"
         - []
     markdown:
       ensureFileRegexMatches:

tests/docs/smoke-all/crossrefs/theorem/lemma-1.qmd

@@ -20,7 +20,7 @@ _quarto:
       ensureTypstFileRegexMatches:
         -
           - "#ref\\(<lem-line>, supplement: \\[Lemma\\]\\)"
-          - "#lemma\\(title: \"Line\"\\)"
+          - "#lemma\\(title: \\[Line\\]\\)"
         - []
     markdown:
       ensureFileRegexMatches: