@rn-iso/expo-build-cache 1.3.3 → 1.5.0

package/README.md

@@ -44,4 +44,4 @@ npx rn-iso gc --delete --older-than 30   # drop entries unused for 30 days
 rn-iso is an optional peer. Without it the cache works exactly the same; it is
 just invisible to housekeeping.
 
-`RN_ISO_BUILD_CACHE` overrides the location.
+The location can be overridden by `RN_ISO_BUILD_CACHE`, or machine-wide by `caches.buildCache` in `~/.rn-iso/config.json` (an absolute path; the env var wins). The CLI and this package resolve both identically, so they always share one store.

package/dist/index.d.ts

@@ -1,23 +1,16 @@
+import { BuildRunOptions, buildCacheKey } from "@rn-iso/core";
 //#region index.d.ts
-interface RunOptions {
-  variant?: unknown;
-  configuration?: unknown;
-  buildConfiguration?: unknown;
-  isSimulator?: unknown;
-  device?: unknown;
-}
 declare function cacheRoot(): string;
-declare function buildCacheKey(platform: string, fingerprintHash: string, runOptions?: RunOptions): string;
 declare function resolveBuildCache({ platform, fingerprintHash, runOptions }: {
   platform: string;
   fingerprintHash: string;
-  runOptions?: RunOptions;
+  runOptions?: BuildRunOptions;
 }): Promise<string | null>;
 declare function uploadBuildCache({ platform, fingerprintHash, buildPath, runOptions }: {
   platform: string;
   fingerprintHash: string;
   buildPath?: string;
-  runOptions?: RunOptions;
+  runOptions?: BuildRunOptions;
 }): Promise<string | null>;
 //#endregion
 export { buildCacheKey, cacheRoot, resolveBuildCache, uploadBuildCache };

package/dist/index.js

@@ -23,44 +23,18 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 //#endregion
 let node_fs = require("node:fs");
 node_fs = __toESM(node_fs);
-let node_os = require("node:os");
-node_os = __toESM(node_os);
 let node_path = require("node:path");
 node_path = __toESM(node_path);
+let _rn_iso_core = require("@rn-iso/core");
 let node_child_process = require("node:child_process");
 //#region index.ts
-function configDir() {
-	return process.env.RN_ISO_HOME || node_path.default.join(node_os.default.homedir(), ".rn-iso");
-}
+let registeredDir = null;
 function cacheRoot() {
-	return process.env.RN_ISO_BUILD_CACHE || node_path.default.join(configDir(), "build-cache");
+	return (0, _rn_iso_core.buildCacheRoot)();
 }
 function entryDir(platform, key) {
 	return node_path.default.join(cacheRoot(), platform, key);
 }
-const SIMULATOR_UDID = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
-const EMULATOR_SERIAL = /^emulator-\d+$/;
-function slug(value) {
-	return String(value).toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "");
-}
-function buildVariant(platform, options) {
-	const raw = platform === "android" ? options.variant : options.configuration != null ? options.configuration : options.buildConfiguration;
-	return (typeof raw === "string" ? slug(raw) : "") || "debug";
-}
-function buildTarget(options) {
-	if (typeof options.isSimulator === "boolean") return options.isSimulator ? "sim" : "device";
-	const device = options.device;
-	if (device === void 0 || device === null || device === false) return "sim";
-	if (typeof device !== "string") return "prompted";
-	const name = device.trim();
-	if (name === "" || name === "generic") return "sim";
-	if (SIMULATOR_UDID.test(name) || EMULATOR_SERIAL.test(name)) return "sim";
-	return `on-${slug(name)}`;
-}
-function buildCacheKey(platform, fingerprintHash, runOptions) {
-	const opts = runOptions && typeof runOptions === "object" ? runOptions : {};
-	return `${fingerprintHash}-${buildVariant(platform, opts)}-${buildTarget(opts)}`;
-}
 function shortKey(key, fingerprintHash) {
 	return `${String(fingerprintHash).slice(0, 12)}${key.slice(String(fingerprintHash).length)}`;
 }
@@ -74,44 +48,11 @@ function artifactIn(dir) {
 	}
 	return found ? node_path.default.join(dir, found) : null;
 }
-function registerCache({ dir, name, prune, note, entriesDepth }) {
-	try {
-		const home = configDir();
-		const file = node_path.default.join(home, "caches.json");
-		let manifest = {
-			version: 1,
-			caches: []
-		};
-		try {
-			const parsed = JSON.parse(node_fs.default.readFileSync(file, "utf-8"));
-			if (Array.isArray(parsed?.caches)) manifest = {
-				version: 1,
-				caches: parsed.caches
-			};
-		} catch {}
-		const others = manifest.caches.filter((c) => c.dir !== dir);
-		const record = {
-			dir,
-			name,
-			prune,
-			note,
-			registeredBy: process.cwd()
-		};
-		if (entriesDepth) record.entriesDepth = entriesDepth;
-		others.push(record);
-		node_fs.default.mkdirSync(home, { recursive: true });
-		node_fs.default.writeFileSync(file, JSON.stringify({
-			version: 1,
-			caches: others
-		}, null, 2));
-	} catch {}
-}
-let registeredDir = null;
 function registerOnce() {
 	const root = cacheRoot();
 	if (registeredDir === root) return;
 	registeredDir = root;
-	registerCache({
+	(0, _rn_iso_core.registerCache)({
 		dir: root,
 		name: "Expo build cache",
 		prune: "entries",
@@ -121,7 +62,7 @@ function registerOnce() {
 }
 async function resolveBuildCache({ platform, fingerprintHash, runOptions }) {
 	registerOnce();
-	const key = buildCacheKey(platform, fingerprintHash, runOptions);
+	const key = (0, _rn_iso_core.buildCacheKey)(platform, fingerprintHash, runOptions);
 	const hit = artifactIn(entryDir(platform, key));
 	if (hit) {
 		console.log(`[build-cache] hit ${platform} ${shortKey(key, fingerprintHash)}`);
@@ -136,7 +77,7 @@ async function resolveBuildCache({ platform, fingerprintHash, runOptions }) {
 async function uploadBuildCache({ platform, fingerprintHash, buildPath, runOptions }) {
 	registerOnce();
 	if (!buildPath || !node_fs.default.existsSync(buildPath)) return null;
-	const key = buildCacheKey(platform, fingerprintHash, runOptions);
+	const key = (0, _rn_iso_core.buildCacheKey)(platform, fingerprintHash, runOptions);
 	const dest = entryDir(platform, key);
 	if (artifactIn(dest)) return artifactIn(dest);
 	const staging = `${dest}.staging-${process.pid}`;
@@ -145,11 +86,20 @@ async function uploadBuildCache({ platform, fingerprintHash, buildPath, runOptio
 		force: true
 	});
 	node_fs.default.mkdirSync(staging, { recursive: true });
-	(0, node_child_process.execFileSync)("cp", [
-		"-R",
-		buildPath,
-		node_path.default.join(staging, node_path.default.basename(buildPath))
-	]);
+	try {
+		(0, node_child_process.execFileSync)("cp", [
+			"-c",
+			"-R",
+			buildPath,
+			node_path.default.join(staging, node_path.default.basename(buildPath))
+		]);
+	} catch {
+		(0, node_child_process.execFileSync)("cp", [
+			"-R",
+			buildPath,
+			node_path.default.join(staging, node_path.default.basename(buildPath))
+		]);
+	}
 	node_fs.default.mkdirSync(node_path.default.dirname(dest), { recursive: true });
 	node_fs.default.rmSync(dest, {
 		recursive: true,
@@ -167,7 +117,7 @@ async function uploadBuildCache({ platform, fingerprintHash, buildPath, runOptio
 	return artifactIn(dest);
 }
 //#endregion
-exports.buildCacheKey = buildCacheKey;
+exports.buildCacheKey = _rn_iso_core.buildCacheKey;
 exports.cacheRoot = cacheRoot;
 exports.resolveBuildCache = resolveBuildCache;
 exports.uploadBuildCache = uploadBuildCache;

package/package.json

@@ -1,8 +1,13 @@
 {
   "name": "@rn-iso/expo-build-cache",
-  "version": "1.3.3",
+  "version": "1.5.0",
   "description": "Local Expo build cache provider: installs a cached .app/.apk instead of compiling when no native input changed.",
   "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/appandflow/rn-iso.git",
+    "directory": "packages/expo-build-cache"
+  },
   "files": [
     "dist",
     "README.md",
@@ -21,6 +26,9 @@
     "test": "node --test test/*.test.js",
     "build": "tsdown"
   },
+  "dependencies": {
+    "@rn-iso/core": "^1.5.0"
+  },
   "engines": {
     "node": ">=22"
   }