neon 3.2.2 → 3.3.0

package/dist/commands/schema_diff.js

@@ -87,19 +87,21 @@ const generateHeader = (pointInTime) => {
 	}
 };
 const parseSchemaDiffParams = async (props) => {
-	if (!props.compareSource) if (props.baseBranch) {
-		props.compareSource = props.baseBranch;
-		props.baseBranch = props.branch;
-	} else if (props.branch) {
-		const { data } = await props.apiClient.listProjectBranches({ projectId: props.projectId });
-		if (data.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 {
-		const { data } = await props.apiClient.listProjectBranches({ projectId: props.projectId });
-		if (data.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";
+	if (!props.compareSource) {
+		if (props.baseBranch) {
+			props.compareSource = props.baseBranch;
+			props.baseBranch = props.branch;
+		} else if (props.branch) {
+			const { data } = await props.apiClient.listProjectBranches({ projectId: props.projectId });
+			if (data.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 {
+			const { data } = await props.apiClient.listProjectBranches({ projectId: props.projectId });
+			if (data.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";
+		}
 	}
 	return props;
 };

package/dist/commands/set_context.js

@@ -1,4 +1,4 @@
-import { t as __exportAll } from "../_chunks/rolldown-runtime-D7D4PA-g.js";
+import { t as __exportAll } from "../_chunks/rolldown-runtime-8H4AJuhK.js";
 import { log } from "../log.js";
 import { applyContext } from "../context.js";
 import { getCliName } from "../utils/cli_name.js";

package/dist/commands/snapshots.js

@@ -1,4 +1,4 @@
-import { t as __exportAll } from "../_chunks/rolldown-runtime-D7D4PA-g.js";
+import { t as __exportAll } from "../_chunks/rolldown-runtime-8H4AJuhK.js";
 import { log } from "../log.js";
 import { retryOnLock } from "../api.js";
 import { writer } from "../writer.js";

package/dist/commands/status.js

@@ -1,4 +1,4 @@
-import { t as __exportAll } from "../_chunks/rolldown-runtime-D7D4PA-g.js";
+import { t as __exportAll } from "../_chunks/rolldown-runtime-8H4AJuhK.js";
 import { fillSingleProject } from "../utils/enrichers.js";
 import { status } from "./config.js";
 //#region src/commands/status.ts

package/dist/commands/user.js

@@ -1,4 +1,4 @@
-import { t as __exportAll } from "../_chunks/rolldown-runtime-D7D4PA-g.js";
+import { t as __exportAll } from "../_chunks/rolldown-runtime-8H4AJuhK.js";
 import { writer } from "../writer.js";
 //#region src/commands/user.ts
 var user_exports = /* @__PURE__ */ __exportAll({

package/dist/commands/vpc_endpoints.js

@@ -1,4 +1,4 @@
-import { t as __exportAll } from "../_chunks/rolldown-runtime-D7D4PA-g.js";
+import { t as __exportAll } from "../_chunks/rolldown-runtime-8H4AJuhK.js";
 import { log } from "../log.js";
 import { writer } from "../writer.js";
 import { fillSingleOrg, fillSingleProject } from "../utils/enrichers.js";

package/dist/config.js

@@ -1,5 +1,5 @@
 import { isCi } from "./env.js";
-import { a as isOwnedCredentialPath, i as isInsideConfigDir, n as credentialsPath, r as defaultDir, t as CREDENTIALS_FILE } from "./_chunks/paths-DMq0Lt7a.js";
+import { a as isInsideConfigDir, i as defaultDir, o as isOwnedCredentialPath, r as credentialsPath, t as CREDENTIALS_FILE } from "./_chunks/paths-g3DRqJiD.js";
 import { existsSync, mkdirSync } from "node:fs";
 //#region src/config.ts
 const ensureConfigDir = ({ "config-dir": configDirArg, "force-auth": forceAuth }) => {

package/dist/credential_io.js

@@ -0,0 +1,2 @@
+import { t as storeFor } from "./_chunks/credential_io-D2vw1UOw.js";
+export { storeFor };

package/dist/index.js

@@ -1,7 +1,7 @@
 import { log } from "./log.js";
 import pkg_default from "./pkg.js";
 import { isNeonApiError, messageFromBody } from "./api.js";
-import { r as defaultDir } from "./_chunks/paths-DMq0Lt7a.js";
+import { i as defaultDir } from "./_chunks/paths-g3DRqJiD.js";
 import { ensureConfigDir } from "./config.js";
 import { authFailureMessage, credentialsToClearOn401, getAuthContext } from "./auth_context.js";
 import { currentContextFile, enrichFromContext } from "./context.js";
@@ -128,34 +128,36 @@ async function handleError(msg, err) {
 		sendError(error, "NETWORK_ERROR");
 		return false;
 	}
-	if (isNeonApiError(err)) if (err.code === "ECONNABORTED") {
-		log.error("Request timed out");
-		sendError(err, "REQUEST_TIMEOUT");
-		return false;
-	} else if (err.status === 401) {
-		sendError(err, "AUTH_FAILED");
-		const context = getAuthContext();
-		const staleCredentials = credentialsToClearOn401(context);
-		if (staleCredentials === null) {
-			log.error(authFailureMessage(context));
+	if (isNeonApiError(err)) {
+		if (err.code === "ECONNABORTED") {
+			log.error("Request timed out");
+			sendError(err, "REQUEST_TIMEOUT");
 			return false;
-		}
-		log.info("Authentication failed, deleting credentials...");
-		try {
-			deleteCredentialsAt(staleCredentials);
-			return true;
-		} catch (deleteErr) {
-			log.debug("Failed to delete credentials: %s", deleteErr instanceof Error ? deleteErr.message : "unknown error");
+		} else if (err.status === 401) {
+			sendError(err, "AUTH_FAILED");
+			const context = getAuthContext();
+			const staleCredentials = credentialsToClearOn401(context);
+			if (staleCredentials === null) {
+				log.error(authFailureMessage(context));
+				return false;
+			}
+			log.info("Authentication failed, deleting credentials...");
+			try {
+				if (context === null) return false;
+				deleteCredentialsAt(staleCredentials, context.configDir);
+				return true;
+			} catch (deleteErr) {
+				log.debug("Failed to delete credentials: %s", deleteErr instanceof Error ? deleteErr.message : "unknown error");
+				return false;
+			}
+		} else {
+			const serverMessage = messageFromBody(err.data);
+			if (serverMessage) log.error(serverMessage);
+			log.debug("status: %d %s | path: %s", err.status, err.statusText, err.requestPath);
+			sendError(err, "API_ERROR");
 			return false;
 		}
 	} else {
-		const serverMessage = messageFromBody(err.data);
-		if (serverMessage) log.error(serverMessage);
-		log.debug("status: %d %s | path: %s", err.status, err.statusText, err.requestPath);
-		sendError(err, "API_ERROR");
-		return false;
-	}
-	else {
 		const error = err instanceof Error ? err : new Error(msg || "Unknown error");
 		sendError(error, matchErrorCode(error.message));
 		log.error(error.message);

package/dist/init/auth.js

@@ -1,6 +1,6 @@
-import { o as inspectCredentials, s as interpretCredentials } from "../_chunks/credentials-MYdHdKah.js";
-import { o as resolveConfigFile } from "../_chunks/paths-DMq0Lt7a.js";
-import { t as DEFAULT_PROFILE } from "../_chunks/profiles-Ir29rqns.js";
+import { l as locationForName, t as DEFAULT_PROFILE } from "../_chunks/profiles-CVXNvU2r.js";
+import { l as interpretCredentials, t as storeFor } from "../_chunks/credential_io-D2vw1UOw.js";
+import { n as configDir } from "../_chunks/paths-g3DRqJiD.js";
 import { log } from "@clack/prompts";
 import { execa } from "execa";
 //#region src/init/auth.ts
@@ -26,8 +26,10 @@ async function ensureNeonctlAuth(options) {
 		return true;
 	} catch (error) {
 		const msg = error instanceof Error ? error.message : "Unknown error";
-		if (!quiet) if (msg.includes("interactive auth") || msg.includes("CI")) log.error("Auth requires an interactive terminal. Run neon init in your system terminal (outside the chat) to sign in.");
-		else log.error(`Authentication failed: ${msg}`);
+		if (!quiet) {
+			if (msg.includes("interactive auth") || msg.includes("CI")) log.error("Auth requires an interactive terminal. Run neon init in your system terminal (outside the chat) to sign in.");
+			else log.error(`Authentication failed: ${msg}`);
+		}
 		return false;
 	}
 }
@@ -38,29 +40,16 @@ async function isAuthenticated() {
 	return await getNeonctlAccessToken() !== null;
 }
 /**
-* The credential the Neon CLI has stored, or `null` when there is none.
-*
-* Shares the reader with `neon` and `@neon/env` rather than keeping a copy — the inline path
-* resolution this replaced was the third implementation of "where is the config directory", and
-* it also looked only for `access_token`, so an account signed in with an API key read as not
-* authenticated and got sent to a browser. See `internals/cli-core/README.md`.
-*
-* `null` means *absent*, and only absent. A file that exists and cannot be read throws: this
-* value decides whether to start a browser sign-in, and a sign-in overwrites the file it could
-* not read — as a different account, if a different one is chosen. Catching every error here
-* made a damaged credential indistinguishable from a fresh machine.
+* Sharing the reader keeps init aligned with CLI path and API-key handling.
+* Unreadable credentials throw so browser sign-in cannot overwrite them.
 */
 async function getNeonctlAccessToken() {
-	const { path } = resolveConfigFile("credentials.json");
-	const read = inspectCredentials(path);
-	if (read.kind === "absent") return null;
-	if (read.kind === "unusable") throw new Error(`${read.reason}. Replace it deliberately with \`neon profile create ${DEFAULT_PROFILE} --force\`, or delete the file.`);
-	const credential = interpretCredentials(read.credentials, {
-		path,
-		profile: DEFAULT_PROFILE
-	});
+	const at = locationForName(configDir(), DEFAULT_PROFILE);
+	const loaded = storeFor(configDir()).read(at);
+	if (loaded === null) return null;
+	const credential = interpretCredentials(loaded.credentials, at, loaded.backend);
 	if (credential.kind === "api_key") return credential.apiKey;
-	const token = read.credentials.access_token;
+	const token = loaded.credentials.access_token;
 	return typeof token === "string" && token.trim() !== "" ? token : null;
 }
 //#endregion

package/dist/keyring.js

@@ -0,0 +1,42 @@
+import { createRequire } from "node:module";
+//#region src/keyring.ts
+const isPackaged = () => process.pkg !== void 0;
+const isMissingItem = (err) => {
+	const message = err instanceof Error ? err.message : String(err);
+	return /no matching entry|not found|password not found/i.test(message);
+};
+/**
+* A literal addon specifier makes the standalone bundle require a native module
+* that packaged binaries cannot load.
+*/
+const tryLoadKeyring = () => {
+	if (isPackaged()) return null;
+	try {
+		const { Entry } = createRequire(import.meta.url)(["@napi-rs", "keyring"].join("/"));
+		return {
+			get(service, account) {
+				try {
+					return new Entry(service, account).getPassword();
+				} catch (err) {
+					if (isMissingItem(err)) return null;
+					throw err;
+				}
+			},
+			set(service, account, password) {
+				new Entry(service, account).setPassword(password);
+			},
+			delete(service, account) {
+				try {
+					return new Entry(service, account).deletePassword();
+				} catch (err) {
+					if (isMissingItem(err)) return false;
+					throw err;
+				}
+			}
+		};
+	} catch {
+		return null;
+	}
+};
+//#endregion
+export { tryLoadKeyring };

package/dist/psql/cli.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { i as looksLikeConnectionString, u as runPsql } from "../_chunks/psql-DWH-kc69.js";
+import { i as looksLikeConnectionString, u as runPsql } from "../_chunks/psql-BNljLda2.js";
 //#region src/psql/cli.ts
 /**
 * Standalone psql shim.

package/dist/psql/command/cmd_connect.js

@@ -416,9 +416,10 @@ const buildConninfoRows = (ctx, db) => {
 	const rows = [];
 	rows.push(["Database", database]);
 	rows.push(["Client User", user]);
-	if (host.startsWith("/")) if (hostaddr !== null && hostaddr.length > 0) rows.push(["Host Address", hostaddr]);
-	else rows.push(["Socket Directory", host]);
-	else {
+	if (host.startsWith("/")) {
+		if (hostaddr !== null && hostaddr.length > 0) rows.push(["Host Address", hostaddr]);
+		else rows.push(["Socket Directory", host]);
+	} else {
 		rows.push(["Host", host]);
 		if (hostaddr !== null && hostaddr.length > 0 && hostaddr !== host) rows.push(["Host Address", hostaddr]);
 	}

package/dist/psql/command/cmd_copy.js

@@ -1,6 +1,6 @@
 import { writeErr, writeOut } from "./shared.js";
 import { pumpReadable } from "../wire/copy.js";
-import { m as getPipelineState } from "../../_chunks/cmd_pipeline-CUbBO9U_.js";
+import { m as getPipelineState } from "../../_chunks/cmd_pipeline-CEk93dGN.js";
 import { createReadStream, createWriteStream, promises } from "node:fs";
 import { spawn } from "node:child_process";
 import { Buffer } from "node:buffer";
@@ -603,74 +603,77 @@ const doCopy = async (conn, opts) => {
 	let fromStdin = false;
 	/** Cleanup callbacks run in `finally`. */
 	const cleanups = [];
-	if (opts.direction === "from") if (opts.file !== null) if (opts.program) {
-		try {
-			program = spawnProgram(opts.file, "from");
-		} catch (err) {
-			return failWith(`could not execute command "${opts.file}": ${err instanceof Error ? err.message : String(err)}`);
+	if (opts.direction === "from") {
+		if (opts.file !== null) {
+			if (opts.program) {
+				try {
+					program = spawnProgram(opts.file, "from");
+				} catch (err) {
+					return failWith(`could not execute command "${opts.file}": ${err instanceof Error ? err.message : String(err)}`);
+				}
+				readable = program.readable;
+				const p = program;
+				cleanups.push(async () => {
+					try {
+						p.child.stdout?.destroy();
+					} catch {}
+					await p.closed;
+				});
+			} else {
+				try {
+					if ((await promises.stat(opts.file)).isDirectory()) return failWith(`${opts.file}: cannot copy from/to a directory`);
+				} catch (err) {
+					return failWith(`${opts.file}: ${err instanceof Error ? err.message : String(err)}`);
+				}
+				const stream = createReadStream(opts.file);
+				readable = stream;
+				cleanups.push(() => new Promise((resolve) => {
+					if (stream.destroyed) {
+						resolve();
+						return;
+					}
+					stream.once("close", () => {
+						resolve();
+					});
+					stream.destroy();
+				}));
+			}
+		} else {
+			readable = process.stdin;
+			fromStdin = true;
 		}
-		readable = program.readable;
-		const p = program;
-		cleanups.push(async () => {
+	} else if (opts.file !== null) {
+		if (opts.program) {
 			try {
-				p.child.stdout?.destroy();
-			} catch {}
-			await p.closed;
-		});
-	} else {
-		try {
-			if ((await promises.stat(opts.file)).isDirectory()) return failWith(`${opts.file}: cannot copy from/to a directory`);
-		} catch (err) {
-			return failWith(`${opts.file}: ${err instanceof Error ? err.message : String(err)}`);
-		}
-		const stream = createReadStream(opts.file);
-		readable = stream;
-		cleanups.push(() => new Promise((resolve) => {
-			if (stream.destroyed) {
-				resolve();
-				return;
+				program = spawnProgram(opts.file, "to");
+			} catch (err) {
+				return failWith(`could not execute command "${opts.file}": ${err instanceof Error ? err.message : String(err)}`);
 			}
-			stream.once("close", () => {
-				resolve();
+			writable = program.writable;
+			const p = program;
+			cleanups.push(async () => {
+				try {
+					p.child.stdin?.end();
+				} catch {}
+				await p.closed;
 			});
-			stream.destroy();
-		}));
-	}
-	else {
-		readable = process.stdin;
-		fromStdin = true;
-	}
-	else if (opts.file !== null) if (opts.program) {
-		try {
-			program = spawnProgram(opts.file, "to");
-		} catch (err) {
-			return failWith(`could not execute command "${opts.file}": ${err instanceof Error ? err.message : String(err)}`);
-		}
-		writable = program.writable;
-		const p = program;
-		cleanups.push(async () => {
+		} else {
 			try {
-				p.child.stdin?.end();
+				if ((await promises.stat(opts.file).catch(() => null))?.isDirectory()) return failWith(`${opts.file}: cannot copy from/to a directory`);
 			} catch {}
-			await p.closed;
-		});
-	} else {
-		try {
-			if ((await promises.stat(opts.file).catch(() => null))?.isDirectory()) return failWith(`${opts.file}: cannot copy from/to a directory`);
-		} catch {}
-		const stream = createWriteStream(opts.file);
-		stream.once("error", (e) => {
-			fileWriteErrors.push(e);
-		});
-		writable = stream;
-		cleanups.push(() => new Promise((resolve, reject) => {
-			stream.end((err) => {
-				if (err) reject(err);
-				else resolve();
+			const stream = createWriteStream(opts.file);
+			stream.once("error", (e) => {
+				fileWriteErrors.push(e);
 			});
-		}));
-	}
-	else writable = process.stdout;
+			writable = stream;
+			cleanups.push(() => new Promise((resolve, reject) => {
+				stream.end((err) => {
+					if (err) reject(err);
+					else resolve();
+				});
+			}));
+		}
+	} else writable = process.stdout;
 	let tag = null;
 	try {
 		if (opts.direction === "from") {

package/dist/psql/command/cmd_io.js

@@ -1,2 +1,2 @@
-import { A as cmdPrint, C as cmdGdesc, D as cmdInclude, E as cmdGx, F as registerIoCommands, M as cmdWrite, N as formatWatchTimestamp, O as cmdIncludeRel, P as getQueryFout, S as cmdG, T as cmdGset, b as WATCH_TEST_CONTROLLER, j as cmdWatch, k as cmdOut, w as cmdGexec, x as clearPipelineGateErrors, y as DEFAULT_WATCH_INTERVAL } from "../../_chunks/cmd_pipeline-CUbBO9U_.js";
+import { A as cmdPrint, C as cmdGdesc, D as cmdInclude, E as cmdGx, F as registerIoCommands, M as cmdWrite, N as formatWatchTimestamp, O as cmdIncludeRel, P as getQueryFout, S as cmdG, T as cmdGset, b as WATCH_TEST_CONTROLLER, j as cmdWatch, k as cmdOut, w as cmdGexec, x as clearPipelineGateErrors, y as DEFAULT_WATCH_INTERVAL } from "../../_chunks/cmd_pipeline-CEk93dGN.js";
 export { DEFAULT_WATCH_INTERVAL, WATCH_TEST_CONTROLLER, clearPipelineGateErrors, cmdG, cmdGdesc, cmdGexec, cmdGset, cmdGx, cmdInclude, cmdIncludeRel, cmdOut, cmdPrint, cmdWatch, cmdWrite, formatWatchTimestamp, getQueryFout, registerIoCommands };

package/dist/psql/command/cmd_pipeline.js

@@ -1,2 +1,2 @@
-import { C as cmdGdesc, _ as stagedNamedBindPresent, a as cmdFlush, c as cmdParse, d as cmdSyncPipeline, f as consumeBindState, g as registerPipelineCommands, h as lookupPrepared, i as cmdEndPipeline, l as cmdSendPipeline, m as getPipelineState, n as cmdBindNamed, o as cmdFlushRequest, p as dropPrepared, r as cmdClosePrepared, s as cmdGetResults, t as cmdBind, u as cmdStartPipeline, v as stashPrepared } from "../../_chunks/cmd_pipeline-CUbBO9U_.js";
+import { C as cmdGdesc, _ as stagedNamedBindPresent, a as cmdFlush, c as cmdParse, d as cmdSyncPipeline, f as consumeBindState, g as registerPipelineCommands, h as lookupPrepared, i as cmdEndPipeline, l as cmdSendPipeline, m as getPipelineState, n as cmdBindNamed, o as cmdFlushRequest, p as dropPrepared, r as cmdClosePrepared, s as cmdGetResults, t as cmdBind, u as cmdStartPipeline, v as stashPrepared } from "../../_chunks/cmd_pipeline-CEk93dGN.js";
 export { cmdBind, cmdBindNamed, cmdClosePrepared, cmdEndPipeline, cmdFlush, cmdFlushRequest, cmdGdesc, cmdGetResults, cmdParse, cmdSendPipeline, cmdStartPipeline, cmdSyncPipeline, consumeBindState, dropPrepared, getPipelineState, lookupPrepared, registerPipelineCommands, stagedNamedBindPresent, stashPrepared };

package/dist/psql/command/dispatch.js

@@ -2,7 +2,7 @@ import { writeErr } from "./shared.js";
 import { scanSlashArgs } from "../scanner/slash.js";
 import { registerConnectCommands } from "./cmd_connect.js";
 import { cmdCd, cmdCopyright, cmdEcho, cmdEdit, cmdErrverbose, cmdGetenv, cmdHelpSQL, cmdPrompt, cmdQecho, cmdQuit, cmdReset, cmdS, cmdSet, cmdSetenv, cmdShell, cmdSlashHelp, cmdTiming, cmdUnset, cmdWarn } from "./cmd_meta.js";
-import { F as registerIoCommands, g as registerPipelineCommands } from "../../_chunks/cmd_pipeline-CUbBO9U_.js";
+import { F as registerIoCommands, g as registerPipelineCommands } from "../../_chunks/cmd_pipeline-CEk93dGN.js";
 import { cmdA, cmdC, cmdEncoding, cmdF, cmdH, cmdPset, cmdT, cmdTitleAttr, cmdX } from "./cmd_format.js";
 import { registerCopyCommands } from "./cmd_copy.js";
 import { registerDescribeCommands } from "./cmd_describe.js";

package/dist/psql/core/common.js

@@ -1,2 +1,2 @@
-import { B as psqlExec, G as writeQueryError, H as renderResultSet, I as __testing, L as captureLastError, R as executeAndPrint, U as sendQuery, V as refreshErrorVars, W as stripLeadingCommentsAndWS, z as pickOut } from "../../_chunks/cmd_pipeline-CUbBO9U_.js";
+import { B as psqlExec, G as writeQueryError, H as renderResultSet, I as __testing, L as captureLastError, R as executeAndPrint, U as sendQuery, V as refreshErrorVars, W as stripLeadingCommentsAndWS, z as pickOut } from "../../_chunks/cmd_pipeline-CEk93dGN.js";
 export { __testing, captureLastError, executeAndPrint, pickOut, psqlExec, refreshErrorVars, renderResultSet, sendQuery, stripLeadingCommentsAndWS, writeQueryError };

package/dist/psql/core/mainloop.js

@@ -2,7 +2,7 @@ import { COND_COMMAND_NAMES, attachCondStack, cmdElif, cmdElse, cmdEndif, cmdIf
 import { scanSlashArgs } from "../scanner/slash.js";
 import { formatDurationMs } from "../print/units.js";
 import { appendHistory, defaultHistoryPath, loadHistory, resolveHistSize, truncateHistory } from "../io/history.js";
-import { G as writeQueryError, H as renderResultSet, L as captureLastError, U as sendQuery, V as refreshErrorVars, f as consumeBindState, m as getPipelineState, z as pickOut } from "../../_chunks/cmd_pipeline-CUbBO9U_.js";
+import { G as writeQueryError, H as renderResultSet, L as captureLastError, U as sendQuery, V as refreshErrorVars, f as consumeBindState, m as getPipelineState, z as pickOut } from "../../_chunks/cmd_pipeline-CEk93dGN.js";
 import { consumeNext } from "../command/inputQueue.js";
 import { psqlCompleter } from "../complete/index.js";
 import { LineEditor } from "../io/lineEditor/index.js";

package/dist/psql/core/startup.js

@@ -1,2 +1,2 @@
-import { f as CLIENT_VERSION, h as parseStartupArgs, m as formatParseError, p as applyStartupArgs } from "../../_chunks/psql-DWH-kc69.js";
+import { f as CLIENT_VERSION, h as parseStartupArgs, m as formatParseError, p as applyStartupArgs } from "../../_chunks/psql-BNljLda2.js";
 export { CLIENT_VERSION, applyStartupArgs, formatParseError, parseStartupArgs };

package/dist/psql/index.js

@@ -1,2 +1,2 @@
-import { a as mergeConnectOptions, c as parseConnectionUriService, d as serviceEntryToConnectOptions, i as looksLikeConnectionString, l as parseConninfo, n as envConnectionDefaults, o as parseConnectionUri, r as libpqConnectionDefaults, s as parseConnectionUriPartial, t as defaultClientCertDefaults, u as runPsql } from "../_chunks/psql-DWH-kc69.js";
+import { a as mergeConnectOptions, c as parseConnectionUriService, d as serviceEntryToConnectOptions, i as looksLikeConnectionString, l as parseConninfo, n as envConnectionDefaults, o as parseConnectionUri, r as libpqConnectionDefaults, s as parseConnectionUriPartial, t as defaultClientCertDefaults, u as runPsql } from "../_chunks/psql-BNljLda2.js";
 export { defaultClientCertDefaults, envConnectionDefaults, libpqConnectionDefaults, looksLikeConnectionString, mergeConnectOptions, parseConnectionUri, parseConnectionUriPartial, parseConnectionUriService, parseConninfo, runPsql, serviceEntryToConnectOptions };

package/dist/psql/io/psqlrc.js

@@ -1,6 +1,6 @@
 import { COND_COMMAND_NAMES, attachCondStack } from "../command/cmd_cond.js";
 import { scanSlashArgs } from "../scanner/slash.js";
-import { U as sendQuery } from "../../_chunks/cmd_pipeline-CUbBO9U_.js";
+import { U as sendQuery } from "../../_chunks/cmd_pipeline-CEk93dGN.js";
 import { dispatchBackslash } from "../command/dispatch.js";
 import { initialScanState } from "../types/scanner.js";
 import { scanSql } from "../scanner/sql.js";
@@ -284,16 +284,18 @@ const executeInputString = async (input, ctx, opts = {}) => {
 		queryBuf += r.sql;
 		working = "";
 	}
-	if (queryBuf.trim().length > 0 && ctx.settings.db && ctx.cond.isActive()) if (print) {
-		if ((await sendQuery(ctx, queryBuf)).hadError) hadError = true;
-		noteConnectionLost();
-	} else try {
-		await ctx.settings.db.execSimple(queryBuf);
-	} catch (err) {
-		const msg = err instanceof Error ? err.message : String(err);
-		ctx.stderr.write(`psql: ERROR:  ${msg}\n`);
-		hadError = true;
-		noteConnectionLost();
+	if (queryBuf.trim().length > 0 && ctx.settings.db && ctx.cond.isActive()) {
+		if (print) {
+			if ((await sendQuery(ctx, queryBuf)).hadError) hadError = true;
+			noteConnectionLost();
+		} else try {
+			await ctx.settings.db.execSimple(queryBuf);
+		} catch (err) {
+			const msg = err instanceof Error ? err.message : String(err);
+			ctx.stderr.write(`psql: ERROR:  ${msg}\n`);
+			hadError = true;
+			noteConnectionLost();
+		}
 	}
 	return {
 		hadError,

package/dist/psql/print/aligned.js

@@ -458,8 +458,10 @@ const buildRule = (widths, border, glyphs, position) => {
 	for (let i = 0; i < widths.length; i++) {
 		const pad = border === 0 ? 0 : 1;
 		out += hrule.repeat(widths[i] + pad * 2);
-		if (i < widths.length - 1) if (border === 0) out += " ";
-		else out += mid;
+		if (i < widths.length - 1) {
+			if (border === 0) out += " ";
+			else out += mid;
+		}
 	}
 	if (border === 2 || border === 3) out += right;
 	return out;
@@ -980,9 +982,11 @@ const renderVerticalCell = (headerLines, dataLines, nameWidth, dwidth, border, g
 			if (border === 0 && hmultiline && !oldAscii) swidth++;
 			out += " ".repeat(swidth);
 		}
-		if (border > 0) if (offset !== 0) out += glyphs.midvruleWrap;
-		else if (dLine === 0) out += vrule;
-		else out += glyphs.midvruleNl;
+		if (border > 0) {
+			if (offset !== 0) out += glyphs.midvruleWrap;
+			else if (dLine === 0) out += vrule;
+			else out += glyphs.midvruleNl;
+		}
 		if (!dcomplete) {
 			const chunk = dataChunks[dLine];
 			out += offset === 0 ? " " : glyphs.wrapLeft;

package/dist/psql/wire/tls.js

@@ -105,15 +105,17 @@ async function negotiateTls(socket, sslMode, tlsOpts = {}, fileOpts = {}, negoti
 */
 async function loadTlsFileOptions(tlsOpts, fileOpts, sslMode) {
 	const merged = { ...tlsOpts };
-	if ((sslMode === void 0 || sslMode === "verify-ca" || sslMode === "verify-full") && fileOpts.sslrootcert !== void 0 && fileOpts.sslrootcert !== "") if (fileOpts.sslrootcert === "system") {
-		const systemCas = [];
-		const sslCertFile = process.env.SSL_CERT_FILE;
-		if (sslCertFile !== void 0 && sslCertFile !== "") systemCas.push(await readPem("sslrootcert", sslCertFile, "CERTIFICATE"));
-		const sslCertDir = process.env.SSL_CERT_DIR;
-		if (sslCertDir !== void 0 && sslCertDir !== "") systemCas.push(...await readCaDir(sslCertDir));
-		if (systemCas.length === 1) merged.ca = systemCas[0];
-		else if (systemCas.length > 1) merged.ca = systemCas;
-	} else merged.ca = await readPem("sslrootcert", fileOpts.sslrootcert, "CERTIFICATE");
+	if ((sslMode === void 0 || sslMode === "verify-ca" || sslMode === "verify-full") && fileOpts.sslrootcert !== void 0 && fileOpts.sslrootcert !== "") {
+		if (fileOpts.sslrootcert === "system") {
+			const systemCas = [];
+			const sslCertFile = process.env.SSL_CERT_FILE;
+			if (sslCertFile !== void 0 && sslCertFile !== "") systemCas.push(await readPem("sslrootcert", sslCertFile, "CERTIFICATE"));
+			const sslCertDir = process.env.SSL_CERT_DIR;
+			if (sslCertDir !== void 0 && sslCertDir !== "") systemCas.push(...await readCaDir(sslCertDir));
+			if (systemCas.length === 1) merged.ca = systemCas[0];
+			else if (systemCas.length > 1) merged.ca = systemCas;
+		} else merged.ca = await readPem("sslrootcert", fileOpts.sslrootcert, "CERTIFICATE");
+	}
 	const certMode = fileOpts.sslcertmode ?? "allow";
 	const clientCert = fileOpts.sslcert !== void 0 && fileOpts.sslcert !== "" ? fileOpts.sslcert : void 0;
 	if (certMode === "require" && clientCert === void 0) throw new Error(`sslcertmode value "require" requires a client certificate`);