neon 7.0.0 → 7.0.1

package/dist/commands/bucket.js

@@ -82,7 +82,7 @@ const builder = (argv) => argv.usage("$0 bucket <sub-command> [options]").option
 		demandOption: true
 	}).options(scopeOptions),
 	handler: (args) => deleteBucket(args)
-}).command("object <sub-command>", "List, download, upload or delete objects in a bucket", (yargs) => yargs.usage("$0 bucket object <sub-command> [options]").command({
+}).command("object", "List, download, upload or delete objects in a bucket", (yargs) => yargs.usage("$0 bucket object <sub-command> [options]").command({
 	command: "list <target>",
 	aliases: ["ls"],
 	describe: "List objects in a bucket. By default folders are collapsed (like \"aws s3 ls\"); pass --recursive for a flat listing of every key",
@@ -153,7 +153,7 @@ const builder = (argv) => argv.usage("$0 bucket <sub-command> [options]").option
 		}
 	}),
 	handler: (args) => deleteObject(args)
-}).demandCommand(1, "").strictCommands());
+}).strictCommands());
 const handler = (args) => {
 	return args;
 };

package/dist/commands/config.js

@@ -476,7 +476,7 @@ const builder = (argv) => argv.usage("$0 config <sub-command> [options]").option
 	kind: "bucket",
 	name: args.name,
 	access: args.access
-}))).demandCommand(1, "Specify what to add: auth, data-api, ai-gateway, function, or bucket.")).command("init", "Scaffold a neon.ts policy and install the Neon config packages", (yargs) => yargs.options({
+})))).command("init", "Scaffold a neon.ts policy and install the Neon config packages", (yargs) => yargs.options({
 	install: {
 		describe: "Install @neon/config and @neon/env if they're missing. On by default; use --no-install to just print the command.",
 		type: "boolean",

package/dist/commands/functions.js

@@ -129,7 +129,7 @@ const builder = (argv) => argv.usage("$0 function <sub-command> [options]").opti
 	describe: "Function slug",
 	type: "string",
 	demandOption: true
-}), (args) => deleteFn(args)).command(["domains", "domain"], "Manage custom domains on the branch (beta)", (yargs) => yargs.demandCommand(1).command("list", "List custom domains on the branch", (yargs) => yargs, (args) => listDomains(args)).command("register <domain>", "Point a domain you already own at a function on the branch", (yargs) => yargs.positional("domain", {
+}), (args) => deleteFn(args)).command(["domains", "domain"], "Manage custom domains on the branch (beta)", (yargs) => yargs.command("list", "List custom domains on the branch", (yargs) => yargs, (args) => listDomains(args)).command("register <domain>", "Point a domain you already own at a function on the branch", (yargs) => yargs.positional("domain", {
 	describe: "Domain you already own (for example docs.example.com)",
 	type: "string",
 	demandOption: true

package/dist/commands/snapshots.js

@@ -146,7 +146,7 @@ const builder = (argv) => argv.usage("$0 snapshots <sub-command> [options]").opt
 		describe: "Full schedule as JSON, for multi-entry schedules, e.g. '[{\"frequency\":\"daily\",\"hour\":3,\"retention_seconds\":604800}]'. Overrides the single-entry flags.",
 		type: "string"
 	}
-}).example([["$0 snapshots schedule set --branch main --frequency daily --hour 3 --retention 604800", "A daily 03:00 snapshot kept for 7 days"], ["$0 snapshots schedule set --branch main --schedule '[{\"frequency\":\"weekly\",\"day\":1,\"hour\":2},{\"frequency\":\"daily\",\"hour\":3}]'", "A multi-entry schedule via JSON"]]), (args) => scheduleSet(args)).demandCommand(1, "Specify `get` or `set`."), () => {});
+}).example([["$0 snapshots schedule set --branch main --frequency daily --hour 3 --retention 604800", "A daily 03:00 snapshot kept for 7 days"], ["$0 snapshots schedule set --branch main --schedule '[{\"frequency\":\"weekly\",\"day\":1,\"hour\":2},{\"frequency\":\"daily\",\"hour\":3}]'", "A multi-entry schedule via JSON"]]), (args) => scheduleSet(args)), () => {});
 const handler = (args) => {
 	return args;
 };

package/dist/commands/vpc_endpoints.js

@@ -28,10 +28,9 @@ const builder = (argv) => {
 			},
 			"region-id": {
 				describe: `The region ID. Possible values: ${REGIONS.join(", ")}`,
-				type: "string",
-				demandOption: true
+				type: "string"
 			}
-		}).middleware(fillSingleOrg).command("list", "List configured VPC endpoints for this organization.", (yargs) => yargs, async (args) => {
+		}).middleware(fillSingleOrg).command("list", "List configured VPC endpoints for this organization.", (yargs) => yargs.demandOption("region-id"), async (args) => {
 			await listOrg(args);
 		}).command({
 			command: "assign <id>",
@@ -40,13 +39,13 @@ const builder = (argv) => {
 			builder: (yargs) => yargs.options({ label: {
 				describe: "An optional descriptive label for the VPC endpoint",
 				type: "string"
-			} }),
+			} }).demandOption("region-id"),
 			handler: async (args) => {
 				await assignOrg(args);
 			}
-		}).command("remove <id>", "Remove a VPC endpoint from this organization.", (yargs) => yargs, async (args) => {
+		}).command("remove <id>", "Remove a VPC endpoint from this organization.", (yargs) => yargs.demandOption("region-id"), async (args) => {
 			await removeOrg(args);
-		}).command("status <id>", "Get the status of a VPC endpoint for this organization.", (yargs) => yargs, async (args) => {
+		}).command("status <id>", "Get the status of a VPC endpoint for this organization.", (yargs) => yargs.demandOption("region-id"), async (args) => {
 			await statusOrg(args);
 		});
 	}).command("project", "Manage project-level VPC endpoint restrictions.\nBy default, connections are accepted from any VPC configured at the organization level.\nA project-level VPC endpoint restriction can be used to restrict connections to a specific VPC.", (yargs) => {

package/dist/help.js

@@ -232,19 +232,58 @@ const formatHelp = (help) => {
 	}
 	return [...result, ...lines];
 };
-const showHelp = async (argv) => {
-	const help = await argv.getHelp();
-	const text = `${formatHelp(help).join("\n")}\n`;
-	await new Promise((resolve, reject) => {
-		process.stdout.write(text, (err) => {
-			if (err) {
-				reject(err);
-				return;
-			}
-			resolve();
-		});
+const writeHelp = (help, stream) => new Promise((resolve, reject) => {
+	stream.write(`${formatHelp(help).join("\n")}\n`, (err) => {
+		if (err) {
+			reject(err);
+			return;
+		}
+		resolve();
 	});
+});
+const showHelp = async (argv) => {
+	await writeHelp(await argv.getHelp(), process.stdout);
 	process.exit(0);
 };
+/**
+* A yargs validation failure: a missing required option or positional, an unknown
+* subcommand, a value outside `choices`. Carries the failing command's help, captured
+* in `.fail` because yargs has restored the parent's context by the time the error
+* reaches the caller.
+*/
+var UsageError = class extends Error {
+	constructor(message, help) {
+		super(message);
+		this.help = help;
+	}
+};
+/** On stderr, so `-o json` stdout stays empty. */
+const showUsageErrorHelp = (err) => writeHelp(err.help, process.stderr);
+/**
+* The yargs `.fail` handler. yargs passes its usage instance as the third argument
+* (`@types/yargs` declares it as `Argv`). Errors thrown by a handler, a `coerce`, or the
+* parser arrive with their own `err` and are rethrown unchanged.
+*/
+const failOnUsageError = (msg, err, usage) => {
+	if (err) throw err;
+	if (typeof usage !== "object" || usage === null || !("help" in usage) || typeof usage.help !== "function") throw new Error("yargs no longer passes its usage instance to .fail(); update failOnUsageError for the installed yargs");
+	const help = usage.help();
+	if (typeof help !== "string") throw new Error("yargs usage.help() did not return a string");
+	throw new UsageError(msg ?? "Invalid usage", help);
+};
+function assertYargsInternals(argv) {
+	if (!("getInternalMethods" in argv) || typeof argv.getInternalMethods !== "function") throw new Error("yargs no longer exposes getInternalMethods(); update isBareParentCommand for the installed yargs");
+}
+/**
+* True when the command yargs is running groups subcommands and none was given, at any
+* depth: `neon config add`, `neon snapshots schedule`. `@types/yargs` doesn't declare the
+* running command's context, so this reads yargs 17's internals.
+*/
+const isBareParentCommand = (argv, positionals) => {
+	assertYargsInternals(argv);
+	const internals = argv.getInternalMethods();
+	const path = internals.getContext().commands;
+	return path.length > 0 && positionals.length === path.length && internals.getCommandInstance().getCommands().length > 0;
+};
 //#endregion
-export { showHelp };
+export { UsageError, failOnUsageError, isBareParentCommand, showHelp, showUsageErrorHelp };

package/dist/index.js

@@ -11,7 +11,7 @@ import { AuthRefreshError, defaultClientID } from "./auth.js";
 import { getCliName } from "./utils/cli_name.js";
 import { ensureAuth } from "./commands/auth.js";
 import { recoverFrom401 } from "./auth_recovery.js";
-import { showHelp } from "./help.js";
+import { UsageError, failOnUsageError, isBareParentCommand, showHelp, showUsageErrorHelp } from "./help.js";
 import { rewriteUnknownAgentArg } from "./init/plan.js";
 import commands_default from "./commands/index.js";
 import { recoverFromSSO } from "./sso_recovery.js";
@@ -125,13 +125,16 @@ builder = builder.scriptName(pkg_default.name).locale("en").usage("$0 <command>
 	type: "boolean",
 	default: false
 }).alias("help", "h").middleware(async (args) => {
-	if (args.help || args._.length === 1 && !NO_SUBCOMMANDS_VERBS.includes(args._[0])) await showHelp(builder);
-}).middleware(ensureAuth).middleware(enrichFromContext).middleware(analyticsMiddleware).command(commands_default).strictCommands().version(pkg_default.version).group("version", "Global options:").alias("version", "v").completion().scriptName(getCliName()).epilog("For more information, visit https://neon.com/docs/reference/neon-cli").wrap(null).fail(false);
+	if (args.help) await showHelp(builder);
+}, true).middleware(async (args) => {
+	if (args._.length === 1 && !NO_SUBCOMMANDS_VERBS.includes(args._[0]) || args._.length > 1 && isBareParentCommand(builder, args._)) await showHelp(builder);
+}).middleware(ensureAuth).middleware(enrichFromContext).middleware(analyticsMiddleware).command(commands_default).strictCommands().version(pkg_default.version).group("version", "Global options:").alias("version", "v").completion().scriptName(getCliName()).epilog("For more information, visit https://neon.com/docs/reference/neon-cli").wrap(null).fail(failOnUsageError);
 async function handleError(msg, err, canRetry) {
 	if (process.argv.some((arg) => arg === "--help" || arg === "-h")) {
 		await showHelp(builder);
 		process.exit(0);
 	}
+	if (err instanceof UsageError) await showUsageErrorHelp(err);
 	if (err instanceof Error && err.stack) log.debug("Stack: %s", err.stack);
 	if (err instanceof Error) {
 		const rewritten = rewriteUnknownAgentArg({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "neon",
-  "version": "7.0.0",
+  "version": "7.0.1",
   "description": "CLI tool for Neon, the cloud backend primitives built around Lakebase Postgres",
   "keywords": [
     "neon",
@@ -99,9 +99,9 @@
     "tsx": "4.22.3",
     "typescript": "^5.9.0",
     "vitest": "^3.0.9",
-    "@neon-internals/cli-core": "0.0.0",
     "@neon-internals/env-core": "0.0.26",
     "@neon/e2e-harness": "0.0.0",
+    "@neon-internals/cli-core": "0.0.0",
     "@neon/functions": "0.11.0"
   },
   "publishConfig": {