Address PR comments: small copy changes, default option for multiselect

Author: jonesphillip

packages/wrangler/src/__tests__/r2.test.ts

@@ -101,7 +101,7 @@ describe("r2", () => {
 				  wrangler r2 bucket notification     Manage event notification rules for an R2 bucket
 				  wrangler r2 bucket domain           Manage custom domains for an R2 bucket
 				  wrangler r2 bucket dev-url          Manage public access via the r2.dev URL for an R2 bucket
-				  wrangler r2 bucket lifecycle      Manage lifecycle rules for an R2 bucket
+				  wrangler r2 bucket lifecycle        Manage lifecycle rules for an R2 bucket
 
 				GLOBAL FLAGS
 				  -j, --experimental-json-config  Experimental: support wrangler.json  [boolean]
@@ -139,7 +139,7 @@ describe("r2", () => {
 				  wrangler r2 bucket notification     Manage event notification rules for an R2 bucket
 				  wrangler r2 bucket domain           Manage custom domains for an R2 bucket
 				  wrangler r2 bucket dev-url          Manage public access via the r2.dev URL for an R2 bucket
-				  wrangler r2 bucket lifecycle      Manage lifecycle rules for an R2 bucket
+				  wrangler r2 bucket lifecycle        Manage lifecycle rules for an R2 bucket
 
 				GLOBAL FLAGS
 				  -j, --experimental-json-config  Experimental: support wrangler.json  [boolean]
@@ -1003,7 +1003,7 @@ binding = \\"testBucket\\""
 						"
 						wrangler r2 bucket notification list <bucket>
 
-						List event notification rules for a bucket
+						List event notification rules for an R2 bucket
 
 						POSITIONALS
 						  bucket  The name of the R2 bucket to get event notification rules for  [string] [required]

packages/wrangler/src/dialogs.ts

@@ -131,12 +131,31 @@ export async function select<Values extends string>(
 	return value;
 }
 
+interface MultiSelectOptions<Values> {
+	choices: SelectOption<Values>[];
+	defaultOptions?: number[];
+}
+
 export async function multiselect<Values extends string>(
 	text: string,
-	options: SelectOptions<Values>
+	options: MultiSelectOptions<Values>
 ): Promise<Values[]> {
 	if (isNonInteractiveOrCI()) {
-		throw new NoDefaultValueProvided();
+		if (options?.defaultOptions === undefined) {
+			throw new NoDefaultValueProvided();
+		}
+
+		const defaultTitles = options.defaultOptions.map(
+			(index) => options.choices[index].title
+		);
+		logger.log(`? ${text}`);
+
+		logger.log(
+			`🤖 ${chalk.dim(
+				"Using default value(s) in non-interactive context:"
+			)} ${chalk.white.bold(defaultTitles.join(", "))}`
+		);
+		return options.defaultOptions.map((index) => options.choices[index].value);
 	}
 	const { value } = await prompts({
 		type: "multiselect",

packages/wrangler/src/r2/index.ts

@@ -577,7 +577,7 @@ export function r2(r2Yargs: CommonYargsArgv, subHelp: SubHelp) {
 					return r2EvNotifyYargs
 						.command(
 							["list <bucket>", "get <bucket>"],
-							"List event notification rules for a bucket",
+							"List event notification rules for an R2 bucket",
 							Notification.ListOptions,
 							Notification.ListHandler
 						)