wrangler 0.0.0-e7a0cd5b → 0.0.0-e7cf0caa

package/src/publish/index.ts

@@ -13,14 +13,12 @@ import { getAssetPaths, getSiteAssetPaths } from "../sites";
 import { requireAuth } from "../user";
 import { collectKeyValues } from "../utils/collectKeyValues";
 import publish from "./publish";
-import type { ConfigPath } from "../index";
 import type {
-	CommonYargsOptions,
-	YargsOptionsToInterface,
+	CommonYargsArgv,
+	StrictYargsOptionsToInterface,
 } from "../yargs-types";
-import type { Argv, ArgumentsCamelCase } from "yargs";
 
-export function publishOptions(yargs: Argv<CommonYargsOptions>) {
+export function publishOptions(yargs: CommonYargsArgv) {
 	return (
 		yargs
 			.positional("script", {
@@ -82,6 +80,13 @@ export function publishOptions(yargs: Argv<CommonYargsOptions>) {
 				deprecated: true,
 				hidden: true,
 			})
+			.option("public", {
+				describe: "Static assets to be served",
+				type: "string",
+				requiresArg: true,
+				deprecated: true,
+				hidden: true,
+			})
 			.option("assets", {
 				describe: "Static assets to be served",
 				type: "string",
@@ -153,7 +158,7 @@ export function publishOptions(yargs: Argv<CommonYargsOptions>) {
 				type: "boolean",
 			})
 			.option("node-compat", {
-				describe: "Enable node.js compatibility",
+				describe: "Enable Node.js compatibility",
 				type: "boolean",
 			})
 			.option("dry-run", {
@@ -179,14 +184,13 @@ export function publishOptions(yargs: Argv<CommonYargsOptions>) {
 	);
 }
 
-type PublishArgs = YargsOptionsToInterface<typeof publishOptions>;
-
-export async function publishHandler(args: ArgumentsCamelCase<PublishArgs>) {
+export async function publishHandler(
+	args: StrictYargsOptionsToInterface<typeof publishOptions>
+) {
 	await printWranglerBanner();
 
 	const configPath =
-		(args.config as ConfigPath) ||
-		(args.script && findWranglerToml(path.dirname(args.script)));
+		args.config || (args.script && findWranglerToml(path.dirname(args.script)));
 	const config = readConfig(configPath, args);
 	const entry = await getEntry(args, config, "publish");
 	await metrics.sendMetricsEvent(
@@ -202,7 +206,7 @@ export async function publishHandler(args: ArgumentsCamelCase<PublishArgs>) {
 	if (args.public) {
 		throw new Error("The --public field has been renamed to --assets");
 	}
-	if (args["experimental-public"]) {
+	if (args.experimentalPublic) {
 		throw new Error(
 			"The --experimental-public field has been renamed to --assets"
 		);
@@ -247,13 +251,13 @@ export async function publishHandler(args: ArgumentsCamelCase<PublishArgs>) {
 		env: args.env,
 		compatibilityDate: args.latest
 			? new Date().toISOString().substring(0, 10)
-			: args["compatibility-date"],
-		compatibilityFlags: args["compatibility-flags"],
+			: args.compatibilityDate,
+		compatibilityFlags: args.compatibilityFlags,
 		vars: cliVars,
 		defines: cliDefines,
 		triggers: args.triggers,
-		jsxFactory: args["jsx-factory"],
-		jsxFragment: args["jsx-fragment"],
+		jsxFactory: args.jsxFactory,
+		jsxFragment: args.jsxFragment,
 		tsconfig: args.tsconfig,
 		routes: args.routes,
 		assetPaths,

package/src/publish/publish.ts

@@ -12,7 +12,8 @@ import {
 import { fetchListResult, fetchResult } from "../cfetch";
 import { printBindings } from "../config";
 import { createWorkerUploadForm } from "../create-worker-upload-form";
-import { confirm, fromDashMessagePrompt } from "../dialogs";
+import { addHyphens } from "../deployments";
+import { confirm } from "../dialogs";
 import { getMigrationsToUpload } from "../durable";
 import { logger } from "../logger";
 import { getMetricsUsageHeaders } from "../metrics";
@@ -20,6 +21,7 @@ import { ParseError } from "../parse";
 import { getQueue, putConsumer } from "../queues/client";
 import { getWorkersDevSubdomain } from "../routes";
 import { syncAssets } from "../sites";
+import traverseModuleGraph from "../traverse-module-graph";
 import { identifyD1BindingsAsBeta } from "../worker";
 import { getZoneForRoute } from "../zones";
 import type { FetchError } from "../cfetch";
@@ -30,7 +32,6 @@ import type {
 	ZoneNameRoute,
 	CustomDomainRoute,
 } from "../config/environment";
-import type { DeploymentListRes } from "../deployments";
 import type { Entry } from "../entry";
 import type { PutConsumerBody } from "../queues/client";
 import type { AssetPaths } from "../sites";
@@ -93,7 +94,7 @@ function sleep(ms: number) {
 
 const scriptStartupErrorRegex = /startup/i;
 
-function errIsScriptSizeOrStartupErr(err: unknown) {
+function errIsScriptSize(err: unknown): err is { code: 10027 } {
 	if (!err) return false;
 
 	// 10027 = workers.api.error.script_too_large
@@ -101,6 +102,12 @@ function errIsScriptSizeOrStartupErr(err: unknown) {
 		return true;
 	}
 
+	return false;
+}
+
+function errIsStartupErr(err: unknown): err is ParseError & { code: 10021 } {
+	if (!err) return false;
+
 	// 10021 = validation error
 	// no explicit error code for more granular errors than "invalid script"
 	// but the error will contain a string error message directly from the
@@ -269,12 +276,14 @@ export default async function publish(props: Props): Promise<void> {
 				};
 			};
 
-			if (
-				(await fromDashMessagePrompt(
-					default_environment.script.last_deployed_from
-				)) === false
-			)
-				return;
+			if (default_environment.script.last_deployed_from === "dash") {
+				logger.warn(
+					`You are about to publish a Workers Service that was last published via the Cloudflare Dashboard.\nEdits that have been made via the dashboard will be overridden by your local code and config.`
+				);
+				if (!(await confirm("Would you like to continue?"))) {
+					return;
+				}
+			}
 		} catch (e) {
 			// code: 10090, message: workers.api.error.service_not_found
 			// is thrown from the above fetchResult on the first publish of a Worker
@@ -327,17 +336,25 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
 
 	const jsxFactory = props.jsxFactory || config.jsx_factory;
 	const jsxFragment = props.jsxFragment || config.jsx_fragment;
-	const keepVars = props.keepVars ?? config.keep_vars;
+	const keepVars = props.keepVars || config.keep_vars;
 
 	const minify = props.minify ?? config.minify;
 
-	const nodeCompat = props.nodeCompat ?? config.node_compat;
-	if (nodeCompat) {
+	const legacyNodeCompat = props.nodeCompat ?? config.node_compat;
+	if (legacyNodeCompat) {
 		logger.warn(
-			"Enabling node.js compatibility mode for built-ins and globals. This is experimental and has serious tradeoffs. Please see https://github.com/ionic-team/rollup-plugin-node-polyfills/ for more details."
+			"Enabling Node.js compatibility mode for built-ins and globals. This is experimental and has serious tradeoffs. Please see https://github.com/ionic-team/rollup-plugin-node-polyfills/ for more details."
 		);
 	}
 
+	const compatibilityFlags =
+		props.compatibilityFlags ?? config.compatibility_flags;
+	const nodejsCompat = compatibilityFlags.includes("nodejs_compat");
+	assert(
+		!(legacyNodeCompat && nodejsCompat),
+		"The `nodejs_compat` compatibility flag cannot be used in conjunction with the legacy `--node-compat` flag. If you want to use the Workers runtime Node.js compatibility features, please remove the `--node-compat` argument from your CLI command or `node_compat = true` from your config file."
+	);
+
 	// Warn if user tries minify or node-compat with no-bundle
 	if (props.noBundle && minify) {
 		logger.warn(
@@ -345,7 +362,7 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
 		);
 	}
 
-	if (props.noBundle && nodeCompat) {
+	if (props.noBundle && legacyNodeCompat) {
 		logger.warn(
 			"`--node-compat` and `--no-bundle` can't be used together. If you want to polyfill Node.js built-ins and disable Wrangler's bundling, please polyfill as part of your own bundling process."
 		);
@@ -385,7 +402,7 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
 		: `/accounts/${accountId}/workers/scripts/${scriptName}`;
 
 	let available_on_subdomain: boolean | undefined = undefined; // we'll set this later
-	let scriptTag: string | null = null;
+	let deploymentId: string | null = null;
 
 	const { format } = props.entry;
 
@@ -447,14 +464,7 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
 			resolvedEntryPointPath,
 			bundleType,
 		}: Awaited<ReturnType<typeof bundleWorker>> = props.noBundle
-			? // we can skip the whole bundling step and mock a bundle here
-			  {
-					modules: [],
-					dependencies: {},
-					resolvedEntryPointPath: props.entry.file,
-					bundleType: props.entry.format === "modules" ? "esm" : "commonjs",
-					stop: undefined,
-			  }
+			? await traverseModuleGraph(props.entry, props.rules)
 			: await bundleWorker(
 					props.entry,
 					typeof destination === "string" ? destination : destination.path,
@@ -464,12 +474,14 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
 						betaD1Shims: identifyD1BindingsAsBeta(config.d1_databases)?.map(
 							(db) => db.binding
 						),
+						doBindings: config.durable_objects.bindings,
 						jsxFactory,
 						jsxFragment,
 						rules: props.rules,
 						tsconfig: props.tsconfig ?? config.tsconfig,
 						minify,
-						nodeCompat,
+						legacyNodeCompat,
+						nodejsCompat,
 						define: { ...config.define, ...props.defines },
 						checkFetch: false,
 						assets: config.assets && {
@@ -487,7 +499,7 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
 						// This could potentially cause issues as we no longer have identical behaviour between dev and publish?
 						targetConsumer: "publish",
 						local: false,
-						experimentalLocalStubCache: false,
+						experimentalLocal: false,
 					}
 			  );
 
@@ -523,8 +535,8 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
 					? { binding: "__STATIC_CONTENT", id: assets.namespace }
 					: []
 			),
+			send_email: config.send_email,
 			vars: { ...config.vars, ...props.vars },
-			metadata_binding: config.metadata_binding,
 			wasm_modules: config.wasm_modules,
 			text_blobs: {
 				...config.text_blobs,
@@ -541,9 +553,14 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
 			r2_buckets: config.r2_buckets,
 			d1_databases: identifyD1BindingsAsBeta(config.d1_databases),
 			services: config.services,
+			analytics_engine_datasets: config.analytics_engine_datasets,
 			dispatch_namespaces: config.dispatch_namespaces,
+			mtls_certificates: config.mtls_certificates,
 			logfwdr: config.logfwdr,
-			unsafe: config.unsafe?.bindings,
+			unsafe: {
+				bindings: config.unsafe.bindings,
+				metadata: config.unsafe.metadata,
+			},
 		};
 
 		if (assets.manifest) {
@@ -565,8 +582,7 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
 			migrations,
 			modules,
 			compatibility_date: props.compatibilityDate ?? config.compatibility_date,
-			compatibility_flags:
-				props.compatibilityFlags ?? config.compatibility_flags,
+			compatibility_flags: compatibilityFlags,
 			usage_model: config.usage_model,
 			keepVars,
 			logpush: props.logpush !== undefined ? props.logpush : config.logpush,
@@ -600,9 +616,9 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
 
 		printBindings({ ...withoutStaticAssets, vars: maskedVars });
 
-		await ensureQueuesExist(config);
-
 		if (!props.dryRun) {
+			await ensureQueuesExist(config);
+
 			// Upload the script so it has time to propagate.
 			// We can also now tell whether available_on_subdomain is set
 			try {
@@ -611,7 +627,7 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
 					id: string | null;
 					etag: string | null;
 					pipeline_hash: string | null;
-					tag: string | null;
+					deployment_id: string | null;
 				}>(
 					workerUrl,
 					{
@@ -628,7 +644,7 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
 				);
 
 				available_on_subdomain = result.available_on_subdomain;
-				scriptTag = result.tag;
+				deploymentId = addHyphens(result.deployment_id) ?? result.deployment_id;
 
 				if (config.first_party_worker) {
 					// Print some useful information returned after publishing
@@ -640,9 +656,7 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
 						logger.log("Worker PipelineHash: ", result.pipeline_hash);
 				}
 			} catch (err) {
-				if (errIsScriptSizeOrStartupErr(err)) {
-					printOffendingDependencies(dependencies);
-				}
+				helpIfErrorIsSizeOrScriptStartup(err, dependencies);
 				throw err;
 			}
 		}
@@ -820,17 +834,27 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
 		logger.log("No publish targets for", workerName, formatTime(deployMs));
 	}
 
-	try {
-		const deploymentsList = await fetchResult<DeploymentListRes>(
-			`/accounts/${accountId}/workers/versions/by-script/${scriptTag}`
-		);
+	logger.log("Current Deployment ID:", deploymentId);
+}
 
-		logger.log("Current Deployment:", deploymentsList.latest.number);
-	} catch (e) {
-		if ((e as { code: number }).code === 10023) {
-			// TODO: remove this try/catch once versions is completely rolled out
-		}
-		throw e;
+export function helpIfErrorIsSizeOrScriptStartup(
+	err: unknown,
+	dependencies: { [path: string]: { bytesInOutput: number } }
+) {
+	if (errIsScriptSize(err)) {
+		printOffendingDependencies(dependencies);
+	} else if (errIsStartupErr(err)) {
+		const youFailed =
+			"Your Worker failed validation because it exceeded startup limits.";
+		const heresWhy =
+			"To ensure fast responses, we place constraints on Worker startup -- like how much CPU it can use, or how long it can take.";
+		const heresTheProblem =
+			"Your Worker failed validation, which means it hit one of these startup limits.";
+		const heresTheSolution =
+			"Try reducing the amount of work done during startup (outside the event handler), either by removing code or relocating it inside the event handler.";
+		logger.warn(
+			[youFailed, heresWhy, heresTheProblem, heresTheSolution].join("\n")
+		);
 	}
 }
 
@@ -997,7 +1021,7 @@ async function ensureQueuesExist(config: Config) {
 			await getQueue(config, queue);
 		} catch (err) {
 			const queueErr = err as FetchError;
-			if (queueErr.code === 100123) {
+			if (queueErr.code === 11000) {
 				// queue_not_found
 				throw new Error(
 					`Queue "${queue}" does not exist. To create it, run: wrangler queues create ${queue}`
@@ -1019,6 +1043,7 @@ function updateQueueConsumers(config: Config): Promise<string[]>[] {
 				max_wait_time_ms: consumer.max_batch_timeout
 					? 1000 * consumer.max_batch_timeout
 					: undefined,
+				max_concurrency: consumer.max_concurrency,
 			},
 		};
 

package/src/pubsub/{pubsub-commands.tsx → pubsub-commands.ts}

@@ -1,4 +1,3 @@
-import { type ConfigPath } from "..";
 import { readConfig } from "../config";
 import { confirm } from "../dialogs";
 import { CommandLineArgsError } from "../index";
@@ -7,13 +6,13 @@ import * as metrics from "../metrics";
 import { parseHumanDuration } from "../parse";
 import { requireAuth } from "../user";
 import * as pubsub from ".";
-import type { CommonYargsOptions } from "../yargs-types";
-import type { Argv, CommandModule } from "yargs";
+import type { CommonYargsArgv, CommonYargsOptions } from "../yargs-types";
+import type { CommandModule } from "yargs";
 
 export function pubSubCommands(
-	pubsubYargs: Argv<CommonYargsOptions>,
+	pubsubYargs: CommonYargsArgv,
 	subHelp: CommandModule<CommonYargsOptions, CommonYargsOptions>
-): Argv {
+) {
 	return pubsubYargs
 		.command(subHelp)
 		.command(
@@ -39,7 +38,7 @@ export function pubSubCommands(
 								.epilogue(pubsub.pubSubBetaWarning);
 						},
 						async (args) => {
-							const config = readConfig(args.config as ConfigPath, args);
+							const config = readConfig(args.config, args);
 							const accountId = await requireAuth(config);
 
 							const namespace: pubsub.PubSubNamespace = {
@@ -49,7 +48,7 @@ export function pubSubCommands(
 								namespace.description = args.description;
 							}
 
-							logger.log(`Creating Pub/SubNamespace ${args.name}...`);
+							logger.log(`Creating Pub/Sub Namespace ${args.name}...`);
 							await pubsub.createPubSubNamespace(accountId, namespace);
 							logger.log(`Success! Created Pub/Sub Namespace ${args.name}`);
 							await metrics.sendMetricsEvent("create pubsub namespace", {
@@ -64,7 +63,7 @@ export function pubSubCommands(
 							return yargs.epilogue(pubsub.pubSubBetaWarning);
 						},
 						async (args) => {
-							const config = readConfig(args.config as ConfigPath, args);
+							const config = readConfig(args.config, args);
 							const accountId = await requireAuth(config);
 
 							logger.log(await pubsub.listPubSubNamespaces(accountId));
@@ -86,7 +85,7 @@ export function pubSubCommands(
 								.epilogue(pubsub.pubSubBetaWarning);
 						},
 						async (args) => {
-							const config = readConfig(args.config as ConfigPath, args);
+							const config = readConfig(args.config, args);
 							const accountId = await requireAuth(config);
 
 							if (
@@ -116,7 +115,7 @@ export function pubSubCommands(
 								.epilogue(pubsub.pubSubBetaWarning);
 						},
 						async (args) => {
-							const config = readConfig(args.config as ConfigPath, args);
+							const config = readConfig(args.config, args);
 							const accountId = await requireAuth(config);
 
 							logger.log(
@@ -165,7 +164,7 @@ export function pubSubCommands(
 						})
 						.epilogue(pubsub.pubSubBetaWarning),
 				async (args) => {
-					const config = readConfig(args.config as ConfigPath, args);
+					const config = readConfig(args.config, args);
 					const accountId = await requireAuth(config);
 
 					const broker: pubsub.PubSubBroker = {
@@ -230,7 +229,7 @@ export function pubSubCommands(
 						})
 						.epilogue(pubsub.pubSubBetaWarning),
 				async (args) => {
-					const config = readConfig(args.config as ConfigPath, args);
+					const config = readConfig(args.config, args);
 					const accountId = await requireAuth(config);
 
 					const broker: pubsub.PubSubBrokerUpdate = {};
@@ -284,7 +283,7 @@ export function pubSubCommands(
 						.epilogue(pubsub.pubSubBetaWarning);
 				},
 				async (args) => {
-					const config = readConfig(args.config as ConfigPath, args);
+					const config = readConfig(args.config, args);
 					const accountId = await requireAuth(config);
 
 					logger.log(await pubsub.listPubSubBrokers(accountId, args.namespace));
@@ -314,7 +313,7 @@ export function pubSubCommands(
 							.epilogue(pubsub.pubSubBetaWarning);
 					},
 					async (args) => {
-						const config = readConfig(args.config as ConfigPath, args);
+						const config = readConfig(args.config, args);
 						const accountId = await requireAuth(config);
 
 						if (
@@ -354,7 +353,7 @@ export function pubSubCommands(
 							.epilogue(pubsub.pubSubBetaWarning);
 					},
 					async (args) => {
-						const config = readConfig(args.config as ConfigPath, args);
+						const config = readConfig(args.config, args);
 						const accountId = await requireAuth(config);
 
 						logger.log(
@@ -413,7 +412,7 @@ export function pubSubCommands(
 						.epilogue(pubsub.pubSubBetaWarning);
 				},
 				async (args) => {
-					const config = readConfig(args.config as ConfigPath, args);
+					const config = readConfig(args.config, args);
 					const accountId = await requireAuth(config);
 
 					let parsedExpiration: number | undefined;
@@ -473,7 +472,7 @@ export function pubSubCommands(
 						.epilogue(pubsub.pubSubBetaWarning);
 				},
 				async (args) => {
-					const config = readConfig(args.config as ConfigPath, args);
+					const config = readConfig(args.config, args);
 					const accountId = await requireAuth(config);
 
 					const numTokens = args.jti.length;
@@ -521,7 +520,7 @@ export function pubSubCommands(
 						.epilogue(pubsub.pubSubBetaWarning);
 				},
 				async (args) => {
-					const config = readConfig(args.config as ConfigPath, args);
+					const config = readConfig(args.config, args);
 					const accountId = await requireAuth(config);
 
 					const numTokens = args.jti.length;
@@ -562,7 +561,7 @@ export function pubSubCommands(
 						.epilogue(pubsub.pubSubBetaWarning);
 				},
 				async (args) => {
-					const config = readConfig(args.config as ConfigPath, args);
+					const config = readConfig(args.config, args);
 					const accountId = await requireAuth(config);
 
 					logger.log(`Listing previously revoked tokens for ${args.name}...`);
@@ -601,7 +600,7 @@ export function pubSubCommands(
 						.epilogue(pubsub.pubSubBetaWarning);
 				},
 				async (args) => {
-					const config = readConfig(args.config as ConfigPath, args);
+					const config = readConfig(args.config, args);
 					const accountId = await requireAuth(config);
 
 					logger.log(

package/src/queues/cli/commands/consumer/add.ts

@@ -1,21 +1,13 @@
-import { type Argv } from "yargs";
 import { readConfig } from "../../../../config";
 import { logger } from "../../../../logger";
 import { postConsumer } from "../../../client";
-import type { CommonYargsOptions } from "../../../../yargs-types";
+import type {
+	CommonYargsArgv,
+	StrictYargsOptionsToInterface,
+} from "../../../../yargs-types";
 import type { PostConsumerBody } from "../../../client";
 
-type Args = CommonYargsOptions & {
-	config?: string;
-	["queue-name"]: string;
-	["script-name"]: string;
-	["batch-size"]?: number;
-	["batch-timeout"]?: number;
-	["message-retries"]?: number;
-	["dead-letter-queue"]?: string;
-};
-
-export function options(yargs: Argv<CommonYargsOptions>): Argv<Args> {
+export function options(yargs: CommonYargsArgv) {
 	return yargs
 		.positional("queue-name", {
 			type: "string",
@@ -45,27 +37,35 @@ export function options(yargs: Argv<CommonYargsOptions>): Argv<Args> {
 				type: "string",
 				describe: "Queue to send messages that failed to be consumed",
 			},
+			"max-concurrency": {
+				type: "number",
+				describe:
+					"The maximum number of concurrent consumer Worker invocations. Must be a positive integer",
+			},
 		});
 }
 
-export async function handler(args: Args) {
+export async function handler(
+	args: StrictYargsOptionsToInterface<typeof options>
+) {
 	const config = readConfig(args.config, args);
 
 	const body: PostConsumerBody = {
-		script_name: args["script-name"],
+		script_name: args.scriptName,
 		// TODO(soon) is this still the correct usage of the environment?
-		environment_name: args.env || "", // API expects empty string as default
+		environment_name: args.env ?? "", // API expects empty string as default
 		settings: {
-			batch_size: args["batch-size"],
-			max_retries: args["message-retries"],
-			max_wait_time_ms: args["batch-timeout"] // API expects milliseconds
-				? 1000 * args["batch-timeout"]
+			batch_size: args.batchSize,
+			max_retries: args.messageRetries,
+			max_wait_time_ms: args.batchTimeout // API expects milliseconds
+				? 1000 * args.batchTimeout
 				: undefined,
+			max_concurrency: args.maxConcurrency,
 		},
-		dead_letter_queue: args["dead-letter-queue"],
+		dead_letter_queue: args.deadLetterQueue,
 	};
 
-	logger.log(`Adding consumer to queue ${args["queue-name"]}.`);
-	await postConsumer(config, args["queue-name"], body);
-	logger.log(`Added consumer to queue ${args["queue-name"]}.`);
+	logger.log(`Adding consumer to queue ${args.queueName}.`);
+	await postConsumer(config, args.queueName, body);
+	logger.log(`Added consumer to queue ${args.queueName}.`);
 }

package/src/queues/cli/commands/consumer/index.ts

@@ -1,11 +1,8 @@
-import { type BuilderCallback } from "yargs";
-import { type CommonYargsOptions } from "../../../../yargs-types";
 import { options as addOptions, handler as addHandler } from "./add";
 import { options as removeOptions, handler as removeHandler } from "./remove";
+import type { CommonYargsArgv } from "../../../../yargs-types";
 
-export const consumers: BuilderCallback<CommonYargsOptions, unknown> = (
-	yargs
-) => {
+export function consumers(yargs: CommonYargsArgv) {
 	yargs.command(
 		"add <queue-name> <script-name>",
 		"Add a Queue Consumer",
@@ -19,4 +16,4 @@ export const consumers: BuilderCallback<CommonYargsOptions, unknown> = (
 		removeOptions,
 		removeHandler
 	);
-};
+}

package/src/queues/cli/commands/consumer/remove.ts

@@ -1,16 +1,12 @@
-import { type Argv } from "yargs";
 import { readConfig } from "../../../../config";
 import { logger } from "../../../../logger";
 import { deleteConsumer } from "../../../client";
-import type { CommonYargsOptions } from "../../../../yargs-types";
+import type {
+	CommonYargsArgv,
+	StrictYargsOptionsToInterface,
+} from "../../../../yargs-types";
 
-type Args = CommonYargsOptions & {
-	config?: string;
-	["queue-name"]: string;
-	["script-name"]: string;
-};
-
-export function options(yargs: Argv<CommonYargsOptions>): Argv<Args> {
+export function options(yargs: CommonYargsArgv) {
 	return yargs
 		.positional("queue-name", {
 			type: "string",
@@ -24,15 +20,12 @@ export function options(yargs: Argv<CommonYargsOptions>): Argv<Args> {
 		});
 }
 
-export async function handler(args: Args) {
+export async function handler(
+	args: StrictYargsOptionsToInterface<typeof options>
+) {
 	const config = readConfig(args.config, args);
 
-	logger.log(`Removing consumer from queue ${args["queue-name"]}.`);
-	await deleteConsumer(
-		config,
-		args["queue-name"],
-		args["script-name"],
-		args.env
-	);
-	logger.log(`Removed consumer from queue ${args["queue-name"]}.`);
+	logger.log(`Removing consumer from queue ${args.queueName}.`);
+	await deleteConsumer(config, args.queueName, args.scriptName, args.env);
+	logger.log(`Removed consumer from queue ${args.queueName}.`);
 }