neon 7.0.5 → 7.0.7

package/dist/api.js

@@ -208,7 +208,8 @@ function validateRequestTimeout(ms) {
 }
 const makeTimedFetch = (requestTimeoutMs) => async (input, init) => {
 	const timeout = AbortSignal.timeout(requestTimeoutMs);
-	const signal = init?.signal ? AbortSignal.any([init.signal, timeout]) : timeout;
+	const callerSignal = init?.signal ?? (input instanceof Request ? input.signal : void 0);
+	const signal = callerSignal ? AbortSignal.any([callerSignal, timeout]) : timeout;
 	const method = init?.method ?? (input instanceof Request ? input.method : "GET");
 	const url = input instanceof Request ? input.url : String(input);
 	log.debug("%s %s", method.toUpperCase(), url);
@@ -220,7 +221,7 @@ const makeTimedFetch = (requestTimeoutMs) => async (input, init) => {
 		log.debug("%d %s", response.status, response.statusText);
 		return response;
 	} catch (err) {
-		if (timeout.aborted && !init?.signal?.aborted) throw new RequestTimeoutError(requestTimeoutMs, err);
+		if (timeout.aborted && !callerSignal?.aborted) throw new RequestTimeoutError(requestTimeoutMs, err);
 		throw err;
 	}
 };
@@ -365,8 +366,9 @@ const getApiClient = ({ apiKey, apiHost, requestTimeoutMs = REQUEST_TIMEOUT_MS }
 			client,
 			query
 		})),
-		listSharedProjects: (query = {}) => call(() => raw.listSharedProjects({
+		listSharedProjects: (query = {}, options = {}) => call(() => raw.listSharedProjects({
 			client,
+			signal: options.signal,
 			query: {
 				...query.cursor !== void 0 ? { cursor: query.cursor } : {},
 				...query.limit !== void 0 ? { limit: query.limit } : {},

package/dist/commands/api.js

@@ -1,14 +1,17 @@
 import { t as __exportAll } from "../_chunks/rolldown-runtime-8H4AJuhK.js";
+import { codeFromBody, isNeonApiError } from "../api.js";
 import { writer } from "../writer.js";
 import { describeOperation, getEndpoints, loadSpec } from "../utils/openapi.js";
 import { readFileSync } from "node:fs";
 import { resolve } from "node:path";
+import chalk from "chalk";
 import YAML from "yaml";
 //#region src/commands/api.ts
 var api_exports = /* @__PURE__ */ __exportAll({
 	buildBody: () => buildBody,
 	buildQuery: () => buildQuery,
 	builder: () => builder,
+	colorizeJson: () => colorizeJson,
 	command: () => command,
 	describe: () => describe,
 	handler: () => handler,
@@ -101,6 +104,23 @@ function parseHeaders(pairs) {
 function assertMethod(method) {
 	if (!HTTP_METHODS.includes(method)) throw new Error(`Unsupported method "${method}". Use one of: ${HTTP_METHODS.join(", ")}.`);
 }
+const JSON_TOKEN = /("(?:\\.|[^"\\])*")(\s*:)?|\b(true|false)\b|\bnull\b|-?\d+(?:\.\d+)?(?:[eE][+-]?\d+)?/g;
+/** Color the tokens of serialized JSON without changing a byte of the text itself. */
+function colorizeJson(json) {
+	return json.replace(JSON_TOKEN, (token, string, colon, bool) => {
+		if (string !== void 0) return colon !== void 0 ? `${chalk.cyan(string)}${colon}` : chalk.green(string);
+		if (bool !== void 0) return chalk.magenta(token);
+		if (token === "null") return chalk.dim(token);
+		return chalk.yellow(token);
+	});
+}
+const METHOD_COLORS = {
+	GET: chalk.green,
+	POST: chalk.cyan,
+	PUT: chalk.yellow,
+	PATCH: chalk.yellow,
+	DELETE: chalk.red
+};
 async function readStdin() {
 	const chunks = [];
 	for await (const chunk of process.stdin) chunks.push(Buffer.from(chunk));
@@ -138,7 +158,8 @@ async function listEndpoints(args) {
 			"summary"
 		],
 		title: `Neon API endpoints (${endpoints.length})`,
-		emptyMessage: "No endpoints found in the spec."
+		emptyMessage: "No endpoints found in the spec.",
+		renderColumns: { method: (endpoint) => useColor(args) ? (METHOD_COLORS[endpoint.method] ?? String)(endpoint.method) : endpoint.method }
 	});
 }
 function isListing(args) {
@@ -242,16 +263,45 @@ async function runRequest(args) {
 		...hasBody ? { body } : {},
 		...Object.keys(headers).length > 0 ? { headers } : {}
 	};
-	const response = await args.apiClient.request(params);
-	const out = process.stdout;
+	let response;
+	try {
+		response = await args.apiClient.request(params);
+	} catch (err) {
+		if (args.include && isNeonApiError(err) && err.status !== void 0 && err.status !== 401 && !isSsoCode(codeFromBody(err.data))) await writeResponse(args, {
+			status: err.status,
+			statusText: err.statusText ?? "",
+			headers: err.headers ?? {},
+			data: err.data
+		});
+		throw err;
+	}
+	await writeResponse(args, response);
+}
+const isSsoCode = (code) => code === "SSO_AUTHORIZATION_REQUIRED" || code === "SSO_ORG_CREDS_ONLY";
+/** Pipes stay plain regardless of FORCE_COLOR, so `neon api … | jq` never sees escapes. */
+const useColor = (args) => process.stdout.isTTY === true && args.color !== false && !process.env.NO_COLOR && chalk.level > 0;
+/** Resolves once stdout has taken the text, so a following `process.exit` can't cut it off. */
+async function writeResponse(args, response) {
+	const color = useColor(args);
+	let text = "";
 	if (args.include) {
-		out.write(`HTTP ${response.status} ${response.statusText}\n`);
-		for (const [key, value] of Object.entries(response.headers)) out.write(`${key}: ${value}\n`);
-		out.write("\n");
+		const status = `HTTP ${response.status} ${response.statusText}`;
+		const statusColor = response.status < 400 ? chalk.green : chalk.red;
+		text += `${color ? statusColor.bold(status) : status}\n`;
+		for (const [key, value] of Object.entries(response.headers)) text += `${color ? chalk.cyan(key) : key}: ${value}\n`;
+		text += "\n";
 	}
-	if (response.data === void 0) return;
-	if (args.output === "yaml") out.write(YAML.stringify(response.data));
-	else out.write(`${JSON.stringify(response.data, null, 2)}\n`);
+	if (response.data !== void 0) {
+		if (args.output === "yaml") text += YAML.stringify(response.data);
+		else {
+			const json = JSON.stringify(response.data, null, 2);
+			text += `${color ? colorizeJson(json) : json}\n`;
+		}
+	}
+	if (text === "") return;
+	await new Promise((resolve, reject) => {
+		process.stdout.write(text, (err) => err ? reject(err) : resolve());
+	});
 }
 const command = "api [path]";
 const describe = "Call any Neon API route directly (authenticated passthrough)";
@@ -335,4 +385,4 @@ const handler = async (args) => {
 	await runRequest(apiArgs);
 };
 //#endregion
-export { buildBody, buildQuery, builder, command, describe, handler, parseHeaders, parseKeyValue, parseTypedValue, setDeep, api_exports as t };
+export { buildBody, buildQuery, builder, colorizeJson, command, describe, handler, parseHeaders, parseKeyValue, parseTypedValue, setDeep, api_exports as t };

package/dist/commands/projects.js

@@ -2,12 +2,13 @@ import { t as __exportAll } from "../_chunks/rolldown-runtime-8H4AJuhK.js";
 import { isCi } from "../env.js";
 import { log } from "../log.js";
 import { isNeonApiError, messageFromBody } from "../api.js";
-import { updateContextFile } from "../context.js";
+import { readContextFile, updateContextFile } from "../context.js";
 import { getCliName } from "../utils/cli_name.js";
 import { projectCreateRequest, projectUpdateRequest } from "../parameters.gen.js";
 import { writer } from "../writer.js";
 import { getComputeUnits } from "../utils/compute_units.js";
 import { psql } from "../utils/psql.js";
+import chalk from "chalk";
 import prompts from "prompts";
 //#region src/commands/projects.ts
 var projects_exports = /* @__PURE__ */ __exportAll({
@@ -18,6 +19,7 @@ var projects_exports = /* @__PURE__ */ __exportAll({
 	builder: () => builder,
 	command: () => command,
 	describe: () => describe,
+	formatDuration: () => formatDuration,
 	handler: () => handler
 });
 const PROJECT_FIELDS = [
@@ -176,37 +178,56 @@ const builder = (argv) => {
 const handler = (args) => {
 	return args;
 };
+const listAll = async (fetchPage) => {
+	const result = [];
+	let cursor;
+	let end = false;
+	while (!end) {
+		const { data } = await fetchPage(cursor);
+		result.push(...data.projects);
+		cursor = data.pagination?.cursor;
+		log.debug("Got %d projects, with cursor: %s", data.projects.length, cursor);
+		if (data.projects.length < PROJECTS_LIST_LIMIT) end = true;
+	}
+	return result;
+};
+const projectColumns = (props) => {
+	const current = readContextFile(props.contextFile).projectId;
+	return { name: (project) => project.id === current ? `${chalk.green("[current]")} ${project.name}` : project.name };
+};
 const list = async (props) => {
-	const getList = async (fn) => {
-		const result = [];
-		let cursor;
-		let end = false;
-		while (!end) {
-			const { data } = await fn({
-				limit: PROJECTS_LIST_LIMIT,
-				org_id: props.orgId,
-				recoverable: props.recoverableOnly,
-				cursor
-			});
-			result.push(...data.projects);
-			cursor = data.pagination?.cursor;
-			log.debug("Got %d projects, with cursor: %s", data.projects.length, cursor);
-			if (data.projects.length < PROJECTS_LIST_LIMIT) end = true;
-		}
-		return result;
-	};
-	const ownedProjects = await getList(props.apiClient.listProjects);
-	const sharedProjects = props.orgId || props.recoverableOnly ? [] : await getList(props.apiClient.listSharedProjects);
+	const query = (cursor) => ({
+		limit: PROJECTS_LIST_LIMIT,
+		org_id: props.orgId,
+		recoverable: props.recoverableOnly,
+		cursor
+	});
+	const includeShared = !props.orgId && !props.recoverableOnly;
+	const ownedRequest = listAll((cursor) => props.apiClient.listProjects(query(cursor)));
+	const sharedAbort = new AbortController();
+	const sharedRequest = includeShared ? listAll((cursor) => props.apiClient.listSharedProjects(query(cursor), { signal: sharedAbort.signal })) : void 0;
+	sharedRequest?.catch(() => void 0);
+	let ownedProjects;
+	try {
+		ownedProjects = await ownedRequest;
+	} catch (err) {
+		sharedAbort.abort();
+		throw err;
+	}
+	const sharedProjects = await sharedRequest ?? [];
 	const out = writer(props);
+	const renderColumns = projectColumns(props);
 	out.write(ownedProjects, {
 		fields: props.recoverableOnly ? RECOVERABLE_PROJECT_FIELDS : PROJECT_FIELDS,
 		title: "Projects",
-		emptyMessage: props.recoverableOnly ? "You don't have any recoverable projects." : "You don't have any projects yet. See how to create a new project:\n> neon projects create --help"
+		emptyMessage: props.recoverableOnly ? "You don't have any recoverable projects." : "You don't have any projects yet. See how to create a new project:\n> neon projects create --help",
+		renderColumns
 	});
-	if (!props.orgId && !props.recoverableOnly) out.write(sharedProjects, {
+	if (includeShared) out.write(sharedProjects, {
 		fields: PROJECT_FIELDS,
 		title: "Shared with you",
-		emptyMessage: "No projects have been shared with you"
+		emptyMessage: "No projects have been shared with you",
+		renderColumns
 	});
 	out.end();
 };
@@ -303,7 +324,55 @@ const recover = async (props) => {
 };
 const get = async (props) => {
 	const { data } = await props.apiClient.getProject(props.id);
-	writer(props).end(data.project, { fields: PROJECT_FIELDS });
+	if (props.output === "json" || props.output === "yaml") {
+		writer(props).end(data.project, { fields: PROJECT_FIELDS });
+		return;
+	}
+	writer(props).end(projectDetails(data.project), {
+		fields: PROJECT_DETAIL_FIELDS,
+		humanTitle: "Project"
+	});
+};
+const PROJECT_DETAIL_FIELDS = [
+	"name",
+	"id",
+	"region_id",
+	"postgres_version",
+	"organization",
+	"default_compute",
+	"history_retention",
+	"created_at",
+	"updated_at"
+];
+/** Table-only view of a project; the field names become the row labels. */
+const projectDetails = (project) => ({
+	name: project.name,
+	id: project.id,
+	region_id: project.region_id,
+	postgres_version: project.pg_version,
+	organization: project.org_id,
+	default_compute: formatComputeRange(project.default_endpoint_settings),
+	history_retention: project.history_retention_seconds === void 0 ? void 0 : formatDuration(project.history_retention_seconds),
+	created_at: project.created_at,
+	updated_at: project.updated_at
+});
+const formatComputeRange = (settings) => {
+	const min = settings?.autoscaling_limit_min_cu;
+	const max = settings?.autoscaling_limit_max_cu;
+	if (min === void 0 || max === void 0) return;
+	return min === max ? `${min} CU` : `${min}-${max} CU`;
+};
+const DURATION_UNITS = [
+	["day", 86400],
+	["hour", 3600],
+	["minute", 60]
+];
+const formatDuration = (seconds) => {
+	for (const [unit, size] of DURATION_UNITS) if (seconds > 0 && seconds % size === 0) {
+		const count = seconds / size;
+		return `${count} ${unit}${count === 1 ? "" : "s"}`;
+	}
+	return `${seconds} second${seconds === 1 ? "" : "s"}`;
 };
 const handleMissingOrgId = async (args, cmd) => {
 	try {
@@ -367,4 +436,4 @@ const onPromptState = (state) => {
 	}
 };
 //#endregion
-export { PROJECT_FIELDS, RECOVERABLE_PROJECT_FIELDS, REGIONS, aliases, builder, command, describe, handler, projects_exports as t };
+export { PROJECT_FIELDS, RECOVERABLE_PROJECT_FIELDS, REGIONS, aliases, builder, command, describe, formatDuration, handler, projects_exports as t };

package/dist/index.js

@@ -179,6 +179,7 @@ async function handleError(msg, err, canRetry) {
 		} else {
 			const serverMessage = messageFromBody(err.data);
 			if (serverMessage) log.error(serverMessage);
+			else log.error([`HTTP ${err.status ?? ""} ${err.statusText ?? ""}`.trim(), err.requestPath].filter(Boolean).join(" | "));
 			log.debug("status: %d %s | path: %s", err.status, err.statusText, err.requestPath);
 			sendError(err, "API_ERROR");
 			return false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "neon",
-  "version": "7.0.5",
+  "version": "7.0.7",
   "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/sdk": "7.0.0",
+    "@neon/config-runtime": "1.7.3",
     "@neon/config": "1.8.3",
-    "@neon/config-runtime": "1.7.3"
+    "@neon/sdk": "7.0.0"
   },
   "optionalDependencies": {
     "@napi-rs/keyring": "1.3.0",