@better-update/cli 0.36.2 → 0.37.0

package/dist/index.mjs

@@ -35,7 +35,7 @@ var __require = /* @__PURE__ */ createRequire(import.meta.url);
 
 //#endregion
 //#region package.json
-var version = "0.36.2";
+var version = "0.37.0";
 
 //#endregion
 //#region src/lib/interactive-mode.ts
@@ -22076,6 +22076,51 @@ const runAndroidBuild = (input) => Effect.gen(function* () {
 	return input.strategy === "custom" ? yield* runAndroidCustom(input, commandEnv) : yield* runGradleBuild(input, commandEnv);
 });
 
+//#endregion
+//#region src/lib/credential-choices.ts
+/** ISO timestamp → `YYYY-MM-DD` for compact, scannable labels. */
+const isoDate = (value) => value.slice(0, 10);
+/**
+* Credentials store the internal team UUID, which is meaningless to read. Build a
+* resolver from `appleTeams.list()` that maps it to the team name (falling back to
+* the 10-char portal identifier, then the raw id if the team isn't in the list).
+*/
+const makeAppleTeamLabeler = (teams) => {
+	const byId = new Map(teams.map((team) => [team.id, team.name ?? team.appleTeamId]));
+	return (internalTeamId) => byId.get(internalTeamId) ?? internalTeamId;
+};
+/**
+* Keystore aliases are often cryptic, so surface the type + creation date in the
+* label and the SHA-1 fingerprint (which matches the Play Console upload key) on
+* the active-row hint.
+*/
+const keystoreChoice = (item) => {
+	const details = [item.keystoreType, `created ${isoDate(item.createdAt)}`].filter((part) => part !== null);
+	return {
+		value: item.id,
+		label: `${item.keyAlias} (${details.join(", ")})`,
+		hint: item.sha1Fingerprint ? `SHA-1 ${item.sha1Fingerprint}` : `id ${item.id.slice(0, 8)}…`
+	};
+};
+/**
+* Push keys share a team, so include the creation date to tell siblings apart.
+* Pass a `teamLabel` (see {@link makeAppleTeamLabeler}) to show the team name
+* instead of the internal UUID.
+*/
+const pushKeyChoice = (key, teamLabel = key.appleTeamId) => ({
+	value: key.id,
+	label: `${key.keyId} (team ${teamLabel}, added ${isoDate(key.createdAt)})`
+});
+/**
+* Surface the expiry so an expired certificate is obvious before it's picked.
+* Pass a `teamLabel` (see {@link makeAppleTeamLabeler}) to show the team name
+* instead of the internal UUID.
+*/
+const distributionCertChoice = (cert, teamLabel = cert.appleTeamId) => ({
+	value: cert.id,
+	label: `${cert.serialNumber.slice(0, 12)}… (team ${teamLabel}, exp ${isoDate(cert.validUntil)})`
+});
+
 //#endregion
 //#region src/lib/credentials-generator-apple-id.ts
 const DISTRIBUTION_TO_PROFILE_TYPE = {
@@ -22443,10 +22488,7 @@ const chooseDistributionCertViaAppleId = (api, ctx, appleTeamIdentifier) => Effe
 	const choice = yield* promptSelect("Select a distribution certificate (or 'generate' for a fresh one)", [{
 		value: GENERATE_NEW,
 		label: "Generate a new distribution certificate"
-	}, ...items.map((cert) => ({
-		value: cert.id,
-		label: `${cert.serialNumber.slice(0, 12)}… (team ${appleTeamIdentifier})`
-	}))]);
+	}, ...items.map((cert) => distributionCertChoice(cert, team?.name ?? appleTeamIdentifier))]);
 	if (choice === GENERATE_NEW) {
 		const created = yield* generateDistributionCertViaAppleIdInteractive(api, ctx);
 		return {
@@ -22557,13 +22599,11 @@ const chooseIosCertificateId = (api) => Effect.gen(function* () {
 		});
 		return (yield* generateDistributionCertInteractive(api)).id;
 	}
+	const teamLabel = makeAppleTeamLabeler((yield* api.appleTeams.list()).items);
 	const choice = yield* promptSelect("Select a distribution certificate (or 'generate' for a fresh one)", [{
 		value: "__generate__",
 		label: "Generate a new distribution certificate"
-	}, ...certs.items.map((cert) => ({
-		value: cert.id,
-		label: `${cert.serialNumber.slice(0, 12)}… (team ${cert.appleTeamId})`
-	}))]);
+	}, ...certs.items.map((cert) => distributionCertChoice(cert, teamLabel(cert.appleTeamId)))]);
 	if (choice === "__generate__") return (yield* generateDistributionCertInteractive(api)).id;
 	return choice;
 });
@@ -22665,10 +22705,7 @@ const pickExistingKeystore = (api) => Effect.gen(function* () {
 		message: "No existing keystores in this organization.",
 		hint: "Re-run and choose 'Generate new keystore'."
 	});
-	return yield* promptSelect("Select a keystore", keystores.items.map((item) => ({
-		value: item.id,
-		label: item.keyAlias
-	})));
+	return yield* promptSelect("Select a keystore", keystores.items.map(keystoreChoice));
 });
 const resolveAndroidAppId = (api, input) => Effect.gen(function* () {
 	const existing = (yield* api.androidApplicationIdentifiers.list({ path: { projectId: input.projectId } })).items.find((item) => item.packageName === input.applicationIdentifier);
@@ -26365,10 +26402,7 @@ const changeDefaultKeystore = (ctx) => Effect.gen(function* () {
 const downloadAndroidKeystoreInteractive = (ctx) => Effect.gen(function* () {
 	const list = yield* ctx.api.androidUploadKeystores.list();
 	if (list.items.length === 0) return yield* Console.log("No keystores to download.");
-	const id = yield* promptSelect("Select a keystore to download", list.items.map((item) => ({
-		value: item.id,
-		label: `${item.keyAlias} (${item.id.slice(0, 8)}…)`
-	})));
+	const id = yield* promptSelect("Select a keystore to download", list.items.map(keystoreChoice));
 	const data = yield* ctx.api.androidUploadKeystores.download({ path: { id } });
 	const secret = yield* openFromDownload({
 		session: yield* openVaultSessionInteractive(ctx.api),
@@ -26692,10 +26726,8 @@ const revokeIosDistributionCert = (ctx) => Effect.gen(function* () {
 		message: "No ASC API key linked to an Apple team.",
 		hint: "Upload an ASC API key first so the CLI can call Apple to revoke."
 	});
-	const localId = yield* promptSelect("Select a distribution certificate to revoke", certs.items.map((cert) => ({
-		value: cert.id,
-		label: `${cert.serialNumber.slice(0, 12)}… (team ${cert.appleTeamId})`
-	})));
+	const teamLabel = makeAppleTeamLabeler((yield* ctx.api.appleTeams.list()).items);
+	const localId = yield* promptSelect("Select a distribution certificate to revoke", certs.items.map((cert) => distributionCertChoice(cert, teamLabel(cert.appleTeamId))));
 	const target = certs.items.find((entry) => entry.id === localId);
 	const ascApiKeyId = teamKeys.find((key) => key.appleTeamId === target?.appleTeamId)?.id ?? (yield* promptSelect("Select an ASC API key to call Apple with", teamKeys.map((key) => ({
 		value: key.id,
@@ -26722,10 +26754,8 @@ const revokeIosPushKey = (ctx) => Effect.gen(function* () {
 		message: "No APNs push keys in this account.",
 		hint: "Run 'Add a new push key' to create one first."
 	});
-	const localId = yield* promptSelect("Select a push key to revoke", items.map((key) => ({
-		value: key.id,
-		label: `${key.keyId} (team ${key.appleTeamId})`
-	})));
+	const teamLabel = makeAppleTeamLabeler((yield* ctx.api.appleTeams.list()).items);
+	const localId = yield* promptSelect("Select a push key to revoke", items.map((key) => pushKeyChoice(key, teamLabel(key.appleTeamId))));
 	const target = items.find((entry) => entry.id === localId);
 	if (target === void 0) return yield* new MissingCredentialsError({
 		message: `Selected push key ${localId} not found.`,
@@ -26863,10 +26893,8 @@ const bindIosPushKey = (ctx) => Effect.gen(function* () {
 		hint: "Run 'Add a new push key' first."
 	});
 	const config = yield* promptForBundleConfig(ctx);
-	const pushKeyId = yield* promptSelect("Select a push key to bind", keys.items.map((key) => ({
-		value: key.id,
-		label: `${key.keyId} (team ${key.appleTeamId})`
-	})));
+	const teamLabel = makeAppleTeamLabeler((yield* ctx.api.appleTeams.list()).items);
+	const pushKeyId = yield* promptSelect("Select a push key to bind", keys.items.map((key) => pushKeyChoice(key, teamLabel(key.appleTeamId))));
 	yield* ctx.api.iosBundleConfigurations.update({
 		path: { id: config.id },
 		payload: { applePushKeyId: pushKeyId }
@@ -26883,10 +26911,8 @@ const setupProjectPushNotifications = (ctx) => Effect.gen(function* () {
 		label: "Add a new push key"
 	}]);
 	const config = yield* promptForBundleConfig(ctx);
-	const pushKeyId = choice === "add" ? yield* createNewPushKeyForBundle(ctx, config.appleTeamId) : yield* promptSelect("Select a push key to bind", keys.items.map((key) => ({
-		value: key.id,
-		label: `${key.keyId} (team ${key.appleTeamId})`
-	})));
+	const teamLabel = makeAppleTeamLabeler(keys.items.length === 0 ? [] : (yield* ctx.api.appleTeams.list()).items);
+	const pushKeyId = choice === "add" ? yield* createNewPushKeyForBundle(ctx, config.appleTeamId) : yield* promptSelect("Select a push key to bind", keys.items.map((key) => pushKeyChoice(key, teamLabel(key.appleTeamId))));
 	yield* ctx.api.iosBundleConfigurations.update({
 		path: { id: config.id },
 		payload: { applePushKeyId: pushKeyId }
@@ -28856,10 +28882,8 @@ const resolvePushKeyTarget = (api, idArg) => Effect.gen(function* () {
 		const [only] = items;
 		if (only !== void 0) return only;
 	}
-	const chosen = yield* promptSelect("Select a push key to revoke", items.map((entry) => ({
-		value: entry.id,
-		label: `${entry.keyId} (team ${entry.appleTeamId})`
-	})));
+	const teamLabel = makeAppleTeamLabeler((yield* api.appleTeams.list()).items);
+	const chosen = yield* promptSelect("Select a push key to revoke", items.map((key) => pushKeyChoice(key, teamLabel(key.appleTeamId))));
 	const match = items.find((entry) => entry.id === chosen);
 	if (match === void 0) return yield* new CredentialValidationError({ message: `Selected push key ${chosen} not found after listing.` });
 	return match;