alchemy 2.0.0-beta.1 → 2.0.0-beta.3

package/bin/alchemy-effect.js

@@ -69,7 +69,7 @@ var __require = /* @__PURE__ */ createRequire(import.meta.url);
 
 //#endregion
 //#region package.json
-var version = "2.0.0-beta.1";
+var version = "2.0.0-beta.3";
 
 //#endregion
 //#region src/Artifacts.ts
@@ -240,10 +240,24 @@ const parseFqn = (fqn) => {
 //#endregion
 //#region src/Provider.ts
 const Provider = (type) => Context.Service()(type);
-const getProviderByType = Effect.fnUntraced(function* (resourceType) {
-	const provider = (yield* Effect.context()).mapUnsafe.get(resourceType);
-	if (!provider) return yield* Effect.die(/* @__PURE__ */ new Error(`Provider not found for ${resourceType}`));
-	return provider;
+const isProviderCollectionService = (value) => {
+	return typeof value === "object" && value !== null && "kind" in value && value.kind === "ProviderCollection";
+};
+const findProviderByType = (type) => tryFindProviderByType(type).pipe(Effect.flatMap(Option.match({
+	onNone: () => Effect.die(`Provider not found for ${type}`),
+	onSome: (provider) => Effect.succeed(provider)
+})));
+const tryFindProviderByType = Effect.fnUntraced(function* (resourceType) {
+	const Tag = Provider(resourceType);
+	const direct = yield* Effect.serviceOption(Tag);
+	if (Option.isSome(direct)) return direct;
+	const context = yield* Effect.context();
+	for (const value of context.mapUnsafe.values()) if (isProviderCollectionService(value)) {
+		const provider = value.get(resourceType);
+		if (provider) return Option.some(provider);
+	}
+	console.log(context.mapUnsafe.keys());
+	return Option.none();
 });
 
 //#endregion
@@ -278,9 +292,9 @@ const make$1 = (name, providers, stack) => (effect) => Effect.all([
 	Stack.asEffect(),
 	Effect.context()
 ]).pipe(Effect.map(([output, stack$1, services]) => ({
+	...stack$1,
 	output,
-	services,
-	...stack$1
+	services
 })), Effect.provide(providers), Effect.provideServiceEffect(Stack, Stage.asEffect().pipe(Effect.map((stage$1) => stack ?? {
 	name,
 	stage: stage$1,
@@ -1078,7 +1092,7 @@ const collectGarbage = Effect.fnUntraced(function* (plan, session) {
 				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);
 			const nextAncestors = new Set(ancestors).add(fqn);
@@ -44364,7 +44378,7 @@ const asEffect = (effect) => Effect.isEffect(effect) ? effect : Effect.succeed(e
 
 //#endregion
 //#region src/Plan.ts
-const make = (stack, options = {}) => ensureArtifactStore(Effect.gen(function* () {
+const make = (stack, options = {}) => Effect.gen(function* () {
 	const state = yield* State;
 	const resources = Object.values(stack.resources);
 	const stackName = stack.name;
@@ -44382,7 +44396,7 @@ const make = (stack, options = {}) => ensureArtifactStore(Effect.gen(function* (
 	const resolveResource = (resourceExpr) => Effect.gen(function* () {
 		return yield* resolvedResources[resourceExpr.src.FQN] ??= yield* Effect.cached(Effect.gen(function* () {
 			const resource = resourceExpr.src;
-			const provider = yield* Provider(resource.Type);
+			const provider = yield* findProviderByType(resource.Type);
 			const props = yield* resolveInput(resource.Props);
 			const oldState = yield* state.get({
 				stack: stackName,
@@ -44449,7 +44463,7 @@ const make = (stack, options = {}) => ensureArtifactStore(Effect.gen(function* (
 	}));
 	const newDownstreamDependencies = Object.fromEntries(resources.map((resource) => [resource.FQN, Object.entries(newUpstreamDependencies).filter(([_, upstream$1]) => upstream$1.includes(resource.FQN)).map(([depFqn]) => depFqn)]));
 	const resourceGraph = Object.fromEntries((yield* Effect.all(resources.map(Effect.fn(function* (resource) {
-		const provider = yield* Provider(resource.Type);
+		const provider = yield* findProviderByType(resource.Type);
 		const id = resource.LogicalId;
 		const fqn = resource.FQN;
 		const news = yield* resolveInput(resource.Props);
@@ -44632,7 +44646,7 @@ const make = (stack, options = {}) => ensureArtifactStore(Effect.gen(function* (
 		if (oldState) {
 			const { logicalId } = parseFqn(fqn);
 			const resourceType = oldState.resourceType;
-			const provider = yield* getProviderByType(resourceType);
+			const provider = yield* findProviderByType(resourceType);
 			if (oldState.attr === void 0) {
 				if (provider.read) attr = yield* provider.read({
 					id: logicalId,
@@ -44658,7 +44672,8 @@ const make = (stack, options = {}) => ensureArtifactStore(Effect.gen(function* (
 					Binding: void 0,
 					Provider: Provider(resourceType),
 					RemovalPolicy: oldState.removalPolicy,
-					ExecutionContext: void 0
+					ExecutionContext: void 0,
+					Providers: void 0
 				},
 				downstream: oldDownstreamDependencies[fqn] ?? [],
 				bindings: oldState.bindings.map((binding) => ({
@@ -44682,7 +44697,7 @@ const make = (stack, options = {}) => ensureArtifactStore(Effect.gen(function* (
 		deletions,
 		output: stack.output
 	};
-}));
+}).pipe(ensureArtifactStore);
 const providePlanScope = (fqn, instanceId) => (effect) => Effect.serviceOption(ArtifactStore).pipe(Effect.map(Option.getOrElse(createArtifactStore)), Effect.flatMap((store) => effect.pipe(Effect.provideService(Artifacts, makeScopedArtifacts(store, fqn)), Effect.provideService(InstanceId, instanceId))));
 var DeleteResourceHasDownstreamDependencies = class extends Data.TaggedError("DeleteResourceHasDownstreamDependencies") {};
 var UnsatisfiedResourceCycle = class extends Data.TaggedError("UnsatisfiedResourceCycle") {};
@@ -44810,7 +44825,7 @@ const tailCommand = Command.make("tail", {
 					fqn
 				});
 				if (!resourceState?.attr) continue;
-				const provider = yield* getProviderByType(resource.Type);
+				const provider = yield* findProviderByType(resource.Type);
 				if (!provider.tail) continue;
 				tailable.push({
 					logicalId: resource.LogicalId,
@@ -44927,7 +44942,7 @@ const logsCommand = Command.make("logs", {
 					fqn
 				});
 				if (!resourceState?.attr) continue;
-				const provider = yield* getProviderByType(resource.Type);
+				const provider = yield* findProviderByType(resource.Type);
 				if (!provider.logs) continue;
 				const lines = yield* provider.logs({
 					id: resource.LogicalId,