alchemy 0.67.0 → 0.68.0

package/src/cloudflare/permission-groups.ts

@@ -45,7 +45,7 @@ export type R2PermissionGroups =
  *
  * @see https://developers.cloudflare.com/r2/api/tokens/#permissions
  */
-export type PermissionGroups = Resource<"cloudflare::PermissionGroups"> & {
+export type PermissionGroups = {
   /**
    * Admin Read & Write - Allows create, list, delete buckets and edit bucket configurations
    * plus list, write, and read object access
@@ -140,10 +140,8 @@ export const PermissionGroups = Resource(
       );
     }
 
-    return this(
-      Object.fromEntries(
-        data.result.map((group) => [group.name, group]),
-      ) as PermissionGroups,
-    );
+    return Object.fromEntries(
+      data.result.map((group) => [group.name, group]),
+    ) as PermissionGroups;
   },
 );

package/src/cloudflare/pipeline.ts

@@ -229,41 +229,40 @@ export interface PipelineRecord {
   [key: string]: any;
 }
 
-export function isPipeline(resource: Resource): resource is Pipeline {
-  return resource[ResourceKind] === "cloudflare::Pipeline";
+export function isPipeline(resource: any): resource is Pipeline {
+  return resource?.[ResourceKind] === "cloudflare::Pipeline";
 }
 
 /**
  * Output returned after Pipeline creation/update
  */
 export type Pipeline<_T extends PipelineRecord = PipelineRecord> =
-  Resource<"cloudflare::Pipeline"> &
-    PipelineProps & {
-      /**
-       * Type identifier for the Pipeline resource
-       */
-      type: "pipeline";
-
-      /**
-       * The unique ID of the pipeline
-       */
-      id: string;
+  PipelineProps & {
+    /**
+     * Type identifier for the Pipeline resource
+     */
+    type: "pipeline";
 
-      /**
-       * The name of the pipeline
-       */
-      name: string;
+    /**
+     * The unique ID of the pipeline
+     */
+    id: string;
 
-      /**
-       * HTTP endpoint URL for the pipeline
-       */
-      endpoint: string;
+    /**
+     * The name of the pipeline
+     */
+    name: string;
 
-      /**
-       * Version of the pipeline
-       */
-      version: number;
-    };
+    /**
+     * HTTP endpoint URL for the pipeline
+     */
+    endpoint: string;
+
+    /**
+     * Version of the pipeline
+     */
+    version: number;
+  };
 
 /**
  * Creates and manages Cloudflare Pipelines.
@@ -341,7 +340,7 @@ export const Pipeline = Resource("cloudflare::Pipeline", async function <
     props.name ?? this.output?.name ?? this.scope.createPhysicalName(id);
 
   if (this.scope.local && !props.dev?.remote) {
-    return this({
+    return {
       type: "pipeline",
       id: this.output?.id ?? "",
       name: this.output?.name ?? pipelineName,
@@ -351,7 +350,7 @@ export const Pipeline = Resource("cloudflare::Pipeline", async function <
       destination: props.destination,
       compression: props.compression,
       accountId: this.output?.accountId ?? "",
-    });
+    };
   }
 
   if (this.phase === "update" && this.output?.name !== pipelineName) {
@@ -418,7 +417,7 @@ export const Pipeline = Resource("cloudflare::Pipeline", async function <
     }
   }
 
-  return this({
+  return {
     type: "pipeline",
     id: pipelineData.result.id,
     name: pipelineName,
@@ -433,7 +432,7 @@ export const Pipeline = Resource("cloudflare::Pipeline", async function <
     destination: props.destination, // Use the input destination, not the API response
     compression: props.compression,
     accountId: api.accountId,
-  });
+  };
 });
 
 interface CloudflarePipelineResponse {

package/src/cloudflare/queue-consumer.ts

@@ -96,9 +96,7 @@ export interface QueueConsumerProps extends CloudflareApiOptions {
 /**
  * Output returned after Queue Consumer creation/update
  */
-export interface QueueConsumer
-  extends Resource<"cloudflare::QueueConsumer">,
-    QueueConsumerProps {
+export interface QueueConsumer extends QueueConsumerProps {
   /**
    * Unique ID for the consumer
    */
@@ -162,7 +160,7 @@ export const QueueConsumer = Resource(
       typeof props.queue === "string" ? props.queue : props.queue.id;
 
     if (this.scope.local && props.dev) {
-      return this({
+      return {
         id: this.output?.id ?? "",
         queueId,
         queue: props.queue,
@@ -170,7 +168,7 @@ export const QueueConsumer = Resource(
         scriptName: props.scriptName,
         settings: props.settings,
         accountId: this.output?.accountId ?? "",
-      });
+      };
     }
 
     const api = await createCloudflareApi(props);
@@ -231,7 +229,7 @@ export const QueueConsumer = Resource(
       );
     }
 
-    return this({
+    return {
       id: consumerData.result.consumer_id,
       queueId,
       queue: props.queue,
@@ -249,7 +247,7 @@ export const QueueConsumer = Resource(
         : undefined,
       createdOn: consumerData.result.created_on,
       accountId: api.accountId,
-    });
+    };
   },
 );
 

package/src/cloudflare/queue.ts

@@ -100,56 +100,55 @@ export function isQueue(eventSource: any): eventSource is Queue {
 /**
  * Output returned after Cloudflare Queue creation/update
  */
-export type Queue<Body = unknown> = Resource<"cloudflare::Queue"> &
-  Omit<QueueProps, "dev"> & {
-    /**
-     * Type identifier for Cloudflare Queue
-     */
-    type: "queue";
+export type Queue<Body = unknown> = Omit<QueueProps, "dev"> & {
+  /**
+   * Type identifier for Cloudflare Queue
+   */
+  type: "queue";
 
-    /**
-     * The unique ID of the queue
-     */
-    id: string;
+  /**
+   * The unique ID of the queue
+   */
+  id: string;
 
-    /**
-     * The name of the queue
-     */
-    name: string;
+  /**
+   * The name of the queue
+   */
+  name: string;
 
-    /**
-     * Time when the queue was created
-     */
-    createdOn: string;
+  /**
+   * Time when the queue was created
+   */
+  createdOn: string;
 
-    /**
-     * Modified timestamp
-     */
-    modifiedOn: string;
+  /**
+   * Modified timestamp
+   */
+  modifiedOn: string;
 
+  /**
+   * Phantom property to allow type inference
+   */
+  Body: Body;
+
+  Batch: MessageBatch<Body>;
+
+  /**
+   * Development mode properties
+   * @internal
+   */
+  dev: {
     /**
-     * Phantom property to allow type inference
+     * The ID of the queue in development mode
      */
-    Body: Body;
-
-    Batch: MessageBatch<Body>;
+    id: string;
 
     /**
-     * Development mode properties
-     * @internal
+     * Whether the queue is running remotely
      */
-    dev: {
-      /**
-       * The ID of the queue in development mode
-       */
-      id: string;
-
-      /**
-       * Whether the queue is running remotely
-       */
-      remote: boolean;
-    };
+    remote: boolean;
   };
+};
 
 /**
  * Creates and manages Cloudflare Queues.
@@ -256,7 +255,7 @@ const _Queue = Resource("cloudflare::Queue", async function <
     remote: props.dev?.remote ?? false,
   };
   if (this.scope.local && !props.dev?.remote) {
-    return this({
+    return {
       type: "queue",
       id: this.output?.id ?? "",
       name: queueName,
@@ -265,7 +264,7 @@ const _Queue = Resource("cloudflare::Queue", async function <
       modifiedOn: this.output?.modifiedOn ?? new Date().toISOString(),
       Body: undefined as T,
       Batch: undefined! as MessageBatch<T>,
-    });
+    };
   }
 
   const api = await createCloudflareApi(props);
@@ -320,7 +319,7 @@ const _Queue = Resource("cloudflare::Queue", async function <
     }
   }
 
-  return this({
+  return {
     type: "queue",
     id: queueData.result.queue_id || "",
     name: queueName,
@@ -340,7 +339,7 @@ const _Queue = Resource("cloudflare::Queue", async function <
     // phantom properties
     Body: undefined as T,
     Batch: undefined! as MessageBatch<T>,
-  });
+  };
 });
 
 interface CloudflareQueueResponse {

package/src/cloudflare/react-router/plugin.ts

@@ -1,7 +1,27 @@
 import type { PluginConfig } from "@cloudflare/vite-plugin";
+import { existsSync, mkdirSync, writeFileSync } from "node:fs";
+import { dirname } from "node:path";
+import { getDefaultConfigPath } from "../miniflare/paths.ts";
 import alchemyVite from "../vite/plugin.ts";
 
 const alchemy = (config?: PluginConfig) => {
+  const configPath = config?.configPath ?? getDefaultConfigPath();
+  // react-router type generation requries a wrangler.json and creates a chicken and egg problem
+  // we create a dummy wrangler.json file so that clean builds can be performed
+  if (!existsSync(configPath)) {
+    mkdirSync(dirname(configPath), { recursive: true });
+    writeFileSync(
+      configPath,
+      JSON.stringify(
+        {
+          name: "dummy",
+          compatibility_date: "2025-09-23",
+        },
+        null,
+        2,
+      ),
+    );
+  }
   return alchemyVite({
     ...config,
     viteEnvironment: {

package/src/cloudflare/redirect-rule.ts

@@ -94,7 +94,7 @@ interface CloudflareRule {
 /**
  * Output returned after RedirectRule creation/update
  */
-export interface RedirectRule extends Resource<"cloudflare::RedirectRule"> {
+export interface RedirectRule {
   /**
    * The ID of the redirect rule
    */
@@ -263,7 +263,7 @@ export const RedirectRule = Resource(
         },
       );
 
-      return this({
+      return {
         ruleId: updatedRule.id,
         rulesetId: this.output.rulesetId,
         zoneId,
@@ -274,7 +274,7 @@ export const RedirectRule = Resource(
         preserveQueryString,
         enabled: updatedRule.enabled ?? true,
         lastUpdated: updatedRule.last_updated,
-      });
+      };
     }
 
     // Get or create the redirect ruleset for this zone
@@ -288,7 +288,7 @@ export const RedirectRule = Resource(
       preserveQueryString,
     });
 
-    return this({
+    return {
       ruleId: createdRule.id,
       rulesetId,
       zoneId,
@@ -299,7 +299,7 @@ export const RedirectRule = Resource(
       preserveQueryString,
       enabled: createdRule.enabled ?? true,
       lastUpdated: createdRule.last_updated,
-    });
+    };
   },
 );
 

package/src/cloudflare/route.ts

@@ -62,7 +62,7 @@ export interface RouteProps extends CloudflareApiOptions {
 /**
  * Output returned after Route creation/update
  */
-export interface Route extends Resource<"cloudflare::Route">, RouteProps {
+export interface Route extends RouteProps {
   /**
    * The unique ID of the route
    */
@@ -166,12 +166,12 @@ export const Route = Resource(
         zoneId = this.output?.zoneId ?? "noop-zone";
       }
 
-      return this({
+      return {
         id: this.output?.id ?? "noop-route",
         pattern: props.pattern,
         script: scriptName,
         zoneId: zoneId,
-      });
+      };
     }
 
     // Get or infer zone ID (only needed for create/update phases)
@@ -247,12 +247,12 @@ export const Route = Resource(
     }
 
     // Return the route resource
-    return this({
+    return {
       id: routeData.result.id,
       pattern: routeData.result.pattern,
       script: routeData.result.script,
       zoneId,
-    });
+    };
   },
 );
 

package/src/cloudflare/ruleset.ts

@@ -46,8 +46,7 @@ export interface RulesetProps<Phase extends RulePhase>
 /**
  * Output returned after Ruleset creation/update
  */
-export interface Ruleset<Phase extends RulePhase>
-  extends Resource<"cloudflare::Ruleset"> {
+export interface Ruleset<Phase extends RulePhase> {
   /**
    * The ID of the ruleset
    */
@@ -185,7 +184,7 @@ export const Ruleset = Resource("cloudflare::Ruleset", async function <
   });
 
   // Transform response back to our format
-  return this({
+  return {
     id: result.id,
     zoneId,
     phase: props.phase,
@@ -194,7 +193,7 @@ export const Ruleset = Resource("cloudflare::Ruleset", async function <
     rules: (result.rules as Array<Rule> | undefined) ?? [],
     lastUpdated: result.last_updated,
     version: result.version,
-  });
+  };
 });
 
 interface CloudflareApiRuleset {

package/src/cloudflare/secret.ts

@@ -51,42 +51,41 @@ export interface SecretProps extends CloudflareApiOptions {
   delete?: boolean;
 }
 
-export function isSecret(resource: Resource): resource is Secret {
-  return resource[ResourceKind] === "cloudflare::Secret";
+export function isSecret(resource: any): resource is Secret {
+  return resource?.[ResourceKind] === "cloudflare::Secret";
 }
 
-export type Secret = Resource<"cloudflare::Secret"> &
-  Omit<SecretProps, "delete" | "value"> & {
-    /**
-     * The binding type for Cloudflare Workers
-     */
-    type: "secrets_store_secret";
-
-    /**
-     * The name of the secret
-     */
-    name: string;
-
-    /**
-     * The unique identifier of the secrets store this secret belongs to
-     */
-    storeId: string;
-
-    /**
-     * The secret value (as an alchemy Secret instance)
-     */
-    value: AlchemySecret;
-
-    /**
-     * Timestamp when the secret was created
-     */
-    createdAt: number;
-
-    /**
-     * Timestamp when the secret was last modified
-     */
-    modifiedAt: number;
-  };
+export type Secret = Omit<SecretProps, "delete" | "value"> & {
+  /**
+   * The binding type for Cloudflare Workers
+   */
+  type: "secrets_store_secret";
+
+  /**
+   * The name of the secret
+   */
+  name: string;
+
+  /**
+   * The unique identifier of the secrets store this secret belongs to
+   */
+  storeId: string;
+
+  /**
+   * The secret value (as an alchemy Secret instance)
+   */
+  value: AlchemySecret;
+
+  /**
+   * Timestamp when the secret was created
+   */
+  createdAt: number;
+
+  /**
+   * Timestamp when the secret was last modified
+   */
+  modifiedAt: number;
+};
 
 /**
  * A Cloudflare Secret represents an individual secret stored in a Secrets Store.
@@ -197,7 +196,7 @@ const _Secret = Resource(
     // Insert or update the secret
     await insertSecret(api, storeId, secretName, props.value);
 
-    return this({
+    return {
       type: "secrets_store_secret",
       name: secretName,
       storeId,
@@ -205,7 +204,7 @@ const _Secret = Resource(
       value: props.value,
       createdAt,
       modifiedAt: Date.now(),
-    });
+    };
   },
 );
 

package/src/cloudflare/secrets-store.ts

@@ -54,16 +54,13 @@ export interface SecretsStoreProps<
   delete?: boolean;
 }
 
-export function isSecretsStore(
-  resource: Resource,
-): resource is SecretsStore<any> {
-  return resource[ResourceKind] === "cloudflare::SecretsStore";
+export function isSecretsStore(resource: any): resource is SecretsStore<any> {
+  return resource?.[ResourceKind] === "cloudflare::SecretsStore";
 }
 
 export interface SecretsStore<
   S extends Record<string, Secret> | undefined = undefined,
-> extends Resource<"cloudflare::SecretsStore">,
-    Omit<SecretsStoreProps<S>, "delete"> {
+> extends Omit<SecretsStoreProps<S>, "delete"> {
   /**
    * The unique identifier of the secrets store
    */
@@ -240,13 +237,13 @@ const _SecretsStore = Resource("cloudflare::SecretsStore", async function <
     await insertSecrets(api, storeId, props);
   }
 
-  return this({
+  return {
     id: storeId,
     name: name,
     secrets: props.secrets as S,
     createdAt: createdAt,
     modifiedAt: Date.now(),
-  });
+  };
 });
 
 export async function createSecretsStore<

package/src/cloudflare/tunnel.ts

@@ -264,16 +264,14 @@ export interface OriginRequestConfig {
   tcpKeepAliveInterval?: number;
 }
 
-export function isTunnel(resource: Resource): resource is Tunnel {
-  return resource[ResourceKind] === "cloudflare::Tunnel";
+export function isTunnel(resource: any): resource is Tunnel {
+  return resource?.[ResourceKind] === "cloudflare::Tunnel";
 }
 
 /**
  * Output returned after Tunnel creation/update
  */
-export interface Tunnel
-  extends Resource<"cloudflare::Tunnel">,
-    Omit<TunnelProps, "delete" | "tunnelSecret"> {
+export interface Tunnel extends Omit<TunnelProps, "delete" | "tunnelSecret"> {
   /**
    * The name of the tunnel
    */
@@ -667,7 +665,7 @@ export const Tunnel = Resource(
     }
 
     // Transform API response to our interface
-    return this({
+    return {
       tunnelId: tunnelData.id,
       accountTag: tunnelData.account_tag,
       name: tunnelData.name,
@@ -697,7 +695,7 @@ export const Tunnel = Resource(
       originRequest: props.originRequest,
       configSrc: props.configSrc,
       dnsRecords: Object.keys(dnsRecords).length > 0 ? dnsRecords : undefined,
-    });
+    };
   },
 );
 

package/src/cloudflare/user.ts

@@ -1,11 +1,9 @@
+import type { Credentials } from "../auth.ts";
 import type { Secret } from "../secret.ts";
 import { logger } from "../util/logger.ts";
 import { memoize } from "../util/memoize.ts";
 import { extractCloudflareResult } from "./api-response.ts";
-import {
-  getCloudflareAuthHeaders,
-  type CloudflareAuthOptions,
-} from "./auth.ts";
+import { CloudflareAuth } from "./auth.ts";
 
 export interface CloudflareAccount {
   name: string;
@@ -56,15 +54,20 @@ export interface CloudflareOrganization {
   roles: string[];
 }
 
-export const getCloudflareAccountId = memoize(
-  async (options: CloudflareAuthOptions): Promise<string> => {
-    const headers = await getCloudflareAuthHeaders(options);
-    const accounts = await extractCloudflareResult<CloudflareAccount[]>(
+export const listCloudflareAccounts = memoize(
+  async (credentials: Credentials): Promise<CloudflareAccount[]> => {
+    return await extractCloudflareResult<CloudflareAccount[]>(
       "get accounts for authorized user",
       fetch("https://api.cloudflare.com/client/v4/accounts", {
-        headers,
+        headers: CloudflareAuth.formatHeaders(credentials),
       }),
     );
+  },
+);
+
+export const getCloudflareAccountId = memoize(
+  async (credentials: Credentials): Promise<string> => {
+    const accounts = await listCloudflareAccounts(credentials);
     if (!accounts[0]) {
       throw new Error(
         "No accounts found for authorized user. Please make sure you're authenticated (see: https://alchemy.run/guides/cloudflare/) or explicitly set the Cloudflare Account ID (see: https://alchemy.run/guides/cloudflare/#account-id)",