neon 8.0.2 → 8.0.4

package/dist/commands/neon_auth.js

@@ -1,9 +1,10 @@
 import { t as __exportAll } from "../_chunks/rolldown-runtime-8H4AJuhK.js";
 import { codeFromBody, isNeonApiError, retryOnLock } from "../api.js";
+import { stripAnsi } from "../human_table.js";
 import { writer } from "../writer.js";
 import { noPassthrough, single } from "../utils/flags.js";
 import { NeonAuthEmailVerificationMethod, NeonAuthOauthProviderId, NeonAuthOauthProviderType, NeonAuthSupportedAuthProvider } from "../utils/api_enums.js";
-import { branchIdFromProps, fillSingleProject } from "../utils/enrichers.js";
+import { branchIdFromProps, fillSingleProject, resolveBranchFromProps } from "../utils/enrichers.js";
 import chalk from "chalk";
 //#region src/commands/neon_auth.ts
 var neon_auth_exports = /* @__PURE__ */ __exportAll({
@@ -12,13 +13,20 @@ var neon_auth_exports = /* @__PURE__ */ __exportAll({
 	describe: () => describe,
 	handler: () => handler
 });
+const writeStyled = (text, stream = process.stdout) => {
+	stream.write(process.env.NO_COLOR ? stripAnsi(text) : text);
+};
 const printKvBlock = (title, entries) => {
-	process.stdout.write(`\n${chalk.green(title)}\n`);
-	for (const [key, value] of entries) process.stdout.write(`  ${chalk.green(key)}  ${value ?? ""}\n`);
-	process.stdout.write("\n");
+	const labels = entries.map(([key]) => key.trimEnd());
+	const width = Math.max(0, ...labels.map((label) => label.length));
+	let text = `\n${chalk.green(title)}\n`;
+	entries.forEach(([, value], i) => {
+		text += `  ${chalk.green(labels[i].padEnd(width))}  ${value ?? ""}\n`;
+	});
+	writeStyled(`${text}\n`);
 };
 const printMessage = (message) => {
-	process.stdout.write(`\n${chalk.green(message)}\n\n`);
+	writeStyled(`\n${chalk.green(message)}\n\n`);
 };
 const INTEGRATION_RESPONSE_FIELDS = [
 	"auth_provider",
@@ -356,6 +364,15 @@ const handler = (args) => {
 const resolveBranch = async (props) => {
 	return props.branchId ?? await branchIdFromProps(props);
 };
+/** The branch name is only known when it was resolved from a listing, not from an id. */
+const resolveBranchWithName = async (props) => {
+	if (props.branchId) return { branchId: props.branchId };
+	const { branchId, branch } = await resolveBranchFromProps(props);
+	return {
+		branchId,
+		branchName: branch?.name
+	};
+};
 const enable = async (props) => {
 	const branchId = await resolveBranch(props);
 	let data;
@@ -378,19 +395,19 @@ const enable = async (props) => {
 	const d = data;
 	printKvBlock(alreadyEnabled ? "Neon Auth is already enabled" : "Neon Auth enabled", [
 		["Auth Provider:", data.auth_provider],
-		...d.db_name ? [["Database:     ", d.db_name]] : [],
-		["Base URL:     ", data.base_url],
-		...d.schema_name ? [["Schema Name:  ", d.schema_name]] : [],
-		...d.table_name ? [["Table Name:   ", d.table_name]] : [],
-		["JWKS URL:     ", data.jwks_url]
+		...d.db_name ? [["Database:", d.db_name]] : [],
+		["Base URL:", data.base_url],
+		...d.schema_name ? [["Schema Name:", d.schema_name]] : [],
+		...d.table_name ? [["Table Name:", d.table_name]] : [],
+		["JWKS URL:", data.jwks_url]
 	]);
 	if (data.base_url) {
-		process.stdout.write(`  ${chalk.green("Set this environment variable in your application:")}\n`);
-		process.stdout.write(`  NEON_AUTH_BASE_URL=${data.base_url}\n\n`);
+		writeStyled(`  ${chalk.green("Set this environment variable in your application:")}\n`);
+		writeStyled(`  NEON_AUTH_BASE_URL=${data.base_url}\n\n`);
 	}
 };
 const status = async (props) => {
-	const branchId = await resolveBranch(props);
+	const { branchId, branchName } = await resolveBranchWithName(props);
 	let data;
 	try {
 		({data} = await props.apiClient.getNeonAuth(props.projectId, branchId));
@@ -407,11 +424,11 @@ const status = async (props) => {
 	}
 	printKvBlock("Neon Auth status", [
 		["Auth Provider:", data.auth_provider],
-		["Branch ID:    ", data.branch_id],
-		["Database:     ", data.db_name],
-		["Base URL:     ", data.base_url],
-		["Created At:   ", data.created_at],
-		["JWKS URL:     ", data.jwks_url]
+		["Branch:", branchName ? `${branchName} (${data.branch_id})` : data.branch_id],
+		["Database:", data.db_name],
+		["Base URL:", data.base_url],
+		["Created At:", data.created_at],
+		["JWKS URL:", data.jwks_url]
 	]);
 };
 const disable = async (props) => {
@@ -428,10 +445,11 @@ const oauthProviderList = async (props) => {
 		return;
 	}
 	writer(props).end(data.providers, { fields: OAUTH_PROVIDER_FIELDS });
-	if (data.providers.some((p) => p.type === NeonAuthOauthProviderType.Shared) && props.output === "table") process.stdout.write(`\n${chalk.yellow("Caution:")} ${SHARED_PROVIDER_DISCLAIMER}\n\n`);
+	if (data.providers.some((p) => p.type === NeonAuthOauthProviderType.Shared) && props.output === "table") writeStyled(`\n${chalk.yellow("Caution:")} ${SHARED_PROVIDER_DISCLAIMER}\n\n`);
 };
 const oauthProviderAdd = async (props) => {
 	const branchId = await resolveBranch(props);
+	const baseUrlRequest = callbackBaseUrl(props, branchId, props.providerId);
 	let data;
 	try {
 		({data} = await props.apiClient.addBranchNeonAuthOauthProvider(props.projectId, branchId, {
@@ -445,14 +463,15 @@ const oauthProviderAdd = async (props) => {
 	}
 	if (props.output === "json" || props.output === "yaml") writer(props).end(data, { fields: OAUTH_PROVIDER_FIELDS });
 	else printKvBlock("OAuth provider added", [
-		["ID:         ", data.id],
-		["Type:       ", data.type],
-		...data.client_id ? [["Client ID:  ", data.client_id]] : []
+		["ID:", data.id],
+		["Type:", data.type],
+		...data.client_id ? [["Client ID:", data.client_id]] : []
 	]);
-	await printCallbackInstructions(props, branchId, props.providerId);
+	printCallbackInstructions(props.providerId, await baseUrlRequest);
 };
 const oauthProviderUpdate = async (props) => {
 	const branchId = await resolveBranch(props);
+	const baseUrlRequest = callbackBaseUrl(props, branchId, props.providerId);
 	let data;
 	try {
 		({data} = await props.apiClient.updateBranchNeonAuthOauthProvider(props.projectId, branchId, props.providerId, {
@@ -465,11 +484,11 @@ const oauthProviderUpdate = async (props) => {
 	}
 	if (props.output === "json" || props.output === "yaml") writer(props).end(data, { fields: OAUTH_PROVIDER_FIELDS });
 	else printKvBlock("OAuth provider updated", [
-		["ID:         ", data.id],
-		["Type:       ", data.type],
-		...data.client_id ? [["Client ID:  ", data.client_id]] : []
+		["ID:", data.id],
+		["Type:", data.type],
+		...data.client_id ? [["Client ID:", data.client_id]] : []
 	]);
-	await printCallbackInstructions(props, branchId, props.providerId);
+	printCallbackInstructions(props.providerId, await baseUrlRequest);
 };
 const CALLBACK_INSTRUCTIONS = {
 	github: {
@@ -485,20 +504,21 @@ const CALLBACK_INSTRUCTIONS = {
 		urlLabel: "callback/google"
 	}
 };
-const printCallbackInstructions = async (props, branchId, providerId) => {
+/**
+* Starts the base-URL read for the callback instructions, or resolves to undefined when none
+* apply. It runs alongside the provider write (adding a provider does not change the base URL)
+* and never rejects: a failed read prints no instructions, as before.
+*/
+const callbackBaseUrl = (props, branchId, providerId) => {
+	if (!CALLBACK_INSTRUCTIONS[providerId]) return Promise.resolve(void 0);
+	if (props.output === "json" || props.output === "yaml") return Promise.resolve(void 0);
+	return props.apiClient.getNeonAuth(props.projectId, branchId).then(({ data }) => data.base_url, () => void 0);
+};
+const printCallbackInstructions = (providerId, baseUrl) => {
 	const instructions = CALLBACK_INSTRUCTIONS[providerId];
-	if (!instructions) return;
-	if (props.output === "json" || props.output === "yaml") return;
-	let baseUrl;
-	try {
-		const { data } = await props.apiClient.getNeonAuth(props.projectId, branchId);
-		baseUrl = data.base_url;
-	} catch {
-		return;
-	}
-	if (!baseUrl) return;
+	if (!instructions || !baseUrl) return;
 	const callbackUrl = `${baseUrl.replace(/\/$/, "")}/${instructions.urlLabel}`;
-	printKvBlock(instructions.lead, [["URL:  ", callbackUrl]]);
+	printKvBlock(instructions.lead, [["URL:", callbackUrl]]);
 };
 const oauthProviderDelete = async (props) => {
 	const branchId = await resolveBranch(props);
@@ -563,13 +583,13 @@ const allowLocalhostDisable = async (props) => {
 	printMessage("Localhost connections restricted");
 };
 const printEmailPasswordEntries = (data) => [
-	["Enabled:                    ", String(data.enabled)],
-	["Verification Method:        ", data.email_verification_method],
-	["Require Verification:       ", String(data.require_email_verification)],
+	["Enabled:", String(data.enabled)],
+	["Verification Method:", data.email_verification_method],
+	["Require Verification:", String(data.require_email_verification)],
 	["Auto Sign In After Verify:  ", String(data.auto_sign_in_after_verification)],
 	["Send Email On Sign Up:      ", String(data.send_verification_email_on_sign_up)],
 	["Send Email On Sign In:      ", String(data.send_verification_email_on_sign_in)],
-	["Disable Sign Up:            ", String(data.disable_sign_up)]
+	["Disable Sign Up:", String(data.disable_sign_up)]
 ];
 const emailPasswordGet = async (props) => {
 	const branchId = await resolveBranch(props);
@@ -598,14 +618,14 @@ const emailPasswordUpdate = async (props) => {
 	printKvBlock("Email & password auth configuration updated", printEmailPasswordEntries(data));
 };
 const printEmailProviderEntries = (data) => [
-	["Type:          ", data.type],
+	["Type:", data.type],
 	...data.type === "standard" ? [
-		["Host:          ", data.host],
+		["Host:", data.host],
 		["Port:          ", data.port != null ? String(data.port) : void 0],
-		["Username:      ", data.username]
+		["Username:", data.username]
 	] : [],
-	["Sender Email:  ", data.sender_email],
-	["Sender Name:   ", data.sender_name]
+	["Sender Email:", data.sender_email],
+	["Sender Name:", data.sender_name]
 ];
 const emailProviderGet = async (props) => {
 	const branchId = await resolveBranch(props);
@@ -634,7 +654,7 @@ const emailProviderUpdate = async (props) => {
 	const { data } = await props.apiClient.updateNeonAuthEmailProvider(props.projectId, branchId, config);
 	if (props.output === "json" || props.output === "yaml") writer(props).end(data, { fields: EMAIL_PROVIDER_FIELDS });
 	else printKvBlock("Email provider configuration updated", printEmailProviderEntries(data));
-	if (warnSharedSender) process.stderr.write(`${chalk.yellow("Warning:")} --sender-email and --sender-name are ignored for the shared email provider. These values only take effect with --type standard.\n\n`);
+	if (warnSharedSender) writeStyled(`${chalk.yellow("Warning:")} --sender-email and --sender-name are ignored for the shared email provider. These values only take effect with --type standard.\n\n`, process.stderr);
 };
 const emailProviderTest = async (props) => {
 	const branchId = await resolveBranch(props);
@@ -655,9 +675,9 @@ const emailProviderTestFailureMessage = (recipientEmail, errorMessage) => {
 	return errorMessage ? `${header}\nUpstream error: ${errorMessage}` : header;
 };
 const printOrganizationEntries = (data) => [
-	["Enabled:          ", String(data.enabled)],
-	["Org Limit:        ", String(data.organization_limit)],
-	["Creator Role:     ", data.creator_role]
+	["Enabled:", String(data.enabled)],
+	["Org Limit:", String(data.organization_limit)],
+	["Creator Role:", data.creator_role]
 ];
 const organizationGet = async (props) => {
 	const branchId = await resolveBranch(props);
@@ -691,9 +711,9 @@ const organizationUpdate = async (props) => {
 	printKvBlock("Organization configuration updated", printOrganizationEntries(data));
 };
 const printWebhookEntries = (data) => [
-	["Enabled:        ", String(data.enabled)],
-	["URL:            ", data.webhook_url ?? ""],
-	["Events:         ", (data.enabled_events ?? []).join(", ")],
+	["Enabled:", String(data.enabled)],
+	["URL:", data.webhook_url ?? ""],
+	["Events:", (data.enabled_events ?? []).join(", ")],
 	["Timeout (sec):  ", data.timeout_seconds != null ? String(data.timeout_seconds) : ""]
 ];
 const webhookGet = async (props) => {
@@ -746,7 +766,7 @@ const pluginsList = async (props) => {
 		}
 		return JSON.stringify(value);
 	};
-	const entries = Object.entries(data).map(([key, value]) => [key.padEnd(24), summarize(value)]);
+	const entries = Object.entries(data).map(([key, value]) => [key, summarize(value)]);
 	printKvBlock("Neon Auth plugins", entries);
 };
 const pluginsGet = async (props) => {
@@ -763,12 +783,12 @@ const pluginsGet = async (props) => {
 		return;
 	}
 	if (typeof plugin === "object" && !Array.isArray(plugin) && plugin != null) {
-		const entries = Object.entries(plugin).map(([k, v]) => [`${k}:`.padEnd(18), formatValue(v)]);
+		const entries = Object.entries(plugin).map(([k, v]) => [`${k}:`, formatValue(v)]);
 		printKvBlock(pluginTitle(props.pluginName), entries);
 	} else if (Array.isArray(plugin)) {
-		const entries = plugin.map((item, i) => [`[${i}]:`.padEnd(18), typeof item === "object" ? JSON.stringify(item) : String(item)]);
+		const entries = plugin.map((item, i) => [`[${i}]:`, typeof item === "object" ? JSON.stringify(item) : String(item)]);
 		printKvBlock(pluginTitle(props.pluginName), entries);
-	} else printKvBlock(pluginTitle(props.pluginName), [["Value:".padEnd(18), String(plugin)]]);
+	} else printKvBlock(pluginTitle(props.pluginName), [["Value:", String(plugin)]]);
 };
 const userCreate = async (props) => {
 	const branchId = await resolveBranch(props);
@@ -779,9 +799,9 @@ const userCreate = async (props) => {
 	const { data } = await props.apiClient.createBranchNeonAuthNewUser(props.projectId, branchId, requestBody);
 	const displayName = requestBody.name !== props.email ? requestBody.name : void 0;
 	printKvBlock("User created", [
-		["ID:    ", data.id],
-		["Email: ", requestBody.email],
-		...displayName ? [["Name:  ", displayName]] : []
+		["ID:", data.id],
+		["Email:", requestBody.email],
+		...displayName ? [["Name:", displayName]] : []
 	]);
 };
 const userDelete = async (props) => {
@@ -792,7 +812,7 @@ const userDelete = async (props) => {
 const userSetRole = async (props) => {
 	const branchId = await resolveBranch(props);
 	const { data } = await props.apiClient.updateNeonAuthUserRole(props.projectId, branchId, props.userId, { roles: props.roles });
-	printKvBlock("Roles updated", [["User ID: ", data.id], ["Roles:   ", props.roles.join(", ")]]);
+	printKvBlock("Roles updated", [["User ID:", data.id], ["Roles:", props.roles.join(", ")]]);
 };
 //#endregion
 export { builder, command, describe, handler, neon_auth_exports as t };

package/dist/commands/orgs.js

@@ -1,14 +1,21 @@
 import { t as __exportAll } from "../_chunks/rolldown-runtime-8H4AJuhK.js";
+import { readContextFile } from "../context.js";
 import { writer } from "../writer.js";
+import chalk from "chalk";
 //#region src/commands/orgs.ts
 var orgs_exports = /* @__PURE__ */ __exportAll({
 	aliases: () => aliases,
 	builder: () => builder,
 	command: () => command,
 	describe: () => describe,
-	handler: () => handler
+	handler: () => handler,
+	planName: () => planName
 });
-const ORG_FIELDS = ["id", "name"];
+const ORG_FIELDS = [
+	"id",
+	"name",
+	"plan"
+];
 const command = "orgs";
 const describe = "Manage organizations";
 const aliases = ["org"];
@@ -23,12 +30,23 @@ const handler = (args) => {
 const list = async (props) => {
 	const out = writer(props);
 	const { data: { organizations } } = await props.apiClient.getCurrentUserOrganizations();
+	const current = readContextFile(props.contextFile).orgId;
 	out.write(organizations, {
 		fields: ORG_FIELDS,
 		title: "Organizations",
-		emptyMessage: "You are not a member of any organization."
+		emptyMessage: "You are not a member of any organization.",
+		renderColumns: {
+			plan: (org) => planName(org.plan),
+			name: (org) => org.id === current ? `${chalk.green("[current]")} ${org.name}` : org.name
+		}
 	});
 	out.end();
 };
+const ACRONYMS = {
+	aws: "AWS",
+	pg: "PG"
+};
+/** `free_v3` -> `Free`, `aws_marketplace` -> `AWS Marketplace`; JSON/YAML keep the API id. */
+const planName = (plan) => (plan ?? "").replace(/_v\d+$/, "").split("_").filter(Boolean).map((word) => ACRONYMS[word] ?? word[0].toUpperCase() + word.slice(1)).join(" ");
 //#endregion
-export { aliases, builder, command, describe, handler, orgs_exports as t };
+export { aliases, builder, command, describe, handler, planName, orgs_exports as t };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "neon",
-  "version": "8.0.2",
+  "version": "8.0.4",
   "description": "CLI tool for Neon, the cloud backend primitives built around Lakebase Postgres",
   "keywords": [
     "neon",
@@ -64,9 +64,9 @@
     "yaml": "^2.9.0",
     "yargs": "17.7.2",
     "yoctocolors": "^2.1.2",
+    "@neon/config": "1.8.3",
     "@neon/config-runtime": "1.7.3",
-    "@neon/sdk": "7.0.0",
-    "@neon/config": "1.8.3"
+    "@neon/sdk": "7.0.0"
   },
   "optionalDependencies": {
     "@napi-rs/keyring": "1.3.0",