alchemy 0.67.0 → 0.69.0

package/lib/cloudflare/bucket.js

@@ -1,13 +1,17 @@
+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 } from "./api-error.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";
+    return resource?.[ResourceKind] === "cloudflare::R2Bucket";
 }
 /**
  * Creates and manages Cloudflare R2 Buckets for object storage.
@@ -54,16 +58,129 @@ export function isBucket(resource) {
  * @see https://developers.cloudflare.com/r2/buckets/
  */
 export async function R2Bucket(id, props = {}) {
-    return await _R2Bucket(id, {
+    const scope = Scope.current;
+    const isLocal = scope.local && props.dev?.remote !== true;
+    const api = await createCloudflareApi(props);
+    const bucket = await _R2Bucket(id, {
         ...props,
         dev: {
             ...(props.dev ?? {}),
             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) => {
+            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,
+            });
+            if (response.ok) {
+                return parseR2Object(key, response);
+            }
+            else if (response.status === 404) {
+                return null;
+            }
+            else {
+                throw await handleApiError(response, "get", "object", key);
+            }
+        },
+        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,
+                object: value,
+            });
+            const body = (await response.json());
+            return {
+                key: body.result.key,
+                etag: body.result.etag,
+                uploaded: new Date(body.result.uploaded),
+                version: body.result.version,
+                size: Number(body.result.size),
+            };
+        },
+        delete: async (key) => {
+            if (isLocal) {
+                await (await localBucket()).delete(key);
+            }
+            return deleteObject(api, {
+                bucketName: bucket.name,
+                key: key,
+            });
+        },
+    };
 }
+const parseR2Object = (key, response) => ({
+    etag: response.headers.get("ETag"),
+    uploaded: parseDate(response.headers),
+    key,
+    size: Number(response.headers.get("Content-Length")),
+    arrayBuffer: () => response.arrayBuffer(),
+    bytes: () => response.bytes(),
+    text: () => response.text(),
+    json: () => response.json(),
+    blob: () => response.blob(),
+});
+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();
     }
@@ -74,7 +191,7 @@ const _R2Bucket = Resource("cloudflare::R2Bucket", async function (id, props = {
     };
     const adopt = props.adopt ?? this.scope.adopt;
     if (this.scope.local && !props.dev?.remote) {
-        return this({
+        return {
             name: this.output?.name ?? "",
             location: this.output?.location ?? "",
             creationDate: this.output?.creationDate ?? new Date(),
@@ -85,11 +202,14 @@ const _R2Bucket = Resource("cloudflare::R2Bucket", async function (id, props = {
             accountId: this.output?.accountId ?? "",
             cors: props.cors,
             dev,
-        });
+        };
     }
     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);
             }
@@ -119,7 +239,11 @@ const _R2Bucket = Resource("cloudflare::R2Bucket", async function (id, props = {
         if (props.lock?.length) {
             await putBucketLockRules(api, bucketName, props);
         }
-        return this({
+        let dataCatalog;
+        if (props.dataCatalog) {
+            dataCatalog = await enableDataCatalog(api, bucketName);
+        }
+        return {
             name: bucketName,
             location: bucket.location,
             creationDate: new Date(bucket.creation_date),
@@ -132,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);
@@ -151,7 +283,7 @@ const _R2Bucket = Resource("cloudflare::R2Bucket", async function (id, props = {
         if (!isDeepStrictEqual(this.output.lock ?? [], props.lock ?? [])) {
             await putBucketLockRules(api, bucketName, props);
         }
-        return this({
+        return {
             ...this.output,
             allowPublicAccess,
             dev,
@@ -159,7 +291,7 @@ const _R2Bucket = Resource("cloudflare::R2Bucket", async function (id, props = {
             lifecycle: props.lifecycle,
             lock: props.lock,
             domain,
-        });
+        };
     }
 });
 /**
@@ -226,13 +358,16 @@ export async function putManagedDomain(api, bucketName, enabled, jurisdiction) {
 async function emptyBucket(api, bucketName, props) {
     let cursor;
     while (true) {
-        const result = await listObjects(api, bucketName, props, cursor);
-        if (result.keys.length) {
+        const result = await listObjects(api, bucketName, {
+            jurisdiction: props.jurisdiction,
+            cursor,
+        });
+        if (result.objects.length) {
             // Another undocumented API! But it lets us delete multiple objects at once instead of one by one.
-            await extractCloudflareResult(`delete ${result.keys.length} objects from bucket "${bucketName}"`, api.delete(`/accounts/${api.accountId}/r2/buckets/${bucketName}/objects`, {
+            await extractCloudflareResult(`delete ${result.objects.length} objects from bucket "${bucketName}"`, api.delete(`/accounts/${api.accountId}/r2/buckets/${bucketName}/objects`, {
                 headers: withJurisdiction(props),
                 method: "DELETE",
-                body: JSON.stringify(result.keys),
+                body: JSON.stringify(result.objects.map((object) => object.key)),
             }));
             if (result.cursor) {
                 cursor = result.cursor;
@@ -245,25 +380,49 @@ async function emptyBucket(api, bucketName, props) {
 /**
  * Lists objects in a bucket.
  */
-export async function listObjects(api, bucketName, props, cursor) {
+export async function listObjects(api, bucketName, props) {
     const params = new URLSearchParams({
         per_page: "1000",
     });
-    if (cursor) {
-        params.set("cursor", cursor);
+    if (props.cursor) {
+        params.set("cursor", props.cursor);
+    }
+    if (props.delimiter) {
+        params.set("delimiter", props.delimiter);
+    }
+    if (props.prefix) {
+        params.set("prefix", props.prefix);
+    }
+    if (props.startAfter) {
+        params.set("start_after", props.startAfter);
+    }
+    if (props.limit) {
+        params.set("limit", props.limit.toString());
     }
     const response = await api.get(`/accounts/${api.accountId}/r2/buckets/${bucketName}/objects?${params.toString()}`, { headers: withJurisdiction(props) });
     const json = await response.json();
     if (!json.success) {
         // 10006 indicates that the bucket does not exist, so there are no objects to list
         if (json.errors.some((e) => e.code === 10006)) {
-            return { keys: [], cursor: undefined };
+            return {
+                objects: [],
+                cursor: undefined,
+                truncated: false,
+            };
         }
         throw new CloudflareApiError(`Failed to list objects in bucket "${bucketName}": ${json.errors.map((e) => `- [${e.code}] ${e.message}${e.documentation_url ? ` (${e.documentation_url})` : ""}`).join("\n")}`, response, json.errors);
     }
     return {
-        keys: json.result.map((object) => object.key),
+        // keys: json.result.map((object) => object.key),
+        objects: json.result.map((object) => ({
+            key: object.key,
+            etag: object.etag,
+            uploaded: new Date(object.last_modified),
+            size: object.size,
+        })),
+        delimitedPrefixes: [],
         cursor: json.result_info?.cursor,
+        truncated: json.result_info?.is_truncated ?? false,
     };
 }
 /**
@@ -373,4 +532,72 @@ export async function getBucketLockRules(api, bucketName, props = {}) {
         : (json.result?.rules ?? []);
     return rules;
 }
+export async function headObject(api, { bucketName, key }) {
+    const response = await withRetries(async () => await api.get(`/accounts/${api.accountId}/r2/buckets/${bucketName}/objects/${key}`));
+    // for some reason HEAD returns 404 for keys that exist, this is the best we can do without using S3 API
+    response.body?.cancel();
+    if (response.status === 404) {
+        return null;
+    }
+    else if (!response.ok) {
+        throw await handleApiError(response, "head", "object", key);
+    }
+    return {
+        key,
+        etag: response.headers.get("ETag")?.replace(/"/g, ""),
+        uploaded: parseDate(response.headers),
+        size: Number(response.headers.get("Content-Length")),
+    };
+}
+const withRetries = (f) => {
+    return withExponentialBackoff(f, isRetryableError, 5, 1000);
+};
+export async function getObject(api, { bucketName, key }) {
+    return await withRetries(async () => {
+        const response = await api.get(`/accounts/${api.accountId}/r2/buckets/${bucketName}/objects/${key}`, {
+            headers: {
+                "Content-Type": "application/octet-stream",
+                Accept: "application/octet-stream",
+            },
+        });
+        if (!response.ok && response.status !== 404) {
+            throw await handleApiError(response, "get", "object", key);
+        }
+        return response;
+    });
+}
+export async function putObject(api, { bucketName, key, object, }) {
+    // Using withExponentialBackoff for reliability
+    return await withRetries(async () => {
+        const response = await api.put(`/accounts/${api.accountId}/r2/buckets/${bucketName}/objects/${key}`, object, {
+            headers: {
+                "Content-Type": "application/octet-stream",
+            },
+        });
+        if (!response.ok) {
+            await handleApiError(response, "put", "object", key);
+        }
+        return response;
+    });
+}
+export async function deleteObject(api, { bucketName, key }) {
+    return await withRetries(async () => {
+        const response = await api.delete(`/accounts/${api.accountId}/r2/buckets/${bucketName}/objects/${key}`);
+        if (!response.ok && response.status !== 404) {
+            await handleApiError(response, "delete", "object", 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

package/lib/cloudflare/bucket.js.map

@@ -1 +1 @@
-{"version":3,"file":"bucket.js","sourceRoot":"","sources":["../../src/cloudflare/bucket.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"bucket.js","sourceRoot":"","sources":["../../src/cloudflare/bucket.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,WAAW,CAAC;AAChC,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAE9C,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACpE,OAAO,EACL,uBAAuB,GAExB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACL,mBAAmB,GAGpB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAC/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AA4V7D,MAAM,UAAU,QAAQ,CAAC,QAAa;IACpC,OAAO,QAAQ,EAAE,CAAC,YAAY,CAAC,KAAK,sBAAsB,CAAC;AAC7D,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2CG;AACH,MAAM,CAAC,KAAK,UAAU,QAAQ,CAC5B,EAAU,EACV,QAAqB,EAAE;IAEvB,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC;IAC5B,MAAM,OAAO,GAAG,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;IAC1D,MAAM,GAAG,GAAG,MAAM,mBAAmB,CAAC,KAAK,CAAC,CAAC;IAC7C,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,EAAE,EAAE;QACjC,GAAG,KAAK;QACR,GAAG,EAAE;YACH,GAAG,CAAC,KAAK,CAAC,GAAG,IAAI,EAAE,CAAC;YACpB,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,KAAK;SAC3B;KACF,CAAC,CAAC;IAEH,IAAI,UAAoC,CAAC;IACzC,MAAM,SAAS,GAAG,GAAG,EAAE;QACrB,IAAI,UAAU,EAAE,CAAC;YACf,OAAO,UAAU,CAAC;QACpB,CAAC;QACD,UAAU,GAAG,IAAI,EAAE,CAAC,SAAS,CAAC;YAC5B,MAAM,EAAE,EAAE;YACV,OAAO,EAAE,IAAI;YACb,kBAAkB,EAAE,qBAAqB,CAAC,KAAK,CAAC,OAAO,CAAC;YACxD,SAAS,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;YAC1B,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS;SACnE,CAAC,CAAC;QACH,KAAK,CAAC,SAAS,CAAC,KAAK,IAAI,EAAE,CAAC,UAAU,EAAE,OAAO,EAAE,CAAC,CAAC;QACnD,OAAO,UAAU,CAAC;IACpB,CAAC,CAAC;IACF,MAAM,WAAW,GAAG,GAAG,EAAE,CAAC,SAAS,EAAE,CAAC,WAAW,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAEjE,OAAO;QACL,GAAG,MAAM;QACT,IAAI,EAAE,KAAK,EAAE,GAAW,EAAE,EAAE;YAC1B,IAAI,OAAO,EAAE,CAAC;gBACZ,OAAO,CAAC,MAAM,WAAW,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACzC,CAAC;YACD,OAAO,UAAU,CAAC,GAAG,EAAE;gBACrB,UAAU,EAAE,MAAM,CAAC,IAAI;gBACvB,GAAG;aACJ,CAAC,CAAC;QACL,CAAC;QACD,GAAG,EAAE,KAAK,EAAE,GAAW,EAAE,EAAE;YACzB,IAAI,OAAO,EAAE,CAAC;gBACZ,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,WAAW,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;gBACpD,IAAI,MAAM,EAAE,CAAC;oBACX,yCAAyC;oBACzC,OAAO,MAAoC,CAAC;gBAC9C,CAAC;gBACD,OAAO,IAAI,CAAC;YACd,CAAC;YACD,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,GAAG,EAAE;gBACpC,UAAU,EAAE,MAAM,CAAC,IAAI;gBACvB,GAAG;aACJ,CAAC,CAAC;YACH,IAAI,QAAQ,CAAC,EAAE,EAAE,CAAC;gBAChB,OAAO,aAAa,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;YACtC,CAAC;iBAAM,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;gBACnC,OAAO,IAAI,CAAC;YACd,CAAC;iBAAM,CAAC;gBACN,MAAM,MAAM,cAAc,CAAC,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC;YAC7D,CAAC;QACH,CAAC;QACD,IAAI,EAAE,KAAK,EAAE,OAAuB,EAAsB,EAAE;YAC1D,IAAI,OAAO,EAAE,CAAC;gBACZ,OAAO,CAAC,MAAM,WAAW,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC7C,CAAC;YACD,OAAO,WAAW,CAAC,GAAG,EAAE,MAAM,CAAC,IAAI,EAAE;gBACnC,GAAG,OAAO;gBACV,YAAY,EAAE,MAAM,CAAC,YAAY;aAClC,CAAC,CAAC;QACL,CAAC;QACD,GAAG,EAAE,KAAK,EACR,GAAW,EACX,KAAsB,EACQ,EAAE;YAChC,IAAI,OAAO,EAAE,CAAC;gBACZ,4DAA4D;gBAC5D,OAAO,MAAM,CAAC,MAAM,WAAW,EAAE,CAAC,CAAC,GAAG,CACpC,GAAG,EACH,OAAO,KAAK,KAAK,QAAQ;oBACvB,CAAC,CAAC,KAAK;oBACP,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC;wBACpB,KAAK,YAAY,UAAU;wBAC3B,KAAK,YAAY,WAAW;wBAC9B,CAAC,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC;wBACvB,CAAC,CAAC,KAAK,YAAY,IAAI;4BACrB,CAAC,CAAC,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,WAAW,EAAE,CAAC;4BAC3C,CAAC,CAAC,KAAK,YAAY,cAAc;gCAC/B,CAAC,CAAC,IAAI,UAAU,CAAC,MAAM,cAAc,CAAC,KAAK,CAAC,CAAC;gCAC7C,CAAC,CAAC,KAAK,CAChB,CAAC;YACJ,CAAC;YACD,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,GAAG,EAAE;gBACpC,UAAU,EAAE,MAAM,CAAC,IAAI;gBACvB,GAAG,EAAE,GAAG;gBACR,MAAM,EAAE,KAAK;aACd,CAAC,CAAC;YACH,MAAM,IAAI,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAQlC,CAAC;YACF,OAAO;gBACL,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG;gBACpB,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI;gBACtB,QAAQ,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC;gBACxC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO;gBAC5B,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;aAC/B,CAAC;QACJ,CAAC;QACD,MAAM,EAAE,KAAK,EAAE,GAAW,EAAE,EAAE;YAC5B,IAAI,OAAO,EAAE,CAAC;gBACZ,MAAM,CAAC,MAAM,WAAW,EAAE,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YAC1C,CAAC;YACD,OAAO,YAAY,CAAC,GAAG,EAAE;gBACvB,UAAU,EAAE,MAAM,CAAC,IAAI;gBACvB,GAAG,EAAE,GAAG;aACT,CAAC,CAAC;QACL,CAAC;KACF,CAAC;AACJ,CAAC;AAED,MAAM,aAAa,GAAG,CAAC,GAAW,EAAE,QAAkB,EAAmB,EAAE,CAAC,CAAC;IAC3E,IAAI,EAAE,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAE;IACnC,QAAQ,EAAE,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC;IACrC,GAAG;IACH,IAAI,EAAE,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;IACpD,WAAW,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,WAAW,EAAE;IACzC,KAAK,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,KAAK,EAAE;IAC7B,IAAI,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE;IAC3B,IAAI,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE;IAC3B,IAAI,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE;CAC5B,CAAC,CAAC;AAEH,MAAM,SAAS,GAAG,CAAC,OAAgB,EAAE,EAAE,CACrC,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,MAAM,CAAE,CAAC,CAAC;AAEjE,MAAM,SAAS,GAAG,QAAQ,CACxB,sBAAsB,EACtB,KAAK,WAEH,EAAU,EACV,QAAqB,EAAE;IAEvB,MAAM,UAAU,GACd,KAAK,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC,CAAC;IAEzE,IAAI,IAAI,CAAC,KAAK,KAAK,QAAQ,IAAI,IAAI,CAAC,MAAM,EAAE,IAAI,KAAK,UAAU,EAAE,CAAC;QAChE,IAAI,CAAC,OAAO,EAAE,CAAC;IACjB,CAAC;IAED,MAAM,iBAAiB,GAAG,KAAK,CAAC,iBAAiB,KAAK,IAAI,CAAC;IAC3D,MAAM,GAAG,GAAG;QACV,EAAE,EAAE,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE,IAAI,UAAU;QACtC,MAAM,EAAE,KAAK,CAAC,GAAG,EAAE,MAAM,IAAI,KAAK;KACnC,CAAC;IACF,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC;IAE9C,IAAI,IAAI,CAAC,KAAK,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,CAAC;QAC3C,OAAO;YACL,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,IAAI,EAAE;YAC7B,QAAQ,EAAE,IAAI,CAAC,MAAM,EAAE,QAAQ,IAAI,EAAE;YACrC,YAAY,EAAE,IAAI,CAAC,MAAM,EAAE,YAAY,IAAI,IAAI,IAAI,EAAE;YACrD,YAAY,EAAE,IAAI,CAAC,MAAM,EAAE,YAAY,IAAI,SAAS;YACpD,iBAAiB;YACjB,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,MAAM;YAC3B,IAAI,EAAE,WAAW;YACjB,SAAS,EAAE,IAAI,CAAC,MAAM,EAAE,SAAS,IAAI,EAAE;YACvC,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,GAAG;SACJ,CAAC;IACJ,CAAC;IAED,MAAM,GAAG,GAAG,MAAM,mBAAmB,CAAC,KAAK,CAAC,CAAC;IAE7C,IAAI,IAAI,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC5B,IAAI,KAAK,CAAC,MAAM,KAAK,KAAK,EAAE,CAAC;YAC3B,IAAI,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,CAAC;gBACzB,MAAM,kBAAkB,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;YAC5C,CAAC;YACD,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,EAAE,EAAE,CAAC;gBACxB,MAAM,sBAAsB,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACrE,CAAC;YACD,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;gBAChB,MAAM,WAAW,CAAC,GAAG,EAAE,UAAU,EAAE,KAAK,CAAC,CAAC;YAC5C,CAAC;YACD,MAAM,YAAY,CAAC,GAAG,EAAE,UAAU,EAAE,KAAK,CAAC,CAAC;QAC7C,CAAC;QACD,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC;IACxB,CAAC;IAED,IAAI,IAAI,CAAC,KAAK,KAAK,QAAQ,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC;QAClD,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,GAAG,EAAE,UAAU,EAAE,KAAK,CAAC,CAAC,KAAK,CAC7D,KAAK,EAAE,GAAG,EAAE,EAAE;YACZ,IACE,GAAG,YAAY,kBAAkB;gBACjC,GAAG,CAAC,MAAM,KAAK,GAAG;gBAClB,KAAK,EACL,CAAC;gBACD,OAAO,MAAM,SAAS,CAAC,GAAG,EAAE,UAAU,EAAE,KAAK,CAAC,CAAC;YACjD,CAAC;YACD,MAAM,GAAG,CAAC;QACZ,CAAC,CACF,CAAC;QACF,MAAM,MAAM,GAAG,MAAM,gBAAgB,CACnC,GAAG,EACH,UAAU,EACV,iBAAiB,EACjB,KAAK,CAAC,YAAY,CACnB,CAAC;QACF,IAAI,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC;YACvB,MAAM,aAAa,CAAC,GAAG,EAAE,UAAU,EAAE,KAAK,CAAC,CAAC;QAC9C,CAAC;QACD,IAAI,KAAK,CAAC,SAAS,EAAE,MAAM,EAAE,CAAC;YAC5B,MAAM,uBAAuB,CAAC,GAAG,EAAE,UAAU,EAAE,KAAK,CAAC,CAAC;QACxD,CAAC;QACD,IAAI,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC;YACvB,MAAM,kBAAkB,CAAC,GAAG,EAAE,UAAU,EAAE,KAAK,CAAC,CAAC;QACnD,CAAC;QACD,IAAI,WAMS,CAAC;QACd,IAAI,KAAK,CAAC,WAAW,EAAE,CAAC;YACtB,WAAW,GAAG,MAAM,iBAAiB,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;QACzD,CAAC;QACD,OAAO;YACL,IAAI,EAAE,UAAU;YAChB,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,YAAY,EAAE,IAAI,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC;YAC5C,YAAY,EAAE,MAAM,CAAC,YAAY;YACjC,iBAAiB;YACjB,MAAM;YACN,IAAI,EAAE,WAAW;YACjB,SAAS,EAAE,GAAG,CAAC,SAAS;YACxB,SAAS,EAAE,KAAK,CAAC,SAAS;YAC1B,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,GAAG;YACH,OAAO,EAAE,WAAW;SACrB,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,IAAI,UAAU,KAAK,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;YACpC,MAAM,IAAI,KAAK,CACb,iFAAiF,IAAI,CAAC,MAAM,CAAC,IAAI,YAAY,UAAU,EAAE,CAC1H,CAAC;QACJ,CAAC;QACD,IAAI,IAAI,CAAC,MAAM,EAAE,OAAO,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC;YAC/C,MAAM,kBAAkB,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;YAC1C,IAAI,CAAC,MAAM,CAAC,OAAO,GAAG,SAAS,CAAC;QAClC,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,KAAK,CAAC,WAAW,EAAE,CAAC;YAC9C,IAAI,CAAC,MAAM,CAAC,OAAO,GAAG,MAAM,iBAAiB,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;QACjE,CAAC;QACD,IAAI,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;QAChC,IAAI,CAAC,CAAC,MAAM,KAAK,iBAAiB,EAAE,CAAC;YACnC,MAAM,GAAG,MAAM,gBAAgB,CAC7B,GAAG,EACH,UAAU,EACV,iBAAiB,EACjB,KAAK,CAAC,YAAY,CACnB,CAAC;QACJ,CAAC;QACD,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,EAAE,EAAE,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC,EAAE,CAAC;YACjE,MAAM,aAAa,CAAC,GAAG,EAAE,UAAU,EAAE,KAAK,CAAC,CAAC;QAC9C,CAAC;QACD,IACE,CAAC,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,IAAI,EAAE,EAAE,KAAK,CAAC,SAAS,IAAI,EAAE,CAAC,EACtE,CAAC;YACD,MAAM,uBAAuB,CAAC,GAAG,EAAE,UAAU,EAAE,KAAK,CAAC,CAAC;QACxD,CAAC;QACD,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,EAAE,EAAE,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC,EAAE,CAAC;YACjE,MAAM,kBAAkB,CAAC,GAAG,EAAE,UAAU,EAAE,KAAK,CAAC,CAAC;QACnD,CAAC;QACD,OAAO;YACL,GAAG,IAAI,CAAC,MAAM;YACd,iBAAiB;YACjB,GAAG;YACH,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,SAAS,EAAE,KAAK,CAAC,SAAS;YAC1B,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,MAAM;SACP,CAAC;IACJ,CAAC;AACH,CAAC,CACF,CAAC;AAcF;;;;;;GAMG;AACH,MAAM,UAAU,gBAAgB,CAC9B,KAAgC,EAChC,UAAkC,EAAE;IAEpC,IAAI,KAAK,CAAC,YAAY,IAAI,KAAK,CAAC,YAAY,KAAK,SAAS,EAAE,CAAC;QAC3D,OAAO,CAAC,oBAAoB,CAAC,GAAG,KAAK,CAAC,YAAY,CAAC;IACrD,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,SAAS,CAC7B,GAAkB,EAClB,UAAkB,EAClB,QAAqB,EAAE;IAEvB,OAAO,MAAM,uBAAuB,CAClC,kBAAkB,UAAU,GAAG,EAC/B,GAAG,CAAC,GAAG,CAAC,aAAa,GAAG,CAAC,SAAS,eAAe,UAAU,EAAE,EAAE;QAC7D,OAAO,EAAE,gBAAgB,CAAC,KAAK,CAAC;KACjC,CAAC,CACH,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,GAAkB,EAClB,UAAkB,EAClB,QAAqB,EAAE;IAEvB,OAAO,MAAM,uBAAuB,CAClC,qBAAqB,UAAU,GAAG,EAClC,GAAG,CAAC,IAAI,CACN,aAAa,GAAG,CAAC,SAAS,aAAa,EACvC;QACE,IAAI,EAAE,UAAU;QAChB,YAAY,EAAE,KAAK,CAAC,YAAY;QAChC,YAAY,EAAE,KAAK,CAAC,YAAY;KACjC,EACD;QACE,OAAO,EAAE,gBAAgB,CAAC,KAAK,CAAC;KACjC,CACF,CACF,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,GAAkB,EAClB,UAAkB,EAClB,KAAkB;IAElB,IAAI,CAAC;QACH,MAAM,uBAAuB,CAC3B,qBAAqB,UAAU,GAAG,EAClC,GAAG,CAAC,MAAM,CAAC,aAAa,GAAG,CAAC,SAAS,eAAe,UAAU,EAAE,EAAE;YAChE,OAAO,EAAE,gBAAgB,CAAC,KAAK,CAAC;SACjC,CAAC,CACH,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,KAAK,YAAY,kBAAkB,IAAI,KAAK,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;YAChE,OAAO;QACT,CAAC;QACD,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,GAAkB,EAClB,UAAkB,EAClB,OAAgB,EAChB,YAAqB;IAErB,OAAO,MAAM,sBAAsB,CACjC,KAAK,IAAI,EAAE;QACT,MAAM,MAAM,GAAG,MAAM,uBAAuB,CAK1C,qCAAqC,UAAU,GAAG,EAClD,GAAG,CAAC,GAAG,CACL,aAAa,GAAG,CAAC,SAAS,eAAe,UAAU,kBAAkB,EACrE,EAAE,OAAO,EAAE,EACX,EAAE,OAAO,EAAE,gBAAgB,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,CAChD,CACF,CAAC;QACF,OAAO,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;IACpD,CAAC,EACD,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,KAAK,GAAG,EAC3B,EAAE,EACF,IAAI,CACL,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,KAAK,UAAU,WAAW,CACxB,GAAkB,EAClB,UAAkB,EAClB,KAAkB;IAElB,IAAI,MAA0B,CAAC;IAC/B,OAAO,IAAI,EAAE,CAAC;QACZ,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,GAAG,EAAE,UAAU,EAAE;YAChD,YAAY,EAAE,KAAK,CAAC,YAAY;YAChC,MAAM;SACP,CAAC,CAAC;QACH,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;YAC1B,kGAAkG;YAClG,MAAM,uBAAuB,CAC3B,UAAU,MAAM,CAAC,OAAO,CAAC,MAAM,yBAAyB,UAAU,GAAG,EACrE,GAAG,CAAC,MAAM,CACR,aAAa,GAAG,CAAC,SAAS,eAAe,UAAU,UAAU,EAC7D;gBACE,OAAO,EAAE,gBAAgB,CAAC,KAAK,CAAC;gBAChC,MAAM,EAAE,QAAQ;gBAChB,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;aACjE,CACF,CACF,CAAC;YACF,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;gBAClB,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;gBACvB,SAAS;YACX,CAAC;QACH,CAAC;QACD,MAAM;IACR,CAAC;AACH,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,GAAkB,EAClB,UAAkB,EAClB,KAEC;IAED,MAAM,MAAM,GAAG,IAAI,eAAe,CAAC;QACjC,QAAQ,EAAE,MAAM;KACjB,CAAC,CAAC;IACH,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;QACjB,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACrC,CAAC;IACD,IAAI,KAAK,CAAC,SAAS,EAAE,CAAC;QACpB,MAAM,CAAC,GAAG,CAAC,WAAW,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;IAC3C,CAAC;IACD,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;QACjB,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACrC,CAAC;IACD,IAAI,KAAK,CAAC,UAAU,EAAE,CAAC;QACrB,MAAM,CAAC,GAAG,CAAC,aAAa,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;IAC9C,CAAC;IACD,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;QAChB,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC9C,CAAC;IACD,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,GAAG,CAC5B,aAAa,GAAG,CAAC,SAAS,eAAe,UAAU,YAAY,MAAM,CAAC,QAAQ,EAAE,EAAE,EAClF,EAAE,OAAO,EAAE,gBAAgB,CAAC,KAAK,CAAC,EAAE,CACrC,CAAC;IACF,MAAM,IAAI,GAcN,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;IAC1B,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;QAClB,kFAAkF;QAClF,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,KAAK,CAAC,EAAE,CAAC;YAC9C,OAAO;gBACL,OAAO,EAAE,EAAE;gBACX,MAAM,EAAE,SAAS;gBACjB,SAAS,EAAE,KAAK;aACjB,CAAC;QACJ,CAAC;QACD,MAAM,IAAI,kBAAkB,CAC1B,qCAAqC,UAAU,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,OAAO,GAAG,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,iBAAiB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,EAC/K,QAAQ,EACR,IAAI,CAAC,MAAM,CACZ,CAAC;IACJ,CAAC;IACD,OAAO;QACL,iDAAiD;QACjD,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YACpC,GAAG,EAAE,MAAM,CAAC,GAAG;YACf,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,QAAQ,EAAE,IAAI,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC;YACxC,IAAI,EAAE,MAAM,CAAC,IAAI;SAClB,CAAC,CAAC;QACH,iBAAiB,EAAE,EAAE;QACrB,MAAM,EAAE,IAAI,CAAC,WAAW,EAAE,MAAM;QAChC,SAAS,EAAE,IAAI,CAAC,WAAW,EAAE,YAAY,IAAI,KAAK;KACtC,CAAC;AACjB,CAAC;AAED;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,GAAkB,EAClB,UAMI,EAAE;IAEN,yBAAyB;IACzB,MAAM,MAAM,GAAG,IAAI,eAAe,EAAE,CAAC;IAErC,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;QACzB,MAAM,CAAC,MAAM,CAAC,eAAe,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;IACvD,CAAC;IAED,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;QACpB,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;IACxD,CAAC;IAED,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;QACnB,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IAC1C,CAAC;IAED,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;QACtB,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;IAChD,CAAC;IAED,kCAAkC;IAClC,MAAM,IAAI,GAAG,aAAa,GAAG,CAAC,SAAS,cAAc,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;IAExG,uBAAuB;IACvB,MAAM,MAAM,GAAG,MAAM,uBAAuB,CAG1C,iBAAiB,EACjB,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE;QACZ,OAAO,EAAE,gBAAgB,CAAC,OAAO,CAAC;KACnC,CAAC,CACH,CAAC;IACF,OAAO,MAAM,CAAC,OAAO,CAAC;AACxB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,GAAkB,EAClB,UAAkB,EAClB,KAAkB;IAElB,IAAI,OAAoB,CAAC;IACzB,IAAI,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC;QACvB,OAAO,GAAG;YACR,MAAM,EAAE,KAAK;YACb,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC;YAC3C,OAAO,EAAE,gBAAgB,CAAC,KAAK,EAAE;gBAC/B,cAAc,EAAE,kBAAkB;aACnC,CAAC;SACH,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,OAAO,GAAG;YACR,MAAM,EAAE,QAAQ;YAChB,OAAO,EAAE,gBAAgB,CAAC,KAAK,CAAC;SACjC,CAAC;IACJ,CAAC;IACD,MAAM,uBAAuB,CAC3B,GAAG,OAAO,CAAC,MAAM,8BAA8B,UAAU,GAAG,EAC5D,GAAG,CAAC,KAAK,CACP,aAAa,GAAG,CAAC,SAAS,eAAe,UAAU,OAAO,EAC1D,OAAO,CACR,CACF,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,GAAkB,EAClB,UAAkB,EAClB,KAAkB;IAElB,MAAM,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC;QAC9C,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC;YAC5B,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE;YACf,CAAC,CAAC;gBACE,KAAK,EAAE,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;oBACpC,GAAG,IAAI;oBACP,8DAA8D;oBAC9D,UAAU,EAAE,IAAI,CAAC,UAAU,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE;oBAC7C,sBAAsB;oBACtB,OAAO,EAAE,IAAI,CAAC,OAAO,IAAI,IAAI;iBAC9B,CAAC,CAAC;aACJ;QACL,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,uBAAuB,CAC3B,sCAAsC,UAAU,GAAG,EACnD,GAAG,CAAC,GAAG,CACL,aAAa,GAAG,CAAC,SAAS,eAAe,UAAU,YAAY,EAC/D,SAAS,EACT,EAAE,OAAO,EAAE,gBAAgB,CAAC,KAAK,CAAC,EAAE,CACrC,CACF,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,GAAkB,EAClB,UAAkB,EAClB,QAAqB,EAAE;IAEvB,MAAM,GAAG,GAAG,MAAM,GAAG,CAAC,GAAG,CACvB,aAAa,GAAG,CAAC,SAAS,eAAe,UAAU,YAAY,EAC/D,EAAE,OAAO,EAAE,gBAAgB,CAAC,KAAK,CAAC,EAAE,CACrC,CAAC;IACF,MAAM,IAAI,GAAQ,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;IACnC,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,CAAC;QACnB,MAAM,IAAI,kBAAkB,CAC1B,gDAAgD,UAAU,MAAM,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,UAAU,EAAE,EAC9F,GAAG,EACH,IAAI,EAAE,MAAM,CACb,CAAC;IACJ,CAAC;IACD,MAAM,KAAK,GAAU,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC;QAC7C,CAAC,CAAC,IAAI,CAAC,MAAM;QACb,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC;IAC/B,OAAO,KAAgC,CAAC;AAC1C,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,GAAkB,EAClB,UAAkB,EAClB,KAAkB;IAElB,MAAM,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC;QACzC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC;YACvB,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE;YACf,CAAC,CAAC;gBACE,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;oBAC/B,GAAG,IAAI;oBACP,sBAAsB;oBACtB,OAAO,EAAE,IAAI,CAAC,OAAO,IAAI,IAAI;iBAC9B,CAAC,CAAC;aACJ;QACL,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,uBAAuB,CAC3B,iCAAiC,UAAU,GAAG,EAC9C,GAAG,CAAC,GAAG,CACL,aAAa,GAAG,CAAC,SAAS,eAAe,UAAU,OAAO,EAC1D,SAAS,EACT,EAAE,OAAO,EAAE,gBAAgB,CAAC,KAAK,CAAC,EAAE,CACrC,CACF,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,GAAkB,EAClB,UAAkB,EAClB,QAAqB,EAAE;IAEvB,MAAM,GAAG,GAAG,MAAM,GAAG,CAAC,GAAG,CACvB,aAAa,GAAG,CAAC,SAAS,eAAe,UAAU,OAAO,EAC1D,EAAE,OAAO,EAAE,gBAAgB,CAAC,KAAK,CAAC,EAAE,CACrC,CAAC;IACF,MAAM,IAAI,GAAQ,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;IACnC,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,CAAC;QACnB,MAAM,IAAI,kBAAkB,CAC1B,2CAA2C,UAAU,MAAM,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,UAAU,EAAE,EACzF,GAAG,EACH,IAAI,EAAE,MAAM,CACb,CAAC;IACJ,CAAC;IACD,MAAM,KAAK,GAAU,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC;QAC7C,CAAC,CAAC,IAAI,CAAC,MAAM;QACb,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC;IAC/B,OAAO,KAA2B,CAAC;AACrC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,GAAkB,EAClB,EAAE,UAAU,EAAE,GAAG,EAAuC;IAExD,MAAM,QAAQ,GAAG,MAAM,WAAW,CAChC,KAAK,IAAI,EAAE,CACT,MAAM,GAAG,CAAC,GAAG,CACX,aAAa,GAAG,CAAC,SAAS,eAAe,UAAU,YAAY,GAAG,EAAE,CACrE,CACJ,CAAC;IACF,wGAAwG;IACxG,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC;IACxB,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;QAC5B,OAAO,IAAI,CAAC;IACd,CAAC;SAAM,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QACxB,MAAM,MAAM,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC;IAC9D,CAAC;IACD,OAAO;QACL,GAAG;QACH,IAAI,EAAE,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,IAAI,EAAE,EAAE,CAAE;QACtD,QAAQ,EAAE,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC;QACrC,IAAI,EAAE,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;KACrD,CAAC;AACJ,CAAC;AAED,MAAM,WAAW,GAAG,CAAC,CAA0B,EAAE,EAAE;IACjD,OAAO,sBAAsB,CAAC,CAAC,EAAE,gBAAgB,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;AAC9D,CAAC,CAAC;AAEF,MAAM,CAAC,KAAK,UAAU,SAAS,CAC7B,GAAkB,EAClB,EAAE,UAAU,EAAE,GAAG,EAAuC;IAExD,OAAO,MAAM,WAAW,CAAC,KAAK,IAAI,EAAE;QAClC,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,GAAG,CAC5B,aAAa,GAAG,CAAC,SAAS,eAAe,UAAU,YAAY,GAAG,EAAE,EACpE;YACE,OAAO,EAAE;gBACP,cAAc,EAAE,0BAA0B;gBAC1C,MAAM,EAAE,0BAA0B;aACnC;SACF,CACF,CAAC;QACF,IAAI,CAAC,QAAQ,CAAC,EAAE,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;YAC5C,MAAM,MAAM,cAAc,CAAC,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC;QAC7D,CAAC;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC,CAAC,CAAC;AACL,CAAC;AAWD,MAAM,CAAC,KAAK,UAAU,SAAS,CAC7B,GAAkB,EAClB,EACE,UAAU,EACV,GAAG,EACH,MAAM,GAKP;IAED,+CAA+C;IAC/C,OAAO,MAAM,WAAW,CAAC,KAAK,IAAI,EAAE;QAClC,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,GAAG,CAC5B,aAAa,GAAG,CAAC,SAAS,eAAe,UAAU,YAAY,GAAG,EAAE,EACpE,MAAM,EACN;YACE,OAAO,EAAE;gBACP,cAAc,EAAE,0BAA0B;aAC3C;SACF,CACF,CAAC;QACF,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,MAAM,cAAc,CAAC,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC;QACvD,CAAC;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,GAAkB,EAClB,EAAE,UAAU,EAAE,GAAG,EAAuC;IAExD,OAAO,MAAM,WAAW,CAAC,KAAK,IAAI,EAAE;QAClC,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,MAAM,CAC/B,aAAa,GAAG,CAAC,SAAS,eAAe,UAAU,YAAY,GAAG,EAAE,CACrE,CAAC;QAEF,IAAI,CAAC,QAAQ,CAAC,EAAE,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;YAC5C,MAAM,cAAc,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC;QAC1D,CAAC;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,GAAkB,EAClB,UAAkB;IAElB,MAAM,QAAQ,GAAG,MAAM,uBAAuB,CAI5C,mCAAmC,UAAU,GAAG,EAChD,GAAG,CAAC,IAAI,CAAC,aAAa,GAAG,CAAC,SAAS,eAAe,UAAU,SAAS,EAAE,EAAE,CAAC,CAC3E,CAAC;IACF,OAAO;QACL,EAAE,EAAE,QAAQ,CAAC,EAAE;QACf,IAAI,EAAE,QAAQ,CAAC,IAAI;QACnB,IAAI,EAAE,yCAAyC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE;KACjF,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,GAAkB,EAClB,UAAkB;IAElB,MAAM,GAAG,CAAC,IAAI,CACZ,aAAa,GAAG,CAAC,SAAS,eAAe,UAAU,UAAU,EAC7D,EAAE,CACH,CAAC;AACJ,CAAC"}

package/lib/cloudflare/bundle/plugin-wasm.js

@@ -22,8 +22,10 @@ export function createWasmPlugin() {
                 assert(build.initialOptions.absWorkingDir && build.initialOptions.outdir, "Missing absWorkingDir or outdir from esbuild options");
                 const outdir = path.resolve(build.initialOptions.absWorkingDir, build.initialOptions.outdir);
                 // Copy to outdir so it's included in the upload
-                await fs.mkdir(outdir, { recursive: true });
-                await fs.copyFile(path.join(args.resolveDir, name), path.join(outdir, name));
+                const copyFrom = path.join(args.resolveDir, name);
+                const copyTo = path.join(outdir, name);
+                await fs.mkdir(path.dirname(copyTo), { recursive: true });
+                await fs.copyFile(copyFrom, copyTo);
                 modules.set(args.path, {
                     type: "wasm",
                     path: name,

package/lib/cloudflare/bundle/plugin-wasm.js.map

@@ -1 +1 @@
-{"version":3,"file":"plugin-wasm.js","sourceRoot":"","sources":["../../../src/cloudflare/bundle/plugin-wasm.ts"],"names":[],"mappings":"AACA,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;AAG7B,MAAM,UAAU,gBAAgB;IAC9B,MAAM,OAAO,GAAG,IAAI,GAAG,EAA+B,CAAC;IACvD,MAAM,MAAM,GAAmB;QAC7B,IAAI,EAAE,cAAc;QACpB,KAAK,CAAC,KAAK;YACT,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE;gBACjB,OAAO,CAAC,KAAK,EAAE,CAAC;YAClB,CAAC,CAAC,CAAC;YAEH,6EAA6E;YAC7E,4DAA4D;YAC5D,KAAK,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,gBAAgB,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;gBAC3D,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACxC,IAAI,QAAQ,EAAE,CAAC;oBACb,OAAO,EAAE,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;gBACjD,CAAC;gBAED,8FAA8F;gBAC9F,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;gBAE5D,kGAAkG;gBAClG,MAAM,CACJ,KAAK,CAAC,cAAc,CAAC,aAAa,IAAI,KAAK,CAAC,cAAc,CAAC,MAAM,EACjE,sDAAsD,CACvD,CAAC;gBACF,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CACzB,KAAK,CAAC,cAAc,CAAC,aAAa,EAClC,KAAK,CAAC,cAAc,CAAC,MAAM,CAC5B,CAAC;gBAEF,gDAAgD;gBAChD,MAAM,EAAE,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;gBAC5C,MAAM,EAAE,CAAC,QAAQ,CACf,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,EAChC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CACxB,CAAC;gBACF,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE;oBACrB,IAAI,EAAE,MAAM;oBACZ,IAAI,EAAE,IAAI;iBACX,CAAC,CAAC;gBAEH,2FAA2F;gBAC3F,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;YACxC,CAAC,CAAC,CAAC;QACL,CAAC;KACF,CAAC;IACF,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC;AAC7B,CAAC"}
+{"version":3,"file":"plugin-wasm.js","sourceRoot":"","sources":["../../../src/cloudflare/bundle/plugin-wasm.ts"],"names":[],"mappings":"AACA,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;AAG7B,MAAM,UAAU,gBAAgB;IAC9B,MAAM,OAAO,GAAG,IAAI,GAAG,EAA+B,CAAC;IACvD,MAAM,MAAM,GAAmB;QAC7B,IAAI,EAAE,cAAc;QACpB,KAAK,CAAC,KAAK;YACT,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE;gBACjB,OAAO,CAAC,KAAK,EAAE,CAAC;YAClB,CAAC,CAAC,CAAC;YAEH,6EAA6E;YAC7E,4DAA4D;YAC5D,KAAK,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,gBAAgB,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;gBAC3D,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACxC,IAAI,QAAQ,EAAE,CAAC;oBACb,OAAO,EAAE,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;gBACjD,CAAC;gBAED,8FAA8F;gBAC9F,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;gBAE5D,kGAAkG;gBAClG,MAAM,CACJ,KAAK,CAAC,cAAc,CAAC,aAAa,IAAI,KAAK,CAAC,cAAc,CAAC,MAAM,EACjE,sDAAsD,CACvD,CAAC;gBACF,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CACzB,KAAK,CAAC,cAAc,CAAC,aAAa,EAClC,KAAK,CAAC,cAAc,CAAC,MAAM,CAC5B,CAAC;gBAEF,gDAAgD;gBAChD,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;gBAClD,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;gBACvC,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;gBAC1D,MAAM,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;gBAEpC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE;oBACrB,IAAI,EAAE,MAAM;oBACZ,IAAI,EAAE,IAAI;iBACX,CAAC,CAAC;gBAEH,2FAA2F;gBAC3F,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;YACxC,CAAC,CAAC,CAAC;QACL,CAAC;KACF,CAAC;IACF,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC;AAC7B,CAAC"}

package/lib/cloudflare/certificate-pack.d.ts

@@ -1,5 +1,4 @@
 import type { Context } from "../context.ts";
-import { Resource } from "../resource.ts";
 import { type CloudflareApi, type CloudflareApiOptions } from "./api.ts";
 import { type Zone } from "./zone.ts";
 /**
@@ -87,7 +86,7 @@ export interface CertificatePackProps extends CloudflareApiOptions {
 /**
  * Output returned after Certificate Pack creation/update
  */
-export interface CertificatePack extends Resource<"cloudflare::CertificatePack"> {
+export interface CertificatePack {
     /**
      * The unique ID of the certificate pack
      */

package/lib/cloudflare/certificate-pack.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"certificate-pack.d.ts","sourceRoot":"","sources":["../../src/cloudflare/certificate-pack.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAG1C,OAAO,EAEL,KAAK,aAAa,EAClB,KAAK,oBAAoB,EAC1B,MAAM,UAAU,CAAC;AAClB,OAAO,EAAuB,KAAK,IAAI,EAAE,MAAM,WAAW,CAAC;AAE3D;;GAEG;AACH,MAAM,MAAM,oBAAoB,GAAG,QAAQ,GAAG,cAAc,GAAG,SAAS,CAAC;AAEzE;;GAEG;AACH,MAAM,MAAM,gBAAgB,GAAG,KAAK,GAAG,MAAM,GAAG,OAAO,CAAC;AAExD;;GAEG;AACH,MAAM,MAAM,YAAY,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,GAAG,CAAC;AAE9C;;GAEG;AACH,MAAM,MAAM,qBAAqB,GAC7B,cAAc,GACd,oBAAoB,GACpB,SAAS,GACT,kBAAkB,GAClB,oBAAoB,GACpB,kBAAkB,GAClB,oBAAoB,GACpB,SAAS,GACT,QAAQ,GACR,wBAAwB,GACxB,sBAAsB,GACtB,oBAAoB,GACpB,sBAAsB,GACtB,oBAAoB,GACpB,iBAAiB,GACjB,oBAAoB,GACpB,gBAAgB,GAChB,cAAc,GACd,UAAU,GACV,eAAe,GACf,oBAAoB,CAAC;AAEzB;;GAEG;AACH,MAAM,WAAW,oBAAqB,SAAQ,oBAAoB;IAChE;;;OAGG;IACH,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAErB;;;;;;;;OAQG;IACH,oBAAoB,EAAE,oBAAoB,CAAC;IAE3C;;;;;;OAMG;IACH,KAAK,EAAE,MAAM,EAAE,CAAC;IAEhB;;;;;OAKG;IACH,IAAI,CAAC,EAAE,UAAU,CAAC;IAElB;;;;;;;OAOG;IACH,gBAAgB,EAAE,gBAAgB,CAAC;IAEnC;;;;;OAKG;IACH,YAAY,EAAE,YAAY,CAAC;IAE3B;;;;;;OAMG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAE7B;;;;;OAKG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED;;GAEG;AACH,MAAM,WAAW,eACf,SAAQ,QAAQ,CAAC,6BAA6B,CAAC;IAC/C;;OAEG;IACH,EAAE,EAAE,MAAM,CAAC;IAEX;;OAEG;IACH,oBAAoB,EAAE,oBAAoB,CAAC;IAE3C;;OAEG;IACH,kBAAkB,EAAE,OAAO,CAAC;IAE5B;;OAEG;IACH,KAAK,EAAE,MAAM,EAAE,CAAC;IAEhB;;OAEG;IACH,MAAM,EAAE,qBAAqB,CAAC;IAE9B;;OAEG;IACH,IAAI,EAAE,UAAU,CAAC;IAEjB;;OAEG;IACH,gBAAgB,EAAE,gBAAgB,CAAC;IAEnC;;OAEG;IACH,YAAY,EAAE,YAAY,CAAC;IAE3B;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IAEf;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6DG;AACH,eAAO,MAAM,eAAe,yFAGlB,OAAO,CAAC,eAAe,CAAC,OACzB,MAAM,SACJ,oBAAoB,KAC1B,OAAO,CAAC,eAAe,CAAC,CAqL5B,CAAC;AAeF;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAsB,4BAA4B,CAChD,GAAG,EAAE,aAAa,EAClB,MAAM,EAAE,MAAM,EACd,iBAAiB,EAAE,MAAM,EACzB,SAAS,GAAE,MAAuB,GACjC,OAAO,CAAC,qBAAqB,CAAC,CAuChC"}
+{"version":3,"file":"certificate-pack.d.ts","sourceRoot":"","sources":["../../src/cloudflare/certificate-pack.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAI7C,OAAO,EAEL,KAAK,aAAa,EAClB,KAAK,oBAAoB,EAC1B,MAAM,UAAU,CAAC;AAClB,OAAO,EAAuB,KAAK,IAAI,EAAE,MAAM,WAAW,CAAC;AAE3D;;GAEG;AACH,MAAM,MAAM,oBAAoB,GAAG,QAAQ,GAAG,cAAc,GAAG,SAAS,CAAC;AAEzE;;GAEG;AACH,MAAM,MAAM,gBAAgB,GAAG,KAAK,GAAG,MAAM,GAAG,OAAO,CAAC;AAExD;;GAEG;AACH,MAAM,MAAM,YAAY,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,GAAG,CAAC;AAE9C;;GAEG;AACH,MAAM,MAAM,qBAAqB,GAC7B,cAAc,GACd,oBAAoB,GACpB,SAAS,GACT,kBAAkB,GAClB,oBAAoB,GACpB,kBAAkB,GAClB,oBAAoB,GACpB,SAAS,GACT,QAAQ,GACR,wBAAwB,GACxB,sBAAsB,GACtB,oBAAoB,GACpB,sBAAsB,GACtB,oBAAoB,GACpB,iBAAiB,GACjB,oBAAoB,GACpB,gBAAgB,GAChB,cAAc,GACd,UAAU,GACV,eAAe,GACf,oBAAoB,CAAC;AAEzB;;GAEG;AACH,MAAM,WAAW,oBAAqB,SAAQ,oBAAoB;IAChE;;;OAGG;IACH,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAErB;;;;;;;;OAQG;IACH,oBAAoB,EAAE,oBAAoB,CAAC;IAE3C;;;;;;OAMG;IACH,KAAK,EAAE,MAAM,EAAE,CAAC;IAEhB;;;;;OAKG;IACH,IAAI,CAAC,EAAE,UAAU,CAAC;IAElB;;;;;;;OAOG;IACH,gBAAgB,EAAE,gBAAgB,CAAC;IAEnC;;;;;OAKG;IACH,YAAY,EAAE,YAAY,CAAC;IAE3B;;;;;;OAMG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAE7B;;;;;OAKG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B;;OAEG;IACH,EAAE,EAAE,MAAM,CAAC;IAEX;;OAEG;IACH,oBAAoB,EAAE,oBAAoB,CAAC;IAE3C;;OAEG;IACH,kBAAkB,EAAE,OAAO,CAAC;IAE5B;;OAEG;IACH,KAAK,EAAE,MAAM,EAAE,CAAC;IAEhB;;OAEG;IACH,MAAM,EAAE,qBAAqB,CAAC;IAE9B;;OAEG;IACH,IAAI,EAAE,UAAU,CAAC;IAEjB;;OAEG;IACH,gBAAgB,EAAE,gBAAgB,CAAC;IAEnC;;OAEG;IACH,YAAY,EAAE,YAAY,CAAC;IAE3B;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IAEf;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6DG;AACH,eAAO,MAAM,eAAe,yFAGlB,OAAO,CAAC,eAAe,CAAC,OACzB,MAAM,SACJ,oBAAoB,KAC1B,OAAO,CAAC,eAAe,CAAC,CAqL5B,CAAC;AAeF;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAsB,4BAA4B,CAChD,GAAG,EAAE,aAAa,EAClB,MAAM,EAAE,MAAM,EACd,iBAAiB,EAAE,MAAM,EACzB,SAAS,GAAE,MAAuB,GACjC,OAAO,CAAC,qBAAqB,CAAC,CAuChC"}

package/lib/cloudflare/certificate-pack.js

@@ -143,7 +143,7 @@ export const CertificatePack = Resource("cloudflare::CertificatePack", async fun
     if (existingPack) {
         // Adopt the existing certificate pack
         logger.log(`Adopting existing certificate pack ${existingPack.id} instead of creating a new one`);
-        return this({
+        return {
             id: existingPack.id,
             certificateAuthority: existingPack.certificate_authority,
             cloudflareBranding: props.cloudflareBranding ?? false,
@@ -154,7 +154,7 @@ export const CertificatePack = Resource("cloudflare::CertificatePack", async fun
             validityDays: existingPack.validity_days,
             zoneId,
             zoneName: zoneName,
-        });
+        };
     }
     logger.log(`Creating certificate pack with ${props.hosts.length} hosts using ${props.certificateAuthority}`);
     const createResponse = await api.post(`/zones/${zoneId}/ssl/certificate_packs/order`, {
@@ -179,7 +179,7 @@ export const CertificatePack = Resource("cloudflare::CertificatePack", async fun
     }
     const createdPack = (await createResponse.json()).result;
     logger.log(`Certificate pack created with ID ${createdPack.id}. Status: ${createdPack.status}. Note: Certificate provisioning can take up to 10 minutes.`);
-    return this({
+    return {
         id: createdPack.id,
         certificateAuthority: createdPack.certificate_authority,
         cloudflareBranding: props.cloudflareBranding ?? false,
@@ -190,7 +190,7 @@ export const CertificatePack = Resource("cloudflare::CertificatePack", async fun
         validityDays: createdPack.validity_days,
         zoneId,
         zoneName: zoneName,
-    });
+    };
 });
 /**
  * Helper function to wait for certificate pack to reach active status

package/lib/cloudflare/certificate-pack.js.map

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

package/lib/cloudflare/compatibility-date.gen.d.ts

@@ -1,5 +1,5 @@
 /**
  * The default Cloudflare Workers compatibility date, set based on the latest workerd release at the time of build.
  */
-export declare const DEFAULT_COMPATIBILITY_DATE = "2025-09-13";
+export declare const DEFAULT_COMPATIBILITY_DATE = "2025-09-27";
 //# sourceMappingURL=compatibility-date.gen.d.ts.map

package/lib/cloudflare/compatibility-date.gen.js

@@ -3,5 +3,5 @@
 /**
  * The default Cloudflare Workers compatibility date, set based on the latest workerd release at the time of build.
  */
-export const DEFAULT_COMPATIBILITY_DATE = "2025-09-13";
+export const DEFAULT_COMPATIBILITY_DATE = "2025-09-27";
 //# sourceMappingURL=compatibility-date.gen.js.map

package/lib/cloudflare/container.d.ts

@@ -1,6 +1,5 @@
 import type { Context } from "../context.ts";
 import { Image, type ImageProps } from "../docker/image.ts";
-import { Resource } from "../resource.ts";
 import { type CloudflareApi, type CloudflareApiOptions } from "./api.ts";
 /**
  * Properties for creating a Container binding or ContainerApplication
@@ -288,7 +287,7 @@ export type SchedulingPolicy = "moon" | "gpu" | "regional" | "fill_metals" | "de
  * This resource manages the lifecycle of containerized applications running on
  * Cloudflare's global network with automatic scaling and scheduling.
  */
-export interface ContainerApplication extends Resource<"cloudflare::ContainerApplication"> {
+export interface ContainerApplication {
     /** Unique identifier for the container application */
     id: string;
     /** Human-readable name of the container application */