alchemy-effect 0.2.0 → 0.3.0

package/src/aws/sqs/queue.ts

@@ -1,7 +1,6 @@
 import type * as S from "effect/Schema";
-
-import { Resource } from "alchemy-effect";
-
+import type { Input } from "../../input.ts";
+import { Resource } from "../../resource.ts";
 // required to avoid this error in consumers: "The inferred type of 'Messages' cannot be named without a reference to '../../effect-aws/node_modules/@types/aws-lambda'. This is likely not portable. A type annotation is necessary.ts(2742)"
 export type * as lambda from "aws-lambda";
 
@@ -15,7 +14,13 @@ export const Queue = Resource<{
 export interface Queue<
   ID extends string = string,
   Props extends QueueProps = QueueProps,
-> extends Resource<"AWS.SQS.Queue", ID, Props, QueueAttrs<Props>> {}
+> extends Resource<
+    "AWS.SQS.Queue",
+    ID,
+    Props,
+    QueueAttrs<Extract<Input.Resolve<Props>, QueueProps>>,
+    Queue
+  > {}
 
 export type QueueAttrs<Props extends QueueProps> = {
   queueName: Props["queueName"] extends string ? Props["queueName"] : string;

package/src/binding.ts

@@ -2,9 +2,9 @@ import * as Context from "effect/Context";
 import type { Effect } from "effect/Effect";
 import * as Layer from "effect/Layer";
 import type { Capability, ICapability } from "./capability.ts";
-import type { Diff } from "./provider.ts";
-import type { Resource } from "./resource.ts";
-import type { Runtime } from "./runtime.ts";
+import type { Diff } from "./diff.ts";
+import type { IResource, Resource } from "./resource.ts";
+import type { IRuntime } from "./runtime.ts";
 
 export interface BindingProps {
   [key: string]: any;
@@ -13,7 +13,7 @@ export interface BindingProps {
 export const isBinding = (b: any): b is AnyBinding =>
   "runtime" in b && "capability" in b && "tag" in b && "output" in b;
 
-export type AnyBinding<F extends Runtime = any> = Binding<
+export type AnyBinding<F extends IRuntime = any> = Binding<
   F,
   any,
   any,
@@ -23,7 +23,7 @@ export type AnyBinding<F extends Runtime = any> = Binding<
 >;
 
 export interface Binding<
-  Run extends Runtime<any, any, any>,
+  Run extends IRuntime<any, any, any>,
   Cap extends Capability = Capability,
   Props = any,
   Attr extends Run["binding"] = any,
@@ -40,14 +40,14 @@ export interface Binding<
 
 /** Tag for a Service that can bind a Capability to a Runtime */
 export interface Bind<
-  F extends Runtime,
+  F extends IRuntime,
   Cap extends Capability,
   Tag extends string,
 > extends Context.Tag<
     `${F["type"]}(${Cap["type"]}, ${Tag})`,
     BindingService<
       F,
-      Extract<Extract<Cap["resource"], Resource>["parent"], Resource>,
+      Extract<Extract<Cap["resource"], Resource>["base"], Resource>,
       F["props"]
     >
   > {
@@ -91,12 +91,12 @@ export const Binding: {
         effect: (eff) => Layer.effect(Tag, eff),
         succeed: (service) => Layer.succeed(Tag, service),
       },
-    } satisfies BindingDeclaration<Runtime, any>,
+    } satisfies BindingDeclaration<IRuntime, any>,
   );
 };
 
 export interface BindingDeclaration<
-  Run extends Runtime,
+  Run extends IRuntime,
   F extends (target: any, props?: any) => AnyBinding<Run>,
   Tag extends string = ReturnType<F>["tag"],
   Cap extends Capability = ReturnType<F>["capability"],
@@ -126,8 +126,8 @@ export interface BindingDeclaration<
 }
 
 export interface BindingDiffProps<
-  Source extends Resource = Resource,
-  Target extends Resource = Resource,
+  Source extends IResource = IResource,
+  Target extends IResource = IResource,
   Props = any,
   Attr = any,
 > {
@@ -148,8 +148,8 @@ export interface BindingDiffProps<
 }
 
 export interface BindingAttachProps<
-  Source extends Resource,
-  Target extends Resource,
+  Source extends IResource,
+  Target extends IResource,
   Props,
   Attr,
 > {
@@ -168,8 +168,8 @@ export interface BindingAttachProps<
 }
 
 export interface BindingReattachProps<
-  Source extends Resource,
-  Target extends Resource,
+  Source extends IResource,
+  Target extends IResource,
   Props,
   Attr,
 > {
@@ -188,8 +188,8 @@ export interface BindingReattachProps<
 }
 
 export interface BindingDetachProps<
-  Source extends Resource,
-  Target extends Resource,
+  Source extends IResource,
+  Target extends IResource,
   Props,
   Attr,
 > {
@@ -208,8 +208,8 @@ export interface BindingDetachProps<
 }
 
 export type BindingService<
-  Target extends Runtime = any,
-  Source extends Resource = Resource,
+  Target extends IRuntime = any,
+  Source extends IResource = IResource,
   Props = any,
   Attr extends Target["binding"] = any,
   DiffReq = never,

package/src/cli/components/ApprovePlan.tsx

@@ -1,13 +1,13 @@
 // biome-ignore lint/style/useImportType: UMD global
 import React, { useState } from "react";
 
-import type * as Alchemy from "alchemy-effect";
 import { Box, Text, useApp, useInput } from "ink";
+import type { IPlan as AlchemyPlan } from "../../plan.ts";
 
 import { Plan } from "./Plan.tsx";
 
 export interface ApprovePlanProps {
-  plan: Alchemy.Plan;
+  plan: AlchemyPlan;
   approve: (result: boolean) => void;
 }
 

package/src/cli/components/Plan.tsx

@@ -1,11 +1,12 @@
 // biome-ignore lint/style/useImportType: UMD global
 import React, { useMemo } from "react";
 
-import type { BindNode, Capability, CRUD, Plan } from "alchemy-effect";
 import { Box, Text } from "ink";
+import type { Capability } from "../../capability.ts";
+import type { IPlan as AlchemyPlan, BindNode, CRUD } from "../../plan.ts";
 
 export interface PlanProps {
-  plan: Plan;
+  plan: AlchemyPlan;
 }
 export function Plan({ plan }: PlanProps): React.JSX.Element {
   const items = useMemo(

package/src/cli/components/PlanProgress.tsx

@@ -1,20 +1,27 @@
 // biome-ignore lint/style/useImportType: UMD global
 import React, { useEffect, useMemo, useRef, useState } from "react";
 
-import type * as Alchemy from "alchemy-effect";
 import { Box, Text } from "ink";
-import type { ProgressEventSource } from "../progress.tsx";
-import { useGlobalSpinner } from "../spinner.ts";
+import type {
+  ApplyEvent,
+  ApplyStatus,
+  StatusChangeEvent,
+} from "../../event.ts";
+import type { IPlan } from "../../plan.ts";
+
+interface ProgressEventSource {
+  subscribe(listener: (event: ApplyEvent) => void): () => void;
+}
 
 interface PlanTask
-  extends Required<Pick<Alchemy.StatusChangeEvent, "id" | "type" | "status">> {
+  extends Required<Pick<StatusChangeEvent, "id" | "type" | "status">> {
   message?: string;
   updatedAt: number;
 }
 
-export interface PlanProgressProps {
+interface PlanProgressProps {
   source: ProgressEventSource;
-  plan: Alchemy.Plan;
+  plan: IPlan;
 }
 
 export function PlanProgress(props: PlanProgressProps): React.JSX.Element {
@@ -29,7 +36,7 @@ export function PlanProgress(props: PlanProgressProps): React.JSX.Element {
     ];
     for (const [id, item] of nodes) {
       const planItem = item!;
-      const status: Alchemy.ApplyStatus =
+      const status: ApplyStatus =
         planItem.action === "noop" ? "success" : "pending";
       initialTasks.set(id, {
         id,
@@ -89,7 +96,7 @@ export function PlanProgress(props: PlanProgressProps): React.JSX.Element {
       ];
       for (const [id, item] of nodes) {
         const planItem = item!;
-        const status: Alchemy.ApplyStatus =
+        const status: ApplyStatus =
           planItem.action === "noop" ? "success" : "pending";
         initialTasks.set(id, {
           id,
@@ -146,7 +153,7 @@ export function PlanProgress(props: PlanProgressProps): React.JSX.Element {
   );
 }
 
-function statusPriority(status: Alchemy.ApplyStatus): number {
+function statusPriority(status: ApplyStatus): number {
   switch (status) {
     case "success":
     case "created":
@@ -166,9 +173,7 @@ function statusPriority(status: Alchemy.ApplyStatus): number {
   }
 }
 
-function statusColor(
-  status: Alchemy.ApplyStatus,
-): Parameters<typeof Text>[0]["color"] {
+function statusColor(status: ApplyStatus): Parameters<typeof Text>[0]["color"] {
   switch (status) {
     case "pending":
       return "gray";
@@ -190,13 +195,13 @@ function statusColor(
   }
 }
 
-function statusIcon(status: Alchemy.ApplyStatus, spinnerChar: string): string {
+function statusIcon(status: ApplyStatus, spinnerChar: string): string {
   if (isInProgress(status)) return spinnerChar;
   if (status === "fail") return "✗";
   return "✓"; // created/updated/deleted/success
 }
 
-function isInProgress(status: Alchemy.ApplyStatus): boolean {
+function isInProgress(status: ApplyStatus): boolean {
   return (
     status === "pending" ||
     status === "creating" ||
@@ -204,3 +209,16 @@ function isInProgress(status: Alchemy.ApplyStatus): boolean {
     status === "deleting"
   );
 }
+
+const spinnerFrames = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"];
+
+function useGlobalSpinner(intervalMs = 80): string {
+  const [index, setIndex] = useState(0);
+  useEffect(() => {
+    const timer = setInterval(() => {
+      setIndex((i) => (i + 1) % spinnerFrames.length);
+    }, intervalMs);
+    return () => clearInterval(timer);
+  }, [intervalMs]);
+  return spinnerFrames[index];
+}

package/src/cli/index.ts

@@ -1,6 +1,2 @@
-import * as Layer from "effect/Layer";
-
-import { requireApproval } from "./approve.tsx";
-import { reportProgress } from "./progress.tsx";
-
-export const layer = Layer.merge(requireApproval, reportProgress);
+export * from "./service.ts";
+export * from "./ink-service.tsx";

package/src/cli/ink-service.tsx

@@ -0,0 +1,61 @@
+import React from "react";
+
+import { type PlanStatusSession, CLI } from "./service.ts";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import type { IPlan } from "../plan.ts";
+import { render } from "ink";
+import { ApprovePlan } from "./components/ApprovePlan.tsx";
+import { Plan } from "./components/Plan.tsx";
+import { PlanProgress } from "./components/PlanProgress.tsx";
+import type { ApplyEvent } from "../event.ts";
+
+export const inkCLI = () =>
+  Layer.succeed(
+    CLI,
+    CLI.of({
+      approvePlan,
+      displayPlan,
+      startApplySession,
+    }),
+  );
+
+const approvePlan = Effect.fn(function* <P extends IPlan>(plan: P) {
+  let approved = false;
+  const { waitUntilExit } = render(
+    <ApprovePlan plan={plan} approve={(a) => (approved = a)} />,
+  );
+  yield* Effect.promise(waitUntilExit);
+  return approved;
+});
+
+const displayPlan = <P extends IPlan>(plan: P): Effect.Effect<void> =>
+  Effect.sync(() => {
+    const { unmount } = render(<Plan plan={plan} />);
+    unmount();
+  });
+
+const startApplySession = Effect.fn(function* <P extends IPlan>(plan: P) {
+  const listeners = new Set<(event: ApplyEvent) => void>();
+  const { unmount } = render(
+    <PlanProgress
+      plan={plan}
+      source={{
+        subscribe(listener) {
+          listeners.add(listener);
+          return () => listeners.delete(listener);
+        },
+      }}
+    />,
+  );
+  return {
+    done: Effect.fn(function* () {
+      yield* Effect.sleep(10); // give the react event loop time to re-render
+      yield* Effect.sync(() => unmount());
+    }),
+    emit: (event) =>
+      Effect.sync(() => {
+        for (const listener of listeners) listener(event);
+      }),
+  } satisfies PlanStatusSession;
+});

package/src/cli/service.ts

@@ -0,0 +1,23 @@
+import type { IPlan } from "../plan.ts";
+import * as Effect from "effect/Effect";
+import * as Context from "effect/Context";
+import type { ApplyEvent } from "../event.ts";
+
+export interface PlanStatusSession {
+  emit: (event: ApplyEvent) => Effect.Effect<void>;
+  done: () => Effect.Effect<void>;
+}
+
+export interface ScopedPlanStatusSession extends PlanStatusSession {
+  note: (note: string) => Effect.Effect<void>;
+}
+
+export interface CLIService {
+  approvePlan: <P extends IPlan>(plan: P) => Effect.Effect<boolean>;
+  displayPlan: <P extends IPlan>(plan: P) => Effect.Effect<void>;
+  startApplySession: <P extends IPlan>(
+    plan: P,
+  ) => Effect.Effect<PlanStatusSession>;
+}
+
+export class CLI extends Context.Tag("CLIService")<CLI, CLIService>() {}

package/src/cloudflare/account.ts

@@ -0,0 +1,37 @@
+import * as Layer from "effect/Layer";
+import * as Context from "effect/Context";
+import * as Effect from "effect/Effect";
+import * as Config from "effect/Config";
+import { App } from "../app.ts";
+
+export class Account extends Context.Tag("cloudflare/account-id")<
+  Account,
+  string
+>() {}
+
+export const fromEnv = () =>
+  Layer.effect(
+    Account,
+    Effect.gen(function* () {
+      const accountId = yield* Config.string("CLOUDFLARE_ACCOUNT_ID");
+      if (!accountId) {
+        return yield* Effect.die("CLOUDFLARE_ACCOUNT_ID is not set");
+      }
+      return accountId;
+    }),
+  );
+
+export const fromStageConfig = () =>
+  Layer.effect(
+    Account,
+    Effect.gen(function* () {
+      const app = yield* App;
+      const accountId =
+        app.config.cloudflare?.account ??
+        (yield* Config.string("CLOUDFLARE_ACCOUNT_ID"));
+      if (!accountId) {
+        return yield* Effect.die("CLOUDFLARE_ACCOUNT_ID is not set");
+      }
+      return accountId;
+    }),
+  );

package/src/cloudflare/api.ts

@@ -5,46 +5,50 @@ import {
   type RequestOptions,
 } from "cloudflare/core";
 import type { ErrorData } from "cloudflare/resources";
-import { Layer } from "effect";
-import * as Context from "effect/Context";
 import * as Data from "effect/Data";
+import * as Option from "effect/Option";
 import * as Effect from "effect/Effect";
+import { Config } from "effect";
 
-export class CloudflareAccountId extends Context.Tag("cloudflare/account-id")<
-  CloudflareAccountId,
-  string
->() {
-  static readonly fromEnv = Layer.effect(
-    CloudflareAccountId,
-    Effect.gen(function* () {
-      const accountId = process.env.CLOUDFLARE_ACCOUNT_ID;
-      if (!accountId) {
-        return yield* Effect.die("CLOUDFLARE_ACCOUNT_ID is not set");
-      }
-      return accountId;
-    }),
-  );
-}
+export const CLOUDFLARE_BASE_URL = Config.string("CLOUDFLARE_BASE_URL").pipe(
+  Config.option,
+);
+export const CLOUDFLARE_API_TOKEN = Config.string("CLOUDFLARE_API_TOKEN").pipe(
+  Config.option,
+);
+export const CLOUDFLARE_API_KEY = Config.string("CLOUDFLARE_API_KEY").pipe(
+  Config.option,
+);
+export const CLOUDFLARE_API_EMAIL = Config.string("CLOUDFLARE_API_EMAIL").pipe(
+  Config.option,
+);
 
 export class CloudflareApi extends Effect.Service<CloudflareApi>()(
   "cloudflare/api",
   {
-    effect: (options?: {
+    effect: Effect.fn(function* (options?: {
       baseUrl?: string;
       apiToken?: string;
       apiKey?: string;
       apiEmail?: string;
-    }) =>
-      Effect.succeed(
-        createRecursiveProxy(
-          new Cloudflare({
-            baseURL: options?.baseUrl ?? import.meta.env.CLOUDFLARE_BASE_URL,
-            apiToken: options?.apiToken ?? import.meta.env.CLOUDFLARE_API_TOKEN,
-            apiKey: options?.apiKey ?? import.meta.env.CLOUDFLARE_API_KEY,
-            apiEmail: options?.apiEmail ?? import.meta.env.CLOUDFLARE_API_EMAIL,
-          }),
-        ),
-      ),
+    }) {
+      return createRecursiveProxy(
+        new Cloudflare({
+          baseURL:
+            options?.baseUrl ??
+            (yield* CLOUDFLARE_BASE_URL).pipe(Option.getOrUndefined),
+          apiToken:
+            options?.apiToken ??
+            (yield* CLOUDFLARE_API_TOKEN).pipe(Option.getOrUndefined),
+          apiKey:
+            options?.apiKey ??
+            (yield* CLOUDFLARE_API_KEY).pipe(Option.getOrUndefined),
+          apiEmail:
+            options?.apiEmail ??
+            (yield* CLOUDFLARE_API_EMAIL).pipe(Option.getOrUndefined),
+        }),
+      );
+    }),
   },
 ) {}
 

package/src/cloudflare/config.ts

@@ -0,0 +1,7 @@
+declare module "../stage.ts" {
+  interface StageConfig {
+    cloudflare?: {
+      account: string;
+    };
+  }
+}

package/src/cloudflare/index.ts

@@ -2,5 +2,7 @@ export * as KV from "./kv/index.ts";
 export * as R2 from "./r2/index.ts";
 export * as Assets from "./worker/assets.fetch.ts";
 export * as Worker from "./worker/index.ts";
+export * from "./account.ts";
+export * from "./live.ts";
 
-export type * as Alchemy from "../index.ts";
+import "./config.ts";

package/src/cloudflare/kv/namespace.binding.ts

@@ -1,4 +1,6 @@
-import { Binding, type Capability, type To } from "alchemy-effect";
+import { Binding } from "../../binding.ts";
+import type { Capability } from "../../capability.ts";
+import type { To } from "../../policy.ts";
 import { Worker } from "../worker/worker.ts";
 import type { Namespace, NamespaceProps } from "./namespace.ts";
 

package/src/cloudflare/kv/namespace.provider.ts

@@ -1,7 +1,8 @@
 import type { KV } from "cloudflare/resources";
 import * as Effect from "effect/Effect";
 import { App } from "../../app.ts";
-import { CloudflareAccountId, CloudflareApi } from "../api.ts";
+import { Account } from "../account.ts";
+import { CloudflareApi } from "../api.ts";
 import {
   Namespace,
   type NamespaceAttr,
@@ -13,10 +14,10 @@ export const namespaceProvider = () =>
     Effect.gen(function* () {
       const app = yield* App;
       const api = yield* CloudflareApi;
-      const accountId = yield* CloudflareAccountId;
+      const accountId = yield* Account;
 
-      const createTitle = (id: string, news: NamespaceProps) =>
-        news.title ?? `${app.name}-${id}-${app.stage}`;
+      const createTitle = (id: string, title: string | undefined) =>
+        title ?? `${app.name}-${id}-${app.stage}`;
 
       const mapResult = <Props extends NamespaceProps>(
         result: KV.Namespace,
@@ -33,7 +34,7 @@ export const namespaceProvider = () =>
             if (output.accountId !== accountId) {
               return { action: "replace" };
             }
-            const title = createTitle(id, news);
+            const title = createTitle(id, news.title);
             if (title !== output.title) {
               return { action: "update" };
             }
@@ -42,7 +43,7 @@ export const namespaceProvider = () =>
           return yield* api.kv.namespaces
             .create({
               account_id: accountId,
-              title: createTitle(id, news),
+              title: createTitle(id, news.title),
             })
             .pipe(Effect.map(mapResult<NamespaceProps>));
         }),
@@ -50,7 +51,7 @@ export const namespaceProvider = () =>
           return yield* api.kv.namespaces
             .update(output.namespaceId, {
               account_id: accountId,
-              title: createTitle(id, news),
+              title: createTitle(id, news.title),
             })
             .pipe(Effect.map(mapResult<NamespaceProps>));
         }),
@@ -72,7 +73,7 @@ export const namespaceProvider = () =>
                 Effect.catchTag("NotFound", () => Effect.succeed(undefined)),
               );
           }
-          const title = createTitle(id, olds ?? {}); // why is olds optional?
+          const title = createTitle(id, olds?.title); // why is olds optional? because read can be called before the resource exists (sync)
           let page = 1;
           while (true) {
             // todo: abstract pagination

package/src/cloudflare/kv/namespace.ts

@@ -18,12 +18,13 @@ export interface Namespace<
     "Cloudflare.KV.Namespace",
     ID,
     Props,
-    NamespaceAttr<Props>
+    NamespaceAttr<Props>,
+    Namespace
   > {}
 
 export const Namespace = Resource<{
   <const ID extends string, const Props extends NamespaceProps>(
     id: ID,
-    props: Props,
+    props?: Props,
   ): Namespace<ID, Props>;
 }>("Cloudflare.KV.Namespace");

package/src/cloudflare/live.ts

@@ -1,6 +1,7 @@
 import * as Layer from "effect/Layer";
 import * as ESBuild from "../esbuild.ts";
-import { CloudflareAccountId, CloudflareApi } from "./api.ts";
+import { CloudflareApi } from "./api.ts";
+import * as Account from "./account.ts";
 import * as KV from "./kv/index.ts";
 import { namespaceProvider } from "./kv/namespace.provider.ts";
 import { bucketProvider } from "./r2/bucket.provider.ts";
@@ -8,7 +9,12 @@ import * as R2 from "./r2/index.ts";
 import { assetsProvider } from "./worker/assets.provider.ts";
 import { workerProvider } from "./worker/worker.provider.ts";
 
-export const providers = () =>
+import "./config.ts";
+
+export const bindings = () =>
+  Layer.mergeAll(KV.bindFromWorker(), R2.bindFromWorker());
+
+export const defaultProviders = () =>
   Layer.mergeAll(
     Layer.provideMerge(
       workerProvider(),
@@ -16,23 +22,11 @@ export const providers = () =>
     ),
     namespaceProvider(),
     bucketProvider(),
-  );
+  ).pipe(Layer.provideMerge(bindings()));
 
-export const bindings = () =>
-  Layer.mergeAll(KV.bindFromWorker(), R2.bindFromWorker());
-
-export const defaultProviders = () =>
-  providers().pipe(Layer.provideMerge(bindings()));
-
-export const live = () =>
+export const providers = () =>
   defaultProviders().pipe(
     Layer.provideMerge(
-      Layer.mergeAll(CloudflareAccountId.fromEnv, CloudflareApi.Default()),
+      Layer.mergeAll(Account.fromStageConfig(), CloudflareApi.Default()),
     ),
   );
-
-export default live;
-
-// Layer.mergeAll
-// Layer.provide
-// Layer.provideMerge

package/src/cloudflare/r2/bucket.binding.ts

@@ -1,4 +1,6 @@
-import { Binding, type Capability, type To } from "alchemy-effect";
+import { Binding } from "../../binding.ts";
+import type { Capability } from "../../capability.ts";
+import type { To } from "../../policy.ts";
 import { Worker } from "../worker/worker.ts";
 import type { Bucket } from "./bucket.ts";