interactive, cloudchamber: replace error calls with crash, and crash …

…now calls error() and exits

packages/cli/args.ts

@@ -1,5 +1,5 @@
 import { getRenderers, inputPrompt } from "./interactive";
-import { logRaw } from ".";
+import { crash, logRaw } from ".";
 import type { Arg, PromptConfig } from "./interactive";
 
 export const processArgument = async <T>(
@@ -12,7 +12,10 @@ export const processArgument = async <T>(
 
 	// If the value has already been set via args, use that
 	if (value !== undefined) {
-		promptConfig.validate?.(value);
+		const error = promptConfig.validate?.(value);
+		if (error) {
+			crash(error);
+		}
 
 		const lines = renderSubmitted({ value });
 		logRaw(lines.join("\n"));

packages/cli/index.ts

@@ -4,7 +4,6 @@ import {
 	dim,
 	gray,
 	white,
-	red,
 	hidden,
 	bgRed,
 	bgYellow,
@@ -129,22 +128,17 @@ export const stripAnsi = (str: string) => {
 	return str.replace(regex, "");
 };
 
-export const crash: (msg?: string) => never = (msg) => {
-	if (msg) {
-		process.stderr.write(red(msg));
-		process.stderr.write("\n");
-	}
+export const crash: (msg?: string, extra?: string) => never = (msg, extra) => {
+	error(msg, extra);
 	exit(1);
 };
 
-export const error = (msg?: string, extra?: string): never => {
+export const error = (msg?: string, extra?: string) => {
 	if (msg) {
 		process.stderr.write(
 			`${gray(shapes.corners.bl)} ${status.error} ${dim(msg)}\n${
 				extra ? space() + extra + "\n" : ""
 			}`
 		);
 	}
-
-	exit(1);
 };

packages/cli/interactive.ts

@@ -2,14 +2,15 @@ import {
 	ConfirmPrompt,
 	isCancel,
 	MultiSelectPrompt,
-	Prompt,
 	SelectPrompt,
 	TextPrompt,
 } from "@clack/core";
 import { createLogUpdate } from "log-update";
 import { blue, bold, brandColor, dim, gray, white } from "./colors";
+import SelectRefreshablePrompt from "./select-list";
 import { cancel, newline, shapes, space, status } from "./index";
-import SelectRefreshablePrompt, { OptionWithDetails } from "./select-list";
+import type { OptionWithDetails } from "./select-list";
+import type { Prompt } from "@clack/core";
 
 const logUpdate = createLogUpdate(process.stdout);
 
@@ -30,7 +31,7 @@ export type BasePromptConfig = {
 	// Further clarifies the question
 	helpText?: string;
 	// The value to use by default
-	defaultValue?: string | boolean | string[];
+	defaultValue?: Arg;
 	// The status label to be shown after submitting
 	label: string;
 	// Pretty-prints the value in the interactive prompt
@@ -280,11 +281,7 @@ const getSelectRenderers = (
 				return options.length - i <= maxItemsPerPage;
 			}
 
-			if (i >= cursor && cursor + maxItemsPerPage > i) {
-				return true;
-			}
-
-			return false;
+			return cursor + maxItemsPerPage > i;
 		};
 
 		return [
@@ -357,20 +354,20 @@ const getSelectListRenderers = (config: ListPromptConfig) => {
 			const isInListOfValues =
 				Array.isArray(value) && value.includes(optionValue);
 			const color = isInListOfValues || active ? blue : white;
-			const text = active
-				? color.underline(optionLabel?.toString() ?? "")
-				: color(optionLabel?.toString() ?? "");
+			const text = active ? color.underline(optionLabel) : color(optionLabel);
 
 			const indicator =
 				isInListOfValues || (active && !Array.isArray(value))
 					? color(shapes.radioActive)
 					: color(shapes.radioInactive);
 
+			const indicatorMargin = 2;
+			const detailBulletpointMargin = indicatorMargin + 4;
 			return [
-				`${space(2)}${indicator} ${text}`,
+				`${space(indicatorMargin)}${indicator} ${text}`,
 				...opt.details.map(
 					(detail, j) =>
-						`${space(6)}${
+						`${space(detailBulletpointMargin)}${
 							j === opt.details.length - 1 ? gray(shapes.corners.bl) : grayBar
 						} ${detail}`
 				),
@@ -384,19 +381,23 @@ const getSelectListRenderers = (config: ListPromptConfig) => {
 			size: 0,
 			options: [],
 		};
-		for (let index = 0; index < options.length; index++) {
-			const option = options[index];
-			if (current.size + option.details.length + 1 > rows - 6) {
+		const VERTICAL_MARGIN = 6;
+		for (const option of options) {
+			// If current accumulation of options + title row + option details size
+			// is bigger than console rows substracted by a bit of vertical margin,
+			// add a new page.
+			const optionHeight = option.details.length + 1;
+			if (current.size + optionHeight > rows - VERTICAL_MARGIN) {
 				pages.push(current.options);
-				current = { size: option.details.length + 1, options: [option] };
+				current = { size: optionHeight, options: [option] };
 				continue;
 			}
 
-			current.size += option.details.length + 1;
+			current.size += optionHeight;
 			current.options.push(option);
 		}
 
-		// add the last current
+		// add the last current as the last page
 		if (current.size !== 0) {
 			pages.push(current.options);
 		}

packages/create-cloudflare/src/common.ts

@@ -11,6 +11,7 @@ import {
 	startSection,
 	updateStatus,
 } from "@cloudflare/cli";
+import { processArgument } from "@cloudflare/cli/args";
 import { bgGreen, blue, brandColor, dim, gray } from "@cloudflare/cli/colors";
 import { inputPrompt, spinner } from "@cloudflare/cli/interactive";
 import { getFrameworkCli } from "frameworks/index";
@@ -28,7 +29,6 @@ import { quote } from "shell-quote";
 import { version as wranglerVersion } from "wrangler/package.json";
 import { version } from "../package.json";
 import type { C3Args, PagesGeneratorContext } from "types";
-import { processArgument } from "@cloudflare/cli/args";
 
 const { name, npm } = detectPackageManager();
 

packages/create-cloudflare/src/frameworks/next/index.ts

@@ -1,5 +1,6 @@
 import { existsSync, mkdirSync } from "fs";
 import { crash, updateStatus, warn } from "@cloudflare/cli";
+import { processArgument } from "@cloudflare/cli/args";
 import { brandColor, dim } from "@cloudflare/cli/colors";
 import {
 	installPackages,
@@ -28,7 +29,6 @@ import {
 	readme,
 } from "./templates";
 import type { C3Args, FrameworkConfig, PagesGeneratorContext } from "types";
-import { processArgument } from "@cloudflare/cli/args";
 
 const { npm, npx } = detectPackageManager();
 

packages/wrangler/src/cloudchamber/cli/deployments.ts

@@ -1,5 +1,5 @@
 import { exit } from "process";
-import { error, endSection, log, cancel } from "@cloudflare/cli";
+import { crash, endSection, log, cancel } from "@cloudflare/cli";
 import { processArgument } from "@cloudflare/cli/args";
 import { yellow, brandColor, dim } from "@cloudflare/cli/colors";
 import { spinner } from "@cloudflare/cli/interactive";
@@ -77,7 +77,7 @@ export async function loadDeployments(
 
 	stop();
 	if (err) {
-		error(
+		crash(
 			"There has been an error while loading your deployments: \n " +
 				err.message
 		);

packages/wrangler/src/cloudchamber/cli/index.ts

@@ -1,5 +1,5 @@
 import {
-	error,
+	crash,
 	updateStatus,
 	log,
 	endSection,
@@ -165,7 +165,7 @@ async function waitForImagePull(deployment: DeploymentV2) {
 	);
 	s.stop();
 	if (err) {
-		error(err.message);
+		crash(err.message);
 		return;
 	}
 
@@ -179,7 +179,7 @@ async function waitForImagePull(deployment: DeploymentV2) {
 	}
 
 	if (eventPlacement.event.name == "ImagePullError") {
-		error(
+		crash(
 			"Your container image couldn't be pulled, (404 not found). Did you specify the correct URL?",
 			`Run ${brandColor(
 				process.argv0 + " cloudchamber modify " + deployment.id
@@ -217,7 +217,7 @@ async function waitForVMToStart(deployment: DeploymentV2) {
 	);
 	s.stop();
 	if (err) {
-		error(err.message);
+		crash(err.message);
 		return;
 	}
 
@@ -276,7 +276,7 @@ async function waitForPlacementInstance(deployment: DeploymentV2) {
 	}
 
 	if (err) {
-		error(err.message);
+		crash(err.message);
 		return;
 	}
 
@@ -312,7 +312,7 @@ export async function waitForPlacement(deployment: DeploymentV2) {
 					DeploymentsService.getDeploymentV2(deployment.id)
 				);
 				if (getDeploymentError) {
-					error(
+					crash(
 						"Couldn't retrieve a new deployment: " + getDeploymentError.message
 					);
 					return;

packages/wrangler/src/cloudchamber/common.ts

@@ -1,6 +1,6 @@
 import { mkdir } from "fs/promises";
 import { exit } from "process";
-import { error, logRaw, space, status, updateStatus } from "@cloudflare/cli";
+import { crash, logRaw, space, status, updateStatus } from "@cloudflare/cli";
 import { dim, brandColor } from "@cloudflare/cli/colors";
 import { inputPrompt, spinner } from "@cloudflare/cli/interactive";
 import { version as wranglerVersion } from "../../package.json";
@@ -170,22 +170,22 @@ export async function fillOpenAPIConfiguration(config: Config, json: boolean) {
 		// This will prompt the user for an accountId being chosen if they haven't configured the account id yet
 		const [, err] = await wrap(requireAuth(config));
 		if (err) {
-			error("authenticating with the Cloudflare API:", err.message);
+			crash("authenticating with the Cloudflare API:", err.message);
 			return;
 		}
 	}
 
 	// Get the loaded API token
 	const token = getAPIToken();
 	if (!token) {
-		error("unexpected apiToken not existing in credentials");
+		crash("unexpected apiToken not existing in credentials");
 		exit(1);
 	}
 
 	const val = "apiToken" in token ? token.apiToken : null;
 	// Don't try to support this method of authentication
 	if (!val) {
-		error(
+		crash(
 			"we don't allow for authKey/email credentials, use `wrangler login` or CLOUDFLARE_API_TOKEN env variable to authenticate"
 		);
 	}
@@ -197,14 +197,14 @@ export async function fillOpenAPIConfiguration(config: Config, json: boolean) {
 	OpenAPI.CREDENTIALS = "omit";
 	const [base, errApiURL] = await wrap(getAPIUrl(config));
 	if (errApiURL) {
-		error("getting the API url:" + errApiURL.message);
+		crash("getting the API url:" + errApiURL.message);
 		return;
 	}
 
 	OpenAPI.BASE = base;
 	OpenAPI.HEADERS = headers;
 	const [, err] = await wrap(loadAccountSpinner({ json }));
-	if (err) error("loading Cloudchamber account failed:" + err.message);
+	if (err) crash("loading Cloudchamber account failed:" + err.message);
 }
 
 export function interactWithUser(config: { json?: boolean }): boolean {
@@ -300,23 +300,23 @@ export function renderDeploymentMutationError(
 	err: Error
 ) {
 	if (!(err instanceof ApiError)) {
-		error(err.message);
+		crash(err.message);
 		return;
 	}
 
 	if (typeof err.body === "string") {
-		error("There has been an internal error, please try again!");
+		crash("There has been an internal error, please try again!");
 		return;
 	}
 
 	if (!("error" in err.body)) {
-		error(err.message);
+		crash(err.message);
 		return;
 	}
 
 	const errorMessage = err.body.error;
 	if (!(errorMessage in DeploymentMutationError)) {
-		error(err.message);
+		crash(err.message);
 		return;
 	}
 
@@ -359,7 +359,7 @@ export function renderDeploymentMutationError(
 				"You have to configure the domain of the image you're trying to set\n",
 		};
 
-	error(details["reason"] ?? errorEnumToErrorMessage[errorEnum]());
+	crash(details["reason"] ?? errorEnumToErrorMessage[errorEnum]());
 }
 
 export function sortEnvironmentVariables(

packages/wrangler/src/cloudchamber/delete.ts

@@ -1,4 +1,4 @@
-import { startSection, error, endSection, cancel } from "@cloudflare/cli";
+import { startSection, crash, endSection, cancel } from "@cloudflare/cli";
 import { inputPrompt } from "@cloudflare/cli/interactive";
 import { logDeployment, pickDeployment } from "./cli/deployments";
 import { DeploymentsService } from "./client";
@@ -63,7 +63,7 @@ async function handleDeleteCommand(
 		DeploymentsService.deleteDeploymentV2(deployment.id)
 	);
 	if (err) {
-		error(
+		crash(
 			`There has been an internal error deleting your deployment.\n ${err.message}`
 		);
 		return;

packages/wrangler/src/cloudchamber/images/images.ts

@@ -1,4 +1,4 @@
-import { startSection, error, endSection } from "@cloudflare/cli";
+import { startSection, crash, endSection } from "@cloudflare/cli";
 import { processArgument } from "@cloudflare/cli/args";
 import {
 	ApiError,
@@ -114,7 +114,7 @@ export const registriesCommand = (yargs: CommonYargsArgvJSON) => {
 						_config
 					) => {
 						if (!imageArgs.pull && !imageArgs.push) {
-							error(
+							crash(
 								"You have to specify either --push or --pull in the command."
 							);
 
@@ -179,13 +179,13 @@ export async function handleConfigureImageRegistryCommand(
 		const { error: errString } = err.body as { error: string };
 		switch (errString) {
 			case ImageRegistryAlreadyExistsError.error.IMAGE_REGISTRY_ALREADY_EXISTS:
-				error("The domain already exists!");
+				crash("The domain already exists!");
 				break;
 			case ImageRegistryNotAllowedError.error.IMAGE_REGISTRY_NOT_ALLOWED:
-				error("This domain is not allowed!");
+				crash("This domain is not allowed!");
 				break;
 			default:
-				error(
+				crash(
 					"An unexpected error happened, please try again or send us the error for troubleshooting\n" +
 						errString
 				);
@@ -195,7 +195,7 @@ export async function handleConfigureImageRegistryCommand(
 	}
 
 	if (err) {
-		error("There has been an internal error:", `${JSON.stringify(err)}`);
+		crash("There has been an internal error:", `${JSON.stringify(err)}`);
 		return;
 	}