hot-updater 1.0.0 → 1.0.1

package/dist/index.mjs

@@ -3870,26 +3870,112 @@ async function handleAgentInfra(operation, options) {
 	await handleInfraScaffold(operation, options);
 }
 //#endregion
-//#region src/utils/version/getAndroidVersion.ts
-const getAndroidVersionFromAppBuildGradle = async () => {
-	const buildGradlePath = path.join(getCwd(), "android", "app", "build.gradle");
-	try {
-		return (await fs$3.readFile(buildGradlePath, "utf8")).match(/versionName\s+['"]([^"]+)['"]/)?.[1] ?? null;
-	} catch {
-		return null;
-	}
+//#region src/utils/version/appVersionCandidates.ts
+/** One version only when every candidate declares the same literal. */
+const resolveFromCandidates = (candidates) => {
+	const versions = new Set(candidates.map((candidate) => candidate.version));
+	const [version] = versions;
+	return {
+		version: versions.size === 1 && version ? version : null,
+		candidates
+	};
 };
-const AndroidVersionParsers = { "app-build-gradle": getAndroidVersionFromAppBuildGradle };
-const getAndroidVersion = async ({ parser, validateWithSemver = false }) => {
-	const parsers = Array.isArray(parser) ? parser : [parser];
-	for (const parserKey of parsers) {
-		const parsedVersion = await AndroidVersionParsers[parserKey]();
-		if (!parsedVersion) continue;
-		if (validateWithSemver && !normalizeRange(parsedVersion)) continue;
-		return parsedVersion;
+/** Several candidates and no single version: the caller must pick one. */
+const isAmbiguousAppVersion = ({ version, candidates }) => version === null && candidates.length > 1;
+const formatAppVersionCandidates = (candidates) => candidates.map(({ label, version }) => `${label}: ${version ?? "unresolved"}`).join(", ");
+//#endregion
+//#region src/utils/version/getAndroidVersion.ts
+const stripComments = (source) => source.replace(/\/\*[\s\S]*?\*\//g, "").replace(/^\s*\/\/.*$/gm, "");
+/** The body of the `{ ... }` block that opens at or after `from`. */
+const readBlock = (source, from) => {
+	const open = source.indexOf("{", from);
+	if (open === -1) return null;
+	let depth = 0;
+	for (let index = open; index < source.length; index++) {
+		if (source[index] === "{") depth++;
+		if (source[index] === "}" && --depth === 0) return {
+			body: source.slice(open + 1, index),
+			end: index + 1
+		};
 	}
 	return null;
 };
+/** The top-level `name { ... }` blocks in a block body. */
+const readNamedBlocks = (body) => {
+	const blocks = [];
+	const header = /(?:create\(\s*["']([\w-]+)["']\s*\)|([\w-]+))\s*\{/g;
+	let match;
+	while (match = header.exec(body)) {
+		const block = readBlock(body, match.index);
+		if (!block) break;
+		blocks.push({
+			name: match[1] ?? match[2],
+			body: block.body
+		});
+		header.lastIndex = block.end;
+	}
+	return blocks;
+};
+/** The first block called `name`, in file order, at any depth. */
+const findBlock = (source, name) => readNamedBlocks(source).flatMap((block) => block.name === name ? [block] : [findBlock(block.body, name)]).find((block) => block !== void 0);
+/** A literal setting declared directly in a block body; null when not literal. */
+const readSetting = (body, setting) => {
+	const match = readNamedBlocks(body).reduce((rest, block) => rest.replace(block.body, ""), body).match(new RegExp(`\\b${setting}\\b\\s*=?\\s*(?:(['"])([^'"]*)\\1|(\\S+))`));
+	if (!match) return void 0;
+	return match[2] || null;
+};
+const capitalize = (value) => value.charAt(0).toUpperCase() + value.slice(1);
+/**
+* Whether a variant builds a flavor: `stagingRelease` builds `staging`, and
+* with flavor dimensions `brandAStagingRelease` builds `brandA` and `staging`.
+*/
+const variantBuildsFlavor = (variant, flavor) => new RegExp(`${capitalize(flavor)}(?=[A-Z]|$)`).test(capitalize(variant));
+/**
+* Reads versionName from defaultConfig and from each product flavor, so an
+* app whose flavors (brands, environments) override the version is reported
+* as ambiguous instead of resolving to the first versionName in the file.
+*/
+const getAndroidVersionFromAppBuildGradle = async (scope = {}) => {
+	const buildGradlePath = path.join(getCwd(), "android", scope.appModuleName ?? "app", "build.gradle");
+	let buildGradle;
+	try {
+		buildGradle = stripComments(await fs$3.readFile(buildGradlePath, "utf8"));
+	} catch {
+		return {
+			version: null,
+			candidates: []
+		};
+	}
+	const android = findBlock(buildGradle, "android")?.body ?? "";
+	const defaultConfig = findBlock(android, "defaultConfig");
+	const defaultVersion = defaultConfig ? readSetting(defaultConfig.body, "versionName") : void 0;
+	const flavorsBlock = findBlock(android, "productFlavors");
+	const flavors = (flavorsBlock ? readNamedBlocks(flavorsBlock.body) : []).map((flavor) => ({
+		name: flavor.name,
+		applicationId: readSetting(flavor.body, "applicationId"),
+		versionName: readSetting(flavor.body, "versionName")
+	}));
+	const defaultCandidate = defaultVersion === void 0 ? [] : [{
+		label: "defaultConfig",
+		version: defaultVersion
+	}];
+	const flavorCandidates = (flavorList) => flavorList.flatMap((flavor) => flavor.versionName === void 0 ? [] : [{
+		label: `${flavor.name} flavor`,
+		version: flavor.versionName
+	}]);
+	const { variant, applicationId } = scope;
+	if (variant || applicationId) {
+		const builtFlavors = flavors.filter((flavor) => applicationId !== void 0 && flavor.applicationId === applicationId || variant !== void 0 && variantBuildsFlavor(variant, flavor.name));
+		if (builtFlavors.length > 0) {
+			const overrides = flavorCandidates(builtFlavors);
+			return resolveFromCandidates(overrides.length > 0 ? overrides : defaultCandidate);
+		}
+	}
+	const overrides = flavorCandidates(flavors);
+	const everyFlavorOverrides = flavors.length > 0 && overrides.length === flavors.length;
+	return resolveFromCandidates([...everyFlavorOverrides ? [] : defaultCandidate, ...overrides]);
+};
+const resolveAndroidAppVersion = (scope) => getAndroidVersionFromAppBuildGradle(scope);
 //#endregion
 //#region ../../node_modules/.pnpm/@bacons+xcode@1.0.0-alpha.33/node_modules/@bacons/xcode/build/api/utils/constants.js
 var require_constants = /* @__PURE__ */ __commonJSMin(((exports) => {
@@ -19406,81 +19492,138 @@ const isFileExist = async (path) => {
 		return false;
 	}
 };
-const getIOSVersionFromInfoPlist = async () => {
+const isResolved = (value) => typeof value === "string" && value.length > 0 && !value.includes("$(");
+const readInfoPlistVersion = async (plistPath) => {
 	try {
-		const iosAppTargetDirectory = getIosAppTargetDirectoryName();
-		if (!iosAppTargetDirectory) return null;
-		const plistPath = path.join(getCwd(), "ios", iosAppTargetDirectory, "Info.plist");
 		if (!await isFileExist(plistPath)) return null;
 		const fileBuffer = await fs$3.readFile(plistPath);
 		const appVersion = parsePlist(fileBuffer)["CFBundleShortVersionString"];
-		if (typeof appVersion !== "string" || appVersion.includes("$(")) return null;
-		return appVersion;
+		return isResolved(appVersion) ? appVersion : null;
 	} catch {
 		return null;
 	}
 };
-const getIOSVersionFromXcodeProject = async () => {
+const getIOSVersionFromInfoPlist = async () => {
+	const iosAppTargetDirectory = getIosAppTargetDirectoryName();
+	if (!iosAppTargetDirectory) return null;
+	return readInfoPlistVersion(path.join(getCwd(), "ios", iosAppTargetDirectory, "Info.plist"));
+};
+const APPLICATION_PRODUCT_TYPE = "com.apple.product-type.application";
+/**
+* Reads MARKETING_VERSION per application target, so a project whose targets
+* (brands, environments) ship different versions is reported as ambiguous
+* instead of resolving to whichever configuration comes first in the file.
+*/
+const getIOSVersionFromXcodeProject = async (scope = {}) => {
+	const notFound = {
+		version: null,
+		candidates: []
+	};
 	try {
+		const iosDirectory = path.join(getCwd(), "ios");
 		const [xcodeprojPath] = import_out.default.globSync("*.xcodeproj/project.pbxproj", {
-			cwd: path.join(getCwd(), "ios"),
+			cwd: iosDirectory,
 			absolute: true,
 			onlyFiles: true
 		});
-		if (!xcodeprojPath) return null;
-		const objects = import_build.XcodeProject.open(xcodeprojPath).toJSON().objects ?? {};
-		for (const key of Object.keys(objects)) {
-			const obj = objects[key];
-			if (!obj || typeof obj !== "object") continue;
-			const record = obj;
-			if (record.isa !== "XCBuildConfiguration" || record.name !== "Release") continue;
-			const marketingVersion = record.buildSettings?.MARKETING_VERSION;
-			if (marketingVersion) return marketingVersion;
-		}
-		return null;
+		if (!xcodeprojPath) return notFound;
+		const project = import_build.XcodeProject.open(xcodeprojPath).toJSON();
+		const objects = project.objects ?? {};
+		const configurationName = scope.configuration ?? "Release";
+		const findConfiguration = (listId) => (listId ? objects[listId]?.buildConfigurations ?? [] : []).map((id) => objects[id]).find((config) => config?.name === configurationName);
+		const rootProject = project.rootObject ? objects[project.rootObject] : void 0;
+		const projectSettings = findConfiguration(rootProject?.buildConfigurationList)?.buildSettings ?? {};
+		const appTargets = (rootProject?.targets ?? []).map((id) => objects[id]).filter((target) => target?.isa === "PBXNativeTarget" && target.productType === APPLICATION_PRODUCT_TYPE).map((target) => {
+			const settings = {
+				...projectSettings,
+				...findConfiguration(target.buildConfigurationList)?.buildSettings
+			};
+			const infoPlistFile = typeof settings.INFOPLIST_FILE === "string" ? settings.INFOPLIST_FILE.replace("$(SRCROOT)", iosDirectory) : void 0;
+			return {
+				name: target.name ?? "unknown",
+				bundleIdentifier: settings.PRODUCT_BUNDLE_IDENTIFIER,
+				marketingVersion: settings.MARKETING_VERSION,
+				infoPlistPath: isResolved(infoPlistFile) ? path.resolve(iosDirectory, infoPlistFile) : void 0
+			};
+		});
+		if (appTargets.length === 0) {
+			const candidates = Object.values(objects).filter((object) => object?.isa === "XCBuildConfiguration" && object.name === configurationName && object.buildSettings?.MARKETING_VERSION !== void 0).map((object) => ({
+				label: configurationName,
+				version: isResolved(object?.buildSettings?.MARKETING_VERSION) ? object.buildSettings.MARKETING_VERSION : null
+			}));
+			return resolveFromCandidates(candidates);
+		}
+		const scopedTargets = scope.scheme || scope.bundleIdentifier ? appTargets.filter((target) => target.name === scope.scheme || scope.bundleIdentifier !== void 0 && target.bundleIdentifier === scope.bundleIdentifier) : [];
+		const targets = scopedTargets.length > 0 ? scopedTargets : appTargets;
+		return resolveFromCandidates(await Promise.all(targets.map(async (target) => ({
+			label: `${target.name} (${configurationName})`,
+			version: (target.infoPlistPath ? await readInfoPlistVersion(target.infoPlistPath) : null) ?? (isResolved(target.marketingVersion) ? target.marketingVersion : null)
+		}))));
 	} catch {
-		return null;
+		return notFound;
 	}
 };
-const IOSVersionParsers = {
-	xcodeproj: getIOSVersionFromXcodeProject,
-	"info-plist": getIOSVersionFromInfoPlist
-};
-const getIOSVersion = async ({ parser, validateWithSemver = false }) => {
-	const parsers = Array.isArray(parser) ? parser : [parser];
-	for (const parserKey of parsers) {
-		const parsedVersion = await IOSVersionParsers[parserKey]();
-		if (!parsedVersion) continue;
-		if (validateWithSemver && !normalizeRange(parsedVersion)) continue;
-		return parsedVersion;
-	}
-	return null;
+/**
+* The iOS app version: Info.plist first, project.pbxproj as a fallback.
+*
+* CFBundleShortVersionString is the version the built app actually reports,
+* so it is the more correct source (#84). It is also far cheaper: reading
+* Info.plist is a small file read, whereas the pbxproj parser is synchronous
+* and blocks the event loop for the length of the parse. On a large
+* project.pbxproj that can take minutes. The React Native template ships
+* Info.plist with CFBundleShortVersionString set to "$(MARKETING_VERSION)",
+* which the plist parser cannot resolve, so the real version only lives in
+* project.pbxproj for most projects.
+*/
+const resolveIOSAppVersion = async (scope) => {
+	const plistVersion = await getIOSVersionFromInfoPlist();
+	if (plistVersion) return {
+		version: plistVersion,
+		candidates: [{
+			label: "Info.plist",
+			version: plistVersion
+		}]
+	};
+	return getIOSVersionFromXcodeProject(scope);
 };
 //#endregion
 //#region src/utils/version/getNativeAppVersion.ts
-const getNativeAppVersion = async (platform) => {
+/**
+* The version the native project builds, with every place it is declared.
+* A project that builds several apps (Xcode targets, product flavors) with
+* different versions resolves to null unless `scope` names the one built.
+*/
+const resolveNativeAppVersion = async (platform, scope = {}) => {
 	switch (platform) {
-		case "ios": return getIOSVersion({ parser: ["info-plist", "xcodeproj"] });
-		case "android": return getAndroidVersion({ parser: "app-build-gradle" });
-		default: return null;
+		case "ios": return resolveIOSAppVersion(scope.ios);
+		case "android": return resolveAndroidAppVersion(scope.android);
+		default: return {
+			version: null,
+			candidates: []
+		};
 	}
 };
+const getNativeAppVersion = async (platform, scope) => (await resolveNativeAppVersion(platform, scope)).version;
 //#endregion
 //#region src/commands/appVersion.ts
 const readAppVersions = async () => {
-	const [androidVersion, iosVersion] = await Promise.all([getNativeAppVersion("android"), getNativeAppVersion("ios")]);
+	const [android, ios] = await Promise.all([resolveNativeAppVersion("android"), resolveNativeAppVersion("ios")]);
 	return {
-		android: androidVersion,
-		ios: iosVersion
+		android,
+		ios
 	};
 };
+const formatVersion = (resolved) => isAmbiguousAppVersion(resolved) ? ui.warning(`several (${formatAppVersionCandidates(resolved.candidates)}); deploy needs -t`) : ui.version(resolved.version);
 const handleAppVersion = async (options = {}) => {
 	const versions = await readAppVersions();
 	if (options.json) {
-		console.log(JSON.stringify(versions, null, 2));
+		console.log(JSON.stringify({
+			android: versions.android.version,
+			ios: versions.ios.version
+		}, null, 2));
 		return;
 	}
-	p.log.message(ui.block("App version", [ui.kv("Android", ui.version(versions.android)), ui.kv("iOS", ui.version(versions.ios))]));
+	p.log.message(ui.block("App version", [ui.kv("Android", formatVersion(versions.android)), ui.kv("iOS", formatVersion(versions.ios))]));
 };
 //#endregion
 //#region ../../node_modules/.pnpm/is-plain-obj@4.1.0/node_modules/is-plain-obj/index.js
@@ -25767,11 +25910,25 @@ async function prepareNativeBuild(options) {
 	} else if (config.updateStrategy === "appVersion") {
 		const s = p.spinner();
 		s.start(`Get native app version (${platform})`);
-		const appVersion = await getNativeAppVersion(platform);
+		const iosScheme = config.nativeBuild.ios[scheme];
+		const androidScheme = config.nativeBuild.android[scheme];
+		const resolved = await resolveNativeAppVersion(platform, {
+			ios: iosScheme && {
+				scheme: iosScheme.scheme,
+				bundleIdentifier: iosScheme.bundleIdentifier,
+				configuration: iosScheme.configuration
+			},
+			android: androidScheme && {
+				variant: androidScheme.variant,
+				applicationId: androidScheme.applicationId ?? androidScheme.packageName,
+				appModuleName: androidScheme.appModuleName
+			}
+		});
+		const appVersion = resolved.version;
 		s.stop(`App Version(${platform}): ${appVersion}`);
 		target.appVersion = appVersion;
 		if (!target.appVersion) {
-			p.log.error(`Failed to retrieve native app version of ${platform}`);
+			p.log.error(isAmbiguousAppVersion(resolved) ? platform === "ios" ? `nativeBuild.ios.${scheme} (scheme ${iosScheme?.scheme}, bundleIdentifier ${iosScheme?.bundleIdentifier}) does not pick one of the app targets in project.pbxproj, which declare different versions (${formatAppVersionCandidates(resolved.candidates)}). Make its scheme match the name of the app target it builds.` : `nativeBuild.android.${scheme} (variant ${androidScheme?.variant ?? "Release"}) does not pick one of the product flavors that set versionName, which declare different versions (${formatAppVersionCandidates(resolved.candidates)}). Set its variant to the flavor it builds, such as brandARelease.` : `Failed to retrieve native app version of ${platform}`);
 			return null;
 		}
 	}
@@ -26913,18 +27070,23 @@ async function validateSigningConfig(config, options = {}) {
 }
 //#endregion
 //#region src/utils/version/getDefaultTargetAppVersion.ts
+/**
+* The target app version deploy defaults to, as a range. `version` is null
+* when the native files declare none, or several (see `candidates`).
+*/
 const getDefaultTargetAppVersion = async (platform) => {
-	let version = null;
-	switch (platform) {
-		case "ios":
-			version = await getIOSVersion({ parser: ["info-plist", "xcodeproj"] });
-			break;
-		case "android": version = await getAndroidVersion({ parser: "app-build-gradle" });
-	}
-	if (!version) return null;
-	if (!(/^\d+\.\d+$/.test(version) || normalizeRange(version))) return null;
+	const resolved = await resolveNativeAppVersion(platform);
+	let version = resolved.version;
+	if (!version) return resolved;
+	if (!(/^\d+\.\d+$/.test(version) || normalizeRange(version))) return {
+		...resolved,
+		version: null
+	};
 	if (version.split(".").length - 1 === 1) version = `${version}.x`;
-	return version;
+	return {
+		...resolved,
+		version
+	};
 };
 //#endregion
 //#region src/commands/deployTransaction.ts
@@ -27250,18 +27412,20 @@ const deployPlatform = async ({ config, core, database, deferAutoPatches, option
 		target.fingerprintHash = newFingerprint.hash;
 		s.stop(`Fingerprint(${platform}): ${newFingerprint.hash}`);
 	} else {
-		const defaultTargetAppVersion = await getDefaultTargetAppVersion(platform);
+		const defaultTargetAppVersion = options.targetAppVersion ? null : await getDefaultTargetAppVersion(platform);
+		const ambiguousVersions = defaultTargetAppVersion && isAmbiguousAppVersion(defaultTargetAppVersion) ? formatAppVersionCandidates(defaultTargetAppVersion.candidates) : null;
+		const defaultVersion = defaultTargetAppVersion?.version ?? null;
 		const targetAppVersion = options.targetAppVersion ?? (options.interactive ? await p.text({
-			message: "Target app version",
-			placeholder: defaultTargetAppVersion ?? "1.0.0",
-			initialValue: defaultTargetAppVersion ?? "1.0.0",
+			message: ambiguousVersions ? `Target app version (the native project builds several versions: ${ambiguousVersions})` : "Target app version",
+			placeholder: defaultVersion ?? "1.0.0",
+			initialValue: defaultVersion ?? (ambiguousVersions ? "" : "1.0.0"),
 			validate: (value) => {
 				if (!value || !normalizeRange(value)) return "Invalid semver format (e.g. 1.0.0, 1.x.x)";
 			}
-		}) : defaultTargetAppVersion);
+		}) : defaultVersion);
 		if (p.isCancel(targetAppVersion)) return null;
 		if (!targetAppVersion) {
-			p.log.error("Target app version not found in native files (Info.plist for iOS, build.gradle for Android). Pass -t <targetAppVersion> explicitly, or check your native config.");
+			p.log.error(ambiguousVersions ? `The native project builds several app versions (${ambiguousVersions}), so the target app version for this deploy cannot be read from it. Pass -t <targetAppVersion> for the app this deploy targets.` : "Target app version not found in native files (Info.plist or project.pbxproj for iOS, build.gradle for Android). Pass -t <targetAppVersion> explicitly, or check your native config.");
 			return null;
 		}
 		target.appVersion = targetAppVersion;

package/dist/infra-templates/aws/lambda/index.cjs

@@ -4550,7 +4550,7 @@ const createKvAdapter = ({ store, tablePrefix = "" }) => {
 };
 //#endregion
 //#region ../../packages/server/dist/version.mjs
-const HOT_UPDATER_SERVER_VERSION = "1.0.0";
+const HOT_UPDATER_SERVER_VERSION = "1.0.1";
 //#endregion
 //#region ../../packages/server/dist/handlerVersionRoutes.mjs
 /**

package/dist/infra-templates/aws/template.json

@@ -1,9 +1,9 @@
 {
   "schemaVersion": 1,
   "provider": "aws",
-  "cliVersion": "1.0.0",
-  "providerVersion": "1.0.0",
-  "serverVersion": "1.0.0",
+  "cliVersion": "1.0.1",
+  "providerVersion": "1.0.1",
+  "serverVersion": "1.0.1",
   "infrastructureGeneration": 1,
   "clientAuth": {
     "plugin": "apiKeys",
@@ -65,13 +65,13 @@
     }
   ],
   "packages": {
-    "hot-updater": "1.0.0",
-    "@hot-updater/server": "1.0.0",
-    "@hot-updater/react-native": "1.0.0",
-    "@hot-updater/aws": "1.0.0",
-    "@hot-updater/bare": "1.0.0",
-    "@hot-updater/rock": "1.0.0",
-    "@hot-updater/expo": "1.0.0",
+    "hot-updater": "1.0.1",
+    "@hot-updater/server": "1.0.1",
+    "@hot-updater/react-native": "1.0.1",
+    "@hot-updater/aws": "1.0.1",
+    "@hot-updater/bare": "1.0.1",
+    "@hot-updater/rock": "1.0.1",
+    "@hot-updater/expo": "1.0.1",
     "@aws-sdk/credential-providers": "3.1066.0"
   },
   "requiredInputs": {

package/dist/infra-templates/cloudflare/template.json

@@ -1,9 +1,9 @@
 {
   "schemaVersion": 1,
   "provider": "cloudflare",
-  "cliVersion": "1.0.0",
-  "providerVersion": "1.0.0",
-  "serverVersion": "1.0.0",
+  "cliVersion": "1.0.1",
+  "providerVersion": "1.0.1",
+  "serverVersion": "1.0.1",
   "infrastructureGeneration": 1,
   "clientAuth": {
     "plugin": "apiKeys",
@@ -61,13 +61,13 @@
     }
   ],
   "packages": {
-    "hot-updater": "1.0.0",
-    "@hot-updater/server": "1.0.0",
-    "@hot-updater/react-native": "1.0.0",
-    "@hot-updater/cloudflare": "1.0.0",
-    "@hot-updater/bare": "1.0.0",
-    "@hot-updater/rock": "1.0.0",
-    "@hot-updater/expo": "1.0.0"
+    "hot-updater": "1.0.1",
+    "@hot-updater/server": "1.0.1",
+    "@hot-updater/react-native": "1.0.1",
+    "@hot-updater/cloudflare": "1.0.1",
+    "@hot-updater/bare": "1.0.1",
+    "@hot-updater/rock": "1.0.1",
+    "@hot-updater/expo": "1.0.1"
   },
   "requiredInputs": {
     "workerName": null,

package/dist/infra-templates/cloudflare/worker/dist/README.md

@@ -1 +1 @@
-This folder contains the built output assets for the worker "hot-updater" generated at 2026-10-11T01:49:38.431Z.
+This folder contains the built output assets for the worker "hot-updater" generated at 2026-10-12T01:32:33.502Z.

package/dist/infra-templates/cloudflare/worker/dist/index.js

@@ -4510,7 +4510,7 @@ var createSqlAdapter = /* @__PURE__ */ __name(({ executor, tablePrefix = "", max
 }, "createSqlAdapter");
 
 // ../../packages/server/dist/package.mjs
-var version = "1.0.0";
+var version = "1.0.1";
 
 // ../../packages/server/dist/version.mjs
 var HOT_UPDATER_SERVER_VERSION = version;