@neondatabase/config 0.8.0 → 0.9.0

package/dist/lib/neon-api-real.js

@@ -2,9 +2,24 @@ import { ErrorCode, PlatformError } from "./errors.js";
 import { formatSuspendTimeout, parseSuspendTimeout } from "./duration.js";
 import { wrapNeonError } from "./wrap-neon-error.js";
 import { z } from "zod";
-import { EndpointType, createApiClient } from "@neondatabase/api-client";
+import { createNeonClient } from "@neon/sdk";
+import { createProject, createProjectBranch, createProjectBranchDataApi, getConnectionUri, getNeonAuth, getProject, getProjectBranchDataApi, listProjectBranchDatabases, listProjectBranchRoles, listProjectBranches, listProjectEndpoints, listProjects, updateProject, updateProjectBranch, updateProjectBranchDataApi, updateProjectEndpoint } from "@neon/sdk/raw";
 //#region src/lib/neon-api-real.ts
 const DEFAULT_NEON_API_BASE_URL = "https://console.neon.tech/api/v2";
+/**
+* Unwrap a `@neon/sdk` raw `{ data, error, response }` result into the bare body, throwing
+* on a non-2xx response. The thrown shape (`{ response: { status, data } }`) deliberately
+* matches what the package's REST fallbacks already throw, so {@link wrapNeonError} and the
+* 423 {@link retryOnLocked} retry keep working unchanged across both transports.
+*/
+function unwrap(result) {
+	const response = result.response;
+	if (!response || !response.ok) throw { response: {
+		status: response?.status,
+		data: result.error
+	} };
+	return result.data;
+}
 const neonAuthResponseSchema = z.object({
 	auth_provider_project_id: z.string(),
 	pub_client_key: z.string().optional(),
@@ -129,16 +144,18 @@ const credentialMetaSchema = z.object({
 });
 const listCredentialsResponseSchema = z.object({ credentials: z.array(credentialMetaSchema) });
 /**
-* Adapt `@neondatabase/api-client` to the narrow {@link NeonApi} façade used by the rest of
+* Adapt `@neon/sdk` (raw layer) to the narrow {@link NeonApi} façade used by the rest of
 * this package. Constructs are restricted to whole-object read/write of just the fields we
 * model in {@link Config}; anything else stays untouched on the remote.
 */
 function createRealNeonApi(options) {
 	if (!options.apiKey || options.apiKey.trim() === "") throw new PlatformError(ErrorCode.MissingApiKey, ["createRealNeonApi requires a non-empty `apiKey`.", "Generate one at https://console.neon.tech/app/settings/api-keys and pass it as { apiKey: process.env.NEON_API_KEY }."].join(" "));
-	return new RealNeonApi(createApiClient({
+	const client = createNeonClient({
 		apiKey: options.apiKey,
-		...options.baseUrl ? { baseURL: options.baseUrl } : {}
-	}), {
+		retries: 0,
+		...options.baseUrl ? { baseUrl: options.baseUrl } : {}
+	}).client;
+	return new RealNeonApi(client, {
 		maxAttempts: options.retryOnLocked?.maxAttempts ?? 12,
 		initialDelayMs: options.retryOnLocked?.initialDelayMs ?? 250,
 		maxDelayMs: options.retryOnLocked?.maxDelayMs ?? 5e3
@@ -204,13 +221,16 @@ var RealNeonApi = class {
 			const projects = [];
 			let cursor;
 			while (true) {
-				const res = await this.client.listProjects({
-					...filter.orgId ? { org_id: filter.orgId } : {},
-					...cursor ? { cursor } : {},
-					limit: 100
-				});
-				projects.push(...res.data.projects);
-				const next = res.data.pagination?.next;
+				const body = unwrap(await listProjects({
+					client: this.client,
+					query: {
+						...filter.orgId ? { org_id: filter.orgId } : {},
+						...cursor ? { cursor } : {},
+						limit: 100
+					}
+				}));
+				projects.push(...body.projects);
+				const next = body.pagination?.next;
 				if (!next || next === cursor) break;
 				cursor = next;
 			}
@@ -219,7 +239,10 @@ var RealNeonApi = class {
 	}
 	async getProject(projectId) {
 		return this.call(`getProject(${projectId})`, async () => {
-			return projectToSnapshot((await this.client.getProject(projectId)).data.project);
+			return projectToSnapshot(unwrap(await getProject({
+				client: this.client,
+				path: { project_id: projectId }
+			})).project);
 		}, { projectId });
 	}
 	async createProject(input) {
@@ -232,7 +255,10 @@ var RealNeonApi = class {
 			...input.defaultBranchName ? { branch: { name: input.defaultBranchName } } : {}
 		} };
 		return this.call(`createProject(${input.name})`, async () => {
-			return projectToSnapshot((await this.client.createProject(body)).data.project);
+			return projectToSnapshot(unwrap(await createProject({
+				client: this.client,
+				body
+			})).project);
 		}, { mutating: true });
 	}
 	async updateProject(projectId, input) {
@@ -241,7 +267,11 @@ var RealNeonApi = class {
 			...input.defaultEndpointSettings ? { default_endpoint_settings: computeSettingsToDefaults(input.defaultEndpointSettings) } : {}
 		} };
 		return this.call(`updateProject(${projectId})`, async () => {
-			return projectToSnapshot((await this.client.updateProject(projectId, body)).data.project);
+			return projectToSnapshot(unwrap(await updateProject({
+				client: this.client,
+				path: { project_id: projectId },
+				body
+			})).project);
 		}, {
 			projectId,
 			mutating: true
@@ -252,13 +282,16 @@ var RealNeonApi = class {
 			const branches = [];
 			let cursor;
 			while (true) {
-				const res = await this.client.listProjectBranches({
-					projectId,
-					limit: 100,
-					...cursor ? { cursor } : {}
-				});
-				branches.push(...res.data.branches);
-				const next = res.data.pagination?.next;
+				const body = unwrap(await listProjectBranches({
+					client: this.client,
+					path: { project_id: projectId },
+					query: {
+						limit: 100,
+						...cursor ? { cursor } : {}
+					}
+				}));
+				branches.push(...body.branches);
+				const next = body.pagination?.next;
 				if (!next || next === cursor) break;
 				cursor = next;
 			}
@@ -267,9 +300,9 @@ var RealNeonApi = class {
 	}
 	async createBranch(projectId, input) {
 		const endpointOptions = input.computeSettings ? {
-			type: EndpointType.ReadWrite,
+			type: "read_write",
 			...computeSettingsToEndpointOptions(input.computeSettings)
-		} : { type: EndpointType.ReadWrite };
+		} : { type: "read_write" };
 		const body = {
 			branch: {
 				name: input.name,
@@ -280,10 +313,14 @@ var RealNeonApi = class {
 			endpoints: [endpointOptions]
 		};
 		return this.call(`createBranch(${projectId}/${input.name})`, async () => {
-			const res = await this.client.createProjectBranch(projectId, body);
+			const data = unwrap(await createProjectBranch({
+				client: this.client,
+				path: { project_id: projectId },
+				body
+			}));
 			return {
-				branch: branchToSnapshot(res.data.branch),
-				endpoints: (res.data.endpoints ?? []).map(endpointToSnapshot)
+				branch: branchToSnapshot(data.branch),
+				endpoints: (data.endpoints ?? []).map(endpointToSnapshot)
 			};
 		}, {
 			projectId,
@@ -296,7 +333,14 @@ var RealNeonApi = class {
 		if (input.expiresAt !== void 0) branch.expires_at = input.expiresAt;
 		if (input.protected !== void 0) branch.protected = input.protected;
 		return this.call(`updateBranch(${projectId}/${branchId})`, async () => {
-			return branchToSnapshot((await this.client.updateProjectBranch(projectId, branchId, { branch })).data.branch);
+			return branchToSnapshot(unwrap(await updateProjectBranch({
+				client: this.client,
+				path: {
+					project_id: projectId,
+					branch_id: branchId
+				},
+				body: { branch }
+			})).branch);
 		}, {
 			projectId,
 			mutating: true
@@ -304,13 +348,23 @@ var RealNeonApi = class {
 	}
 	async listEndpoints(projectId) {
 		return this.call(`listEndpoints(${projectId})`, async () => {
-			return (await this.client.listProjectEndpoints(projectId)).data.endpoints.map(endpointToSnapshot);
+			return unwrap(await listProjectEndpoints({
+				client: this.client,
+				path: { project_id: projectId }
+			})).endpoints.map(endpointToSnapshot);
 		}, { projectId });
 	}
 	async updateEndpoint(projectId, endpointId, settings) {
 		const endpoint = computeSettingsToEndpointOptions(settings);
 		return this.call(`updateEndpoint(${projectId}/${endpointId})`, async () => {
-			return endpointToSnapshot((await this.client.updateProjectEndpoint(projectId, endpointId, { endpoint })).data.endpoint);
+			return endpointToSnapshot(unwrap(await updateProjectEndpoint({
+				client: this.client,
+				path: {
+					project_id: projectId,
+					endpoint_id: endpointId
+				},
+				body: { endpoint }
+			})).endpoint);
 		}, {
 			projectId,
 			mutating: true
@@ -318,32 +372,54 @@ var RealNeonApi = class {
 	}
 	async listBranchRoles(projectId, branchId) {
 		return this.call(`listBranchRoles(${projectId}/${branchId})`, async () => {
-			return (await this.client.listProjectBranchRoles(projectId, branchId)).data.roles.map(roleToSnapshot);
+			return unwrap(await listProjectBranchRoles({
+				client: this.client,
+				path: {
+					project_id: projectId,
+					branch_id: branchId
+				}
+			})).roles.map(roleToSnapshot);
 		}, { projectId });
 	}
 	async listBranchDatabases(projectId, branchId) {
 		return this.call(`listBranchDatabases(${projectId}/${branchId})`, async () => {
-			return (await this.client.listProjectBranchDatabases(projectId, branchId)).data.databases.map(databaseToSnapshot);
+			return unwrap(await listProjectBranchDatabases({
+				client: this.client,
+				path: {
+					project_id: projectId,
+					branch_id: branchId
+				}
+			})).databases.map(databaseToSnapshot);
 		}, { projectId });
 	}
 	async getConnectionUri(projectId, input) {
 		const op = `getConnectionUri(${projectId}/${input.databaseName}@${input.roleName}${input.pooled ? " pooled" : ""})`;
 		const pooled = input.pooled === true;
 		return this.call(op, async () => {
-			return { uri: (await this.client.getConnectionUri({
-				projectId,
-				database_name: input.databaseName,
-				role_name: input.roleName,
-				...input.branchId ? { branch_id: input.branchId } : {},
-				...input.endpointId ? { endpoint_id: input.endpointId } : {},
-				pooled
-			})).data.uri };
+			return { uri: unwrap(await getConnectionUri({
+				client: this.client,
+				path: { project_id: projectId },
+				query: {
+					database_name: input.databaseName,
+					role_name: input.roleName,
+					...input.branchId ? { branch_id: input.branchId } : {},
+					...input.endpointId ? { endpoint_id: input.endpointId } : {},
+					pooled
+				}
+			})).uri };
 		}, { projectId });
 	}
 	async getNeonAuth(projectId, branchId) {
 		try {
 			return await this.call(`getNeonAuth(${projectId}/${branchId})`, async () => {
-				return neonAuthResponseToSnapshot((await this.client.getNeonAuth(projectId, branchId)).data);
+				const data = unwrap(await getNeonAuth({
+					client: this.client,
+					path: {
+						project_id: projectId,
+						branch_id: branchId
+					}
+				}));
+				return neonAuthResponseToSnapshot(neonAuthResponseSchema.parse(data));
 			}, { projectId });
 		} catch (err) {
 			if (err instanceof PlatformError && err.code === ErrorCode.NotFound) return null;
@@ -406,7 +482,14 @@ var RealNeonApi = class {
 	}
 	async getNeonDataApi(projectId, branchId, databaseName) {
 		try {
-			return await this.call(`getNeonDataApi(${projectId}/${branchId}/${databaseName})`, async () => dataApiSnapshotFromResponse(await this.client.getProjectBranchDataApi(projectId, branchId, databaseName).then((res) => res.data)), { projectId });
+			return await this.call(`getNeonDataApi(${projectId}/${branchId}/${databaseName})`, async () => dataApiSnapshotFromResponse(unwrap(await getProjectBranchDataApi({
+				client: this.client,
+				path: {
+					project_id: projectId,
+					branch_id: branchId,
+					database_name: databaseName
+				}
+			}))), { projectId });
 		} catch (err) {
 			if (err instanceof PlatformError && err.code === ErrorCode.NotFound) return null;
 			throw err;
@@ -415,7 +498,15 @@ var RealNeonApi = class {
 	async enableProjectBranchDataApi(projectId, branchId, databaseName, input) {
 		try {
 			return await this.call(`enableProjectBranchDataApi(${projectId}/${branchId}/${databaseName})`, async () => {
-				return { url: (await this.client.createProjectBranchDataApi(projectId, branchId, databaseName, dataApiCreateRequest(input))).data.url };
+				return { url: unwrap(await createProjectBranchDataApi({
+					client: this.client,
+					path: {
+						project_id: projectId,
+						branch_id: branchId,
+						database_name: databaseName
+					},
+					body: dataApiCreateRequest(input)
+				})).url };
 			}, {
 				projectId,
 				mutating: true
@@ -430,8 +521,23 @@ var RealNeonApi = class {
 	}
 	async updateProjectBranchDataApi(projectId, branchId, databaseName, settings) {
 		return await this.call(`updateProjectBranchDataApi(${projectId}/${branchId}/${databaseName})`, async () => {
-			await this.client.updateProjectBranchDataApi(projectId, branchId, databaseName, { settings: dataApiSettingsToApi(settings) });
-			return dataApiSnapshotFromResponse((await this.client.getProjectBranchDataApi(projectId, branchId, databaseName)).data);
+			unwrap(await updateProjectBranchDataApi({
+				client: this.client,
+				path: {
+					project_id: projectId,
+					branch_id: branchId,
+					database_name: databaseName
+				},
+				body: { settings: dataApiSettingsToApi(settings) }
+			}));
+			return dataApiSnapshotFromResponse(unwrap(await getProjectBranchDataApi({
+				client: this.client,
+				path: {
+					project_id: projectId,
+					branch_id: branchId,
+					database_name: databaseName
+				}
+			})));
 		}, {
 			projectId,
 			mutating: true
@@ -796,7 +902,7 @@ function endpointToSnapshot(endpoint) {
 	return {
 		id: endpoint.id,
 		branchId: endpoint.branch_id,
-		type: endpoint.type === EndpointType.ReadOnly ? "read_only" : "read_write",
+		type: endpoint.type === "read_only" ? "read_only" : "read_write",
 		autoscalingLimitMinCu: endpoint.autoscaling_limit_min_cu,
 		autoscalingLimitMaxCu: endpoint.autoscaling_limit_max_cu,
 		suspendTimeout: formatSuspendTimeout(endpoint.suspend_timeout_seconds)