alchemy 0.57.2 → 0.59.0

package/src/cloudflare/wrangler.json.ts

@@ -178,6 +178,7 @@ export const WranglerJson = Resource(
         worker.name,
         cwd,
         props.secrets ?? false,
+        this.scope.local && !props.worker.dev?.remote,
       );
     }
 
@@ -450,7 +451,11 @@ export interface WranglerJsonSpec {
   /**
    * Hyperdrive bindings
    */
-  hyperdrive?: { binding: string; id: string; localConnectionString: string }[];
+  hyperdrive?: {
+    binding: string;
+    id: string;
+    localConnectionString?: string;
+  }[];
 
   /**
    * Pipelines
@@ -500,6 +505,7 @@ function processBindings(
   workerName: string,
   workerCwd: string,
   writeSecrets: boolean,
+  local: boolean,
 ): void {
   // Arrays to collect different binding types
   const kvNamespaces: {
@@ -563,7 +569,7 @@ function processBindings(
   const hyperdrive: {
     binding: string;
     id: string;
-    localConnectionString: string;
+    localConnectionString?: string;
   }[] = [];
   const pipelines: { binding: string; pipeline: string }[] = [];
   const secretsStoreSecrets: {
@@ -624,7 +630,12 @@ function processBindings(
       });
     } else if (binding.type === "kv_namespace") {
       // KV Namespace binding
-      const id = "namespaceId" in binding ? binding.namespaceId : binding.id;
+      const id =
+        "dev" in binding && !binding.dev?.remote && local
+          ? binding.dev.id
+          : "namespaceId" in binding
+            ? binding.namespaceId
+            : binding.id;
       kvNamespaces.push({
         binding: bindingName,
         id: id,
@@ -651,10 +662,14 @@ function processBindings(
         new_classes.push(doBinding.className);
       }
     } else if (binding.type === "r2_bucket") {
+      const name =
+        "dev" in binding && !binding.dev?.remote && local
+          ? binding.dev.id
+          : binding.name;
       r2Buckets.push({
         binding: bindingName,
-        bucket_name: binding.name,
-        preview_bucket_name: binding.name,
+        bucket_name: name,
+        preview_bucket_name: name,
         ...(binding.dev?.remote ? { experimental_remote: true } : {}),
       });
     } else if (binding.type === "secret") {
@@ -673,18 +688,26 @@ function processBindings(
         script_name: binding.scriptName,
       });
     } else if (binding.type === "d1") {
+      const id =
+        "dev" in binding && !binding.dev?.remote && local
+          ? binding.dev.id
+          : binding.id;
       d1Databases.push({
         binding: bindingName,
-        database_id: binding.id,
+        database_id: id,
         database_name: binding.name,
         migrations_dir: binding.migrationsDir,
-        preview_database_id: binding.id,
+        preview_database_id: id,
         ...(binding.dev?.remote ? { experimental_remote: true } : {}),
       });
     } else if (binding.type === "queue") {
+      const id =
+        "dev" in binding && !binding.dev?.remote && local
+          ? binding.dev.id
+          : binding.id;
       queues.producers.push({
         binding: bindingName,
-        queue: binding.name,
+        queue: id,
       });
     } else if (binding.type === "vectorize") {
       vectorizeIndexes.push({
@@ -737,14 +760,12 @@ function processBindings(
         binding: bindingName,
       };
     } else if (binding.type === "hyperdrive") {
-      const password =
-        "password" in binding.origin
-          ? binding.origin.password.unencrypted
-          : binding.origin.access_client_secret.unencrypted;
       hyperdrive.push({
         binding: bindingName,
         id: binding.hyperdriveId,
-        localConnectionString: `${binding.origin.scheme || "postgres"}://${binding.origin.user}:${password}@${binding.origin.host}:${binding.origin.port || 5432}/${binding.origin.database}`,
+        localConnectionString: writeSecrets
+          ? binding.dev.origin.unencrypted
+          : undefined,
       });
     } else if (binding.type === "pipeline") {
       pipelines.push({

package/src/destroy.ts

@@ -175,18 +175,14 @@ export async function destroy<Type extends string>(
       }
     }
 
-    const destroyOptions = {
-      ...options,
-      strategy: instance[DestroyStrategy] ?? "sequential",
-    };
     if (nestedScope) {
-      await destroy(nestedScope, destroyOptions);
+      await destroy(nestedScope, {
+        ...options,
+        strategy: instance[DestroyStrategy] ?? "sequential",
+      });
     }
 
     if (options?.replace == null) {
-      if (nestedScope) {
-        await destroy(nestedScope, destroyOptions);
-      }
       await scope.deleteResource(instance[ResourceID]);
     } else {
       let pendingDeletions =

package/src/secret.ts

@@ -1,3 +1,4 @@
+import { inspect } from "node:util";
 import { alchemy } from "./alchemy.ts";
 
 declare global {
@@ -70,12 +71,40 @@ export class Secret<T = string> {
   ) {
     globalSecrets[name] = this;
   }
+
+  /**
+   * Ensures that a value is wrapped in a Secret.
+   */
+  static wrap<T>(value: T | Secret<T>): Secret<T> {
+    return isSecret<T>(value) ? value : new Secret(value);
+  }
+
+  /**
+   * Unwraps a Secret if it is wrapped, otherwise returns the value.
+   */
+  static unwrap<T, U = T>(value: T | Secret<U>): T | U {
+    return isSecret<U>(value) ? value.unencrypted : value;
+  }
+
+  /**
+   * Override toString to prevent accidental exposure of secret values
+   */
+  toString(): string {
+    return `Secret(${this.name ?? ""})`;
+  }
+
+  /**
+   * Custom inspect implementation for console.log to prevent exposing secrets
+   */
+  [inspect.custom](): string {
+    return this.toString();
+  }
 }
 
 /**
  * Type guard to check if a value is a Secret wrapper
  */
-export function isSecret(binding: any): binding is Secret {
+export function isSecret<T = string>(binding: any): binding is Secret<T> {
   return (
     binding instanceof Secret ||
     (typeof binding === "object" && binding?.type === "secret")

package/templates/astro/README.md

@@ -1,5 +1,7 @@
 # Astro Starter Kit: Basics
 
+[![Deployed with Alchemy](https://alchemy.run/alchemy-badge.svg)](https://alchemy.run)
+
 ```sh
 bun create astro@latest -- --template basics
 ```

package/templates/nuxt/README.md

@@ -1,5 +1,7 @@
 # Nuxt Minimal Starter
 
+[![Deployed with Alchemy](https://alchemy.run/alchemy-badge.svg)](https://alchemy.run)
+
 Look at the [Nuxt documentation](https://nuxt.com/docs/getting-started/introduction) to learn more.
 
 ## Setup

package/templates/react-router/README.md

@@ -1,5 +1,7 @@
 # Welcome to React Router!
 
+[![Deployed with Alchemy](https://alchemy.run/alchemy-badge.svg)](https://alchemy.run)
+
 A modern, production-ready template for building full-stack React applications using React Router.
 
 ## Features

package/templates/rwsdk/README.md

@@ -1,5 +1,7 @@
 # Standard RedwoodSDK Starter
 
+[![Deployed with Alchemy](https://alchemy.run/alchemy-badge.svg)](https://alchemy.run)
+
 This "standard starter" is the recommended implementation for RedwoodSDK. You get a Typescript project with:
 
 - Vite

package/templates/sveltekit/README.md

@@ -1,5 +1,7 @@
 # sv
 
+[![Deployed with Alchemy](https://alchemy.run/alchemy-badge.svg)](https://alchemy.run)
+
 Everything you need to build a Svelte project, powered by [`sv`](https://github.com/sveltejs/cli).
 
 ## Creating a project

package/templates/tanstack-start/README.md

@@ -1,5 +1,7 @@
 # Welcome to TanStack.com!
 
+[![Deployed with Alchemy](https://alchemy.run/alchemy-badge.svg)](https://alchemy.run)
+
 This site is built with TanStack Router!
 
 - [TanStack Router Docs](https://tanstack.com/router)

package/templates/typescript/README.md

@@ -1,5 +1,7 @@
 # my-alchemy-app
 
+[![Deployed with Alchemy](https://alchemy.run/alchemy-badge.svg)](https://alchemy.run)
+
 To install dependencies:
 
 ```bash

package/templates/vite/README.md

@@ -1,5 +1,7 @@
 # React + TypeScript + Vite
 
+[![Deployed with Alchemy](https://alchemy.run/alchemy-badge.svg)](https://alchemy.run)
+
 This template provides a minimal setup to get React working in Vite with HMR and some ESLint rules.
 
 Currently, two official plugins are available: