alchemy 0.62.3 → 0.63.0

package/src/cloudflare/pipeline.ts

@@ -183,7 +183,7 @@ export interface PipelineProps extends CloudflareApiOptions {
   /**
    * Name of the pipeline
    *
-   * @default id
+   * @default ${app}-${stage}-${id}
    */
   name?: string;
 
@@ -236,34 +236,34 @@ export function isPipeline(resource: Resource): resource is Pipeline {
 /**
  * Output returned after Pipeline creation/update
  */
-export interface Pipeline<_T extends PipelineRecord = PipelineRecord>
-  extends Resource<"cloudflare::Pipeline">,
-    PipelineProps {
-  /**
-   * Type identifier for the Pipeline resource
-   */
-  type: "pipeline";
-
-  /**
-   * The unique ID of the pipeline
-   */
-  id: string;
+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;
 
-  /**
-   * The name of the pipeline
-   */
-  name: string;
+      /**
+       * The name of the pipeline
+       */
+      name: string;
 
-  /**
-   * HTTP endpoint URL for the pipeline
-   */
-  endpoint: string;
+      /**
+       * HTTP endpoint URL for the pipeline
+       */
+      endpoint: string;
 
-  /**
-   * Version of the pipeline
-   */
-  version: number;
-}
+      /**
+       * Version of the pipeline
+       */
+      version: number;
+    };
 
 /**
  * Creates and manages Cloudflare Pipelines.
@@ -337,7 +337,8 @@ export const Pipeline = Resource("cloudflare::Pipeline", async function <
   Pipeline<T>
 > {
   const api = await createCloudflareApi(props);
-  const pipelineName = props.name ?? id;
+  const pipelineName =
+    props.name ?? this.output?.name ?? this.scope.createPhysicalName(id);
 
   if (this.scope.local && !props.dev?.remote) {
     return this({
@@ -353,6 +354,10 @@ export const Pipeline = Resource("cloudflare::Pipeline", async function <
     });
   }
 
+  if (this.phase === "update" && this.output?.name !== pipelineName) {
+    await renamePipeline(api, this.output.name, pipelineName);
+  }
+
   if (this.phase === "delete") {
     if (props.delete !== false) {
       // Delete Pipeline
@@ -377,7 +382,7 @@ export const Pipeline = Resource("cloudflare::Pipeline", async function <
           (error.status === 400 &&
             error.message.includes("Pipeline with this name already exists")))
       ) {
-        if (props.adopt) {
+        if (props.adopt ?? this.scope.adopt) {
           console.warn(
             "Pipeline already exists, adopting existing Cloudflare Pipeline:",
             pipelineName,
@@ -580,6 +585,49 @@ export async function updatePipeline(
   return (await updateResponse.json()) as CloudflarePipelineResponse;
 }
 
+/**
+ * Rename a pipeline
+ *
+ * @param api - Cloudflare API instance
+ * @param currentName - Current name of the pipeline
+ * @param newName - New name for the pipeline
+ * @returns Updated pipeline response with the new name
+ *
+ * @see https://developers.cloudflare.com/api/resources/pipelines/methods/update/
+ */
+export async function renamePipeline(
+  api: CloudflareApi,
+  currentName: string,
+  newName: string,
+): Promise<CloudflarePipelineResponse> {
+  // Get the current pipeline configuration
+  const currentPipeline = await getPipeline(api, currentName);
+
+  // Build the update payload with the new name
+  const updatePayload = {
+    name: newName,
+    source: currentPipeline.result.source,
+    destination: currentPipeline.result.destination,
+  };
+
+  // Use the update endpoint with the current name in the path and new name in the body
+  const updateResponse = await api.put(
+    `/accounts/${api.accountId}/pipelines/${currentName}`,
+    updatePayload,
+  );
+
+  if (!updateResponse.ok) {
+    return await handleApiError(
+      updateResponse,
+      "renaming",
+      "Pipeline",
+      `${currentName} -> ${newName}`,
+    );
+  }
+
+  return (await updateResponse.json()) as CloudflarePipelineResponse;
+}
+
 /**
  * Helper function to prepare pipeline payload for create/update operations
  */

package/src/cloudflare/queue-consumer.ts

@@ -200,7 +200,7 @@ export const QueueConsumer = Resource(
           err instanceof CloudflareApiError &&
           err.status === 400 &&
           err.message.includes("already has a consumer") &&
-          props.adopt
+          (props.adopt ?? this.scope.adopt)
         ) {
           const consumerId = await findQueueConsumerId(
             api,

package/src/cloudflare/queue.ts

@@ -40,7 +40,7 @@ export interface QueueProps extends CloudflareApiOptions {
    * Required during creation
    * Cannot be changed after creation
    *
-   * @default id
+   * @default ${app}-${stage}-${id}
    */
   name?: string;
 
@@ -248,7 +248,9 @@ const _Queue = Resource("cloudflare::Queue", async function <
 >(this: Context<Queue<T>>, id: string, props: QueueProps = {}): Promise<
   Queue<T>
 > {
-  const queueName = props.name ?? id;
+  const queueName =
+    props.name ?? this.output?.name ?? this.scope.createPhysicalName(id);
+
   const dev = {
     id: this.output?.dev?.id ?? this.output?.id ?? id,
     remote: props.dev?.remote ?? false,
@@ -285,7 +287,7 @@ const _Queue = Resource("cloudflare::Queue", async function <
       queueData = await createQueue(api, queueName, props);
     } catch (error) {
       if (error instanceof CloudflareApiError && error.status === 409) {
-        if (!props.adopt) {
+        if (!(props.adopt ?? this.scope.adopt)) {
           throw error;
         }
         // Queue already exists, try to find it by name
@@ -296,7 +298,10 @@ const _Queue = Resource("cloudflare::Queue", async function <
           );
         }
         queueData = existingQueue;
-        queueData = await updateQueue(api, queueData.result.queue_id!, props);
+        queueData = await updateQueue(api, queueData.result.queue_id!, {
+          ...props,
+          name: queueName,
+        });
       } else {
         throw error;
       }
@@ -304,15 +309,11 @@ const _Queue = Resource("cloudflare::Queue", async function <
   } else {
     // Update operation
     if (this.output?.id) {
-      // Check if name is being changed, which is not allowed
-      if (queueName !== this.output.name) {
-        throw new Error(
-          `Cannot update Queue name after creation. Queue name is immutable. Before: ${this.output.name}, After: ${queueName}`,
-        );
-      }
-
       // Update the queue with new settings
-      queueData = await updateQueue(api, this.output.id, props);
+      queueData = await updateQueue(api, this.output.id, {
+        ...props,
+        name: queueName,
+      });
     } else {
       // If no ID exists, fall back to creating a new queue
       queueData = await createQueue(api, queueName, props);
@@ -452,10 +453,21 @@ export async function deleteQueue(
 export async function updateQueue(
   api: CloudflareApi,
   queueId: string,
-  props: QueueProps,
+  props: QueueProps & {
+    name: string;
+  },
 ): Promise<CloudflareQueueResponse> {
   // Prepare the update payload - only include settings
-  const updatePayload: any = {};
+  const updatePayload: {
+    queue_name?: string;
+    settings?: {
+      delivery_delay?: number;
+      delivery_paused?: boolean;
+      message_retention_period?: number;
+    };
+  } = {
+    queue_name: props.name,
+  };
 
   // Add settings if provided
   if (props.settings) {

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

@@ -1,3 +1,4 @@
+import path from "node:path";
 import { getPackageManagerRunner } from "../../util/detect-package-manager.ts";
 import type { Assets } from "../assets.ts";
 import type { Bindings } from "../bindings.ts";
@@ -21,6 +22,8 @@ export async function ReactRouter<B extends Bindings>(
   props: ReactRouterProps<B> = {},
 ): Promise<ReactRouter<B>> {
   const runner = await getPackageManagerRunner();
+  const cwd = path.resolve(props.cwd ?? process.cwd());
+  const ssr = await detectSSREnabled(cwd);
   return await Vite(id, {
     ...props,
     build:
@@ -29,13 +32,36 @@ export async function ReactRouter<B extends Bindings>(
     dev:
       props.dev ??
       `${runner} react-router typegen && ${runner} react-router dev`,
+    spa: !ssr,
     compatibility: "node",
-    entrypoint: props.entrypoint ?? "build/server/index.js",
+    entrypoint: props.entrypoint ?? (ssr ? "build/server/index.js" : undefined),
     noBundle: props.noBundle ?? true,
     assets: props.assets ?? "build/client",
     wrangler: {
-      main: props.wrangler?.main ?? props.main ?? "workers/app.ts",
+      main:
+        props.wrangler?.main ??
+        props.main ??
+        (ssr ? "workers/app.ts" : undefined),
       transform: props.wrangler?.transform,
     },
   });
 }
+
+/**
+ * Detect if SSR is enabled by checking for an `ssr` property in `react-router.config.ts`.
+ * If no config is found or if there is no `ssr` property, default to true in line with React Router's default behavior.
+ * @see https://reactrouter.com/api/framework-conventions/react-router.config.ts
+ */
+async function detectSSREnabled(cwd: string): Promise<boolean> {
+  const candidates = [
+    "react-router.config.ts",
+    "react-router.config.mts",
+    "react-router.config.mjs",
+    "react-router.config.js",
+  ];
+  const configs = await Promise.allSettled(
+    candidates.map((candidate) => import(path.join(cwd, candidate))),
+  );
+  const config = configs.find((result) => result.status === "fulfilled")?.value;
+  return config?.default?.ssr !== false;
+}

package/src/cloudflare/redwood/plugin.ts

@@ -1,15 +1,16 @@
 import { redwood, type RedwoodPluginOptions } from "rwsdk/vite";
+import type { PluginOption } from "vite";
 import { DEFAULT_CONFIG_PATH } from "../miniflare/paths.ts";
 import alchemyVite from "../vite/plugin.ts";
 
-const alchemyRedwood = (options?: RedwoodPluginOptions) => {
+const alchemyRedwood = (options?: RedwoodPluginOptions): PluginOption => {
   const configPath = options?.configPath ?? DEFAULT_CONFIG_PATH;
   return [
     redwood({
       ...options,
       configPath,
       includeCloudflarePlugin: false,
-    }),
+    }) as PluginOption,
     alchemyVite({
       configPath,
       viteEnvironment: { name: "worker" },

package/src/cloudflare/route.ts

@@ -211,7 +211,7 @@ export const Route = Resource(
       } catch (error) {
         // Check if this is a "route already exists" error and adopt is enabled
         if (
-          props.adopt &&
+          (props.adopt ?? this.scope.adopt) &&
           error instanceof CloudflareApiError &&
           error.status === 409
         ) {

package/src/cloudflare/ruleset.ts

@@ -32,6 +32,8 @@ export interface RulesetProps<Phase extends RulePhase>
 
   /**
    * Human-readable name for the ruleset
+   *
+   * @default ${app}-${stage}-${id}
    */
   name?: string;
 
@@ -152,7 +154,7 @@ export interface Ruleset<Phase extends RulePhase>
  */
 export const Ruleset = Resource("cloudflare::Ruleset", async function <
   Phase extends RulePhase,
->(this: Context<Ruleset<Phase>>, _id: string, props: RulesetProps<Phase>): Promise<
+>(this: Context<Ruleset<Phase>>, id: string, props: RulesetProps<Phase>): Promise<
   Ruleset<Phase>
 > {
   const api = await createCloudflareApi(props);
@@ -172,10 +174,13 @@ export const Ruleset = Resource("cloudflare::Ruleset", async function <
     return this.destroy();
   }
 
+  const rulesetName =
+    props.name ?? this.output?.name ?? this.scope.createPhysicalName(id);
+
   // Overwrite entire entrypoint with only the provided rules
   const result = await updateRuleset(api, zoneId, phase, {
     rules: props.rules,
-    ...(props.name && { name: props.name }),
+    name: rulesetName,
     ...(props.description && { description: props.description }),
   });
 

package/src/cloudflare/secret.ts

@@ -13,41 +13,21 @@ import {
 import { findSecretsStoreByName, SecretsStore } from "./secrets-store.ts";
 
 /**
- * Properties for creating or updating a Secret in a Secrets Store (internal interface)
+ * Properties for creating or updating a Secret in a Secrets Store (public interface)
  */
-interface _SecretProps extends CloudflareApiOptions {
+export interface SecretProps extends CloudflareApiOptions {
   /**
-   * The secrets store to add this secret to
+   * Name for the Secret.
    *
-   * @default - the default-secret-store
-   */
-  store?: SecretsStore<any>;
-
-  /**
-   * The secret value to store (must be an AlchemySecret for security)
+   * @default ${app}-${stage}-${id}
    */
-  value: AlchemySecret;
-
-  /**
-   * Whether to delete the secret.
-   * If set to false, the secret will remain but the resource will be removed from state
-   *
-   * @default true
-   */
-  delete?: boolean;
-}
-
-/**
- * Properties for creating or updating a Secret in a Secrets Store (public interface)
- */
-export interface SecretProps extends CloudflareApiOptions {
+  name?: string;
   /**
    * The secrets store to add this secret to
    *
    * @default - the default-secret-store
    */
   store?: SecretsStore<any>;
-
   /**
    * The secret value to store
    * Can be a string or an existing Secret instance
@@ -76,7 +56,7 @@ export function isSecret(resource: Resource): resource is Secret {
 }
 
 export type Secret = Resource<"cloudflare::Secret"> &
-  Omit<_SecretProps, "delete"> & {
+  Omit<SecretProps, "delete" | "value"> & {
     /**
      * The binding type for Cloudflare Workers
      */
@@ -177,11 +157,20 @@ const _Secret = Resource(
   "cloudflare::Secret",
   async function (
     this: Context<Secret>,
-    name: string,
-    props: _SecretProps,
+    id: string,
+    props: SecretProps & {
+      value: AlchemySecret;
+    },
   ): Promise<Secret> {
     const api = await createCloudflareApi(props);
 
+    const secretName =
+      props.name ?? this.output?.name ?? this.scope.createPhysicalName(id);
+
+    if (this.phase === "update" && this.output.name !== secretName) {
+      this.replace();
+    }
+
     const storeId =
       props.store?.id ??
       (await findSecretsStoreByName(api, SecretsStore.Default))?.id ??
@@ -195,7 +184,7 @@ const _Secret = Resource(
 
     if (this.phase === "delete") {
       if (props.delete !== false) {
-        await deleteSecret(api, storeId, name);
+        await deleteSecret(api, storeId, secretName);
       }
       return this.destroy();
     }
@@ -206,11 +195,11 @@ const _Secret = Resource(
         : Date.now();
 
     // Insert or update the secret
-    await insertSecret(api, storeId, name, props.value);
+    await insertSecret(api, storeId, secretName, props.value);
 
     return this({
       type: "secrets_store_secret",
-      name,
+      name: secretName,
       storeId,
       store: props.store,
       value: props.value,

package/src/cloudflare/secrets-store.ts

@@ -17,7 +17,7 @@ export interface SecretsStoreProps<
   /**
    * Name of the secrets store
    *
-   * @default id
+   * @default ${app}-${stage}-${id}
    */
   name?: string;
 
@@ -179,7 +179,11 @@ const _SecretsStore = Resource("cloudflare::SecretsStore", async function <
 > {
   const api = await createCloudflareApi(props);
 
-  const name = props.name ?? id;
+  const name = props.name ?? this.scope.createPhysicalName(id);
+
+  if (this.phase === "update" && this.output.name !== name) {
+    this.replace();
+  }
 
   if (this.phase === "delete") {
     const storeId = this.output?.id;
@@ -209,7 +213,7 @@ const _SecretsStore = Resource("cloudflare::SecretsStore", async function <
     await insertSecrets(api, storeId, props);
   } else {
     // If adopt is true, first check if a store with this name already exists
-    if (props.adopt) {
+    if (props.adopt ?? this.scope.adopt) {
       const existingStore = await findSecretsStoreByName(api, name);
 
       if (existingStore) {

package/src/cloudflare/tunnel.ts

@@ -49,7 +49,7 @@ export interface TunnelProps extends CloudflareApiOptions {
    * Note: Tunnel names are immutable and cannot be changed after creation.
    * When updating a tunnel, any name change will be ignored.
    *
-   * @default id
+   * @default ${app}-${stage}-${id}
    */
   name?: string;
 
@@ -274,6 +274,11 @@ export function isTunnel(resource: Resource): resource is Tunnel {
 export interface Tunnel
   extends Resource<"cloudflare::Tunnel">,
     Omit<TunnelProps, "delete" | "tunnelSecret"> {
+  /**
+   * The name of the tunnel
+   */
+  name: string;
+
   /**
    * The ID of the tunnel
    */
@@ -488,7 +493,13 @@ export const Tunnel = Resource(
     // Create Cloudflare API client with automatic account discovery
     const api = await createCloudflareApi(props);
 
-    const name = props.name ?? id;
+    const name =
+      props.name ?? this.output?.name ?? this.scope.createPhysicalName(id);
+
+    if (this.phase === "update" && this.output.name !== name) {
+      console.log("replacing tunnel", this.output.name, name);
+      this.replace(true);
+    }
 
     if (this.phase === "delete") {
       // For delete operations, check if the tunnel ID exists in the output

package/src/cloudflare/vectorize-index.ts

@@ -14,8 +14,10 @@ import {
 export interface VectorizeIndexProps extends CloudflareApiOptions {
   /**
    * Name of the index
+   *
+   * @default ${app}-${stage}-${id}
    */
-  name: string;
+  name?: string;
 
   /**
    * Optional description of the index
@@ -68,6 +70,11 @@ export interface VectorizeIndex
    */
   id: string;
 
+  /**
+   * Name of the Vectorize Index.
+   */
+  name: string;
+
   /**
    * Time at which the index was created
    */
@@ -121,7 +128,8 @@ export const VectorizeIndex = Resource(
     props: VectorizeIndexProps,
   ): Promise<VectorizeIndex> {
     const api = await createCloudflareApi(props);
-    const indexName = props.name || id;
+    const indexName =
+      props.name ?? this.output?.name ?? this.scope.createPhysicalName(id);
 
     if (this.phase === "delete") {
       logger.log("Deleting Vectorize index:", indexName);
@@ -145,7 +153,7 @@ export const VectorizeIndex = Resource(
       } catch (error) {
         // Check if this is a "index already exists" error and adopt is enabled
         if (
-          props.adopt &&
+          (props.adopt ?? this.scope.adopt) &&
           error instanceof CloudflareApiError &&
           error.message.includes("vectorize.index.duplicate_name")
         ) {
@@ -158,6 +166,9 @@ export const VectorizeIndex = Resource(
         }
       }
     } else {
+      if (this.output.name !== indexName) {
+        return this.replace();
+      }
       if (props.delete !== this.props.delete) {
         // Only allow changing the delete property
         if (!this.quiet) {

package/src/cloudflare/vite/plugin.ts

@@ -1,12 +1,13 @@
 import { cloudflare, type PluginConfig } from "@cloudflare/vite-plugin";
 import path from "node:path";
+import type { PluginOption } from "vite";
 import {
   DEFAULT_PERSIST_PATH,
   validateConfigPath,
   validatePersistPath,
 } from "../miniflare/paths.ts";
 
-const alchemy = (config?: PluginConfig) => {
+const alchemy = (config?: PluginConfig): PluginOption => {
   const persistState = config?.persistState ?? {
     path: validatePersistPath(
       typeof config?.persistState === "object"
@@ -24,7 +25,7 @@ const alchemy = (config?: PluginConfig) => {
     experimental: config?.experimental ?? {
       remoteBindings: true,
     },
-  });
+  }) as PluginOption;
 };
 
 export default alchemy;

package/src/cloudflare/website.ts

@@ -149,7 +149,7 @@ export async function Website<B extends Bindings>(
   props: WebsiteProps<B>,
 ) {
   const {
-    name = id,
+    name = Scope.current.createPhysicalName(id),
     build: buildProps,
     assets,
     dev,