alchemy 2.0.0-beta.34 → 2.0.0-beta.36

package/src/Cloudflare/StateStore/State.ts

@@ -13,8 +13,11 @@ import * as Output from "../../Output.ts";
 import * as Config from "effect/Config";
 import { adopt } from "../../AdoptPolicy.ts";
 import { AuthError } from "../../Auth/AuthProvider.ts";
-import { readCredentials, writeCredentials } from "../../Auth/Credentials.ts";
-import { ALCHEMY_PROFILE } from "../../Auth/Profile.ts";
+import {
+  CredentialsStore,
+  CredentialsStoreLive,
+} from "../../Auth/Credentials.ts";
+import { ALCHEMY_PROFILE, ProfileLive } from "../../Auth/Profile.ts";
 import * as Cloudflare from "../../Cloudflare/Providers.ts";
 import { deploy } from "../../Deploy.ts";
 import * as Alchemy from "../../Stack.ts";
@@ -162,7 +165,8 @@ export const bootstrap = (options: BootstrapOptions = {}) =>
       );
       const credentials = yield* loginWithCloudflare();
       if (!isCI) {
-        yield* writeCredentials<HttpStateStoreCredentials>(
+        const store = yield* CredentialsStore;
+        yield* store.write<HttpStateStoreCredentials>(
           profileName,
           CREDENTIALS_FILE,
           credentials,
@@ -206,7 +210,8 @@ export const state = () =>
       const isCI = yield* Config.boolean("CI").pipe(Config.withDefault(false));
       const alchemyContext = yield* AlchemyContext;
       const profileName = yield* ALCHEMY_PROFILE;
-      const credentials = yield* readCredentials<HttpStateStoreCredentials>(
+      const store = yield* CredentialsStore;
+      const credentials = yield* store.read<HttpStateStoreCredentials>(
         profileName,
         CREDENTIALS_FILE,
       );
@@ -293,7 +298,7 @@ export const state = () =>
         // it exists, so fetch the secret token
         const credentials = yield* loginWithCloudflare();
         if (!isCI) {
-          yield* writeCredentials<HttpStateStoreCredentials>(
+          yield* store.write<HttpStateStoreCredentials>(
             profileName,
             CREDENTIALS_FILE,
             credentials,
@@ -348,6 +353,8 @@ export const state = () =>
     Layer.provideMerge(CloudflareEnvironment.fromProfile()),
     Layer.provideMerge(CloudflareAuth),
     Layer.provideMerge(Access.AccessLive),
+    Layer.provideMerge(ProfileLive),
+    Layer.provideMerge(CredentialsStoreLive),
     Layer.orDie,
   );
 
@@ -584,19 +591,21 @@ export const loginWithCloudflare = () =>
     if (!isCI) {
       // 4. Persist credentials. The profile entry is managed by
       //    `loadOrConfigure` when this is invoked through `configure`.
-      yield* writeCredentials<HttpStateStoreCredentials>(
-        profileName,
-        CREDENTIALS_FILE,
-        {
+      const credStore = yield* CredentialsStore;
+      yield* credStore
+        .write<HttpStateStoreCredentials>(profileName, CREDENTIALS_FILE, {
           url,
           authToken: authToken.trim(),
-        },
-      ).pipe(
-        Effect.mapError(
-          (e) =>
-            new AuthError({ message: "Failed to write credentials", cause: e }),
-        ),
-      );
+        })
+        .pipe(
+          Effect.mapError(
+            (e) =>
+              new AuthError({
+                message: "Failed to write credentials",
+                cause: e,
+              }),
+          ),
+        );
 
       yield* Clank.success(
         `HTTP state store credentials saved for '${profileName}'.`,

package/src/Cloudflare/Website/StaticSite.ts

@@ -1,4 +1,5 @@
 import * as Effect from "effect/Effect";
+import * as Redacted from "effect/Redacted";
 import { Command, type CommandProps } from "../../Build/Command.ts";
 import type { InputProps } from "../../Input.ts";
 import * as Namespace from "../../Namespace.ts";
@@ -135,7 +136,16 @@ export const StaticSite = <
         cwd: props.cwd,
         memo: props.memo,
         outdir: props.outdir,
-        env: props.env,
+        env: props.env
+          ? Object.fromEntries(
+              Object.entries(props.env).flatMap(([k, v]) => {
+                if (v === undefined) return [];
+                if (typeof v === "string" || Redacted.isRedacted(v))
+                  return [[k, v]];
+                return [[k, JSON.stringify(v)]];
+              }),
+            )
+          : undefined,
       })),
     );
 

package/src/Cloudflare/Workers/InferEnv.ts

@@ -27,6 +27,10 @@ type GetBindingType<T> = T extends Cloudflare.Assets
             ? Ai
             : T extends Cloudflare.Artifacts
               ? Artifacts
-              : T extends Cloudflare.DurableObjectNamespaceLike
-                ? DurableObjectNamespace<Exclude<T["Shape"], undefined>>
-                : never;
+              : T extends Cloudflare.Images
+                ? ImagesBinding
+                : T extends Cloudflare.Hyperdrive
+                  ? Hyperdrive
+                  : T extends Cloudflare.DurableObjectNamespaceLike
+                    ? DurableObjectNamespace<Exclude<T["Shape"], undefined>>
+                    : never;

package/src/Cloudflare/Workers/LocalWorkerProvider.ts

@@ -51,18 +51,25 @@ export const LocalWorkerProvider = () =>
           }
         }
         for (const [key, value] of Object.entries(props.env ?? {})) {
+          if (value === undefined) continue;
           if (Redacted.isRedacted(value)) {
             workerBindings.push({
               type: "secret_text",
               name: key,
               text: Redacted.value(value),
             });
-          } else {
+          } else if (typeof value === "string") {
             workerBindings.push({
               type: "plain_text",
               name: key,
               text: value,
             });
+          } else {
+            workerBindings.push({
+              type: "json",
+              name: key,
+              json: value,
+            });
           }
         }
         const result = yield* sidecar.serve({
@@ -88,6 +95,7 @@ export const LocalWorkerProvider = () =>
               sql: true,
             }),
           ),
+          userOptions: props.build,
         });
         return {
           workerId: name,