neon 8.3.3 → 8.3.4

package/dist/commands/dev.js

@@ -4,11 +4,11 @@ import { isClaimableEnvTarget } from "../claimable/state.js";
 import { getCliName } from "../utils/cli_name.js";
 import { readEnvFile, resolveEnvFilePath } from "../env_file.js";
 import { l as functionBaseUrlKey } from "../_chunks/env-HYNFtxu5.js";
-import { branchIdResolve } from "../utils/enrichers.js";
-import { bundleEntry } from "../utils/esbuild.js";
 import { a as resolveDevEnv } from "../_chunks/env-BWqJqBDJ.js";
 import { findConfigFunctionBySource, resolveFunctionsFromConfig } from "../dev/functions.js";
 import { resolveWatchInputs } from "../dev/inputs.js";
+import { branchIdResolve } from "../utils/enrichers.js";
+import { bundleEntry } from "../utils/esbuild.js";
 import { existsSync, mkdirSync, rmSync, statSync, writeFileSync } from "node:fs";
 import { basename, dirname, join, relative, resolve } from "node:path";
 import { fileURLToPath } from "node:url";

package/dist/commands/env.js

@@ -7,9 +7,9 @@ import { deprecatedServiceMessage, parseServices, servicesFlagValue, servicesOpt
 import { mergeEnvFile, readEnvFile, resolveEnvFilePath } from "../env_file.js";
 import { t as NEON_ENV_VAR_KEYS, u as isFunctionBaseUrlKey } from "../_chunks/env-HYNFtxu5.js";
 import { ENV_PULL_KEY_HELP, ENV_PULL_SERVICES, envKeysForSelection, envPullFlagValue, ownedEnvServiceKeys, parseEnvPullKeys } from "../env_services.js";
+import { i as dropClaimableUnsupported, o as resolveNeonEnvVars } from "../_chunks/env-BWqJqBDJ.js";
 import { fillSingleProject, resolveBranchRef } from "../utils/enrichers.js";
 import { warnAiGateway } from "../utils/ai_gateway_notice.js";
-import { i as dropClaimableUnsupported, o as resolveNeonEnvVars } from "../_chunks/env-BWqJqBDJ.js";
 import { formatPulledEnv, pulledBranch } from "./env_output.js";
 import { existsSync } from "node:fs";
 import chalk from "chalk";

package/dist/utils/inspect_db.js

@@ -48,20 +48,36 @@ const connectionUriForDatabase = (connectionUri, database) => {
 	url.pathname = `/${encodeURIComponent(database)}`;
 	return url.toString();
 };
-const listBranchDatabases = async (props) => {
+/**
+* Resolves the branch once and starts its endpoint, role, and database reads together.
+* Callers read them in the order a sequential run would, so the first error is the same.
+*/
+const startBranchConnectionReads = async (props) => {
 	const projectId = props.projectId;
 	const parsedPIT = props.branch ? parsePITBranch(props.branch) : {
 		tag: "head",
 		branch: ""
 	};
-	const branchId = await branchIdFromProps({
-		...props,
-		...props.branch ? { branch: parsedPIT.branch } : {}
+	if (props.branch) props.branch = parsedPIT.branch;
+	const branchId = await branchIdFromProps(props);
+	const endpoints = props.apiClient.listProjectBranchEndpoints(projectId, branchId).then(({ data }) => data.endpoints);
+	const role = props.roleName ? Promise.resolve(props.roleName) : props.apiClient.listProjectBranchRoles(projectId, branchId).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 } } = await props.apiClient.listProjectBranchDatabases(projectId, branchId);
+	const databases = props.apiClient.listProjectBranchDatabases(projectId, branchId).then(({ data }) => data.databases);
+	for (const read of [
+		endpoints,
+		role,
+		databases
+	]) read.catch(() => void 0);
 	return {
 		branchId,
-		names: databases.map((d) => d.name)
+		parsedPIT,
+		endpoints,
+		role,
+		databases
 	};
 };
 /**
@@ -70,25 +86,16 @@ const listBranchDatabases = async (props) => {
 * pooling, prisma tuning, and SSL mode). Mirrors how `connection-string`
 * resolves a branch so `inspect db` connects the same way.
 */
-const resolveConnectionUri = async (props) => {
-	const projectId = props.projectId;
-	const parsedPIT = props.branch ? parsePITBranch(props.branch) : {
-		tag: "head",
-		branch: ""
-	};
-	if (props.branch) props.branch = parsedPIT.branch;
-	const branchId = await branchIdFromProps(props);
-	const { data: { endpoints } } = await props.apiClient.listProjectBranchEndpoints(projectId, branchId);
+const resolveConnectionUri = async (props, started) => {
+	const reads = started ?? await startBranchConnectionReads(props);
+	const { branchId, parsedPIT } = reads;
+	const endpoints = await reads.endpoints;
 	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 }) => {
-		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 role = await reads.role;
+	const branchDatabases = await reads.databases;
 	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;
@@ -158,8 +165,9 @@ const resolveInspectTargets = async (props, scope) => {
 			branchDatabaseCount: 1
 		};
 	}
-	const { branchId, names } = await listBranchDatabases(props);
-	if (names.length === 0) throw new Error(`No databases found for the branch: ${branchId}`);
+	const reads = await startBranchConnectionReads(props);
+	const names = (await reads.databases).map((d) => d.name);
+	if (names.length === 0) throw new Error(`No databases found for the branch: ${reads.branchId}`);
 	const selection = selectInspectTargets({
 		branchDatabases: names,
 		scope
@@ -167,7 +175,7 @@ const resolveInspectTargets = async (props, scope) => {
 	const first = await resolveConnectionUri({
 		...props,
 		databaseName: selection.databases[0]
-	});
+	}, reads);
 	return {
 		targets: selection.databases.map((database) => ({
 			database,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "neon",
-  "version": "8.3.3",
+  "version": "8.3.4",
   "description": "CLI tool for Neon, the cloud backend primitives built around Lakebase Postgres",
   "keywords": [
     "neon",