alchemy 2.0.0-beta.48 → 2.0.0-beta.49

package/bin/exec.js

@@ -363,6 +363,7 @@ const of = (resource) => {
 	}
 	return new ResourceExpr(resource);
 };
+const asOutput = (t) => isOutput(t) ? t : Effect.isEffect(t) ? new EffectExpr(VoidExpr, () => t) : new LiteralExpr(t);
 const isOutput = (value) => value && (typeof value === "object" || typeof value === "function") && ExprSymbol in value;
 const ExprSymbol = Symbol.for("alchemy/Expr");
 const isExpr = (value) => value && (typeof value === "object" || typeof value === "function") && ExprSymbol in value;
@@ -447,6 +448,21 @@ var ApplyExpr = class extends BaseExpr {
 		return `${this.expr[inspect]()}.map(${this.f.toString()})`;
 	}
 };
+const isFlatMapExpr = (node) => node?.kind === "FlatMapExpr";
+var FlatMapExpr = class extends BaseExpr {
+	expr;
+	f;
+	kind = "FlatMapExpr";
+	constructor(expr, f) {
+		super();
+		this.expr = expr;
+		this.f = f;
+		return proxy(this);
+	}
+	[inspect]() {
+		return `${this.expr[inspect]()}.flatMap(${this.f.toString()})`;
+	}
+};
 const isEffectExpr = (node) => node?.kind === "EffectExpr";
 var EffectExpr = class extends BaseExpr {
 	expr;
@@ -557,11 +573,12 @@ function proxy(self) {
 		has: (_, prop) => prop === ExprSymbol || prop === inspect ? true : prop in self,
 		get: (target$1, prop) => prop === Symbol.toPrimitive ? (hint) => {
 			throw new Error(`Cannot coerce Output<${self[inspect]()}> to a ${hint === "number" ? "number" : "string"} via JS coercion. Use Output.interpolate\`...\` or Output.map(output, fn) to compose Outputs — the value isn't known until deploy time.`);
-		} : prop === ExprSymbol ? self : prop === inspect ? target$1[inspect] : isResourceExpr(self) && self.stables && prop in self.stables ? self.stables[prop] : prop === "apply" ? self[prop] : prop in self ? typeof self[prop] === "function" && !("kind" in self) ? new PropExpr(proxy$1, prop) : self[prop] : new PropExpr(proxy$1, prop),
+		} : prop === ExprSymbol ? self : prop === inspect ? target$1[inspect] : isResourceExpr(self) && self.stables && prop in self.stables ? self.stables[prop] : prop in self ? typeof self[prop] === "function" && !("kind" in self) ? new PropExpr(proxy$1, prop) : self[prop] : new PropExpr(proxy$1, prop),
 		apply: (_, thisArg, args) => {
 			if (isPropExpr(self)) {
-				if (self.identifier === "apply") return new ApplyExpr(self.expr, args[0]);
-				else if (self.identifier === "effect") return new EffectExpr(self.expr, args[0]);
+				if (self.identifier === "map" || self.identifier === "apply") return new ApplyExpr(self.expr, args[0]);
+				else if (self.identifier === "mapEffect" || self.identifier === "effect") return new EffectExpr(self.expr, args[0]);
+				else if (self.identifier === "flatMap") return new FlatMapExpr(self.expr, args[0]);
 			}
 		}
 	});
@@ -590,7 +607,10 @@ const evaluate = (expr, upstream$1) => Effect.gen(function* () {
 		} else if (isLiteralExpr(expr)) return expr.value;
 		else if (isApplyExpr(expr)) return expr.f(yield* evaluate(expr.expr, upstream$1));
 		else if (isEffectExpr(expr)) return yield* expr.f(yield* evaluate(expr.expr, upstream$1));
-		else if (isAllExpr(expr)) return yield* Effect.all(expr.outs.map((out) => evaluate(out, upstream$1)));
+		else if (isFlatMapExpr(expr)) {
+			const value = yield* evaluate(expr.expr, upstream$1);
+			return yield* evaluate(expr.f(value), upstream$1);
+		} else if (isAllExpr(expr)) return yield* Effect.all(expr.outs.map((out) => evaluate(out, upstream$1)));
 		else if (isPropExpr(expr)) return (yield* evaluate(expr.expr, upstream$1))?.[expr.identifier];
 		else if (isNamedExpr(expr)) return yield* evaluate(expr.expr, upstream$1);
 		else if (isRefExpr(expr)) {
@@ -645,7 +665,7 @@ const upstream = (expr) => {
 	else if (isResourceExpr(expr)) return { [expr.src.FQN]: expr.src };
 	else if (isPropExpr(expr)) return upstream(expr.expr);
 	else if (isAllExpr(expr)) return Object.assign({}, ...expr.outs.map((out) => upstream(out)));
-	else if (isEffectExpr(expr) || isApplyExpr(expr) || isNamedExpr(expr)) return upstream(expr.expr);
+	else if (isEffectExpr(expr) || isApplyExpr(expr) || isFlatMapExpr(expr) || isNamedExpr(expr)) return upstream(expr.expr);
 	else if (Array.isArray(expr)) return expr.map(upstream).reduce(toObject, {});
 	else if (typeof expr === "object" && expr !== null) return Object.values(expr).map((v) => upstream(v)).reduce(toObject, {});
 	return {};
@@ -1254,6 +1274,9 @@ const make = (stack, options = {}) => Effect.gen(function* () {
 		} else if (isEffectExpr(expr)) {
 			const upstream$1 = yield* resolveOutput(expr.expr);
 			return hasOutputs(upstream$1) ? expr : yield* expr.f(upstream$1);
+		} else if (isFlatMapExpr(expr)) {
+			const upstream$1 = yield* resolveOutput(expr.expr);
+			return hasOutputs(upstream$1) ? expr : yield* resolveOutput(asOutput(expr.f(upstream$1)));
 		} else if (isAllExpr(expr)) return yield* Effect.all(expr.outs.map(resolveOutput), { concurrency: "unbounded" });
 		else if (isLiteralExpr(expr)) return expr.value;
 		else if (isRefExpr(expr)) {