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

package/src/Cloudflare/Tunnel/TunnelRead.ts

@@ -15,6 +15,7 @@ import * as Layer from "effect/Layer";
 import * as Binding from "../../Binding.ts";
 import type { RuntimeContext } from "../../RuntimeContext.ts";
 import type { AccountApiToken } from "../ApiToken/AccountApiToken.ts";
+import type { CloudflareEnvironment } from "../CloudflareEnvironment.ts";
 import type { Worker } from "../Workers/Worker.ts";
 import {
   authorizeWith,
@@ -142,7 +143,7 @@ export const readClient = (token: TunnelToken): TunnelReadClient => {
  */
 export class TunnelRead extends Binding.Service<
   TunnelRead,
-  () => Effect.Effect<TunnelReadClient, never, Worker>
+  () => Effect.Effect<TunnelReadClient, never, Worker | CloudflareEnvironment>
 >()("Cloudflare.TunnelRead") {}
 
 /**
@@ -151,7 +152,7 @@ export class TunnelRead extends Binding.Service<
  */
 export class TunnelReadPolicy extends Binding.Policy<
   TunnelReadPolicy,
-  (token: AccountApiToken) => Effect.Effect<void>
+  (token: AccountApiToken) => Effect.Effect<void, never, CloudflareEnvironment>
 >()("Cloudflare.TunnelRead") {}
 
 /** Runtime layer for {@link TunnelRead}. */

package/src/Cloudflare/Tunnel/TunnelReadWrite.ts

@@ -2,6 +2,7 @@ import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
 import * as Binding from "../../Binding.ts";
 import type { AccountApiToken } from "../ApiToken/AccountApiToken.ts";
+import type { CloudflareEnvironment } from "../CloudflareEnvironment.ts";
 import type { Worker } from "../Workers/Worker.ts";
 import {
   makeTunnelClient,
@@ -61,7 +62,11 @@ export const readWriteClient = (token: TunnelToken): TunnelReadWriteClient => ({
  */
 export class TunnelReadWrite extends Binding.Service<
   TunnelReadWrite,
-  () => Effect.Effect<TunnelReadWriteClient, never, Worker>
+  () => Effect.Effect<
+    TunnelReadWriteClient,
+    never,
+    Worker | CloudflareEnvironment
+  >
 >()("Cloudflare.TunnelReadWrite") {}
 
 /**
@@ -71,7 +76,7 @@ export class TunnelReadWrite extends Binding.Service<
  */
 export class TunnelReadWritePolicy extends Binding.Policy<
   TunnelReadWritePolicy,
-  (token: AccountApiToken) => Effect.Effect<void>
+  (token: AccountApiToken) => Effect.Effect<void, never, CloudflareEnvironment>
 >()("Cloudflare.TunnelReadWrite") {}
 
 /** Runtime layer for {@link TunnelReadWrite}. */

package/src/Cloudflare/Tunnel/TunnelWrite.ts

@@ -17,6 +17,7 @@ import * as Layer from "effect/Layer";
 import * as Binding from "../../Binding.ts";
 import type { RuntimeContext } from "../../RuntimeContext.ts";
 import type { AccountApiToken } from "../ApiToken/AccountApiToken.ts";
+import type { CloudflareEnvironment } from "../CloudflareEnvironment.ts";
 import type { Worker } from "../Workers/Worker.ts";
 import {
   authorizeWith,
@@ -168,7 +169,7 @@ export const writeClient = (token: TunnelToken): TunnelWriteClient => {
  */
 export class TunnelWrite extends Binding.Service<
   TunnelWrite,
-  () => Effect.Effect<TunnelWriteClient, never, Worker>
+  () => Effect.Effect<TunnelWriteClient, never, Worker | CloudflareEnvironment>
 >()("Cloudflare.TunnelWrite") {}
 
 /**
@@ -177,7 +178,7 @@ export class TunnelWrite extends Binding.Service<
  */
 export class TunnelWritePolicy extends Binding.Policy<
   TunnelWritePolicy,
-  (token: AccountApiToken) => Effect.Effect<void>
+  (token: AccountApiToken) => Effect.Effect<void, never, CloudflareEnvironment>
 >()("Cloudflare.TunnelWrite") {}
 
 /** Runtime layer for {@link TunnelWrite}. */

package/src/Cloudflare/Vectorize/VectorizeIndex.ts

@@ -140,111 +140,90 @@ export const isVectorizeIndex = (value: unknown): value is VectorizeIndex =>
   Predicate.hasProperty(value, "Type") && value.Type === VectorizeIndexTypeId;
 
 export const VectorizeIndexProvider = () =>
-  Provider.effect(
-    VectorizeIndex,
-    Effect.gen(function* () {
-      const { accountId } = yield* CloudflareEnvironment;
-      const createIndex = yield* vectorize.createIndex;
-      const getIndex = yield* vectorize.getIndex;
-      const deleteIndex = yield* vectorize.deleteIndex;
-
-      const createIndexName = (id: string, name: string | undefined) =>
-        Effect.gen(function* () {
-          return name ?? (yield* createPhysicalName({ id, lowercase: true }));
-        });
-
-      const buildConfig = (
-        news: VectorizeIndexProps,
-      ): vectorize.CreateIndexRequest["config"] =>
-        news.preset !== undefined
-          ? // `VectorizePreset` is intentionally open (`| (string & {})`) so
-            // new Cloudflare presets aren't blocked by stale types. The
-            // distilled type is the strict-at-release-time union; cast
-            // through for the API call.
-            ({
-              preset: news.preset as never,
-            } as vectorize.CreateIndexRequest["config"])
-          : {
-              dimensions: news.dimensions!,
-              metric: news.metric ?? DEFAULT_METRIC,
-            };
+  Provider.succeed(VectorizeIndex, {
+    stables: ["indexName", "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* createIndexName(id, news.name);
+      const oldName = output?.indexName
+        ? output.indexName
+        : yield* createIndexName(id, olds.name);
+      if (
+        oldName !== name ||
+        (news.preset ?? undefined) !== (olds.preset ?? undefined) ||
+        (news.dimensions ?? undefined) !== (olds.dimensions ?? undefined) ||
+        (news.metric ?? DEFAULT_METRIC) !== (olds.metric ?? DEFAULT_METRIC) ||
+        (news.description ?? undefined) !== (olds.description ?? undefined)
+      ) {
+        return { action: "replace" } as const;
+      }
+      return undefined;
+    }),
+    read: Effect.fn(function* ({ id, output, olds }) {
+      const { accountId } = yield* yield* CloudflareEnvironment;
+      const acct = output?.accountId ?? accountId;
+      const name =
+        output?.indexName ?? (yield* createIndexName(id, olds?.name));
+      return yield* vectorize
+        .getIndex({ accountId: acct, indexName: name })
+        .pipe(
+          Effect.map((index) => toAttributes(index, name, acct)),
+          Effect.catchTag(["NotFound", "Gone"], () =>
+            Effect.succeed(undefined),
+          ),
+        );
+    }),
+    reconcile: Effect.fn(function* ({ id, news = {} }) {
+      const { accountId } = yield* yield* CloudflareEnvironment;
+      const indexName = yield* createIndexName(id, news.name);
 
-      return {
-        stables: ["indexName", "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* createIndexName(id, news.name);
-          const oldName = output?.indexName
-            ? output.indexName
-            : yield* createIndexName(id, olds.name);
-          if (
-            oldName !== name ||
-            (news.preset ?? undefined) !== (olds.preset ?? undefined) ||
-            (news.dimensions ?? undefined) !== (olds.dimensions ?? undefined) ||
-            (news.metric ?? DEFAULT_METRIC) !==
-              (olds.metric ?? DEFAULT_METRIC) ||
-            (news.description ?? undefined) !== (olds.description ?? undefined)
-          ) {
-            return { action: "replace" } as const;
-          }
-          return undefined;
-        }),
-        read: Effect.fn(function* ({ id, output, olds }) {
-          const acct = output?.accountId ?? accountId;
-          const name =
-            output?.indexName ?? (yield* createIndexName(id, olds?.name));
-          return yield* getIndex({ accountId: acct, indexName: name }).pipe(
-            Effect.map((index) => toAttributes(index, name, acct)),
-            Effect.catchTag(["NotFound", "Gone"], () =>
-              Effect.succeed(undefined),
-            ),
-          );
-        }),
-        reconcile: Effect.fn(function* ({ id, news = {} }) {
-          const indexName = yield* createIndexName(id, news.name);
+      // Observe — read the live index by name. The name is the stable
+      // identifier; fall back through a NotFound to the create path so
+      // we recover from out-of-band deletes or partial state-persistence.
+      let observed = yield* vectorize
+        .getIndex({
+          accountId,
+          indexName,
+        })
+        .pipe(
+          Effect.catchTag(["NotFound", "Gone"], () =>
+            Effect.succeed(undefined),
+          ),
+        );
 
-          // Observe — read the live index by name. The name is the stable
-          // identifier; fall back through a NotFound to the create path so
-          // we recover from out-of-band deletes or partial state-persistence.
-          let observed = yield* getIndex({
+      // Ensure — create if missing. Cloudflare returns 409 Conflict when
+      // an index with the same name already exists; tolerate the race by
+      // re-reading it.
+      if (!observed) {
+        observed = yield* vectorize
+          .createIndex({
             accountId,
-            indexName,
-          }).pipe(
-            Effect.catchTag(["NotFound", "Gone"], () =>
-              Effect.succeed(undefined),
+            name: indexName,
+            config: buildConfig(news),
+            description: news.description,
+          })
+          .pipe(
+            Effect.catchTag("IndexAlreadyExists", () =>
+              vectorize.getIndex({ accountId, indexName }),
             ),
           );
+      }
 
-          // Ensure — create if missing. Cloudflare returns 409 Conflict when
-          // an index with the same name already exists; tolerate the race by
-          // re-reading it.
-          if (!observed) {
-            observed = yield* createIndex({
-              accountId,
-              name: indexName,
-              config: buildConfig(news),
-              description: news.description,
-            }).pipe(
-              Effect.catchTag("IndexAlreadyExists", () =>
-                getIndex({ accountId, indexName }),
-              ),
-            );
-          }
-
-          return toAttributes(observed, indexName, accountId);
-        }),
-        delete: Effect.fn(function* ({ output }) {
-          yield* deleteIndex({
-            accountId: output.accountId,
-            indexName: output.indexName,
-          }).pipe(Effect.catchTag(["NotFound", "Gone"], () => Effect.void));
-        }),
-      };
+      return toAttributes(observed, indexName, accountId);
+    }),
+    delete: Effect.fn(function* ({ output }) {
+      yield* vectorize
+        .deleteIndex({
+          accountId: output.accountId,
+          indexName: output.indexName,
+        })
+        .pipe(Effect.catchTag(["NotFound", "Gone"], () => Effect.void));
     }),
-  );
+  });
 
 const toAttributes = (
   index: vectorize.GetIndexResponse | vectorize.CreateIndexResponse,
@@ -260,3 +239,24 @@ const toAttributes = (
   createdOn: index.createdOn ?? undefined,
   modifiedOn: index.modifiedOn ?? undefined,
 });
+
+const createIndexName = (id: string, name: string | undefined) =>
+  Effect.gen(function* () {
+    return name ?? (yield* createPhysicalName({ id, lowercase: true }));
+  });
+
+const buildConfig = (
+  news: VectorizeIndexProps,
+): vectorize.CreateIndexRequest["config"] =>
+  news.preset !== undefined
+    ? // `VectorizePreset` is intentionally open (`| (string & {})`) so
+      // new Cloudflare presets aren't blocked by stale types. The
+      // distilled type is the strict-at-release-time union; cast
+      // through for the API call.
+      ({
+        preset: news.preset as never,
+      } as vectorize.CreateIndexRequest["config"])
+    : {
+        dimensions: news.dimensions!,
+        metric: news.metric ?? DEFAULT_METRIC,
+      };

package/src/Cloudflare/Vectorize/VectorizeMetadataIndex.ts

@@ -87,122 +87,110 @@ export const VectorizeMetadataIndex = Resource<VectorizeMetadataIndex>(
 );
 
 export const VectorizeMetadataIndexProvider = () =>
-  Provider.effect(
-    VectorizeMetadataIndex,
-    Effect.gen(function* () {
-      const { accountId } = yield* CloudflareEnvironment;
-      const createMetadataIndex = yield* vectorize.createIndexMetadataIndex;
-      const deleteMetadataIndex = yield* vectorize.deleteIndexMetadataIndex;
-      const listMetadataIndexes = yield* vectorize.listIndexMetadataIndexes;
+  Provider.succeed(VectorizeMetadataIndex, {
+    stables: ["propertyName", "indexName", "accountId"],
+    diff: Effect.fn(function* ({ olds, news, output }) {
+      const { accountId } = yield* yield* CloudflareEnvironment;
+      if (!isResolved(news)) return undefined;
+      if ((output?.accountId ?? accountId) !== accountId) {
+        return { action: "replace" } as const;
+      }
+      const newIndexName = news.indexName;
+      const oldIndexName = output?.indexName ?? olds.indexName;
+      if (
+        (oldIndexName ?? newIndexName) !== newIndexName ||
+        (olds.propertyName ?? news.propertyName) !== news.propertyName ||
+        (olds.indexType ?? news.indexType) !== news.indexType
+      ) {
+        return { action: "replace" } as const;
+      }
+      return undefined;
+    }),
+    read: Effect.fn(function* ({ output, olds }) {
+      const { accountId } = yield* yield* CloudflareEnvironment;
+      const acct = output?.accountId ?? accountId;
+      const indexName = output?.indexName ?? olds?.indexName;
+      const propertyName = output?.propertyName ?? olds?.propertyName;
+      if (!indexName || !propertyName) return undefined;
+      const existing = yield* findExisting(acct, indexName, propertyName);
+      if (!existing?.propertyName || !existing.indexType) return undefined;
+      return {
+        propertyName: existing.propertyName,
+        indexType: existing.indexType,
+        indexName,
+        accountId: acct,
+        mutationId: output?.mutationId,
+      };
+    }),
+    reconcile: Effect.fn(function* ({ news, output }) {
+      const { accountId } = yield* yield* CloudflareEnvironment;
+      const acct = output?.accountId ?? accountId;
+      const indexName = news.indexName;
 
-      const findExisting = (
-        acct: string,
-        indexName: string,
-        propertyName: string,
-      ) =>
-        listMetadataIndexes({
-          accountId: acct,
-          indexName,
-        }).pipe(
-          Effect.map((res) => {
-            const index = res.metadataIndexes?.find(
-              (m) => m.propertyName === propertyName,
-            );
-            return index
-              ? {
-                  propertyName: index.propertyName,
-                  indexType:
-                    index.indexType?.toLowerCase() as MetadataIndexType,
-                }
-              : undefined;
-          }),
-          Effect.catchTag(["NotFound", "Gone"], () =>
-            Effect.succeed(undefined),
-          ),
-        );
+      // Observe — list metadata indexes on the parent and look for one
+      // matching propertyName.
+      const existing = yield* findExisting(acct, indexName, news.propertyName);
 
-      return {
-        stables: ["propertyName", "indexName", "accountId"],
-        diff: Effect.fn(function* ({ olds, news, output }) {
-          if (!isResolved(news)) return undefined;
-          if ((output?.accountId ?? accountId) !== accountId) {
-            return { action: "replace" } as const;
-          }
-          const newIndexName = news.indexName;
-          const oldIndexName = output?.indexName ?? olds.indexName;
-          if (
-            (oldIndexName ?? newIndexName) !== newIndexName ||
-            (olds.propertyName ?? news.propertyName) !== news.propertyName ||
-            (olds.indexType ?? news.indexType) !== news.indexType
-          ) {
-            return { action: "replace" } as const;
-          }
-          return undefined;
-        }),
-        read: Effect.fn(function* ({ output, olds }) {
-          const acct = output?.accountId ?? accountId;
-          const indexName = output?.indexName ?? olds?.indexName;
-          const propertyName = output?.propertyName ?? olds?.propertyName;
-          if (!indexName || !propertyName) return undefined;
-          const existing = yield* findExisting(acct, indexName, propertyName);
-          if (!existing?.propertyName || !existing.indexType) return undefined;
-          return {
-            propertyName: existing.propertyName,
-            indexType: existing.indexType,
-            indexName,
+      // Ensure — create if missing. Cloudflare returns 409 Conflict on
+      // duplicate; tolerate the race by reusing the prior mutationId.
+      let mutationId = output?.mutationId;
+      if (!existing) {
+        const created = yield* vectorize
+          .createIndexMetadataIndex({
             accountId: acct,
-            mutationId: output?.mutationId,
-          };
-        }),
-        reconcile: Effect.fn(function* ({ news, output }) {
-          const acct = output?.accountId ?? accountId;
-          const indexName = news.indexName;
-
-          // Observe — list metadata indexes on the parent and look for one
-          // matching propertyName.
-          const existing = yield* findExisting(
-            acct,
             indexName,
-            news.propertyName,
-          );
-
-          // Ensure — create if missing. Cloudflare returns 409 Conflict on
-          // duplicate; tolerate the race by reusing the prior mutationId.
-          let mutationId = output?.mutationId;
-          if (!existing) {
-            const created = yield* createMetadataIndex({
-              accountId: acct,
-              indexName,
-              propertyName: news.propertyName,
-              indexType: news.indexType,
-            }).pipe(
-              Effect.catchTag("MetadataIndexAlreadyExists", () =>
-                Effect.succeed({ mutationId: output?.mutationId }),
-              ),
-            );
-            mutationId = created.mutationId ?? undefined;
-          }
-
-          return {
             propertyName: news.propertyName,
             indexType: news.indexType,
-            indexName,
-            accountId: acct,
-            mutationId,
-          };
-        }),
-        delete: Effect.fn(function* ({ output }) {
-          yield* deleteMetadataIndex({
-            accountId: output.accountId,
-            indexName: output.indexName,
-            propertyName: output.propertyName,
-          }).pipe(
-            Effect.catchTag(
-              ["NotFound", "Gone", "MetadataIndexNotFound"],
-              () => Effect.void,
+          })
+          .pipe(
+            Effect.catchTag("MetadataIndexAlreadyExists", () =>
+              Effect.succeed({ mutationId: output?.mutationId }),
             ),
           );
-        }),
+        mutationId = created.mutationId ?? undefined;
+      }
+
+      return {
+        propertyName: news.propertyName,
+        indexType: news.indexType,
+        indexName,
+        accountId: acct,
+        mutationId,
       };
     }),
-  );
+    delete: Effect.fn(function* ({ output }) {
+      yield* vectorize
+        .deleteIndexMetadataIndex({
+          accountId: output.accountId,
+          indexName: output.indexName,
+          propertyName: output.propertyName,
+        })
+        .pipe(
+          Effect.catchTag(
+            ["NotFound", "Gone", "MetadataIndexNotFound"],
+            () => Effect.void,
+          ),
+        );
+    }),
+  });
+
+const findExisting = (acct: string, indexName: string, propertyName: string) =>
+  vectorize
+    .listIndexMetadataIndexes({
+      accountId: acct,
+      indexName,
+    })
+    .pipe(
+      Effect.map((res) => {
+        const index = res.metadataIndexes?.find(
+          (m) => m.propertyName === propertyName,
+        );
+        return index
+          ? {
+              propertyName: index.propertyName,
+              indexType: index.indexType?.toLowerCase() as MetadataIndexType,
+            }
+          : undefined;
+      }),
+      Effect.catchTag(["NotFound", "Gone"], () => Effect.succeed(undefined)),
+    );