npm - alchemy - Versions diffs - 0.51.2 → 0.52.0 - Mend

alchemy 0.51.2 → 0.52.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (103) hide show

package/lib/apply.js +1 -1
package/lib/apply.js.map +1 -1
package/lib/cloudflare/assets.d.ts +1 -1
package/lib/cloudflare/assets.d.ts.map +1 -1
package/lib/cloudflare/bindings.d.ts +12 -11
package/lib/cloudflare/bindings.d.ts.map +1 -1
package/lib/cloudflare/bindings.js.map +1 -1
package/lib/cloudflare/bound.d.ts +11 -18
package/lib/cloudflare/bound.d.ts.map +1 -1
package/lib/cloudflare/bucket.d.ts +4 -5
package/lib/cloudflare/bucket.d.ts.map +1 -1
package/lib/cloudflare/bucket.js +1 -16
package/lib/cloudflare/bucket.js.map +1 -1
package/lib/cloudflare/compatibility-date.gen.d.ts +1 -1
package/lib/cloudflare/compatibility-date.gen.js +1 -1
package/lib/cloudflare/d1-database.d.ts +85 -26
package/lib/cloudflare/d1-database.d.ts.map +1 -1
package/lib/cloudflare/d1-database.js +66 -47
package/lib/cloudflare/d1-database.js.map +1 -1
package/lib/cloudflare/d1-local-migrations.d.ts +10 -0
package/lib/cloudflare/d1-local-migrations.d.ts.map +1 -0
package/lib/cloudflare/d1-local-migrations.js +39 -0
package/lib/cloudflare/d1-local-migrations.js.map +1 -0
package/lib/cloudflare/dispatch-namespace.d.ts +4 -6
package/lib/cloudflare/dispatch-namespace.d.ts.map +1 -1
package/lib/cloudflare/dispatch-namespace.js +1 -11
package/lib/cloudflare/dispatch-namespace.js.map +1 -1
package/lib/cloudflare/event-source.d.ts +3 -3
package/lib/cloudflare/event-source.d.ts.map +1 -1
package/lib/cloudflare/hyperdrive.d.ts +3 -4
package/lib/cloudflare/hyperdrive.d.ts.map +1 -1
package/lib/cloudflare/hyperdrive.js +1 -9
package/lib/cloudflare/hyperdrive.js.map +1 -1
package/lib/cloudflare/index.d.ts +1 -0
package/lib/cloudflare/index.d.ts.map +1 -1
package/lib/cloudflare/index.js +1 -0
package/lib/cloudflare/index.js.map +1 -1
package/lib/cloudflare/kv-namespace.d.ts +4 -5
package/lib/cloudflare/kv-namespace.d.ts.map +1 -1
package/lib/cloudflare/kv-namespace.js +1 -14
package/lib/cloudflare/kv-namespace.js.map +1 -1
package/lib/cloudflare/pipeline.d.ts +4 -5
package/lib/cloudflare/pipeline.d.ts.map +1 -1
package/lib/cloudflare/pipeline.js +1 -12
package/lib/cloudflare/pipeline.js.map +1 -1
package/lib/cloudflare/queue-consumer.d.ts +3 -3
package/lib/cloudflare/queue-consumer.d.ts.map +1 -1
package/lib/cloudflare/queue.d.ts +3 -4
package/lib/cloudflare/queue.d.ts.map +1 -1
package/lib/cloudflare/queue.js +1 -11
package/lib/cloudflare/queue.js.map +1 -1
package/lib/cloudflare/vectorize-index.d.ts +4 -5
package/lib/cloudflare/vectorize-index.d.ts.map +1 -1
package/lib/cloudflare/vectorize-index.js +1 -15
package/lib/cloudflare/vectorize-index.js.map +1 -1
package/lib/cloudflare/vectorize-metadata-index.d.ts +2 -2
package/lib/cloudflare/vectorize-metadata-index.d.ts.map +1 -1
package/lib/cloudflare/worker-ref.d.ts +41 -0
package/lib/cloudflare/worker-ref.d.ts.map +1 -0
package/lib/cloudflare/worker-ref.js +27 -0
package/lib/cloudflare/worker-ref.js.map +1 -0
package/lib/cloudflare/worker.d.ts +6 -68
package/lib/cloudflare/worker.d.ts.map +1 -1
package/lib/cloudflare/worker.js +5 -198
package/lib/cloudflare/worker.js.map +1 -1
package/lib/cloudflare/wrangler.json.js +1 -0
package/lib/cloudflare/wrangler.json.js.map +1 -1
package/lib/cloudflare/zone.d.ts.map +1 -1
package/lib/cloudflare/zone.js +2 -2
package/lib/cloudflare/zone.js.map +1 -1
package/lib/esbuild/bundle.d.ts +2 -2
package/lib/state/cloudflare-state-store.d.ts +3 -1
package/lib/state/cloudflare-state-store.d.ts.map +1 -1
package/lib/state/cloudflare-state-store.js +11 -2
package/lib/state/cloudflare-state-store.js.map +1 -1
package/lib/state/instrumented-state-store.d.ts +2 -0
package/lib/state/instrumented-state-store.d.ts.map +1 -1
package/lib/state/instrumented-state-store.js +2 -0
package/lib/state/instrumented-state-store.js.map +1 -1
package/package.json +1 -1
package/src/apply.ts +1 -1
package/src/cloudflare/bindings.ts +18 -17
package/src/cloudflare/bound.ts +35 -18
package/src/cloudflare/bucket.ts +5 -27
package/src/cloudflare/compatibility-date.gen.ts +1 -1
package/src/cloudflare/d1-database.ts +107 -100
package/src/cloudflare/d1-local-migrations.ts +52 -0
package/src/cloudflare/dispatch-namespace.ts +6 -25
package/src/cloudflare/event-source.ts +3 -3
package/src/cloudflare/hyperdrive.ts +4 -19
package/src/cloudflare/index.ts +1 -0
package/src/cloudflare/kv-namespace.ts +5 -28
package/src/cloudflare/pipeline.ts +8 -27
package/src/cloudflare/queue-consumer.ts +3 -3
package/src/cloudflare/queue.ts +4 -22
package/src/cloudflare/vectorize-index.ts +5 -27
package/src/cloudflare/vectorize-metadata-index.ts +2 -2
package/src/cloudflare/worker-ref.ts +51 -0
package/src/cloudflare/worker.ts +16 -332
package/src/cloudflare/wrangler.json.ts +1 -0
package/src/cloudflare/zone.ts +9 -8
package/src/state/cloudflare-state-store.ts +73 -54
package/src/state/instrumented-state-store.ts +2 -0

package/src/cloudflare/queue.ts CHANGED Viewed

@@ -1,13 +1,11 @@
 import type { Context } from "../context.ts";
 import { Resource, ResourceKind } from "../resource.ts";
-import { bind } from "../runtime/bind.ts";
 import { CloudflareApiError, handleApiError } from "./api-error.ts";
 import {
   createCloudflareApi,
   type CloudflareApi,
   type CloudflareApiOptions,
 } from "./api.ts";
-import type { Bound } from "./bound.ts";
 /**
  * Settings for a Cloudflare Queue
@@ -95,7 +93,7 @@ export function isQueue(eventSource: any): eventSource is Queue {
 /**
  * Output returned after Cloudflare Queue creation/update
  */
-export interface QueueResource<Body = unknown>
+export interface Queue<Body = unknown>
   extends Resource<"cloudflare::Queue">,
     QueueProps {
   /**
@@ -131,9 +129,6 @@ export interface QueueResource<Body = unknown>
   Batch: MessageBatch<Body>;
 }
-export type Queue<Body = unknown> = QueueResource<Body> &
-  Bound<QueueResource<Body>>;
 /**
  * Creates and manages Cloudflare Queues.
  *
@@ -213,23 +208,10 @@ export type Queue<Body = unknown> = QueueResource<Body> &
  *
  * @see https://developers.cloudflare.com/queues/
  */
-export async function Queue<Body = unknown>(
-  name: string,
-  props: QueueProps = {},
-): Promise<Queue<Body>> {
-  const queue = await QueueResource<Body>(name, props);
-  const binding = await bind(queue);
-  return {
-    ...queue,
-    send: binding.send,
-    sendBatch: binding.sendBatch,
-  } as Queue<Body>;
-}
-const QueueResource = Resource("cloudflare::Queue", async function <
+export const Queue = Resource("cloudflare::Queue", async function <
   T = unknown,
->(this: Context<QueueResource<T>>, id: string, props: QueueProps = {}): Promise<
-  QueueResource<T>
+>(this: Context<Queue<T>>, id: string, props: QueueProps = {}): Promise<
+  Queue<T>
 > {
   const api = await createCloudflareApi(props);
   const queueName = props.name ?? id;

package/src/cloudflare/vectorize-index.ts CHANGED Viewed

@@ -1,6 +1,5 @@
 import type { Context } from "../context.ts";
 import { Resource, ResourceKind } from "../resource.ts";
-import { bind } from "../runtime/bind.ts";
 import { logger } from "../util/logger.ts";
 import { CloudflareApiError, handleApiError } from "./api-error.ts";
 import {
@@ -8,7 +7,6 @@ import {
   type CloudflareApi,
   type CloudflareApiOptions,
 } from "./api.ts";
-import type { Bound } from "./bound.ts";
 /**
  * Properties for creating or updating a Vectorize Index
@@ -53,14 +51,14 @@ export interface VectorizeIndexProps extends CloudflareApiOptions {
 export function isVectorizeIndex(
   resource: Resource,
-): resource is VectorizeIndexResource {
+): resource is VectorizeIndex {
   return resource[ResourceKind] === "cloudflare::VectorizeIndex";
 }
 /**
  * Output returned after Vectorize Index creation/update
  */
-export interface VectorizeIndexResource
+export interface VectorizeIndex
   extends Resource<"cloudflare::VectorizeIndex">,
     VectorizeIndexProps {
   type: "vectorize";
@@ -76,9 +74,6 @@ export interface VectorizeIndexResource
   createdAt?: number;
 }
-export type VectorizeIndex = VectorizeIndexResource &
-  Bound<VectorizeIndexResource>;
 /**
  * Creates and manages Cloudflare Vectorize Indexes.
  *
@@ -118,30 +113,13 @@ export type VectorizeIndex = VectorizeIndexResource &
  *
  * @see https://developers.cloudflare.com/vectorize/
  */
-export async function VectorizeIndex(
-  name: string,
-  props: VectorizeIndexProps,
-): Promise<VectorizeIndex> {
-  const index = await _VectorizeIndex(name, props);
-  const binding = await bind(index);
-  return {
-    ...index,
-    describe: binding.describe,
-    query: binding.query,
-    insert: binding.insert,
-    upsert: binding.upsert,
-    deleteByIds: binding.deleteByIds,
-    getByIds: binding.getByIds,
-  };
-}
-const _VectorizeIndex = Resource(
+export const VectorizeIndex = Resource(
   "cloudflare::VectorizeIndex",
   async function (
-    this: Context<VectorizeIndexResource>,
+    this: Context<VectorizeIndex>,
     id: string,
     props: VectorizeIndexProps,
-  ): Promise<VectorizeIndexResource> {
+  ): Promise<VectorizeIndex> {
     const api = await createCloudflareApi(props);
     const indexName = props.name || id;

package/src/cloudflare/vectorize-metadata-index.ts CHANGED Viewed

@@ -7,7 +7,7 @@ import {
   type CloudflareApi,
   type CloudflareApiOptions,
 } from "./api.ts";
-import type { VectorizeIndexResource } from "./vectorize-index.ts";
+import type { VectorizeIndex } from "./vectorize-index.ts";
 /**
  * Properties for creating or deleting a Vectorize Metadata Index
@@ -16,7 +16,7 @@ export interface VectorizeMetadataIndexProps extends CloudflareApiOptions {
   /**
    * Parent Vectorize Index
    */
-  index: VectorizeIndexResource;
+  index: VectorizeIndex;
   /**
    * Name of the property in the metadata to create an index for

package/src/cloudflare/worker-ref.ts ADDED Viewed

@@ -0,0 +1,51 @@
+import type { WorkerBindingService } from "./bindings.ts";
+/**
+ * Represents a reference to a Cloudflare Worker service.
+ *
+ * @template RPC - The type of the worker's RPC entrypoint, defaults to Rpc.WorkerEntrypointBranded.
+ *
+ * This interface extends all properties of WorkerBindingService except for "name".
+ * It also includes an optional __rpc__ property for type branding.
+ */
+export type WorkerRef<
+  RPC extends Rpc.WorkerEntrypointBranded = Rpc.WorkerEntrypointBranded,
+> = Omit<WorkerBindingService, "name"> & {
+  /**
+   * Optional type branding for the worker's RPC entrypoint.
+   */
+  __rpc__?: RPC;
+};
+/**
+ * Creates a reference to a Cloudflare Worker service.
+ *
+ * @example
+ * // Create a reference to a Cloudflare Worker service:
+ * const ref = WorkerRef({
+ *   service: "my-worker",
+ *   environment: "production",
+ *   namespace: "main"
+ * });
+ *
+ * // Optionally, you can specify only the service:
+ * const ref2 = WorkerRef({ service: "my-worker" });
+ *
+ * // You can also specify the RPC type for stronger typing:
+ * interface MyWorkerRPC extends Rpc.WorkerEntrypointBranded {
+ *   myMethod(arg: string): Promise<number>;
+ * }
+ * const typedRef = WorkerRef<MyWorkerRPC>({ service: "my-worker" });
+ */
+export function WorkerRef<
+  RPC extends Rpc.WorkerEntrypointBranded = Rpc.WorkerEntrypointBranded,
+>(options?: {
+  service: string;
+  environment?: string;
+  namespace?: string;
+}): WorkerRef<RPC> {
+  return {
+    ...options,
+    type: "service",
+  } as WorkerRef<RPC>;
+}

package/src/cloudflare/worker.ts CHANGED Viewed

@@ -6,13 +6,8 @@ import { isDeepStrictEqual } from "node:util";
 import path from "pathe";
 import type { Context } from "../context.ts";
 import type { BundleProps } from "../esbuild/bundle.ts";
-import { InnerResourceScope, Resource, ResourceKind } from "../resource.ts";
-import { getBindKey, tryGetBinding } from "../runtime/bind.ts";
-import { isRuntime } from "../runtime/global.ts";
-import { bootstrapPlugin } from "../runtime/plugin.ts";
-import { Scope } from "../scope.ts";
-import { Secret, isSecret, secret } from "../secret.ts";
-import { serializeScope } from "../serde.ts";
+import { Resource, ResourceKind } from "../resource.ts";
+import { isSecret } from "../secret.ts";
 import type { type } from "../type.ts";
 import { DeferredPromise } from "../util/deferred-promise.ts";
 import { logger } from "../util/logger.ts";
@@ -25,16 +20,12 @@ import {
   createCloudflareApi,
 } from "./api.ts";
 import type { Assets } from "./assets.ts";
-import {
-  type Binding,
-  type Bindings,
-  Json,
-  type WorkerBindingDurableObjectNamespace,
-  type WorkerBindingService,
-  type WorkerBindingSpec,
+import type {
+  Bindings,
+  WorkerBindingDurableObjectNamespace,
+  WorkerBindingSpec,
 } from "./bindings.ts";
 import type { Bound } from "./bound.ts";
-import { isBucket } from "./bucket.ts";
 import {
   type WorkerBundle,
   type WorkerBundleChunk,
@@ -49,36 +40,27 @@ import {
 } from "./compatibility-presets.ts";
 import { type Container, ContainerApplication } from "./container.ts";
 import { CustomDomain } from "./custom-domain.ts";
-import { isD1Database } from "./d1-database.ts";
-import type { DispatchNamespaceResource } from "./dispatch-namespace.ts";
+import type { DispatchNamespace } from "./dispatch-namespace.ts";
 import {
   DurableObjectNamespace,
   isDurableObjectNamespace,
 } from "./durable-object-namespace.ts";
-import {
-  type EventSource,
-  type QueueEventSource,
-  isQueueEventSource,
-} from "./event-source.ts";
-import { isKVNamespace } from "./kv-namespace.ts";
+import { type EventSource, isQueueEventSource } from "./event-source.ts";
 import type { MiniflareWorkerOptions } from "./miniflare/miniflare-worker-options.ts";
 import { miniflareServer } from "./miniflare/miniflare.ts";
-import { isPipeline } from "./pipeline.ts";
 import {
   QueueConsumer,
   deleteQueueConsumer,
   listQueueConsumersForWorker,
 } from "./queue-consumer.ts";
-import { type QueueResource, isQueue } from "./queue.ts";
+import { isQueue } from "./queue.ts";
 import { Route } from "./route.ts";
-import { isVectorizeIndex } from "./vectorize-index.ts";
 import { uploadAssets } from "./worker-assets.ts";
 import {
   type WorkerScriptMetadata,
   bumpMigrationTagVersion,
   prepareWorkerMetadata,
 } from "./worker-metadata.ts";
-import { WorkerStub, isWorkerStub } from "./worker-stub.ts";
 import { WorkerSubdomain, disableWorkerSubdomain } from "./worker-subdomain.ts";
 import { createTail } from "./worker-tail.ts";
 import { Workflow, isWorkflow, upsertWorkflow } from "./workflow.ts";
@@ -330,7 +312,7 @@ export interface BaseWorkerProps<
    *
    * This allows workers to be routed to via dispatch namespace routing rules
    */
-  namespace?: string | DispatchNamespaceResource;
+  namespace?: string | DispatchNamespace;
   /**
    * Version label for this worker deployment
@@ -455,45 +437,6 @@ export type WorkerProps<
   RPC extends Rpc.WorkerEntrypointBranded = Rpc.WorkerEntrypointBranded,
 > = InlineWorkerProps<B, RPC> | EntrypointWorkerProps<B, RPC>;
-export type FetchWorkerProps<
-  B extends Bindings = Bindings,
-  E extends EventSource[] = EventSource[],
-> = Omit<WorkerProps<B>, "entrypoint" | "eventSources"> & {
-  /**
-   * A function that will be used to fetch the worker script.
-   *
-   * This is only used when using the fetch property.
-   */
-  fetch?(
-    request: Request,
-    env: Bindings.Runtime<B>,
-    ctx: ExecutionContext,
-  ): Promise<Response>;
-  /**
-   * Event sources that this worker will consume.
-   *
-   * Can include queues, streams, or other event sources.
-   */
-  eventSources?: E;
-  /**
-   * A function that will be used to queue the worker script.
-   *
-   * This is only used when using the queue property.
-   */
-  queue?(
-    batch: QueueBatch<E>,
-    env: Bindings.Runtime<B>,
-    ctx: ExecutionContext,
-  ): Promise<void>;
-};
-type QueueBatch<E extends EventSource[]> = E[number] extends QueueEventSource
-  ? any
-  : E[number] extends QueueResource<infer Body>
-    ? MessageBatch<Body>
-    : MessageBatch<unknown>;
 export function isWorker(resource: Resource): resource is Worker<any> {
   return resource[ResourceKind] === "cloudflare::Worker";
 }
@@ -505,8 +448,7 @@ export type Worker<
   B extends Bindings | undefined = Bindings | undefined,
   RPC extends Rpc.WorkerEntrypointBranded = Rpc.WorkerEntrypointBranded,
 > = Resource<"cloudflare::Worker"> &
-  Omit<WorkerProps<B>, "url" | "script" | "routes" | "domains"> &
-  globalThis.Service & {
+  Omit<WorkerProps<B>, "url" | "script" | "routes" | "domains"> & {
     /** @internal phantom property */
     __rpc__?: RPC;
@@ -586,7 +528,7 @@ export type Worker<
     /**
      * The dispatch namespace this worker is deployed to
      */
-    namespace?: string | DispatchNamespaceResource;
+    namespace?: string | DispatchNamespace;
     /**
      * Version label for this worker deployment
@@ -601,56 +543,6 @@ export type Worker<
     };
   };
-/**
- * Represents a reference to a Cloudflare Worker service.
- *
- * @template RPC - The type of the worker's RPC entrypoint, defaults to Rpc.WorkerEntrypointBranded.
- *
- * This interface extends all properties of WorkerBindingService except for "name".
- * It also includes an optional __rpc__ property for type branding.
- */
-export type WorkerRef<
-  RPC extends Rpc.WorkerEntrypointBranded = Rpc.WorkerEntrypointBranded,
-> = Omit<WorkerBindingService, "name"> & {
-  /**
-   * Optional type branding for the worker's RPC entrypoint.
-   */
-  __rpc__?: RPC;
-};
-/**
- * Creates a reference to a Cloudflare Worker service.
- *
- * @example
- * // Create a reference to a Cloudflare Worker service:
- * const ref = WorkerRef({
- *   service: "my-worker",
- *   environment: "production",
- *   namespace: "main"
- * });
- *
- * // Optionally, you can specify only the service:
- * const ref2 = WorkerRef({ service: "my-worker" });
- *
- * // You can also specify the RPC type for stronger typing:
- * interface MyWorkerRPC extends Rpc.WorkerEntrypointBranded {
- *   myMethod(arg: string): Promise<number>;
- * }
- * const typedRef = WorkerRef<MyWorkerRPC>({ service: "my-worker" });
- */
-export function WorkerRef<
-  RPC extends Rpc.WorkerEntrypointBranded = Rpc.WorkerEntrypointBranded,
->(options?: {
-  service: string;
-  environment?: string;
-  namespace?: string;
-}): WorkerRef<RPC> {
-  return {
-    ...options,
-    type: "service",
-  } as WorkerRef<RPC>;
-}
 /**
  * A Cloudflare Worker is a serverless function that can be deployed to the Cloudflare network.
  *
@@ -807,220 +699,12 @@ export function Worker<
   const B extends Bindings,
   RPC extends Rpc.WorkerEntrypointBranded,
 >(id: string, props: WorkerProps<B, RPC>): Promise<Worker<B, RPC>>;
-export function Worker<const B extends Bindings, const E extends EventSource[]>(
-  id: string,
-  meta: ImportMeta,
-  props: FetchWorkerProps<B, E>,
-): Promise<Worker<B>> & globalThis.Service;
 export function Worker<const B extends Bindings>(
-  ...args:
-    | [id: string, props: WorkerProps<B>]
-    | [id: string, meta: ImportMeta, props: FetchWorkerProps<B>]
+  id: string,
+  props: WorkerProps<B>,
 ): Promise<Worker<B>> {
-  const [id, meta, props] =
-    args.length === 2 ? [args[0], undefined, args[1]] : args;
-  if (("fetch" in props && props.fetch) || ("queue" in props && props.queue)) {
-    const scope = Scope.current;
-    const workerName = props.name ?? id;
-    // we need to make sure the worker exists
-    const stub = WorkerStub(`${id}/stub`, {
-      name: workerName,
-      accountId: props.accountId,
-      apiKey: props.apiKey,
-      apiToken: props.apiToken,
-      baseUrl: props.baseUrl,
-      email: props.email,
-    });
-    async function collectResources(
-      scope: Scope | undefined,
-    ): Promise<Resource[]> {
-      if (!scope) {
-        return [];
-      }
-      return (
-        await Promise.all(
-          Array.from(scope.resources.values()).map(async (resource) => [
-            (await resource) as Resource,
-            ...(await collectResources(await resource[InnerResourceScope])),
-          ]),
-        )
-      ).flat();
-    }
-    const deferred = scope.defer(async () => {
-      const autoBindings: Record<string, Binding> = {};
-      for (const resource of await collectResources(Scope.root)) {
-        if (
-          isQueue(resource) ||
-          isWorkerStub(resource) ||
-          isWorker(resource) ||
-          isD1Database(resource) ||
-          isBucket(resource) ||
-          isPipeline(resource) ||
-          isVectorizeIndex(resource) ||
-          isKVNamespace(resource)
-        ) {
-          // TODO(sam): make this generic/pluggable
-          autoBindings[getBindKey(resource)] = resource;
-        }
-      }
-      // TODO(sam): prune to only needed secrets
-      for (const secret of Secret.all()) {
-        autoBindings[secret.name] = secret;
-      }
-      const bindings = {
-        ...props.bindings,
-        __ALCHEMY_WORKER_NAME__: workerName,
-        __ALCHEMY_SERIALIZED_SCOPE__: Json(await serializeScope(scope)),
-        ALCHEMY_STAGE: scope.stage,
-        ALCHEMY_PASSWORD: secret(scope.password),
-        // TODO(sam): prune un-needed bindings
-        ...autoBindings,
-      };
-      return _Worker(id, {
-        ...(props as any),
-        url: true,
-        compatibilityFlags: Array.from(
-          new Set([
-            "nodejs_compat",
-            ...unionCompatibilityFlags(
-              props.compatibility,
-              props.compatibilityFlags,
-            ),
-          ]),
-        ),
-        entrypoint: meta!.filename,
-        name: workerName,
-        // adopt because the stub guarnatees that the worker exists
-        adopt: true,
-        bindings,
-        bundle: {
-          ...props.bundle,
-          plugins: [bootstrapPlugin],
-          external: [
-            // for alchemy
-            "libsodium*",
-            "@swc/*",
-            "esbuild",
-            // TODO(sam): this is for fetch, why is it a package?
-            "undici",
-            "miniflare",
-            "@iarna/toml",
-            "cli-*",
-            "react*",
-          ],
-          banner: {
-            js: "var __ALCHEMY_RUNTIME__ = true;",
-          },
-          inject: [
-            ...(props.bundle?.inject ?? []),
-            path.resolve(import.meta.dirname, "..", "runtime", "shims.js"),
-          ],
-        },
-      });
-    }) as Promise<Worker<B>>;
-    // defer construction of this worker until the app is about to finaloze
-    // this ensures that the Worker's dependencies are instantiated before we bundle
-    // it is then safe to bundle and import the Worker to detect which resources need to be auto-bound
-    const promise = Promise.all([deferred, stub]).then(
-      ([worker]) => worker,
-    ) as Promise<Worker<B>> & {
-      fetch?: (...args: any[]) => Promise<Response>;
-      queue?: (
-        batch: QueueBatch<any>,
-        env: Bindings.Runtime<B>,
-        ctx: ExecutionContext,
-      ) => Promise<void>;
-    };
-    if (isRuntime) {
-      if (props.fetch) {
-        promise.fetch = async (
-          request: Request,
-          env: Bindings.Runtime<B>,
-          ctx: ExecutionContext,
-        ) => {
-          try {
-            return await props.fetch!(request, env as any, ctx);
-          } catch (err: any) {
-            return new Response(err.message + err.stack, {
-              status: 500,
-            });
-          }
-        };
-      }
-      if (props.queue) {
-        promise.queue = async (
-          batch: QueueBatch<any>,
-          env: Bindings.Runtime<B>,
-          ctx: ExecutionContext,
-        ) => {
-          return await props.queue!(batch, env, ctx);
-        };
-      }
-    } else {
-      promise.fetch = async (
-        request: string | URL | Request,
-        init?: RequestInit,
-      ) => {
-        const worker = await promise;
-        if (!worker.url) {
-          throw new Error("Worker URL is not available in runtime");
-        }
-        if (request instanceof Request) {
-          const origin = new URL(worker.url);
-          const incoming = request.url.startsWith("/")
-            ? new URL(`${worker.url}${request.url}`)
-            : new URL(request.url);
-          logger.log(incoming);
-          const proxyURL = new URL(
-            `${incoming.pathname}${incoming.search}${incoming.hash}`,
-            origin,
-          );
-          const headers = new Headers(request.headers);
-          headers.set("host", origin.host);
-          try {
-            return await fetch(
-              new Request(proxyURL, {
-                method: request.method,
-                body: request.body,
-                headers,
-                // TODO(sam): do we need this? GPT added it ...
-                // redirect: "manual",
-              }),
-            );
-          } catch (err: any) {
-            return new Response(err.message ?? "proxy error", { status: 500 });
-          }
-        } else {
-          if (typeof request === "string" && request.startsWith("/")) {
-            request = new URL(`${worker.url}${request}`);
-          }
-          return await fetch(request, init);
-        }
-      };
-    }
-    return promise;
-  }
-  return _Worker(id, props as WorkerProps<B>).then(async (worker) => {
-    const binding = await tryGetBinding(worker);
-    if (binding) {
-      worker.fetch = (request: Request) => binding.fetch(request);
-      worker.connect = (address: SocketAddress, options: SocketOptions) =>
-        binding.connect(address, options);
-    }
-    return worker;
-  });
+  return _Worker(id, props as WorkerProps<B>);
 }
 export const _Worker = Resource(

package/src/cloudflare/wrangler.json.ts CHANGED Viewed

@@ -645,6 +645,7 @@ function processBindings(
         script_name: binding.scriptName,
       });
     } else if (binding.type === "d1") {
+      console.log("binding.dev", binding.dev);
       d1Databases.push({
         binding: bindingName,
         database_id: binding.id,

package/src/cloudflare/zone.ts CHANGED Viewed

@@ -651,14 +651,15 @@ export async function findZoneForHostname(
   const totalPages = firstPageData.result_info?.total_pages ?? 1;
   // Fetch remaining pages concurrently if needed
-  const allZones = totalPages > 1
-    ? await Promise.all([
-        Promise.resolve(firstPageData.result),
-        ...Array.from({ length: totalPages - 1 }, (_, i) =>
-          fetchZonePage(i + 2).then(data => data.result)
-        ),
-      ]).then(results => results.flat())
-    : firstPageData.result;
+  const allZones =
+    totalPages > 1
+      ? await Promise.all([
+          Promise.resolve(firstPageData.result),
+          ...Array.from({ length: totalPages - 1 }, (_, i) =>
+            fetchZonePage(i + 2).then((data) => data.result),
+          ),
+        ]).then((results) => results.flat())
+      : firstPageData.result;
   // Find the zone that best matches the hostname
   // We look for the longest matching zone name (most specific)