neonctl 2.37.0 → 2.38.0

package/bin/cli.js

@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+
+await import("neon/cli");

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "neonctl",
-  "version": "2.37.0",
-  "description": "CLI tool for Neon Serverless Postgres",
+  "version": "2.38.0",
+  "description": "Compatibility command for the Neon CLI",
   "keywords": [
     "neon",
     "neonctl",
@@ -20,99 +20,32 @@
     "url": "https://neon.com"
   },
   "type": "module",
-  "main": "dist/index.js",
   "bin": {
-    "neonctl": "dist/cli.js",
-    "neon": "dist/cli.js"
+    "neonctl": "bin/cli.js",
+    "neon": "bin/cli.js"
   },
   "files": [
     "README.md",
-    "dist/",
+    "bin/",
     "package.json"
   ],
   "engines": {
     "node": ">=20.19.0"
   },
   "dependencies": {
-    "@hono/node-server": "2.0.4",
-    "@segment/analytics-node": "1.3.0",
-    "chalk": "5.3.0",
-    "chokidar": "5.0.0",
-    "cli-table": "0.3.11",
-    "cliui": "8.0.1",
-    "diff": "5.2.0",
-    "fflate": "^0.8.3",
-    "neon-init": "0.20.2",
-    "open": "^10.2.0",
-    "openid-client": "6.8.1",
-    "pg-protocol": "^1.14.0",
-    "prompts": "2.4.2",
-    "undici": "^7.28.0",
-    "which": "3.0.1",
-    "yaml": "^2.9.0",
-    "yargs": "17.7.2",
-    "@neon/config": "0.10.0",
-    "@neon/config-runtime": "0.10.0",
-    "@neon/env": "0.11.8",
-    "@neon/sdk": "1.3.0"
-  },
-  "optionalDependencies": {
-    "esbuild": "0.28.1"
+    "neon": "2.38.0"
   },
   "devDependencies": {
-    "@apidevtools/swagger-parser": "12.1.0",
-    "@rollup/plugin-commonjs": "25.0.8",
-    "@rollup/plugin-json": "6.1.0",
-    "@rollup/plugin-node-resolve": "15.2.3",
-    "@testcontainers/postgresql": "^11.14.0",
-    "@types/cli-table": "0.3.4",
-    "@types/diff": "5.2.1",
-    "@types/express": "4.17.21",
     "@types/node": "^20.19.0",
-    "@types/prompts": "2.4.9",
-    "@types/which": "3.0.4",
-    "@types/yargs": "^17.0.35",
     "@vitest/coverage-v8": "^3.0.9",
-    "@yao-pkg/pkg": "6.10.0",
-    "emocks": "3.0.4",
-    "express": "4.19.2",
-    "node-pty": "1.1.0",
-    "oauth2-mock-server": "8.1.0",
-    "openapi-types": "12.1.3",
-    "rollup": "3.29.4",
-    "strip-ansi": "7.1.0",
-    "tsx": "4.22.3",
-    "typescript": "^5.9.0",
     "vitest": "^3.0.9"
   },
   "publishConfig": {
     "access": "public",
     "provenance": false
   },
-  "pkg": {
-    "assets": [
-      "callback.html"
-    ],
-    "scripts": [
-      "bundle/*.js"
-    ],
-    "targets": [
-      "node22-linux-x64",
-      "node22-macos-x64",
-      "node22-win-x64",
-      "node22-linux-arm64"
-    ]
-  },
   "scripts": {
-    "generateParams": "tsx generateOptionsFromSpec.ts",
-    "clean": "rm -rf dist",
-    "build": "pnpm generateParams && pnpm clean && tsc -p tsconfig.build.json && cp src/*.html ./dist",
-    "bundle": "node pkg.js",
-    "typecheck": "tsc --noEmit",
-    "lint": "pnpm typecheck && biome check src",
-    "lint:fix": "pnpm typecheck && biome check src --write",
-    "test": "pnpm --filter neonctl... build && vitest run",
-    "test:ci": "pnpm build && vitest run",
-    "test:conformance": "vitest run --config tests/psql-conformance/vitest.config.ts"
+    "test": "vitest",
+    "test:ci": "vitest run"
   }
 }

package/dist/analytics.js

@@ -1,168 +0,0 @@
-import { readFileSync } from "node:fs";
-import { join } from "node:path";
-import { Analytics } from "@segment/analytics-node";
-import { getApiClient, isNeonApiError } from "./api.js";
-import { CREDENTIALS_FILE } from "./config.js";
-import { isCurrentBranchProbe } from "./context.js";
-import { getGithubEnvVars, isCi } from "./env.js";
-import { log } from "./log.js";
-import pkg from "./pkg.js";
-const WRITE_KEY = "3SQXn5ejjXWLEJ8xU2PRYhAotLtTaeeV";
-/**
- * Raw-argv fallback for the offline `--current-branch` probe. The init
- * middleware runs before validation, where the parsed `currentBranch` flag may
- * not be populated yet, so we also scan `process.argv` directly to be safe.
- */
-const hasCurrentBranchArgv = () => process.argv.includes("--current-branch");
-let client;
-let clientInitialized = false;
-let userId = "";
-let errorEventContext;
-/**
- * Phase 1: Run before validation so the Segment client exists if any
- * middleware (e.g. auth) fails. Enables sendError() in the fail handler.
- * Does not resolve user id or send CLI Started.
- */
-export const initAnalyticsClientMiddleware = (args) => {
-    if (!args.analytics || clientInitialized) {
-        return;
-    }
-    // The offline `--current-branch` probe must make zero network calls. This
-    // middleware runs before validation, so guard on the raw argv too (in case
-    // the parsed `currentBranch` flag isn't populated this early): never create
-    // the Segment client, which keeps trackEvent/closeAnalytics no-ops downstream.
-    if (isCurrentBranchProbe(args) || hasCurrentBranchArgv()) {
-        return;
-    }
-    clientInitialized = true;
-    errorEventContext = getErrorAnalyticsEventContext(args);
-    client = new Analytics({
-        writeKey: WRITE_KEY,
-        host: "https://track.neon.tech",
-    });
-    log.debug("Initialized CLI analytics client");
-    client.identify({
-        userId: "anonymous",
-    });
-};
-/**
- * Phase 2: Run after auth. Resolves user id from credentials,
- * identifies the user, and sends CLI Started.
- */
-export const analyticsMiddleware = async (args) => {
-    if (!client || !args.analytics) {
-        return;
-    }
-    if (isCurrentBranchProbe(args)) {
-        return;
-    }
-    try {
-        const credentialsPath = join(args.configDir, CREDENTIALS_FILE);
-        const credentials = readFileSync(credentialsPath, {
-            encoding: "utf-8",
-        });
-        userId = JSON.parse(credentials).user_id;
-    }
-    catch (err) {
-        log.debug("Failed to read credentials file", err);
-    }
-    try {
-        if (args.apiKey) {
-            const apiClient = getApiClient({
-                apiKey: args.apiKey,
-                apiHost: args.apiHost,
-            });
-            // Populating api key details for analytics
-            const authDetailsResponse = await apiClient.getAuthDetails();
-            const authDetails = authDetailsResponse.data;
-            args.accountId = authDetails.account_id;
-            args.authMethod = authDetails.auth_method;
-            args.authData = authDetails.auth_data;
-            // Get user id if not org api key
-            if (!userId && authDetails.auth_method !== "api_key_org") {
-                const resp = await apiClient?.getCurrentUserInfo?.();
-                userId = resp?.data?.id;
-            }
-        }
-        else {
-            args.accountId = userId;
-            args.authMethod = "oauth";
-        }
-    }
-    catch (err) {
-        log.debug("Failed to get user id from api", err);
-    }
-    client.identify({
-        userId: userId?.toString() ?? "anonymous",
-    });
-    client.track({
-        userId: userId || "anonymous",
-        event: "CLI Started",
-        properties: getAnalyticsEventProperties(args),
-        context: {
-            direct: true,
-        },
-    });
-};
-export const closeAnalytics = async (opts) => {
-    if (client) {
-        log.debug("Flushing CLI analytics");
-        // `timeout` bounds how long we wait for in-flight events to flush so a
-        // slow / unreachable track.neon.tech can't hang a short-lived command
-        // (e.g. the psql launch path, which flushes here before process.exit).
-        await client.closeAndFlush(opts);
-        log.debug("Flushed CLI analytics");
-    }
-};
-export const getErrorAnalyticsEventProperties = (err, errCode, context) => {
-    const apiError = isNeonApiError(err) ? err : undefined;
-    const requestId = apiError?.headers?.["x-neon-ret-request-id"];
-    return {
-        ...context,
-        message: err.message,
-        stack: err.stack,
-        errCode,
-        statusCode: apiError?.status,
-        requestId,
-    };
-};
-export const sendError = (err, errCode) => {
-    if (!client) {
-        return;
-    }
-    const apiError = isNeonApiError(err) ? err : undefined;
-    const requestId = apiError?.headers?.["x-neon-ret-request-id"];
-    if (requestId) {
-        log.debug("Failed request ID: %s", requestId);
-    }
-    client.track({
-        event: "CLI Error",
-        userId: userId || "anonymous",
-        properties: getErrorAnalyticsEventProperties(err, errCode, errorEventContext),
-    });
-    log.debug("Sent CLI error event: %s", errCode);
-};
-export const trackEvent = (event, properties) => {
-    if (!client) {
-        return;
-    }
-    client.track({
-        event,
-        userId: userId || "anonymous",
-        properties,
-    });
-    log.debug("Sent CLI event: %s", event);
-};
-const getErrorAnalyticsEventContext = (_args) => ({
-    version: pkg.version,
-    ci: isCi(),
-});
-export const getAnalyticsEventProperties = (args) => ({
-    version: pkg.version,
-    command: args._.join(" "),
-    flags: {
-        output: args.output,
-    },
-    ci: isCi(),
-    githubEnvVars: getGithubEnvVars(process.env),
-});