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

package/src/Cloudflare/Email/EmailAddress.ts

@@ -74,82 +74,85 @@ const toAttrs = (
 });
 
 export const EmailAddressProvider = () =>
-  Provider.effect(
-    EmailAddress,
-    Effect.gen(function* () {
-      const { accountId } = yield* CloudflareEnvironment;
-      const create = yield* emailRouting.createAddress;
-      const get = yield* emailRouting.getAddress;
-      const del = yield* emailRouting.deleteAddress;
+  Provider.succeed(EmailAddress, {
+    stables: ["addressId", "accountId", "email"],
+    diff: Effect.fn(function* ({ news, output }) {
+      const { accountId } = yield* yield* CloudflareEnvironment;
+      if (!output) return undefined;
+      if (output.accountId !== accountId) {
+        return { action: "replace" } as const;
+      }
+      if (!isResolved(news)) return undefined;
+      if (news.email !== output.email) {
+        return { action: "replace" } as const;
+      }
+      return undefined;
+    }),
+    read: Effect.fn(function* ({ output, olds }) {
+      const { accountId } = yield* yield* CloudflareEnvironment;
+      const identifier =
+        output?.addressId ??
+        (olds?.email ? encodeURIComponent(olds.email) : undefined);
+      if (!identifier) return undefined;
+      const acct = output?.accountId ?? accountId;
+      return yield* emailRouting
+        .getAddress({
+          accountId: acct,
+          destinationAddressIdentifier: identifier,
+        })
+        .pipe(
+          Effect.map((r) => toAttrs(acct, r)),
+          Effect.catch(() => Effect.succeed(undefined)),
+        );
+    }),
+    reconcile: Effect.fn(function* ({ news, output }) {
+      const { accountId } = yield* yield* CloudflareEnvironment;
+      const acct = output?.accountId ?? accountId;
+      const email = news.email;
+
+      // Observe — by addressId if known, else by email lookup.
+      let observed: ReturnType<typeof toAttrs> | undefined = output?.addressId
+        ? yield* emailRouting
+            .getAddress({
+              accountId: acct,
+              destinationAddressIdentifier: output.addressId,
+            })
+            .pipe(
+              Effect.map((r) => toAttrs(acct, r)),
+              Effect.catch(() => Effect.succeed(undefined)),
+            )
+        : undefined;
 
-      return {
-        stables: ["addressId", "accountId", "email"],
-        diff: Effect.fn(function* ({ news, output }) {
-          if (!output) return undefined;
-          if (output.accountId !== accountId) {
-            return { action: "replace" } as const;
-          }
-          if (!isResolved(news)) return undefined;
-          if (news.email !== output.email) {
-            return { action: "replace" } as const;
-          }
-          return undefined;
-        }),
-        read: Effect.fn(function* ({ output, olds }) {
-          const identifier =
-            output?.addressId ??
-            (olds?.email ? encodeURIComponent(olds.email) : undefined);
-          if (!identifier) return undefined;
-          const acct = output?.accountId ?? accountId;
-          return yield* get({
+      if (!observed) {
+        observed = yield* emailRouting
+          .getAddress({
             accountId: acct,
-            destinationAddressIdentifier: identifier,
-          }).pipe(
+            destinationAddressIdentifier: encodeURIComponent(email),
+          })
+          .pipe(
             Effect.map((r) => toAttrs(acct, r)),
             Effect.catch(() => Effect.succeed(undefined)),
           );
-        }),
-        reconcile: Effect.fn(function* ({ news, output }) {
-          const acct = output?.accountId ?? accountId;
-          const email = news.email;
+      }
 
-          // Observe — by addressId if known, else by email lookup.
-          let observed: ReturnType<typeof toAttrs> | undefined =
-            output?.addressId
-              ? yield* get({
-                  accountId: acct,
-                  destinationAddressIdentifier: output.addressId,
-                }).pipe(
-                  Effect.map((r) => toAttrs(acct, r)),
-                  Effect.catch(() => Effect.succeed(undefined)),
-                )
-              : undefined;
+      // Ensure — register the address if it doesn't already exist.
+      if (!observed) {
+        const created = yield* emailRouting.createAddress({
+          accountId: acct,
+          email,
+        });
+        observed = toAttrs(acct, created);
+      }
 
-          if (!observed) {
-            observed = yield* get({
-              accountId: acct,
-              destinationAddressIdentifier: encodeURIComponent(email),
-            }).pipe(
-              Effect.map((r) => toAttrs(acct, r)),
-              Effect.catch(() => Effect.succeed(undefined)),
-            );
-          }
-
-          // Ensure — register the address if it doesn't already exist.
-          if (!observed) {
-            const created = yield* create({ accountId: acct, email });
-            observed = toAttrs(acct, created);
-          }
-
-          return observed;
-        }),
-        delete: Effect.fn(function* ({ output }) {
-          if (!output?.addressId) return;
-          yield* del({
-            accountId: output.accountId,
-            destinationAddressIdentifier: output.addressId,
-          }).pipe(Effect.catch(() => Effect.void));
-        }),
-      };
+      return observed;
+    }),
+    delete: Effect.fn(function* ({ output }) {
+      if (!output?.addressId) return;
+      yield* emailRouting
+        .deleteAddress({
+          accountId: output.accountId,
+          destinationAddressIdentifier: output.addressId,
+        })
+        .pipe(Effect.catch(() => Effect.void));
     }),
-  );
+  });

package/src/Cloudflare/Email/EmailRouting.ts

@@ -57,82 +57,80 @@ export type EmailRouting = Resource<
  */
 export const EmailRouting = Resource<EmailRouting>("Cloudflare.EmailRouting");
 
-export const EmailRoutingProvider = () =>
-  Provider.effect(
-    EmailRouting,
-    Effect.gen(function* () {
-      const { accountId } = yield* CloudflareEnvironment;
-      const enable = yield* emailRouting.enableEmailRouting;
-      const disable = yield* emailRouting.disableEmailRouting;
-      const get = yield* emailRouting.getEmailRouting;
-
-      const resolve = (zone: ZoneReference) =>
-        resolveZoneId({
-          accountId,
-          zone,
-          hostname: typeof zone === "string" ? zone : (zone.name ?? ""),
-        });
+const resolve = Effect.fnUntraced(function* (zone: ZoneReference) {
+  const { accountId } = yield* yield* CloudflareEnvironment;
+  return yield* resolveZoneId({
+    accountId,
+    zone,
+    hostname: typeof zone === "string" ? zone : (zone.name ?? ""),
+  });
+});
 
+export const EmailRoutingProvider = () =>
+  Provider.succeed(EmailRouting, {
+    stables: ["zoneId", "routingId"],
+    diff: Effect.fn(function* ({ news, output }) {
+      if (!output) return undefined;
+      if (!isResolved(news)) return undefined;
+      const zoneId = yield* resolve(news.zone);
+      if (zoneId !== output.zoneId) {
+        return { action: "replace" } as const;
+      }
+      if ((news.enabled ?? true) !== output.enabled) {
+        return { action: "update" } as const;
+      }
+      return undefined;
+    }),
+    read: Effect.fn(function* ({ output }) {
+      if (!output?.zoneId) return undefined;
+      const result = yield* emailRouting.getEmailRouting({
+        zoneId: output.zoneId,
+      });
       return {
-        stables: ["zoneId", "routingId"],
-        diff: Effect.fn(function* ({ news, output }) {
-          if (!output) return undefined;
-          if (!isResolved(news)) return undefined;
-          const zoneId = yield* resolve(news.zone);
-          if (zoneId !== output.zoneId) {
-            return { action: "replace" } as const;
-          }
-          if ((news.enabled ?? true) !== output.enabled) {
-            return { action: "update" } as const;
-          }
-          return undefined;
-        }),
-        read: Effect.fn(function* ({ output }) {
-          if (!output?.zoneId) return undefined;
-          const result = yield* get({ zoneId: output.zoneId });
-          return {
-            routingId: result.id,
-            zoneId: output.zoneId,
-            name: result.name,
-            enabled: result.enabled,
-            status: (result.status ?? undefined) as
-              | EmailRoutingStatus
-              | undefined,
-          };
-        }),
-        reconcile: Effect.fn(function* ({ news, output }) {
-          const zoneId = output?.zoneId ?? (yield* resolve(news.zone));
-          const desired = news.enabled ?? true;
-
-          if (desired) {
-            const result = yield* enable({ zoneId, body: {} });
-            return {
-              routingId: result.id,
-              zoneId,
-              name: result.name,
-              enabled: result.enabled,
-              status: (result.status ?? undefined) as
-                | EmailRoutingStatus
-                | undefined,
-            };
-          } else {
-            const result = yield* disable({ zoneId, body: {} });
-            return {
-              routingId: result.id,
-              zoneId,
-              name: result.name,
-              enabled: result.enabled,
-              status: (result.status ?? undefined) as
-                | EmailRoutingStatus
-                | undefined,
-            };
-          }
-        }),
-        delete: Effect.fn(function* ({ output }) {
-          yield* disable({ zoneId: output.zoneId, body: {} }).pipe(
-            Effect.catch(() => Effect.void),
-          );
-        }),
+        routingId: result.id,
+        zoneId: output.zoneId,
+        name: result.name,
+        enabled: result.enabled,
+        status: (result.status ?? undefined) as EmailRoutingStatus | undefined,
       };
     }),
-  );
+    reconcile: Effect.fn(function* ({ news, output }) {
+      const zoneId = output?.zoneId ?? (yield* resolve(news.zone));
+      const desired = news.enabled ?? true;
+
+      if (desired) {
+        const result = yield* emailRouting.enableEmailRouting({
+          zoneId,
+          body: {},
+        });
+        return {
+          routingId: result.id,
+          zoneId,
+          name: result.name,
+          enabled: result.enabled,
+          status: (result.status ?? undefined) as
+            | EmailRoutingStatus
+            | undefined,
+        };
+      } else {
+        const result = yield* emailRouting.disableEmailRouting({
+          zoneId,
+          body: {},
+        });
+        return {
+          routingId: result.id,
+          zoneId,
+          name: result.name,
+          enabled: result.enabled,
+          status: (result.status ?? undefined) as
+            | EmailRoutingStatus
+            | undefined,
+        };
+      }
+    }),
+    delete: Effect.fn(function* ({ output }) {
+      yield* emailRouting
+        .disableEmailRouting({ zoneId: output.zoneId, body: {} })
+        .pipe(Effect.catch(() => Effect.void));
+    }),
+  });

package/src/Cloudflare/Email/EmailRule.ts

@@ -122,89 +122,88 @@ const normalize = (
   ),
 });
 
-export const EmailRuleProvider = () =>
-  Provider.effect(
-    EmailRule,
-    Effect.gen(function* () {
-      const { accountId } = yield* CloudflareEnvironment;
-      const create = yield* emailRouting.createRule;
-      const update = yield* emailRouting.updateRule;
-      const get = yield* emailRouting.getRule;
-      const del = yield* emailRouting.deleteRule;
+const resolve = Effect.fnUntraced(function* (zone: ZoneReference) {
+  const { accountId } = yield* yield* CloudflareEnvironment;
+  return yield* resolveZoneId({
+    accountId,
+    zone,
+    hostname: typeof zone === "string" ? zone : (zone.name ?? ""),
+  });
+});
 
-      const resolve = (zone: ZoneReference) =>
-        resolveZoneId({
-          accountId,
-          zone,
-          hostname: typeof zone === "string" ? zone : (zone.name ?? ""),
-        });
+export const EmailRuleProvider = () =>
+  Provider.succeed(EmailRule, {
+    stables: ["ruleId", "zoneId"],
+    diff: Effect.fn(function* ({ news, output }) {
+      if (!output) return undefined;
+      if (!isResolved(news)) return undefined;
+      const zoneId = yield* resolve(news.zone);
+      if (zoneId !== output.zoneId) {
+        return { action: "replace" } as const;
+      }
+      return undefined;
+    }),
+    read: Effect.fn(function* ({ output }) {
+      if (!output?.ruleId || !output?.zoneId) return undefined;
+      return yield* emailRouting
+        .getRule({
+          zoneId: output.zoneId,
+          ruleIdentifier: output.ruleId,
+        })
+        .pipe(
+          Effect.map((r) => normalize(r, output.zoneId)),
+          Effect.catch(() => Effect.succeed(undefined)),
+        );
+    }),
+    reconcile: Effect.fn(function* ({ news, output }) {
+      const zoneId = output?.zoneId ?? (yield* resolve(news.zone));
+      const body = {
+        actions: news.actions.map((a) =>
+          a.type === "drop"
+            ? { type: a.type }
+            : { type: a.type, value: a.value },
+        ),
+        matchers: news.matchers.map((m) =>
+          m.type === "all"
+            ? { type: "all" as const }
+            : {
+                type: "literal" as const,
+                field: "to" as const,
+                value: m.value,
+              },
+        ),
+        enabled: news.enabled ?? true,
+        name: news.name ?? "",
+        priority: news.priority ?? 0,
+      };
 
-      return {
-        stables: ["ruleId", "zoneId"],
-        diff: Effect.fn(function* ({ news, output }) {
-          if (!output) return undefined;
-          if (!isResolved(news)) return undefined;
-          const zoneId = yield* resolve(news.zone);
-          if (zoneId !== output.zoneId) {
-            return { action: "replace" } as const;
-          }
-          return undefined;
-        }),
-        read: Effect.fn(function* ({ output }) {
-          if (!output?.ruleId || !output?.zoneId) return undefined;
-          return yield* get({
-            zoneId: output.zoneId,
+      if (output?.ruleId) {
+        const result = yield* emailRouting
+          .updateRule({
+            zoneId,
             ruleIdentifier: output.ruleId,
-          }).pipe(
-            Effect.map((r) => normalize(r, output.zoneId)),
-            Effect.catch(() => Effect.succeed(undefined)),
-          );
-        }),
-        reconcile: Effect.fn(function* ({ news, output }) {
-          const zoneId = output?.zoneId ?? (yield* resolve(news.zone));
-          const body = {
-            actions: news.actions.map((a) =>
-              a.type === "drop"
-                ? { type: a.type }
-                : { type: a.type, value: a.value },
+            ...body,
+          })
+          .pipe(
+            Effect.catch(() =>
+              emailRouting
+                .createRule({ zoneId, ...body })
+                .pipe(Effect.map((r) => r)),
             ),
-            matchers: news.matchers.map((m) =>
-              m.type === "all"
-                ? { type: "all" as const }
-                : {
-                    type: "literal" as const,
-                    field: "to" as const,
-                    value: m.value,
-                  },
-            ),
-            enabled: news.enabled ?? true,
-            name: news.name ?? "",
-            priority: news.priority ?? 0,
-          };
-
-          if (output?.ruleId) {
-            const result = yield* update({
-              zoneId,
-              ruleIdentifier: output.ruleId,
-              ...body,
-            }).pipe(
-              Effect.catch(() =>
-                create({ zoneId, ...body }).pipe(Effect.map((r) => r)),
-              ),
-            );
-            return normalize(result, zoneId);
-          }
+          );
+        return normalize(result, zoneId);
+      }
 
-          const result = yield* create({ zoneId, ...body });
-          return normalize(result, zoneId);
-        }),
-        delete: Effect.fn(function* ({ output }) {
-          if (!output?.ruleId) return;
-          yield* del({
-            zoneId: output.zoneId,
-            ruleIdentifier: output.ruleId,
-          }).pipe(Effect.catch(() => Effect.void));
-        }),
-      };
+      const result = yield* emailRouting.createRule({ zoneId, ...body });
+      return normalize(result, zoneId);
+    }),
+    delete: Effect.fn(function* ({ output }) {
+      if (!output?.ruleId) return;
+      yield* emailRouting
+        .deleteRule({
+          zoneId: output.zoneId,
+          ruleIdentifier: output.ruleId,
+        })
+        .pipe(Effect.catch(() => Effect.void));
     }),
-  );
+  });