@better-update/cli 0.47.0 → 0.47.2

package/dist/index.mjs

@@ -35,7 +35,7 @@ var __require = /* #__PURE__ */ (() => createRequire(import.meta.url))();
 
 //#endregion
 //#region package.json
-var version = "0.47.0";
+var version = "0.47.2";
 
 //#endregion
 //#region src/lib/interactive-mode.ts
@@ -3466,7 +3466,9 @@ const promptText = (message, options) => Effect.gen(function* () {
 	return handleCancel(yield* Effect.promise(async () => text(compact({
 		message,
 		placeholder: options?.placeholder,
-		defaultValue: options?.defaultValue
+		defaultValue: options?.defaultValue,
+		initialValue: options?.initialValue,
+		validate: options?.validate
 	}))));
 });
 const promptConfirm = (message, options) => Effect.gen(function* () {
@@ -35031,12 +35033,12 @@ const APP_CREATE_HINTS = {
 };
 /** Best-effort: write the resolved id back to eas.json so the next run reuses it. */
 const persist$1 = (input, ascAppId) => setSubmitProfileAscAppId(input.projectRoot, input.profileName, ascAppId).pipe(Effect.flatMap((path) => printHuman(`Saved ascAppId to ${path} (submit profile "${input.profileName}") for reuse.`)), Effect.catchAll((error) => printHuman(`Note: could not write ascAppId to eas.json (${error.message}). Add it manually to reuse it.`)));
-const createApp = (cookieCtx, name, input) => wrapConnect("apple-create-app", async () => AppleUtils.App.createAsync(cookieCtx, compact({
+const createApp = (cookieCtx, name, companyName, input) => wrapConnect("apple-create-app", async () => AppleUtils.App.createAsync(cookieCtx, compact({
 	name,
 	bundleId: input.bundleIdentifier,
 	sku: input.sku ?? input.bundleIdentifier,
 	primaryLocale: input.primaryLocale ?? DEFAULT_LOCALE,
-	companyName: input.companyName,
+	companyName,
 	platforms: [AppleUtils.Platform.IOS]
 }))).pipe(Effect.mapError((error) => {
 	const hint = Object.entries(APP_CREATE_HINTS).find(([code]) => error.message.includes(code));
@@ -35045,6 +35047,36 @@ const createApp = (cookieCtx, name, input) => wrapConnect("apple-create-app", as
 		message: `${error.message} — ${hint[1]}.`
 	});
 }));
+/**
+* Best-effort App Store name default to pre-fill the prompt with. Prefers the
+* Expo config's `name` (app.json `expo.name`), then the passed-in fallback (the
+* better-update project name) so non-Expo projects — which have no `@expo/config`
+* — still get a sensible default. Returns `undefined` when neither is available.
+*/
+const resolveDefaultAppName = (input) => readExpoConfig(input.projectRoot).pipe(Effect.map((config) => config.name?.trim() ? config.name.trim() : void 0), Effect.orElseSucceed(() => void 0), Effect.map((expoName) => {
+	const fallback = input.defaultAppName?.trim();
+	return expoName ?? (fallback || void 0);
+}));
+/** Reject a blank app name so the prompt re-asks instead of 500'ing `App.createAsync`. */
+const requireNonEmptyName = (value) => value?.trim() ? void 0 : "An app name is required.";
+/**
+* The App Store name to create the app under. A non-empty configured `appName`
+* wins; else prompt — pre-filled with the resolved default (Expo `expo.name` or
+* the better-update project name) and *required*, so an empty Enter re-asks
+* rather than reaching `App.createAsync` with a blank name (which Apple 500s).
+*/
+const resolveAppName = (input) => Effect.gen(function* () {
+	const configured = input.appName?.trim();
+	if (configured) return configured;
+	const defaultName = yield* resolveDefaultAppName(input);
+	return (yield* promptText("App name (as shown on the App Store)", defaultName === void 0 ? {
+		placeholder: input.bundleIdentifier,
+		validate: requireNonEmptyName
+	} : {
+		initialValue: defaultName,
+		validate: requireNonEmptyName
+	})).trim();
+});
 const ensureAscAppForSubmit = (input) => Effect.gen(function* () {
 	const ctx = buildTokenRequestContext(input.credentials);
 	const existing = yield* wrapConnect("apple-find-app", async () => AppleUtils.App.findAsync(ctx, { bundleId: input.bundleIdentifier }));
@@ -35057,12 +35089,17 @@ const ensureAscAppForSubmit = (input) => Effect.gen(function* () {
 		return null;
 	}
 	if (!(yield* promptConfirm(`No App Store Connect app exists for bundle id ${input.bundleIdentifier}. Create it now from your Apple ID?`, { initialValue: true }))) return null;
-	const name = input.appName ?? (yield* promptText("App name (as shown on the App Store)", { placeholder: input.bundleIdentifier }));
+	const name = yield* resolveAppName(input);
+	if (name.length === 0) {
+		yield* printHuman(`No app name was provided, so the App Store Connect app can't be created. Re-run and enter a name, or set submit.${input.profileName}.ios.appName in eas.json.`);
+		return null;
+	}
 	const auth = yield* AppleAuth;
 	const session = yield* auth.ensureLoggedIn();
 	const cookieCtx = auth.buildRequestContext(session);
+	const companyName = input.companyName ?? toOptional(session.teamName);
 	yield* printHuman("Creating the App Store Connect app via your Apple ID...");
-	const app = yield* createApp(cookieCtx, name, input);
+	const app = yield* createApp(cookieCtx, name, companyName, input);
 	yield* printHuman(`Created App Store Connect app "${name}" (${app.id}).`);
 	yield* persist$1(input, app.id);
 	return app.id;
@@ -35247,16 +35284,20 @@ const submitIosBranch = (params) => Effect.gen(function* () {
 		return false;
 	}
 	let resolvedAscAppId = iosProfile?.ascAppId;
-	if (wantsConfig && resolvedAscAppId === void 0 && ascCredentials !== null) resolvedAscAppId = toOptional(yield* ensureAscAppForSubmit({
-		credentials: ascCredentials,
-		projectRoot: params.projectRoot,
-		profileName: params.profile,
-		bundleIdentifier: iosConfig.bundleIdentifier,
-		appName: iosProfile?.appName,
-		sku: iosProfile?.sku,
-		companyName: iosProfile?.companyName,
-		primaryLocale: iosProfile?.language
-	}));
+	if (wantsConfig && resolvedAscAppId === void 0 && ascCredentials !== null) {
+		const defaultAppName = yield* api.projects.get({ path: { id: params.projectId } }).pipe(Effect.map((project) => project.name), Effect.orElseSucceed(() => void 0));
+		resolvedAscAppId = toOptional(yield* ensureAscAppForSubmit({
+			credentials: ascCredentials,
+			projectRoot: params.projectRoot,
+			profileName: params.profile,
+			bundleIdentifier: iosConfig.bundleIdentifier,
+			appName: iosProfile?.appName,
+			defaultAppName,
+			sku: iosProfile?.sku,
+			companyName: iosProfile?.companyName,
+			primaryLocale: iosProfile?.language
+		}));
+	}
 	yield* printHuman(auth.kind === "app-specific-password" ? "Running xcrun altool upload (Apple ID app-specific password)..." : "Running xcrun altool upload (ASC API key)...");
 	yield* runIosSubmit({
 		api,
@@ -35296,6 +35337,7 @@ const runFlow = (api, projectId, args) => Effect.gen(function* () {
 	if (args.platform === "ios" && iosConfig !== void 0) {
 		if (!(yield* submitIosBranch({
 			api,
+			projectId,
 			submissionId: submission.id,
 			projectRoot: args.projectRoot,
 			profile: args.profile,