stim 1.18.0 → 1.20.0

package/dist/{gradle-C6GKnunQ.mjs → gradle-C2OEKCCI.mjs}

@@ -1,35 +1,15 @@
-import { t as getExecutor } from "./exec-DWhCZDGm.mjs";
+import { t as getExecutor } from "./exec-B81Qodjn.mjs";
 import { n as stripAnsi, r as waitForChild, t as createLineReader } from "./process-output-Fpl8PYi8.mjs";
-import { l as phaseLine } from "./command-output-CBtzyIgF.mjs";
+import { l as phaseLine } from "./command-output-BjPN99ZB.mjs";
+import { o as androidHome } from "./android-BsYNR81W.mjs";
 import { a as spawnDeclared } from "./spawn-claims-Kqiifsk2.mjs";
-import { o as androidHome } from "./android-DC3ZLuw0.mjs";
-import { P as readCcacheActivity, T as startBuildHeartbeat, g as HEARTBEAT_INTERVAL_MS, j as CCACHE_UNAVAILABLE } from "./toolchain-Bnyd_K3A.mjs";
+import { a as readCcacheActivity, n as CCACHE_UNAVAILABLE } from "./ccache-CjHQ5F8g.mjs";
+import { M as startBuildHeartbeat, y as HEARTBEAT_INTERVAL_MS } from "./toolchain-DqyDXs30.mjs";
 import { existsSync, mkdirSync, readFileSync, readdirSync, rmSync, statSync } from "node:fs";
 import { dirname, isAbsolute, join, relative, sep } from "node:path";
 import { fileURLToPath } from "node:url";
-import chalk from "chalk";
 import { createHash } from "node:crypto";
-/** The ABI name a build for every ABI has to fit; `stim android` narrows a build to the device's. */
-const LONGEST_ANDROID_ABI = "armeabi-v7a";
-function androidPathRoom(root, { abi = null, variant = null, platform = process.platform } = {}) {
-	if (platform !== "win32") return null;
-	const abiName = abi ?? LONGEST_ANDROID_ABI;
-	const tail = 198 + (/release$/i.test(variant ?? "") ? 14 : 5) - 5 + abiName.length;
-	const longest = root.length + tail;
-	if (longest < 240) return null;
-	return {
-		root,
-		abi: abiName,
-		longest,
-		maxRootLength: 239 - tail
-	};
-}
-function androidPathRoomMessage({ root, abi, longest, maxRootLength }) {
-	return `The project root ${root} is ${root.length} characters, so the longest known Android native object path (react_codegen_safeareacontext for ${abi}) reaches ${longest} characters, past the 239 the NDK's ninja can be given on Windows; the root can be at most ${maxRootLength} characters.`;
-}
-function androidPathRoomRemedy({ root }) {
-	return `Map the project to a drive letter (\`subst X: "${root}"\`) and run Stim from X:\\, or move it under a shorter root.`;
-}
+import chalk from "chalk";
 const MAX_MESSAGE_LENGTH = 300;
 const KOTLIN_URI = /^e:\s+file:\/\/(\/\S+?):(\d+):(\d+)\s+(.*)$/;
 const KOTLIN_PAREN = /^e:\s+(\S+?):\s*\((\d+),\s*(\d+)\):\s*(.*)$/;
@@ -290,44 +270,12 @@ function assembleTaskFor(variant) {
 }
 const LAST_LINES = 20;
 const TRANSCRIPT_LINES = 2e3;
-function androidDir(root) {
-	return join(root, "android");
-}
-function gradlewPath(root) {
-	return join(androidDir(root), process.platform === "win32" ? "gradlew.bat" : "gradlew");
-}
-function apkOutputsDir(root) {
-	return join(androidDir(root), "app", "build", "outputs", "apk");
-}
-function debugApkDir(root) {
-	return join(apkOutputsDir(root), "debug");
-}
-function discoverAndroidProject(root) {
-	const dir = androidDir(root);
-	if (!existsSync(dir)) return {
-		failed: true,
-		code: BUILD_ERROR,
-		reason: `No android/ directory in ${root}.`,
-		remedy: "Generate it (`npx expo prebuild -p android`, which `stim android` runs itself on an Expo project) or check out the native sources."
-	};
-	const gradlew = gradlewPath(root);
-	if (!existsSync(gradlew)) return {
-		failed: true,
-		code: BUILD_ERROR,
-		reason: `${gradlew} does not exist, so there is no gradle wrapper to build with.`,
-		remedy: "Restore the wrapper (`gradle wrapper` in android/, or regenerate the project with `npx expo prebuild -p android --clean`)."
-	};
-	return {
-		androidDir: dir,
-		gradlew
-	};
-}
-function androidSdkRefusal({ sdkPath, sdkExists, hasLocalProperties }) {
+function androidSdkRefusal({ sdkPath, sdkExists, hasLocalProperties, localPropertiesPath }) {
 	if (sdkExists || hasLocalProperties) return null;
 	return {
 		code: BUILD_ERROR,
 		reason: `No Android SDK at ${sdkPath}.`,
-		remedy: "Set ANDROID_HOME to the Android SDK (Android Studio installs it at ~/Library/Android/sdk), or write sdk.dir into android/local.properties. JAVA_HOME must point at a JDK 17 install as well."
+		remedy: `Set ANDROID_HOME to the Android SDK (Android Studio installs it at ~/Library/Android/sdk), or write sdk.dir into ${localPropertiesPath}. JAVA_HOME must point at a JDK 17 install as well.`
 	};
 }
 function pickDebugApk(files) {
@@ -392,8 +340,7 @@ function listApkSubdirs(base, prefix = [], depth = 0) {
 	}
 	return dirs;
 }
-function findVariantApkDir(root, variant) {
-	const base = apkOutputsDir(root);
+function findVariantApkDir(base, variant) {
 	const wanted = variant.trim().toLowerCase();
 	for (const segments of listApkSubdirs(base)) if (variantNameOf(segments).toLowerCase() === wanted) return join(base, ...segments);
 	return null;
@@ -410,25 +357,25 @@ function findDebugApksUnder(base) {
 	}
 	return found.toSorted();
 }
-function locateApk(root, transcript = "", variant = null) {
+function locateApk(project, transcript = "", variant = null) {
 	const fromTranscript = parseApkFromTranscript(transcript);
 	if (fromTranscript) {
-		const abs = isAbsolute(fromTranscript) ? fromTranscript : join(androidDir(root), fromTranscript);
+		const abs = isAbsolute(fromTranscript) ? fromTranscript : join(project.directory, fromTranscript);
 		if (existsSync(abs)) return { apkPath: abs };
 	}
 	if (variant) {
-		const dir = findVariantApkDir(root, variant);
+		const dir = findVariantApkDir(project.outputsDir, variant);
 		return { apkPath: dir ? apkInDir(dir) : null };
 	}
-	const direct = apkInDir(debugApkDir(root));
+	const direct = apkInDir(join(project.outputsDir, "debug"));
 	if (direct) return { apkPath: direct };
-	const found = findDebugApksUnder(apkOutputsDir(root));
+	const found = findDebugApksUnder(project.outputsDir);
 	if (found.length === 1) {
 		const apk = found[0];
-		const suggested = variantNameOf(relative(apkOutputsDir(root), apk).split(sep).slice(0, -1));
+		const suggested = variantNameOf(relative(project.outputsDir, apk).split(sep).slice(0, -1));
 		return {
 			apkPath: apk,
-			note: `no APK in ${relative(androidDir(root), debugApkDir(root))}; using ${relative(androidDir(root), apk)}${suggested ? ` -- set the android.variant setting to "${suggested}" to build this variant explicitly` : ""}`
+			note: `no APK in ${relative(project.directory, join(project.outputsDir, "debug"))}; using ${relative(project.directory, apk)}${suggested ? ` -- set the android.variant setting to "${suggested}" to build this variant explicitly` : ""}`
 		};
 	}
 	if (found.length > 1) return {
@@ -585,48 +532,21 @@ function parseProductFlavors(source) {
 		dimensions
 	};
 }
-function readProductFlavors(root) {
-	return parseProductFlavors(readOrNull(join(androidDir(root), "app", "build.gradle")));
-}
-function productFlavorRefusal({ flavors, variant }) {
-	if (variant) return null;
-	if (!flavors.known || flavors.dimensions.length === 0) return null;
-	let combinations = [[]];
-	for (const group of flavors.dimensions) combinations = combinations.flatMap((combination) => group.map((flavor) => combination.concat(flavor)));
-	if (combinations.length < 2) return null;
-	const count = flavors.dimensions.reduce((total, group) => total + group.length, 0);
-	const variants = combinations.map((combination) => variantNameOf(combination.concat("debug")));
-	return {
-		code: "STIM_BAD_ARG",
-		reason: `android/app/build.gradle declares ${count} product flavors, so \`./gradlew ${ASSEMBLE_TASK}\` builds an APK for each of them and nothing says which flavor to install.`,
-		remedy: `Pass \`--variant ${variants[0]}\` or set the android.variant setting -- e.g. {"android": {"variant": "${variants[0]}"}} in .stim.json. The debug variants are: ${variants.join(", ")}.`
-	};
-}
-function gradleArgs(task, { buildCache = true, abi = null } = {}) {
+function gradleArgs(task, { buildCache = true, projectArgs = [] } = {}) {
 	return [
 		task,
 		...buildCache ? ["--build-cache"] : ["--no-build-cache"],
-		...abi ? [`-PreactNativeArchitectures=${abi}`] : []
+		...projectArgs
 	];
 }
-async function buildAndroid({ root, logWriter, variant = null, abi = null }, { spawnFn = null, now = Date.now, env = process.env, buildCache = true, ccache = null, cas = null, pch = "auto", compilerCacheDisabled = false, heartbeatMs = HEARTBEAT_INTERVAL_MS, estimateMs = null, onHeartbeat = (line) => console.error(line), onNote = (line) => console.error(line), platform = process.platform } = {}) {
-	const project = discoverAndroidProject(root);
-	if (project.failed) return {
-		ok: false,
-		code: project.code,
-		reason: project.reason,
-		remedy: project.remedy,
-		diagnostics: [],
-		truncated: 0,
-		lastLines: [],
-		durationMs: 0
-	};
+async function buildGradle({ root, logWriter, variant = null, project, task, projectArgs = [], preflightFailure = null, locate }, { spawnFn = null, now = Date.now, env = process.env, buildCache = true, ccache = null, cas = null, pch = "auto", compilerCacheDisabled = false, heartbeatMs = HEARTBEAT_INTERVAL_MS, estimateMs = null, onHeartbeat = (line) => console.error(line), onNote = (line) => console.error(line) } = {}) {
 	const sdk = androidHome(env);
 	const sdkExists = existsSync(sdk);
 	const refusal = androidSdkRefusal({
 		sdkPath: sdk,
 		sdkExists,
-		hasLocalProperties: existsSync(join(project.androidDir, "local.properties"))
+		hasLocalProperties: existsSync(join(project.directory, "local.properties")),
+		localPropertiesPath: relative(root, join(project.directory, "local.properties")).split(sep).join("/")
 	});
 	if (refusal) return {
 		ok: false,
@@ -636,26 +556,21 @@ async function buildAndroid({ root, logWriter, variant = null, abi = null }, { s
 		lastLines: [],
 		durationMs: 0
 	};
-	const room = androidPathRoom(root, {
-		abi,
-		variant,
-		platform
-	});
-	if (room) return {
+	if (preflightFailure) return {
 		ok: false,
-		code: "STIM_PATH_TOO_LONG",
-		reason: androidPathRoomMessage(room),
-		remedy: androidPathRoomRemedy(room),
+		...preflightFailure,
 		diagnostics: [],
 		truncated: 0,
 		lastLines: [],
 		durationMs: 0
 	};
+	const wrapper = `./${relative(project.directory, project.gradlew).split(sep).join("/")}`;
+	const moduleTask = task.includes(":") ? task : `${project.module === ":" ? "" : project.module}:${task}`;
+	const tasksTask = `${project.module === ":" ? "" : project.module}:tasks`;
 	const spawn = spawnFn || ((cmd, args, opts) => getExecutor().spawn(cmd, args, opts));
-	const task = assembleTaskFor(variant);
 	const args = gradleArgs(task, {
 		buildCache,
-		abi
+		projectArgs
 	});
 	if (cas) {
 		args.push("--init-script", cas.initScript);
@@ -709,7 +624,7 @@ async function buildAndroid({ root, logWriter, variant = null, abi = null }, { s
 	let child;
 	try {
 		child = spawnDeclared(() => spawn(project.gradlew, args, {
-			cwd: project.androidDir,
+			cwd: project.directory,
 			stdio: [
 				"ignore",
 				"pipe",
@@ -726,7 +641,7 @@ async function buildAndroid({ root, logWriter, variant = null, abi = null }, { s
 			}
 		}));
 	} catch (err) {
-		return spawnFailure(err, project, now() - startedAt);
+		return spawnFailure(err, root, project, now() - startedAt);
 	}
 	const outReader = createLineReader(push);
 	const errReader = createLineReader(push);
@@ -748,7 +663,7 @@ async function buildAndroid({ root, logWriter, variant = null, abi = null }, { s
 	const transcript = window.join("\n");
 	const ccacheActivity = ccache ? readCcacheActivity(ccache.statsLog) : CCACHE_UNAVAILABLE;
 	if (result.error) return {
-		...spawnFailure(result.error, project, durationMs),
+		...spawnFailure(result.error, root, project, durationMs),
 		lastLines: tail.slice(),
 		ccache: ccacheActivity
 	};
@@ -758,7 +673,7 @@ async function buildAndroid({ root, logWriter, variant = null, abi = null }, { s
 		return {
 			ok: false,
 			code: BUILD_ERROR,
-			reason: `\`./gradlew ${task}\` failed (${how}).`,
+			reason: `\`${wrapper} ${task}\` failed (${how}).`,
 			diagnostics: shown,
 			truncated,
 			lastLines: tail.slice(),
@@ -766,23 +681,32 @@ async function buildAndroid({ root, logWriter, variant = null, abi = null }, { s
 			ccache: ccacheActivity
 		};
 	}
-	const located = locateApk(root, transcript, variant);
+	const located = locate ? await locate() : locateApk(project, transcript, variant);
+	if ("code" in located) return {
+		ok: false,
+		...located,
+		diagnostics: [],
+		truncated: 0,
+		lastLines: tail.slice(),
+		durationMs,
+		ccache: ccacheActivity
+	};
 	if (!located.apkPath && located.candidates?.length) return {
 		ok: false,
 		code: BUILD_ERROR,
-		reason: `\`./gradlew ${task}\` left ${located.candidates.length} debug APKs under ${apkOutputsDir(root)}, and nothing says which flavor to install.`,
-		remedy: `Set the android.variant setting to the variant to install -- e.g. {"android": {"variant": "${variantNameOf(relative(apkOutputsDir(root), located.candidates[0]).split(sep).slice(0, -1))}"}} in .stim.json.`,
+		reason: `\`${wrapper} ${task}\` left ${located.candidates.length} debug APKs under ${project.outputsDir}, and nothing says which flavor to install.`,
+		remedy: `Set the android.variant setting to the variant to install -- e.g. {"android": {"variant": "${variantNameOf(relative(project.outputsDir, located.candidates[0]).split(sep).slice(0, -1))}"}} in .stim.json.`,
 		diagnostics: [],
 		truncated: 0,
-		lastLines: located.candidates.map((c) => relative(androidDir(root), c)),
+		lastLines: located.candidates.map((c) => relative(project.directory, c)),
 		durationMs,
 		ccache: ccacheActivity
 	};
 	if (!located.apkPath) return {
 		ok: false,
 		code: BUILD_ERROR,
-		reason: variant ? `\`./gradlew ${task}\` succeeded but produced no APK under ${apkOutputsDir(root)} for variant "${variant}".` : `\`./gradlew ${task}\` succeeded but produced no APK in ${debugApkDir(root)}.`,
-		remedy: variant ? `Check that the android.variant setting ("${variant}") names a real variant (\`./gradlew :app:tasks\` lists the assemble tasks).` : `Check that ${task} builds the app module (\`./gradlew :app:${task}\` in android/) and that no flavour redirects the output.`,
+		reason: variant ? `\`${wrapper} ${task}\` succeeded but produced no APK under ${project.outputsDir} for variant "${variant}".` : `\`${wrapper} ${task}\` succeeded but produced no APK in ${join(project.outputsDir, "debug")}.`,
+		remedy: variant ? `Check that the android.variant setting ("${variant}") names a real variant (\`${wrapper} ${tasksTask}\` lists the assemble tasks).` : `Check that ${task} builds the ${project.module.replace(/^:/, "") || "root"} module (\`${wrapper} ${moduleTask}\` in ${relative(root, project.directory).split(sep).join("/") || "."}/) and that no flavour redirects the output.`,
 		diagnostics: [],
 		truncated: 0,
 		lastLines: tail.slice(),
@@ -793,6 +717,7 @@ async function buildAndroid({ root, logWriter, variant = null, abi = null }, { s
 		ok: true,
 		apkPath: located.apkPath,
 		apkNote: located.note ?? null,
+		...located.androidPackage ? { androidPackage: located.androidPackage } : {},
 		durationMs,
 		lastLines: tail.slice(),
 		ccache: ccacheActivity
@@ -804,7 +729,7 @@ function resetStatsLog(statsLog) {
 		rmSync(statsLog, { force: true });
 	} catch {}
 }
-function spawnFailure(err, project, durationMs) {
+function spawnFailure(err, root, project, durationMs) {
 	const nodeErr = err;
 	const message = String(nodeErr?.message || err || "");
 	const permissionDenied = nodeErr?.code === "EACCES" || /EACCES|permission denied/i.test(message);
@@ -812,7 +737,7 @@ function spawnFailure(err, project, durationMs) {
 		ok: false,
 		code: BUILD_ERROR,
 		reason: `Could not run ${project.gradlew}: ${message}`,
-		remedy: permissionDenied ? `Make the wrapper executable: \`chmod +x ${project.gradlew}\`.` : "Check that the gradle wrapper is intact (android/gradlew and android/gradle/wrapper/) and that JAVA_HOME points at a JDK 17 install.",
+		remedy: permissionDenied ? `Make the wrapper executable: \`chmod +x ${project.gradlew}\`.` : `Check that the gradle wrapper is intact (${relative(root, project.gradlew)} and ${relative(root, join(project.directory, "gradle", "wrapper"))}/) and that JAVA_HOME points at a JDK 17 install.`,
 		diagnostics: [],
 		truncated: 0,
 		lastLines: [],
@@ -838,4 +763,4 @@ function readOrNull(file) {
 	}
 }
 //#endregion
-export { gradlewPath as a, formatDiagnostic as c, androidPathRoomRemedy as d, buildAndroid as i, androidPathRoom as l, apkOutputsDir as n, productFlavorRefusal as o, assembleTaskFor as r, readProductFlavors as s, androidSdkRefusal as t, androidPathRoomMessage as u };
+export { buildGradle as a, formatDiagnostic as c, assembleTaskFor as i, BUILD_ERROR as n, parseProductFlavors as o, androidSdkRefusal as r, variantNameOf as s, ASSEMBLE_TASK as t };