alchemy 2.0.0-beta.52 → 2.0.0-beta.53

package/src/Cloudflare/VpcService/VpcService.ts

@@ -120,143 +120,144 @@ export type VpcService = Resource<
  */
 export const VpcService = Resource<VpcService>("Cloudflare.VpcService");
 
-export const VpcServiceProvider = () =>
-  Provider.effect(
-    VpcService,
-    Effect.gen(function* () {
-      const { accountId } = yield* CloudflareEnvironment;
-      const createService = yield* connectivity.createDirectoryService;
-      const getService = yield* connectivity.getDirectoryService;
-      const updateService = yield* connectivity.updateDirectoryService;
-      const deleteService = yield* connectivity.deleteDirectoryService;
-      const listServices = connectivity.listDirectoryServices;
-
-      const createServiceName = (id: string, name: string | undefined) =>
-        Effect.gen(function* () {
-          if (name) return name;
-          return yield* createPhysicalName({
-            id,
-            lowercase: true,
-            maxLength: 63,
-          });
-        });
-
-      const findServiceByName = (name: string) =>
-        listServices.items({ accountId }).pipe(
-          Stream.filter((s) => s.name === name),
-          Stream.runHead,
-          Effect.map(Option.getOrUndefined),
-        );
+const createServiceName = (id: string, name: string | undefined) =>
+  Effect.gen(function* () {
+    if (name) return name;
+    return yield* createPhysicalName({
+      id,
+      lowercase: true,
+      maxLength: 63,
+    });
+  });
 
-      return {
-        stables: ["serviceId", "accountId"],
-        diff: Effect.fn(function* ({ id, olds, news, output }) {
-          if (!isResolved(news)) return undefined;
-          if ((output?.accountId ?? accountId) !== accountId) {
-            return { action: "replace" } as const;
-          }
-          const name = yield* createServiceName(id, news.name);
-          const oldName = output?.serviceName
-            ? output.serviceName
-            : yield* createServiceName(id, olds?.name);
-          if (name !== oldName) {
-            return { action: "update" } as const;
-          }
-        }),
-        reconcile: Effect.fn(function* ({ id, news, output }) {
-          const name = yield* createServiceName(id, news.name);
-          const acct = output?.accountId ?? accountId;
+const findServiceByName = Effect.fnUntraced(function* (name: string) {
+  const { accountId } = yield* yield* CloudflareEnvironment;
+  return yield* connectivity.listDirectoryServices.items({ accountId }).pipe(
+    Stream.filter((s) => s.name === name),
+    Stream.runHead,
+    Effect.map(Option.getOrUndefined),
+  );
+});
 
-          // Observe — re-fetch the cached service; fall back to a name
-          // scan so we recover from out-of-band deletes or partial state
-          // persistence failures.
-          let observed: connectivity.GetDirectoryServiceResponse | undefined;
-          if (output?.serviceId) {
-            observed = yield* getService({
-              accountId: acct,
-              serviceId: output.serviceId,
-            }).pipe(Effect.catch(() => Effect.succeed(undefined)));
-          }
-          if (!observed) {
-            const match = yield* findServiceByName(name);
-            observed = match as
-              | connectivity.GetDirectoryServiceResponse
-              | undefined;
-          }
+export const VpcServiceProvider = () =>
+  Provider.succeed(VpcService, {
+    stables: ["serviceId", "accountId"],
+    diff: Effect.fn(function* ({ id, olds, news, output }) {
+      const { accountId } = yield* yield* CloudflareEnvironment;
+      if (!isResolved(news)) return undefined;
+      if ((output?.accountId ?? accountId) !== accountId) {
+        return { action: "replace" } as const;
+      }
+      const name = yield* createServiceName(id, news.name);
+      const oldName = output?.serviceName
+        ? output.serviceName
+        : yield* createServiceName(id, olds?.name);
+      if (name !== oldName) {
+        return { action: "update" } as const;
+      }
+    }),
+    reconcile: Effect.fn(function* ({ id, news, output }) {
+      const { accountId } = yield* yield* CloudflareEnvironment;
+      const name = yield* createServiceName(id, news.name);
+      const acct = output?.accountId ?? accountId;
 
-          // Ensure — create if missing. Cloudflare rejects a duplicate
-          // name with a generic error; tolerate by adopting the existing
-          // service (when the caller opted in) and re-applying the
-          // desired configuration.
-          if (!observed || !observed.serviceId) {
-            const result = yield* createService({
-              accountId: acct,
-              name,
-              type: news.serviceType ?? "http",
-              httpPort: news.httpPort,
-              httpsPort: news.httpsPort,
-              host: news.host,
-            }).pipe(
-              Effect.catch((err: unknown) =>
-                Effect.gen(function* () {
-                  if (!news.adopt) return yield* Effect.fail(err as never);
-                  const existing = yield* findServiceByName(name);
-                  if (!existing || !existing.serviceId) {
-                    return yield* Effect.fail(err as never);
-                  }
-                  return yield* updateService({
-                    accountId: acct,
-                    serviceId: existing.serviceId,
-                    name,
-                    type: news.serviceType ?? "http",
-                    httpPort: news.httpPort,
-                    httpsPort: news.httpsPort,
-                    host: news.host,
-                  });
-                }),
-              ),
-            );
-            return formatVpcService(result, acct);
-          }
+      // Observe — re-fetch the cached service; fall back to a name
+      // scan so we recover from out-of-band deletes or partial state
+      // persistence failures.
+      let observed: connectivity.GetDirectoryServiceResponse | undefined;
+      if (output?.serviceId) {
+        observed = yield* connectivity
+          .getDirectoryService({
+            accountId: acct,
+            serviceId: output.serviceId,
+          })
+          .pipe(Effect.catch(() => Effect.succeed(undefined)));
+      }
+      if (!observed) {
+        const match = yield* findServiceByName(name);
+        observed = match as
+          | connectivity.GetDirectoryServiceResponse
+          | undefined;
+      }
 
-          // Sync — the Cloudflare update API replaces all mutable fields
-          // (name, ports, host) atomically, so always issue it so
-          // adoption and routine updates converge.
-          const result = yield* updateService({
+      // Ensure — create if missing. Cloudflare rejects a duplicate
+      // name with a generic error; tolerate by adopting the existing
+      // service (when the caller opted in) and re-applying the
+      // desired configuration.
+      if (!observed || !observed.serviceId) {
+        const result = yield* connectivity
+          .createDirectoryService({
             accountId: acct,
-            serviceId: observed.serviceId,
             name,
-            type: news.serviceType ?? observed.type ?? "http",
+            type: news.serviceType ?? "http",
             httpPort: news.httpPort,
             httpsPort: news.httpsPort,
             host: news.host,
-          });
-          return formatVpcService(result, acct);
-        }),
-        delete: Effect.fn(function* ({ output }) {
-          yield* deleteService({
+          })
+          .pipe(
+            Effect.catch((err: unknown) =>
+              Effect.gen(function* () {
+                if (!news.adopt) return yield* Effect.fail(err as never);
+                const existing = yield* findServiceByName(name);
+                if (!existing || !existing.serviceId) {
+                  return yield* Effect.fail(err as never);
+                }
+                return yield* connectivity.updateDirectoryService({
+                  accountId: acct,
+                  serviceId: existing.serviceId,
+                  name,
+                  type: news.serviceType ?? "http",
+                  httpPort: news.httpPort,
+                  httpsPort: news.httpsPort,
+                  host: news.host,
+                });
+              }),
+            ),
+          );
+        return formatVpcService(result, acct);
+      }
+
+      // Sync — the Cloudflare update API replaces all mutable fields
+      // (name, ports, host) atomically, so always issue it so
+      // adoption and routine updates converge.
+      const result = yield* connectivity.updateDirectoryService({
+        accountId: acct,
+        serviceId: observed.serviceId,
+        name,
+        type: news.serviceType ?? observed.type ?? "http",
+        httpPort: news.httpPort,
+        httpsPort: news.httpsPort,
+        host: news.host,
+      });
+      return formatVpcService(result, acct);
+    }),
+    delete: Effect.fn(function* ({ output }) {
+      yield* connectivity
+        .deleteDirectoryService({
+          accountId: output.accountId,
+          serviceId: output.serviceId,
+        })
+        .pipe(Effect.catch(() => Effect.void));
+    }),
+    read: Effect.fn(function* ({ id, output, olds }) {
+      const { accountId } = yield* yield* CloudflareEnvironment;
+      if (output?.serviceId) {
+        return yield* connectivity
+          .getDirectoryService({
             accountId: output.accountId,
             serviceId: output.serviceId,
-          }).pipe(Effect.catch(() => Effect.void));
-        }),
-        read: Effect.fn(function* ({ id, output, olds }) {
-          if (output?.serviceId) {
-            return yield* getService({
-              accountId: output.accountId,
-              serviceId: output.serviceId,
-            }).pipe(
-              Effect.map((s) => formatVpcService(s, output.accountId)),
-              Effect.catch(() => Effect.succeed(undefined)),
-            );
-          }
-          const name = yield* createServiceName(id, olds?.name);
-          const existing = yield* findServiceByName(name);
-          if (!existing || !existing.serviceId) return undefined;
-          return formatVpcService(existing, accountId);
-        }),
-      };
+          })
+          .pipe(
+            Effect.map((s) => formatVpcService(s, output.accountId)),
+            Effect.catch(() => Effect.succeed(undefined)),
+          );
+      }
+      const name = yield* createServiceName(id, olds?.name);
+      const existing = yield* findServiceByName(name);
+      if (!existing || !existing.serviceId) return undefined;
+      return formatVpcService(existing, accountId);
     }),
-  );
+  });
 
 export const formatVpcService = (
   service: {

package/src/Cloudflare/VpcService/VpcServiceRef.ts

@@ -44,7 +44,7 @@ export type VpcServiceRef = VpcServiceAttributes;
  */
 export const VpcServiceRef = (props: VpcServiceRefProps) =>
   Effect.gen(function* () {
-    const { accountId } = yield* CloudflareEnvironment;
+    const { accountId } = yield* yield* CloudflareEnvironment;
     if ("name" in props) {
       const match = yield* connectivity.listDirectoryServices
         .items({ accountId })

package/src/Cloudflare/Workers/Assets.ts

@@ -1,4 +1,4 @@
-import createIgnore from "@alchemy.run/node-utils/ignore";
+import { Ignore } from "@alchemy.run/node-utils/ignore";
 import * as workers from "@distilled.cloud/cloudflare/workers";
 import * as Data from "effect/Data";
 import * as Effect from "effect/Effect";
@@ -98,7 +98,7 @@ const maybeReadString = Effect.fnUntraced(function* (file: string) {
 });
 
 const createIgnoreMatcher = (patterns: string[]) => {
-  const matcher = createIgnore().add(patterns);
+  const matcher = new Ignore().add(patterns);
   return (file: string) => matcher.ignores(file);
 };
 

package/src/Cloudflare/Workers/LocalWorkerProvider.ts

@@ -82,7 +82,7 @@ export class WorkerValidationError extends Schema.TaggedErrorClass<WorkerValidat
 export const localRuntimeServices = () =>
   RpcProvider.providerServicesEffect(
     Effect.gen(function* () {
-      const { accountId } = yield* CloudflareEnvironment;
+      const { accountId } = yield* yield* CloudflareEnvironment;
       const { dotAlchemy } = yield* AlchemyContext;
       const path = yield* Path.Path;
       return layerRuntime({
@@ -110,7 +110,6 @@ export const LocalWorkerProvider = () =>
       import.meta.url,
     ),
     Effect.gen(function* () {
-      const { accountId } = yield* CloudflareEnvironment;
       const bundler = yield* WorkerBundle;
       const runtime = yield* Runtime;
       const stack = yield* Stack;
@@ -424,6 +423,7 @@ export const LocalWorkerProvider = () =>
         props: WorkerPropsWithDev;
         bindings: ResourceBinding<Worker["Binding"]>[];
       }) {
+        const { accountId } = yield* yield* CloudflareEnvironment;
         const { props, bindings } = options;
         const config = yield* buildConfig(options);
         const url = yield* (
@@ -463,6 +463,7 @@ export const LocalWorkerProvider = () =>
           };
         }),
         reconcile: Effect.fn(function* ({ id, news, bindings }) {
+          const { accountId } = yield* yield* CloudflareEnvironment;
           // `dev: false` opts out of running a local Worker entirely —
           // typically because an external dev process (DevCommand) is
           // serving requests. Tear down any prior instance and return a