@better-update/cli 0.41.2 → 0.42.1

package/dist/index.mjs

@@ -35,7 +35,7 @@ var __require = /* #__PURE__ */ (() => createRequire(import.meta.url))();
 
 //#endregion
 //#region package.json
-var version = "0.41.2";
+var version = "0.42.1";
 
 //#endregion
 //#region src/lib/interactive-mode.ts
@@ -489,6 +489,8 @@ const RotateVaultBody = Schema.Struct({
 var AndroidUploadKeystore = class extends Schema.Class("AndroidUploadKeystore")({
 	id: Id,
 	organizationId: Id,
+	/** User-supplied label from `credentials upload --name`; null for keystores uploaded before names were stored or generated via keytool. */
+	name: Schema.NullOr(Schema.String),
 	keyAlias: Schema.String,
 	md5Fingerprint: Schema.NullOr(Schema.String),
 	sha1Fingerprint: Schema.NullOr(Schema.String),
@@ -505,6 +507,7 @@ var AndroidUploadKeystore = class extends Schema.Class("AndroidUploadKeystore")(
 const UploadAndroidUploadKeystoreBody = Schema.Struct({
 	id: Id,
 	...encryptedEnvelopeFields,
+	name: Schema.optional(Schema.String.pipe(Schema.maxLength(200))),
 	keyAlias: Schema.String.pipe(Schema.minLength(1), Schema.maxLength(200)),
 	md5Fingerprint: Schema.optional(Schema.String.pipe(Schema.maxLength(200))),
 	sha1Fingerprint: Schema.optional(Schema.String.pipe(Schema.maxLength(200))),
@@ -21978,6 +21981,7 @@ const generateAndUploadKeystore = (api, input) => Effect.scoped(Effect.gen(funct
 	});
 	const session = yield* openVaultSessionInteractive(api);
 	const metadata = compact({
+		name: input.name,
 		keyAlias: input.keyAlias,
 		md5Fingerprint: fingerprints.md5,
 		sha1Fingerprint: fingerprints.sha1,
@@ -22954,15 +22958,17 @@ const makeAppleTeamLabeler = (teams) => {
 	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.
+* Aliases collide across white-label apps (many keystores share `jmango`), so
+* lead with the user-supplied name when present and keep the alias alongside it;
+* 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);
+	const title = item.name ? `${item.name} (alias ${item.keyAlias})` : item.keyAlias;
 	return {
 		value: item.id,
-		label: `${item.keyAlias} (${details.join(", ")})`,
+		label: `${title} (${details.join(", ")})`,
 		hint: item.sha1Fingerprint ? `SHA-1 ${item.sha1Fingerprint}` : `id ${item.id.slice(0, 8)}…`
 	};
 };
@@ -24527,6 +24533,7 @@ const resolveIosStrategy = (profile, projectType) => {
 
 //#endregion
 //#region src/lib/gradle-config.ts
+const isValidAndroidPackageName = Schema.is(AndroidPackageName);
 /**
 * Parse Groovy `build.gradle` to extract key Android config values.
 * Returns `undefined` if:
@@ -24573,12 +24580,27 @@ const parseVersionCode = (raw) => {
 const extractGradleConfig = (parsed) => {
 	const defaultConfig = asRecord(asRecord(parsed["android"])?.["defaultConfig"]);
 	return compact({
-		applicationId: typeof defaultConfig?.["applicationId"] === "string" ? unquote(defaultConfig["applicationId"]) : void 0,
+		applicationId: extractApplicationId(defaultConfig?.["applicationId"]),
 		versionCode: parseVersionCode(defaultConfig?.["versionCode"]),
 		versionName: typeof defaultConfig?.["versionName"] === "string" ? unquote(defaultConfig["versionName"]) : void 0
 	});
 };
 const unquote = (input) => input.startsWith("\"") && input.endsWith("\"") ? input.slice(1, -1) : input;
+/**
+* Extract a usable Android `applicationId` from the parsed Gradle value.
+*
+* react-native-config and similar setups make the id dynamic and env-driven
+* (e.g. `applicationId project.env.get("APP_ID")`, or a `def` variable). The
+* Groovy parser surfaces the raw expression text (`project.env.get("APP_ID")`,
+* `appId`, …), which is not a real package name. Treat anything that isn't a
+* valid reverse-domain package as unresolved so callers fall back to the
+* Expo/eas config value instead of building with — or validating — junk.
+*/
+const extractApplicationId = (raw) => {
+	if (typeof raw !== "string") return;
+	const value = unquote(raw);
+	return isValidAndroidPackageName(value) ? value : void 0;
+};
 
 //#endregion
 //#region src/application/platform-build.ts
@@ -26854,6 +26876,13 @@ const uploadIosPushCertificate = (api, input, bytes) => Effect.gen(function* ()
 
 //#endregion
 //#region src/lib/credentials-manager.ts
+/** Build a list row, defaulting the optional columns most credential types lack. */
+const makeRow = (fields) => ({
+	name: null,
+	distribution: null,
+	sha1Fingerprint: null,
+	...fields
+});
 const formatDistribution = (value) => value.toLowerCase().replaceAll("_", "-");
 const listAllCredentials = (api) => Effect.gen(function* () {
 	const [certs, pushKeys, pushCerts, payCerts, passCerts, ascKeys, profiles, keystores, googleKeys] = yield* Effect.all([
@@ -26868,68 +26897,72 @@ const listAllCredentials = (api) => Effect.gen(function* () {
 		api.googleServiceAccountKeys.list()
 	], { concurrency: "unbounded" });
 	return [
-		...certs.items.map((cert) => ({
+		...certs.items.map((cert) => makeRow({
 			id: cert.id,
-			name: cert.serialNumber,
+			identifier: cert.serialNumber,
 			platform: "ios",
 			type: "distribution-certificate",
-			distribution: null
+			createdAt: cert.createdAt
 		})),
-		...pushKeys.items.map((key) => ({
+		...pushKeys.items.map((key) => makeRow({
 			id: key.id,
-			name: key.keyId,
+			identifier: key.keyId,
 			platform: "ios",
 			type: "push-key",
-			distribution: null
+			createdAt: key.createdAt
 		})),
-		...pushCerts.items.map((cert) => ({
+		...pushCerts.items.map((cert) => makeRow({
 			id: cert.id,
-			name: cert.bundleIdentifier,
+			identifier: cert.bundleIdentifier,
 			platform: "ios",
 			type: "push-certificate",
-			distribution: null
+			createdAt: cert.createdAt
 		})),
-		...payCerts.items.map((cert) => ({
+		...payCerts.items.map((cert) => makeRow({
 			id: cert.id,
-			name: cert.merchantIdentifier,
+			identifier: cert.merchantIdentifier,
 			platform: "ios",
 			type: "apple-pay-certificate",
-			distribution: null
+			createdAt: cert.createdAt
 		})),
-		...passCerts.items.map((cert) => ({
+		...passCerts.items.map((cert) => makeRow({
 			id: cert.id,
-			name: cert.passTypeIdentifier,
+			identifier: cert.passTypeIdentifier,
 			platform: "ios",
 			type: "pass-type-certificate",
-			distribution: null
+			createdAt: cert.createdAt
 		})),
-		...ascKeys.items.map((key) => ({
+		...ascKeys.items.map((key) => makeRow({
 			id: key.id,
 			name: key.name,
+			identifier: key.keyId,
 			platform: "ios",
 			type: "asc-api-key",
-			distribution: null
+			createdAt: key.createdAt
 		})),
-		...profiles.items.map((profile) => ({
+		...profiles.items.map((profile) => makeRow({
 			id: profile.id,
-			name: profile.profileName ?? profile.bundleIdentifier,
+			identifier: profile.profileName ?? profile.bundleIdentifier,
 			platform: "ios",
 			type: "provisioning-profile",
-			distribution: formatDistribution(profile.distributionType)
+			distribution: formatDistribution(profile.distributionType),
+			createdAt: profile.createdAt
 		})),
-		...keystores.items.map((ks) => ({
+		...keystores.items.map((ks) => makeRow({
 			id: ks.id,
-			name: ks.keyAlias,
+			name: ks.name,
+			identifier: ks.keyAlias,
 			platform: "android",
 			type: "keystore",
-			distribution: null
+			sha1Fingerprint: ks.sha1Fingerprint,
+			createdAt: ks.createdAt
 		})),
-		...googleKeys.items.map((key) => ({
+		...googleKeys.items.map((key) => makeRow({
 			id: key.id,
-			name: key.clientEmail,
+			identifier: key.clientEmail,
 			platform: "android",
 			type: "google-service-account-key",
-			distribution: null
+			createdAt: key.createdAt
 		}))
 	];
 });
@@ -27046,6 +27079,7 @@ const uploadAndroidKeystore = (api, input, bytes) => Effect.gen(function* () {
 		storePassword: input.password
 	});
 	const metadata = compact({
+		name: input.name,
 		keyAlias: parsed.keyAlias,
 		md5Fingerprint: fingerprints.md5,
 		sha1Fingerprint: fingerprints.sha1,
@@ -27224,7 +27258,7 @@ const TYPE_LABELS = {
 	keystore: "Android keystore",
 	"google-service-account-key": "Google service account key"
 };
-const formatRowLabel$1 = (row) => `${row.name} (${row.id.slice(0, 8)}…)`;
+const formatRowLabel$1 = (row) => `${row.name ?? row.identifier} (${row.id.slice(0, 8)}…)`;
 const pickAndDelete = (ctx, type, humanLabel) => Effect.gen(function* () {
 	const matches = filterCredentials(yield* listAllCredentials(ctx.api), { type });
 	if (matches.length === 0) return yield* Console.log(`No ${humanLabel} entries found.`);
@@ -27389,6 +27423,7 @@ const setupAndroidProjectCredentials = (ctx) => Effect.gen(function* () {
 });
 const generateAndroidKeystoreInteractive = (ctx) => Effect.gen(function* () {
 	const alias = yield* promptText("Key alias", { placeholder: "upload-key" });
+	const name = yield* promptText("Display name (label shown in lists)", { placeholder: alias });
 	const storePassword = yield* promptPassword("Keystore password");
 	const keyPassword = yield* promptPassword("Key password");
 	const commonName = yield* promptText("Common name (CN)", { placeholder: "Your App" });
@@ -27396,6 +27431,7 @@ const generateAndroidKeystoreInteractive = (ctx) => Effect.gen(function* () {
 	yield* Console.log("Generating keystore with keytool...");
 	const created = yield* generateAndUploadKeystore(ctx.api, {
 		keyAlias: alias,
+		name: name.trim().length > 0 ? name : alias,
 		storePassword,
 		keyPassword,
 		commonName,
@@ -27407,12 +27443,13 @@ const generateAndroidKeystoreInteractive = (ctx) => Effect.gen(function* () {
 const uploadAndroidKeystoreInteractive = (ctx) => Effect.gen(function* () {
 	const filePath = yield* promptText("Path to the keystore (.jks/.keystore) file");
 	const keyAlias = yield* promptText("Key alias");
+	const name = yield* promptText("Display name (label shown in lists)", { placeholder: keyAlias });
 	const storePassword = yield* promptPassword("Keystore password");
 	const keyPassword = yield* promptPassword("Key password");
 	const created = yield* uploadCredential(ctx.api, {
 		platform: "android",
 		type: "keystore",
-		name: keyAlias,
+		name: name.trim().length > 0 ? name : keyAlias,
 		filePath,
 		keyAlias,
 		keyPassword,
@@ -29448,13 +29485,17 @@ const resolveKeystoreInput = (args) => Effect.gen(function* () {
 	const commonName = args["common-name"] !== void 0 && args["common-name"].trim().length > 0 ? args["common-name"] : yield* promptText("Common name (CN)", { placeholder: "Your App" });
 	const organization = args.organization !== void 0 && args.organization.trim().length > 0 ? args.organization : yield* promptText("Organization (O)", { placeholder: "Your Company" });
 	const validityDays = yield* parseValidityDays(args["validity-days"]);
+	const name = args.name !== void 0 && args.name.trim().length > 0 ? args.name : void 0;
 	return {
 		alias: yield* ensureNonEmpty(alias, "alias"),
 		storePassword: yield* ensureNonEmpty(storePassword, "store-password"),
 		keyPassword: yield* ensureNonEmpty(keyPassword, "key-password"),
 		commonName: yield* ensureNonEmpty(commonName, "common-name"),
 		organization: yield* ensureNonEmpty(organization, "organization"),
-		...compact({ validityDays })
+		...compact({
+			validityDays,
+			name
+		})
 	};
 });
 const keystoreCommand = defineCommand({
@@ -29463,6 +29504,10 @@ const keystoreCommand = defineCommand({
 		description: "Generate a new Android upload keystore via keytool and store it server-side"
 	},
 	args: {
+		name: {
+			type: "string",
+			description: "Display name (label shown in `credentials list`)"
+		},
 		alias: {
 			type: "string",
 			description: "Key alias"
@@ -29498,7 +29543,10 @@ const keystoreCommand = defineCommand({
 			keyPassword: resolved.keyPassword,
 			commonName: resolved.commonName,
 			organization: resolved.organization,
-			...compact({ validityDays: resolved.validityDays })
+			...compact({
+				validityDays: resolved.validityDays,
+				name: resolved.name
+			})
 		});
 		yield* printHuman("");
 		yield* printHuman("Keystore generated and uploaded.");
@@ -29893,15 +29941,19 @@ const listCommand$4 = defineCommand({
 		yield* printList([
 			"ID",
 			"Name",
+			"Identifier",
 			"Platform",
 			"Type",
-			"Distribution"
+			"Created",
+			"SHA-1"
 		], filterCredentials(yield* listAllCredentials(yield* apiClient), args.platform ? { platform: args.platform } : {}).map((row) => [
 			row.id,
-			row.name,
+			row.name ?? "-",
+			row.identifier,
 			row.platform,
 			row.type,
-			row.distribution ?? "-"
+			isoDate(row.createdAt),
+			row.sha1Fingerprint ?? "-"
 		]), "No credentials found.");
 	}))
 });
@@ -30012,8 +30064,9 @@ const CREDENTIAL_TYPES$2 = [
 const isPlatform = (value) => value === "ios" || value === "android";
 const isType = (value) => CREDENTIAL_TYPES$2.includes(value);
 const formatRowLabel = (row) => {
+	const label = row.name ? `${row.name} (${row.identifier})` : row.identifier;
 	const distro = row.distribution ? ` (${row.distribution})` : "";
-	return `${row.type}: ${row.name}${distro} — ${row.id.slice(0, 8)}…`;
+	return `${row.type}: ${label}${distro} — ${row.id.slice(0, 8)}…`;
 };
 const removeCommand = defineCommand({
 	meta: {
@@ -31183,7 +31236,12 @@ const viewKeystore = (api, id) => Effect.gen(function* () {
 		pairs: [
 			["ID", item.id],
 			["Type", "Android upload keystore"],
+			["Name", item.name ?? "-"],
 			["Key alias", item.keyAlias],
+			["Keystore type", item.keystoreType ?? "-"],
+			["SHA-1", item.sha1Fingerprint ?? "-"],
+			["SHA-256", item.sha256Fingerprint ?? "-"],
+			["MD5", item.md5Fingerprint ?? "-"],
 			["Created", item.createdAt],
 			["Updated", item.updatedAt]
 		],