alchemy 0.15.3 → 0.15.5

package/lib/serde.js

@@ -11,7 +11,7 @@ export async function serialize(scope, value, options) {
     if (Array.isArray(value)) {
         return Promise.all(value.map((value) => serialize(scope, value, options)));
     }
-    if (value instanceof Secret) {
+    else if (value instanceof Secret) {
         if (!scope.password) {
             throw new Error("Cannot serialize secret without password");
         }
@@ -21,26 +21,42 @@ export async function serialize(scope, value, options) {
                 : value.unencrypted,
         };
     }
-    if (isType(value)) {
+    else if (isType(value)) {
         return {
             "@schema": value.toJSON(),
         };
     }
-    if (value instanceof Date) {
+    else if (value instanceof Date) {
         return {
             "@date": value.toISOString(),
         };
     }
-    if (value instanceof Scope) {
-        return undefined;
+    else if (typeof value === "symbol") {
+        assertNotUniqueSymbol(value);
+        return {
+            "@symbol": value.toString(),
+        };
     }
-    if (value && typeof value === "object") {
-        return Object.fromEntries(await Promise.all(Object.entries(value).map(async ([key, value]) => [
-            key,
-            await serialize(scope, value, options),
+    else if (value instanceof Scope) {
+        return {
+            "@scope": null,
+        };
+    }
+    else if (value && typeof value === "object") {
+        for (const symbol of Object.getOwnPropertySymbols(value)) {
+            assertNotUniqueSymbol(symbol);
+        }
+        for (const key of Object.keys(value)) {
+            if (parseSymbol(key)) {
+                throw new Error(`Cannot serialize property '${key}' because it looks like a stringified symbol.`);
+            }
+        }
+        return Object.fromEntries(await Promise.all([...Object.getOwnPropertySymbols(value), ...Object.keys(value)].map(async (key) => [
+            key.toString(),
+            await serialize(scope, value[key], options),
         ])));
     }
-    if (typeof value === "function") {
+    else if (typeof value === "function") {
         // can't serialize functions
         return undefined;
     }
@@ -57,17 +73,37 @@ export async function deserialize(scope, value) {
             }
             return new Secret(await decryptWithKey(value["@secret"], scope.password));
         }
-        if ("@schema" in value) {
+        else if ("@schema" in value) {
             return value["@schema"];
         }
-        if ("@date" in value) {
+        else if ("@date" in value) {
             return new Date(value["@date"]);
         }
+        else if ("@symbol" in value) {
+            return parseSymbol(value["@symbol"]);
+        }
+        else if ("@scope" in value) {
+            return scope;
+        }
         return Object.fromEntries(await Promise.all(Object.entries(value).map(async ([key, value]) => [
-            key,
+            parseSymbol(key) ?? key,
             await deserialize(scope, value),
         ])));
     }
     return value;
 }
+const symbolPattern = /^Symbol\((.*)\)$/;
+function parseSymbol(value) {
+    const match = value.match(symbolPattern);
+    if (!match) {
+        return undefined;
+    }
+    return Symbol.for(match[1]);
+}
+function assertNotUniqueSymbol(symbol) {
+    if (symbol.description === undefined ||
+        symbol !== Symbol.for(symbol.description)) {
+        throw new Error(`Cannot serialize unique symbol: ${symbol.description}`);
+    }
+}
 //# sourceMappingURL=serde.js.map

package/lib/serde.js.map

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

package/package.json

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

package/src/cloudflare/bindings.ts

@@ -49,7 +49,11 @@ export type Binding =
   | VectorizeIndex
   | Worker
   | Workflow
-  | BrowserRendering;
+  | BrowserRendering
+  | Self;
+
+export type Self = typeof Self;
+export const Self = Symbol.for("Self");
 
 /**
  * Union type for all Worker binding types (API spec)

package/src/cloudflare/bound.ts

@@ -3,7 +3,7 @@ import type { Secret } from "../secret.js";
 import type { AiGateway as _AiGateway } from "./ai-gateway.js";
 import type { Ai as _Ai } from "./ai.js";
 import type { Assets } from "./assets.js";
-import type { Binding } from "./bindings.js";
+import type { Binding, Self } from "./bindings.js";
 import type { BrowserRendering } from "./browser-rendering.js";
 import type { R2Bucket as _R2Bucket } from "./bucket.js";
 import type { D1Database as _D1Database } from "./d1-database.js";
@@ -48,4 +48,6 @@ export type Bound<T extends Binding> = T extends _DurableObjectNamespace
                               ? Fetcher
                               : T extends _Ai<infer M>
                                 ? Ai<M>
-                                : Service;
+                                : T extends Self
+                                  ? Service
+                                  : Service;

package/src/cloudflare/worker.ts

@@ -13,7 +13,7 @@ import {
   createCloudflareApi,
 } from "./api.js";
 import type { Assets } from "./assets.js";
-import type { Bindings, WorkerBindingSpec } from "./bindings.js";
+import { type Bindings, Self, type WorkerBindingSpec } from "./bindings.js";
 import type { Bound } from "./bound.js";
 import { bundleWorkerScript } from "./bundle/bundle-worker.js";
 import type { DurableObjectNamespace } from "./durable-object-namespace.js";
@@ -207,7 +207,7 @@ export interface WorkerProps<B extends Bindings = Bindings>
  */
 export interface Worker<B extends Bindings = Bindings>
   extends Resource<"cloudflare::Worker">,
-    Omit<WorkerProps<B>, "url"> {
+    Omit<WorkerProps<B>, "url" | "script"> {
   type: "service";
 
   /**
@@ -358,143 +358,182 @@ export const Worker = Resource(
     id: string,
     props: WorkerProps<B>,
   ): Promise<Worker<B>> {
-    // Create Cloudflare API client with automatic account discovery
-    const api = await createCloudflareApi(props);
-
-    // Use the provided name
-    const workerName = props.name ?? id;
-
     // Validate input - we need either script, entryPoint, or bundle
     if (!props.script && !props.entrypoint) {
       throw new Error("One of script or entryPoint must be provided");
     }
 
-    if (this.phase === "delete") {
-      await deleteWorker(this, api, workerName);
-      return this.destroy();
-    }
-    if (this.phase === "create") {
-      if (!props.adopt) {
-        await assertWorkerDoesNotExist(this, api, workerName);
-      }
-    }
+    // Create Cloudflare API client with automatic account discovery
+    const api = await createCloudflareApi(props);
+
+    // Use the provided name
+    const workerName = props.name ?? id;
 
     const oldBindings = await this.get<Bindings>("bindings");
 
     const compatibilityDate = props.compatibilityDate ?? "2025-04-20";
     const compatibilityFlags = props.compatibilityFlags ?? [];
 
-    // Get the script content - either from props.script, or by bundling
-    const scriptContent =
-      props.script ??
-      (await bundleWorkerScript({
-        ...props,
-        compatibilityDate,
-        compatibilityFlags,
-      }));
-
-    // Find any assets bindings
-    const assetsBindings: { name: string; assets: Assets }[] = [];
-    const workflowsBindings: Workflow[] = [];
-
-    if (props.bindings) {
-      for (const [bindingName, binding] of Object.entries(props.bindings)) {
-        if (typeof binding === "object") {
-          if (binding.type === "assets") {
-            assetsBindings.push({ name: bindingName, assets: binding });
-          } else if (binding.type === "workflow") {
-            workflowsBindings.push(binding);
+    const uploadWorkerScript = async (props: WorkerProps<B>) => {
+      // Get the script content - either from props.script, or by bundling
+      const scriptContent =
+        props.script ??
+        (await bundleWorkerScript({
+          ...props,
+          compatibilityDate,
+          compatibilityFlags,
+        }));
+
+      // Find any assets bindings
+      const assetsBindings: { name: string; assets: Assets }[] = [];
+      const workflowsBindings: Workflow[] = [];
+
+      if (props.bindings) {
+        for (const [bindingName, binding] of Object.entries(props.bindings)) {
+          if (typeof binding === "object") {
+            if (binding.type === "assets") {
+              assetsBindings.push({ name: bindingName, assets: binding });
+            } else if (binding.type === "workflow") {
+              workflowsBindings.push(binding);
+            }
           }
         }
       }
-    }
 
-    // Upload any assets and get completion tokens
-    let assetUploadResult: AssetUploadResult | undefined;
-    if (assetsBindings.length > 0) {
-      // We'll use the first asset binding for now
-      // In the future, we might want to support multiple asset bindings
-      const assetBinding = assetsBindings[0];
+      // Upload any assets and get completion tokens
+      let assetUploadResult: AssetUploadResult | undefined;
+      if (assetsBindings.length > 0) {
+        // We'll use the first asset binding for now
+        // In the future, we might want to support multiple asset bindings
+        const assetBinding = assetsBindings[0];
+
+        // Upload the assets and get the completion token
+        assetUploadResult = await uploadAssets(
+          api,
+          workerName,
+          assetBinding.assets,
+          props.assets,
+        );
+      }
+
+      // Prepare metadata with bindings
+      const scriptMetadata = await prepareWorkerMetadata(
+        this,
+        oldBindings,
+        {
+          ...props,
+          compatibilityDate,
+          compatibilityFlags,
+          workerName,
+        },
+        assetUploadResult,
+      );
+
+      await putWorker(api, workerName, scriptContent, scriptMetadata);
+
+      for (const workflow of workflowsBindings) {
+        await upsertWorkflow(api, {
+          workflowName: workflow.workflowName,
+          className: workflow.className,
+          scriptName: workerName,
+        });
+      }
+
+      await Promise.all(
+        props.eventSources?.map((eventSource) => {
+          if (isQueue(eventSource) || isQueueEventSource(eventSource)) {
+            const queue = isQueue(eventSource)
+              ? eventSource
+              : eventSource.queue;
+            return QueueConsumer(`${queue.id}-consumer`, {
+              queue,
+              scriptName: workerName,
+              accountId: api.accountId,
+              settings: isQueueEventSource(eventSource)
+                ? eventSource.settings
+                : undefined,
+            });
+          }
+          throw new Error(`Unsupported event source type: ${eventSource}`);
+        }) ?? [],
+      );
 
-      // Upload the assets and get the completion token
-      assetUploadResult = await uploadAssets(
+      // TODO: it is less than ideal that this can fail, resulting in state problem
+      await this.set("bindings", props.bindings);
+
+      // Handle worker URL if requested
+      const workerUrl = await configureURL(
+        this,
         api,
         workerName,
-        assetBinding.assets,
-        props.assets,
+        props.url ?? false,
       );
-    }
 
-    // Prepare metadata with bindings
-    const scriptMetadata = await prepareWorkerMetadata(
-      this,
-      oldBindings,
-      {
-        ...props,
-        compatibilityDate,
-        compatibilityFlags,
-      },
-      assetUploadResult,
-    );
+      // Get current timestamp
+      const now = Date.now();
 
-    await putWorker(api, workerName, scriptContent, scriptMetadata);
-
-    for (const workflow of workflowsBindings) {
-      await upsertWorkflow(api, {
-        workflowName: workflow.workflowName,
-        className: workflow.className,
-        scriptName: workerName,
-      });
-    }
+      // Update cron triggers
+      if (props.crons) {
+        const res = await api.put(
+          `/accounts/${api.accountId}/workers/scripts/${workerName}/schedules`,
+          props.crons.map((cron) => ({ cron })),
+        );
 
-    await Promise.all(
-      props.eventSources?.map((eventSource) => {
-        if (isQueue(eventSource) || isQueueEventSource(eventSource)) {
-          const queue = isQueue(eventSource) ? eventSource : eventSource.queue;
-          return QueueConsumer(`${queue.id}-consumer`, {
-            queue,
-            scriptName: workerName,
-            accountId: api.accountId,
-            settings: isQueueEventSource(eventSource)
-              ? eventSource.settings
-              : undefined,
-          });
+        if (!res.ok) {
+          await handleApiError(
+            res,
+            "updating cron triggers",
+            "worker",
+            workerName,
+          );
         }
-        throw new Error(`Unsupported event source type: ${eventSource}`);
-      }) ?? [],
-    );
-
-    // TODO: it is less than ideal that this can fail, resulting in state problem
-    await this.set("bindings", props.bindings);
+      }
 
-    // Handle worker URL if requested
-    const workerUrl = await configureURL(
-      this,
-      api,
-      workerName,
-      props.url ?? false,
-    );
+      return { scriptMetadata, workerUrl, now };
+    };
 
-    // Get current timestamp
-    const now = Date.now();
+    if (this.phase === "delete") {
+      if (
+        Object.values(props.bindings ?? {}).some((binding) => binding === Self)
+      ) {
+        // remove the Self bindings or else we can't remove (LOL)
+        await uploadWorkerScript({
+          ...props,
+          bindings: Object.fromEntries(
+            Object.entries(props.bindings ?? {}).filter(
+              ([_, binding]) => binding !== Self,
+            ),
+          ) as B,
+        });
+      }
 
-    // Update cron triggers
-    if (props.crons) {
-      const res = await api.put(
-        `/accounts/${api.accountId}/workers/scripts/${workerName}/schedules`,
-        props.crons.map((cron) => ({ cron })),
+      await withExponentialBackoff(
+        () =>
+          deleteWorker(this, api, {
+            ...props,
+            workerName,
+          }),
+        (err) =>
+          (err.status === 400 &&
+            err.message.includes(
+              "is still referenced by service bindings in Workers",
+            )) ||
+          err.status === 500 ||
+          err.status === 503,
+        10,
+        100,
       );
 
-      if (!res.ok) {
-        await handleApiError(
-          res,
-          "updating cron triggers",
-          "worker",
-          workerName,
-        );
+      return this.destroy();
+    }
+    if (this.phase === "create") {
+      if (!props.adopt) {
+        await assertWorkerDoesNotExist(this, api, workerName);
       }
     }
 
+    const { scriptMetadata, workerUrl, now } = await uploadWorkerScript(props);
+
     // Construct the output
     return this({
       ...props,
@@ -504,7 +543,6 @@ export const Worker = Resource(
       name: workerName,
       compatibilityDate,
       compatibilityFlags,
-      script: scriptContent,
       format: props.format || "esm", // Include format in the output
       bindings: props.bindings ?? ({} as B),
       env: props.env,
@@ -526,8 +564,9 @@ export const Worker = Resource(
 async function deleteWorker<B extends Bindings>(
   ctx: Context<Worker<B>>,
   api: CloudflareApi,
-  workerName: string,
+  props: WorkerProps<B> & { workerName: string },
 ) {
+  const workerName = props.workerName;
   // Delete any queue consumers attached to this worker first
   await deleteQueueConsumers(ctx, api, workerName);
 
@@ -538,13 +577,7 @@ async function deleteWorker<B extends Bindings>(
 
   // Check for success (2xx status code)
   if (!deleteResponse.ok && deleteResponse.status !== 404) {
-    const errorData: any = await deleteResponse
-      .json()
-      .catch(() => ({ errors: [{ message: deleteResponse.statusText }] }));
-    console.error(
-      "Error deleting worker:",
-      errorData.errors?.[0]?.message || deleteResponse.statusText,
-    );
+    await handleApiError(deleteResponse, "delete", "worker", workerName);
   }
 
   // Disable the URL if it was enabled
@@ -698,6 +731,7 @@ async function prepareWorkerMetadata<B extends Bindings>(
   props: WorkerProps & {
     compatibilityDate: string;
     compatibilityFlags: string[];
+    workerName: string;
   },
   assetUploadResult?: AssetUploadResult,
 ): Promise<WorkerMetadata> {
@@ -752,6 +786,12 @@ async function prepareWorkerMetadata<B extends Bindings>(
         name: bindingName,
         text: binding,
       });
+    } else if (binding === Self) {
+      meta.bindings.push({
+        type: "service",
+        name: bindingName,
+        service: props.workerName,
+      });
     } else if (binding.type === "d1") {
       meta.bindings.push({
         type: "d1",
@@ -807,7 +847,7 @@ async function prepareWorkerMetadata<B extends Bindings>(
         // script_name: ??,
       });
       // it's unclear whether this is needed, but it works both ways
-      configureClassMigration(binding, binding.id, binding.className);
+      // configureClassMigration(binding, binding.id, binding.className);
     } else if (binding.type === "queue") {
       meta.bindings.push({
         type: "queue",

package/src/cloudflare/wrangler.json.ts

@@ -1,7 +1,7 @@
 import type { Context } from "../context.js";
 import { StaticJsonFile } from "../fs/static-json-file.js";
 import { Resource } from "../resource.js";
-import type { Bindings } from "./bindings.js";
+import { Self, type Bindings } from "./bindings.js";
 import type { DurableObjectNamespace } from "./durable-object-namespace.js";
 import type { EventSource } from "./event-source.js";
 import { isQueueEventSource } from "./event-source.js";
@@ -95,7 +95,7 @@ export const WranglerJson = Resource(
 
     // Process bindings if they exist
     if (worker.bindings) {
-      processBindings(spec, worker.bindings, worker.eventSources);
+      processBindings(spec, worker.bindings, worker.eventSources, worker.name);
     }
 
     // Add environment variables as vars
@@ -170,6 +170,10 @@ export interface WranglerJsonSpec {
   kv_namespaces?: {
     binding: string;
     id: string;
+    /**
+     * The ID of the KV namespace used during `wrangler dev`
+     */
+    preview_id?: string;
   }[];
 
   /**
@@ -190,6 +194,10 @@ export interface WranglerJsonSpec {
   r2_buckets?: {
     binding: string;
     bucket_name: string;
+    /**
+     * The preview name of this R2 bucket at the edge.
+     */
+    preview_bucket_name?: string;
   }[];
 
   /**
@@ -246,6 +254,10 @@ export interface WranglerJsonSpec {
     database_id: string;
     database_name: string;
     migrations_dir?: string;
+    /**
+     * The ID of the D1 database used during `wrangler dev`
+     */
+    preview_database_id?: string;
   }[];
 
   /**
@@ -279,6 +291,7 @@ function processBindings(
   spec: WranglerJsonSpec,
   bindings: Bindings,
   eventSources: EventSource[] | undefined,
+  workerName: string,
 ): void {
   // Arrays to collect different binding types
   const kvNamespaces: { binding: string; id: string }[] = [];
@@ -340,6 +353,18 @@ function processBindings(
         spec.vars = {};
       }
       spec.vars[bindingName] = binding;
+    } else if (binding === Self) {
+      // Self(service) binding
+      services.push({
+        binding: bindingName,
+        service: workerName,
+      });
+    } else if (binding.type === "service") {
+      // Service binding
+      services.push({
+        binding: bindingName,
+        service: binding.id,
+      });
     } else if (binding.type === "kv_namespace") {
       // KV Namespace binding
       kvNamespaces.push({
@@ -363,12 +388,6 @@ function processBindings(
         binding: bindingName,
         bucket_name: binding.name,
       });
-    } else if (binding.type === "service") {
-      // Service binding
-      services.push({
-        binding: bindingName,
-        service: binding.id,
-      });
     } else if (binding.type === "secret") {
       // Secret binding
       secrets.push(bindingName);