Fix GenType path test on CI

Signed-off-by: Florian Hammerschmidt <florianh89@gmail.com>

Author: fhammerschmidt

rewatch/src/build/parse.rs

@@ -436,18 +436,11 @@ fn generate_ast(
     // generate the dir of the ast_path (it mirrors the source file dir)
     let ast_parent_path = package.get_build_path().join(ast_path.parent().unwrap());
     helpers::create_path(&ast_parent_path);
-    // Keep absolute source locations in the AST in the same path form as the
-    // canonical project root passed during compilation. This matters for
-    // Windows paths that have both short and expanded representations.
-    let parse_working_dir = build_path_abs
-        .canonicalize()
-        .map(helpers::StrippedVerbatimPath::to_stripped_verbatim_path)
-        .unwrap_or_else(|_| build_path_abs.clone());
 
     /* Create .ast */
     let result = match Some(
         Command::new(&build_state.compiler_info.bsc_path)
-            .current_dir(&parse_working_dir)
+            .current_dir(&build_path_abs)
             .args(parser_args)
             .output()
             .map_err(|e| {

rewatch/src/config.rs

@@ -1029,7 +1029,7 @@ impl Config {
     }
 
     pub fn get_project_root_args(&self) -> Vec<String> {
-        // The parser records locations from a canonical working directory.
+        // Package discovery gives the parser a canonical working directory.
         // Use the same representation here so GenType can strip this prefix,
         // including when Windows supplied the project through an 8.3 path.
         let root = self

rewatch/tests/gentype/project-root.mjs

@@ -6,8 +6,44 @@ import {join} from "node:path";
 
 const executable = process.env.REWATCH_EXECUTABLE;
 assert(executable, "REWATCH_EXECUTABLE must be set");
-const executableForNode =
-  process.platform === "win32" && existsSync(`${executable}.cmd`) ? `${executable}.cmd` : executable;
+
+function runBuild(buildDirectory) {
+  if (process.platform !== "win32") {
+    return spawnSync(executable, ["build"], {
+      cwd: buildDirectory,
+      encoding: "utf8",
+      env: process.env,
+      timeout: 30_000,
+    });
+  }
+
+  const executablePath = executable.endsWith(".exe") ? executable : `${executable}.exe`;
+  const commandShim = executable.endsWith(".cmd") ? executable : `${executable}.cmd`;
+  const resolvedExecutable = existsSync(executablePath)
+    ? executablePath
+    : existsSync(commandShim)
+      ? commandShim
+      : executable;
+
+  return spawnSync(
+    process.env.ComSpec ?? "cmd.exe",
+    [
+      "/d",
+      "/s",
+      "/c",
+      'cd /d "%REWATCH_TEST_PROJECT%" && "%REWATCH_TEST_EXECUTABLE%" build',
+    ],
+    {
+      encoding: "utf8",
+      env: {
+        ...process.env,
+        REWATCH_TEST_EXECUTABLE: resolvedExecutable,
+        REWATCH_TEST_PROJECT: buildDirectory,
+      },
+      timeout: 30_000,
+    },
+  );
+}
 
 function getBuildDirectory(projectDir) {
   if (process.platform !== "win32") {
@@ -55,12 +91,8 @@ try {
   );
 
   const buildDirectory = getBuildDirectory(projectDir);
-  const result = spawnSync(executableForNode, ["build"], {
-    cwd: buildDirectory,
-    encoding: "utf8",
-    env: process.env,
-    timeout: 30_000,
-  });
+  assert(existsSync(buildDirectory), `Build directory does not exist: ${buildDirectory}`);
+  const result = runBuild(buildDirectory);
 
   assert.ifError(result.error);
   assert.equal(result.status, 0, `${result.stdout}\n${result.stderr}`);