neon 8.3.0 → 8.3.1

package/dist/commands/snapshots.js

@@ -1,8 +1,8 @@
 import { t as __exportAll } from "../_chunks/rolldown-runtime-8H4AJuhK.js";
 import { log } from "../log.js";
-import { retryOnLock } from "../api.js";
+import { isNeonApiError, retryOnLock } from "../api.js";
 import { writer } from "../writer.js";
-import { looksLikeLSN, looksLikeTimestamp, toIso } from "../utils/formats.js";
+import { looksLikeBranchId, looksLikeLSN, looksLikeSnapshotId, looksLikeTimestamp, toIso } from "../utils/formats.js";
 import { branchIdResolve, fillSingleProject, resolveBranchRef } from "../utils/enrichers.js";
 import { BRANCH_FIELDS } from "./branches.js";
 //#region src/commands/snapshots.ts
@@ -166,6 +166,25 @@ const resolveSnapshot = async (props) => {
 	if (byName.length > 1) throw new Error(`Multiple snapshots are named "${props.id}". Re-run with the snapshot id:\n${byName.map((s) => `  ${s.id}`).join("\n")}`);
 	throw new Error(`Snapshot "${props.id}" not found.\nAvailable snapshots: ${snapshots.map((s) => `${s.name} (${s.id})`).join(", ") || "none"}`);
 };
+/**
+* Runs `call` on the snapshot `props.id` names. An id goes straight to the API without the
+* listing; a 404 sends it through {@link resolveSnapshot}, since a name can look like an id.
+* When the listing has that id, the 404 was about something else (a target branch), so it stands.
+*/
+const withSnapshotId = async (props, call) => {
+	let notFound;
+	if (looksLikeSnapshotId(props.id)) try {
+		return await call(props.id);
+	} catch (err) {
+		if (!(isNeonApiError(err) && err.status === 404)) throw err;
+		notFound = err;
+	}
+	const snapshot = await resolveSnapshot(props);
+	if (notFound && snapshot.id === props.id) throw notFound;
+	return call(snapshot.id);
+};
+/** A `br-…` id needs no branch listing; a name or the context/default branch does. */
+const snapshotBranchId = async (props) => props.branch && looksLikeBranchId(props.branch) ? props.branch : (await resolveBranchRef(props)).branchId;
 const list = async (props) => {
 	const { data: { snapshots } } = await props.apiClient.listSnapshots(props.projectId);
 	writer(props).end(snapshots, {
@@ -185,10 +204,7 @@ const get = async (props) => {
 const create = async (props) => {
 	if (props.lsn !== void 0 && !looksLikeLSN(props.lsn)) throw new Error(`Invalid --lsn value: "${props.lsn}". Expected an LSN like 0/1F3C8A0.`);
 	if (props.timestamp !== void 0 && !looksLikeTimestamp(props.timestamp)) throw new Error(`Invalid --timestamp value: "${props.timestamp}". Use an RFC 3339 timestamp, e.g. 2025-01-01T00:00:00Z.`);
-	const { branchId } = await resolveBranchRef({
-		...props,
-		branch: props.branch
-	});
+	const branchId = await snapshotBranchId(props);
 	const { data } = await retryOnLock(() => props.apiClient.createSnapshot(props.projectId, branchId, {
 		name: props.name,
 		timestamp: props.timestamp,
@@ -203,12 +219,11 @@ const create = async (props) => {
 };
 const update = async (props) => {
 	if (props.name === void 0 && props.expiresAt === void 0 && !props.clearExpiration) throw new Error("Nothing to update. Pass --name, --expires-at, or --clear-expiration.");
-	const snapshot = await resolveSnapshot(props);
 	const expiresAt = props.clearExpiration ? null : props.expiresAt !== void 0 ? toIso(props.expiresAt, "--expires-at") : void 0;
-	const { data } = await retryOnLock(() => props.apiClient.updateSnapshot(props.projectId, snapshot.id, { snapshot: {
+	const { data } = await withSnapshotId(props, (snapshotId) => retryOnLock(() => props.apiClient.updateSnapshot(props.projectId, snapshotId, { snapshot: {
 		name: props.name,
 		expires_at: expiresAt
-	} }));
+	} })));
 	writer(props).end(data.snapshot, {
 		fields: SNAPSHOT_FIELDS,
 		renderColumns: { expires_at: (s) => s.expires_at || "never" }
@@ -223,17 +238,18 @@ const deleteSnapshot = async (props) => {
 	});
 };
 const restore = async (props) => {
-	const snapshot = await resolveSnapshot(props);
-	const targetBranchId = props.targetBranch ? await branchIdResolve({
-		branch: props.targetBranch,
-		projectId: props.projectId,
-		apiClient: props.apiClient
-	}) : void 0;
-	const { data } = await retryOnLock(() => props.apiClient.restoreSnapshot(props.projectId, snapshot.id, {
-		name: props.name,
-		target_branch_id: targetBranchId,
-		finalize_restore: props.finalize
-	}));
+	const { data } = await withSnapshotId(props, async (snapshotId) => {
+		const targetBranchId = props.targetBranch ? await branchIdResolve({
+			branch: props.targetBranch,
+			projectId: props.projectId,
+			apiClient: props.apiClient
+		}) : void 0;
+		return retryOnLock(() => props.apiClient.restoreSnapshot(props.projectId, snapshotId, {
+			name: props.name,
+			target_branch_id: targetBranchId,
+			finalize_restore: props.finalize
+		}));
+	});
 	const out = writer(props).write(data.branch, {
 		fields: BRANCH_FIELDS,
 		title: "restored branch"
@@ -259,10 +275,7 @@ const finalize = async (props) => {
 	});
 };
 const scheduleGet = async (props) => {
-	const { branchId } = await resolveBranchRef({
-		...props,
-		branch: props.branch
-	});
+	const branchId = await snapshotBranchId(props);
 	const { data } = await props.apiClient.getSnapshotSchedule(props.projectId, branchId);
 	writer(props).end(data.schedule, {
 		fields: SCHEDULE_FIELDS,
@@ -304,10 +317,6 @@ const parseScheduleJson = (raw) => {
 	});
 };
 const scheduleSet = async (props) => {
-	const { branchId } = await resolveBranchRef({
-		...props,
-		branch: props.branch
-	});
 	let schedule;
 	if (props.schedule) schedule = parseScheduleJson(props.schedule);
 	else if (props.frequency) {
@@ -318,6 +327,7 @@ const scheduleSet = async (props) => {
 		if (props.retention !== void 0) item.retention_seconds = props.retention;
 		schedule = [item];
 	} else throw new Error("Provide --frequency (optionally with --hour/--day/--month/--retention) or --schedule <json>.");
+	const branchId = await snapshotBranchId(props);
 	await retryOnLock(() => props.apiClient.setSnapshotSchedule(props.projectId, branchId, { schedule }));
 	writer(props).end(schedule, {
 		fields: SCHEDULE_FIELDS,