neon 2.47.0 → 3.1.0

package/dist/commands/psql.js

@@ -1,62 +1,64 @@
+import { __exportAll } from "../_virtual/_rolldown/runtime.js";
 import { EndpointType } from "../utils/api_enums.js";
 import { fillSingleProject } from "../utils/enrichers.js";
-import { handler as connectionStringHandler, SSL_MODES, } from "./connection_string.js";
-export const command = "psql [branch]";
-export const describe = "Connect to a database via psql";
-export const builder = (argv) => {
-    return argv
-        .usage("$0 psql [branch] [options] [-- psql-args]")
-        .example("$0 psql", "Connect to the default branch via psql")
-        .example("$0 psql main", "Connect to the main branch via psql")
-        .example('$0 psql main -- -c "SELECT 1"', "Run a single query against the main branch")
-        .example("$0 psql main@2024-01-01T00:00:00Z", "Connect to the main branch at a specific point in time")
-        .positional("branch", {
-        describe: `Branch name or id. Defaults to the default branch if omitted. Can be written in the point-in-time format: "branch@timestamp" or "branch@lsn"`,
-        type: "string",
-    })
-        .options({
-        "project-id": {
-            type: "string",
-            describe: "Project ID",
-        },
-        "role-name": {
-            type: "string",
-            describe: "Role name",
-        },
-        "database-name": {
-            type: "string",
-            describe: "Database name",
-        },
-        pooled: {
-            type: "boolean",
-            describe: "Use pooled connection",
-            default: false,
-        },
-        "endpoint-type": {
-            type: "string",
-            choices: Object.values(EndpointType),
-            describe: "Endpoint type",
-        },
-        ssl: {
-            type: "string",
-            choices: SSL_MODES,
-            default: "require",
-            describe: "SSL mode",
-        },
-        fallback: {
-            type: "boolean",
-            describe: "Force the embedded TypeScript psql fallback (for testing)",
-            default: false,
-            hidden: true,
-        },
-    })
-        .middleware(fillSingleProject);
+import { SSL_MODES, handler as handler$1 } from "./connection_string.js";
+//#region src/commands/psql.ts
+var psql_exports = /* @__PURE__ */ __exportAll({
+	builder: () => builder,
+	command: () => command,
+	describe: () => describe,
+	handler: () => handler
+});
+const command = "psql [branch]";
+const describe = "Connect to a database via psql";
+const builder = (argv) => {
+	return argv.usage("$0 psql [branch] [options] [-- psql-args]").example("$0 psql", "Connect to the default branch via psql").example("$0 psql main", "Connect to the main branch via psql").example("$0 psql main -- -c \"SELECT 1\"", "Run a single query against the main branch").example("$0 psql main@2024-01-01T00:00:00Z", "Connect to the main branch at a specific point in time").positional("branch", {
+		describe: `Branch name or id. Defaults to the default branch if omitted. Can be written in the point-in-time format: "branch@timestamp" or "branch@lsn"`,
+		type: "string"
+	}).options({
+		"project-id": {
+			type: "string",
+			describe: "Project ID"
+		},
+		"role-name": {
+			type: "string",
+			describe: "Role name"
+		},
+		"database-name": {
+			type: "string",
+			describe: "Database name"
+		},
+		pooled: {
+			type: "boolean",
+			describe: "Use pooled connection",
+			default: false
+		},
+		"endpoint-type": {
+			type: "string",
+			choices: Object.values(EndpointType),
+			describe: "Endpoint type"
+		},
+		ssl: {
+			type: "string",
+			choices: SSL_MODES,
+			default: "require",
+			describe: "SSL mode"
+		},
+		fallback: {
+			type: "boolean",
+			describe: "Force the embedded TypeScript psql fallback (for testing)",
+			default: false,
+			hidden: true
+		}
+	}).middleware(fillSingleProject);
 };
-export const handler = async (props) => {
-    await connectionStringHandler({
-        ...props,
-        psql: true,
-        prisma: false,
-        extended: false,
-    });
+const handler = async (props) => {
+	await handler$1({
+		...props,
+		psql: true,
+		prisma: false,
+		extended: false
+	});
 };
+//#endregion
+export { builder, command, describe, handler, psql_exports };

package/dist/commands/roles.js

@@ -1,65 +1,62 @@
+import { __exportAll } from "../_virtual/_rolldown/runtime.js";
 import { retryOnLock } from "../api.js";
-import { branchIdFromProps, fillSingleProject } from "../utils/enrichers.js";
 import { writer } from "../writer.js";
+import { branchIdFromProps, fillSingleProject } from "../utils/enrichers.js";
+//#region src/commands/roles.ts
+var roles_exports = /* @__PURE__ */ __exportAll({
+	aliases: () => aliases,
+	builder: () => builder,
+	command: () => command,
+	create: () => create,
+	deleteRole: () => deleteRole,
+	describe: () => describe,
+	handler: () => handler,
+	list: () => list
+});
 const ROLES_FIELDS = ["name", "created_at"];
-export const command = "roles";
-export const describe = "Manage roles";
-export const aliases = ["role"];
-export const builder = (argv) => argv
-    .usage("$0 roles <sub-command> [options]")
-    .options({
-    "project-id": {
-        describe: "Project ID",
-        type: "string",
-    },
-    branch: {
-        describe: "Branch ID or name",
-        type: "string",
-    },
-})
-    .middleware(fillSingleProject)
-    .command("list", "List roles", (yargs) => yargs, (args) => list(args))
-    .command("create", "Create a role", (yargs) => yargs.options({
-    name: {
-        describe: "Role name",
-        type: "string",
-        demandOption: true,
-    },
-    "no-login": {
-        describe: "Create a passwordless role that cannot login",
-        boolean: true,
-    },
-}), (args) => create(args))
-    .command("delete <role>", "Delete a role", (yargs) => yargs, (args) => deleteRole(args));
-export const handler = (args) => {
-    return args;
+const command = "roles";
+const describe = "Manage roles";
+const aliases = ["role"];
+const builder = (argv) => argv.usage("$0 roles <sub-command> [options]").options({
+	"project-id": {
+		describe: "Project ID",
+		type: "string"
+	},
+	branch: {
+		describe: "Branch ID or name",
+		type: "string"
+	}
+}).middleware(fillSingleProject).command("list", "List roles", (yargs) => yargs, (args) => list(args)).command("create", "Create a role", (yargs) => yargs.options({
+	name: {
+		describe: "Role name",
+		type: "string",
+		demandOption: true
+	},
+	"no-login": {
+		describe: "Create a passwordless role that cannot login",
+		boolean: true
+	}
+}), (args) => create(args)).command("delete <role>", "Delete a role", (yargs) => yargs, (args) => deleteRole(args));
+const handler = (args) => {
+	return args;
 };
-export const list = async (props) => {
-    const branchId = await branchIdFromProps(props);
-    const { data } = await props.apiClient.listProjectBranchRoles(props.projectId, branchId);
-    writer(props).end(data.roles, {
-        fields: ROLES_FIELDS,
-    });
+const list = async (props) => {
+	const branchId = await branchIdFromProps(props);
+	const { data } = await props.apiClient.listProjectBranchRoles(props.projectId, branchId);
+	writer(props).end(data.roles, { fields: ROLES_FIELDS });
 };
-export const create = async (props) => {
-    const branchId = await branchIdFromProps(props);
-    const { data } = await retryOnLock(() => props.apiClient.createProjectBranchRole(props.projectId, branchId, {
-        role: {
-            name: props.name,
-            no_login: props["no-login"],
-        },
-    }));
-    writer(props).end(data.role, {
-        fields: ROLES_FIELDS,
-    });
+const create = async (props) => {
+	const branchId = await branchIdFromProps(props);
+	const { data } = await retryOnLock(() => props.apiClient.createProjectBranchRole(props.projectId, branchId, { role: {
+		name: props.name,
+		no_login: props["no-login"]
+	} }));
+	writer(props).end(data.role, { fields: ROLES_FIELDS });
 };
-export const deleteRole = async (props) => {
-    const branchId = await branchIdFromProps(props);
-    const { data } = await retryOnLock(() => props.apiClient.deleteProjectBranchRole(props.projectId, branchId, props.role));
-    // A 204 (role already gone) carries no body; only a 200 returns the role.
-    if (data) {
-        writer(props).end(data.role, {
-            fields: ROLES_FIELDS,
-        });
-    }
+const deleteRole = async (props) => {
+	const branchId = await branchIdFromProps(props);
+	const { data } = await retryOnLock(() => props.apiClient.deleteProjectBranchRole(props.projectId, branchId, props.role));
+	if (data) writer(props).end(data.role, { fields: ROLES_FIELDS });
 };
+//#endregion
+export { aliases, builder, command, create, deleteRole, describe, handler, list, roles_exports };

package/dist/commands/schema_diff.js

@@ -1,151 +1,107 @@
-import chalk from "chalk";
-import { createPatch } from "diff";
-import { sendError } from "../analytics.js";
-import { isNeonApiError, messageFromBody } from "../api.js";
 import { log } from "../log.js";
-import { branchIdFromProps } from "../utils/enrichers.js";
-import { parsePointInTime, } from "../utils/point_in_time.js";
+import { isNeonApiError, messageFromBody } from "../api.js";
+import { sendError } from "../analytics.js";
 import { writer } from "../writer.js";
+import { branchIdFromProps } from "../utils/enrichers.js";
+import { parsePointInTime } from "../utils/point_in_time.js";
+import chalk from "chalk";
+import { createPatch } from "diff";
+//#region src/commands/schema_diff.ts
 const COLORS = {
-    added: chalk.green,
-    removed: chalk.red,
-    header: chalk.yellow,
-    section: chalk.magenta,
+	added: chalk.green,
+	removed: chalk.red,
+	header: chalk.yellow,
+	section: chalk.magenta
 };
-export const schemaDiff = async (props) => {
-    props.branch = props.baseBranch || props.branch;
-    const baseBranch = await branchIdFromProps(props);
-    let pointInTime = await parsePointInTime({
-        pointInTime: props.compareSource,
-        targetBranchId: baseBranch,
-        projectId: props.projectId,
-        api: props.apiClient,
-    });
-    // Swap base and compare points if comparing with parent branch
-    const comparingWithParent = props.compareSource.startsWith("^parent");
-    let baseBranchPoint = {
-        branchId: baseBranch,
-        tag: "head",
-    };
-    [baseBranchPoint, pointInTime] = comparingWithParent
-        ? [pointInTime, baseBranchPoint]
-        : [baseBranchPoint, pointInTime];
-    const baseDatabases = await fetchDatabases(baseBranch, props);
-    if (props.database) {
-        const database = baseDatabases.find((db) => db.name === props.database);
-        if (!database) {
-            throw new Error(`Database ${props.database} does not exist in base branch ${baseBranch}`);
-        }
-        const patch = await createSchemaDiff(baseBranchPoint, pointInTime, database, props);
-        writer(props).text(colorize(patch));
-        return;
-    }
-    await Promise.all(baseDatabases.map(async (database) => {
-        const patch = await createSchemaDiff(baseBranchPoint, pointInTime, database, props);
-        writer(props).text(colorize(patch));
-    }));
+const schemaDiff = async (props) => {
+	props.branch = props.baseBranch || props.branch;
+	const baseBranch = await branchIdFromProps(props);
+	let pointInTime = await parsePointInTime({
+		pointInTime: props.compareSource,
+		targetBranchId: baseBranch,
+		projectId: props.projectId,
+		api: props.apiClient
+	});
+	const comparingWithParent = props.compareSource.startsWith("^parent");
+	let baseBranchPoint = {
+		branchId: baseBranch,
+		tag: "head"
+	};
+	[baseBranchPoint, pointInTime] = comparingWithParent ? [pointInTime, baseBranchPoint] : [baseBranchPoint, pointInTime];
+	const baseDatabases = await fetchDatabases(baseBranch, props);
+	if (props.database) {
+		const database = baseDatabases.find((db) => db.name === props.database);
+		if (!database) throw new Error(`Database ${props.database} does not exist in base branch ${baseBranch}`);
+		const patch = await createSchemaDiff(baseBranchPoint, pointInTime, database, props);
+		writer(props).text(colorize(patch));
+		return;
+	}
+	await Promise.all(baseDatabases.map(async (database) => {
+		const patch = await createSchemaDiff(baseBranchPoint, pointInTime, database, props);
+		writer(props).text(colorize(patch));
+	}));
 };
 const fetchDatabases = async (branch, props) => {
-    return props.apiClient
-        .listProjectBranchDatabases(props.projectId, branch)
-        .then((response) => response.data.databases);
+	return props.apiClient.listProjectBranchDatabases(props.projectId, branch).then((response) => response.data.databases);
 };
 const createSchemaDiff = async (baseBranch, pointInTime, database, props) => {
-    const [baseSchema, compareSchema] = await Promise.all([
-        fetchSchema(baseBranch, database, props),
-        fetchSchema(pointInTime, database, props),
-    ]);
-    return createPatch(`Database: ${database.name}`, baseSchema, compareSchema, generateHeader(baseBranch), generateHeader(pointInTime));
+	const [baseSchema, compareSchema] = await Promise.all([fetchSchema(baseBranch, database, props), fetchSchema(pointInTime, database, props)]);
+	return createPatch(`Database: ${database.name}`, baseSchema, compareSchema, generateHeader(baseBranch), generateHeader(pointInTime));
 };
 const fetchSchema = async (pointInTime, database, props) => {
-    try {
-        const response = await props.apiClient.getProjectBranchSchema({
-            projectId: props.projectId,
-            branchId: pointInTime.branchId,
-            db_name: database.name,
-            ...pointInTimeParams(pointInTime),
-        });
-        return response.data.sql ?? "";
-    }
-    catch (error) {
-        if (isNeonApiError(error)) {
-            sendError(error, "API_ERROR");
-            throw new Error(messageFromBody(error.data) ??
-                `Error while fetching schema for branch ${pointInTime.branchId}`);
-        }
-        throw error;
-    }
+	try {
+		return (await props.apiClient.getProjectBranchSchema({
+			projectId: props.projectId,
+			branchId: pointInTime.branchId,
+			db_name: database.name,
+			...pointInTimeParams(pointInTime)
+		})).data.sql ?? "";
+	} catch (error) {
+		if (isNeonApiError(error)) {
+			sendError(error, "API_ERROR");
+			throw new Error(messageFromBody(error.data) ?? `Error while fetching schema for branch ${pointInTime.branchId}`);
+		}
+		throw error;
+	}
 };
 const colorize = (patch) => {
-    return patch
-        .replace(/^([^\n]+)\n([^\n]+)\n/m, "") // Remove first two lines
-        .replace(/^-.*/gm, colorizer("removed"))
-        .replace(/^\+.*/gm, colorizer("added"))
-        .replace(/^@@.+@@.*/gm, colorizer("section"));
+	return patch.replace(/^([^\n]+)\n([^\n]+)\n/m, "").replace(/^-.*/gm, colorizer("removed")).replace(/^\+.*/gm, colorizer("added")).replace(/^@@.+@@.*/gm, colorizer("section"));
 };
 const colorizer = (colorId) => {
-    const color = COLORS[colorId];
-    return (line) => color(line);
+	const color = COLORS[colorId];
+	return (line) => color(line);
 };
 const pointInTimeParams = (pointInTime) => {
-    switch (pointInTime.tag) {
-        case "timestamp":
-            return {
-                timestamp: pointInTime.timestamp,
-            };
-        case "lsn":
-            return {
-                lsn: pointInTime.lsn ?? undefined,
-            };
-        default:
-            return {};
-    }
+	switch (pointInTime.tag) {
+		case "timestamp": return { timestamp: pointInTime.timestamp };
+		case "lsn": return { lsn: pointInTime.lsn ?? void 0 };
+		default: return {};
+	}
 };
 const generateHeader = (pointInTime) => {
-    const header = `(Branch: ${pointInTime.branchId}`;
-    switch (pointInTime.tag) {
-        case "timestamp":
-            return `${header} at ${pointInTime.timestamp})`;
-        case "lsn":
-            return `${header} at ${pointInTime.lsn})`;
-        default:
-            return `${header})`;
-    }
+	const header = `(Branch: ${pointInTime.branchId}`;
+	switch (pointInTime.tag) {
+		case "timestamp": return `${header} at ${pointInTime.timestamp})`;
+		case "lsn": return `${header} at ${pointInTime.lsn})`;
+		default: return `${header})`;
+	}
 };
-/*
-  The command has two positional optional arguments - [base-branch] and [compare-source]
-  If only one argument is specified, we should consider it as `compare-source`
-    and `base-branch` will be either read from context or the default branch of project.
-  If no branches are specified, compare the context branch with its parent
-*/
-export 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,
-            });
-            const contextBranch = data.branches.find((b) => b.id === props.branch || b.name === props.branch);
-            if (contextBranch?.parent_id == undefined) {
-                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,
-            });
-            const defaultBranch = data.branches.find((b) => b.default);
-            if (defaultBranch?.parent_id == undefined) {
-                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;
+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";
+	}
+	return props;
 };
+//#endregion
+export { parseSchemaDiffParams, schemaDiff };

package/dist/commands/set_context.js

@@ -1,30 +1,38 @@
-import { applyContext } from "../context.js";
+import { __exportAll } from "../_virtual/_rolldown/runtime.js";
 import { log } from "../log.js";
+import { applyContext } from "../context.js";
 import { getCliName } from "../utils/cli_name.js";
-export const command = "set-context";
-export const describe = `Deprecated: use \`${getCliName()} link\`. Set the .neon context (raw write).`;
-export const builder = (argv) => argv.usage("$0 set-context [options]").options({
-    "project-id": {
-        describe: "Project ID",
-        type: "string",
-    },
-    "org-id": {
-        describe: "Organization ID",
-        type: "string",
-    },
-    "branch-id": {
-        describe: "Branch ID",
-        type: "string",
-    },
+//#region src/commands/set_context.ts
+var set_context_exports = /* @__PURE__ */ __exportAll({
+	builder: () => builder,
+	command: () => command,
+	describe: () => describe,
+	handler: () => handler
+});
+const command = "set-context";
+const describe = `Deprecated: use \`${getCliName()} link\`. Set the .neon context (raw write).`;
+const builder = (argv) => argv.usage("$0 set-context [options]").options({
+	"project-id": {
+		describe: "Project ID",
+		type: "string"
+	},
+	"org-id": {
+		describe: "Organization ID",
+		type: "string"
+	},
+	"branch-id": {
+		describe: "Branch ID",
+		type: "string"
+	}
 });
-export const handler = (props) => {
-    log.warning(`\`${getCliName()} set-context\` is deprecated and will be removed in a future release. ` +
-        `Use \`${getCliName()} link\` instead — it verifies inputs and infers the org for you ` +
-        `(or \`${getCliName()} link --no-checks\` for the same write-without-checks behavior).`);
-    const context = {
-        projectId: props.projectId,
-        orgId: props.orgId,
-        branchId: props.branchId,
-    };
-    applyContext(props.contextFile, context);
+const handler = (props) => {
+	log.warning(`\`${getCliName()} set-context\` is deprecated and will be removed in a future release. Use \`${getCliName()} link\` instead — it verifies inputs and infers the org for you (or \`${getCliName()} link --no-checks\` for the same write-without-checks behavior).`);
+	const context = {
+		projectId: props.projectId,
+		orgId: props.orgId,
+		branchId: props.branchId
+	};
+	applyContext(props.contextFile, context);
 };
+//#endregion
+export { builder, command, describe, handler, set_context_exports };