alchemy 0.67.0 → 0.69.0

package/lib/cloudflare/assets.d.ts

@@ -1,5 +1,3 @@
-import type { Context } from "../context.ts";
-import { Resource } from "../resource.ts";
 /**
  * Properties for creating or updating Assets
  */
@@ -11,54 +9,18 @@ export interface AssetsProps {
     path: string;
 }
 /**
- * Output returned after Assets creation/update
+ * Assets binding type
  */
-export interface Assets extends Resource<"cloudflare::Asset">, AssetsProps {
-    /**
-     * The type of binding
-     */
+export type Assets = AssetsProps & {
     type: "assets";
-    /**
-     * The ID of the assets bundle
-     */
-    id: string;
-    /**
-     * Asset files that were found
-     */
-    files: AssetFile[];
-    /**
-     * Time at which the assets were created
-     */
-    createdAt: number;
-    /**
-     * Time at which the assets were last updated
-     */
-    updatedAt: number;
-}
-/**
- * Represents a single asset file
- */
-export interface AssetFile {
-    /**
-     * Path relative to the assets directory
-     */
-    path: string;
-    /**
-     * Full filesystem path to the file
-     */
-    filePath: string;
-    /**
-     * Content type of the file
-     */
-    contentType: string;
-}
+};
 /**
  * Cloudflare Assets represent a collection of static files that can be uploaded and served
  * by Cloudflare Workers.
  *
  * @example
  * // Create a basic assets bundle from a local directory
- * const staticAssets = await Assets("static", {
+ * const staticAssets = await Assets({
  *   path: "./src/assets"
  * });
  *
@@ -71,5 +33,21 @@ export interface AssetFile {
  *   }
  * });
  */
-export declare const Assets: (((this: any, id: string, props?: {}) => never) & (new (_: never) => never)) | ((this: Context<Assets>, id: string, props: AssetsProps) => Promise<Assets>);
+export declare function Assets(props: AssetsProps): Promise<Assets>;
+export declare namespace Assets {
+    interface FileMetadata {
+        path: string;
+        name: string;
+        hash: string;
+        size: number;
+        type: string;
+    }
+    /**
+     * Recursively read the metadata for all assets in a directory, skipping files that are ignored by the .assetsignore file
+     *
+     * @param root Path to the directory
+     * @returns Metadata for all assets in the directory
+     */
+    const read: (root: string) => Promise<FileMetadata[]>;
+}
 //# sourceMappingURL=assets.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"assets.d.ts","sourceRoot":"","sources":["../../src/cloudflare/assets.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAI1C;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B;;;OAGG;IACH,IAAI,EAAE,MAAM,CAAC;CACd;AAED;;GAEG;AACH,MAAM,WAAW,MAAO,SAAQ,QAAQ,CAAC,mBAAmB,CAAC,EAAE,WAAW;IACxE;;OAEG;IACH,IAAI,EAAE,QAAQ,CAAC;IAEf;;OAEG;IACH,EAAE,EAAE,MAAM,CAAC;IAEX;;OAEG;IACH,KAAK,EAAE,SAAS,EAAE,CAAC;IAEnB;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAElB;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;CACnB;AAED;;GAEG;AACH,MAAM,WAAW,SAAS;IACxB;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAC;IAEjB;;OAEG;IACH,WAAW,EAAE,MAAM,CAAC;CACrB;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,eAAO,MAAM,MAAM,yFAMT,OAAO,CAAC,MAAM,CAAC,MACjB,MAAM,SACH,WAAW,KACjB,OAAO,CAAC,MAAM,CAAC,CA6CnB,CAAC"}
+{"version":3,"file":"assets.d.ts","sourceRoot":"","sources":["../../src/cloudflare/assets.ts"],"names":[],"mappings":"AAOA;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B;;;OAGG;IACH,IAAI,EAAE,MAAM,CAAC;CACd;AAED;;GAEG;AACH,MAAM,MAAM,MAAM,GAAG,WAAW,GAAG;IACjC,IAAI,EAAE,QAAQ,CAAC;CAChB,CAAC;AAEF;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAsB,MAAM,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,CAKhE;AAED,yBAAiB,MAAM,CAAC;IACtB,UAAiB,YAAY;QAC3B,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,MAAM,CAAC;KACd;IAED;;;;;OAKG;IACI,MAAM,IAAI,GAAU,MAAM,MAAM,KAAG,OAAO,CAAC,YAAY,EAAE,CA+C/D,CAAC;CAmBH"}

package/lib/cloudflare/assets.js

@@ -1,5 +1,6 @@
-import * as fs from "node:fs/promises";
-import * as path from "pathe";
+import crypto from "node:crypto";
+import fs from "node:fs/promises";
+import path from "pathe";
 import { Resource } from "../resource.js";
 import { getContentType } from "../util/content-type.js";
 import ignore from "../util/ignore-matcher.js";
@@ -9,7 +10,7 @@ import ignore from "../util/ignore-matcher.js";
  *
  * @example
  * // Create a basic assets bundle from a local directory
- * const staticAssets = await Assets("static", {
+ * const staticAssets = await Assets({
  *   path: "./src/assets"
  * });
  *
@@ -22,75 +23,82 @@ import ignore from "../util/ignore-matcher.js";
  *   }
  * });
  */
-export const Assets = Resource("cloudflare::Asset", {
-    alwaysUpdate: true,
-}, async function (id, props) {
-    if (this.phase === "delete") {
-        return this.destroy();
-    }
-    try {
-        // Check if the assets directory exists
-        const stats = await fs.stat(props.path);
-        if (!stats.isDirectory()) {
-            throw new Error(`Assets path ${props.path} is not a directory`);
-        }
-    }
-    catch (_error) {
-        throw new Error(`Assets directory ${props.path} does not exist or is not accessible`);
-    }
-    // Recursively get all files in the assets directory
-    const ignoreMatcher = await createIgnoreMatcher(props.path);
-    const filesList = await getFilesRecursively(props.path, ignoreMatcher);
-    // Create asset file objects
-    const files = filesList.map((filePath) => {
-        const relativePath = path.relative(props.path, filePath);
-        return {
-            path: path.normalize(relativePath),
-            filePath: path.normalize(filePath),
-            contentType: getContentType(filePath) ?? "application/null",
-        };
-    });
-    // Get current timestamp
-    const now = Date.now();
-    // Construct the output
-    return this({
-        id,
+export async function Assets(props) {
+    return {
         type: "assets",
-        path: props.path,
-        files,
-        createdAt: this.output?.createdAt || now,
-        updatedAt: now,
-    });
-});
-async function createIgnoreMatcher(dir) {
-    const ignoreMatcher = ignore().add(".assetsignore");
-    const ignorePath = path.join(dir, ".assetsignore");
-    try {
-        const content = await fs.readFile(ignorePath, "utf-8");
-        ignoreMatcher.add(content.split("\n"));
-    }
-    catch {
-        // ignore
-    }
-    return ignoreMatcher;
+        ...props,
+    };
 }
-// Helper functions for file operations
-async function getFilesRecursively(dir, ignoreMatcher) {
-    const files = await fs.readdir(dir, { withFileTypes: true });
-    const result = [];
-    await Promise.all(files.map(async (file) => {
-        const filePath = path.join(dir, file.name);
-        if (ignoreMatcher.ignores(file.name)) {
-            return;
-        }
-        if (file.isDirectory() ||
-            (file.isSymbolicLink() && (await fs.stat(filePath)).isDirectory())) {
-            result.push(...(await getFilesRecursively(filePath, ignoreMatcher)));
+(function (Assets) {
+    /**
+     * Recursively read the metadata for all assets in a directory, skipping files that are ignored by the .assetsignore file
+     *
+     * @param root Path to the directory
+     * @returns Metadata for all assets in the directory
+     */
+    Assets.read = async (root) => {
+        const matcher = ignore().add(".assetsignore");
+        const ignorePath = path.join(root, ".assetsignore");
+        try {
+            const content = await fs.readFile(ignorePath, "utf-8");
+            matcher.add(content.split("\n"));
         }
-        else {
-            result.push(filePath);
+        catch {
+            // ignore
         }
-    }));
-    return result;
-}
+        const readDirectory = async (directory) => {
+            const files = await fs.readdir(directory);
+            const result = [];
+            await Promise.all(files.map(async (file) => {
+                const absolutePath = path.join(directory, file);
+                const relativePath = path.relative(root, absolutePath);
+                if (matcher.ignores(relativePath)) {
+                    return;
+                }
+                const stat = await fs.stat(absolutePath);
+                if (stat.isDirectory()) {
+                    result.push(...(await readDirectory(absolutePath)));
+                }
+                else {
+                    if (stat.size > 26214400) {
+                        throw new Error(`File "${absolutePath}" is too large to upload as an asset to Cloudflare (the file is ${(stat.size / 1024 / 1024).toFixed(2)} MB; the maximum size is 25MB).`);
+                    }
+                    result.push({
+                        path: absolutePath,
+                        name: relativePath.startsWith("/")
+                            ? relativePath
+                            : `/${relativePath}`,
+                        hash: await computeHash(absolutePath),
+                        size: stat.size,
+                        type: getContentType(absolutePath) ?? "application/null",
+                    });
+                }
+            }));
+            return result;
+        };
+        return await readDirectory(root);
+    };
+    /**
+     * Calculate the SHA-256 hash and size of a file
+     *
+     * @param filePath Path to the file
+     * @returns Hash (first 32 chars of SHA-256) and size of the file
+     */
+    const computeHash = async (filePath) => {
+        const contents = await fs.readFile(filePath);
+        const hash = crypto.createHash("sha256");
+        hash.update(contents);
+        const extension = path.extname(filePath).substring(1);
+        hash.update(extension);
+        return hash.digest("hex").slice(0, 32);
+    };
+})(Assets || (Assets = {}));
+// we are deprecating the Assets resource (it is now just a function)
+// but, a user may still have a resource that depends on it, so we register a no-op dummy resource so that it can be cleanly deleted
+Resource("cloudflare::Asset", async function () {
+    if (this.phase === "delete") {
+        return this.destroy();
+    }
+    throw new Error("Not implemented");
+});
 //# sourceMappingURL=assets.js.map

package/lib/cloudflare/assets.js.map

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

@@ -1,19 +1,93 @@
-import type { Secret } from "../secret.ts";
-import type { CloudflareApiOptions } from "./api.ts";
-export interface CloudflareApiTokenAuthOptions {
-    type: "api-token";
-    apiToken: Secret<string>;
+import { Credentials } from "../auth.ts";
+import { OAuthClient } from "../util/oauth-client.ts";
+export declare namespace CloudflareAuth {
+    const client: OAuthClient;
+    type Metadata = {
+        id: string;
+        name: string;
+    };
+    const ALL_SCOPES: {
+        "access:read": string;
+        "access:write": string;
+        "account:read": string;
+        "agw:read": string;
+        "agw:run": string;
+        "ai:read": string;
+        "ai:write": string;
+        "aiaudit:read": string;
+        "aiaudit:write": string;
+        "aig:read": string;
+        "aig:write": string;
+        "auditlogs:read": string;
+        "browser:read": string;
+        "browser:write": string;
+        "cfone:read": string;
+        "cfone:write": string;
+        "cloudchamber:write": string;
+        "constellation:write": string;
+        "containers:write": string;
+        "d1:write": string;
+        "dex:read": string;
+        "dex:write": string;
+        "dns_analytics:read": string;
+        "dns_records:edit": string;
+        "dns_records:read": string;
+        "dns_settings:read": string;
+        "firstpartytags:write": string;
+        "lb:edit": string;
+        "lb:read": string;
+        "logpush:read": string;
+        "logpush:write": string;
+        "notification:read": string;
+        "notification:write": string;
+        "pages:read": string;
+        "pages:write": string;
+        "pipelines:read": string;
+        "pipelines:setup": string;
+        "pipelines:write": string;
+        "query_cache:write": string;
+        "queues:write": string;
+        "r2_catalog:write": string;
+        "radar:read": string;
+        "rag:read": string;
+        "rag:write": string;
+        "secrets_store:read": string;
+        "secrets_store:write": string;
+        "sso-connector:read": string;
+        "sso-connector:write": string;
+        "ssl_certs:write": string;
+        "teams:pii": string;
+        "teams:read": string;
+        "teams:secure_location": string;
+        "teams:write": string;
+        "url_scanner:read": string;
+        "url_scanner:write": string;
+        "user:read": string;
+        "vectorize:write": string;
+        "workers:write": string;
+        "workers_builds:read": string;
+        "workers_builds:write": string;
+        "workers_kv:write": string;
+        "workers_observability:read": string;
+        "workers_observability:write": string;
+        "workers_observability_telemetry:write": string;
+        "workers_routes:write": string;
+        "workers_scripts:write": string;
+        "workers_tail:read": string;
+        "zone:read": string;
+    };
+    const DEFAULT_SCOPES: string[];
+    /**
+     * Format Cloudflare credentials as headers, refreshing OAuth credentials if expired.
+     * If the credentials are OAuth, the `profile` is required so we can read and write the updated credentials.
+     */
+    const formatHeadersWithRefresh: (input: {
+        profile: string | undefined;
+        credentials: Credentials;
+    }) => Promise<Record<string, string>>;
+    /**
+     * Format Cloudflare credentials as headers.
+     */
+    const formatHeaders: (credentials: Credentials) => Record<string, string>;
 }
-export interface CloudflareApiKeyAuthOptions {
-    type: "api-key";
-    apiKey: Secret;
-    apiEmail: string;
-}
-export interface CloudflareWranglerAuthOptions {
-    type: "wrangler";
-}
-export type CloudflareAuthOptions = CloudflareApiTokenAuthOptions | CloudflareApiKeyAuthOptions | CloudflareWranglerAuthOptions;
-export declare const isCloudflareAuthOptions: (input?: CloudflareApiOptions | CloudflareAuthOptions) => input is CloudflareAuthOptions;
-export declare function normalizeAuthOptions(input?: CloudflareApiOptions | CloudflareAuthOptions): Promise<CloudflareAuthOptions>;
-export declare function getCloudflareAuthHeaders(authOptions: CloudflareAuthOptions): Promise<Record<string, string>>;
 //# sourceMappingURL=auth.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../src/cloudflare/auth.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAIrD,MAAM,WAAW,6BAA6B;IAC5C,IAAI,EAAE,WAAW,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;CAC1B;AAED,MAAM,WAAW,2BAA2B;IAC1C,IAAI,EAAE,SAAS,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,6BAA6B;IAC5C,IAAI,EAAE,UAAU,CAAC;CAClB;AAED,MAAM,MAAM,qBAAqB,GAC7B,6BAA6B,GAC7B,2BAA2B,GAC3B,6BAA6B,CAAC;AAElC,eAAO,MAAM,uBAAuB,GAClC,QAAQ,oBAAoB,GAAG,qBAAqB,KACnD,KAAK,IAAI,qBAQX,CAAC;AAEF,wBAAsB,oBAAoB,CACxC,KAAK,CAAC,EAAE,oBAAoB,GAAG,qBAAqB,GACnD,OAAO,CAAC,qBAAqB,CAAC,CA+BhC;AAED,wBAAsB,wBAAwB,CAC5C,WAAW,EAAE,qBAAqB,GACjC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAyBjC"}
+{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../src/cloudflare/auth.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAEtD,yBAAiB,cAAc,CAAC;IACvB,MAAM,MAAM,aAQjB,CAAC;IAEH,KAAY,QAAQ,GAAG;QACrB,EAAE,EAAE,MAAM,CAAC;QACX,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IACK,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAkFtB,CAAC;IACK,MAAM,cAAc,UAkB1B,CAAC;IAEF;;;OAGG;IACI,MAAM,wBAAwB,GAAU,OAAO;QACpD,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;QAC5B,WAAW,EAAE,WAAW,CAAC;KAC1B,oCAgBA,CAAC;IAEF;;OAEG;IACI,MAAM,aAAa,GACxB,aAAa,WAAW,KACvB,MAAM,CAAC,MAAM,EAAE,MAAM,CAYvB,CAAC;CACH"}