alchemy 0.15.11 → 0.15.12

package/lib/cloudflare/account-api-token.d.ts

@@ -2,10 +2,11 @@ import type { Context } from "../context.js";
 import { Resource } from "../resource.js";
 import type { Secret } from "../secret.js";
 import { type CloudflareApiOptions } from "./api.js";
+import { type PermissionGroupName } from "./permission-groups.js";
 /**
  * Permission group for a token policy
  */
-export interface TokenPolicyPermissionGroup {
+export type TokenPolicyPermissionGroup = {
     /**
      * ID of the permission group
      */
@@ -14,7 +15,7 @@ export interface TokenPolicyPermissionGroup {
      * Optional metadata for the permission group
      */
     meta?: Record<string, any>;
-}
+};
 /**
  * Policy that defines what the token can access
  */
@@ -26,12 +27,18 @@ export interface TokenPolicy {
     /**
      * Permission groups to include in the policy
      */
-    permissionGroups: TokenPolicyPermissionGroup[];
+    permissionGroups: (PermissionGroupName | TokenPolicyPermissionGroup)[];
     /**
      * Resources the policy applies to
      */
-    resources: Record<string, string>;
+    resources: {
+        [key in TokenPolicyResourceKey]?: string;
+    };
 }
+/**
+ * @see https://developers.cloudflare.com/fundamentals/api/reference/permissions/
+ */
+type TokenPolicyResourceKey = `com.cloudflare.api.account` | `com.cloudflare.api.account.${string}` | `com.cloudflare.api.account.zone.${string}` | `com.cloudflare.api.user.${string}`;
 /**
  * Condition for token usage (e.g., IP restrictions)
  */
@@ -78,13 +85,17 @@ export interface AccountApiTokenProps extends CloudflareApiOptions {
 /**
  * Output returned after Account API Token creation/update
  */
-export interface AccountApiToken extends Resource<"cloudflare::AccountApiToken">, AccountApiTokenProps {
+export interface AccountApiToken extends Resource<"cloudflare::AccountApiToken"> {
     /**
      * The ID of the token
      *
      * Equiv. to ACCESS_KEY_ID
      */
     id: string;
+    /**
+     * Name of the token
+     */
+    name: string;
     /**
      * Status of the token
      */
@@ -101,7 +112,7 @@ export interface AccountApiToken extends Resource<"cloudflare::AccountApiToken">
      *
      * An alias of {@link id}
      */
-    accessKeyId: string;
+    accessKeyId: Secret;
     /**
      * Secret access key for the token
      *
@@ -109,7 +120,7 @@ export interface AccountApiToken extends Resource<"cloudflare::AccountApiToken">
      *
      * @see https://developers.cloudflare.com/r2/api/tokens/#get-s3-api-credentials-from-an-api-token
      */
-    secretAccessKey: string;
+    secretAccessKey: Secret;
 }
 /**
  * Creates a Cloudflare Account API Token with specified permissions.
@@ -121,21 +132,13 @@ export interface AccountApiToken extends Resource<"cloudflare::AccountApiToken">
  * @see https://developers.cloudflare.com/api/resources/accounts/subresources/tokens/methods/create/
  *
  * @example
- * // First, fetch all permission groups
- * const permissions = await PermissionGroups("cloudflare-permissions", {
- *   accountId: cfAccountId,
- * });
- *
  * // Create a token with read-only permissions for specific zones
  * const readOnlyToken = await AccountApiToken("readonly-token", {
  *   name: "Readonly Zone Token",
  *   policies: [
  *     {
  *       effect: "allow",
- *       permissionGroups: [
- *         { id: permissions["Zone Read"].id },
- *         { id: permissions["Analytics Read"].id }
- *       ],
+ *       permissionGroups: ["Zone Read", "Analytics Read"],
  *       resources: {
  *         "com.cloudflare.api.account.zone.22b1de5f1c0e4b3ea97bb1e963b06a43": "*",
  *         "com.cloudflare.api.account.zone.eb78d65290b24279ba6f44721b3ea3c4": "*"
@@ -152,9 +155,7 @@ export interface AccountApiToken extends Resource<"cloudflare::AccountApiToken">
  *   policies: [
  *     {
  *       effect: "allow",
- *       permissionGroups: [
- *         { id: permissions["Worker Routes Edit"].id }
- *       ],
+ *       permissionGroups: ["Worker Routes Edit"],
  *       resources: {
  *         "com.cloudflare.api.account.worker.route.*": "*"
  *       }
@@ -169,6 +170,22 @@ export interface AccountApiToken extends Resource<"cloudflare::AccountApiToken">
  *     }
  *   }
  * });
+ *
+ * @example
+ * // Create a token with bucket access permissions
+ * const storageToken = await AccountApiToken("account-access-token", {
+ *   name: "alchemy-account-access-token",
+ *   policies: [
+ *     {
+ *       effect: "allow",
+ *       permissionGroups: ["Workers R2 Storage Write"],
+ *       resources: {
+ *         "com.cloudflare.api.account": "*",
+ *       },
+ *     },
+ *   ],
+ * });
  */
 export declare const AccountApiToken: (((this: any, id: string, props?: {}) => never) & (new (_: never) => never)) | ((this: Context<AccountApiToken>, id: string, props: AccountApiTokenProps) => Promise<AccountApiToken>);
+export {};
 //# sourceMappingURL=account-api-token.d.ts.map

package/lib/cloudflare/account-api-token.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"account-api-token.d.ts","sourceRoot":"","sources":["../../src/cloudflare/account-api-token.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAE3C,OAAO,EAAE,KAAK,oBAAoB,EAAuB,MAAM,UAAU,CAAC;AAE1E;;GAEG;AACH,MAAM,WAAW,0BAA0B;IACzC;;OAEG;IACH,EAAE,EAAE,MAAM,CAAC;IAEX;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC5B;AAED;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B;;OAEG;IACH,MAAM,EAAE,OAAO,GAAG,MAAM,CAAC;IAEzB;;OAEG;IACH,gBAAgB,EAAE,0BAA0B,EAAE,CAAC;IAE/C;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACnC;AAED;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B;;OAEG;IACH,SAAS,CAAC,EAAE;QACV;;WAEG;QACH,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC;QAEd;;WAEG;QACH,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;KAClB,CAAC;CACH;AAED;;GAEG;AACH,MAAM,WAAW,oBAAqB,SAAQ,oBAAoB;IAChE;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,QAAQ,EAAE,WAAW,EAAE,CAAC;IAExB;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,SAAS,CAAC,EAAE,cAAc,CAAC;CAC5B;AA4BD;;GAEG;AACH,MAAM,WAAW,eACf,SAAQ,QAAQ,CAAC,6BAA6B,CAAC,EAC7C,oBAAoB;IACtB;;;;OAIG;IACH,EAAE,EAAE,MAAM,CAAC;IAEX;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IAEf;;;;;OAKG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf;;;;OAIG;IACH,WAAW,EAAE,MAAM,CAAC;IAEpB;;;;;;OAMG;IACH,eAAe,EAAE,MAAM,CAAC;CACzB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0DG;AACH,eAAO,MAAM,eAAe,yFAGlB,OAAO,CAAC,eAAe,CAAC,MAC1B,MAAM,SACH,oBAAoB,KAC1B,OAAO,CAAC,eAAe,CAAC,CA8I5B,CAAC"}
+{"version":3,"file":"account-api-token.d.ts","sourceRoot":"","sources":["../../src/cloudflare/account-api-token.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAE3C,OAAO,EAAuB,KAAK,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAC1E,OAAO,EAEL,KAAK,mBAAmB,EACzB,MAAM,wBAAwB,CAAC;AAEhC;;GAEG;AACH,MAAM,MAAM,0BAA0B,GAAG;IACvC;;OAEG;IACH,EAAE,EAAE,MAAM,CAAC;IAEX;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC5B,CAAC;AAEF;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B;;OAEG;IACH,MAAM,EAAE,OAAO,GAAG,MAAM,CAAC;IAEzB;;OAEG;IACH,gBAAgB,EAAE,CAAC,mBAAmB,GAAG,0BAA0B,CAAC,EAAE,CAAC;IAEvE;;OAEG;IACH,SAAS,EAAE;SACR,GAAG,IAAI,sBAAsB,CAAC,CAAC,EAAE,MAAM;KACzC,CAAC;CACH;AAED;;GAEG;AACH,KAAK,sBAAsB,GACvB,4BAA4B,GAC5B,8BAA8B,MAAM,EAAE,GAEtC,mCAAmC,MAAM,EAAE,GAE3C,2BAA2B,MAAM,EAAE,CAAC;AAExC;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B;;OAEG;IACH,SAAS,CAAC,EAAE;QACV;;WAEG;QACH,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC;QAEd;;WAEG;QACH,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;KAClB,CAAC;CACH;AAED;;GAEG;AACH,MAAM,WAAW,oBAAqB,SAAQ,oBAAoB;IAChE;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,QAAQ,EAAE,WAAW,EAAE,CAAC;IAExB;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,SAAS,CAAC,EAAE,cAAc,CAAC;CAC5B;AA4BD;;GAEG;AACH,MAAM,WAAW,eACf,SAAQ,QAAQ,CAAC,6BAA6B,CAAC;IAC/C;;;;OAIG;IACH,EAAE,EAAE,MAAM,CAAC;IAEX;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IAEf;;;;;OAKG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf;;;;OAIG;IACH,WAAW,EAAE,MAAM,CAAC;IAEpB;;;;;;OAMG;IACH,eAAe,EAAE,MAAM,CAAC;CACzB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+DG;AACH,eAAO,MAAM,eAAe,yFAGlB,OAAO,CAAC,eAAe,CAAC,MAC1B,MAAM,SACH,oBAAoB,KAC1B,OAAO,CAAC,eAAe,CAAC,CAwJ5B,CAAC"}

package/lib/cloudflare/account-api-token.js

@@ -2,6 +2,7 @@ import { alchemy } from "../alchemy.js";
 import { Resource } from "../resource.js";
 import { sha256 } from "../util/sha256.js";
 import { createCloudflareApi } from "./api.js";
+import { PermissionGroups, } from "./permission-groups.js";
 /**
  * Creates a Cloudflare Account API Token with specified permissions.
  *
@@ -12,21 +13,13 @@ import { createCloudflareApi } from "./api.js";
  * @see https://developers.cloudflare.com/api/resources/accounts/subresources/tokens/methods/create/
  *
  * @example
- * // First, fetch all permission groups
- * const permissions = await PermissionGroups("cloudflare-permissions", {
- *   accountId: cfAccountId,
- * });
- *
  * // Create a token with read-only permissions for specific zones
  * const readOnlyToken = await AccountApiToken("readonly-token", {
  *   name: "Readonly Zone Token",
  *   policies: [
  *     {
  *       effect: "allow",
- *       permissionGroups: [
- *         { id: permissions["Zone Read"].id },
- *         { id: permissions["Analytics Read"].id }
- *       ],
+ *       permissionGroups: ["Zone Read", "Analytics Read"],
  *       resources: {
  *         "com.cloudflare.api.account.zone.22b1de5f1c0e4b3ea97bb1e963b06a43": "*",
  *         "com.cloudflare.api.account.zone.eb78d65290b24279ba6f44721b3ea3c4": "*"
@@ -43,9 +36,7 @@ import { createCloudflareApi } from "./api.js";
  *   policies: [
  *     {
  *       effect: "allow",
- *       permissionGroups: [
- *         { id: permissions["Worker Routes Edit"].id }
- *       ],
+ *       permissionGroups: ["Worker Routes Edit"],
  *       resources: {
  *         "com.cloudflare.api.account.worker.route.*": "*"
  *       }
@@ -60,6 +51,21 @@ import { createCloudflareApi } from "./api.js";
  *     }
  *   }
  * });
+ *
+ * @example
+ * // Create a token with bucket access permissions
+ * const storageToken = await AccountApiToken("account-access-token", {
+ *   name: "alchemy-account-access-token",
+ *   policies: [
+ *     {
+ *       effect: "allow",
+ *       permissionGroups: ["Workers R2 Storage Write"],
+ *       resources: {
+ *         "com.cloudflare.api.account": "*",
+ *       },
+ *     },
+ *   ],
+ * });
  */
 export const AccountApiToken = Resource("cloudflare::AccountApiToken", async function (id, props) {
     // Create Cloudflare API client with automatic account discovery
@@ -83,16 +89,26 @@ export const AccountApiToken = Resource("cloudflare::AccountApiToken", async fun
         // Return destroyed state
         return this.destroy();
     }
+    const permissionGroups = await PermissionGroups("cloudflare-permission-groups", props);
     // Transform our properties to API format
     const apiPayload = {
         name: props.name,
         policies: props.policies.map((policy) => ({
             effect: policy.effect,
-            permission_groups: policy.permissionGroups.map((pg) => ({
-                id: pg.id,
-                meta: pg.meta || {},
+            permission_groups: policy.permissionGroups.map((pg) => typeof pg === "string"
+                ? {
+                    id: permissionGroups[pg].id,
+                }
+                : {
+                    id: pg.id,
+                    meta: pg.meta || {},
+                }),
+            resources: Object.fromEntries(Object.entries(policy.resources).map(([key, value]) => {
+                if (key === "com.cloudflare.api.account") {
+                    return [`com.cloudflare.api.account.${api.accountId}`, value];
+                }
+                return [key, value];
             })),
-            resources: policy.resources,
         })),
         // Format dates for Cloudflare API (removing milliseconds)
         ...(props.expiresOn
@@ -153,14 +169,6 @@ export const AccountApiToken = Resource("cloudflare::AccountApiToken", async fun
         id: tokenData.id,
         name: tokenData.name,
         status: tokenData.status,
-        policies: tokenData.policies.map((policy) => ({
-            effect: policy.effect,
-            permissionGroups: policy.permission_groups.map((pg) => ({
-                id: pg.id,
-                meta: pg.meta,
-            })),
-            resources: policy.resources,
-        })),
         ...(tokenData.expires_on ? { expiresOn: tokenData.expires_on } : {}),
         ...(tokenData.not_before ? { notBefore: tokenData.not_before } : {}),
         ...(tokenData.condition
@@ -176,8 +184,8 @@ export const AccountApiToken = Resource("cloudflare::AccountApiToken", async fun
             }
             : {}),
         value: tokenValue,
-        accessKeyId: tokenData.id,
-        secretAccessKey: sha256(tokenValue.unencrypted),
+        accessKeyId: alchemy.secret(tokenData.id),
+        secretAccessKey: alchemy.secret(sha256(tokenValue.unencrypted)),
     });
 });
 //# sourceMappingURL=account-api-token.js.map

package/lib/cloudflare/account-api-token.js.map

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

package/lib/cloudflare/permission-groups.d.ts

@@ -18,6 +18,8 @@ export interface PermissionGroup {
      */
     scopes: string[];
 }
+export type PermissionGroupName = R2PermissionGroups;
+export type R2PermissionGroups = "Workers R2 Storage Write" | "Workers R2 Storage Read" | "Workers R2 Storage Bucket Item Write" | "Workers R2 Storage Bucket Item Read";
 /**
  * All Cloudflare permission groups mapped by name to ID
  *

package/lib/cloudflare/permission-groups.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"permission-groups.d.ts","sourceRoot":"","sources":["../../src/cloudflare/permission-groups.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAuB,KAAK,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAE1E;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B;;OAEG;IACH,EAAE,EAAE,MAAM,CAAC;IAEX;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB;AAYD;;;;GAIG;AACH,MAAM,MAAM,gBAAgB,GAAG,QAAQ,CAAC,8BAA8B,CAAC,GAAG;IACxE;;;OAGG;IACH,0BAA0B,EAAE,eAAe,CAAC;IAE5C;;;OAGG;IACH,yBAAyB,EAAE,eAAe,CAAC;IAE3C;;OAEG;IACH,sCAAsC,EAAE,eAAe,CAAC;IAExD;;OAEG;IACH,qCAAqC,EAAE,eAAe,CAAC;IAEvD;;OAEG;IACH,CAAC,IAAI,EAAE,MAAM,GAAG,eAAe,CAAC;CACjC,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,eAAO,MAAM,gBAAgB,yFAGnB,OAAO,CAAC,gBAAgB,CAAC,MAC3B,MAAM,YACD,oBAAoB,KAC5B,OAAO,CAAC,gBAAgB,CAAC,CAkC7B,CAAC"}
+{"version":3,"file":"permission-groups.d.ts","sourceRoot":"","sources":["../../src/cloudflare/permission-groups.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAuB,KAAK,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAE1E;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B;;OAEG;IACH,EAAE,EAAE,MAAM,CAAC;IAEX;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB;AAYD,MAAM,MAAM,mBAAmB,GAAG,kBAAkB,CAAC;AAErD,MAAM,MAAM,kBAAkB,GAC1B,0BAA0B,GAC1B,yBAAyB,GACzB,sCAAsC,GACtC,qCAAqC,CAAC;AAE1C;;;;GAIG;AACH,MAAM,MAAM,gBAAgB,GAAG,QAAQ,CAAC,8BAA8B,CAAC,GAAG;IACxE;;;OAGG;IACH,0BAA0B,EAAE,eAAe,CAAC;IAE5C;;;OAGG;IACH,yBAAyB,EAAE,eAAe,CAAC;IAE3C;;OAEG;IACH,sCAAsC,EAAE,eAAe,CAAC;IAExD;;OAEG;IACH,qCAAqC,EAAE,eAAe,CAAC;IAEvD;;OAEG;IACH,CAAC,IAAI,EAAE,MAAM,GAAG,eAAe,CAAC;CACjC,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,eAAO,MAAM,gBAAgB,yFAGnB,OAAO,CAAC,gBAAgB,CAAC,MAC3B,MAAM,YACD,oBAAoB,KAC5B,OAAO,CAAC,gBAAgB,CAAC,CAkC7B,CAAC"}

package/lib/cloudflare/permission-groups.js.map

@@ -1 +1 @@
-{"version":3,"file":"permission-groups.js","sourceRoot":"","sources":["../../src/cloudflare/permission-groups.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,mBAAmB,EAA6B,MAAM,UAAU,CAAC;AAkE1E;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,QAAQ,CACtC,8BAA8B,EAC9B,KAAK,WAEH,EAAU,EACV,UAAgC,EAAE;IAElC,8CAA8C;IAC9C,IAAI,IAAI,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC5B,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC;IACxB,CAAC;IAED,wBAAwB;IACxB,MAAM,GAAG,GAAG,MAAM,mBAAmB,CAAC,OAAO,CAAC,CAAC;IAE/C,8CAA8C;IAC9C,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,GAAG,CAC5B,aAAa,GAAG,CAAC,SAAS,2BAA2B,CACtD,CAAC;IAEF,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QACjB,MAAM,IAAI,KAAK,CACb,sCAAsC,QAAQ,CAAC,UAAU,EAAE,CAC5D,CAAC;IACJ,CAAC;IAED,MAAM,IAAI,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAA6B,CAAC;IAEjE,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;QAClC,MAAM,IAAI,KAAK,CACb,uBAAuB,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,IAAI,eAAe,EAAE,CACtE,CAAC;IACJ,CAAC;IAED,OAAO,IAAI,CACT,MAAM,CAAC,WAAW,CAChB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAC5B,CACtB,CAAC;AACJ,CAAC,CACF,CAAC"}
+{"version":3,"file":"permission-groups.js","sourceRoot":"","sources":["../../src/cloudflare/permission-groups.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,mBAAmB,EAA6B,MAAM,UAAU,CAAC;AA0E1E;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,QAAQ,CACtC,8BAA8B,EAC9B,KAAK,WAEH,EAAU,EACV,UAAgC,EAAE;IAElC,8CAA8C;IAC9C,IAAI,IAAI,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC5B,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC;IACxB,CAAC;IAED,wBAAwB;IACxB,MAAM,GAAG,GAAG,MAAM,mBAAmB,CAAC,OAAO,CAAC,CAAC;IAE/C,8CAA8C;IAC9C,MAAM,QAAQ,GAAG,MAAM,GAAG,CAAC,GAAG,CAC5B,aAAa,GAAG,CAAC,SAAS,2BAA2B,CACtD,CAAC;IAEF,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QACjB,MAAM,IAAI,KAAK,CACb,sCAAsC,QAAQ,CAAC,UAAU,EAAE,CAC5D,CAAC;IACJ,CAAC;IAED,MAAM,IAAI,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAA6B,CAAC;IAEjE,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;QAClC,MAAM,IAAI,KAAK,CACb,uBAAuB,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,IAAI,eAAe,EAAE,CACtE,CAAC;IACJ,CAAC;IAED,OAAO,IAAI,CACT,MAAM,CAAC,WAAW,CAChB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAC5B,CACtB,CAAC;AACJ,CAAC,CACF,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alchemy",
-  "version": "0.15.11",
+  "version": "0.15.12",
   "type": "module",
   "module": "./lib/index.js",
   "scripts": {

package/src/cloudflare/account-api-token.ts

@@ -3,12 +3,16 @@ import type { Context } from "../context.js";
 import { Resource } from "../resource.js";
 import type { Secret } from "../secret.js";
 import { sha256 } from "../util/sha256.js";
-import { type CloudflareApiOptions, createCloudflareApi } from "./api.js";
+import { createCloudflareApi, type CloudflareApiOptions } from "./api.js";
+import {
+  PermissionGroups,
+  type PermissionGroupName,
+} from "./permission-groups.js";
 
 /**
  * Permission group for a token policy
  */
-export interface TokenPolicyPermissionGroup {
+export type TokenPolicyPermissionGroup = {
   /**
    * ID of the permission group
    */
@@ -18,7 +22,7 @@ export interface TokenPolicyPermissionGroup {
    * Optional metadata for the permission group
    */
   meta?: Record<string, any>;
-}
+};
 
 /**
  * Policy that defines what the token can access
@@ -32,14 +36,27 @@ export interface TokenPolicy {
   /**
    * Permission groups to include in the policy
    */
-  permissionGroups: TokenPolicyPermissionGroup[];
+  permissionGroups: (PermissionGroupName | TokenPolicyPermissionGroup)[];
 
   /**
    * Resources the policy applies to
    */
-  resources: Record<string, string>;
+  resources: {
+    [key in TokenPolicyResourceKey]?: string;
+  };
 }
 
+/**
+ * @see https://developers.cloudflare.com/fundamentals/api/reference/permissions/
+ */
+type TokenPolicyResourceKey =
+  | `com.cloudflare.api.account`
+  | `com.cloudflare.api.account.${string}`
+  // | `com.cloudflare.api.account.zone`
+  | `com.cloudflare.api.account.zone.${string}`
+  // | `com.cloudflare.api.user`
+  | `com.cloudflare.api.user.${string}`;
+
 /**
  * Condition for token usage (e.g., IP restrictions)
  */
@@ -120,8 +137,7 @@ interface CloudflareApiToken {
  * Output returned after Account API Token creation/update
  */
 export interface AccountApiToken
-  extends Resource<"cloudflare::AccountApiToken">,
-    AccountApiTokenProps {
+  extends Resource<"cloudflare::AccountApiToken"> {
   /**
    * The ID of the token
    *
@@ -129,6 +145,11 @@ export interface AccountApiToken
    */
   id: string;
 
+  /**
+   * Name of the token
+   */
+  name: string;
+
   /**
    * Status of the token
    */
@@ -147,7 +168,7 @@ export interface AccountApiToken
    *
    * An alias of {@link id}
    */
-  accessKeyId: string;
+  accessKeyId: Secret;
 
   /**
    * Secret access key for the token
@@ -156,7 +177,7 @@ export interface AccountApiToken
    *
    * @see https://developers.cloudflare.com/r2/api/tokens/#get-s3-api-credentials-from-an-api-token
    */
-  secretAccessKey: string;
+  secretAccessKey: Secret;
 }
 
 /**
@@ -169,21 +190,13 @@ export interface AccountApiToken
  * @see https://developers.cloudflare.com/api/resources/accounts/subresources/tokens/methods/create/
  *
  * @example
- * // First, fetch all permission groups
- * const permissions = await PermissionGroups("cloudflare-permissions", {
- *   accountId: cfAccountId,
- * });
- *
  * // Create a token with read-only permissions for specific zones
  * const readOnlyToken = await AccountApiToken("readonly-token", {
  *   name: "Readonly Zone Token",
  *   policies: [
  *     {
  *       effect: "allow",
- *       permissionGroups: [
- *         { id: permissions["Zone Read"].id },
- *         { id: permissions["Analytics Read"].id }
- *       ],
+ *       permissionGroups: ["Zone Read", "Analytics Read"],
  *       resources: {
  *         "com.cloudflare.api.account.zone.22b1de5f1c0e4b3ea97bb1e963b06a43": "*",
  *         "com.cloudflare.api.account.zone.eb78d65290b24279ba6f44721b3ea3c4": "*"
@@ -200,9 +213,7 @@ export interface AccountApiToken
  *   policies: [
  *     {
  *       effect: "allow",
- *       permissionGroups: [
- *         { id: permissions["Worker Routes Edit"].id }
- *       ],
+ *       permissionGroups: ["Worker Routes Edit"],
  *       resources: {
  *         "com.cloudflare.api.account.worker.route.*": "*"
  *       }
@@ -217,6 +228,21 @@ export interface AccountApiToken
  *     }
  *   }
  * });
+ *
+ * @example
+ * // Create a token with bucket access permissions
+ * const storageToken = await AccountApiToken("account-access-token", {
+ *   name: "alchemy-account-access-token",
+ *   policies: [
+ *     {
+ *       effect: "allow",
+ *       permissionGroups: ["Workers R2 Storage Write"],
+ *       resources: {
+ *         "com.cloudflare.api.account": "*",
+ *       },
+ *     },
+ *   ],
+ * });
  */
 export const AccountApiToken = Resource(
   "cloudflare::AccountApiToken",
@@ -251,16 +277,34 @@ export const AccountApiToken = Resource(
       return this.destroy();
     }
 
+    const permissionGroups = await PermissionGroups(
+      "cloudflare-permission-groups",
+      props,
+    );
+
     // Transform our properties to API format
     const apiPayload = {
       name: props.name,
       policies: props.policies.map((policy) => ({
         effect: policy.effect,
-        permission_groups: policy.permissionGroups.map((pg) => ({
-          id: pg.id,
-          meta: pg.meta || {},
-        })),
-        resources: policy.resources,
+        permission_groups: policy.permissionGroups.map((pg) =>
+          typeof pg === "string"
+            ? {
+                id: permissionGroups[pg].id,
+              }
+            : {
+                id: pg.id,
+                meta: pg.meta || {},
+              },
+        ),
+        resources: Object.fromEntries(
+          Object.entries(policy.resources).map(([key, value]) => {
+            if (key === "com.cloudflare.api.account") {
+              return [`com.cloudflare.api.account.${api.accountId}`, value];
+            }
+            return [key, value];
+          }),
+        ),
       })),
       // Format dates for Cloudflare API (removing milliseconds)
       ...(props.expiresOn
@@ -339,14 +383,6 @@ export const AccountApiToken = Resource(
       id: tokenData.id,
       name: tokenData.name,
       status: tokenData.status,
-      policies: tokenData.policies.map((policy) => ({
-        effect: policy.effect,
-        permissionGroups: policy.permission_groups.map((pg) => ({
-          id: pg.id,
-          meta: pg.meta,
-        })),
-        resources: policy.resources,
-      })),
       ...(tokenData.expires_on ? { expiresOn: tokenData.expires_on } : {}),
       ...(tokenData.not_before ? { notBefore: tokenData.not_before } : {}),
       ...(tokenData.condition
@@ -362,8 +398,8 @@ export const AccountApiToken = Resource(
           }
         : {}),
       value: tokenValue,
-      accessKeyId: tokenData.id,
-      secretAccessKey: sha256(tokenValue.unencrypted),
+      accessKeyId: alchemy.secret(tokenData.id),
+      secretAccessKey: alchemy.secret(sha256(tokenValue.unencrypted)),
     });
   },
 );

package/src/cloudflare/permission-groups.ts

@@ -32,6 +32,14 @@ interface PermissionGroupsResponse {
   messages: any[];
 }
 
+export type PermissionGroupName = R2PermissionGroups;
+
+export type R2PermissionGroups =
+  | "Workers R2 Storage Write"
+  | "Workers R2 Storage Read"
+  | "Workers R2 Storage Bucket Item Write"
+  | "Workers R2 Storage Bucket Item Read";
+
 /**
  * All Cloudflare permission groups mapped by name to ID
  *