@theholocron/holocron-plugin-neon 2.0.0-alpha.49 → 2.0.0-alpha.50

package/dist/index.d.mts

@@ -1,25 +1,19 @@
-import { AuthError, ConnectionStringOptions, ResolveTokenInput, RestClient, RestClient as RestClient$1, Storage, StorageBranch } from "@theholocron/cli";
+import { AuthError, ConnectionStringOptions, ResolveTokenInput, Storage, StorageBranch } from "@theholocron/cli";
+import { NeonClient, NeonClient as NeonClient$1, createNeonClient } from "@theholocron/neon-client";
 
 //#region src/auth.d.ts
 declare const resolveToken: (input?: import("@theholocron/http-client").ResolveTokenInput) => string;
 //#endregion
-//#region src/rest.d.ts
-declare function createNeonRestClient(opts: {
-  token: string;
-  baseUrl?: string;
-  fetch?: typeof fetch;
-}): RestClient$1;
-//#endregion
 //#region src/capabilities/storage.d.ts
 interface StorageOptions {
   projectId: string;
 }
 declare class NeonStorage implements Storage {
-  private readonly rest;
+  private readonly client;
+  private readonly opts;
   readonly key: "storage";
   readonly providerName = "neon";
-  private readonly base;
-  constructor(rest: RestClient, opts: StorageOptions);
+  constructor(client: NeonClient$1, opts: StorageOptions);
   getConnectionString(scope: string, options?: ConnectionStringOptions): Promise<string>;
   listBranches(): Promise<StorageBranch[]>;
   createBranch(input: {
@@ -76,7 +70,7 @@ interface NeonPluginOptions extends ResolveTokenInput {
 }
 interface PluginContext {
   options: NeonPluginOptions;
-  rest: RestClient;
+  client: NeonClient;
 }
 declare function createContext(options: NeonPluginOptions): PluginContext;
 declare function storage(ctx: PluginContext): Storage;
@@ -94,4 +88,4 @@ declare function createPlugin(options: NeonPluginOptions): {
  */
 declare const AUTH_HINT: string;
 //#endregion
-export { AUTH_HINT, AuthError, NeonPluginOptions, NeonStorage, PluginContext, type ResolveTokenInput, type VerifyTokenFailure, type VerifyTokenResult, type VerifyTokenSuccess, createContext, createNeonRestClient, createPlugin, resolveToken, storage, verifyToken };
+export { AUTH_HINT, AuthError, type NeonClient, NeonPluginOptions, NeonStorage, PluginContext, type ResolveTokenInput, type VerifyTokenFailure, type VerifyTokenResult, type VerifyTokenSuccess, createContext, createNeonClient, createPlugin, resolveToken, storage, verifyToken };

package/dist/index.mjs

@@ -1,4 +1,5 @@
-import { AuthError, ProviderApiError, createResolveToken, createRestClient } from "@theholocron/cli";
+import { AuthError, ProviderApiError, createResolveToken } from "@theholocron/cli";
+import { createNeonClient } from "@theholocron/neon-client";
 //#region src/auth.ts
 const resolveToken = createResolveToken({
 	envName: "HOLOCRON_NEON_API_KEY",
@@ -27,55 +28,46 @@ const resolveToken = createResolveToken({
 * via `projectId` in options.
 */
 var NeonStorage = class {
-	rest;
+	client;
+	opts;
 	key = "storage";
 	providerName = "neon";
-	base;
-	constructor(rest, opts) {
-		this.rest = rest;
+	constructor(client, opts) {
+		this.client = client;
+		this.opts = opts;
 		if (!opts.projectId) throw new Error("NeonStorage requires `projectId` in options");
-		this.base = `/projects/${opts.projectId}`;
 	}
 	async getConnectionString(scope, options = {}) {
 		const db = await this.firstDatabase(scope);
-		const params = {
+		const { uri } = await this.client.connection.uri(this.opts.projectId, {
 			branch_id: scope,
 			database_name: db.name,
 			role_name: db.owner_name,
 			pooled: options.pooled ? "true" : "false"
-		};
-		return (await this.rest.request(`${this.base}/connection_uri`, { query: params })).uri;
+		});
+		return uri;
 	}
 	async listBranches() {
-		return (await this.rest.request(`${this.base}/branches`)).branches.map(mapBranch);
+		const { branches } = await this.client.branches.list(this.opts.projectId);
+		return branches.map(mapBranch);
 	}
 	async createBranch(input) {
-		return mapBranch((await this.rest.request(`${this.base}/branches`, {
-			method: "POST",
-			body: {
-				branch: {
-					name: input.name,
-					...input.from ? { parent_id: input.from } : {}
-				},
-				endpoints: [{ type: "read_write" }]
-			}
-		})).branch);
+		const { branch } = await this.client.branches.create(this.opts.projectId, {
+			name: input.name,
+			...input.from ? { parent_id: input.from } : {},
+			endpoints: [{ type: "read_write" }]
+		});
+		return mapBranch(branch);
 	}
 	async destroyBranch(branch) {
-		await this.rest.request(`${this.base}/branches/${encodeURIComponent(branch)}`, { method: "DELETE" });
+		await this.client.branches.destroy(this.opts.projectId, branch);
 	}
 	async resetBranch(input) {
-		await this.rest.request(`${this.base}/branches/${encodeURIComponent(input.branch)}/restore`, {
-			method: "POST",
-			body: { source_branch_id: input.from }
-		});
+		await this.client.branches.restore(this.opts.projectId, input.branch, input.from);
 	}
 	async enableExtension(input) {
 		const db = await this.firstDatabase(input.branch);
-		await this.rest.request(`${this.base}/branches/${encodeURIComponent(input.branch)}/databases/${encodeURIComponent(db.name)}/run_sql`, {
-			method: "POST",
-			body: { query: `CREATE EXTENSION IF NOT EXISTS "${input.extension}"` }
-		});
+		await this.client.databases.runSql(this.opts.projectId, input.branch, db.name, `CREATE EXTENSION IF NOT EXISTS "${input.extension}"`);
 	}
 	/**
 	* The first database on a branch — the "default" for connection-string
@@ -83,7 +75,8 @@ var NeonStorage = class {
 	* means it was created without an endpoint and needs initialization).
 	*/
 	async firstDatabase(branchId) {
-		const db = (await this.rest.request(`${this.base}/branches/${encodeURIComponent(branchId)}/databases`)).databases[0];
+		const { databases } = await this.client.databases.list(this.opts.projectId, branchId);
+		const db = databases[0];
 		if (!db) throw new ProviderApiError(`Neon branch ${branchId} has no databases — initialize the branch first`, 404, void 0);
 		return db;
 	}
@@ -97,16 +90,6 @@ function mapBranch(raw) {
 	};
 }
 //#endregion
-//#region src/rest.ts
-function createNeonRestClient(opts) {
-	return createRestClient({
-		baseUrl: opts.baseUrl ?? "https://console.neon.tech/api/v2",
-		token: opts.token,
-		vendor: "Neon",
-		fetch: opts.fetch
-	});
-}
-//#endregion
 //#region src/verify-token.ts
 /**
 * `verifyToken` — plugin-level export used by `holocron auth set` +
@@ -115,13 +98,13 @@ function createNeonRestClient(opts) {
 * shape.
 */
 async function verifyToken(token, opts = {}) {
-	const rest = createNeonRestClient({
+	const client = createNeonClient({
 		token,
 		baseUrl: opts.baseUrl,
 		fetch: opts.fetch
 	});
 	try {
-		const me = await rest.request("/users/me");
+		const me = await client.users.me();
 		return {
 			ok: true,
 			subject: `user @ ${me?.email ?? me?.login ?? me?.name ?? me?.id ?? "unknown"}`
@@ -139,7 +122,7 @@ function createContext(options) {
 	if (!options.projectId) throw new Error("@theholocron/holocron-plugin-neon requires `projectId` in options");
 	return {
 		options,
-		rest: createNeonRestClient({
+		client: createNeonClient({
 			token: resolveToken(options),
 			baseUrl: options.baseUrl,
 			fetch: options.fetch
@@ -147,7 +130,7 @@ function createContext(options) {
 	};
 }
 function storage(ctx) {
-	return new NeonStorage(ctx.rest, { projectId: ctx.options.projectId });
+	return new NeonStorage(ctx.client, { projectId: ctx.options.projectId });
 }
 function createPlugin(options) {
 	const ctx = createContext(options);
@@ -164,4 +147,4 @@ function createPlugin(options) {
 */
 const AUTH_HINT = "generate a Neon API key at https://console.neon.tech/app/settings/api-keys, then run: holocron auth set neon <KEY>";
 //#endregion
-export { AUTH_HINT, AuthError, NeonStorage, createContext, createNeonRestClient, createPlugin, resolveToken, storage, verifyToken };
+export { AUTH_HINT, AuthError, NeonStorage, createContext, createNeonClient, createPlugin, resolveToken, storage, verifyToken };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@theholocron/holocron-plugin-neon",
-  "version": "2.0.0-alpha.49",
+  "version": "2.0.0-alpha.50",
   "description": "Holocron plugin for Neon. Implements the storage capability against Neon's REST API — branch ops, connection strings, extensions.",
   "homepage": "https://github.com/theholocron/holocron/tree/main/packages/holocron-plugin-neon#readme",
   "bugs": "https://github.com/theholocron/holocron/issues",
@@ -21,9 +21,16 @@
     }
   },
   "peerDependencies": {
-    "@theholocron/cli": "2.0.0-alpha.49"
+    "@theholocron/neon-client": "^0.7.0",
+    "@theholocron/cli": "2.0.0-alpha.50"
+  },
+  "peerDependenciesMeta": {
+    "@theholocron/neon-client": {
+      "optional": false
+    }
   },
   "devDependencies": {
+    "@theholocron/neon-client": "^0.7.0",
     "@types/node": "^26",
     "@theholocron/eslint-config": "^5.2.0",
     "@theholocron/tsconfig": "^6.0.0",
@@ -37,7 +44,7 @@
     "tsx": "^4.22.4",
     "typescript": "^5.9.3",
     "vitest": "^4.1.10",
-    "@theholocron/cli": "2.0.0-alpha.49"
+    "@theholocron/cli": "2.0.0-alpha.50"
   },
   "publishConfig": {
     "access": "public"