neon 8.0.7 → 8.0.8

package/dist/_chunks/{env-N19A7qND.js → env-Dkl0TY44.js}

@@ -113,10 +113,14 @@ function requiredValue(value, description) {
 async function fetchEnvKeys(config, options, keys) {
 	return (await fetchEnvKeysState(config, options, keys)).env;
 }
-async function fetchEnvKeysState(config, options, keys) {
+/**
+* `policy` is the {@link resolveBranchPolicy} result for this same `config` and branch, when
+* the caller already has it.
+*/
+async function fetchEnvKeysState(config, options, keys, policy) {
 	const api = options.api ?? createApiFromOptions(options);
 	const projectId = options.projectId;
-	const { branch, desired } = await resolveBranchPolicy(config, options, api);
+	const { branch, desired } = policy ?? await resolveBranchPolicy(config, options, api);
 	const selection = keys ? new Set(keys) : null;
 	const omitted = new Set(options.omitKeys ?? []);
 	const wants = (key) => !omitted.has(key) && (selection === null || selection.has(key));

package/dist/_chunks/{env-BgiaRNT1.js → env-HVRMArlT.js}

@@ -2,7 +2,7 @@ import { log } from "../log.js";
 import { getCliName } from "../utils/cli_name.js";
 import { declaredNeonServices } from "../config_services.js";
 import { loadProjectConfig } from "../project.js";
-import { a as defaultAiGatewayCredential, c as fetchEnvKeysState, d as isLiveCredential, h as toEntries, i as credentialName, l as functionBaseUrlKey, m as resolveBranchPolicy, n as createApiFromOptions, o as defaultStorageCredential, p as policyEnvKeys, r as credentialEnvKeys, t as NEON_ENV_VAR_KEYS, u as isFunctionBaseUrlKey } from "./env-N19A7qND.js";
+import { a as defaultAiGatewayCredential, c as fetchEnvKeysState, d as isLiveCredential, h as toEntries, i as credentialName, l as functionBaseUrlKey, m as resolveBranchPolicy, n as createApiFromOptions, o as defaultStorageCredential, p as policyEnvKeys, r as credentialEnvKeys, t as NEON_ENV_VAR_KEYS, u as isFunctionBaseUrlKey } from "./env-Dkl0TY44.js";
 import { ENV_PULL_SERVICES, envKeysForSelection, serviceForEnvKey, servicesForEnvKeys } from "../env_services.js";
 import { formatInstallCommand, resolvePackageManager } from "../utils/package_manager.js";
 import { ErrorCode, createNeonApiFromOptions, isPlatformError } from "@neon/config";
@@ -57,7 +57,10 @@ async function fetchEnvReusingSecrets(config, options) {
 		aiGateway: gatewayCredentialSelected
 	}).filter((key) => selected.has(key));
 	if (secretKeys.length === 0) {
-		const fetched = await fetchEnvKeysState(config, fetchOptions, requested === null ? null : selectedPolicyKeys);
+		const fetched = await fetchEnvKeysState(config, fetchOptions, requested === null ? null : selectedPolicyKeys, {
+			branch,
+			desired
+		});
 		return {
 			vars: preferPersisted(toEntries(fetched.env), source),
 			credential: {
@@ -91,10 +94,12 @@ async function fetchEnvReusingSecrets(config, options) {
 	const fetchKeys = requested === null ? null : selectedPolicyKeys.filter((key) => !keptSecretKeys.includes(key));
 	const fetched = await fetchEnvKeysState(config, {
 		...fetchOptions,
-		branchId: branch.id,
 		api,
 		...keptSecretKeys.length > 0 && requested === null ? { omitKeys: keptSecretKeys } : {}
-	}, fetchKeys);
+	}, fetchKeys, {
+		branch,
+		desired
+	});
 	const vars = preferPersisted(toEntries(fetched.env), source);
 	const unavailable = fetched.functionUrlsUnavailable ? { functionUrlsUnavailable: true } : {};
 	for (const key of keptSecretKeys) {

package/dist/commands/config.js

@@ -791,7 +791,7 @@ const applyCmd = async (props) => {
 	await autoPullEnvAfterPin({
 		...props,
 		envPull: props.envPull !== false
-	});
+	}, branch);
 	if (hooks?.deploy?.after) {
 		const env = await resolveHookEnv(config, {
 			projectId: props.projectId,

package/dist/commands/dev.js

@@ -3,12 +3,12 @@ import { log } from "../log.js";
 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-N19A7qND.js";
-import { branchIdResolve } from "../utils/enrichers.js";
-import { bundleEntry } from "../utils/esbuild.js";
-import { a as resolveDevEnv } from "../_chunks/env-BgiaRNT1.js";
+import { l as functionBaseUrlKey } from "../_chunks/env-Dkl0TY44.js";
+import { a as resolveDevEnv } from "../_chunks/env-HVRMArlT.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

@@ -5,12 +5,12 @@ import { isClaimableEnvTarget } from "../claimable/state.js";
 import { getCliName } from "../utils/cli_name.js";
 import { deprecatedServiceMessage, parseServices, servicesFlagValue, servicesOption } from "../neon_services.js";
 import { mergeEnvFile, readEnvFile, resolveEnvFilePath } from "../env_file.js";
-import { t as NEON_ENV_VAR_KEYS, u as isFunctionBaseUrlKey } from "../_chunks/env-N19A7qND.js";
+import { t as NEON_ENV_VAR_KEYS, u as isFunctionBaseUrlKey } from "../_chunks/env-Dkl0TY44.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-HVRMArlT.js";
 import { fillSingleProject, resolveBranchRef } from "../utils/enrichers.js";
 import { warnAiGateway } from "../utils/ai_gateway_notice.js";
 import { announceTargetBranch } from "../utils/branch_notice.js";
-import { i as dropClaimableUnsupported, o as resolveNeonEnvVars } from "../_chunks/env-BgiaRNT1.js";
 import { existsSync } from "node:fs";
 import chalk from "chalk";
 //#region src/commands/env.ts
@@ -133,7 +133,7 @@ const pull = async (props, opts = {}) => {
 	const selectionServices = dropped ? dropped.services : props.services ?? [];
 	const selectionEnvKeys = dropped ? dropped.envKeys : props.envKeys ?? [];
 	const selectedKeys = props.services !== void 0 || props.envKeys !== void 0 ? envKeysForSelection(selectionServices, selectionEnvKeys) : void 0;
-	const branch = await resolveBranchRef(props);
+	const branch = opts.branch ?? await resolveBranchRef(props);
 	if (opts.announce) announceTargetBranch(props, branch, "Pulling env from branch");
 	const branchId = branch.branchId;
 	const location = {
@@ -251,13 +251,13 @@ const pickSelectedVars = (vars, selectedKeys, services) => {
 * command's primary effect and has already succeeded by the time this runs, so a pull failure
 * degrades to a warning rather than failing the command.
 */
-const autoPullEnvAfterPin = async (props) => {
+const autoPullEnvAfterPin = async (props, branch) => {
 	if (!props.envPull) {
 		log.info(chalk.dim(ENV_PULL_SKIPPED_HINT));
 		return { status: "skipped" };
 	}
 	try {
-		return await pull(props);
+		return await pull(props, branch ? { branch } : {});
 	} catch (err) {
 		const message = err instanceof Error ? err.message : String(err);
 		log.warning(`Branch pinned, but pulling its Neon env vars failed: %s

package/dist/dev/env.js

@@ -1,2 +1,2 @@
-import { a as resolveDevEnv, i as dropClaimableUnsupported, n as MissingBranchContextError, o as resolveNeonEnvVars, r as ServiceNotOnBranchError, t as DevEnvMismatchError } from "../_chunks/env-BgiaRNT1.js";
+import { a as resolveDevEnv, i as dropClaimableUnsupported, n as MissingBranchContextError, o as resolveNeonEnvVars, r as ServiceNotOnBranchError, t as DevEnvMismatchError } from "../_chunks/env-HVRMArlT.js";
 export { DevEnvMismatchError, MissingBranchContextError, ServiceNotOnBranchError, dropClaimableUnsupported, resolveDevEnv, resolveNeonEnvVars };

package/dist/env_services.js

@@ -1,5 +1,5 @@
 import { NEON_SERVICES } from "./neon_services.js";
-import { f as parseFunctionBaseUrlKey, t as NEON_ENV_VAR_KEYS, u as isFunctionBaseUrlKey } from "./_chunks/env-N19A7qND.js";
+import { f as parseFunctionBaseUrlKey, t as NEON_ENV_VAR_KEYS, u as isFunctionBaseUrlKey } from "./_chunks/env-Dkl0TY44.js";
 //#region src/env_services.ts
 const ENV_PULL_SERVICES = NEON_SERVICES;
 const ENV_PULL_KEYS = [

package/dist/utils/hooks.js

@@ -1,6 +1,6 @@
 import { log } from "../log.js";
 import { loadProjectConfig } from "../project.js";
-import { s as fetchEnvKeys } from "../_chunks/env-N19A7qND.js";
+import { s as fetchEnvKeys } from "../_chunks/env-Dkl0TY44.js";
 import { runHook } from "@neon/config-runtime";
 //#region src/utils/hooks.ts
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "neon",
-  "version": "8.0.7",
+  "version": "8.0.8",
   "description": "CLI tool for Neon, the cloud backend primitives built around Lakebase Postgres",
   "keywords": [
     "neon",
@@ -64,8 +64,8 @@
     "yaml": "^2.9.0",
     "yargs": "17.7.2",
     "yoctocolors": "^2.1.2",
-    "@neon/config-runtime": "1.7.4",
     "@neon/sdk": "7.0.0",
+    "@neon/config-runtime": "1.7.5",
     "@neon/config": "1.8.3"
   },
   "optionalDependencies": {