stim 1.17.2 → 1.19.0

package/dist/{exec-CaErVv7t.mjs → exec-i8GDPwq9.mjs}

@@ -1,13 +1,18 @@
 import { execSync } from "child_process";
 import spawn from "cross-spawn";
 import which from "which";
+import { basename } from "path";
+import { createDebugLog, runId } from "@stim-cli/core/state";
+//#region src/debug-log.ts
+const debugLog = createDebugLog("cli", { base: () => ({ runId: runId() }) });
+//#endregion
 //#region src/exec.ts
 const MAX_BUFFER = 67108864;
 function nameTimeout(error, command, timeoutMs) {
 	if (error?.code === "ETIMEDOUT" && error instanceof Error) error.message = `Command timed out after ${timeoutMs}ms: ${command}`;
 	return error;
 }
-let active = {
+const defaultExecutor = {
 	run(cmd, { timeoutMs, killSignal, cwd, env } = {}) {
 		const opts = {
 			encoding: "utf-8",
@@ -31,7 +36,7 @@ let active = {
 			throw nameTimeout(error, cmd, timeoutMs);
 		}
 	},
-	runFile(file, args = [], { timeoutMs, killSignal, cwd, env, omitEnv, input, untrimmed } = {}) {
+	runFile(file, args = [], { timeoutMs, killSignal, cwd, env, omitEnv, input, untrimmed, rejectStderr } = {}) {
 		const opts = {
 			encoding: "utf-8",
 			stdio: [
@@ -55,14 +60,14 @@ let active = {
 		}
 		const result = spawn.sync(file, args, opts);
 		if (result.error) throw nameTimeout(Object.assign(result.error, result), [file, ...args].join(" "), timeoutMs);
-		if (result.status !== 0) {
+		if (result.status !== 0 || rejectStderr && String(result.stderr ?? "").trim()) {
 			const stderr = String(result.stderr ?? "");
 			const message = `Command failed: ${[file, ...args].join(" ")}${stderr ? `\n${stderr}` : ""}`;
 			throw Object.assign(new Error(message), result);
 		}
 		return untrimmed ? String(result.stdout) : String(result.stdout).trim();
 	},
-	runFileAsync(file, args = [], { timeoutMs, killSignal, cwd, env, omitEnv } = {}) {
+	runFileAsync(file, args = [], { timeoutMs, killSignal, cwd, env, omitEnv, rejectStderr, onSpawn } = {}) {
 		const command = [file, ...args].join(" ");
 		return new Promise((resolve, reject) => {
 			const opts = { stdio: [
@@ -80,6 +85,13 @@ let active = {
 				opts.env = childEnv;
 			}
 			const child = spawn(file, args, opts);
+			try {
+				onSpawn?.(child);
+			} catch (error) {
+				child.kill("SIGKILL");
+				reject(error);
+				return;
+			}
 			const stdout = [];
 			const stderr = [];
 			let timedOut = false;
@@ -104,7 +116,7 @@ let active = {
 					stderr: err
 				};
 				if (timedOut) reject(nameTimeout(Object.assign(new Error(command), result, { code: "ETIMEDOUT" }), command, timeoutMs));
-				else if (status !== 0) reject(Object.assign(/* @__PURE__ */ new Error(`Command failed: ${command}${err ? `\n${err}` : ""}`), result));
+				else if (status !== 0 || rejectStderr && err.trim()) reject(Object.assign(/* @__PURE__ */ new Error(`Command failed: ${command}${err ? `\n${err}` : ""}`), result));
 				else resolve(out.trim());
 			});
 		});
@@ -130,8 +142,83 @@ let active = {
 		return which.sync(name, { nothrow: true });
 	}
 };
+/** The program a call runs, without its arguments: those can carry tokens. */
+const programOf = (command) => basename(command.trim().split(/\s+/)[0] ?? "");
+function outcomeOf(error) {
+	const { status, signal, code } = error ?? {};
+	return {
+		ok: false,
+		...typeof status === "number" ? { exit: status } : {},
+		...signal ? { signal } : {},
+		...code ? { code } : {}
+	};
+}
+let executionId = 0;
+function timedSync(fn, program) {
+	return (...args) => {
+		if (!debugLog.enabled()) return fn(...args);
+		const id = ++executionId;
+		const name = program(...args);
+		const started = performance.now();
+		debugLog.log("exec.start", {
+			program: name,
+			executionId: id
+		});
+		try {
+			const out = fn(...args);
+			debugLog.log("exec", {
+				program: name,
+				executionId: id,
+				ms: Math.round(performance.now() - started),
+				ok: true
+			});
+			return out;
+		} catch (error) {
+			debugLog.log("exec", {
+				program: name,
+				executionId: id,
+				ms: Math.round(performance.now() - started),
+				...outcomeOf(error)
+			});
+			throw error;
+		}
+	};
+}
+let active = {
+	...defaultExecutor,
+	run: timedSync((cmd, opts) => defaultExecutor.run(cmd, opts), programOf),
+	runFile: timedSync((file, args, opts) => defaultExecutor.runFile(file, args, opts), (file) => basename(file)),
+	async runFileAsync(file, args, opts) {
+		if (!debugLog.enabled()) return defaultExecutor.runFileAsync(file, args, opts);
+		const id = ++executionId;
+		const name = basename(file);
+		const started = performance.now();
+		debugLog.log("exec.start", {
+			program: name,
+			executionId: id
+		});
+		try {
+			const out = await defaultExecutor.runFileAsync(file, args, opts);
+			debugLog.log("exec", {
+				program: name,
+				executionId: id,
+				ms: Math.round(performance.now() - started),
+				ok: true
+			});
+			return out;
+		} catch (error) {
+			debugLog.log("exec", {
+				program: name,
+				executionId: id,
+				ms: Math.round(performance.now() - started),
+				...outcomeOf(error)
+			});
+			throw error;
+		}
+	}
+};
 function getExecutor() {
 	return active;
 }
 //#endregion
-export { getExecutor as t };
+export { debugLog as n, getExecutor as t };