neon 7.0.5 → 7.0.6

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