alchemy 2.0.0-beta.76 → 2.0.0-beta.78

package/src/Prisma/Branch.ts

@@ -12,11 +12,16 @@ import {
 import * as ProviderLayer from "../Local/ProviderLayer.ts";
 import { Resource } from "../Resource.ts";
 import {
-  PrismaClient,
-  isConflict,
-  isNotFound,
-  type PrismaManagementClient,
-} from "./Client.ts";
+  type GetProjectBranchesResponse,
+  type GetProjectsResponse,
+  deleteBranch,
+  getBranch,
+  getProjects,
+  getProjectBranches,
+  updateBranch,
+  createProjectBranch,
+} from "@distilled.cloud/prisma/management";
+import { Retry } from "@distilled.cloud/prisma";
 import type { Project } from "./Project.ts";
 import type { Providers } from "./Providers.ts";
 import {
@@ -26,7 +31,8 @@ import {
   resolveProjectId,
   unresolvedProjectIdOf,
 } from "./Refs.ts";
-import type { Branch as ApiBranch } from "./Types.ts";
+import type { ObservedBranch } from "./Internal/Observed.ts";
+import { PrismaPaginationError } from "./Internal/Pagination.ts";
 
 export interface BranchProps {
   /**
@@ -130,14 +136,65 @@ export const Branch = Resource<Branch>("Prisma.Branch");
 const createGitName = (id: string, gitName: string | undefined) =>
   gitName === undefined ? createPhysicalName({ id }) : Effect.succeed(gitName);
 
-const findBranch = (
-  client: PrismaManagementClient,
+// Distilled emits the cursor-paginated list operations as plain ops, so
+// callers walk `pagination` themselves (see `src/Neon/Project.ts`).
+const listBranches = (
   projectId: string,
-  gitName: string,
+  query?: { readonly gitName?: string },
 ) =>
-  client.listBranches(projectId, { gitName }).pipe(
+  Effect.gen(function* () {
+    const branches: GetProjectBranchesResponse["data"][number][] = [];
+    let cursor: string | undefined;
+    while (true) {
+      const page = yield* getProjectBranches({
+        projectId,
+        ...(query?.gitName === undefined ? {} : { gitName: query.gitName }),
+        ...(cursor === undefined ? {} : { cursor }),
+      });
+      branches.push(...page.data);
+      const nextCursor = page.pagination.nextCursor;
+      if (!page.pagination.hasMore) break;
+      if (nextCursor === null) {
+        return yield* Effect.fail(
+          new PrismaPaginationError({
+            message:
+              "Invalid Prisma Management API pagination response from getProjectBranches: hasMore was true without a non-empty nextCursor",
+          }),
+        );
+      }
+      cursor = nextCursor;
+    }
+    return branches;
+  });
+
+const listProjects = () =>
+  Effect.gen(function* () {
+    const projects: GetProjectsResponse["data"][number][] = [];
+    let cursor: string | undefined;
+    while (true) {
+      const page = yield* getProjects(cursor === undefined ? {} : { cursor });
+      projects.push(...page.data);
+      const nextCursor = page.pagination.nextCursor;
+      if (!page.pagination.hasMore) break;
+      if (nextCursor === null) {
+        return yield* Effect.fail(
+          new PrismaPaginationError({
+            message:
+              "Invalid Prisma Management API pagination response from getProjects: hasMore was true without a non-empty nextCursor",
+          }),
+        );
+      }
+      cursor = nextCursor;
+    }
+    return projects;
+  });
+
+const findBranch = (projectId: string, gitName: string) =>
+  listBranches(projectId, { gitName }).pipe(
     Effect.flatMap((branches) => {
-      const matches = branches.filter((b: ApiBranch) => b.gitName === gitName);
+      const matches = branches.filter(
+        (b: ObservedBranch) => b.gitName === gitName,
+      );
       return matches.length > 1
         ? Effect.fail(
             new Error(
@@ -149,7 +206,7 @@ const findBranch = (
   );
 
 const attrsFrom = (
-  branch: ApiBranch,
+  branch: ObservedBranch,
   previousDefaultBranchId?: string,
 ): Branch["Attributes"] => ({
   branchId: branch.id,
@@ -163,7 +220,7 @@ const attrsFrom = (
 });
 
 const ensureBranchIdentity = (
-  branch: ApiBranch,
+  branch: ObservedBranch,
   expected: { projectId: string; gitName: string },
 ) =>
   branch.project.id === expected.projectId &&
@@ -179,17 +236,16 @@ const ProviderLive = () =>
   Provider.effect(
     Branch,
     Effect.gen(function* () {
-      const client = yield* PrismaClient;
       return {
         stables: ["branchId"],
         list: Effect.fn(function* () {
-          const projects = yield* client.listProjects();
+          const projects = yield* listProjects();
           const branches = yield* Effect.forEach(
             projects,
             (project) =>
-              client
-                .listBranches(project.id)
-                .pipe(Effect.catchIf(isNotFound, () => Effect.succeed([]))),
+              listBranches(project.id).pipe(
+                Effect.catchTag("NotFound", () => Effect.succeed([])),
+              ),
             { concurrency: 8 },
           );
           // Current defaults and production-role branches are project-owned
@@ -237,16 +293,14 @@ const ProviderLive = () =>
             ? undefined
             : output?.branchId;
           const branch = branchId
-            ? yield* client
-                .getBranch(branchId)
-                .pipe(
-                  Effect.catchIf(isNotFound, () => Effect.succeed(undefined)),
-                )
+            ? yield* getBranch({ branchId }).pipe(
+                Effect.map((response) => response.data),
+                Effect.catchTag("NotFound", () => Effect.succeed(undefined)),
+              )
             : yield* Effect.gen(function* () {
                 const projectId = unresolvedProjectIdOf(olds.project);
                 return projectId
                   ? yield* findBranch(
-                      client,
                       projectId,
                       yield* createGitName(id, olds.gitName),
                     )
@@ -264,14 +318,13 @@ const ProviderLive = () =>
             ? undefined
             : output?.branchId;
           let branch = branchId
-            ? yield* client
-                .getBranch(branchId)
-                .pipe(
-                  Effect.catchIf(isNotFound, () => Effect.succeed(undefined)),
-                )
+            ? yield* getBranch({ branchId }).pipe(
+                Effect.map((response) => response.data),
+                Effect.catchTag("NotFound", () => Effect.succeed(undefined)),
+              )
             : undefined;
           if (!branch) {
-            const liveBranches = yield* client.listBranches(projectId);
+            const liveBranches = yield* listBranches(projectId);
             const defaults = liveBranches.filter(
               (candidate) => candidate.isDefault,
             );
@@ -285,27 +338,32 @@ const ProviderLive = () =>
               );
             }
             previousDefaultBranchId = defaults[0]!.id;
-            branch = yield* client
-              .createBranch(projectId, {
-                gitName,
-                isDefault: news.isDefault,
-              })
-              .pipe(
-                Effect.catchIf(isConflict, () =>
-                  Effect.fail(
-                    new Error(
-                      `Prisma branch '${gitName}' appeared after the adoption check. Refusing to take it over; rerun with adoption enabled if it is the intended branch.`,
-                    ),
+            branch = yield* createProjectBranch({
+              projectId,
+              gitName,
+              ...(news.isDefault === undefined
+                ? {}
+                : { isDefault: news.isDefault }),
+            }).pipe(
+              // A replayed create would make a second branch; the retry
+              // policy cannot see the request, so opt out explicitly.
+              Retry.none,
+              Effect.map((response) => response.data),
+              Effect.catchTag("Conflict", () =>
+                Effect.fail(
+                  new Error(
+                    `Prisma branch '${gitName}' appeared after the adoption check. Refusing to take it over; rerun with adoption enabled if it is the intended branch.`,
                   ),
                 ),
-              );
+              ),
+            );
           }
           yield* ensureBranchIdentity(branch, {
             projectId,
             gitName,
           });
           if (news.isDefault === true && !branch.isDefault) {
-            const liveBranches = yield* client.listBranches(projectId);
+            const liveBranches = yield* listBranches(projectId);
             const defaults = liveBranches.filter(
               (candidate) => candidate.isDefault,
             );
@@ -317,9 +375,10 @@ const ProviderLive = () =>
               );
             }
             previousDefaultBranchId = defaults[0]!.id;
-            branch = yield* client.updateBranch(branch.id, {
+            branch = (yield* updateBranch({
+              branchId: branch.id,
               isDefault: true,
-            });
+            })).data;
             yield* ensureBranchIdentity(branch, {
               projectId,
               gitName,
@@ -336,9 +395,12 @@ const ProviderLive = () =>
         }),
         delete: Effect.fn(function* ({ output }) {
           if (isPrismaDevId(output.branchId)) return;
-          const branch = yield* client
-            .getBranch(output.branchId)
-            .pipe(Effect.catchIf(isNotFound, () => Effect.succeed(undefined)));
+          const branch = yield* getBranch({
+            branchId: output.branchId,
+          }).pipe(
+            Effect.map((response) => response.data),
+            Effect.catchTag("NotFound", () => Effect.succeed(undefined)),
+          );
           if (!branch) return;
           yield* ensureBranchIdentity(branch, {
             projectId: output.projectId,
@@ -363,17 +425,18 @@ const ProviderLive = () =>
                 ),
               );
             }
-            const previous = yield* client
-              .getBranch(previousDefaultBranchId)
-              .pipe(
-                Effect.catchIf(isNotFound, () =>
-                  Effect.fail(
-                    new Error(
-                      `Cannot restore previous default Prisma branch '${previousDefaultBranchId}' because it no longer exists. Promote another branch explicitly before deleting '${branch.gitName}'.`,
-                    ),
+            const previous = yield* getBranch({
+              branchId: previousDefaultBranchId,
+            }).pipe(
+              Effect.map((response) => response.data),
+              Effect.catchTag("NotFound", () =>
+                Effect.fail(
+                  new Error(
+                    `Cannot restore previous default Prisma branch '${previousDefaultBranchId}' because it no longer exists. Promote another branch explicitly before deleting '${branch.gitName}'.`,
                   ),
                 ),
-              );
+              ),
+            );
             if (
               previous.project.id !== output.projectId ||
               previous.id === branch.id
@@ -386,7 +449,10 @@ const ProviderLive = () =>
             }
             const restored = previous.isDefault
               ? previous
-              : yield* client.updateBranch(previous.id, { isDefault: true });
+              : (yield* updateBranch({
+                  branchId: previous.id,
+                  isDefault: true,
+                })).data;
             if (
               restored.id !== previous.id ||
               restored.project.id !== output.projectId ||
@@ -398,11 +464,12 @@ const ProviderLive = () =>
                 ),
               );
             }
-            const demoted = yield* client
-              .getBranch(branch.id)
-              .pipe(
-                Effect.catchIf(isNotFound, () => Effect.succeed(undefined)),
-              );
+            const demoted = yield* getBranch({
+              branchId: branch.id,
+            }).pipe(
+              Effect.map((response) => response.data),
+              Effect.catchTag("NotFound", () => Effect.succeed(undefined)),
+            );
             if (!demoted) return;
             yield* ensureBranchIdentity(demoted, {
               projectId: output.projectId,
@@ -416,9 +483,9 @@ const ProviderLive = () =>
               );
             }
           }
-          yield* client
-            .deleteBranch(output.branchId)
-            .pipe(Effect.catchIf(isNotFound, () => Effect.void));
+          yield* deleteBranch({
+            branchId: output.branchId,
+          }).pipe(Effect.catchTag("NotFound", () => Effect.void));
         }),
       };
     }),

package/src/Prisma/Bucket.ts

@@ -10,7 +10,14 @@ import {
 } from "./Internal/DevStub.ts";
 import * as ProviderLayer from "../Local/ProviderLayer.ts";
 import { Resource } from "../Resource.ts";
-import { PrismaClient, isNotFound } from "./Client.ts";
+import {
+  type GetBucketsResponse,
+  deleteBucket,
+  getBuckets,
+  getBucket,
+  createBucket,
+} from "@distilled.cloud/prisma/management";
+import { Retry } from "@distilled.cloud/prisma";
 import type { Project } from "./Project.ts";
 import type { Providers } from "./Providers.ts";
 import {
@@ -20,7 +27,8 @@ import {
   resolveProjectId,
   unresolvedProjectIdOf,
 } from "./Refs.ts";
-import type { Bucket as ApiBucket } from "./Types.ts";
+import type { ObservedBucket } from "./Internal/Observed.ts";
+import { PrismaPaginationError } from "./Internal/Pagination.ts";
 
 export interface BucketProps {
   /**
@@ -109,24 +117,45 @@ export class BucketProjectMismatchError extends Data.TaggedError(
   message: string;
 }> {}
 
-const attrsFrom = (bucket: ApiBucket): Bucket["Attributes"] => ({
+const attrsFrom = (bucket: ObservedBucket): Bucket["Attributes"] => ({
   bucketId: bucket.id,
   name: bucket.name,
   projectId: bucket.project.id,
   createdAt: bucket.createdAt,
 });
 
+// Distilled emits the cursor-paginated list operations as plain ops, so
+// callers walk `pagination` themselves (see `src/Neon/Project.ts`).
+const listBuckets = () =>
+  Effect.gen(function* () {
+    const buckets: GetBucketsResponse["data"][number][] = [];
+    let cursor: string | undefined;
+    while (true) {
+      const page = yield* getBuckets(cursor === undefined ? {} : { cursor });
+      buckets.push(...page.data);
+      const nextCursor = page.pagination.nextCursor;
+      if (!page.pagination.hasMore) break;
+      if (nextCursor === null) {
+        return yield* Effect.fail(
+          new PrismaPaginationError({
+            message:
+              "Invalid Prisma Management API pagination response from getBuckets: hasMore was true without a non-empty nextCursor",
+          }),
+        );
+      }
+      cursor = nextCursor;
+    }
+    return buckets;
+  });
+
 const ProviderLive = () =>
   Provider.effect(
     Bucket,
     Effect.gen(function* () {
-      const client = yield* PrismaClient;
       return {
         stables: ["bucketId"],
         list: () =>
-          client
-            .listBuckets()
-            .pipe(Effect.map((buckets) => buckets.map(attrsFrom))),
+          listBuckets().pipe(Effect.map((buckets) => buckets.map(attrsFrom))),
         diff: Effect.fn(function* ({ olds, news, output }) {
           if (!isInputObject(news)) return undefined;
           if (isPrismaDevId(output?.bucketId)) {
@@ -162,9 +191,10 @@ const ProviderLive = () =>
             ? undefined
             : output?.bucketId;
           if (!bucketId) return undefined;
-          const bucket = yield* client
-            .getBucket(bucketId)
-            .pipe(Effect.catchIf(isNotFound, () => Effect.succeed(undefined)));
+          const bucket = yield* getBucket({ bucketId }).pipe(
+            Effect.map((response) => response.data),
+            Effect.catchTag("NotFound", () => Effect.succeed(undefined)),
+          );
           return bucket ? attrsFrom(bucket) : undefined;
         }),
         reconcile: Effect.fn(function* ({ news, output }) {
@@ -173,11 +203,10 @@ const ProviderLive = () =>
             ? undefined
             : output?.bucketId;
           const observed = bucketId
-            ? yield* client
-                .getBucket(bucketId)
-                .pipe(
-                  Effect.catchIf(isNotFound, () => Effect.succeed(undefined)),
-                )
+            ? yield* getBucket({ bucketId }).pipe(
+                Effect.map((response) => response.data),
+                Effect.catchTag("NotFound", () => Effect.succeed(undefined)),
+              )
             : undefined;
           if (observed) {
             if (observed.project.id !== projectId) {
@@ -190,18 +219,28 @@ const ProviderLive = () =>
             }
             return attrsFrom(observed);
           }
-          const created = yield* client.createBucket({
+          const created = yield* createBucket({
             projectId,
-            name: news.name,
-            branchId: news.branchId,
-          });
+            ...(news.name === undefined ? {} : { name: news.name }),
+            ...(news.branchId === undefined || news.branchId === null
+              ? {}
+              : { branchId: news.branchId }),
+          }).pipe(
+            // A replayed create would make a second bucket; the retry policy
+            // cannot see the request, so opt out explicitly.
+            Retry.none,
+            Effect.map((response) => response.data),
+          );
           return attrsFrom(created);
         }),
         delete: Effect.fn(function* ({ output }) {
           if (isPrismaDevId(output.bucketId)) return;
-          const bucket = yield* client
-            .getBucket(output.bucketId)
-            .pipe(Effect.catchIf(isNotFound, () => Effect.succeed(undefined)));
+          const bucket = yield* getBucket({
+            bucketId: output.bucketId,
+          }).pipe(
+            Effect.map((response) => response.data),
+            Effect.catchTag("NotFound", () => Effect.succeed(undefined)),
+          );
           if (!bucket) return;
           if (bucket.project.id !== output.projectId) {
             return yield* new BucketProjectMismatchError({
@@ -213,9 +252,9 @@ const ProviderLive = () =>
           }
           // Deletion cascades server-side: the Management API removes the
           // bucket together with its objects and any remaining keys.
-          yield* client
-            .deleteBucket(output.bucketId)
-            .pipe(Effect.catchIf(isNotFound, () => Effect.void));
+          yield* deleteBucket({
+            bucketId: output.bucketId,
+          }).pipe(Effect.catchTag("NotFound", () => Effect.void));
         }),
       };
     }),

package/src/Prisma/BucketAccessKey.ts

@@ -13,10 +13,12 @@ import * as ProviderLayer from "../Local/ProviderLayer.ts";
 import { Resource } from "../Resource.ts";
 import type { Bucket } from "./Bucket.ts";
 import {
-  PrismaClient,
-  isNotFound,
-  type PrismaManagementClient,
-} from "./Client.ts";
+  type GetBucketKeysResponse,
+  deleteBucketKey,
+  getBucketKeys,
+  createBucketKey,
+} from "@distilled.cloud/prisma/management";
+import { Retry } from "@distilled.cloud/prisma";
 import { physicalInstanceName } from "./Internal/EnvName.ts";
 import type { Providers } from "./Providers.ts";
 import {
@@ -26,7 +28,12 @@ import {
   resolveBucketId,
   unresolvedBucketIdOf,
 } from "./Refs.ts";
-import type { BucketKey as ApiBucketKey, BucketKeyRole } from "./Types.ts";
+import {
+  type ObservedBucketKey,
+  requiredSecretValue,
+} from "./Internal/Observed.ts";
+import type { BucketKeyRole } from "./Types.ts";
+import { PrismaPaginationError } from "./Internal/Pagination.ts";
 
 export interface BucketAccessKeyProps {
   /**
@@ -145,20 +152,39 @@ export class AmbiguousBucketAccessKeyError extends Data.TaggedError(
   message: string;
 }> {}
 
-const listKeys = (client: PrismaManagementClient, bucketId: string) =>
-  client
-    .listBucketKeys(bucketId, { limit: 100 })
-    .pipe(Effect.catchIf(isNotFound, () => Effect.succeed([])));
+// Distilled emits the cursor-paginated list operations as plain ops, so
+// callers walk `pagination` themselves (see `src/Neon/Project.ts`).
+const listKeys = (bucketId: string) =>
+  Effect.gen(function* () {
+    const keys: GetBucketKeysResponse["data"][number][] = [];
+    let cursor: string | undefined;
+    while (true) {
+      const page = yield* getBucketKeys(
+        cursor === undefined
+          ? { bucketId, limit: 100 }
+          : { bucketId, limit: 100, cursor },
+      );
+      keys.push(...page.data);
+      const nextCursor = page.pagination.nextCursor;
+      if (!page.pagination.hasMore) break;
+      if (nextCursor === null) {
+        return yield* Effect.fail(
+          new PrismaPaginationError({
+            message:
+              "Invalid Prisma Management API pagination response from getBucketKeys: hasMore was true without a non-empty nextCursor",
+          }),
+        );
+      }
+      cursor = nextCursor;
+    }
+    return keys;
+  }).pipe(Effect.catchTag("NotFound", () => Effect.succeed([])));
 
-const uniqueKeyNamed = (
-  client: PrismaManagementClient,
-  bucketId: string,
-  expectedName: string,
-) =>
-  listKeys(client, bucketId).pipe(
+const uniqueKeyNamed = (bucketId: string, expectedName: string) =>
+  listKeys(bucketId).pipe(
     Effect.flatMap((keys) => {
       const matches = keys.filter(
-        (key: ApiBucketKey) => key.name === expectedName,
+        (key: ObservedBucketKey) => key.name === expectedName,
       );
       return matches.length > 1
         ? Effect.fail(
@@ -177,7 +203,6 @@ const ProviderLive = () =>
   Provider.effect(
     BucketAccessKey,
     Effect.gen(function* () {
-      const client = yield* PrismaClient;
       return {
         stables: BUCKET_ACCESS_KEY_STABLES,
         // Bucket keys cannot be listed account-wide, and bucket deletion
@@ -215,9 +240,9 @@ const ProviderLive = () =>
           // persisted state stays authoritative for credentials; the list
           // endpoint only confirms the key still exists.
           if (!output || isPrismaDevId(output.bucketAccessKeyId)) return output;
-          const keys = yield* listKeys(client, output.bucketId);
+          const keys = yield* listKeys(output.bucketId);
           return keys.some(
-            (key: ApiBucketKey) => key.id === output.bucketAccessKeyId,
+            (key: ObservedBucketKey) => key.id === output.bucketAccessKeyId,
           )
             ? output
             : undefined;
@@ -232,10 +257,11 @@ const ProviderLive = () =>
             // state is authoritative afterwards — but only while the key
             // still exists; a revoked key falls through to mint fresh
             // credentials.
-            const keys = yield* listKeys(client, persisted.bucketId);
+            const keys = yield* listKeys(persisted.bucketId);
             if (
               keys.some(
-                (key: ApiBucketKey) => key.id === persisted.bucketAccessKeyId,
+                (key: ObservedBucketKey) =>
+                  key.id === persisted.bucketAccessKeyId,
               )
             ) {
               return persisted;
@@ -250,21 +276,30 @@ const ProviderLive = () =>
           // the deterministic name whose secret was never persisted and can
           // never be recovered. Revoke it and mint a fresh key rather than
           // leaking an unusable credential.
-          const orphan = yield* uniqueKeyNamed(client, bucketId, expectedName);
+          const orphan = yield* uniqueKeyNamed(bucketId, expectedName);
           if (orphan) {
-            yield* client
-              .deleteBucketKey(bucketId, orphan.id)
-              .pipe(Effect.catchIf(isNotFound, () => Effect.void));
+            yield* deleteBucketKey({
+              bucketId,
+              keyId: orphan.id,
+            }).pipe(Effect.catchTag("NotFound", () => Effect.void));
           }
-          const created = yield* client.createBucketKey(bucketId, {
+          const created = yield* createBucketKey({
+            bucketId,
             name: expectedName,
             role: news.role,
-          });
+          }).pipe(
+            // The secret is revealed exactly once, so a replayed create
+            // would leak an unusable key; opt out of the retry policy.
+            Retry.none,
+            Effect.map((response) => response.data),
+          );
           return {
             bucketAccessKeyId: created.id,
             bucketId,
-            accessKeyId: created.accessKeyId,
-            secretAccessKey: Redacted.make(created.secretAccessKey),
+            accessKeyId: requiredSecretValue(created.accessKeyId),
+            secretAccessKey: Redacted.make(
+              requiredSecretValue(created.secretAccessKey),
+            ),
             endpoint: created.endpoint,
             bucketName: created.bucketName,
           } satisfies BucketAccessKey["Attributes"];
@@ -273,9 +308,10 @@ const ProviderLive = () =>
           if (isPrismaDevId(output.bucketAccessKeyId)) return;
           // Bucket deletion revokes remaining keys server-side, so the key
           // may already be gone when the bucket was destroyed first.
-          yield* client
-            .deleteBucketKey(output.bucketId, output.bucketAccessKeyId)
-            .pipe(Effect.catchIf(isNotFound, () => Effect.void));
+          yield* deleteBucketKey({
+            bucketId: output.bucketId,
+            keyId: output.bucketAccessKeyId,
+          }).pipe(Effect.catchTag("NotFound", () => Effect.void));
         }),
       };
     }),