stim 1.8.0 → 1.10.0

package/dist/{android-DeYdjjBP.mjs → android-DPov-fv2.mjs}

@@ -1,5 +1,5 @@
-import { t as getExecutor } from "./exec-B29XNuhP.mjs";
-import { s as androidToolCwd } from "./android-DWssqHQ8.mjs";
+import { t as getExecutor } from "./exec-DK8KaVHK.mjs";
+import { s as androidToolCwd } from "./android-787HhP5w.mjs";
 //#region src/collector/android.ts
 const LEVEL_BY_LETTER = {
 	V: "debug",

package/dist/{android-cas-SWIjzeuL.mjs → android-cas-CITmIeWY.mjs}

@@ -1,14 +1,16 @@
-import { t as getExecutor } from "./exec-B29XNuhP.mjs";
-import { D as withDirLock, u as getConfigDir } from "./config-B7iyKWkL.mjs";
-import { r as register } from "./cache-manifest-CYJi8-Hx.mjs";
-import { _ as workspaceLogsDir, c as ensureWorkspaceStorage, u as sharedCcache } from "./workspace-state-BT5E3SA2.mjs";
-import { n as stripAnsi, r as waitForChild, t as createLineReader } from "./process-output-Dl5uKE03.mjs";
-import { r as androidHome } from "./android-DWssqHQ8.mjs";
-import { l as phaseLine } from "./command-output-B3ycpsYv.mjs";
-import { d as startBuildHeartbeat, n as HEARTBEAT_INTERVAL_MS } from "./xcode-B6YaWeg0.mjs";
+import { u as getConfigDir } from "./config-BEq0Qw_a.mjs";
+import { t as getExecutor } from "./exec-DK8KaVHK.mjs";
+import { r as register } from "./cache-manifest-Pubfp8wV.mjs";
+import { C as sharedCcache, P as withDirLock, j as workspaceLogsDir, x as ensureWorkspaceStorage } from "./metro-BWLOJ_Wr.mjs";
+import { n as spawnDeclared } from "./spawn-claims-CUleC2cM.mjs";
+import { n as stripAnsi, r as waitForChild, t as createLineReader } from "./process-output-Fpl8PYi8.mjs";
+import { l as phaseLine } from "./command-output-D5z2_bcF.mjs";
+import { r as androidHome } from "./android-787HhP5w.mjs";
+import { d as startBuildHeartbeat, n as HEARTBEAT_INTERVAL_MS } from "./xcode-B2tBkf0m.mjs";
 import { accessSync, constants, existsSync, mkdirSync, readFileSync, readdirSync, realpathSync, renameSync, rmSync, statSync, symlinkSync, writeFileSync } from "node:fs";
-import { createHash, randomUUID } from "node:crypto";
+import { isJsonObject, readJsonFile } from "@stim-cli/core/state";
 import { dirname, isAbsolute, join, relative, sep } from "node:path";
+import { createHash, randomUUID } from "node:crypto";
 import { fileURLToPath } from "node:url";
 import chalk from "chalk";
 /** The ABI name a build for every ABI has to fit; `stim android` narrows a build to the device's. */
@@ -833,7 +835,7 @@ async function buildAndroid({ root, logWriter, variant = null, abi = null }, { s
 	if (ccache) resetStatsLog(ccache.statsLog);
 	let child;
 	try {
-		child = spawn(project.gradlew, args, {
+		child = spawnDeclared(() => spawn(project.gradlew, args, {
 			cwd: project.androidDir,
 			stdio: [
 				"ignore",
@@ -848,7 +850,7 @@ async function buildAndroid({ root, logWriter, variant = null, abi = null }, { s
 				TERM: "dumb",
 				FORCE_COLOR: "0"
 			}
-		});
+		}));
 	} catch (err) {
 		return spawnFailure(err, project, now() - startedAt);
 	}
@@ -994,10 +996,16 @@ function directory(path) {
 		return false;
 	}
 }
+function isAndroidCasToolchain(value) {
+	return CAS_TOOLCHAIN_FIELDS.every((field) => typeof value[field] === "string");
+}
 function readAndroidCasToolchain(manifest) {
-	const toolchain = JSON.parse(readFileSync(manifest, "utf8"));
-	const missing = CAS_TOOLCHAIN_FIELDS.filter((field) => typeof toolchain?.[field] !== "string");
-	if (missing.length > 0) throw new Error(`${manifest} declares no ${missing.join(", ")}.`);
+	const parsed = readJsonFile(manifest);
+	const toolchain = isJsonObject(parsed) ? parsed : {};
+	if (!isAndroidCasToolchain(toolchain)) {
+		const missing = CAS_TOOLCHAIN_FIELDS.filter((field) => typeof toolchain[field] !== "string");
+		throw new Error(`${manifest} declares no ${missing.join(", ")}.`);
+	}
 	const notExecutable = CAS_TOOLCHAIN_BINARIES.filter((field) => !executableFile(toolchain[field]));
 	if (notExecutable.length > 0) throw new Error(`${manifest} names no executable ${notExecutable.join(", ")}.`);
 	if (!directory(toolchain.resourceDir)) throw new Error(`${manifest} names resourceDir ${toolchain.resourceDir}, which is not a directory.`);

package/dist/android-cas-compiler.mjs

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
-import { t as getExecutor } from "./exec-B29XNuhP.mjs";
+import { t as getExecutor } from "./exec-DK8KaVHK.mjs";
 import { appendFileSync, existsSync, mkdirSync, readFileSync, renameSync, writeFileSync } from "node:fs";
-import { createHash, randomUUID } from "node:crypto";
 import { join } from "node:path";
+import { createHash, randomUUID } from "node:crypto";
 import { once } from "node:events";
 //#region bin/android-cas-compiler.ts
 const context = process.env.STIM_ANDROID_CAS_CONTEXT;