refactor(git)!: BlobStoreR2 requires ReadWriteBucket instead of providing the binding (#2102)

Author: sam-goodwin

examples/cloudflare-git-service/src/api/host.ts

@@ -9,6 +9,7 @@ import * as Effect from "effect/Effect";
  */
 import * as HttpRouter from "effect/http/HttpRouter";
 import { HttpServerRequest } from "effect/http/HttpServerRequest";
+import * as Layer from "effect/Layer";
 import { Auth, AuthDb } from "./auth.ts";
 import { HttpLive } from "./git.ts";
 
@@ -31,5 +32,7 @@ export default class GitHost extends Cloudflare.Worker<GitHost>()(
         }),
       ),
     };
-  }).pipe(Effect.provide(CloudflareD1(AuthDb))),
+  }).pipe(
+    Effect.provide(Layer.mergeAll(CloudflareD1(AuthDb), Cloudflare.R2.ReadWriteBucketBinding)),
+  ),
 ) {}

packages/alchemy/src/Git/BlobStore.ts

@@ -30,6 +30,15 @@ import * as Stream from "effect/Stream";
  *   Layer.provide(Git.BlobStoreR2(MyBucket)),
  *   // ...
  * );
+ *
+ * // The Worker picks the ReadWriteBucket implementation.
+ * export default class GitHost extends Cloudflare.Worker<GitHost>()(
+ *   "GitHost",
+ *   { main: import.meta.url, ...Git.GIT_WORKER_OPTIONS },
+ *   Effect.gen(function* () {
+ *     return { fetch: yield* HttpRouter.toHttpEffect(GitLive) };
+ *   }).pipe(Effect.provide(Cloudflare.R2.ReadWriteBucketBinding)),
+ * ) {}
  * ```
  */
 import * as Cloudflare from "../Cloudflare/index.ts";
@@ -223,19 +232,22 @@ export const makeBlobStoreR2 = (bucket: ReadWriteBucketClient): BlobStoreShape =
 
 /**
  * R2-backed {@link BlobStore}: packs, bundles, oversize objects, and
- * push spill live in the given bucket. Registers the bucket binding on
- * the host Worker.
+ * push spill live in the given bucket. Requires the
+ * `Cloudflare.R2.ReadWriteBucket` capability; provide an implementation
+ * (`Cloudflare.R2.ReadWriteBucketBinding` or `ReadWriteBucketHttp`) on the
+ * Worker.
  *
  * @layer
  * @provides Git.BlobStore
  */
 export const BlobStoreR2 = (
   bucket: Parameters<typeof Cloudflare.R2.ReadWriteBucket>[0],
-): Layer.Layer<BlobStore> =>
+): Layer.Layer<BlobStore, never, Cloudflare.R2.ReadWriteBucket> =>
   Layer.effect(
     BlobStore,
     Effect.gen(function* () {
       const client = yield* Cloudflare.R2.ReadWriteBucket(bucket);
       return makeBlobStoreR2(client);
     }),
-  ).pipe(Layer.provide(Cloudflare.R2.ReadWriteBucketBinding)) as never;
+    // `bucket` may be a declaration Effect, which widens the inferred requirement.
+  ) as Layer.Layer<BlobStore, never, Cloudflare.R2.ReadWriteBucket>;

packages/alchemy/test/Git/fixtures/lambda-stack.ts

@@ -45,7 +45,7 @@ export default class LambdaGitHost extends Cloudflare.Worker<LambdaGitHost>()(
   Effect.gen(function* () {
     const fetch = yield* HttpRouter.toHttpEffect(GitLive);
     return { fetch };
-  }),
+  }).pipe(Effect.provide(Cloudflare.R2.ReadWriteBucketBinding)),
 ) {}
 
 export const makeLambdaTestStack = (name: string) =>

packages/alchemy/test/Git/fixtures/loader-stack.ts

@@ -42,7 +42,7 @@ export default class LoaderGitHost extends Cloudflare.Worker<LoaderGitHost>()(
   Effect.gen(function* () {
     const fetch = yield* HttpRouter.toHttpEffect(GitLive);
     return { fetch };
-  }),
+  }).pipe(Effect.provide(Cloudflare.R2.ReadWriteBucketBinding)),
 ) {}
 
 export const makeLoaderTestStack = (name: string) =>

packages/alchemy/test/Git/fixtures/protected-stack.ts

@@ -210,7 +210,7 @@ export default class ProtectedGitHost extends Cloudflare.Worker<ProtectedGitHost
   Effect.gen(function* () {
     const fetch = yield* HttpRouter.toHttpEffect(ProtectedGitLive);
     return { fetch };
-  }),
+  }).pipe(Effect.provide(Cloudflare.R2.ReadWriteBucketBinding)),
 ) {}
 
 /** Deployable stack for the protected-branch test. */

packages/alchemy/test/Git/fixtures/stack.ts

@@ -67,7 +67,7 @@ export default class TestGitHost extends Cloudflare.Worker<TestGitHost>()(
   Effect.gen(function* () {
     const fetch = yield* HttpRouter.toHttpEffect(GitLive);
     return { fetch };
-  }),
+  }).pipe(Effect.provide(Cloudflare.R2.ReadWriteBucketBinding)),
 ) {}
 
 /**