@better-update/cli 0.14.0 → 0.14.2

package/dist/index.mjs

@@ -28,7 +28,7 @@ var __require = /* @__PURE__ */ createRequire(import.meta.url);
 
 //#endregion
 //#region package.json
-var version = "0.14.0";
+var version = "0.14.2";
 
 //#endregion
 //#region src/lib/interactive-mode.ts
@@ -5033,9 +5033,8 @@ const isCertificateLimitError = (error) => {
 var CertParseError = class extends Data.TaggedError("CertParseError") {};
 const APPLE_TEAM_ID_RE$1 = /^[A-Z0-9]{10}$/u;
 const stringField = (cert, name) => {
-	const field = cert.subject.getField(name);
-	if (field === void 0 || typeof field.value !== "string") return null;
-	return field.value;
+	const value = cert.subject.getField(name)?.value;
+	return typeof value === "string" ? value : null;
 };
 const matchTeamFromCommonName = (cn) => {
 	const match = /\(([A-Z0-9]{10})\)/u.exec(cn);
@@ -5221,19 +5220,21 @@ const generateAndUploadDistributionCertificate = (api, input) => Effect.gen(func
 		step: "p12-build",
 		message: cause.message
 	})));
+	const created = yield* api.appleDistributionCertificates.upload({ payload: {
+		p12Base64: bundle.p12Base64,
+		p12Password: bundle.password,
+		serialNumber: bundle.metadata.serialNumber,
+		appleTeamIdentifier: bundle.metadata.appleTeamId,
+		...bundle.metadata.appleTeamName === null ? {} : { appleTeamName: bundle.metadata.appleTeamName },
+		...bundle.metadata.developerIdIdentifier === null ? {} : { developerIdIdentifier: bundle.metadata.developerIdIdentifier },
+		validFrom: bundle.metadata.validFrom,
+		validUntil: bundle.metadata.validUntil
+	} });
 	return {
-		id: (yield* api.appleDistributionCertificates.upload({ payload: {
-			p12Base64: bundle.p12Base64,
-			p12Password: bundle.password,
-			serialNumber: bundle.metadata.serialNumber,
-			appleTeamIdentifier: bundle.metadata.appleTeamId,
-			...bundle.metadata.appleTeamName === null ? {} : { appleTeamName: bundle.metadata.appleTeamName },
-			...bundle.metadata.developerIdIdentifier === null ? {} : { developerIdIdentifier: bundle.metadata.developerIdIdentifier },
-			validFrom: bundle.metadata.validFrom,
-			validUntil: bundle.metadata.validUntil
-		} })).id,
+		id: created.id,
 		serialNumber: bundle.metadata.serialNumber,
-		appleTeamId: bundle.metadata.appleTeamId,
+		appleTeamId: created.appleTeamId,
+		appleTeamIdentifier: bundle.metadata.appleTeamId,
 		developerPortalIdentifier: apple.id
 	};
 });
@@ -5397,19 +5398,21 @@ const generateAndUploadDistributionCertificateViaAppleId = (api, input) => Effec
 		step: "parse-p12",
 		message: cause.message
 	})));
+	const created = yield* api.appleDistributionCertificates.upload({ payload: {
+		p12Base64: result.certificateP12,
+		p12Password: result.password,
+		serialNumber: metadata.serialNumber,
+		appleTeamIdentifier: metadata.appleTeamId,
+		...metadata.appleTeamName === null ? {} : { appleTeamName: metadata.appleTeamName },
+		...metadata.developerIdIdentifier === null ? {} : { developerIdIdentifier: metadata.developerIdIdentifier },
+		validFrom: metadata.validFrom,
+		validUntil: metadata.validUntil
+	} });
 	return {
-		id: (yield* api.appleDistributionCertificates.upload({ payload: {
-			p12Base64: result.certificateP12,
-			p12Password: result.password,
-			serialNumber: metadata.serialNumber,
-			appleTeamIdentifier: metadata.appleTeamId,
-			...metadata.appleTeamName === null ? {} : { appleTeamName: metadata.appleTeamName },
-			...metadata.developerIdIdentifier === null ? {} : { developerIdIdentifier: metadata.developerIdIdentifier },
-			validFrom: metadata.validFrom,
-			validUntil: metadata.validUntil
-		} })).id,
+		id: created.id,
 		serialNumber: metadata.serialNumber,
-		appleTeamId: metadata.appleTeamId,
+		appleTeamId: created.appleTeamId,
+		appleTeamIdentifier: metadata.appleTeamId,
 		developerPortalIdentifier: result.certificate.id
 	};
 });
@@ -5525,8 +5528,10 @@ const generateDistributionCertViaAppleIdInteractive = (api, ctx) => Effect.gen(f
 	return yield* generate.pipe(Effect.catchTag("CertificateLimitError", () => interactiveAppleIdCertLimitRecover(ctx).pipe(Effect.flatMap(() => generate))));
 });
 const GENERATE_NEW = "__generate__";
-const chooseDistributionCertViaAppleId = (api, ctx, appleTeamId) => Effect.gen(function* () {
-	const items = (yield* api.appleDistributionCertificates.list()).items.filter((cert) => cert.appleTeamId === appleTeamId);
+const chooseDistributionCertViaAppleId = (api, ctx, appleTeamIdentifier) => Effect.gen(function* () {
+	const [teams, all] = yield* Effect.all([api.appleTeams.list(), api.appleDistributionCertificates.list()], { concurrency: 2 });
+	const team = teams.items.find((entry) => entry.appleTeamId === appleTeamIdentifier);
+	const items = team === void 0 ? [] : all.items.filter((cert) => cert.appleTeamId === team.id);
 	if (items.length === 0) {
 		const created = yield* generateDistributionCertViaAppleIdInteractive(api, ctx);
 		return {
@@ -5539,7 +5544,7 @@ const chooseDistributionCertViaAppleId = (api, ctx, appleTeamId) => Effect.gen(f
 		label: "Generate a new distribution certificate"
 	}, ...items.map((cert) => ({
 		value: cert.id,
-		label: `${cert.serialNumber.slice(0, 12)}… (team ${cert.appleTeamId})`
+		label: `${cert.serialNumber.slice(0, 12)}… (team ${appleTeamIdentifier})`
 	}))]);
 	if (choice === GENERATE_NEW) {
 		const created = yield* generateDistributionCertViaAppleIdInteractive(api, ctx);
@@ -8387,7 +8392,7 @@ const generateNewIosDistributionCert = (ctx) => Effect.gen(function* () {
 	yield* printKeyValue([
 		["ID", created.id],
 		["Serial", created.serialNumber],
-		["Apple team", created.appleTeamId]
+		["Apple team", created.appleTeamIdentifier]
 	]);
 });
 const addIosPushKey = (ctx) => Effect.gen(function* () {
@@ -9168,7 +9173,7 @@ const distributionCertificateCommand$1 = defineCommand({
 		yield* printKeyValue([
 			["ID", created.id],
 			["Serial", created.serialNumber],
-			["Apple team", created.appleTeamId],
+			["Apple team", created.appleTeamIdentifier],
 			["Apple cert", created.developerPortalIdentifier]
 		]);
 	}), GENERATE_EXIT_EXTRAS)