@project-ajax/sdk 0.0.55 → 0.0.57

package/src/cli/commands/runs.impl.ts

@@ -19,9 +19,9 @@ export const listRuns = buildAuthedHandler(async function (flags: FormatFlags) {
 
 		const data = Result.unwrap(result);
 		if (data.runs.length === 0) {
-			this.writer.writeErr("No runs found for this worker.");
+			this.io.writeErr("No runs found for this worker.");
 		} else {
-			this.writer.writeTableOut({
+			this.io.writeTableOut({
 				headers: ["Run ID", "Name", "Started At", "Ended At", "Exit Code"],
 				rows: data.runs.map((run) => [
 					run.runId,
@@ -38,10 +38,10 @@ export const listRuns = buildAuthedHandler(async function (flags: FormatFlags) {
 
 		// If it's a validation error, show the clean debug message
 		if (result.error.validationError) {
-			this.writer.writeErr(`✗ ${result.error.validationError.debugMessage}`);
+			this.io.writeErr(`✗ ${result.error.validationError.debugMessage}`);
 			throw new Error(result.error.validationError.debugMessage);
 		} else {
-			this.writer.writeErr(`✗ ${result.error.message}`);
+			this.io.writeErr(`✗ ${result.error.message}`);
 			throw new Error(result.error.message);
 		}
 	}
@@ -71,16 +71,16 @@ export const getRunLogs = buildAuthedHandler(async function (
 
 		const data = Result.unwrap(result);
 		// Output logs directly to stdout (primary output)
-		this.writer.writeOut(data.logs);
+		this.io.writeOut(data.logs);
 	} else {
 		this.process.stderr.write("ERROR\n\n");
 
 		// If it's a validation error, show the clean debug message
 		if (result.error.validationError) {
-			this.writer.writeErr(`✗ ${result.error.validationError.debugMessage}`);
+			this.io.writeErr(`✗ ${result.error.validationError.debugMessage}`);
 			throw new Error(result.error.validationError.debugMessage);
 		} else {
-			this.writer.writeErr(`✗ ${result.error.message}`);
+			this.io.writeErr(`✗ ${result.error.message}`);
 			throw new Error(result.error.message);
 		}
 	}

package/src/cli/commands/secrets.impl.ts

@@ -17,17 +17,17 @@ export const setSecrets = buildAuthedHandler(async function (
 		);
 	}
 
-	this.writer.writeErr(`Setting ${pluralize(secrets.length, "secret")}...`);
+	this.io.writeErr(`Setting ${pluralize(secrets.length, "secret")}...`);
 
 	const result = await this.apiClient.upsertSecrets(workerId, secrets);
 
 	if (Result.isSuccess(result)) {
 		for (const secret of Result.unwrap(result).secrets) {
-			this.writer.writeErr(`Set secret "${secret.key}"`);
+			this.io.writeErr(`Set secret "${secret.key}"`);
 		}
 	} else {
-		this.writer.writeErr(`✗ Failed to set secrets`);
-		this.writer.writeErr(`✗ ${result.error.message}`);
+		this.io.writeErr(`✗ Failed to set secrets`);
+		this.io.writeErr(`✗ ${result.error.message}`);
 		throw new Error(result.error.message);
 	}
 });
@@ -51,25 +51,25 @@ export const listSecrets = buildAuthedHandler(async function (
 
 		const data = Result.unwrap(result);
 		if (data.secrets.length === 0) {
-			this.writer.writeErr("No secrets for this worker.");
-			this.writer.writeErr(
+			this.io.writeErr("No secrets for this worker.");
+			this.io.writeErr(
 				"To list OAuth connect secrets, use `npx workers connect list`",
 			);
 		} else {
-			this.writer.writeTableOut({
+			this.io.writeTableOut({
 				headers: ["Key", "Created At"],
 				rows: data.secrets.map((secret) => [secret.key, secret.createdAt]),
 				plain: flags.plain,
 			});
-			this.writer.writeErr(
+			this.io.writeErr(
 				"To list OAuth connect secrets, use `npx workers connect list`",
 			);
 		}
 	} else {
 		this.process.stderr.write("ERROR\n\n");
 
-		this.writer.writeErr(`✗ Failed to list secrets`);
-		this.writer.writeErr(`✗ ${result.error.message}`);
+		this.io.writeErr(`✗ Failed to list secrets`);
+		this.io.writeErr(`✗ ${result.error.message}`);
 		throw new Error(result.error.message);
 	}
 });
@@ -94,8 +94,8 @@ export const removeSecret = buildAuthedHandler(async function (
 	} else {
 		this.process.stderr.write("ERROR\n\n");
 
-		this.writer.writeErr(`✗ Failed to remove secret "${key}"`);
-		this.writer.writeErr(`✗ ${result.error.message}`);
+		this.io.writeErr(`✗ Failed to remove secret "${key}"`);
+		this.io.writeErr(`✗ ${result.error.message}`);
 		throw new Error(result.error.message);
 	}
 });

package/src/cli/commands/utils/testing.ts

@@ -4,8 +4,9 @@ import * as os from "node:os";
 import { tmpdir } from "node:os";
 import * as path from "node:path";
 import { Config, type ConfigMap } from "../../config.js";
+import type { LocalContext } from "../../context.js";
 import type { GlobalFlags } from "../../flags.js";
-import { Writer } from "../../writer.js";
+import { IO } from "../../io.js";
 
 export const tmpDirectories: string[] = [];
 
@@ -36,13 +37,13 @@ export async function createAndLoadConfig({
 	return [map, configFilePath];
 }
 
-export function createBaseContext() {
+export function createBaseContext(): LocalContext {
 	return {
-		writer: new Writer({ debugEnabled: false }),
-		process,
 		fs,
+		io: new IO({ debugEnabled: false }),
 		os,
 		path,
+		process,
 	};
 }
 

package/src/cli/config.ts

@@ -141,9 +141,8 @@ export class Config {
 			partialConfig.workerId = opts.flags["worker-id"];
 		}
 
-		partialConfig.baseUrl ??= baseUrlForEnvironment(
-			partialConfig.environment ?? "prod",
-		);
+		partialConfig.environment ??= "prod";
+		partialConfig.baseUrl ??= baseUrlForEnvironment(partialConfig.environment);
 
 		const environment = partialConfig.environment;
 		if (!environment) {
@@ -194,8 +193,6 @@ export class Config {
 				configFile = {
 					token: null,
 					workerId: null,
-					environment: "prod",
-					baseUrl: baseUrlForEnvironment("prod"),
 				};
 			} else {
 				throw error;

package/src/cli/context.ts

@@ -3,24 +3,24 @@ import * as os from "node:os";
 import * as path from "node:path";
 import type { StricliAutoCompleteContext } from "@stricli/auto-complete";
 import type { CommandContext } from "@stricli/core";
-import { Writer } from "./writer.js";
+import { IO } from "./io.js";
 
 export interface LocalContext
 	extends CommandContext,
 		StricliAutoCompleteContext {
 	readonly fs: typeof fs;
+	readonly io: IO;
 	readonly os: typeof os;
 	readonly path: typeof path;
 	readonly process: NodeJS.Process;
-	readonly writer: Writer;
 }
 
 export function buildContext(process: NodeJS.Process): LocalContext {
 	return {
 		fs,
+		io: new IO({ debugEnabled: false }),
 		os,
 		path,
 		process,
-		writer: new Writer({ debugEnabled: false }),
 	};
 }

package/src/cli/deploy.ts

@@ -53,7 +53,7 @@ export async function deployWorker(
 
 	// Resolve absolute path
 	const absPath = path.resolve(process.cwd(), workerPath);
-	context.writer.debug(`Deploying worker from: ${absPath}`);
+	context.io.debug(`Deploying worker from: ${absPath}`);
 
 	// Create API client
 	const client = context.apiClient;
@@ -63,7 +63,7 @@ export async function deployWorker(
 	let workerId: string;
 
 	if ("workerId" in options) {
-		context.writer.writeErr(`Updating worker...`);
+		context.io.writeErr(`Updating worker...`);
 
 		workerId = options.workerId;
 
@@ -73,13 +73,13 @@ export async function deployWorker(
 			uploadUrl = res.url;
 			uploadFields = res.fields;
 		} else {
-			context.writer.writeErr(
+			context.io.writeErr(
 				"Failed to generate pre-signed upload URL for worker bundle:",
 			);
 			throw new Error(updateResult.error.message);
 		}
 	} else {
-		context.writer.writeErr(`Creating worker...`);
+		context.io.writeErr(`Creating worker...`);
 
 		const createResult = await client.createWorker(options.name);
 		if (Result.isSuccess(createResult)) {
@@ -93,20 +93,20 @@ export async function deployWorker(
 		}
 	}
 
-	context.writer.debug(`Generated upload URL: ${uploadUrl}`);
+	context.io.debug(`Generated upload URL: ${uploadUrl}`);
 
 	// Build the worker bundle
-	context.writer.writeErr("Building worker bundle...");
+	context.io.writeErr("Building worker bundle...");
 	const archivePath = await buildWorkerBundle(context, absPath);
-	context.writer.debug(`Created bundle at: ${archivePath}`);
+	context.io.debug(`Created bundle at: ${archivePath}`);
 
 	// Upload the bundle
-	context.writer.writeErr("Uploading bundle...");
+	context.io.writeErr("Uploading bundle...");
 	await uploadBundle(uploadUrl, uploadFields, archivePath);
-	context.writer.debug("Upload complete");
+	context.io.debug("Upload complete");
 
 	// Fetch and save capabilities
-	context.writer.writeErr("Fetching and saving worker capabilities...");
+	context.io.writeErr("Fetching and saving worker capabilities...");
 	const capabilitiesResult = await client.fetchAndSaveCapabilities(workerId);
 
 	if (Result.isSuccess(capabilitiesResult)) {
@@ -141,7 +141,7 @@ async function buildWorkerBundle(
 		platform: "node",
 	});
 
-	context.writer.debug(`Built bundle to: ${outdir}`);
+	context.io.debug(`Built bundle to: ${outdir}`);
 
 	// Create tar.gz archive
 	const archiveDir = fs.mkdtempSync("/tmp/workers-archive-");

package/src/cli/handler.ts

@@ -35,7 +35,7 @@ export function buildHandler<const FLAGS, const ARGS extends BaseArgs = []>(
 			flags,
 		});
 
-		this.writer.debugEnabled = flags.debug;
+		this.io.debugEnabled = flags.debug;
 
 		await handler.call({ ...this, config }, flags, ...args);
 	};
@@ -61,7 +61,7 @@ export function buildAuthedHandler<
 			environment,
 			baseUrl: this.config.baseUrl,
 			cellId,
-			writer: this.writer,
+			writer: this.io,
 		});
 		return handler.call({ ...this, apiClient: client }, flags, ...args);
 	});

package/src/cli/{writer.ts → io.ts}

@@ -1,3 +1,4 @@
+import * as prompts from "@inquirer/prompts";
 import { createTable, type TableCell, type TableItem } from "@visulima/tabular";
 
 export interface WriterOptions {
@@ -10,10 +11,14 @@ export interface TableOptions {
 	plain: boolean;
 }
 
+type WithSafety<T> = T & {
+	noTTY: string;
+};
+
 /**
- * A writer writes messages to standard out and standard error.
+ * IO manages safe, consistent, input and output patterns for the CLI.
  */
-export class Writer {
+export class IO {
 	debugEnabled: boolean;
 
 	constructor(options: WriterOptions) {
@@ -74,6 +79,33 @@ export class Writer {
 		this.writeErr(content);
 	}
 
+	confirm(config: WithSafety<Parameters<typeof prompts.confirm>[0]>) {
+		if (!process.stdin.isTTY) {
+			this.writeErr(config.noTTY);
+			process.exit(1);
+		}
+
+		return prompts.confirm(config).catch(this.#handlePromptExit.bind(this));
+	}
+
+	input(config: WithSafety<Parameters<typeof prompts.input>[0]>) {
+		if (!process.stdin.isTTY) {
+			this.writeErr(config.noTTY);
+			process.exit(1);
+		}
+
+		return prompts.input(config).catch(this.#handlePromptExit.bind(this));
+	}
+
+	#handlePromptExit(err: unknown) {
+		if (err instanceof Error && err.name === "ExitPromptError") {
+			this.writeErr("👋 Prompt cancelled. Goodbye!");
+			process.exit(1);
+		}
+
+		throw err;
+	}
+
 	#buildTable(tableConfig: TableOptions) {
 		if (tableConfig.plain) {
 			return tableConfig.rows

package/dist/cli/writer.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"writer.d.ts","sourceRoot":"","sources":["../../src/cli/writer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,KAAK,SAAS,EAAkB,MAAM,mBAAmB,CAAC;AAEhF,MAAM,WAAW,aAAa;IAC7B,YAAY,EAAE,OAAO,CAAC;CACtB;AAED,MAAM,WAAW,YAAY;IAC5B,OAAO,EAAE,SAAS,EAAE,GAAG,SAAS,EAAE,EAAE,CAAC;IACrC,IAAI,EAAE,SAAS,EAAE,EAAE,CAAC;IACpB,KAAK,EAAE,OAAO,CAAC;CACf;AAED;;GAEG;AACH,qBAAa,MAAM;;IAClB,YAAY,EAAE,OAAO,CAAC;gBAEV,OAAO,EAAE,aAAa;IAIlC;;;;OAIG;IACH,KAAK,CAAC,GAAG,IAAI,EAAE,UAAU,CAAC,OAAO,OAAO,CAAC,GAAG,CAAC;IAW7C;;;;OAIG;IACH,QAAQ,CAAC,GAAG,IAAI,EAAE,UAAU,CAAC,OAAO,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;IAIzD;;;;OAIG;IACH,QAAQ,CAAC,GAAG,IAAI,EAAE,UAAU,CAAC,OAAO,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;IAIzD;;;;OAIG;IACH,aAAa,CAAC,WAAW,EAAE,YAAY;IAKvC;;;;OAIG;IACH,aAAa,CAAC,WAAW,EAAE,YAAY;CAqBvC"}