alchemy 0.68.0 → 0.69.0

package/lib/cloudflare/api.js

@@ -1,4 +1,5 @@
 import { Provider } from "../auth.js";
+import { isBinary } from "../serde.js";
 import { memoize } from "../util/memoize.js";
 import { withExponentialBackoff } from "../util/retry.js";
 import { safeFetch } from "../util/safe-fetch.js";
@@ -175,7 +176,7 @@ export class CloudflareApi {
         return this.fetch(path, {
             ...init,
             method: "POST",
-            body: this.toBody(body),
+            body: await this.toBody(body),
         });
     }
     /**
@@ -185,17 +186,15 @@ export class CloudflareApi {
         return this.fetch(path, {
             ...init,
             method: "PUT",
-            body: this.toBody(body),
+            body: await this.toBody(body),
         });
     }
-    toBody(body) {
-        return body instanceof FormData
+    async toBody(body) {
+        return body instanceof FormData ||
+            typeof body === "string" ||
+            isBinary(body)
             ? body
-            : typeof body === "string"
-                ? body
-                : body instanceof ReadableStream
-                    ? body
-                    : JSON.stringify(body);
+            : JSON.stringify(body);
     }
     /**
      * Helper for PATCH requests
@@ -204,7 +203,7 @@ export class CloudflareApi {
         return this.fetch(path, {
             ...init,
             method: "PATCH",
-            body: this.toBody(body),
+            body: await this.toBody(body),
         });
     }
     /**

package/lib/cloudflare/api.js.map

@@ -1 +1 @@
-{"version":3,"file":"api.js","sourceRoot":"","sources":["../../src/cloudflare/api.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"api.js","sourceRoot":"","sources":["../../src/cloudflare/api.ts"],"names":[],"mappings":"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"}

package/lib/cloudflare/astro/astro.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"astro.d.ts","sourceRoot":"","sources":["../../../src/cloudflare/astro/astro.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE/C,OAAO,EAAW,KAAK,YAAY,EAAE,MAAM,eAAe,CAAC;AAC3D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAE3C;;;GAGG;AACH,MAAM,WAAW,UAAU,CAAC,CAAC,SAAS,QAAQ,CAC5C,SAAQ,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC;IACpC,MAAM,CAAC,EAAE,QAAQ,GAAG,QAAQ,CAAC;CAC9B;AAED;;;;GAIG;AACH,MAAM,MAAM,KAAK,CAAC,CAAC,SAAS,QAAQ,IAAI,CAAC,SAAS;IAAE,MAAM,EAAE,GAAG,CAAA;CAAE,GAC7D,KAAK,GACL,MAAM,CAAC,CAAC,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC;AAEnC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwCG;AACH,wBAAsB,KAAK,CAAC,CAAC,SAAS,QAAQ,EAC5C,EAAE,EAAE,MAAM,EACV,KAAK,GAAE,UAAU,CAAC,CAAC,CAAM,GACxB,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAenB"}
+{"version":3,"file":"astro.d.ts","sourceRoot":"","sources":["../../../src/cloudflare/astro/astro.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE/C,OAAO,EAIL,KAAK,YAAY,EAClB,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAE3C;;;GAGG;AACH,MAAM,WAAW,UAAU,CAAC,CAAC,SAAS,QAAQ,CAC5C,SAAQ,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC;IACpC,MAAM,CAAC,EAAE,QAAQ,GAAG,QAAQ,CAAC;CAC9B;AAED;;;;GAIG;AACH,MAAM,MAAM,KAAK,CAAC,CAAC,SAAS,QAAQ,IAAI,CAAC,SAAS;IAAE,MAAM,EAAE,GAAG,CAAA;CAAE,GAC7D,KAAK,GACL,MAAM,CAAC,CAAC,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC;AAEnC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwCG;AACH,wBAAsB,KAAK,CAAC,CAAC,SAAS,QAAQ,EAC5C,EAAE,EAAE,MAAM,EACV,KAAK,GAAE,UAAU,CAAC,CAAC,CAAM,GACxB,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAenB"}

package/lib/cloudflare/astro/astro.js

@@ -9,7 +9,7 @@ var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExte
 import { join, resolve } from "node:path";
 import { getPackageManagerRunner } from "../../util/detect-package-manager.js";
 import { withSkipPathValidation } from "../miniflare/paths.js";
-import { Website } from "../website.js";
+import { spreadBuildProps, spreadDevProps, Website, } from "../website.js";
 /**
  * Creates and deploys an Astro application using the Cloudflare adapter.
  *
@@ -58,8 +58,8 @@ export async function Astro(id, props = {}) {
     return await Website(id, {
         ...props,
         noBundle: props.noBundle ?? true,
-        build: props.build ?? `${runner} astro build`,
-        dev: props.dev ?? `${runner} astro dev`,
+        build: spreadBuildProps(props, `${runner} astro build`),
+        dev: spreadDevProps(props, `${runner} astro dev`),
         entrypoint: props.entrypoint ??
             (output === "server" ? "dist/_worker.js/index.js" : undefined),
         assets: props.assets ?? "dist",

package/lib/cloudflare/astro/astro.js.map

@@ -1 +1 @@
-{"version":3,"file":"astro.js","sourceRoot":"","sources":["../../../src/cloudflare/astro/astro.ts"],"names":[],"mappings":";;;;;;;;AAAA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AAG/E,OAAO,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAC/D,OAAO,EAAE,OAAO,EAAqB,MAAM,eAAe,CAAC;AAqB3D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwCG;AACH,MAAM,CAAC,KAAK,UAAU,KAAK,CACzB,EAAU,EACV,QAAuB,EAAE;IAEzB,MAAM,GAAG,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IAChD,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,IAAI,CAAC,MAAM,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC;IAC9D,MAAM,MAAM,GAAG,MAAM,uBAAuB,EAAE,CAAC;IAC/C,OAAO,MAAM,OAAO,CAAC,EAAE,EAAE;QACvB,GAAG,KAAK;QACR,QAAQ,EAAE,KAAK,CAAC,QAAQ,IAAI,IAAI;QAChC,KAAK,EAAE,KAAK,CAAC,KAAK,IAAI,GAAG,MAAM,cAAc;QAC7C,GAAG,EAAE,KAAK,CAAC,GAAG,IAAI,GAAG,MAAM,YAAY;QACvC,UAAU,EACR,KAAK,CAAC,UAAU;YAChB,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,0BAA0B,CAAC,CAAC,CAAC,SAAS,CAAC;QAChE,MAAM,EAAE,KAAK,CAAC,MAAM,IAAI,MAAM;QAC9B,GAAG,EAAE,KAAK;KACX,CAAC,CAAC;AACL,CAAC;AAED,KAAK,UAAU,iBAAiB,CAAC,GAAW;IAC1C,MAAM,UAAU,GAAG;QACjB,kBAAkB;QAClB,iBAAiB;QACjB,iBAAiB;QACjB,kBAAkB;KACnB,CAAC;IACF,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;QACnC,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,sBAAsB,CACzC,GAAG,EAAE,CAAC,MAAM,kCAAC,IAAI,CAAC,GAAG,EAAE,SAAS,CAAC,EAAC,CACnC,CAAC;YACF,IACE,OAAO,MAAM,CAAC,OAAO,KAAK,QAAQ;gBAClC,MAAM,CAAC,OAAO;gBACd,QAAQ,IAAI,MAAM,CAAC,OAAO;gBAC1B,OAAO,MAAM,CAAC,OAAO,CAAC,MAAM,KAAK,QAAQ,EACzC,CAAC;gBACD,OAAO,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;YAC/B,CAAC;YACD,OAAO,QAAQ,CAAC;QAClB,CAAC;QAAC,MAAM,CAAC;YACP,SAAS;QACX,CAAC;IACH,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC"}
+{"version":3,"file":"astro.js","sourceRoot":"","sources":["../../../src/cloudflare/astro/astro.ts"],"names":[],"mappings":";;;;;;;;AAAA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AAG/E,OAAO,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAC/D,OAAO,EACL,gBAAgB,EAChB,cAAc,EACd,OAAO,GAER,MAAM,eAAe,CAAC;AAqBvB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwCG;AACH,MAAM,CAAC,KAAK,UAAU,KAAK,CACzB,EAAU,EACV,QAAuB,EAAE;IAEzB,MAAM,GAAG,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IAChD,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,IAAI,CAAC,MAAM,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC;IAC9D,MAAM,MAAM,GAAG,MAAM,uBAAuB,EAAE,CAAC;IAC/C,OAAO,MAAM,OAAO,CAAC,EAAE,EAAE;QACvB,GAAG,KAAK;QACR,QAAQ,EAAE,KAAK,CAAC,QAAQ,IAAI,IAAI;QAChC,KAAK,EAAE,gBAAgB,CAAC,KAAK,EAAE,GAAG,MAAM,cAAc,CAAC;QACvD,GAAG,EAAE,cAAc,CAAC,KAAK,EAAE,GAAG,MAAM,YAAY,CAAC;QACjD,UAAU,EACR,KAAK,CAAC,UAAU;YAChB,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,0BAA0B,CAAC,CAAC,CAAC,SAAS,CAAC;QAChE,MAAM,EAAE,KAAK,CAAC,MAAM,IAAI,MAAM;QAC9B,GAAG,EAAE,KAAK;KACX,CAAC,CAAC;AACL,CAAC;AAED,KAAK,UAAU,iBAAiB,CAAC,GAAW;IAC1C,MAAM,UAAU,GAAG;QACjB,kBAAkB;QAClB,iBAAiB;QACjB,iBAAiB;QACjB,kBAAkB;KACnB,CAAC;IACF,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;QACnC,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,sBAAsB,CACzC,GAAG,EAAE,CAAC,MAAM,kCAAC,IAAI,CAAC,GAAG,EAAE,SAAS,CAAC,EAAC,CACnC,CAAC;YACF,IACE,OAAO,MAAM,CAAC,OAAO,KAAK,QAAQ;gBAClC,MAAM,CAAC,OAAO;gBACd,QAAQ,IAAI,MAAM,CAAC,OAAO;gBAC1B,OAAO,MAAM,CAAC,OAAO,CAAC,MAAM,KAAK,QAAQ,EACzC,CAAC;gBACD,OAAO,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;YAC/B,CAAC;YACD,OAAO,QAAQ,CAAC;QAClB,CAAC;QAAC,MAAM,CAAC;YACP,SAAS;QACX,CAAC;IACH,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC"}

package/lib/cloudflare/bucket-object.d.ts

@@ -0,0 +1,81 @@
+import type { Context } from "../context.ts";
+import { type CloudflareApiOptions } from "./api.ts";
+import { type PutObjectObject, type R2Bucket } from "./bucket.ts";
+/**
+ * Properties for creating or updating an R2 Object
+ */
+export interface R2ObjectProps extends CloudflareApiOptions {
+    /**
+     * The R2 bucket where the object will be stored
+     */
+    bucket: R2Bucket;
+    /**
+     * The key (path/name) of the object within the bucket
+     * Must be a valid object key as defined by R2 storage requirements
+     */
+    key: string;
+    /**
+     * The content to store in the object
+     * Supports various data types including streams, buffers, strings, and blobs
+     */
+    content: PutObjectObject;
+}
+/**
+ * Output returned after R2 Object creation/update
+ */
+export interface R2Object {
+    /**
+     * The resource identifier
+     */
+    id: string;
+    /**
+     * The key (path/name) of the object within the bucket
+     */
+    key: string;
+    /**
+     * The etag of the object
+     */
+    etag: string;
+}
+/**
+ * Creates and manages objects within Cloudflare R2 Buckets.
+ *
+ * R2 Objects represent individual files or data stored within an R2 bucket.
+ * This resource provides lifecycle management for object creation, updates, and deletion.
+ *
+ * @example
+ * // Create a simple text object in a bucket
+ * const textObject = await R2Object("readme", {
+ *   bucket: myBucket,
+ *   key: "docs/README.txt",
+ *   content: "Welcome to our application!"
+ * });
+ *
+ * @example
+ * // Store JSON data as an object
+ * const configObject = await R2Object("app-config", {
+ *   bucket: configBucket,
+ *   key: "config/app.json",
+ *   content: JSON.stringify({ version: "1.0.0", debug: false })
+ * });
+ *
+ * @example
+ * // Store binary data from a buffer
+ * const imageObject = await R2Object("user-avatar", {
+ *   bucket: assetsBucket,
+ *   key: "avatars/user-123.png",
+ *   content: imageBuffer
+ * });
+ *
+ * @example
+ * // Store data from a readable stream
+ * const streamObject = await R2Object("upload", {
+ *   bucket: uploadsBucket,
+ *   key: "uploads/file.dat",
+ *   content: readableStream
+ * });
+ *
+ * @see https://developers.cloudflare.com/r2/api/workers/workers-api-reference/
+ */
+export declare const R2Object: (((this: any, id: string, props?: {}) => never) & (new (_: never) => never)) | ((this: Context<R2Object>, id: string, props: R2ObjectProps) => Promise<R2Object>);
+//# sourceMappingURL=bucket-object.d.ts.map

package/lib/cloudflare/bucket-object.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"bucket-object.d.ts","sourceRoot":"","sources":["../../src/cloudflare/bucket-object.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAE7C,OAAO,EAAuB,KAAK,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAC1E,OAAO,EAAgB,KAAK,eAAe,EAAE,KAAK,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEhF;;GAEG;AACH,MAAM,WAAW,aAAc,SAAQ,oBAAoB;IACzD;;OAEG;IACH,MAAM,EAAE,QAAQ,CAAC;IAEjB;;;OAGG;IACH,GAAG,EAAE,MAAM,CAAC;IAEZ;;;OAGG;IACH,OAAO,EAAE,eAAe,CAAC;CAC1B;AAED;;GAEG;AACH,MAAM,WAAW,QAAQ;IACvB;;OAEG;IACH,EAAE,EAAE,MAAM,CAAC;IAEX;;OAEG;IACH,GAAG,EAAE,MAAM,CAAC;IAEZ;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;CACd;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuCG;AACH,eAAO,MAAM,QAAQ,yFAGX,OAAO,CAAC,QAAQ,CAAC,MACnB,MAAM,SACH,aAAa,KACnB,OAAO,CAAC,QAAQ,CAAC,CAuBrB,CAAC"}

package/lib/cloudflare/bucket-object.js

@@ -0,0 +1,67 @@
+import { Resource } from "../resource.js";
+import { createCloudflareApi } from "./api.js";
+import { deleteObject } from "./bucket.js";
+/**
+ * Creates and manages objects within Cloudflare R2 Buckets.
+ *
+ * R2 Objects represent individual files or data stored within an R2 bucket.
+ * This resource provides lifecycle management for object creation, updates, and deletion.
+ *
+ * @example
+ * // Create a simple text object in a bucket
+ * const textObject = await R2Object("readme", {
+ *   bucket: myBucket,
+ *   key: "docs/README.txt",
+ *   content: "Welcome to our application!"
+ * });
+ *
+ * @example
+ * // Store JSON data as an object
+ * const configObject = await R2Object("app-config", {
+ *   bucket: configBucket,
+ *   key: "config/app.json",
+ *   content: JSON.stringify({ version: "1.0.0", debug: false })
+ * });
+ *
+ * @example
+ * // Store binary data from a buffer
+ * const imageObject = await R2Object("user-avatar", {
+ *   bucket: assetsBucket,
+ *   key: "avatars/user-123.png",
+ *   content: imageBuffer
+ * });
+ *
+ * @example
+ * // Store data from a readable stream
+ * const streamObject = await R2Object("upload", {
+ *   bucket: uploadsBucket,
+ *   key: "uploads/file.dat",
+ *   content: readableStream
+ * });
+ *
+ * @see https://developers.cloudflare.com/r2/api/workers/workers-api-reference/
+ */
+export const R2Object = Resource("cloudflare::R2Object", async function (id, props) {
+    if (this.phase === "delete") {
+        const api = await createCloudflareApi(props);
+        // Delete the object from the bucket
+        await deleteObject(api, {
+            bucketName: props.bucket.name,
+            key: props.key,
+        });
+        return this.destroy();
+    }
+    else {
+        if (this.phase === "update" && this.output?.key !== props.key) {
+            this.replace();
+        }
+        // Create or update the object in the bucket
+        const response = await props.bucket.put(props.key, props.content);
+        return {
+            id,
+            key: props.key,
+            etag: response.etag,
+        };
+    }
+});
+//# sourceMappingURL=bucket-object.js.map

package/lib/cloudflare/bucket-object.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"bucket-object.js","sourceRoot":"","sources":["../../src/cloudflare/bucket-object.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,mBAAmB,EAA6B,MAAM,UAAU,CAAC;AAC1E,OAAO,EAAE,YAAY,EAAuC,MAAM,aAAa,CAAC;AA4ChF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuCG;AACH,MAAM,CAAC,MAAM,QAAQ,GAAG,QAAQ,CAC9B,sBAAsB,EACtB,KAAK,WAEH,EAAU,EACV,KAAoB;IAEpB,IAAI,IAAI,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC5B,MAAM,GAAG,GAAG,MAAM,mBAAmB,CAAC,KAAK,CAAC,CAAC;QAC7C,oCAAoC;QACpC,MAAM,YAAY,CAAC,GAAG,EAAE;YACtB,UAAU,EAAE,KAAK,CAAC,MAAM,CAAC,IAAI;YAC7B,GAAG,EAAE,KAAK,CAAC,GAAG;SACf,CAAC,CAAC;QACH,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC;IACxB,CAAC;SAAM,CAAC;QACN,IAAI,IAAI,CAAC,KAAK,KAAK,QAAQ,IAAI,IAAI,CAAC,MAAM,EAAE,GAAG,KAAK,KAAK,CAAC,GAAG,EAAE,CAAC;YAC9D,IAAI,CAAC,OAAO,EAAE,CAAC;QACjB,CAAC;QACD,4CAA4C;QAC5C,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;QAElE,OAAO;YACL,EAAE;YACF,GAAG,EAAE,KAAK,CAAC,GAAG;YACd,IAAI,EAAE,QAAQ,CAAC,IAAI;SACpB,CAAC;IACJ,CAAC;AACH,CAAC,CACF,CAAC"}

package/lib/cloudflare/bucket.d.ts

@@ -61,6 +61,10 @@ export interface BucketProps extends CloudflareApiOptions {
      * Lock rules for the bucket
      */
     lock?: R2BucketLockRule[];
+    /**
+     * Enable data catalog for bucket
+     */
+    dataCatalog?: boolean;
     /**
      * Whether to emulate the bucket locally when Alchemy is running in watch mode.
      */
@@ -215,7 +219,7 @@ export type R2ObjectMetadata = {
     uploaded: Date;
     size: number;
 };
-export type R2Object = R2ObjectMetadata & {
+export type R2ObjectContent = R2ObjectMetadata & {
     arrayBuffer(): Promise<ArrayBuffer>;
     bytes(): Promise<Uint8Array>;
     text(): Promise<string>;
@@ -240,7 +244,7 @@ export type R2Objects = {
 });
 export type R2Bucket = _R2Bucket & {
     head(key: string): Promise<R2ObjectMetadata | null>;
-    get(key: string): Promise<R2Object | null>;
+    get(key: string): Promise<R2ObjectContent | null>;
     put(key: string, value: ReadableStream | ArrayBuffer | ArrayBufferView | string | null | Blob): Promise<PutR2ObjectResponse>;
     delete(key: string): Promise<Response>;
     list(options?: R2ListOptions): Promise<R2Objects>;
@@ -283,6 +287,23 @@ type _R2Bucket = Omit<BucketProps, "delete" | "dev"> & {
          */
         remote: boolean;
     };
+    /**
+     * Data catalog for the bucket
+     */
+    catalog?: {
+        /**
+         * ID of the data catalog
+         */
+        id: string;
+        /**
+         * Name of the data catalog
+         */
+        name: string;
+        /**
+         * Host of the data catalog
+         */
+        host: string;
+    };
 };
 export declare function isBucket(resource: any): resource is R2Bucket;
 /**
@@ -410,7 +431,7 @@ export declare function getObject(api: CloudflareApi, { bucketName, key }: {
     bucketName: string;
     key: string;
 }): Promise<Response>;
-type PutObjectObject = ReadableStream | ArrayBuffer | ArrayBufferView | string | Blob;
+export type PutObjectObject = ReadableStream | ArrayBuffer | ArrayBufferView | Uint8Array | string | Buffer | Blob;
 export declare function putObject(api: CloudflareApi, { bucketName, key, object, }: {
     bucketName: string;
     key: string;
@@ -420,5 +441,11 @@ export declare function deleteObject(api: CloudflareApi, { bucketName, key }: {
     bucketName: string;
     key: string;
 }): Promise<Response>;
+export declare function enableDataCatalog(api: CloudflareApi, bucketName: string): Promise<{
+    id: string;
+    name: string;
+    host: string;
+}>;
+export declare function disableDataCatalog(api: CloudflareApi, bucketName: string): Promise<void>;
 export {};
 //# sourceMappingURL=bucket.d.ts.map

package/lib/cloudflare/bucket.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bucket.d.ts","sourceRoot":"","sources":["../../src/cloudflare/bucket.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"bucket.d.ts","sourceRoot":"","sources":["../../src/cloudflare/bucket.ts"],"names":[],"mappings":"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"}

package/lib/cloudflare/bucket.js

@@ -1,12 +1,15 @@
+import * as mf from "miniflare";
 import { isDeepStrictEqual } from "node:util";
 import { Resource, ResourceKind } from "../resource.js";
 import { Scope } from "../scope.js";
+import { streamToBuffer } from "../serde.js";
 import { isRetryableError } from "../state/r2-rest-state-store.js";
 import { withExponentialBackoff } from "../util/retry.js";
 import { CloudflareApiError, handleApiError } from "./api-error.js";
 import { extractCloudflareResult, } from "./api-response.js";
 import { createCloudflareApi, } from "./api.js";
 import { deleteMiniflareBinding } from "./miniflare/delete.js";
+import { getDefaultPersistPath } from "./miniflare/paths.js";
 export function isBucket(resource) {
     return resource?.[ResourceKind] === "cloudflare::R2Bucket";
 }
@@ -55,6 +58,8 @@ export function isBucket(resource) {
  * @see https://developers.cloudflare.com/r2/buckets/
  */
 export async function R2Bucket(id, props = {}) {
+    const scope = Scope.current;
+    const isLocal = scope.local && props.dev?.remote !== true;
     const api = await createCloudflareApi(props);
     const bucket = await _R2Bucket(id, {
         ...props,
@@ -63,13 +68,42 @@ export async function R2Bucket(id, props = {}) {
             force: Scope.current.local,
         },
     });
+    let _miniflare;
+    const miniflare = () => {
+        if (_miniflare) {
+            return _miniflare;
+        }
+        _miniflare = new mf.Miniflare({
+            script: "",
+            modules: true,
+            defaultPersistRoot: getDefaultPersistPath(scope.rootDir),
+            r2Buckets: [bucket.dev.id],
+            log: process.env.DEBUG ? new mf.Log(mf.LogLevel.DEBUG) : undefined,
+        });
+        scope.onCleanup(async () => _miniflare?.dispose());
+        return _miniflare;
+    };
+    const localBucket = () => miniflare().getR2Bucket(bucket.dev.id);
     return {
         ...bucket,
-        head: async (key) => headObject(api, {
-            bucketName: bucket.name,
-            key,
-        }),
+        head: async (key) => {
+            if (isLocal) {
+                return (await localBucket()).head(key);
+            }
+            return headObject(api, {
+                bucketName: bucket.name,
+                key,
+            });
+        },
         get: async (key) => {
+            if (isLocal) {
+                const result = await (await localBucket()).get(key);
+                if (result) {
+                    // cast because workers vs node built-ins
+                    return result;
+                }
+                return null;
+            }
             const response = await getObject(api, {
                 bucketName: bucket.name,
                 key,
@@ -84,11 +118,30 @@ export async function R2Bucket(id, props = {}) {
                 throw await handleApiError(response, "get", "object", key);
             }
         },
-        list: async (options) => listObjects(api, bucket.name, {
-            ...options,
-            jurisdiction: bucket.jurisdiction,
-        }),
+        list: async (options) => {
+            if (isLocal) {
+                return (await localBucket()).list(options);
+            }
+            return listObjects(api, bucket.name, {
+                ...options,
+                jurisdiction: bucket.jurisdiction,
+            });
+        },
         put: async (key, value) => {
+            if (isLocal) {
+                // @ts-expect-error - node built-ins vs cloudflare built-ins
+                return await (await localBucket()).put(key, typeof value === "string"
+                    ? value
+                    : Buffer.isBuffer(value) ||
+                        value instanceof Uint8Array ||
+                        value instanceof ArrayBuffer
+                        ? new Uint8Array(value)
+                        : value instanceof Blob
+                            ? new Uint8Array(await value.arrayBuffer())
+                            : value instanceof ReadableStream
+                                ? new Uint8Array(await streamToBuffer(value))
+                                : value);
+            }
             const response = await putObject(api, {
                 bucketName: bucket.name,
                 key: key,
@@ -103,10 +156,15 @@ export async function R2Bucket(id, props = {}) {
                 size: Number(body.result.size),
             };
         },
-        delete: async (key) => deleteObject(api, {
-            bucketName: bucket.name,
-            key: key,
-        }),
+        delete: async (key) => {
+            if (isLocal) {
+                await (await localBucket()).delete(key);
+            }
+            return deleteObject(api, {
+                bucketName: bucket.name,
+                key: key,
+            });
+        },
     };
 }
 const parseR2Object = (key, response) => ({
@@ -122,7 +180,7 @@ const parseR2Object = (key, response) => ({
 });
 const parseDate = (headers) => new Date(headers.get("Last-Modified") ?? headers.get("Date"));
 const _R2Bucket = Resource("cloudflare::R2Bucket", async function (id, props = {}) {
-    const bucketName = props.name ?? this.output?.name ?? this.scope.createPhysicalName(id);
+    const bucketName = props.name ?? (this.output?.name || this.scope.createPhysicalName(id));
     if (this.phase === "update" && this.output?.name !== bucketName) {
         this.replace();
     }
@@ -149,6 +207,9 @@ const _R2Bucket = Resource("cloudflare::R2Bucket", async function (id, props = {
     const api = await createCloudflareApi(props);
     if (this.phase === "delete") {
         if (props.delete !== false) {
+            if (this.output?.catalog) {
+                await disableDataCatalog(api, bucketName);
+            }
             if (this.output.dev?.id) {
                 await deleteMiniflareBinding(this.scope, "r2", this.output.dev.id);
             }
@@ -178,6 +239,10 @@ const _R2Bucket = Resource("cloudflare::R2Bucket", async function (id, props = {
         if (props.lock?.length) {
             await putBucketLockRules(api, bucketName, props);
         }
+        let dataCatalog;
+        if (props.dataCatalog) {
+            dataCatalog = await enableDataCatalog(api, bucketName);
+        }
         return {
             name: bucketName,
             location: bucket.location,
@@ -191,12 +256,20 @@ const _R2Bucket = Resource("cloudflare::R2Bucket", async function (id, props = {
             lock: props.lock,
             cors: props.cors,
             dev,
+            catalog: dataCatalog,
         };
     }
     else {
         if (bucketName !== this.output.name) {
             throw new Error(`Cannot update R2Bucket name after creation. Bucket name is immutable. Before: ${this.output.name}, After: ${bucketName}`);
         }
+        if (this.output?.catalog && !props.dataCatalog) {
+            await disableDataCatalog(api, bucketName);
+            this.output.catalog = undefined;
+        }
+        if (!this.output.catalog && props.dataCatalog) {
+            this.output.catalog = await enableDataCatalog(api, bucketName);
+        }
         let domain = this.output.domain;
         if (!!domain !== allowPublicAccess) {
             domain = await putManagedDomain(api, bucketName, allowPublicAccess, props.jurisdiction);
@@ -516,4 +589,15 @@ export async function deleteObject(api, { bucketName, key }) {
         return response;
     });
 }
+export async function enableDataCatalog(api, bucketName) {
+    const response = await extractCloudflareResult(`enable data catalog for bucket "${bucketName}"`, api.post(`/accounts/${api.accountId}/r2-catalog/${bucketName}/enable`, {}));
+    return {
+        id: response.id,
+        name: response.name,
+        host: `https://catalog.cloudflarestorage.com/${response.name.replace("_", "/")}`,
+    };
+}
+export async function disableDataCatalog(api, bucketName) {
+    await api.post(`/accounts/${api.accountId}/r2-catalog/${bucketName}/disable`, {});
+}
 //# sourceMappingURL=bucket.js.map