neon 4.2.0 → 4.2.1

package/dist/commands/branches.js

@@ -24,8 +24,8 @@ const BRANCH_FIELDS = [
 	"name",
 	"id",
 	"current_state",
-	"created_at",
-	"expires_at"
+	"expires_at",
+	"created_at"
 ];
 const BRANCH_FIELDS_RESET = [
 	"name",

package/dist/commands/projects.js

@@ -12,6 +12,7 @@ import prompts from "prompts";
 //#region src/commands/projects.ts
 var projects_exports = /* @__PURE__ */ __exportAll({
 	PROJECT_FIELDS: () => PROJECT_FIELDS,
+	RECOVERABLE_PROJECT_FIELDS: () => RECOVERABLE_PROJECT_FIELDS,
 	REGIONS: () => REGIONS,
 	aliases: () => aliases,
 	builder: () => builder,
@@ -25,6 +26,14 @@ const PROJECT_FIELDS = [
 	"region_id",
 	"created_at"
 ];
+const RECOVERABLE_PROJECT_FIELDS = [
+	"id",
+	"name",
+	"recoverable_until",
+	"deleted_at",
+	"region_id",
+	"created_at"
+];
 const REGIONS = [
 	"aws-us-west-2",
 	"aws-ap-southeast-1",
@@ -185,11 +194,7 @@ const list = async (props) => {
 	const sharedProjects = props.orgId || props.recoverableOnly ? [] : await getList(props.apiClient.listSharedProjects);
 	const out = writer(props);
 	out.write(ownedProjects, {
-		fields: props.recoverableOnly ? [
-			...PROJECT_FIELDS,
-			"deleted_at",
-			"recoverable_until"
-		] : PROJECT_FIELDS,
+		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"
 	});
@@ -351,4 +356,4 @@ const onPromptState = (state) => {
 	}
 };
 //#endregion
-export { PROJECT_FIELDS, REGIONS, aliases, builder, command, describe, handler, projects_exports as t };
+export { PROJECT_FIELDS, RECOVERABLE_PROJECT_FIELDS, REGIONS, aliases, builder, command, describe, handler, projects_exports as t };

package/dist/commands/snapshots.js

@@ -18,8 +18,8 @@ const SNAPSHOT_FIELDS = [
 	"id",
 	"name",
 	"source_branch_id",
-	"created_at",
-	"expires_at"
+	"expires_at",
+	"created_at"
 ];
 const SCHEDULE_FIELDS = [
 	"frequency",

package/dist/human_table.js

@@ -32,6 +32,12 @@ function displayWidth(s) {
 	}
 	return width;
 }
+function presentFields(data, fields) {
+	return fields.filter((field) => data.some((item) => {
+		const value = fieldValue(item, field);
+		return value !== void 0 && value !== "";
+	}));
+}
 function formatHumanChunk(chunk) {
 	const arrayData = Array.isArray(chunk.data) ? chunk.data : [chunk.data];
 	const isList = Array.isArray(chunk.data);
@@ -42,48 +48,28 @@ function formatHumanChunk(chunk) {
 		out += formatTitle(chunk.title, chunk.colorTitle) + "\n";
 	}
 	if (!arrayData.length) return out;
-	const fields = chunk.fields.filter((field) => arrayData.some((item) => {
-		const value = fieldValue(item, field);
-		return value !== void 0 && value !== "";
-	}));
+	if (isList) {
+		const fields = presentFields(arrayData, chunk.fields);
+		if (fields.length) {
+			const headers = fields.map(titleCaseField);
+			const rows = arrayData.map((item) => fields.map((field) => cellText(item, field, chunk.renderColumns)));
+			out += formatColumns(headers, rows, naturalWidths(headers, rows)) + "\n";
+		}
+		return out;
+	}
+	const fields = presentFields(arrayData, chunk.fields);
 	if (!fields.length) return out;
-	const headers = fields.map(titleCaseField);
-	const rows = arrayData.map((item) => fields.map((field) => cellText(item, field, chunk.renderColumns)));
-	const body = isList ? formatList(headers, rows, chunk.width) : formatStacked(headers, rows, chunk.width);
+	const body = formatStacked(fields.map(titleCaseField), arrayData.map((item) => fields.map((field) => cellText(item, field, chunk.renderColumns))), chunk.width);
 	if (body) out += body + "\n";
 	return out;
 }
 function formatTitle(title, colorTitle) {
 	return colorTitle ? chalk.bold(title) : title;
 }
-function formatList(headers, rows, width) {
-	if (headers.length === 1) return formatOneColumn(headers[0] ?? "", rows.map((row) => row[0] ?? ""));
-	if (width === void 0) return formatColumns(headers, rows, naturalWidths(headers, rows));
-	for (let n = headers.length; n >= 2; n--) {
-		const subsetHeaders = headers.slice(0, n);
-		const subsetRows = rows.map((row) => row.slice(0, n));
-		const natural = naturalWidths(subsetHeaders, subsetRows);
-		if (rowWidth(natural) <= width) return formatColumns(subsetHeaders, subsetRows, natural);
-		const fitted = tryFit(subsetHeaders, subsetRows, width);
-		if (fitted === void 0) continue;
-		if (!natural.slice(0, n - 1).every((col, i) => fitted[i] === col)) continue;
-		return formatColumns(subsetHeaders.map((cell, i) => truncateTo(cell, fitted[i] ?? 0)), subsetRows.map((row) => row.map((cell, i) => truncateTo(cell, fitted[i] ?? 0))), fitted);
-	}
-	return formatStacked(headers, rows, width);
-}
-function rowWidth(widths) {
-	if (widths.length === 0) return 0;
-	return widths.reduce((sum, col) => sum + col, 0) + (widths.length - 1) * GUTTER;
-}
-function formatOneColumn(header, values) {
-	const lines = [chalk.green(header)];
-	for (const value of values) lines.push(value);
-	return lines.join("\n");
-}
 function formatColumns(headers, rows, widths) {
 	const joinRow = (cells) => cells.map((cell, i) => {
 		const width = widths[i] ?? 0;
-		return i === cells.length - 1 ? truncateTo(cell, width) : padEndWidth(cell, width);
+		return i === cells.length - 1 ? cell : padEndWidth(cell, width);
 	}).join(" ".repeat(GUTTER)).trimEnd();
 	const lines = [chalk.green(joinRow(headers))];
 	for (const row of rows) lines.push(joinRow(row));
@@ -101,25 +87,6 @@ function formatStacked(headers, rows, width) {
 function stackedLine(header, value, labelWidth) {
 	return `${padEndWidth(header, labelWidth)}${" ".repeat(GUTTER)}${value}`;
 }
-function tryFit(headers, rows, width) {
-	const n = headers.length;
-	if (n === 0) return [];
-	const gutters = (n - 1) * GUTTER;
-	if (width <= gutters) return;
-	const budget = width - gutters;
-	if (budget < n * MIN_COL) return;
-	const widths = naturalWidths(headers, rows);
-	let overflow = widths.reduce((sum, col) => sum + col, 0) - budget;
-	if (overflow <= 0) return widths;
-	for (let i = n - 1; i >= 0 && overflow > 0; i--) {
-		const current = widths[i] ?? 0;
-		const take = Math.min(Math.max(current - MIN_COL, 0), overflow);
-		widths[i] = current - take;
-		overflow -= take;
-	}
-	if (overflow > 0) return;
-	return widths;
-}
 function naturalWidths(headers, rows) {
 	return headers.map((header, i) => Math.max(displayWidth(header), ...rows.map((row) => displayWidth(row[i] ?? ""))));
 }

package/package.json

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