neon 3.1.0 → 3.1.1

package/dist/psql/core/mainloop.js

@@ -2,8 +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 { captureLastError, pickOut, refreshErrorVars, renderResultSet, sendQuery, writeQueryError } from "./common.js";
-import { consumeBindState, getPipelineState } from "../command/cmd_pipeline.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 { 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,657 +1,2 @@
-import { setStartupVars } from "./syncVars.js";
-import { helpVariables, slashUsage, usage } from "./help.js";
-import { lookupPgPass } from "../io/pgpass.js";
-import { envConnectionDefaults, libpqConnectionDefaults, looksLikeConnectionString, mergeConnectOptions, parseConnectionUriPartial, parseConninfo, serviceEntryToConnectOptions } from "../index.js";
-//#region src/psql/core/startup.ts
-/**
-* psql startup-args parser + applier.
-*
-* TypeScript port of `parse_psql_options()` / the top of `main()` in
-* `src/bin/psql/startup.c`. Two responsibilities:
-*
-*   1. `parseStartupArgs(argv)` — hand-written getopt_long-equivalent that
-*      walks the argv array once, decoding short (`-c`) and long (`--command`)
-*      options, and accumulates an ordered list of `-c`/`-f` actions plus a
-*      bag of settings flags. Positional arguments follow the upstream
-*      `[DBNAME [USERNAME]]` rule.
-*
-*      We hand-roll the parser instead of pulling in `yargs` (or similar)
-*      because upstream psql has subtle precedence rules — actions are
-*      ordered, `-v NAME` without `=` deletes the variable, `-X` interacts
-*      with `.psqlrc` discovery, etc. The parser stays under ~250 LOC and is
-*      fully covered by unit tests.
-*
-*   2. `applyStartupArgs(args, settings, baseConnect)` — mutates `settings`
-*      (and its var store) in-place to reflect parsed flags, then returns
-*      the connect options the caller should use plus the ordered list of
-*      pre-REPL actions to execute (currently just `-c` / `-f`).
-*
-* Out-of-scope for WP-26 but the table mentions them so they're listed below:
-*   - `-1` / `--single-transaction` — we accept and record on the args but
-*     do not wire its semantics in the caller. Tracked for a follow-up.
-*   - `-C` — accepted as a no-op (since-PG17 connection-check skip).
-*   - `-l` / `--list` — recorded; the caller may use it later to short-circuit
-*     the REPL with a `\l` and exit. Not wired here.
-*   - `-L logfile`, `-o output` — recorded on args. Routing into the printer
-*     is owned by other WPs (logfile streaming and output redirection).
-*   - `--help[=topic]` — returns a ParseError with `kind: 'help'` and the
-*     help text already rendered as `message`. Caller writes and exits 0.
-*   - `-V` / `--version` — returns `kind: 'version'` with the version string.
-*     Caller writes and exits 0.
-*
-* Help/version text is rendered through `./help.ts` so the formatting stays
-* in lock-step with `\?` output (WP-18). The version string mirrors upstream
-* `psql (PostgreSQL) PG_VERSION` and is currently hard-coded — the embedded
-* psql doesn't have a build-system PG_VERSION constant. A follow-up could
-* surface the real PG version from a const, but for now we expose the
-* embedded build's version label.
-*/
-/** Short options that consume the next argv slot (or attached value). */
-const SHORT_WITH_ARG = /* @__PURE__ */ new Set([
-	"c",
-	"d",
-	"f",
-	"F",
-	"h",
-	"L",
-	"o",
-	"p",
-	"P",
-	"R",
-	"T",
-	"U",
-	"v"
-]);
-/** Short flags (no argument). */
-const SHORT_NO_ARG = /* @__PURE__ */ new Set([
-	"a",
-	"A",
-	"b",
-	"C",
-	"e",
-	"E",
-	"H",
-	"l",
-	"n",
-	"q",
-	"s",
-	"S",
-	"t",
-	"V",
-	"w",
-	"W",
-	"x",
-	"X",
-	"z",
-	"0",
-	"1",
-	"?"
-]);
-/** Long option → canonical short equivalent (or sentinel string). */
-const LONG_MAP = {
-	"echo-all": "a",
-	"no-align": "A",
-	command: "c",
-	dbname: "d",
-	"echo-queries": "e",
-	"echo-errors": "b",
-	"echo-hidden": "E",
-	file: "f",
-	"field-separator": "F",
-	"field-separator-zero": "z",
-	host: "h",
-	html: "H",
-	list: "l",
-	"log-file": "L",
-	"no-readline": "n",
-	"single-transaction": "1",
-	output: "o",
-	port: "p",
-	pset: "P",
-	quiet: "q",
-	"record-separator": "R",
-	"record-separator-zero": "0",
-	"single-step": "s",
-	"single-line": "S",
-	"tuples-only": "t",
-	"table-attr": "T",
-	username: "U",
-	set: "v",
-	variable: "v",
-	version: "V",
-	"no-password": "w",
-	password: "W",
-	expanded: "x",
-	"no-psqlrc": "X",
-	"no-pager": "__no_pager__",
-	"on-error-stop": "__on_error_stop__",
-	help: "__help__",
-	csv: "__csv__"
-};
-/** Long options that REQUIRE an attached value (or one in the next argv). */
-const LONG_WITH_ARG = /* @__PURE__ */ new Set([
-	"command",
-	"dbname",
-	"file",
-	"field-separator",
-	"host",
-	"log-file",
-	"output",
-	"port",
-	"pset",
-	"record-separator",
-	"table-attr",
-	"username",
-	"set",
-	"variable"
-]);
-/** Long options whose value is optional (only attached with `=`). */
-const LONG_OPTIONAL_ARG = /* @__PURE__ */ new Set(["help", "echo-hidden"]);
-const blankArgs = () => ({
-	actions: [],
-	variables: [],
-	noPsqlrc: false,
-	noReadline: false,
-	echoAll: false,
-	echoHidden: "off",
-	echoErrors: false,
-	echoQueries: false,
-	quiet: false,
-	singleline: false,
-	singlestep: false,
-	noAlign: false,
-	noPager: false,
-	htmlMode: false,
-	tuplesOnly: false,
-	expanded: false,
-	csvOutput: false,
-	onErrorStop: false,
-	fieldSepZero: false,
-	recordSepZero: false,
-	pset: [],
-	list: false,
-	singleTransaction: false,
-	help: false,
-	version: false,
-	positional: []
-});
-const renderToString = (fn) => {
-	const chunks = [];
-	fn({ write(chunk) {
-		chunks.push(typeof chunk === "string" ? chunk : Buffer.from(chunk).toString("utf8"));
-		return true;
-	} });
-	return chunks.join("");
-};
-const renderHelp = (topic) => {
-	if (topic === void 0 || topic === "options") return renderToString((out) => {
-		usage(out);
-	});
-	if (topic === "commands") return renderToString((out) => {
-		slashUsage(out, false);
-	});
-	if (topic === "variables") return renderToString((out) => {
-		helpVariables(out);
-	});
-	return "";
-};
-/**
-* Version label for the embedded TypeScript psql. This is the "client"
-* identifier — the analogue of upstream psql's compiled-in `PG_VERSION`.
-* The embedded psql is not a real PostgreSQL build, so we track our own
-* implementation version here. It seeds the `VERSION_NAME` psql var (and,
-* via {@link setStartupVars}, the numeric `VERSION_NUM`); keep it as a
-* `MAJOR.MINOR.PATCH` string so the numeric mapping stays meaningful. Bump
-* alongside meaningful behaviour changes to the embedded psql.
-*/
-const CLIENT_VERSION = "1.0.0";
-const VERSION_STRING = `psql (PostgreSQL) embedded-ts (neon ${CLIENT_VERSION})`;
-const pushAction = (acts, a) => {
-	acts.push(a);
-};
-const pushVariable = (vars, raw) => {
-	const eq = raw.indexOf("=");
-	if (eq < 0) {
-		vars.push({
-			name: raw,
-			value: ""
-		});
-		return;
-	}
-	vars.push({
-		name: raw.slice(0, eq),
-		value: raw.slice(eq + 1)
-	});
-};
-/**
-* `-d VALUE` resolution. libpq accepts three shapes for the value:
-*
-*   1. Bare database name (no `=`, no `postgres[ql]://` prefix) — set
-*      `args.database` directly. This is by far the common case.
-*   2. Connection URI (`postgresql://…` / `postgres://…`) — parse it and
-*      lift the fields it specifies onto `args` (host, port, user, etc.).
-*   3. Conninfo key=value pairs separated by whitespace — same, but parsed
-*      via `parseConninfo`.
-*
-* The test corpus for upstream `001_basic.pl` uses shape (3) to open a
-* walsender connection: `-d "dbname=postgres replication=database"`. We
-* fold any conninfo-only fields (currently only `replication`) onto a
-* dedicated `args.replication` slot that `applyStartupArgs` threads into
-* `ConnectOptions.replication`.
-*/
-const applyDashD = (args, value) => {
-	if (!looksLikeConnectionString(value)) {
-		args.database = value;
-		return;
-	}
-	const parsed = value.startsWith("postgresql://") || value.startsWith("postgres://") ? parseConnectionUriPartial(value) : parseConninfo(value);
-	args.dashD = {
-		...args.dashD ?? {},
-		...parsed
-	};
-	if (parsed.host !== void 0 && args.host === void 0) args.host = parsed.host;
-	if (parsed.port !== void 0 && args.port === void 0) args.port = parsed.port;
-	if (parsed.user !== void 0 && args.user === void 0) args.user = parsed.user;
-	if (parsed.password !== void 0 && args.password === void 0) args.password = parsed.password;
-	if (parsed.database !== void 0 && args.database === void 0) args.database = parsed.database;
-	if (parsed.replication !== void 0) args.replication = parsed.replication;
-};
-const parseStartupArgs = (argv) => {
-	const args = blankArgs();
-	const actions = [];
-	const variables = [];
-	const pset = [];
-	let i = 0;
-	const n = argv.length;
-	const needValue = (flagDisplay) => {
-		if (i + 1 >= n) return {
-			kind: "missing-arg",
-			message: `option requires an argument -- ${flagDisplay}`
-		};
-		i += 1;
-		return argv[i];
-	};
-	const applyShort = (letter, attachedValue, flagDisplay) => {
-		const takesArg = SHORT_WITH_ARG.has(letter);
-		let value;
-		if (takesArg) if (attachedValue !== void 0) value = attachedValue;
-		else {
-			const v = needValue(flagDisplay);
-			if (typeof v !== "string") return v;
-			value = v;
-		}
-		else if (attachedValue !== void 0) return {
-			kind: "invalid-option",
-			message: `option does not take an argument -- ${letter}`
-		};
-		switch (letter) {
-			case "a":
-				args.echoAll = true;
-				return null;
-			case "A":
-				args.noAlign = true;
-				return null;
-			case "b":
-				args.echoErrors = true;
-				return null;
-			case "C": return null;
-			case "c":
-				pushAction(actions, {
-					kind: "command",
-					sql: value
-				});
-				return null;
-			case "d":
-				applyDashD(args, value);
-				return null;
-			case "e":
-				args.echoQueries = true;
-				return null;
-			case "E":
-				args.echoHidden = "on";
-				return null;
-			case "f":
-				pushAction(actions, {
-					kind: "file",
-					path: value
-				});
-				return null;
-			case "F":
-				args.fieldSep = value;
-				args.fieldSepZero = false;
-				return null;
-			case "h":
-				args.host = value;
-				return null;
-			case "H":
-				args.htmlMode = true;
-				return null;
-			case "l":
-				args.list = true;
-				return null;
-			case "L":
-				args.log = value;
-				return null;
-			case "n":
-				args.noReadline = true;
-				return null;
-			case "o":
-				args.output = value;
-				return null;
-			case "p": {
-				const p = Number.parseInt(value, 10);
-				if (!Number.isFinite(p) || p <= 0 || p > 65535) return {
-					kind: "invalid-value",
-					message: `invalid port number: "${value}"`
-				};
-				args.port = p;
-				return null;
-			}
-			case "P":
-				pset.push(value);
-				return null;
-			case "q":
-				args.quiet = true;
-				return null;
-			case "R":
-				args.recordSep = value;
-				args.recordSepZero = false;
-				return null;
-			case "s":
-				args.singlestep = true;
-				return null;
-			case "S":
-				args.singleline = true;
-				return null;
-			case "t":
-				args.tuplesOnly = true;
-				return null;
-			case "T":
-				pset.push(`tableattr=${value}`);
-				return null;
-			case "U":
-				args.user = value;
-				return null;
-			case "v":
-				pushVariable(variables, value);
-				return null;
-			case "V": return {
-				kind: "version",
-				message: VERSION_STRING
-			};
-			case "w":
-				args.promptPassword = false;
-				return null;
-			case "W":
-				args.promptPassword = true;
-				return null;
-			case "x":
-				args.expanded = true;
-				return null;
-			case "X":
-				args.noPsqlrc = true;
-				return null;
-			case "z":
-				args.fieldSepZero = true;
-				return null;
-			case "0":
-				args.recordSepZero = true;
-				return null;
-			case "1":
-				args.singleTransaction = true;
-				return null;
-			case "?": return {
-				kind: "help",
-				message: renderHelp(void 0)
-			};
-			default: return {
-				kind: "invalid-option",
-				message: `invalid option -- ${letter}`
-			};
-		}
-	};
-	while (i < n) {
-		const tok = argv[i];
-		if (tok === "--") {
-			i += 1;
-			while (i < n) {
-				args.positional.push(argv[i]);
-				i += 1;
-			}
-			break;
-		}
-		if (tok.startsWith("--")) {
-			const eq = tok.indexOf("=");
-			const name = eq < 0 ? tok.slice(2) : tok.slice(2, eq);
-			const attached = eq < 0 ? void 0 : tok.slice(eq + 1);
-			if (name === "csv") {
-				if (attached !== void 0) return {
-					kind: "invalid-option",
-					message: `option does not take an argument: --${name}`
-				};
-				args.csvOutput = true;
-				i += 1;
-				continue;
-			}
-			if (name === "no-pager") {
-				if (attached !== void 0) return {
-					kind: "invalid-option",
-					message: `option does not take an argument: --${name}`
-				};
-				args.noPager = true;
-				i += 1;
-				continue;
-			}
-			if (name === "on-error-stop") {
-				if (attached !== void 0) return {
-					kind: "invalid-option",
-					message: `option does not take an argument: --${name}`
-				};
-				args.onErrorStop = true;
-				variables.push({
-					name: "ON_ERROR_STOP",
-					value: "on"
-				});
-				i += 1;
-				continue;
-			}
-			if (name === "help") {
-				const topic = attached;
-				if (topic !== void 0 && topic !== "options" && topic !== "commands" && topic !== "variables") return {
-					kind: "invalid-option",
-					message: `unrecognized help topic: ${topic}`
-				};
-				return {
-					kind: "help",
-					message: renderHelp(topic)
-				};
-			}
-			if (name === "echo-hidden") {
-				if (attached === void 0) args.echoHidden = "on";
-				else if (attached === "noexec") args.echoHidden = "noexec";
-				else if (attached === "" || attached === "on") args.echoHidden = "on";
-				else return {
-					kind: "invalid-value",
-					message: `invalid value for --echo-hidden: "${attached}"`
-				};
-				i += 1;
-				continue;
-			}
-			const short = LONG_MAP[name];
-			if (short === void 0) return {
-				kind: "invalid-option",
-				message: `unrecognized option: --${name}`
-			};
-			const requiresArg = LONG_WITH_ARG.has(name);
-			const optionalArg = LONG_OPTIONAL_ARG.has(name);
-			let value = attached;
-			if (requiresArg && value === void 0) {
-				if (i + 1 >= n) return {
-					kind: "missing-arg",
-					message: `option requires an argument: --${name}`
-				};
-				i += 1;
-				value = argv[i];
-			} else if (!requiresArg && !optionalArg && value !== void 0) return {
-				kind: "invalid-option",
-				message: `option does not take an argument: --${name}`
-			};
-			const err = applyShort(short, value, `--${name}`);
-			if (err) return err;
-			i += 1;
-			continue;
-		}
-		if (tok.startsWith("-") && tok.length > 1) {
-			let k = 1;
-			while (k < tok.length) {
-				const letter = tok[k];
-				if (!SHORT_WITH_ARG.has(letter) && !SHORT_NO_ARG.has(letter)) return {
-					kind: "invalid-option",
-					message: `invalid option -- ${letter}`
-				};
-				if (SHORT_WITH_ARG.has(letter)) {
-					const remainder = tok.slice(k + 1);
-					const err = applyShort(letter, remainder.length > 0 ? remainder : void 0, letter);
-					if (err) return err;
-					k = tok.length;
-					break;
-				}
-				const err = applyShort(letter, void 0, letter);
-				if (err) return err;
-				k += 1;
-			}
-			i += 1;
-			continue;
-		}
-		args.positional.push(tok);
-		i += 1;
-	}
-	return {
-		...args,
-		actions,
-		variables,
-		pset
-	};
-};
-const applyStartupArgs = (args, settings, baseConnectOpts, resolution) => {
-	setStartupVars(settings.vars, CLIENT_VERSION);
-	for (const v of args.variables) if (v.value === "") settings.vars.unset(v.name);
-	else settings.vars.set(v.name, v.value);
-	if (args.echoAll) settings.vars.set("ECHO", "all");
-	if (args.echoErrors) settings.vars.set("ECHO", "errors");
-	if (args.echoQueries) settings.vars.set("ECHO", "queries");
-	if (args.echoHidden !== "off") {
-		settings.echoHidden = args.echoHidden;
-		settings.vars.set("ECHO_HIDDEN", args.echoHidden === "noexec" ? "noexec" : "on");
-	}
-	if (args.quiet) {
-		settings.quiet = true;
-		settings.vars.set("QUIET", "on");
-	}
-	if (args.singleline) {
-		settings.singleline = true;
-		settings.vars.set("SINGLELINE", "on");
-	}
-	if (args.singlestep) {
-		settings.singlestep = true;
-		settings.vars.set("SINGLESTEP", "on");
-	}
-	if (args.onErrorStop) {
-		settings.onErrorStop = true;
-		settings.vars.set("ON_ERROR_STOP", "on");
-	}
-	if (args.noAlign) settings.popt.topt.format = "unaligned";
-	if (args.htmlMode) settings.popt.topt.format = "html";
-	if (args.csvOutput) settings.popt.topt.format = "csv";
-	if (args.tuplesOnly) settings.popt.topt.tuplesOnly = true;
-	if (args.expanded) settings.popt.topt.expanded = "on";
-	if (args.fieldSepZero) settings.popt.topt.fieldSep = "\0";
-	else if (args.fieldSep !== void 0) settings.popt.topt.fieldSep = args.fieldSep;
-	if (args.recordSepZero) settings.popt.topt.recordSep = "\0";
-	else if (args.recordSep !== void 0) settings.popt.topt.recordSep = args.recordSep;
-	if (args.noPager) settings.popt.topt.pager = "off";
-	for (const directive of args.pset) {
-		const eq = directive.indexOf("=");
-		if (eq >= 0) {
-			const key = directive.slice(0, eq);
-			const val = directive.slice(eq + 1);
-			if (key === "tableattr" || key === "T") settings.popt.topt.tableAttr = val.length > 0 ? val : null;
-			else if (key === "pager") {
-				if (val === "on" || val === "off" || val === "always") settings.popt.topt.pager = val;
-			}
-		}
-	}
-	let dbname = args.database;
-	let username = args.user;
-	if (args.positional[0] && !dbname) dbname = args.positional[0];
-	if (args.positional[1] && !username) username = args.positional[1];
-	const argvLayer = { ...args.dashD ?? {} };
-	if (args.host !== void 0) argvLayer.host = args.host;
-	if (args.port !== void 0) argvLayer.port = args.port;
-	if (username !== void 0) argvLayer.user = username;
-	if (dbname !== void 0) argvLayer.database = dbname;
-	if (args.password !== void 0) argvLayer.password = args.password;
-	if (args.replication !== void 0) argvLayer.replication = args.replication;
-	let connect;
-	if (resolution === void 0) connect = {
-		...baseConnectOpts ?? {
-			host: "localhost",
-			port: 5432,
-			user: "",
-			database: "",
-			ssl: "prefer"
-		},
-		...argvLayer
-	};
-	else connect = resolveLayeredConnect(argvLayer, resolution, baseConnectOpts);
-	return {
-		connect,
-		preActions: args.actions
-	};
-};
-/**
-* Run the layered connection-parameter merge.
-*
-*   argv > URI partial > PG* env > .pgpass (password only) > service > libpq defaults
-*
-* `baseConnectOpts` (the legacy `ConnectOptions` argument) is treated as a
-* pre-baked URI partial when the resolution path is used WITHOUT an explicit
-* `uriPartial`. This keeps the door open for callers that still want to
-* pass a fully-defaulted URI shape from `parseConnectionUri`.
-*/
-const resolveLayeredConnect = (argvLayer, resolution, legacyBase) => {
-	const env = resolution.env ?? {};
-	const uriPartial = resolution.uriPartial ?? (legacyBase !== void 0 ? legacyBase : {});
-	const serviceName = resolution.serviceName ?? env.PGSERVICE;
-	let serviceEntry;
-	if (serviceName !== void 0 && serviceName !== "") {
-		serviceEntry = resolution.services?.get(serviceName);
-		if (serviceEntry === void 0) throw new Error(`definition of service "${serviceName}" not found`);
-	}
-	const serviceLayer = serviceEntry !== void 0 ? serviceEntryToConnectOptions(serviceEntry) : {};
-	const envLayer = envConnectionDefaults(env);
-	const defaults = libpqConnectionDefaults(env);
-	const layers = [
-		argvLayer,
-		uriPartial,
-		envLayer,
-		serviceLayer
-	];
-	let merged = mergeConnectOptions(layers, defaults);
-	if (merged.password === void 0) {
-		const pgpassPwd = lookupPgPass(resolution.pgpassEntries ?? [], {
-			host: merged.host,
-			port: merged.port,
-			database: merged.database !== "" ? merged.database : merged.user,
-			user: merged.user
-		});
-		if (pgpassPwd !== void 0) {
-			const pgpassLayer = { password: pgpassPwd };
-			merged = mergeConnectOptions([...layers, pgpassLayer], defaults);
-		}
-	}
-	return merged;
-};
-const formatParseError = (err) => err.message;
-//#endregion
+import { f as CLIENT_VERSION, h as parseStartupArgs, m as formatParseError, p as applyStartupArgs } from "../../_chunks/psql-DWH-kc69.js";
 export { CLIENT_VERSION, applyStartupArgs, formatParseError, parseStartupArgs };