neon 7.0.3 → 7.0.5

package/dist/commands/branches.js

@@ -6,11 +6,12 @@ import { branchCreateRequest } from "../parameters.gen.js";
 import { writer } from "../writer.js";
 import { EndpointType } from "../utils/api_enums.js";
 import { looksLikeBranchId, looksLikeLSN, looksLikeTimestamp } from "../utils/formats.js";
-import { branchIdFromProps, branchIdResolve, fillSingleProject } from "../utils/enrichers.js";
+import { branchIdFromProps, fillSingleProject, resolveBranchFromProps } from "../utils/enrichers.js";
 import { getComputeUnits } from "../utils/compute_units.js";
 import { psql } from "../utils/psql.js";
 import { parsePointInTime } from "../utils/point_in_time.js";
 import { parseSchemaDiffParams, schemaDiff } from "./schema_diff.js";
+import chalk from "chalk";
 //#region src/commands/branches.ts
 var branches_exports = /* @__PURE__ */ __exportAll({
 	BRANCH_FIELDS: () => BRANCH_FIELDS,
@@ -27,14 +28,64 @@ const BRANCH_FIELDS = [
 	"expires_at",
 	"created_at"
 ];
-const BRANCH_FIELDS_RESET = [
+const BRANCH_FIELDS_RESET = [...BRANCH_FIELDS, "last_reset_at"];
+const BRANCH_DETAIL_FIELDS = [
 	"name",
 	"id",
-	"default",
+	"parent_id",
 	"current_state",
+	"expires_at",
 	"created_at",
-	"last_reset_at"
+	"created_by",
+	"last_reset_at",
+	"logical_size"
 ];
+/**
+* The branch `.neon` pins, by name (preferred) or id, when `.neon` links this same project;
+* a `--project-id` pointing elsewhere makes its branch not current.
+*/
+const currentBranchOf = (props) => {
+	const context = readContextFile(props.contextFile);
+	return context.projectId === props.projectId ? contextBranch(context) : void 0;
+};
+const branchNameCell = (br, labels) => {
+	const tags = [];
+	if (br.default) tags.push(chalk.cyan("[default]"));
+	if (br.protected) tags.push(chalk.yellow("[protected]"));
+	if (labels.annotations?.[br.id]?.value.anonymized) tags.push(chalk.dim("[anon]"));
+	if (labels.current !== void 0 && (br.id === labels.current || br.name === labels.current)) tags.push(chalk.green("[current]"));
+	tags.push(br.name);
+	return tags.join(" ");
+};
+const stateCell = (state) => {
+	if (!state) return "";
+	if (state === "ready") return chalk.green(state);
+	if (state === "init" || state === "resetting") return chalk.yellow(state);
+	return chalk.dim(state);
+};
+const formatBytes = (bytes) => {
+	const units = [
+		"bytes",
+		"KiB",
+		"MiB",
+		"GiB",
+		"TiB"
+	];
+	let value = bytes;
+	let unit = 0;
+	while (value >= 1024 && unit < units.length - 1) {
+		value /= 1024;
+		unit++;
+	}
+	return unit === 0 ? `${bytes} bytes` : `${value.toFixed(1)} ${units[unit]}`;
+};
+const branchColumns = (labels) => ({
+	name: (br) => branchNameCell(br, labels),
+	current_state: (br) => stateCell(br.current_state),
+	expires_at: (br) => br.expires_at || "never",
+	created_by: (br) => br.created_by?.name ?? "",
+	logical_size: (br) => br.logical_size === void 0 ? "" : formatBytes(br.logical_size)
+});
 const command = "branches";
 const describe = "Manage branches";
 const aliases = ["branch"];
@@ -171,22 +222,12 @@ const handler = (args) => {
 };
 const list = async (props) => {
 	const { data: { branches, annotations } } = await props.apiClient.listProjectBranches({ projectId: props.projectId });
-	const currentBranch = contextBranch(readContextFile(props.contextFile));
 	writer(props).end(branches, {
 		fields: BRANCH_FIELDS,
-		renderColumns: {
-			expires_at: (br) => br.expires_at || "never",
-			name: (br) => {
-				const isAnon = annotations[br.id]?.value.anonymized;
-				const labels = [];
-				if (br.default) labels.push("[default]");
-				if (br.protected) labels.push("[protected]");
-				if (isAnon) labels.push("[anon]");
-				if (currentBranch !== void 0 && (br.id === currentBranch || br.name === currentBranch)) labels.push("[current]");
-				labels.push(br.name);
-				return labels.join(" ");
-			}
-		}
+		renderColumns: branchColumns({
+			annotations,
+			current: currentBranchOf(props)
+		})
 	});
 };
 const create = async (props) => {
@@ -237,16 +278,20 @@ const create = async (props) => {
 		out.write(data.branch, {
 			fields: BRANCH_FIELDS,
 			title: "branch",
-			emptyMessage: "No branches have been found."
+			humanTitle: "Branch",
+			emptyMessage: "No branches have been found.",
+			renderColumns: branchColumns({ current: currentBranchOf(props) })
 		});
 		if (writeEndpoints) out.write(endpoints, {
 			fields: ["id", "created_at"],
 			title: "endpoints",
+			humanTitle: "Compute",
 			emptyMessage: "No endpoints have been found."
 		});
 		if (writeUris) out.write(connectionUris, {
 			fields: ["connection_uri"],
 			title: "connection_uris",
+			humanTitle: "Connection string",
 			emptyMessage: "No connection uris have been found"
 		});
 	}
@@ -259,24 +304,54 @@ const create = async (props) => {
 	}
 };
 const rename = async (props) => {
-	const branchId = await branchIdFromProps(props);
+	const { branchId, listing } = await resolveBranchFromProps(props);
 	const { data } = await retryOnLock(() => props.apiClient.updateProjectBranch(props.projectId, branchId, { branch: { name: props.newName } }));
-	writer(props).end(data.branch, { fields: BRANCH_FIELDS });
+	writer(props).end(data.branch, {
+		fields: BRANCH_FIELDS,
+		renderColumns: branchColumns({
+			annotations: listing?.annotations,
+			current: currentBranchOf(props)
+		})
+	});
 };
 const setDefault = async (props) => {
-	const branchId = await branchIdFromProps(props);
+	const { branchId, listing } = await resolveBranchFromProps(props);
 	const { data } = await retryOnLock(() => props.apiClient.setDefaultProjectBranch(props.projectId, branchId));
-	writer(props).end(data.branch, { fields: BRANCH_FIELDS });
+	writer(props).end(data.branch, {
+		fields: BRANCH_FIELDS,
+		renderColumns: branchColumns({
+			annotations: listing?.annotations,
+			current: currentBranchOf(props)
+		})
+	});
 };
 const deleteBranch = async (props) => {
-	const branchId = await branchIdFromProps(props);
+	const { branchId, listing } = await resolveBranchFromProps(props);
 	const { data } = await retryOnLock(() => props.apiClient.deleteProjectBranch(props.projectId, branchId));
-	if (data) writer(props).end(data.branch, { fields: BRANCH_FIELDS });
+	if (data) writer(props).end(data.branch, {
+		fields: BRANCH_FIELDS,
+		renderColumns: branchColumns({
+			annotations: listing?.annotations,
+			current: currentBranchOf(props)
+		})
+	});
 };
 const get = async (props) => {
-	const branchId = await branchIdFromProps(props);
-	const { data } = await props.apiClient.getProjectBranch(props.projectId, branchId);
-	writer(props).end(data.branch, { fields: BRANCH_FIELDS });
+	const resolved = await resolveBranchFromProps(props);
+	let branch = resolved.branch;
+	let annotations = resolved.listing?.annotations;
+	if (!branch) {
+		const { data } = await props.apiClient.getProjectBranch(props.projectId, resolved.branchId);
+		branch = data.branch;
+		annotations = data.annotation ? { [data.branch.id]: data.annotation } : void 0;
+	}
+	writer(props).end(branch, {
+		fields: BRANCH_DETAIL_FIELDS,
+		renderColumns: branchColumns({
+			annotations,
+			current: currentBranchOf(props)
+		})
+	});
 };
 const addCompute = async (props) => {
 	const branchId = await branchIdFromProps(props);
@@ -291,34 +366,50 @@ const addCompute = async (props) => {
 };
 const reset = async (props) => {
 	if (!props.parent) throw new Error("Only resetting to parent is supported for now");
-	const branchId = await branchIdFromProps(props);
-	const { data: { branch: { parent_id } } } = await props.apiClient.getProjectBranch(props.projectId, branchId);
+	const { branchId, branch, listing } = await resolveBranchFromProps(props);
+	const parent_id = branch?.parent_id ?? (await props.apiClient.getProjectBranch(props.projectId, branchId)).data.branch.parent_id;
 	if (!parent_id) throw new Error("Branch has no parent");
 	const { data } = await retryOnLock(() => props.apiClient.restoreProjectBranch(props.projectId, branchId, {
 		source_branch_id: parent_id,
 		preserve_under_name: props.preserveUnderName || void 0
 	}));
-	writer(props).end(data.branch, { fields: BRANCH_FIELDS_RESET });
+	writer(props).end(data.branch, {
+		fields: BRANCH_FIELDS_RESET,
+		renderColumns: branchColumns({
+			annotations: listing?.annotations,
+			current: currentBranchOf(props)
+		})
+	});
 };
 const restore = async (props) => {
-	const targetBranchId = await branchIdResolve({
-		branch: props.id,
+	const { branchId: targetBranchId, branch: targetBranch, listing } = await resolveBranchFromProps({
+		apiClient: props.apiClient,
 		projectId: props.projectId,
-		apiClient: props.apiClient
+		id: props.id
 	});
 	const pointInTime = await parsePointInTime({
 		pointInTime: props.pointInTime,
 		targetBranchId,
 		projectId: props.projectId,
-		api: props.apiClient
+		api: props.apiClient,
+		branches: listing?.branches,
+		targetBranch
 	});
-	log.info(`Restoring branch ${targetBranchId} to the branch ${pointInTime.branchId} ${pointInTime.tag === "lsn" && "LSN " + pointInTime.lsn || pointInTime.tag === "timestamp" && "timestamp " + pointInTime.timestamp || "head"}`);
+	if (props.output === "table") {
+		const nameOf = (id) => listing?.branches.find((b) => b.id === id)?.name ?? id;
+		const point = pointInTime.tag === "lsn" ? `LSN ${pointInTime.lsn} of` : pointInTime.tag === "timestamp" ? `timestamp ${pointInTime.timestamp} of` : "the head of";
+		log.info(`Restoring ${nameOf(targetBranchId)} to ${point} ${nameOf(pointInTime.branchId)}`);
+	} else log.info(`Restoring branch ${targetBranchId} to the branch ${pointInTime.branchId} ${pointInTime.tag === "lsn" && "LSN " + pointInTime.lsn || pointInTime.tag === "timestamp" && "timestamp " + pointInTime.timestamp || "head"}`);
 	const { data } = await retryOnLock(() => props.apiClient.restoreProjectBranch(props.projectId, targetBranchId, {
 		source_branch_id: pointInTime.branchId,
 		preserve_under_name: props.preserveUnderName || void 0,
 		...pointInTime.tag === "lsn" && { source_lsn: pointInTime.lsn },
 		...pointInTime.tag === "timestamp" && { source_timestamp: pointInTime.timestamp }
 	}));
+	const labels = {
+		annotations: listing?.annotations,
+		current: currentBranchOf(props)
+	};
 	const writeInst = writer(props).write(data.branch, {
 		title: "Restored branch",
 		fields: [
@@ -326,7 +417,8 @@ const restore = async (props) => {
 			"name",
 			"last_reset_at"
 		],
-		emptyMessage: "No branches have been restored."
+		emptyMessage: "No branches have been restored.",
+		renderColumns: branchColumns(labels)
 	});
 	const parentId = data.branch.parent_id;
 	if (props.preserveUnderName && parentId) {
@@ -334,19 +426,26 @@ const restore = async (props) => {
 		writeInst.write(data.branch, {
 			title: "Backup branch",
 			fields: ["id", "name"],
-			emptyMessage: "Backup branch has not been found."
+			emptyMessage: "Backup branch has not been found.",
+			renderColumns: branchColumns(labels)
 		});
 	}
 	writeInst.end();
 };
 const setExpiration = async (props) => {
-	const branchId = await branchIdFromProps({
+	const { branchId, listing } = await resolveBranchFromProps({
 		...props,
 		id: props.branchId
 	});
 	const expiresAt = typeof props.expiresAt === "string" ? new Date(props.expiresAt).toISOString() : null;
 	const { data } = await retryOnLock(() => props.apiClient.updateProjectBranch(props.projectId, branchId, { branch: { expires_at: expiresAt } }));
-	writer(props).end(data.branch, { fields: BRANCH_FIELDS });
+	writer(props).end(data.branch, {
+		fields: BRANCH_FIELDS,
+		renderColumns: branchColumns({
+			annotations: listing?.annotations,
+			current: currentBranchOf(props)
+		})
+	});
 };
 //#endregion
 export { BRANCH_FIELDS, aliases, builder, command, describe, handler, branches_exports as t };

package/dist/commands/connection_string.js

@@ -85,17 +85,25 @@ const handler = async (props) => {
 	};
 	if (props.branch) props.branch = parsedPIT.branch;
 	const branchId = await branchIdFromProps(props);
-	const { data: { endpoints } } = await props.apiClient.listProjectBranchEndpoints(projectId, branchId);
+	const endpointsRequest = props.apiClient.listProjectBranchEndpoints(projectId, branchId);
+	const rolesRequest = props.roleName ? void 0 : props.apiClient.listProjectBranchRoles(projectId, branchId);
+	const databasesRequest = props.apiClient.listProjectBranchDatabases(projectId, branchId);
+	for (const request of [
+		endpointsRequest,
+		rolesRequest,
+		databasesRequest
+	]) request?.catch(() => void 0);
+	const { data: { endpoints } } = await endpointsRequest;
 	const matchEndpointType = props.endpointType ?? EndpointType.ReadWrite;
 	let endpoint = endpoints.find((e) => e.type === matchEndpointType);
 	if (!endpoint && props.endpointType == null) endpoint = endpoints[0];
 	if (!endpoint) throw new Error(`No ${props.endpointType ?? ""} endpoint found for the branch: ${branchId}`);
-	const role = props.roleName || await props.apiClient.listProjectBranchRoles(projectId, branchId).then(({ data }) => {
+	const role = !rolesRequest ? props.roleName : await rolesRequest.then(({ data }) => {
 		if (data.roles.length === 0) throw new Error(`No roles found for the branch: ${branchId}`);
 		if (data.roles.length === 1) return data.roles[0].name;
 		throw new Error(`Multiple roles found for the branch, please provide one with the --role-name option: ${data.roles.map((r) => r.name).join(", ")}`);
 	});
-	const { data: { databases: branchDatabases } } = await props.apiClient.listProjectBranchDatabases(projectId, branchId);
+	const { data: { databases: branchDatabases } } = await databasesRequest;
 	const database = props.databaseName || (() => {
 		if (branchDatabases.length === 0) throw new Error(`No databases found for the branch: ${branchId}`);
 		if (branchDatabases.length === 1) return branchDatabases[0].name;

package/dist/commands/schema_diff.js

@@ -2,7 +2,7 @@ import { log } from "../log.js";
 import { isNeonApiError, messageFromBody } from "../api.js";
 import { sendError } from "../analytics.js";
 import { writer } from "../writer.js";
-import { branchIdFromProps, listAllProjectBranches } from "../utils/enrichers.js";
+import { listAllProjectBranchesWithAnnotations, resolveBranchFromProps } from "../utils/enrichers.js";
 import { parsePointInTime } from "../utils/point_in_time.js";
 import chalk from "chalk";
 import { createPatch } from "diff";
@@ -15,12 +15,14 @@ const COLORS = {
 };
 const schemaDiff = async (props) => {
 	props.branch = props.baseBranch || props.branch;
-	const baseBranch = await branchIdFromProps(props);
+	const { branchId: baseBranch, branch: baseBranchData, listing } = await resolveBranchFromProps(props, props.branchListing);
 	let pointInTime = await parsePointInTime({
 		pointInTime: props.compareSource,
 		targetBranchId: baseBranch,
 		projectId: props.projectId,
-		api: props.apiClient
+		api: props.apiClient,
+		branches: listing?.branches,
+		targetBranch: baseBranchData
 	});
 	const comparingWithParent = props.compareSource.startsWith("^parent");
 	let baseBranchPoint = {
@@ -32,21 +34,35 @@ const schemaDiff = async (props) => {
 	if (props.database) {
 		const database = baseDatabases.find((db) => db.name === props.database);
 		if (!database) throw new Error(`Database ${props.database} does not exist in base branch ${baseBranch}`);
-		const patch = await createSchemaDiff(baseBranchPoint, pointInTime, database, props);
-		writer(props).text(colorize(patch));
+		const diff = await createSchemaDiff(baseBranchPoint, pointInTime, database, props);
+		writer(props).text(colorize(diff.patch));
+		reportUnchanged(diff, [baseBranchPoint, pointInTime], database, props, listing);
 		return;
 	}
 	await Promise.all(baseDatabases.map(async (database) => {
-		const patch = await createSchemaDiff(baseBranchPoint, pointInTime, database, props);
-		writer(props).text(colorize(patch));
+		const diff = await createSchemaDiff(baseBranchPoint, pointInTime, database, props);
+		writer(props).text(colorize(diff.patch));
+		reportUnchanged(diff, [baseBranchPoint, pointInTime], database, props, listing);
 	}));
 };
+/** The patch alone is two header lines when nothing differs, which reads like missing output. */
+const reportUnchanged = (diff, [base, compare], database, props, listing) => {
+	if (!diff.unchanged || props.output !== "table") return;
+	const label = (point) => {
+		const name = listing?.branches.find((b) => b.id === point.branchId)?.name ?? point.branchId;
+		return point.tag === "lsn" ? `${name} at ${point.lsn}` : point.tag === "timestamp" ? `${name} at ${point.timestamp}` : name;
+	};
+	log.info(`No schema differences for database ${database.name} between ${label(base)} and ${label(compare)}.`);
+};
 const fetchDatabases = async (branch, props) => {
 	return props.apiClient.listProjectBranchDatabases(props.projectId, branch).then((response) => response.data.databases);
 };
 const createSchemaDiff = async (baseBranch, pointInTime, database, props) => {
 	const [baseSchema, compareSchema] = await Promise.all([fetchSchema(baseBranch, database, props), fetchSchema(pointInTime, database, props)]);
-	return createPatch(`Database: ${database.name}`, baseSchema, compareSchema, generateHeader(baseBranch), generateHeader(pointInTime));
+	return {
+		patch: createPatch(`Database: ${database.name}`, baseSchema, compareSchema, generateHeader(baseBranch), generateHeader(pointInTime)),
+		unchanged: baseSchema === compareSchema
+	};
 };
 const fetchSchema = async (pointInTime, database, props) => {
 	try {
@@ -68,6 +84,7 @@ const colorize = (patch) => {
 	return patch.replace(/^([^\n]+)\n([^\n]+)\n/m, "").replace(/^-.*/gm, colorizer("removed")).replace(/^\+.*/gm, colorizer("added")).replace(/^@@.+@@.*/gm, colorizer("section"));
 };
 const colorizer = (colorId) => {
+	if (process.env.NO_COLOR) return (line) => line;
 	const color = COLORS[colorId];
 	return (line) => color(line);
 };
@@ -92,11 +109,13 @@ const parseSchemaDiffParams = async (props) => {
 			props.compareSource = props.baseBranch;
 			props.baseBranch = props.branch;
 		} else if (props.branch) {
-			if ((await listAllProjectBranches(props.apiClient, props.projectId)).find((b) => b.id === props.branch || b.name === props.branch)?.parent_id == void 0) throw new Error(`No branch specified. Your context branch (${props.branch}) has no parent, so no comparison is possible.`);
+			props.branchListing = await listAllProjectBranchesWithAnnotations(props.apiClient, props.projectId);
+			if (props.branchListing.branches.find((b) => b.id === props.branch || b.name === props.branch)?.parent_id == void 0) throw new Error(`No branch specified. Your context branch (${props.branch}) has no parent, so no comparison is possible.`);
 			log.info(`No branches specified. Comparing your context branch '${props.branch}' with its parent`);
 			props.compareSource = "^parent";
 		} else {
-			if ((await listAllProjectBranches(props.apiClient, props.projectId)).find((b) => b.default)?.parent_id == void 0) throw new Error("No branch specified. Include a base branch or add a set-context branch to continue. Your default branch has no parent, so no comparison is possible.");
+			props.branchListing = await listAllProjectBranchesWithAnnotations(props.apiClient, props.projectId);
+			if (props.branchListing.branches.find((b) => b.default)?.parent_id == void 0) throw new Error("No branch specified. Include a base branch or add a set-context branch to continue. Your default branch has no parent, so no comparison is possible.");
 			log.info(`No branches specified. Comparing default branch with its parent`);
 			props.compareSource = "^parent";
 		}

package/dist/human_table.js

@@ -22,8 +22,11 @@ function parseColumns(value) {
 	if (!Number.isFinite(n) || n <= 0) return;
 	return n;
 }
+function stripAnsi(s) {
+	return s.replace(ANSI_RE, "");
+}
 function displayWidth(s) {
-	const plain = s.replace(ANSI_RE, "");
+	const plain = stripAnsi(s);
 	let width = 0;
 	for (const char of plain) {
 		const code = char.codePointAt(0);
@@ -203,4 +206,4 @@ function charWidth(code) {
 	return 1;
 }
 //#endregion
-export { displayWidth, formatHumanChunk, parseColumns, resolveOutputWidth };
+export { displayWidth, formatHumanChunk, parseColumns, resolveOutputWidth, stripAnsi };

package/dist/utils/enrichers.js

@@ -7,8 +7,9 @@ const BRANCHES_LIST_LIMIT = 100;
 * Branch list pages cap at 100. A name stored in `.neon` can live on a later
 * page, so resolution has to walk `pagination.next` before treating it as missing.
 */
-const listAllProjectBranches = async (apiClient, projectId) => {
-	const result = [];
+const listAllProjectBranchesWithAnnotations = async (apiClient, projectId) => {
+	const branches = [];
+	const annotations = {};
 	let cursor;
 	while (true) {
 		const { data } = await apiClient.listProjectBranches({
@@ -16,16 +17,21 @@ const listAllProjectBranches = async (apiClient, projectId) => {
 			limit: BRANCHES_LIST_LIMIT,
 			cursor
 		});
-		result.push(...data.branches);
+		branches.push(...data.branches);
+		Object.assign(annotations, data.annotations);
 		cursor = data.pagination?.next;
 		if (!cursor || data.branches.length === 0) break;
 	}
-	return result;
+	return {
+		branches,
+		annotations
+	};
 };
-const branchIdResolve = async ({ branch, apiClient, projectId }) => {
+const listAllProjectBranches = async (apiClient, projectId) => (await listAllProjectBranchesWithAnnotations(apiClient, projectId)).branches;
+const branchIdResolve = async ({ branch, apiClient, projectId, branches: listed }) => {
 	branch = branch.toString();
 	if (looksLikeBranchId(branch)) return branch;
-	const branches = await listAllProjectBranches(apiClient, projectId);
+	const branches = listed ?? await listAllProjectBranches(apiClient, projectId);
 	const branchData = branches.find((b) => b.name === branch);
 	if (!branchData) throw new Error(`Branch ${branch} not found.\nAvailable branches: ${branches.map((b) => b.name).join(", ")}`);
 	return branchData.id;
@@ -45,6 +51,33 @@ const branchIdFromProps = async (props) => {
 	props.branchId = await getBranchIdFromProps(props);
 	return props.branchId;
 };
+/**
+* {@link branchIdFromProps}, plus whatever the resolution already fetched: a name or the
+* default branch is resolved from a listing, so the branch object and the listing come back
+* with the id and callers need not fetch them again. An explicit `br-…` id is not listed.
+*/
+const resolveBranchFromProps = async (props, known) => {
+	const ref = typeof props.branch === "string" ? props.branch : props.id;
+	const explicit = ref ? String(ref) : void 0;
+	if (explicit !== void 0 && looksLikeBranchId(explicit)) {
+		props.branchId = explicit;
+		const branch = known?.branches.find((b) => b.id === explicit);
+		return branch ? {
+			branchId: explicit,
+			branch,
+			listing: known
+		} : { branchId: explicit };
+	}
+	const listing = known ?? await listAllProjectBranchesWithAnnotations(props.apiClient, props.projectId);
+	const branch = explicit === void 0 ? listing.branches.find((b) => b.default) : listing.branches.find((b) => b.name === explicit);
+	if (!branch) throw new Error(explicit === void 0 ? "No default branch found" : `Branch ${explicit} not found.\nAvailable branches: ${listing.branches.map((b) => b.name).join(", ")}`);
+	props.branchId = branch.id;
+	return {
+		branchId: branch.id,
+		branch,
+		listing
+	};
+};
 const resolveBranchRef = async (props) => {
 	const branch = typeof props.branch === "string" ? props.branch : props.id;
 	const branches = await listAllProjectBranches(props.apiClient, props.projectId);
@@ -130,4 +163,4 @@ const fillSingleOrg = async (props) => {
 	};
 };
 //#endregion
-export { branchIdFromProps, branchIdResolve, fillSingleOrg, fillSingleProject, listAllProjectBranches, resolveBranchRef, resolveSingleDatabase };
+export { branchIdFromProps, branchIdResolve, fillSingleOrg, fillSingleProject, listAllProjectBranches, listAllProjectBranchesWithAnnotations, resolveBranchFromProps, resolveBranchRef, resolveSingleDatabase };

package/dist/utils/point_in_time.js

@@ -28,19 +28,19 @@ const parsePITBranch = (input) => {
 	}
 	return result;
 };
-const parsePointInTime = async ({ pointInTime, targetBranchId, projectId, api }) => {
+const parsePointInTime = async ({ pointInTime, targetBranchId, projectId, api, branches, targetBranch }) => {
 	const parsedPIT = parsePITBranch(pointInTime);
 	let branchId = "";
 	if (parsedPIT.branch === "^self") branchId = targetBranchId;
 	else if (parsedPIT.branch === "^parent") {
-		const { data } = await api.getProjectBranch(projectId, targetBranchId);
-		const { parent_id: parentId } = data.branch;
+		const parentId = (targetBranch?.id === targetBranchId ? targetBranch : (await api.getProjectBranch(projectId, targetBranchId)).data.branch).parent_id;
 		if (parentId == null) throw new PointInTimeParseError("Branch has no parent");
 		branchId = parentId;
 	} else branchId = await branchIdResolve({
 		branch: parsedPIT.branch,
 		projectId,
-		apiClient: api
+		apiClient: api,
+		branches
 	});
 	delete parsedPIT.branch;
 	return {

package/dist/writer.js

@@ -1,6 +1,6 @@
 import { isCi } from "./env.js";
 import { toSnakeCase } from "./utils/string.js";
-import { formatHumanChunk, resolveOutputWidth } from "./human_table.js";
+import { formatHumanChunk, resolveOutputWidth, stripAnsi } from "./human_table.js";
 import YAML from "yaml";
 //#region src/writer.ts
 const writeYaml = (chunks) => {
@@ -11,17 +11,20 @@ const writeJson = (chunks) => {
 	return json === void 0 ? json : `${json}\n`;
 };
 const writeTable = (chunks, out, width) => {
+	const noColor = Boolean(process.env.NO_COLOR);
 	chunks.forEach(({ data, config }, i) => {
-		out.write(formatHumanChunk({
+		const title = config.humanTitle ?? config.title;
+		const text = formatHumanChunk({
 			data,
 			fields: config.fields,
-			title: config.title,
+			title,
 			emptyMessage: config.emptyMessage,
 			renderColumns: config.renderColumns,
 			width,
 			colorTitle: !isCi(),
-			leadingBlank: i > 0 && Boolean(config.title)
-		}));
+			leadingBlank: i > 0 && Boolean(title)
+		});
+		out.write(noColor ? stripAnsi(text) : text);
 	});
 };
 /**

package/package.json

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