alchemy 2.0.0-beta.1 → 2.0.0-beta.2

package/src/AWS/RDS/DBCluster.ts

@@ -7,6 +7,7 @@ import { isResolved } from "../../Diff.ts";
 import { createPhysicalName } from "../../PhysicalName.ts";
 import * as Provider from "../../Provider.ts";
 import { Resource } from "../../Resource.ts";
+import type { Providers } from "../Providers.ts";
 import { createInternalTags, diffTags } from "../../Tags.ts";
 
 export interface DBClusterProps {
@@ -116,7 +117,9 @@ export interface DBCluster extends Resource<
     vpcSecurityGroupIds: string[];
     httpEndpointEnabled: boolean | undefined;
     tags: Record<string, string>;
-  }
+  },
+  never,
+  Providers
 > {}
 
 /**

package/src/AWS/RDS/DBClusterEndpoint.ts

@@ -4,6 +4,7 @@ import { isResolved } from "../../Diff.ts";
 import { createPhysicalName } from "../../PhysicalName.ts";
 import * as Provider from "../../Provider.ts";
 import { Resource } from "../../Resource.ts";
+import type { Providers } from "../Providers.ts";
 import { createInternalTags, diffTags } from "../../Tags.ts";
 
 export interface DBClusterEndpointProps {
@@ -47,7 +48,9 @@ export interface DBClusterEndpoint extends Resource<
     staticMembers: string[];
     excludedMembers: string[];
     tags: Record<string, string>;
-  }
+  },
+  never,
+  Providers
 > {}
 
 /**

package/src/AWS/RDS/DBClusterParameterGroup.ts

@@ -4,6 +4,7 @@ import { isResolved } from "../../Diff.ts";
 import { createPhysicalName } from "../../PhysicalName.ts";
 import * as Provider from "../../Provider.ts";
 import { Resource } from "../../Resource.ts";
+import type { Providers } from "../Providers.ts";
 import { createInternalTags, diffTags } from "../../Tags.ts";
 
 export interface DBClusterParameterGroupProps {
@@ -34,7 +35,9 @@ export interface DBClusterParameterGroup extends Resource<
     family: string;
     description: string | undefined;
     tags: Record<string, string>;
-  }
+  },
+  never,
+  Providers
 > {}
 
 /**

package/src/AWS/RDS/DBInstance.ts

@@ -5,6 +5,7 @@ import { isResolved } from "../../Diff.ts";
 import { createPhysicalName } from "../../PhysicalName.ts";
 import * as Provider from "../../Provider.ts";
 import { Resource } from "../../Resource.ts";
+import type { Providers } from "../Providers.ts";
 import { createInternalTags, diffTags } from "../../Tags.ts";
 
 export interface DBInstanceProps {
@@ -80,7 +81,9 @@ export interface DBInstance extends Resource<
     dbSubnetGroupName: string | undefined;
     dbParameterGroupNames: string[];
     tags: Record<string, string>;
-  }
+  },
+  never,
+  Providers
 > {}
 
 /**

package/src/AWS/RDS/DBParameterGroup.ts

@@ -4,6 +4,7 @@ import { isResolved } from "../../Diff.ts";
 import { createPhysicalName } from "../../PhysicalName.ts";
 import * as Provider from "../../Provider.ts";
 import { Resource } from "../../Resource.ts";
+import type { Providers } from "../Providers.ts";
 import { createInternalTags, diffTags } from "../../Tags.ts";
 
 export interface DBParameterGroupProps {
@@ -34,7 +35,9 @@ export interface DBParameterGroup extends Resource<
     family: string;
     description: string | undefined;
     tags: Record<string, string>;
-  }
+  },
+  never,
+  Providers
 > {}
 
 /**

package/src/AWS/RDS/DBProxy.ts

@@ -5,6 +5,7 @@ import { isResolved } from "../../Diff.ts";
 import { createPhysicalName } from "../../PhysicalName.ts";
 import * as Provider from "../../Provider.ts";
 import { Resource } from "../../Resource.ts";
+import type { Providers } from "../Providers.ts";
 import { createInternalTags, diffTags } from "../../Tags.ts";
 
 export interface DBProxyProps {
@@ -75,7 +76,9 @@ export interface DBProxy extends Resource<
     idleClientTimeout: number | undefined;
     debugLogging: boolean | undefined;
     tags: Record<string, string>;
-  }
+  },
+  never,
+  Providers
 > {}
 
 /**

package/src/AWS/RDS/DBProxyEndpoint.ts

@@ -5,6 +5,7 @@ import { isResolved } from "../../Diff.ts";
 import { createPhysicalName } from "../../PhysicalName.ts";
 import * as Provider from "../../Provider.ts";
 import { Resource } from "../../Resource.ts";
+import type { Providers } from "../Providers.ts";
 import { createInternalTags, diffTags } from "../../Tags.ts";
 
 export interface DBProxyEndpointProps {
@@ -52,7 +53,9 @@ export interface DBProxyEndpoint extends Resource<
     vpcSecurityGroupIds: string[];
     targetRole: string | undefined;
     tags: Record<string, string>;
-  }
+  },
+  never,
+  Providers
 > {}
 
 /**

package/src/AWS/RDS/DBProxyTargetGroup.ts

@@ -3,6 +3,7 @@ import * as Effect from "effect/Effect";
 import { isResolved } from "../../Diff.ts";
 import * as Provider from "../../Provider.ts";
 import { Resource } from "../../Resource.ts";
+import type { Providers } from "../Providers.ts";
 
 export interface DBProxyTargetGroupProps {
   /**
@@ -40,7 +41,9 @@ export interface DBProxyTargetGroup extends Resource<
     connectionPoolConfig: rds.ConnectionPoolConfigurationInfo | undefined;
     dbClusterIdentifiers: string[];
     dbInstanceIdentifiers: string[];
-  }
+  },
+  never,
+  Providers
 > {}
 
 /**

package/src/AWS/RDS/DBSubnetGroup.ts

@@ -4,6 +4,7 @@ import { isResolved } from "../../Diff.ts";
 import { createPhysicalName } from "../../PhysicalName.ts";
 import * as Provider from "../../Provider.ts";
 import { Resource } from "../../Resource.ts";
+import type { Providers } from "../Providers.ts";
 import { createInternalTags, diffTags } from "../../Tags.ts";
 import type { SubnetId } from "../EC2/Subnet.ts";
 
@@ -38,7 +39,9 @@ export interface DBSubnetGroup extends Resource<
     status: string | undefined;
     supportedNetworkTypes: string[] | undefined;
     tags: Record<string, string>;
-  }
+  },
+  never,
+  Providers
 > {}
 
 /**

package/src/AWS/Route53/Record.ts

@@ -5,6 +5,7 @@ import { isResolved } from "../../Diff.ts";
 import type { Input } from "../../Input.ts";
 import * as Provider from "../../Provider.ts";
 import { Resource } from "../../Resource.ts";
+import type { Providers } from "../Providers.ts";
 
 export interface RecordAliasTarget {
   /**
@@ -92,7 +93,9 @@ export interface Record extends Resource<
      * Optional routing set identifier.
      */
     setIdentifier: string | undefined;
-  }
+  },
+  never,
+  Providers
 > {}
 
 /**

package/src/AWS/S3/Bucket.ts

@@ -8,6 +8,7 @@ import { isResolved } from "../../Diff.ts";
 import { createPhysicalName } from "../../PhysicalName.ts";
 import * as Provider from "../../Provider.ts";
 import { Resource, type ResourceBinding } from "../../Resource.ts";
+import type { Providers } from "../Providers.ts";
 import { diffTags } from "../../Tags.ts";
 import { Account, type AccountID } from "../Account.ts";
 import type { PolicyStatement } from "../IAM/Policy.ts";
@@ -76,7 +77,8 @@ export interface Bucket extends Resource<
      * Policy statements for the bucket.
      */
     policyStatements?: PolicyStatement[];
-  }
+  },
+  Providers
 > {}
 
 /**

package/src/AWS/SNS/Subscription.ts

@@ -4,6 +4,7 @@ import { isResolved } from "../../Diff.ts";
 import type { Input } from "../../Input.ts";
 import * as Provider from "../../Provider.ts";
 import { Resource } from "../../Resource.ts";
+import type { Providers } from "../Providers.ts";
 
 export type SubscriptionArn = string;
 
@@ -42,7 +43,9 @@ export interface Subscription extends Resource<
     owner: string | undefined;
     pendingConfirmation: boolean;
     attributes: Record<string, string>;
-  }
+  },
+  never,
+  Providers
 > {}
 
 /**

package/src/AWS/SNS/Topic.ts

@@ -4,6 +4,7 @@ import { isResolved } from "../../Diff.ts";
 import { createPhysicalName } from "../../PhysicalName.ts";
 import * as Provider from "../../Provider.ts";
 import { Resource } from "../../Resource.ts";
+import type { Providers } from "../Providers.ts";
 import { createInternalTags, createTagsList, diffTags } from "../../Tags.ts";
 import type { AccountID } from "../Account.ts";
 import type { RegionID } from "../Region.ts";
@@ -50,7 +51,9 @@ export interface Topic extends Resource<
     attributes: Record<string, string>;
     dataProtectionPolicy: string | undefined;
     tags: Record<string, string>;
-  }
+  },
+  never,
+  Providers
 > {}
 
 /**

package/src/AWS/SQS/Queue.ts

@@ -6,6 +6,7 @@ import { isResolved } from "../../Diff.ts";
 import { createPhysicalName } from "../../PhysicalName.ts";
 import * as Provider from "../../Provider.ts";
 import { Resource, type ResourceBinding } from "../../Resource.ts";
+import type { Providers } from "../Providers.ts";
 import { Account, type AccountID } from "../Account.ts";
 import type { PolicyStatement } from "../IAM/Policy.ts";
 import type { RegionID } from "../Region.ts";
@@ -82,7 +83,8 @@ export interface Queue extends Resource<
   },
   {
     policyStatements: PolicyStatement[];
-  }
+  },
+  Providers
 > {}
 
 export const Queue = Resource<Queue>("AWS.SQS.Queue");

package/src/AWS/Scheduler/Schedule.ts

@@ -5,6 +5,7 @@ import type { Input } from "../../Input.ts";
 import { createPhysicalName } from "../../PhysicalName.ts";
 import * as Provider from "../../Provider.ts";
 import { Resource } from "../../Resource.ts";
+import type { Providers } from "../Providers.ts";
 import {
   createInternalTags,
   createTagsList,
@@ -97,7 +98,9 @@ export interface Schedule extends Resource<
     scheduleName: string;
     groupName: string;
     state: string | undefined;
-  }
+  },
+  never,
+  Providers
 > {}
 
 export const Schedule = Resource<Schedule>("AWS.Scheduler.Schedule");

package/src/AWS/Scheduler/ScheduleGroup.ts

@@ -4,6 +4,7 @@ import { isResolved } from "../../Diff.ts";
 import { createPhysicalName } from "../../PhysicalName.ts";
 import * as Provider from "../../Provider.ts";
 import { Resource } from "../../Resource.ts";
+import type { Providers } from "../Providers.ts";
 import {
   createInternalTags,
   createTagsList,
@@ -45,7 +46,9 @@ export interface ScheduleGroup extends Resource<
     scheduleGroupArn: string;
     scheduleGroupName: string;
     state: string | undefined;
-  }
+  },
+  never,
+  Providers
 > {}
 
 export const ScheduleGroup = Resource<ScheduleGroup>(

package/src/AWS/SecretsManager/Secret.ts

@@ -5,6 +5,7 @@ import { isResolved } from "../../Diff.ts";
 import { createPhysicalName } from "../../PhysicalName.ts";
 import * as Provider from "../../Provider.ts";
 import { Resource } from "../../Resource.ts";
+import type { Providers } from "../Providers.ts";
 import { createInternalTags, diffTags } from "../../Tags.ts";
 
 export interface GenerateSecretStringProps
@@ -62,7 +63,9 @@ export interface Secret extends Resource<
     description: string | undefined;
     kmsKeyId: string | undefined;
     tags: Record<string, string>;
-  }
+  },
+  never,
+  Providers
 > {}
 
 /**

package/src/AWS/Website/AssetDeployment.ts

@@ -7,6 +7,7 @@ import { readdir, readFile } from "node:fs/promises";
 import path from "node:path";
 import * as Provider from "../../Provider.ts";
 import { Resource } from "../../Resource.ts";
+import type { Providers } from "../Providers.ts";
 import type { WebsiteTextEncoding } from "./shared.ts";
 
 export interface AssetFileOption {
@@ -67,7 +68,9 @@ export interface AssetDeployment extends Resource<
     prefix: string;
     version: string;
     fileCount: number;
-  }
+  },
+  never,
+  Providers
 > {}
 
 /**

package/src/Apply.ts

@@ -1,5 +1,6 @@
 import * as Deferred from "effect/Deferred";
 import * as Effect from "effect/Effect";
+import * as Option from "effect/Option";
 import type { Simplify } from "effect/Types";
 import {
   Artifacts,
@@ -8,7 +9,6 @@ import {
   ensureArtifactStore,
   makeScopedArtifacts,
 } from "./Artifacts.ts";
-import * as Option from "effect/Option";
 import {
   type PlanStatusSession,
   type ScopedPlanStatusSession,
@@ -21,7 +21,7 @@ import type { Input } from "./Input.ts";
 import { generateInstanceId, InstanceId } from "./InstanceId.ts";
 import * as Output from "./Output.ts";
 import { type Apply, type Delete, type Plan } from "./Plan.ts";
-import { getProviderByType } from "./Provider.ts";
+import { findProviderByType } from "./Provider.ts";
 import type { ResourceBinding } from "./Resource.ts";
 import { Stack } from "./Stack.ts";
 import { Stage } from "./Stage.ts";
@@ -927,7 +927,7 @@ const collectGarbage = Effect.fnUntraced(function* (
               downstream: node.old.downstream,
               props: node.old.props,
               attr: node.old.attr,
-              provider: yield* getProviderByType(node.old.resourceType),
+              provider: yield* findProviderByType(node.old.resourceType),
             };
 
         const fqn = toFqn(namespace, logicalId);

package/src/Binding.ts

@@ -6,6 +6,7 @@ import { SingleShotGen } from "effect/Utils";
 import { ExecutionContext } from "./ExecutionContext.ts";
 import * as Namespace from "./Namespace.ts";
 import { ALCHEMY_PHASE } from "./Phase.ts";
+import { tryFindProviderByType } from "./Provider.ts";
 import type { ResourceLike } from "./Resource.ts";
 import { Self } from "./Self.ts";
 import { CurrentStack } from "./Stack.ts";
@@ -133,24 +134,24 @@ export const Policy =
 
     // we use a service option because at runtime (e.g. in a Lambda Function or Cloudflare Worker)
     // the Policy Layer is not provided and this becomes a no-op
-    const Service = Effect.serviceOption(self)
-      .asEffect()
-      .pipe(
-        Effect.map(Option.getOrUndefined),
-        Effect.flatMap((service) =>
-          service
-            ? Effect.succeed(service)
-            : Effect.all([CurrentStack, ALCHEMY_PHASE.asEffect()]).pipe(
-                Effect.flatMap(([stack, phase]) =>
-                  stack && phase === "plan"
-                    ? Effect.die(
-                        `Binding.Policy provider '${Identifier}' was not provided at Plan Time in Stack '${stack.name}'`,
-                      )
-                    : Effect.succeed((() => Effect.void) as any as Shape),
-                ),
+    const Service = tryFindProviderByType<Policy<Self, Identifier, Shape>>(
+      self.key as Identifier,
+    ).pipe(
+      Effect.map(Option.getOrUndefined),
+      Effect.flatMap((service) =>
+        service
+          ? Effect.succeed(service)
+          : Effect.all([CurrentStack, ALCHEMY_PHASE.asEffect()]).pipe(
+              Effect.flatMap(([stack, phase]) =>
+                stack && phase === "plan"
+                  ? Effect.die(
+                      `Binding.Policy provider 'Policy<${Identifier}>' was not provided at Plan Time in Stack '${stack.name}'`,
+                    )
+                  : Effect.succeed((() => Effect.void) as any as Shape),
               ),
-        ),
-      );
+            ),
+      ),
+    );
 
     const asEffect = () =>
       Effect.all([Self.asEffect(), Service]).pipe(

package/src/Cloudflare/Container/ContainerApplication.ts

@@ -33,6 +33,7 @@ import { sha256Object } from "../../Util/sha256.ts";
 import { normalizeNulls } from "../../Util/stable.ts";
 import { Account } from "../Account.ts";
 import { CloudflareLogs, type TelemetryFilter } from "../Logs.ts";
+import type { Providers } from "../Providers.ts";
 import { Container, ContainerTypeId } from "./Container.ts";
 
 export { Credentials } from "@distilled.cloud/cloudflare/Credentials";
@@ -254,7 +255,8 @@ export interface ContainerApplication<Shape = unknown> extends Resource<
       namespaceId: string;
     };
     env?: Record<string, any>;
-  }
+  },
+  Providers
 > {
   /** @internal phantom */
   Shape: Shape;

package/src/Cloudflare/D1/D1Database.ts

@@ -6,6 +6,7 @@ import { createPhysicalName } from "../../PhysicalName.ts";
 import * as Provider from "../../Provider.ts";
 import { Resource } from "../../Resource.ts";
 import { Account } from "../Account.ts";
+import type { Providers } from "../Providers.ts";
 
 export type Jurisdiction = "default" | "eu" | "fedramp";
 export type PrimaryLocationHint =
@@ -48,7 +49,9 @@ export type D1Database = Resource<
     jurisdiction: Jurisdiction;
     readReplication: { mode: "auto" | "disabled" } | undefined;
     accountId: string;
-  }
+  },
+  never,
+  Providers
 >;
 
 /**

package/src/Cloudflare/KV/KVNamespace.ts

@@ -5,9 +5,10 @@ import { createPhysicalName } from "../../PhysicalName.ts";
 import * as Provider from "../../Provider.ts";
 import { Resource } from "../../Resource.ts";
 import { Account } from "../Account.ts";
+import type { Providers } from "../Providers.ts";
 import { KVNamespaceBinding } from "./KVNamespaceBinding.ts";
 
-export type NamespaceProps = {
+export type KVNamespaceProps = {
   /**
    * A human-readable string name for the namespace.
    * If omitted, a unique name will be generated.
@@ -18,20 +19,22 @@ export type NamespaceProps = {
 
 export type KVNamespace = Resource<
   "Cloudflare.KVNamespace",
-  NamespaceProps,
+  KVNamespaceProps,
   {
     title: string;
     namespaceId: string;
     supportsUrlEncoding: boolean | undefined;
     accountId: string;
-  }
+  },
+  never,
+  Providers
 >;
 
 export const KVNamespace = Resource<KVNamespace>("Cloudflare.KVNamespace")({
   bind: KVNamespaceBinding.bind,
 });
 
-export const NamespaceProvider = () =>
+export const KVNamespaceProvider = () =>
   Provider.effect(
     KVNamespace,
     Effect.gen(function* () {

package/src/Cloudflare/Providers.ts

@@ -1,75 +1,77 @@
 import * as Auth from "@distilled.cloud/cloudflare/Auth";
-import { pipe } from "effect/Function";
 import * as Layer from "effect/Layer";
-import * as FetchHttpClient from "effect/unstable/http/FetchHttpClient";
 import * as Socket from "effect/unstable/socket/Socket";
-import { CommandProvider } from "../Build/Command.ts";
-import { RandomProvider } from "../Random.ts";
+import { Command } from "../Build/Command.ts";
+import * as Build from "../Build/index.ts";
+import * as Provider from "../Provider.ts";
+import { Random, RandomProvider } from "../Random.ts";
 import * as Account from "./Account.ts";
-import { ContainerProvider } from "./Container/ContainerApplication.ts";
+import * as Containers from "./Container/index.ts";
 import * as D1 from "./D1/index.ts";
 import * as KV from "./KV/index.ts";
 import * as R2 from "./R2/index.ts";
-import { AssetsProvider } from "./Workers/Assets.ts";
-import { WorkerProvider } from "./Workers/Worker.ts";
-import { WorkflowProvider } from "./Workers/Workflow.ts";
+import * as Assets from "./Workers/Assets.ts";
+import * as Workers from "./Workers/index.ts";
+import * as Workflows from "./Workers/Workflow.ts";
 
-// export type Providers = Extract<Layer.Success<_providers>, Provider<any>>;
+export { Credentials } from "@distilled.cloud/cloudflare/Credentials";
 
-export interface Providers extends Layer.Layer<
-  Layer.Success<_providers>,
-  Layer.Error<_providers>,
-  Layer.Services<_providers>
-> {}
+export class Providers extends Provider.ProviderCollection<Providers>()(
+  "Cloudflare",
+) {}
+
+export type ProviderRequirements = Layer.Services<ReturnType<typeof providers>>;
 
 /**
  * Cloudflare providers, bindings, and credentials for Worker-based stacks.
  */
-export const providers: () => Providers = () => _providers();
-
-type _providers = ReturnType<typeof _providers>;
-const _providers = () =>
-  pipe(
-    resources(),
-    Layer.provideMerge(bindings()),
-    Layer.provideMerge(utils()),
-    Layer.provideMerge(credentials()),
+export const providers = () =>
+  Layer.effect(
+    Providers,
+    Provider.collection([
+      Command,
+      Containers.Container,
+      D1.D1ConnectionPolicy,
+      D1.D1Database,
+      KV.KVNamespace,
+      KV.KVNamespaceBindingPolicy,
+      R2.R2Bucket,
+      R2.R2BucketBindingPolicy,
+      Random,
+      Workers.BindWorkerPolicy,
+      Workers.FetchPolicy,
+      Workers.Worker,
+      Workflows.WorkflowResource,
+    ]),
+  ).pipe(
+    Layer.provide(
+      Layer.mergeAll(
+        Containers.ContainerProvider(),
+        D1.D1ConnectionPolicyLive,
+        D1.DatabaseProvider(),
+        KV.KVNamespaceBindingPolicyLive,
+        KV.KVNamespaceProvider(),
+        R2.R2BucketBindingPolicyLive,
+        R2.R2BucketProvider(),
+        Workers.BindWorkerPolicyLive,
+        Workers.FetchPolicyLive,
+        Workers.WorkerProvider(),
+        Workflows.WorkflowProvider(),
+      ),
+    ),
+    Layer.provideMerge(
+      Layer.mergeAll(
+        Assets.AssetsProvider(),
+        Build.CommandProvider(),
+        RandomProvider(),
+      ),
+    ),
+    Layer.provideMerge(
+      Layer.mergeAll(
+        Account.fromStageConfig(),
+        Auth.fromEnv(),
+        Socket.layerWebSocketConstructorGlobal,
+      ),
+    ),
     Layer.orDie,
   );
-
-/**
- * Cloudflare account credentials and auth context.
- */
-export const credentials = () =>
-  Layer.mergeAll(
-    Account.fromStageConfig(),
-    Layer.provideMerge(Auth.fromEnv(), FetchHttpClient.layer),
-  );
-
-/**
- * All Cloudflare resource providers.
- */
-export const resources = () =>
-  Layer.mergeAll(
-    CommandProvider(),
-    RandomProvider(),
-    ContainerProvider(),
-    WorkerProvider(),
-    WorkflowProvider(),
-    D1.DatabaseProvider(),
-    KV.NamespaceProvider(),
-    R2.R2BucketProvider(),
-  );
-
-/**
- * All Cloudflare binding policies.
- */
-export const bindings = () =>
-  Layer.mergeAll(
-    D1.D1ConnectionPolicyLive,
-    R2.R2BucketBindingPolicyLive,
-    KV.KVNamespaceBindingPolicyLive,
-  );
-
-const utils = () =>
-  Layer.mergeAll(AssetsProvider(), Socket.layerWebSocketConstructorGlobal);

package/src/Cloudflare/R2/R2Bucket.ts

@@ -6,6 +6,7 @@ import { createPhysicalName } from "../../PhysicalName.ts";
 import * as Provider from "../../Provider.ts";
 import { Resource } from "../../Resource.ts";
 import { Account } from "../Account.ts";
+import type { Providers } from "../Providers.ts";
 import { R2BucketBinding } from "./R2BucketBinding.ts";
 
 export type R2BucketName = string;
@@ -41,7 +42,9 @@ export type R2Bucket = Resource<
     jurisdiction: R2Bucket.Jurisdiction;
     location: R2Bucket.Location | undefined;
     accountId: string;
-  }
+  },
+  never,
+  Providers
 >;
 
 export const R2Bucket = Resource<R2Bucket>("Cloudflare.R2Bucket")({