neonctl 2.28.0 → 2.29.1

package/dist/psql/core/startup.js

@@ -41,121 +41,121 @@
  * surface the real PG version from a const, but for now we expose the
  * embedded build's version label.
  */
-import { envConnectionDefaults, libpqConnectionDefaults, looksLikeConnectionString, mergeConnectOptions, parseConninfo, parseConnectionUriPartial, serviceEntryToConnectOptions, } from '../index.js';
-import { lookupPgPass } from '../io/pgpass.js';
-import { setStartupVars } from './syncVars.js';
-import { helpVariables, slashUsage, usage } from './help.js';
+import { envConnectionDefaults, libpqConnectionDefaults, looksLikeConnectionString, mergeConnectOptions, parseConnectionUriPartial, parseConninfo, serviceEntryToConnectOptions, } from "../index.js";
+import { lookupPgPass } from "../io/pgpass.js";
+import { helpVariables, slashUsage, usage } from "./help.js";
+import { setStartupVars } from "./syncVars.js";
 // ---------------------------------------------------------------------------
 // Internal helpers.
 // ---------------------------------------------------------------------------
 /** Short options that consume the next argv slot (or attached value). */
 const SHORT_WITH_ARG = new Set([
-    'c',
-    'd',
-    'f',
-    'F',
-    'h',
-    'L',
-    'o',
-    'p',
-    'P',
-    'R',
-    'T',
-    'U',
-    'v',
+    "c",
+    "d",
+    "f",
+    "F",
+    "h",
+    "L",
+    "o",
+    "p",
+    "P",
+    "R",
+    "T",
+    "U",
+    "v",
 ]);
 /** Short flags (no argument). */
 const SHORT_NO_ARG = new Set([
-    'a',
-    'A',
-    'b',
-    'C',
-    'e',
-    'E',
-    'H',
-    'l',
-    'n',
-    'q',
-    's',
-    'S',
-    't',
-    'V',
-    'w',
-    'W',
-    'x',
-    'X',
-    'z',
-    '0',
-    '1',
-    '?',
+    "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__',
+    "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 = new Set([
-    'command',
-    'dbname',
-    'file',
-    'field-separator',
-    'host',
-    'log-file',
-    'output',
-    'port',
-    'pset',
-    'record-separator',
-    'table-attr',
-    'username',
-    'set',
-    'variable',
+    "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 = new Set(['help', 'echo-hidden']);
+const LONG_OPTIONAL_ARG = new Set(["help", "echo-hidden"]);
 const blankArgs = () => ({
     actions: [],
     variables: [],
     noPsqlrc: false,
     noReadline: false,
     echoAll: false,
-    echoHidden: 'off',
+    echoHidden: "off",
     echoErrors: false,
     echoQueries: false,
     quiet: false,
@@ -181,30 +181,32 @@ const renderToString = (fn) => {
     const chunks = [];
     const sink = {
         write(chunk) {
-            chunks.push(typeof chunk === 'string' ? chunk : Buffer.from(chunk).toString('utf8'));
+            chunks.push(typeof chunk === "string"
+                ? chunk
+                : Buffer.from(chunk).toString("utf8"));
             return true;
         },
     };
     fn(sink);
-    return chunks.join('');
+    return chunks.join("");
 };
 const renderHelp = (topic) => {
-    if (topic === undefined || topic === 'options') {
+    if (topic === undefined || topic === "options") {
         return renderToString((out) => {
             usage(out);
         });
     }
-    if (topic === 'commands') {
+    if (topic === "commands") {
         return renderToString((out) => {
             slashUsage(out, false);
         });
     }
-    if (topic === 'variables') {
+    if (topic === "variables") {
         return renderToString((out) => {
             helpVariables(out);
         });
     }
-    return '';
+    return "";
 };
 /**
  * Version label for the embedded TypeScript psql. This is the "client"
@@ -215,7 +217,7 @@ const renderHelp = (topic) => {
  * `MAJOR.MINOR.PATCH` string so the numeric mapping stays meaningful. Bump
  * alongside meaningful behaviour changes to the embedded psql.
  */
-export const CLIENT_VERSION = '1.0.0';
+export const CLIENT_VERSION = "1.0.0";
 // `psql --version` / `-V` output. Mirrors upstream's `psql (PostgreSQL)
 // <PG_VERSION>` SHAPE (tools parse the leading `psql (PostgreSQL)`), with an
 // `embedded-ts` label in place of a real PG build number since this is a
@@ -226,12 +228,12 @@ const pushAction = (acts, a) => {
     acts.push(a);
 };
 const pushVariable = (vars, raw) => {
-    const eq = raw.indexOf('=');
+    const eq = raw.indexOf("=");
     if (eq < 0) {
         // psql treats `-v NAME` (no value) as "delete this variable". We surface
         // an empty value; the caller decides whether to set or unset. Tests
         // verify both shapes.
-        vars.push({ name: raw, value: '' });
+        vars.push({ name: raw, value: "" });
         return;
     }
     vars.push({ name: raw.slice(0, eq), value: raw.slice(eq + 1) });
@@ -262,7 +264,7 @@ const applyDashD = (args, value) => {
     // user`) eagerly, and those non-undefined defaults would then land in the
     // top-priority argv layer and override `PGUSER` / `PGDATABASE` (review #7).
     // The partial parser returns only the keys the URI actually specified.
-    const parsed = value.startsWith('postgresql://') || value.startsWith('postgres://')
+    const parsed = value.startsWith("postgresql://") || value.startsWith("postgres://")
         ? parseConnectionUriPartial(value)
         : parseConninfo(value);
     // Keep the whole partial (incl. ssl*/channelBinding/hostaddr/requireAuth)
@@ -303,7 +305,7 @@ export const parseStartupArgs = (argv) => {
     const needValue = (flagDisplay) => {
         if (i + 1 >= n) {
             return {
-                kind: 'missing-arg',
+                kind: "missing-arg",
                 message: `option requires an argument -- ${flagDisplay}`,
             };
         }
@@ -322,7 +324,7 @@ export const parseStartupArgs = (argv) => {
             }
             else {
                 const v = needValue(flagDisplay);
-                if (typeof v !== 'string')
+                if (typeof v !== "string")
                     return v;
                 value = v;
             }
@@ -333,135 +335,135 @@ export const parseStartupArgs = (argv) => {
             // for clusters like `-Xy` where `X` doesn't take an argument — flex
             // continues to `y`; we keep it strict for clarity).
             return {
-                kind: 'invalid-option',
+                kind: "invalid-option",
                 message: `option does not take an argument -- ${letter}`,
             };
         }
         switch (letter) {
-            case 'a':
+            case "a":
                 args.echoAll = true;
                 return null;
-            case 'A':
+            case "A":
                 args.noAlign = true;
                 return null;
-            case 'b':
+            case "b":
                 args.echoErrors = true;
                 return null;
-            case 'C':
+            case "C":
                 // Since-PG17 "skip connection check" — no-op for our use.
                 return null;
-            case 'c':
-                pushAction(actions, { kind: 'command', sql: value });
+            case "c":
+                pushAction(actions, { kind: "command", sql: value });
                 return null;
-            case 'd':
+            case "d":
                 applyDashD(args, value);
                 return null;
-            case 'e':
+            case "e":
                 args.echoQueries = true;
                 return null;
-            case 'E':
-                args.echoHidden = 'on';
+            case "E":
+                args.echoHidden = "on";
                 return null;
-            case 'f':
-                pushAction(actions, { kind: 'file', path: value });
+            case "f":
+                pushAction(actions, { kind: "file", path: value });
                 return null;
-            case 'F':
+            case "F":
                 args.fieldSep = value;
                 args.fieldSepZero = false;
                 return null;
-            case 'h':
+            case "h":
                 args.host = value;
                 return null;
-            case 'H':
+            case "H":
                 args.htmlMode = true;
                 return null;
-            case 'l':
+            case "l":
                 args.list = true;
                 return null;
-            case 'L':
+            case "L":
                 args.log = value;
                 return null;
-            case 'n':
+            case "n":
                 args.noReadline = true;
                 return null;
-            case 'o':
+            case "o":
                 args.output = value;
                 return null;
-            case 'p': {
+            case "p": {
                 const p = Number.parseInt(value, 10);
                 if (!Number.isFinite(p) || p <= 0 || p > 65535) {
                     return {
-                        kind: 'invalid-value',
+                        kind: "invalid-value",
                         message: `invalid port number: "${value}"`,
                     };
                 }
                 args.port = p;
                 return null;
             }
-            case 'P':
+            case "P":
                 pset.push(value);
                 return null;
-            case 'q':
+            case "q":
                 args.quiet = true;
                 return null;
-            case 'R':
+            case "R":
                 args.recordSep = value;
                 args.recordSepZero = false;
                 return null;
-            case 's':
+            case "s":
                 args.singlestep = true;
                 return null;
-            case 'S':
+            case "S":
                 args.singleline = true;
                 return null;
-            case 't':
+            case "t":
                 args.tuplesOnly = true;
                 return null;
-            case 'T':
+            case "T":
                 // -T TEXT → push a synthetic pset directive so it routes through
                 // the same `\pset tableattr` plumbing.
                 pset.push(`tableattr=${value}`);
                 return null;
-            case 'U':
+            case "U":
                 args.user = value;
                 return null;
-            case 'v':
+            case "v":
                 pushVariable(variables, value);
                 return null;
-            case 'V':
+            case "V":
                 return {
-                    kind: 'version',
+                    kind: "version",
                     message: VERSION_STRING,
                 };
-            case 'w':
+            case "w":
                 args.promptPassword = false;
                 return null;
-            case 'W':
+            case "W":
                 args.promptPassword = true;
                 return null;
-            case 'x':
+            case "x":
                 args.expanded = true;
                 return null;
-            case 'X':
+            case "X":
                 args.noPsqlrc = true;
                 return null;
-            case 'z':
+            case "z":
                 args.fieldSepZero = true;
                 return null;
-            case '0':
+            case "0":
                 args.recordSepZero = true;
                 return null;
-            case '1':
+            case "1":
                 args.singleTransaction = true;
                 return null;
-            case '?':
+            case "?":
                 return {
-                    kind: 'help',
+                    kind: "help",
                     message: renderHelp(undefined),
                 };
             default:
                 return {
-                    kind: 'invalid-option',
+                    kind: "invalid-option",
                     message: `invalid option -- ${letter}`,
                 };
         }
@@ -469,7 +471,7 @@ export const parseStartupArgs = (argv) => {
     // ---- Main loop. -------------------------------------------------------
     while (i < n) {
         const tok = argv[i];
-        if (tok === '--') {
+        if (tok === "--") {
             // End of options. Everything after is positional.
             i += 1;
             while (i < n) {
@@ -478,16 +480,16 @@ export const parseStartupArgs = (argv) => {
             }
             break;
         }
-        if (tok.startsWith('--')) {
+        if (tok.startsWith("--")) {
             // Long option: `--name` or `--name=value`.
-            const eq = tok.indexOf('=');
+            const eq = tok.indexOf("=");
             const name = eq < 0 ? tok.slice(2) : tok.slice(2, eq);
             const attached = eq < 0 ? undefined : tok.slice(eq + 1);
             // Special-case the long-only synthetic options first.
-            if (name === 'csv') {
+            if (name === "csv") {
                 if (attached !== undefined) {
                     return {
-                        kind: 'invalid-option',
+                        kind: "invalid-option",
                         message: `option does not take an argument: --${name}`,
                     };
                 }
@@ -495,10 +497,10 @@ export const parseStartupArgs = (argv) => {
                 i += 1;
                 continue;
             }
-            if (name === 'no-pager') {
+            if (name === "no-pager") {
                 if (attached !== undefined) {
                     return {
-                        kind: 'invalid-option',
+                        kind: "invalid-option",
                         message: `option does not take an argument: --${name}`,
                     };
                 }
@@ -506,44 +508,44 @@ export const parseStartupArgs = (argv) => {
                 i += 1;
                 continue;
             }
-            if (name === 'on-error-stop') {
+            if (name === "on-error-stop") {
                 if (attached !== undefined) {
                     return {
-                        kind: 'invalid-option',
+                        kind: "invalid-option",
                         message: `option does not take an argument: --${name}`,
                     };
                 }
                 args.onErrorStop = true;
-                variables.push({ name: 'ON_ERROR_STOP', value: 'on' });
+                variables.push({ name: "ON_ERROR_STOP", value: "on" });
                 i += 1;
                 continue;
             }
-            if (name === 'help') {
+            if (name === "help") {
                 const topic = attached;
                 if (topic !== undefined &&
-                    topic !== 'options' &&
-                    topic !== 'commands' &&
-                    topic !== 'variables') {
+                    topic !== "options" &&
+                    topic !== "commands" &&
+                    topic !== "variables") {
                     return {
-                        kind: 'invalid-option',
+                        kind: "invalid-option",
                         message: `unrecognized help topic: ${topic}`,
                     };
                 }
-                return { kind: 'help', message: renderHelp(topic) };
+                return { kind: "help", message: renderHelp(topic) };
             }
-            if (name === 'echo-hidden') {
+            if (name === "echo-hidden") {
                 if (attached === undefined) {
-                    args.echoHidden = 'on';
+                    args.echoHidden = "on";
                 }
-                else if (attached === 'noexec') {
-                    args.echoHidden = 'noexec';
+                else if (attached === "noexec") {
+                    args.echoHidden = "noexec";
                 }
-                else if (attached === '' || attached === 'on') {
-                    args.echoHidden = 'on';
+                else if (attached === "" || attached === "on") {
+                    args.echoHidden = "on";
                 }
                 else {
                     return {
-                        kind: 'invalid-value',
+                        kind: "invalid-value",
                         message: `invalid value for --echo-hidden: "${attached}"`,
                     };
                 }
@@ -553,7 +555,7 @@ export const parseStartupArgs = (argv) => {
             const short = LONG_MAP[name];
             if (short === undefined) {
                 return {
-                    kind: 'invalid-option',
+                    kind: "invalid-option",
                     message: `unrecognized option: --${name}`,
                 };
             }
@@ -563,7 +565,7 @@ export const parseStartupArgs = (argv) => {
             if (requiresArg && value === undefined) {
                 if (i + 1 >= n) {
                     return {
-                        kind: 'missing-arg',
+                        kind: "missing-arg",
                         message: `option requires an argument: --${name}`,
                     };
                 }
@@ -572,7 +574,7 @@ export const parseStartupArgs = (argv) => {
             }
             else if (!requiresArg && !optionalArg && value !== undefined) {
                 return {
-                    kind: 'invalid-option',
+                    kind: "invalid-option",
                     message: `option does not take an argument: --${name}`,
                 };
             }
@@ -582,7 +584,7 @@ export const parseStartupArgs = (argv) => {
             i += 1;
             continue;
         }
-        if (tok.startsWith('-') && tok.length > 1) {
+        if (tok.startsWith("-") && tok.length > 1) {
             // Short option cluster. Each char might consume the rest of the token
             // (or the next argv) as its value.
             let k = 1;
@@ -590,7 +592,7 @@ export const parseStartupArgs = (argv) => {
                 const letter = tok[k];
                 if (!SHORT_WITH_ARG.has(letter) && !SHORT_NO_ARG.has(letter)) {
                     return {
-                        kind: 'invalid-option',
+                        kind: "invalid-option",
                         message: `invalid option -- ${letter}`,
                     };
                 }
@@ -635,7 +637,7 @@ export const applyStartupArgs = (args, settings, baseConnectOpts, resolution) =>
     setStartupVars(settings.vars, CLIENT_VERSION);
     // -------- 1) Variable assignments. -------------------------------------
     for (const v of args.variables) {
-        if (v.value === '') {
+        if (v.value === "") {
             // Mirror upstream `-v NAME` (no `=`): DeleteVariable.
             settings.vars.unset(v.name);
         }
@@ -645,61 +647,61 @@ export const applyStartupArgs = (args, settings, baseConnectOpts, resolution) =>
     }
     // -------- 2) Settings flags. -------------------------------------------
     if (args.echoAll)
-        settings.vars.set('ECHO', 'all');
+        settings.vars.set("ECHO", "all");
     if (args.echoErrors)
-        settings.vars.set('ECHO', 'errors');
+        settings.vars.set("ECHO", "errors");
     if (args.echoQueries)
-        settings.vars.set('ECHO', 'queries');
-    if (args.echoHidden !== 'off') {
+        settings.vars.set("ECHO", "queries");
+    if (args.echoHidden !== "off") {
         settings.echoHidden = args.echoHidden;
-        settings.vars.set('ECHO_HIDDEN', args.echoHidden === 'noexec' ? 'noexec' : 'on');
+        settings.vars.set("ECHO_HIDDEN", args.echoHidden === "noexec" ? "noexec" : "on");
     }
     if (args.quiet) {
         settings.quiet = true;
-        settings.vars.set('QUIET', 'on');
+        settings.vars.set("QUIET", "on");
     }
     if (args.singleline) {
         settings.singleline = true;
-        settings.vars.set('SINGLELINE', 'on');
+        settings.vars.set("SINGLELINE", "on");
     }
     if (args.singlestep) {
         settings.singlestep = true;
-        settings.vars.set('SINGLESTEP', 'on');
+        settings.vars.set("SINGLESTEP", "on");
     }
     if (args.onErrorStop) {
         settings.onErrorStop = true;
-        settings.vars.set('ON_ERROR_STOP', 'on');
+        settings.vars.set("ON_ERROR_STOP", "on");
     }
     // -------- 3) Output formatting. ----------------------------------------
     if (args.noAlign) {
-        settings.popt.topt.format = 'unaligned';
+        settings.popt.topt.format = "unaligned";
     }
     if (args.htmlMode) {
-        settings.popt.topt.format = 'html';
+        settings.popt.topt.format = "html";
     }
     if (args.csvOutput) {
-        settings.popt.topt.format = 'csv';
+        settings.popt.topt.format = "csv";
     }
     if (args.tuplesOnly) {
         settings.popt.topt.tuplesOnly = true;
     }
     if (args.expanded) {
-        settings.popt.topt.expanded = 'on';
+        settings.popt.topt.expanded = "on";
     }
     if (args.fieldSepZero) {
-        settings.popt.topt.fieldSep = '\0';
+        settings.popt.topt.fieldSep = "\0";
     }
     else if (args.fieldSep !== undefined) {
         settings.popt.topt.fieldSep = args.fieldSep;
     }
     if (args.recordSepZero) {
-        settings.popt.topt.recordSep = '\0';
+        settings.popt.topt.recordSep = "\0";
     }
     else if (args.recordSep !== undefined) {
         settings.popt.topt.recordSep = args.recordSep;
     }
     if (args.noPager) {
-        settings.popt.topt.pager = 'off';
+        settings.popt.topt.pager = "off";
     }
     // -------- 4) pset directives. ------------------------------------------
     // We don't have a parsed `do_pset` here yet (lives in command/cmd_format),
@@ -707,15 +709,15 @@ export const applyStartupArgs = (args, settings, baseConnectOpts, resolution) =>
     // them through once parsed. For tableattr (the most common -T use), apply
     // directly.
     for (const directive of args.pset) {
-        const eq = directive.indexOf('=');
+        const eq = directive.indexOf("=");
         if (eq >= 0) {
             const key = directive.slice(0, eq);
             const val = directive.slice(eq + 1);
-            if (key === 'tableattr' || key === 'T') {
+            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') {
+            else if (key === "pager") {
+                if (val === "on" || val === "off" || val === "always") {
                     settings.popt.topt.pager = val;
                 }
             }
@@ -757,11 +759,11 @@ export const applyStartupArgs = (args, settings, baseConnectOpts, resolution) =>
     let connect;
     if (resolution === undefined) {
         const base = baseConnectOpts ?? {
-            host: 'localhost',
+            host: "localhost",
             port: 5432,
-            user: '',
-            database: '',
-            ssl: 'prefer',
+            user: "",
+            database: "",
+            ssl: "prefer",
         };
         connect = { ...base, ...argvLayer };
     }
@@ -783,14 +785,16 @@ export const applyStartupArgs = (args, settings, baseConnectOpts, resolution) =>
 const resolveLayeredConnect = (argvLayer, resolution, legacyBase) => {
     const env = resolution.env ?? {};
     const uriPartial = resolution.uriPartial ??
-        (legacyBase !== undefined ? legacyBase : {});
+        (legacyBase !== undefined
+            ? legacyBase
+            : {});
     // Pick the service entry: explicit `serviceName` argument first, else fall
     // back to `$PGSERVICE`. The URI parser threads `?service=` through to its
     // caller via this same field, so callers should populate `serviceName`
     // from there before invoking us.
     const serviceName = resolution.serviceName ?? env.PGSERVICE;
     let serviceEntry;
-    if (serviceName !== undefined && serviceName !== '') {
+    if (serviceName !== undefined && serviceName !== "") {
         serviceEntry = resolution.services?.get(serviceName);
         if (serviceEntry === undefined) {
             // Mirror libpq: if the user explicitly named a service (via
@@ -822,13 +826,15 @@ const resolveLayeredConnect = (argvLayer, resolution, legacyBase) => {
         const pgpassPwd = lookupPgPass(resolution.pgpassEntries ?? [], {
             host: merged.host,
             port: merged.port,
-            database: merged.database !== '' ? merged.database : merged.user,
+            database: merged.database !== "" ? merged.database : merged.user,
             user: merged.user,
         });
         if (pgpassPwd !== undefined) {
             // Re-merge with pgpass slotted in just above libpq defaults so any
             // explicit `password=` in env / service still wins.
-            const pgpassLayer = { password: pgpassPwd };
+            const pgpassLayer = {
+                password: pgpassPwd,
+            };
             merged = mergeConnectOptions([...layers, pgpassLayer], defaults);
         }
     }