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

package/src/Cloudflare/Hyperdrive/Hyperdrive.ts

@@ -163,180 +163,177 @@ export const isHyperdrive = (value: unknown): value is Hyperdrive =>
   value.Type === "Cloudflare.Hyperdrive";
 
 export const HyperdriveProvider = () =>
-  Provider.effect(
-    Hyperdrive,
-    Effect.gen(function* () {
-      const { accountId } = yield* CloudflareEnvironment;
-      const createConfig = yield* hyperdrive.createConfig;
-      const getConfig = yield* hyperdrive.getConfig;
-      const updateConfig = yield* hyperdrive.updateConfig;
-      const deleteConfig = yield* hyperdrive.deleteConfig;
-      const listConfigs = yield* hyperdrive.listConfigs;
+  Provider.succeed(Hyperdrive, {
+    // The `hyperdriveId` is not marked as stable because if you start in dev mode, the ID will change on first deploy.
+    stables: ["accountId"],
+    diff: Effect.fn(function* ({ id, olds, news, output }) {
+      const { accountId } = yield* yield* CloudflareEnvironment;
+      const ctx = yield* AlchemyContext;
+      if (ctx.dev) return undefined;
 
-      const createConfigName = (id: string, name: string | undefined) =>
-        Effect.gen(function* () {
-          if (name) return name;
-          return yield* createPhysicalName({ id, lowercase: true });
-        });
-
-      const findByName = (name: string) =>
-        Effect.gen(function* () {
-          const list = yield* listConfigs({ accountId });
-          return list.result.find((c) => c.name === name);
-        });
-
-      return {
-        // The `hyperdriveId` is not marked as stable because if you start in dev mode, the ID will change on first deploy.
-        stables: ["accountId"],
-        diff: Effect.fn(function* ({ id, olds, news, output }) {
-          const ctx = yield* AlchemyContext;
-          if (ctx.dev) return undefined;
-
-          if (!isResolved(news)) return undefined;
-          if ((output?.accountId ?? accountId) !== accountId) {
-            return { action: "replace" } as const;
-          }
-          const name = yield* createConfigName(id, news.name);
-          const oldName = output?.name
-            ? output.name
-            : yield* createConfigName(id, olds.name);
-          if (oldName !== name) {
-            return { action: "replace" } as const;
-          }
-          if (!isHyperdriveId(output?.hyperdriveId)) {
-            return { action: "update" };
-          }
-        }),
-        read: Effect.fn(function* ({ id, output, olds }) {
-          const ctx = yield* AlchemyContext;
-          if (ctx.dev) {
-            return output;
-          }
+      if (!isResolved(news)) return undefined;
+      if ((output?.accountId ?? accountId) !== accountId) {
+        return { action: "replace" } as const;
+      }
+      const name = yield* createConfigName(id, news.name);
+      const oldName = output?.name
+        ? output.name
+        : yield* createConfigName(id, olds.name);
+      if (oldName !== name) {
+        return { action: "replace" } as const;
+      }
+      if (!isHyperdriveId(output?.hyperdriveId)) {
+        return { action: "update" };
+      }
+    }),
+    read: Effect.fn(function* ({ id, output, olds }) {
+      const { accountId } = yield* yield* CloudflareEnvironment;
+      const ctx = yield* AlchemyContext;
+      if (ctx.dev) {
+        return output;
+      }
 
-          if (isHyperdriveId(output?.hyperdriveId)) {
-            return yield* getConfig({
+      if (isHyperdriveId(output?.hyperdriveId)) {
+        return yield* hyperdrive
+          .getConfig({
+            accountId: output.accountId,
+            hyperdriveId: output.hyperdriveId,
+          })
+          .pipe(
+            Effect.map((c) => ({
+              hyperdriveId: c.id,
+              name: c.name,
               accountId: output.accountId,
-              hyperdriveId: output.hyperdriveId,
-            }).pipe(
-              Effect.map((c) => ({
-                hyperdriveId: c.id,
-                name: c.name,
-                accountId: output.accountId,
-                origin: {
-                  ...c.origin,
-                  password: olds?.origin?.password,
-                } as HyperdriveOrigin,
-                mtls: {
-                  caCertificateId: c.mtls?.caCertificateId ?? undefined,
-                  mtlsCertificateId: c.mtls?.mtlsCertificateId ?? undefined,
-                  sslmode: c.mtls?.sslmode ?? undefined,
-                } as HyperdriveMtls,
-                dev: output?.dev,
-              })),
-              Effect.catchTag("HyperdriveConfigNotFound", () =>
-                Effect.succeed(undefined),
-              ),
-            );
-          }
-          const name = yield* createConfigName(id, olds?.name);
-          const match = yield* findByName(name);
-          if (match) {
-            return {
-              hyperdriveId: match.id,
-              name: match.name,
-              accountId,
               origin: {
-                ...match.origin,
+                ...c.origin,
                 password: olds?.origin?.password,
               } as HyperdriveOrigin,
               mtls: {
-                caCertificateId: match.mtls?.caCertificateId ?? undefined,
-                mtlsCertificateId: match.mtls?.mtlsCertificateId ?? undefined,
-                sslmode: match.mtls?.sslmode ?? undefined,
+                caCertificateId: c.mtls?.caCertificateId ?? undefined,
+                mtlsCertificateId: c.mtls?.mtlsCertificateId ?? undefined,
+                sslmode: c.mtls?.sslmode ?? undefined,
               } as HyperdriveMtls,
               dev: output?.dev,
-            };
-          }
-          return undefined;
-        }),
-        reconcile: Effect.fn(function* ({ id, news, output }) {
-          const name = output?.name ?? (yield* createConfigName(id, news.name));
-
-          const ctx = yield* AlchemyContext;
-          if (ctx.dev) {
-            return {
-              hyperdriveId:
-                output?.hyperdriveId ?? `dev:${crypto.randomUUID()}`,
-              name,
-              accountId: output?.accountId ?? accountId,
-              origin: news.origin,
-              mtls: news.mtls ?? {},
-              dev: news.dev,
-            };
-          }
-
-          const requestBody = {
-            origin: toRequestOrigin(news.origin),
-            caching: news.caching,
-            mtls: news.mtls,
-            originConnectionLimit: news.originConnectionLimit,
-          };
+            })),
+            Effect.catchTag("HyperdriveConfigNotFound", () =>
+              Effect.succeed(undefined),
+            ),
+          );
+      }
+      const name = yield* createConfigName(id, olds?.name);
+      const match = yield* findByName(name);
+      if (match) {
+        return {
+          hyperdriveId: match.id,
+          name: match.name,
+          accountId,
+          origin: {
+            ...match.origin,
+            password: olds?.origin?.password,
+          } as HyperdriveOrigin,
+          mtls: {
+            caCertificateId: match.mtls?.caCertificateId ?? undefined,
+            mtlsCertificateId: match.mtls?.mtlsCertificateId ?? undefined,
+            sslmode: match.mtls?.sslmode ?? undefined,
+          } as HyperdriveMtls,
+          dev: output?.dev,
+        };
+      }
+      return undefined;
+    }),
+    reconcile: Effect.fn(function* ({ id, news, output }) {
+      const { accountId } = yield* yield* CloudflareEnvironment;
+      const name = output?.name ?? (yield* createConfigName(id, news.name));
 
-          // Observe + ensure. When we know the hyperdriveId we go straight
-          // to update; otherwise we createConfig and fall back to "find by
-          // name then update" if Cloudflare reports the name is already in
-          // use (race or a cold-start adoption).
-          const synced = isHyperdriveId(output?.hyperdriveId)
-            ? yield* updateConfig({
-                accountId: output.accountId,
-                hyperdriveId: output.hyperdriveId,
-                name: output.name,
-                ...requestBody,
-              })
-            : yield* createConfig({ accountId, name, ...requestBody }).pipe(
-                Effect.catchTag("InvalidHyperdriveConfig", (originalError) =>
-                  Effect.gen(function* () {
-                    const match = yield* findByName(name);
-                    if (!match) {
-                      return yield* Effect.fail(originalError);
-                    }
-                    return yield* updateConfig({
-                      accountId,
-                      hyperdriveId: match.id,
-                      name,
-                      ...requestBody,
-                    });
-                  }),
-                ),
-              );
+      const ctx = yield* AlchemyContext;
+      if (ctx.dev) {
+        return {
+          hyperdriveId: output?.hyperdriveId ?? `dev:${crypto.randomUUID()}`,
+          name,
+          accountId: output?.accountId ?? accountId,
+          origin: news.origin,
+          mtls: news.mtls ?? {},
+          dev: news.dev,
+        };
+      }
 
-          return {
-            hyperdriveId: synced.id,
-            name: synced.name,
-            accountId: output?.accountId ?? accountId,
-            origin: news.origin,
-            mtls: news.mtls ?? {},
-            dev: news.dev,
-          };
-        }),
-        delete: Effect.fn(function* ({ output }) {
-          if (!isHyperdriveId(output.hyperdriveId)) return;
+      const requestBody = {
+        origin: toRequestOrigin(news.origin),
+        caching: news.caching,
+        mtls: news.mtls,
+        originConnectionLimit: news.originConnectionLimit,
+      };
 
-          yield* deleteConfig({
+      // Observe + ensure. When we know the hyperdriveId we go straight
+      // to update; otherwise we createConfig and fall back to "find by
+      // name then update" if Cloudflare reports the name is already in
+      // use (race or a cold-start adoption).
+      const synced = isHyperdriveId(output?.hyperdriveId)
+        ? yield* hyperdrive.updateConfig({
             accountId: output.accountId,
             hyperdriveId: output.hyperdriveId,
-          }).pipe(
-            Effect.catchIf(
-              (e) =>
-                e._tag === "HyperdriveConfigNotFound" ||
-                (e._tag === "CloudflareHttpError" && e.status === 404),
-              () => Effect.void,
-            ),
-          );
-        }),
+            name: output.name,
+            ...requestBody,
+          })
+        : yield* hyperdrive
+            .createConfig({ accountId, name, ...requestBody })
+            .pipe(
+              Effect.catchTag("InvalidHyperdriveConfig", (originalError) =>
+                Effect.gen(function* () {
+                  const match = yield* findByName(name);
+                  if (!match) {
+                    return yield* Effect.fail(originalError);
+                  }
+                  return yield* hyperdrive.updateConfig({
+                    accountId,
+                    hyperdriveId: match.id,
+                    name,
+                    ...requestBody,
+                  });
+                }),
+              ),
+            );
+
+      return {
+        hyperdriveId: synced.id,
+        name: synced.name,
+        accountId: output?.accountId ?? accountId,
+        origin: news.origin,
+        mtls: news.mtls ?? {},
+        dev: news.dev,
       };
     }),
-  );
+    delete: Effect.fn(function* ({ output }) {
+      if (!isHyperdriveId(output.hyperdriveId)) return;
+
+      yield* hyperdrive
+        .deleteConfig({
+          accountId: output.accountId,
+          hyperdriveId: output.hyperdriveId,
+        })
+        .pipe(
+          Effect.catchIf(
+            (e) =>
+              e._tag === "HyperdriveConfigNotFound" ||
+              (e._tag === "CloudflareHttpError" && e.status === 404),
+            () => Effect.void,
+          ),
+        );
+    }),
+  });
+
+const createConfigName = (id: string, name: string | undefined) =>
+  Effect.gen(function* () {
+    if (name) return name;
+    return yield* createPhysicalName({ id, lowercase: true });
+  });
+
+const findByName = (name: string) =>
+  Effect.gen(function* () {
+    const { accountId } = yield* yield* CloudflareEnvironment;
+    const list = yield* hyperdrive.listConfigs({ accountId });
+    return list.result.find((c) => c.name === name);
+  });
 
 export const defaultPort = (scheme: HyperdriveScheme): number =>
   scheme === "mysql" ? 3306 : 5432;

package/src/Cloudflare/KV/KVNamespace.ts

@@ -66,151 +66,152 @@ export const KVNamespace = Resource<KVNamespace>("Cloudflare.KVNamespace")({
 });
 
 export const KVNamespaceProvider = () =>
-  Provider.effect(
-    KVNamespace,
-    Effect.gen(function* () {
-      const { accountId } = yield* CloudflareEnvironment;
-      const createNamespace = yield* kv.createNamespace;
-      const updateNamespace = yield* kv.updateNamespace;
-      const deleteNamespace = yield* kv.deleteNamespace;
-      const getNamespaceFn = yield* kv.getNamespace;
-
-      const createTitle = (id: string, title: string | undefined) =>
-        Effect.gen(function* () {
-          return title ?? (yield* createPhysicalName({ id }));
-        });
-
-      // Cloudflare's `listNamespaces` accepts no title/prefix filter, so
-      // adoption-by-name has to scan every page. Use the paginated
-      // `.items` stream off the un-yielded operation method (yielding
-      // `kv.listNamespaces` collapses it to a single-page call).
-      const findNamespaceByTitle = (title: string) =>
-        kv.listNamespaces.items({ accountId }).pipe(
-          Stream.filter((ns) => ns.title === title),
-          Stream.runHead,
-          Effect.map(Option.getOrUndefined),
-        );
-
-      return {
-        stables: ["namespaceId", "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 title = yield* createTitle(id, news.title);
-          const oldTitle =
-            output?.title ?? (yield* createTitle(id, olds.title));
-          if (title !== oldTitle) {
-            return { action: "update" } as const;
-          }
-        }),
-        reconcile: Effect.fn(function* ({ id, news = {}, output }) {
-          const title = yield* createTitle(id, news.title);
-          const acct = output?.accountId ?? accountId;
+  Provider.succeed(KVNamespace, {
+    stables: ["namespaceId", "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 title = yield* createTitle(id, news.title);
+      const oldTitle = output?.title ?? (yield* createTitle(id, olds.title));
+      if (title !== oldTitle) {
+        return { action: "update" } as const;
+      }
+    }),
+    reconcile: Effect.fn(function* ({ id, news = {}, output }) {
+      const { accountId } = yield* yield* CloudflareEnvironment;
+      const title = yield* createTitle(id, news.title);
+      const acct = output?.accountId ?? accountId;
 
-          // Observe — re-fetch the cached namespace; fall back to a title
-          // scan so we recover from out-of-band deletes or partial state
-          // persistence failures.
-          let observed:
-            | {
-                id: string;
-                title: string;
-                supportsUrlEncoding?: boolean | null | undefined;
-              }
-            | undefined;
-          if (output?.namespaceId) {
-            observed = yield* getNamespaceFn({
-              accountId: acct,
-              namespaceId: output.namespaceId,
-            }).pipe(
-              Effect.catchTag("NamespaceNotFound", () =>
-                Effect.succeed(undefined),
-              ),
-            );
+      // Observe — re-fetch the cached namespace; fall back to a title
+      // scan so we recover from out-of-band deletes or partial state
+      // persistence failures.
+      let observed:
+        | {
+            id: string;
+            title: string;
+            supportsUrlEncoding?: boolean | null | undefined;
           }
+        | undefined;
+      if (output?.namespaceId) {
+        observed = yield* kv
+          .getNamespace({
+            accountId: acct,
+            namespaceId: output.namespaceId,
+          })
+          .pipe(
+            Effect.catchTag("NamespaceNotFound", () =>
+              Effect.succeed(undefined),
+            ),
+          );
+      }
 
-          // Ensure — create if missing. Cloudflare returns
-          // `NamespaceTitleAlreadyExists` on a concurrent create; tolerate
-          // by adopting the namespace with the same title.
-          if (!observed) {
-            observed = yield* createNamespace({
-              accountId: acct,
-              title,
-            }).pipe(
-              Effect.catchTag("NamespaceTitleAlreadyExists", () =>
-                Effect.gen(function* () {
-                  const match = yield* findNamespaceByTitle(title);
-                  if (match) {
-                    return match;
-                  }
-                  return yield* Effect.die(
-                    `Namespace with title "${title}" already exists but could not be found`,
-                  );
-                }),
-              ),
-            );
-          }
+      // Ensure — create if missing. Cloudflare returns
+      // `NamespaceTitleAlreadyExists` on a concurrent create; tolerate
+      // by adopting the namespace with the same title.
+      if (!observed) {
+        observed = yield* kv
+          .createNamespace({
+            accountId: acct,
+            title,
+          })
+          .pipe(
+            Effect.catchTag("NamespaceTitleAlreadyExists", () =>
+              Effect.gen(function* () {
+                const match = yield* findNamespaceByTitle(title);
+                if (match) {
+                  return match;
+                }
+                return yield* Effect.die(
+                  `Namespace with title "${title}" already exists but could not be found`,
+                );
+              }),
+            ),
+          );
+      }
 
-          // Sync — KV's only mutable property is the title. Rename only
-          // when the observed title drifts from desired so we avoid
-          // unnecessary API calls on every reconcile.
-          let namespaceId = observed.id;
-          let resolvedTitle = observed.title;
-          let supportsUrlEncoding = observed.supportsUrlEncoding ?? undefined;
-          if (observed.title !== title) {
-            const renamed = yield* updateNamespace({
-              accountId: acct,
-              namespaceId: observed.id,
-              title,
-            });
-            namespaceId = renamed.id;
-            resolvedTitle = renamed.title;
-            supportsUrlEncoding = renamed.supportsUrlEncoding ?? undefined;
-          }
+      // Sync — KV's only mutable property is the title. Rename only
+      // when the observed title drifts from desired so we avoid
+      // unnecessary API calls on every reconcile.
+      let namespaceId = observed.id;
+      let resolvedTitle = observed.title;
+      let supportsUrlEncoding = observed.supportsUrlEncoding ?? undefined;
+      if (observed.title !== title) {
+        const renamed = yield* kv.updateNamespace({
+          accountId: acct,
+          namespaceId: observed.id,
+          title,
+        });
+        namespaceId = renamed.id;
+        resolvedTitle = renamed.title;
+        supportsUrlEncoding = renamed.supportsUrlEncoding ?? undefined;
+      }
 
-          return {
-            title: resolvedTitle,
-            namespaceId,
-            supportsUrlEncoding,
-            accountId: acct,
-          };
-        }),
-        delete: Effect.fn(function* ({ output }) {
-          yield* deleteNamespace({
+      return {
+        title: resolvedTitle,
+        namespaceId,
+        supportsUrlEncoding,
+        accountId: acct,
+      };
+    }),
+    delete: Effect.fn(function* ({ output }) {
+      yield* kv
+        .deleteNamespace({
+          accountId: output.accountId,
+          namespaceId: output.namespaceId,
+        })
+        .pipe(Effect.catchTag("NamespaceNotFound", () => Effect.void));
+    }),
+    read: Effect.fn(function* ({ id, olds, output }) {
+      const { accountId } = yield* yield* CloudflareEnvironment;
+      if (output?.namespaceId) {
+        return yield* kv
+          .getNamespace({
             accountId: output.accountId,
             namespaceId: output.namespaceId,
-          }).pipe(Effect.catchTag("NamespaceNotFound", () => Effect.void));
-        }),
-        read: Effect.fn(function* ({ id, olds, output }) {
-          if (output?.namespaceId) {
-            return yield* getNamespaceFn({
+          })
+          .pipe(
+            Effect.map((namespace) => ({
+              title: namespace.title,
+              namespaceId: namespace.id,
+              supportsUrlEncoding: namespace.supportsUrlEncoding ?? undefined,
               accountId: output.accountId,
-              namespaceId: output.namespaceId,
-            }).pipe(
-              Effect.map((namespace) => ({
-                title: namespace.title,
-                namespaceId: namespace.id,
-                supportsUrlEncoding: namespace.supportsUrlEncoding ?? undefined,
-                accountId: output.accountId,
-              })),
-              Effect.catchTag("NamespaceNotFound", () =>
-                Effect.succeed(undefined),
-              ),
-            );
-          }
-          const title = yield* createTitle(id, olds?.title);
-          const match = yield* findNamespaceByTitle(title);
-          if (match) {
-            return {
-              title: match.title,
-              namespaceId: match.id,
-              supportsUrlEncoding: match.supportsUrlEncoding ?? undefined,
-              accountId,
-            };
-          }
-          return undefined;
-        }),
-      };
+            })),
+            Effect.catchTag("NamespaceNotFound", () =>
+              Effect.succeed(undefined),
+            ),
+          );
+      }
+      const title = yield* createTitle(id, olds?.title);
+      const match = yield* findNamespaceByTitle(title);
+      if (match) {
+        return {
+          title: match.title,
+          namespaceId: match.id,
+          supportsUrlEncoding: match.supportsUrlEncoding ?? undefined,
+          accountId,
+        };
+      }
+      return undefined;
     }),
+  });
+
+const createTitle = (id: string, title: string | undefined) =>
+  Effect.gen(function* () {
+    return title ?? (yield* createPhysicalName({ id }));
+  });
+
+// Cloudflare's `listNamespaces` accepts no title/prefix filter, so
+// adoption-by-name has to scan every page. Use the paginated
+// `.items` stream off the un-yielded operation method (yielding
+// `kv.listNamespaces` collapses it to a single-page call).
+const findNamespaceByTitle = Effect.fnUntraced(function* (title: string) {
+  const { accountId } = yield* yield* CloudflareEnvironment;
+  return yield* kv.listNamespaces.items({ accountId }).pipe(
+    Stream.filter((ns) => ns.title === title),
+    Stream.runHead,
+    Effect.map(Option.getOrUndefined),
   );
+});