builderman 1.5.2 → 1.5.3

package/dist/internal/task-executor.js

@@ -2,7 +2,7 @@ import * as path from "node:path";
 import * as fs from "node:fs";
 import { $TASK_INTERNAL, $PIPELINE_INTERNAL } from "./constants.js";
 import { PipelineError } from "../errors.js";
-import { parseCommandLine } from "./util.js";
+import { parseCommandLine, resolveExecutable } from "./util.js";
 /**
  * Executes a task (either a regular task or a nested pipeline).
  */
@@ -229,23 +229,45 @@ function executeRegularTask(task, taskId, taskName, context, callbacks) {
         callbacks.onTaskFailed(taskId, pipelineError);
         return;
     }
-    const accumulatedPath = [
-        path.join(taskCwd, "node_modules", ".bin"),
-        path.join(process.cwd(), "node_modules", ".bin"),
-        process.env.PATH,
-    ]
-        .filter(Boolean)
-        .join(process.platform === "win32" ? ";" : ":");
     // Merge environment variables in order: process.env -> pipeline.env -> task.env -> command.env
     const accumulatedEnv = {
         ...process.env,
-        PATH: accumulatedPath,
-        Path: accumulatedPath,
+        // We'll compute PATH/Path below once we've built the accumulatedPath string
         ...config?.env,
         ...taskEnv,
         ...commandEnv,
     };
-    const child = spawnFn(cmd, args, {
+    const accumulatedPath = [
+        path.join(taskCwd, "node_modules", ".bin"),
+        path.join(process.cwd(), "node_modules", ".bin"),
+        process.env.PATH,
+    ]
+        .filter(Boolean)
+        .join(process.platform === "win32" ? ";" : ":");
+    // Ensure PATH is set consistently (Windows is case-insensitive)
+    accumulatedEnv.PATH = accumulatedPath;
+    accumulatedEnv.Path = accumulatedPath;
+    let finalCmd;
+    let finalArgs;
+    if (process.platform === "win32" && !cmd.includes("\\") && !cmd.includes("/")) {
+        // On Windows, for bare commands like "pnpm" we delegate resolution to cmd.exe
+        // so that PATHEXT and other shell semantics are respected. This closely matches
+        // Node's spawn behavior when using shell: true, but keeps a consistent API.
+        finalCmd = process.env.ComSpec || "cmd.exe";
+        finalArgs = ["/d", "/s", "/c", commandString];
+    }
+    else {
+        // Resolve executable from PATH (needed when shell: false)
+        const { cmd: resolvedCmd, needsCmdWrapper } = resolveExecutable(cmd, accumulatedPath);
+        finalCmd = resolvedCmd;
+        finalArgs = args;
+        // On Windows, .cmd and .bat files need to be run via cmd.exe when shell: false
+        if (needsCmdWrapper) {
+            finalCmd = process.env.ComSpec || "cmd.exe";
+            finalArgs = ["/c", resolvedCmd, ...args];
+        }
+    }
+    const child = spawnFn(finalCmd, finalArgs, {
         cwd: taskCwd,
         stdio: ["inherit", "pipe", "pipe"],
         shell: false,

package/dist/internal/util.d.ts

@@ -14,3 +14,19 @@ export declare function parseCommandLine(command: string): {
     cmd: string;
     args: string[];
 };
+/**
+ * Resolves an executable command from PATH.
+ * When using spawn with shell: false, Node.js doesn't automatically resolve
+ * executables from PATH like a shell would. This function searches PATH
+ * directories to find the executable.
+ *
+ * On Windows, .cmd and .bat files need to be executed via cmd.exe when using shell: false.
+ *
+ * @param cmd - The command name to resolve (e.g., "pnpm", "node")
+ * @param pathEnv - The PATH environment variable value
+ * @returns An object with the resolved command and whether it needs cmd.exe wrapper on Windows
+ */
+export declare function resolveExecutable(cmd: string, pathEnv: string | undefined): {
+    cmd: string;
+    needsCmdWrapper: boolean;
+};

package/dist/internal/util.js

@@ -1,3 +1,5 @@
+import * as path from "node:path";
+import * as fs from "node:fs";
 import { $TASK_INTERNAL } from "./constants.js";
 export function validateTasks(tasks) {
     if (tasks?.some((dep) => !($TASK_INTERNAL in dep))) {
@@ -54,3 +56,50 @@ export function parseCommandLine(command) {
     const [cmd, ...args] = tokens;
     return { cmd, args };
 }
+/**
+ * Resolves an executable command from PATH.
+ * When using spawn with shell: false, Node.js doesn't automatically resolve
+ * executables from PATH like a shell would. This function searches PATH
+ * directories to find the executable.
+ *
+ * On Windows, .cmd and .bat files need to be executed via cmd.exe when using shell: false.
+ *
+ * @param cmd - The command name to resolve (e.g., "pnpm", "node")
+ * @param pathEnv - The PATH environment variable value
+ * @returns An object with the resolved command and whether it needs cmd.exe wrapper on Windows
+ */
+export function resolveExecutable(cmd, pathEnv) {
+    // If cmd is already an absolute path or contains path separators, return as-is
+    if (path.isAbsolute(cmd) || cmd.includes(path.sep)) {
+        return { cmd, needsCmdWrapper: false };
+    }
+    // If no PATH provided, return original cmd
+    if (!pathEnv) {
+        return { cmd, needsCmdWrapper: false };
+    }
+    const pathDirs = pathEnv.split(process.platform === "win32" ? ";" : ":");
+    // On Windows, check for .exe, .cmd, .bat extensions
+    const extensions = process.platform === "win32" ? ["", ".exe", ".cmd", ".bat"] : [""];
+    for (const dir of pathDirs) {
+        if (!dir)
+            continue;
+        for (const ext of extensions) {
+            const candidate = path.join(dir, `${cmd}${ext}`);
+            try {
+                // Check if file exists and is executable
+                // On Windows, we also need to check if it's a file (not a directory)
+                const stats = fs.statSync(candidate, { throwIfNoEntry: false });
+                if (stats && stats.isFile()) {
+                    // On Windows, .cmd and .bat files need to be run via cmd.exe when shell: false
+                    const needsCmdWrapper = process.platform === "win32" && (ext === ".cmd" || ext === ".bat");
+                    return { cmd: candidate, needsCmdWrapper };
+                }
+            }
+            catch {
+                // Continue searching
+            }
+        }
+    }
+    // If not found, return original cmd (spawn will handle the error)
+    return { cmd, needsCmdWrapper: false };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "builderman",
-  "version": "1.5.2",
+  "version": "1.5.3",
   "description": "Simple task runner for building and developing projects.",
   "main": "dist/index.js",
   "type": "module",