neonctl 2.27.1 → 2.29.0

package/dist/utils/package_manager.js

@@ -0,0 +1,68 @@
+import { spawn } from "node:child_process";
+import which from "which";
+import { log } from "../log.js";
+// npm first so it's the default/preselected choice; the rest follow in rough
+// popularity order.
+export const PACKAGE_MANAGERS = [
+    "npm",
+    "pnpm",
+    "yarn",
+    "bun",
+];
+/**
+ * The package manager the CLI was invoked through, read from the
+ * `npm_config_user_agent` npm sets for `npm exec`/`npx`, `pnpm dlx`, `yarn
+ * dlx`, and `bunx` (so `pnpm dlx neonctl …` installs with pnpm). Returns
+ * undefined when there's nothing to infer from — e.g. a globally-installed
+ * `neon`/`neonctl` — so the caller can ask (or fall back) instead of silently
+ * assuming npm.
+ */
+export const detectPackageManager = () => {
+    const ua = process.env.npm_config_user_agent ?? "";
+    if (ua.startsWith("pnpm"))
+        return "pnpm";
+    if (ua.startsWith("yarn"))
+        return "yarn";
+    if (ua.startsWith("bun"))
+        return "bun";
+    if (ua.startsWith("npm"))
+        return "npm";
+    return undefined;
+};
+/** The package managers actually on PATH, in {@link PACKAGE_MANAGERS} order. */
+export const installedPackageManagers = () => PACKAGE_MANAGERS.filter((pm) => which.sync(pm, { nothrow: true }) !== null);
+/**
+ * Pick a package manager without prompting: the one the CLI was invoked through,
+ * else the first one installed, else npm. Used by non-interactive flows (e.g.
+ * `config init`) where there's no scaffold prompt to hang a picker off.
+ */
+export const resolvePackageManager = () => detectPackageManager() ?? installedPackageManagers()[0] ?? "npm";
+/**
+ * The argv that adds `packages` as runtime dependencies with `pm`. npm spells it
+ * `install`; pnpm/yarn/bun use `add`.
+ */
+export const addDependenciesArgs = (pm, packages) => (pm === "npm" ? ["install", ...packages] : ["add", ...packages]);
+/**
+ * Run a command inheriting our stdio so the user sees install / link output
+ * live and can answer any prompts the child raises. Resolves to whether it
+ * exited cleanly; a non-zero exit is reported but never throws — the caller
+ * decides whether to treat it as fatal.
+ */
+export const runCommand = (cmd, args, cwd) => new Promise((resolvePromise) => {
+    // npm/pnpm/yarn ship as .cmd shims on Windows, which need a shell to run.
+    const child = spawn(cmd, args, {
+        cwd,
+        stdio: "inherit",
+        shell: process.platform === "win32",
+    });
+    child.on("error", (err) => {
+        log.warning("Could not run `%s %s`: %s", cmd, args.join(" "), err instanceof Error ? err.message : String(err));
+        resolvePromise(false);
+    });
+    child.on("close", (code) => {
+        if (code !== 0) {
+            log.warning("`%s %s` exited with code %d.", cmd, args.join(" "), code);
+        }
+        resolvePromise(code === 0);
+    });
+});

package/dist/utils/point_in_time.js

@@ -1,24 +1,24 @@
-import { looksLikeLSN, looksLikeTimestamp } from './formats.js';
-import { branchIdResolve } from './enrichers.js';
+import { branchIdResolve } from "./enrichers.js";
+import { looksLikeLSN, looksLikeTimestamp } from "./formats.js";
 export class PointInTimeParseError extends Error {
     constructor(message) {
         super(message);
-        this.name = 'PointInTimeParseError';
+        this.name = "PointInTimeParseError";
     }
 }
 export const parsePITBranch = (input) => {
-    const splitIndex = input.lastIndexOf('@');
+    const splitIndex = input.lastIndexOf("@");
     const sourceBranch = splitIndex === -1 ? input : input.slice(0, splitIndex);
     const exactPIT = splitIndex === -1 ? null : input.slice(splitIndex + 1);
     const result = {
         branch: sourceBranch,
         ...(exactPIT === null
-            ? { tag: 'head' }
+            ? { tag: "head" }
             : looksLikeLSN(exactPIT)
-                ? { tag: 'lsn', lsn: exactPIT }
-                : { tag: 'timestamp', timestamp: exactPIT }),
+                ? { tag: "lsn", lsn: exactPIT }
+                : { tag: "timestamp", timestamp: exactPIT }),
     };
-    if (result.tag === 'timestamp') {
+    if (result.tag === "timestamp") {
         const timestamp = result.timestamp;
         if (!looksLikeTimestamp(timestamp)) {
             throw new PointInTimeParseError(`Invalid source branch format - ${input}`);
@@ -31,15 +31,15 @@ export const parsePITBranch = (input) => {
 };
 export const parsePointInTime = async ({ pointInTime, targetBranchId, projectId, api, }) => {
     const parsedPIT = parsePITBranch(pointInTime);
-    let branchId = '';
-    if (parsedPIT.branch === '^self') {
+    let branchId = "";
+    if (parsedPIT.branch === "^self") {
         branchId = targetBranchId;
     }
-    else if (parsedPIT.branch === '^parent') {
+    else if (parsedPIT.branch === "^parent") {
         const { data } = await api.getProjectBranch(projectId, targetBranchId);
         const { parent_id: parentId } = data.branch;
         if (parentId == null) {
-            throw new PointInTimeParseError('Branch has no parent');
+            throw new PointInTimeParseError("Branch has no parent");
         }
         branchId = parentId;
     }

package/dist/utils/psql.js

@@ -1,8 +1,8 @@
-import { spawn } from 'child_process';
-import which from 'which';
-import { closeAnalytics, trackEvent } from '../analytics.js';
-import { log } from '../log.js';
-const FALLBACK_ENV = 'NEONCTL_PSQL_FALLBACK';
+import { spawn } from "child_process";
+import which from "which";
+import { closeAnalytics, trackEvent } from "../analytics.js";
+import { log } from "../log.js";
+const FALLBACK_ENV = "NEONCTL_PSQL_FALLBACK";
 /** Max time we wait for the analytics flush before handing off to psql. */
 const ANALYTICS_FLUSH_TIMEOUT_MS = 3000;
 /**
@@ -12,28 +12,28 @@ const ANALYTICS_FLUSH_TIMEOUT_MS = 3000;
  * cases rather than a misleading `false`.
  */
 const planPsql = async (opts) => {
-    if (opts.mode === 'ts') {
+    if (opts.mode === "ts") {
         return {
-            implementation: 'ts',
-            reason: 'forced_flag',
+            implementation: "ts",
+            reason: "forced_flag",
             nativeAvailable: null,
             nativePath: null,
         };
     }
-    if (process.env[FALLBACK_ENV] === '1') {
+    if (process.env[FALLBACK_ENV] === "1") {
         return {
-            implementation: 'ts',
-            reason: 'forced_env',
+            implementation: "ts",
+            reason: "forced_env",
             nativeAvailable: null,
             nativePath: null,
         };
     }
-    const nativePath = await which('psql', { nothrow: true });
+    const nativePath = await which("psql", { nothrow: true });
     const nativeAvailable = nativePath !== null;
-    if (opts.mode === 'native') {
+    if (opts.mode === "native") {
         return {
-            implementation: 'native',
-            reason: 'forced_native',
+            implementation: "native",
+            reason: "forced_native",
             nativeAvailable,
             nativePath,
         };
@@ -41,14 +41,14 @@ const planPsql = async (opts) => {
     // 'auto' (or unset): strict fallback — prefer native, TS only if missing.
     return nativeAvailable
         ? {
-            implementation: 'native',
-            reason: 'native_available',
+            implementation: "native",
+            reason: "native_available",
             nativeAvailable,
             nativePath,
         }
         : {
-            implementation: 'ts',
-            reason: 'fallback_no_native',
+            implementation: "ts",
+            reason: "fallback_no_native",
             nativeAvailable,
             nativePath,
         };
@@ -64,7 +64,7 @@ const planPsql = async (opts) => {
  * analytics is disabled (`--analytics false`), since the client is absent.
  */
 const reportPsqlInvocation = async (plan) => {
-    trackEvent('psql_invoked', {
+    trackEvent("psql_invoked", {
         implementation: plan.implementation,
         reason: plan.reason,
         nativeAvailable: plan.nativeAvailable,
@@ -72,11 +72,11 @@ const reportPsqlInvocation = async (plan) => {
     await closeAnalytics({ timeout: ANALYTICS_FLUSH_TIMEOUT_MS });
 };
 const execNative = async (binary, connection_uri, args) => {
-    log.info('Connecting to the database using psql...');
+    log.info("Connecting to the database using psql...");
     const child = spawn(binary, [connection_uri, ...args], {
-        stdio: 'inherit',
+        stdio: "inherit",
     });
-    for (const signame of ['SIGINT', 'SIGTERM']) {
+    for (const signame of ["SIGINT", "SIGTERM"]) {
         process.on(signame, (code) => {
             if (!child.killed && code !== null) {
                 child.kill(code);
@@ -84,15 +84,15 @@ const execNative = async (binary, connection_uri, args) => {
         });
     }
     return new Promise((_, reject) => {
-        child.on('exit', (code) => {
+        child.on("exit", (code) => {
             process.exit(code === null ? 1 : code);
         });
-        child.on('error', reject);
+        child.on("error", reject);
     });
 };
 const execTs = async (connection_uri, args) => {
-    log.info('Connecting to the database using embedded psql (TypeScript)...');
-    const { runPsql } = await import('../psql/index.js');
+    log.info("Connecting to the database using embedded psql (TypeScript)...");
+    const { runPsql } = await import("../psql/index.js");
     const code = await runPsql([connection_uri, ...args], {
         stdin: process.stdin,
         stdout: process.stdout,
@@ -103,9 +103,9 @@ const execTs = async (connection_uri, args) => {
 export const psql = async (connection_uri, args = [], opts = {}) => {
     const plan = await planPsql(opts);
     await reportPsqlInvocation(plan);
-    if (plan.implementation === 'ts') {
-        if (plan.reason === 'fallback_no_native') {
-            log.info('psql binary not found on PATH; falling back to embedded TypeScript psql');
+    if (plan.implementation === "ts") {
+        if (plan.reason === "fallback_no_native") {
+            log.info("psql binary not found on PATH; falling back to embedded TypeScript psql");
         }
         return execTs(connection_uri, args);
     }

package/dist/utils/string.js

@@ -1,5 +1,5 @@
 export const toSnakeCase = (str) => str
-    .split(' ')
+    .split(" ")
     .map((word) => word.toLowerCase())
-    .join('_');
+    .join("_");
 export const isObject = (value) => value != null && value === Object(value);

package/dist/utils/ui.js

@@ -4,7 +4,7 @@
 export const consumeNextMatching = (lines, matcher) => {
     while (lines.length > 0) {
         const line = lines.shift().trim();
-        if (line === '') {
+        if (line === "") {
             continue;
         }
         if (matcher.test(line)) {
@@ -23,7 +23,7 @@ export const consumeBlockIfMatches = (lines, matcher) => {
         return result;
     }
     let line = lines.shift();
-    while (line.trim() === '') {
+    while (line.trim() === "") {
         line = lines.shift();
     }
     if (!matcher.test(line)) {
@@ -33,7 +33,7 @@ export const consumeBlockIfMatches = (lines, matcher) => {
     result.push(line);
     while (lines.length > 0) {
         line = lines.shift();
-        if (line.trim() === '') {
+        if (line.trim() === "") {
             break;
         }
         result.push(line);
@@ -42,18 +42,18 @@ export const consumeBlockIfMatches = (lines, matcher) => {
 };
 export const splitColumns = (line) => {
     const result = line.trim().split(/\s{2,}/);
-    result[1] = result[1] ?? '';
+    result[1] = result[1] ?? "";
     if (result.length > 2) {
-        result[1] = result.slice(1).join(' ');
+        result[1] = result.slice(1).join(" ");
     }
     return result;
 };
 export const drawPointer = (width) => {
     const result = [];
-    result.push('└');
+    result.push("└");
     for (let i = 0; i < width - 4; i++) {
-        result.push('─');
+        result.push("─");
     }
-    result.push('>');
-    return result.join('');
+    result.push(">");
+    return result.join("");
 };

package/dist/utils/zip.js

@@ -1,4 +1,4 @@
-import { zipSync } from 'fflate';
+import { zipSync } from "fflate";
 // Zip the esbuild output (index.mjs) into the archive the Functions deploy endpoint
 // expects. Compression level 6 matches the previous bundler.
 export const zipBundle = (entries) => zipSync(entries, { level: 6 });

package/dist/writer.js

@@ -1,8 +1,8 @@
-import YAML from 'yaml';
-import Table from 'cli-table';
-import chalk from 'chalk';
-import { isCi } from './env.js';
-import { isObject, toSnakeCase } from './utils/string.js';
+import chalk from "chalk";
+import Table from "cli-table";
+import YAML from "yaml";
+import { isCi } from "./env.js";
+import { isObject, toSnakeCase } from "./utils/string.js";
 const writeYaml = (chunks) => {
     return YAML.stringify(chunks.length === 1
         ? chunks[0].data
@@ -20,21 +20,21 @@ const writeJson = (chunks) => {
         ])), null, 2);
 };
 const writeTable = (chunks, out) => {
-    chunks.forEach(({ data, config: { emptyMessage, fields, title, renderColumns = {} } }) => {
+    chunks.forEach(({ data, config: { emptyMessage, fields, title, renderColumns = {} }, }) => {
         const arrayData = Array.isArray(data) ? data : [data];
         if (!arrayData.length && emptyMessage) {
-            out.write('\n' + emptyMessage + '\n');
+            out.write("\n" + emptyMessage + "\n");
             return;
         }
-        const fieldsFiltered = fields.filter((field) => arrayData.some((item) => item[field] !== undefined && item[field] !== ''));
+        const fieldsFiltered = fields.filter((field) => arrayData.some((item) => item[field] !== undefined && item[field] !== ""));
         const table = new Table({
             style: {
-                head: ['green'],
+                head: ["green"],
             },
             head: fieldsFiltered.map((field) => field
-                .split('_')
+                .split("_")
                 .map((word) => word[0].toUpperCase() + word.slice(1))
-                .join(' ')),
+                .join(" ")),
         });
         arrayData.forEach((item) => {
             table.push(fieldsFiltered.map((field) => {
@@ -43,17 +43,17 @@ const writeTable = (chunks, out) => {
                     return renderColumns[field]?.(item);
                 }
                 return Array.isArray(value)
-                    ? value.join('\n')
+                    ? value.join("\n")
                     : isObject(value)
                         ? JSON.stringify(value, null, 2)
-                        : (value ?? '');
+                        : (value ?? "");
             }));
         });
         if (title) {
-            out.write((isCi() ? title : chalk.bold(title)) + '\n');
+            out.write((isCi() ? title : chalk.bold(title)) + "\n");
         }
         out.write(table.toString());
-        out.write('\n');
+        out.write("\n");
     });
 };
 /**
@@ -85,10 +85,10 @@ export const writer = (props) => {
             if (args.length === 2) {
                 chunks.push({ data: args[0], config: args[1] });
             }
-            if (props.output == 'yaml') {
+            if (props.output == "yaml") {
                 return out.write(writeYaml(chunks));
             }
-            if (props.output == 'json') {
+            if (props.output == "json") {
                 return out.write(writeJson(chunks));
             }
             writeTable(chunks, out);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "neonctl",
-  "version": "2.27.1",
+  "version": "2.29.0",
   "description": "CLI tool for Neon Serverless Postgres",
   "keywords": [
     "neon",
@@ -31,17 +31,11 @@
     "package.json"
   ],
   "engines": {
-    "node": ">=18"
+    "node": ">=22"
   },
   "dependencies": {
     "@hono/node-server": "2.0.4",
-    "@neondatabase/api-client": "2.7.1",
-    "@neondatabase/config": "0.8.0",
-    "@neondatabase/config-runtime": "0.8.0",
-    "@neondatabase/env": "0.7.0",
     "@segment/analytics-node": "1.3.0",
-    "axios": "1.7.2",
-    "axios-debug-log": "1.0.0",
     "chalk": "5.3.0",
     "chokidar": "5.0.0",
     "cli-table": "0.3.11",
@@ -53,9 +47,14 @@
     "openid-client": "6.8.1",
     "pg-protocol": "^1.14.0",
     "prompts": "2.4.2",
+    "undici": "^8.5.0",
     "which": "3.0.1",
     "yaml": "2.4.5",
-    "yargs": "17.7.2"
+    "yargs": "17.7.2",
+    "@neon/sdk": "0.1.0",
+    "@neon/config": "0.8.1",
+    "@neon/config-runtime": "0.8.1",
+    "@neon/env": "0.8.1"
   },
   "optionalDependencies": {
     "esbuild": "0.28.0"
@@ -83,7 +82,6 @@
     "node-pty": "1.1.0",
     "oauth2-mock-server": "8.1.0",
     "openapi-types": "12.1.3",
-    "prettier": "3.3.3",
     "rollup": "3.29.4",
     "strip-ansi": "7.1.0",
     "tsx": "4.22.3",
@@ -115,8 +113,8 @@
     "build": "pnpm generateParams && pnpm clean && tsc -p tsconfig.build.json && cp src/*.html ./dist",
     "bundle": "node pkg.js",
     "typecheck": "tsc --noEmit",
-    "lint": "pnpm typecheck && eslint src && prettier --check .",
-    "lint:fix": "pnpm typecheck && eslint src --fix && prettier --w .",
+    "lint": "pnpm typecheck && eslint src",
+    "lint:fix": "pnpm typecheck && eslint src --fix",
     "test": "pnpm build && vitest run",
     "test:ci": "pnpm build && vitest run",
     "test:conformance": "vitest run --config tests/psql-conformance/vitest.config.ts"