alchemy 2.0.0-beta.44 → 2.0.0-beta.45

package/bin/exec.js

@@ -19,7 +19,9 @@ import * as Logger from "effect/Logger";
 import * as Option from "effect/Option";
 import "effect/Scope";
 import * as Deferred from "effect/Deferred";
+import * as Semaphore from "effect/Semaphore";
 import * as Data from "effect/Data";
+import * as Duration from "effect/Duration";
 import { flow, pipe } from "effect/Function";
 import { SingleShotGen } from "effect/Utils";
 import { pipeArguments } from "effect/Pipeable";
@@ -32,7 +34,6 @@ import * as NodeUtil from "node:util";
 import * as Console from "effect/Console";
 import * as Command from "effect/unstable/cli/Command";
 import * as Flag from "effect/unstable/cli/Flag";
-import * as Duration from "effect/Duration";
 import * as Metric from "effect/Metric";
 import { createHash } from "node:crypto";
 import * as Argument from "effect/unstable/cli/Argument";
@@ -142,7 +143,9 @@ const CredentialsStoreLive = Layer.effect(CredentialsStore, Effect.gen(function*
 	}));
 	const write = (profile$1, provider, credentials) => {
 		const filePath = credentialsFilePath(profile$1, provider);
-		return fs.makeDirectory(path.dirname(filePath), { recursive: true }).pipe(Effect.flatMap(() => fs.writeFileString(filePath, JSON.stringify(credentials, null, 2))));
+		return fs.makeDirectory(path.dirname(filePath), { recursive: true }).pipe(Effect.flatMap(() => {
+			return fs.writeFileString(filePath, JSON.stringify(credentials, null, 2));
+		}));
 	};
 	const remove_ = (profile$1, provider) => fs.remove(credentialsFilePath(profile$1, provider)).pipe(Effect.catch(() => Effect.void));
 	const deleteProfile = (profile$1) => fs.remove(profileCredentialsDirPath(profile$1), { recursive: true }).pipe(Effect.catch(() => Effect.void));
@@ -216,6 +219,7 @@ const ensureArtifactStore = (effect) => Effect.serviceOption(ArtifactStore).pipe
 
 //#endregion
 //#region lib/Auth/AuthProvider.js
+const interactiveMutex = Semaphore.makeUnsafe(1);
 var AuthProviders = class extends EffectContext.Service()("AuthProviders") {};
 
 //#endregion
@@ -317,6 +321,18 @@ const isResource = (value) => {
 //#endregion
 //#region lib/RuntimeContext.js
 /**
+* Canonicalize a logical key into a key that is safe to use as the name of an
+* environment variable / binding (`[a-zA-Z][a-zA-Z0-9_]*`).
+*
+* `RuntimeContext.set`/`get` are dumb key/value stores: they read and write the
+* key **verbatim**. It is the *caller's* responsibility to hand them a
+* canonical key, since the caller is the one that knows the logical key may
+* contain `.`/`-` (e.g. a dotted config name from `Platform`, or an
+* `Output.toString()` like `"QueueSinkQueue.queueUrl"`). Callers run the key
+* through this before calling `set`/`get` so both sides agree.
+*/
+const sanitizeKey = (key) => key.replaceAll(/[^a-zA-Z0-9]/g, "_");
+/**
 * Context of the runtime environment.
 *
 * E.g. the context of a running Worker, Task, Process, Function
@@ -362,7 +378,8 @@ var BaseExpr = class {
 		return this.bind(this.toString());
 	}
 	bind(id) {
-		return RuntimeContext.pipe(Effect.flatMap((ctx) => Effect.map(ctx.set(id, this), (key) => ctx.get(key))));
+		const key = sanitizeKey(id);
+		return RuntimeContext.pipe(Effect.flatMap((ctx) => Effect.map(ctx.set(key, this), (k) => ctx.get(k))));
 	}
 	pipe(...fns) {
 		return pipe(this, ...fns);
@@ -611,6 +628,7 @@ const evaluate = (expr, upstream$1) => Effect.gen(function* () {
 	}
 	if (Array.isArray(expr)) return yield* Effect.all(expr.map((item) => evaluate(item, upstream$1)));
 	else if (Redacted.isRedacted(expr)) return expr;
+	else if (Duration.isDuration(expr)) return expr;
 	else if (typeof expr === "object" && expr !== null) return Object.fromEntries(yield* Effect.all(Object.entries(expr).map(([key, value]) => evaluate(value, upstream$1).pipe(Effect.map((value$1) => [key, value$1])))));
 	return expr;
 });
@@ -938,6 +956,17 @@ const canonicalize = (value, stripNullish) => {
 	if (value && typeof value === "object") return Object.fromEntries(Object.entries(value).filter(([, nested]) => !stripNullish || nested != null).sort(([a], [b]) => a.localeCompare(b)).map(([key, nested]) => [key, canonicalize(nested, stripNullish)]));
 	return value;
 };
+/**
+* Collapse bindings that share the same `sid`, keeping the last occurrence.
+*
+* The same binding can be recorded more than once on a target resource — e.g.
+* a KV namespace bound to both a Worker and a Workflow ends up pushed twice to
+* `stack.bindings[fqn]`. `diffBindings` already collapses these implicitly via
+* its `Map` keyed by `sid`, so the `reconcile` path never observes duplicates.
+* Use this helper to give a provider's `diff` handler the same de-duplicated
+* binding set, keeping plan-time hashing consistent with deploy-time.
+*/
+const dedupeBindings = (bindings) => Array.from(new Map(bindings.map((b) => [b.sid, b])).values());
 const diffBindings = (oldBindings, newBindings) => {
 	const oldMap = new Map(oldBindings.map((b) => [b.sid, b]));
 	const newMap = new Map(newBindings.map((b) => [b.sid, b]));
@@ -970,7 +999,7 @@ const generateInstanceId = () => Effect.sync(() => {
 
 //#endregion
 //#region lib/Util/types.js
-const asEffect = (effect) => Effect.isEffect(effect) ? effect : Effect.succeed(effect);
+const asEffect = (effect) => typeof effect?.asEffect === "function" ? effect.asEffect() : Effect.isEffect(effect) ? effect : Effect.succeed(effect);
 
 //#endregion
 //#region lib/Telemetry/Metrics.js
@@ -1178,7 +1207,7 @@ const make = (stack, options = {}) => Effect.gen(function* () {
 			if (!oldState || oldState.status === "creating") return resourceExpr;
 			const oldProps = oldState.status === "updating" ? oldState.old.props : oldState.props;
 			const oldBindings = oldState.bindings ?? [];
-			const newBindings = stack.bindings[resource.FQN] ?? [];
+			const newBindings = dedupeBindings(stack.bindings[resource.FQN] ?? []);
 			const diff = yield* provider.diff ? provider.diff({
 				id: resource.LogicalId,
 				olds: oldProps,
@@ -1202,6 +1231,7 @@ const make = (stack, options = {}) => Effect.gen(function* () {
 		if (!input) return input;
 		else if (isExpr(input)) return yield* resolveOutput(input);
 		else if (Redacted.isRedacted(input)) return input;
+		else if (Duration.isDuration(input)) return input;
 		else if (Array.isArray(input)) return yield* Effect.all(input.map(resolveInput), { concurrency: "unbounded" });
 		else if (isResource(input)) return yield* resolveInput(yield* resolveOutput(of(input)));
 		else if (typeof input === "object") return Object.fromEntries(yield* Effect.all(Object.entries(input).map(([key, value]) => resolveInput(value).pipe(Effect.map((value$1) => [key, value$1]))), { concurrency: "unbounded" }));
@@ -1294,7 +1324,7 @@ const make = (stack, options = {}) => Effect.gen(function* () {
 		const fqn = resource.FQN;
 		const news = yield* resolveInput(resource.Props);
 		const downstream = newDownstreamDependencies[fqn] ?? [];
-		const newBindings = yield* resolveInput(stack.bindings[fqn] ?? []);
+		const newBindings = dedupeBindings(yield* resolveInput(stack.bindings[fqn] ?? []));
 		const persisted = yield* state.get({
 			stack: stackName,
 			stage: stage$1,
@@ -1703,7 +1733,7 @@ const executePlan = Effect.fnUntraced(function* (plan, tracker, terminalStatuses
 	const ready = Object.fromEntries(yield* Effect.all(Object.keys(allNodes).map((fqn) => Effect.map(Deferred.make(), (d) => [fqn, d]))));
 	const readyStable = Object.fromEntries(yield* Effect.all(Object.keys(allNodes).map((fqn) => Effect.map(Deferred.make(), (d) => [fqn, d]))));
 	const getOutputs = () => Object.fromEntries(Object.entries(tracker).map(([fqn, t]) => [fqn, t.output]));
-	const waitForDeps = (fqns) => Effect.all(fqns.filter((fqn) => fqn in ready).map((fqn) => Deferred.await(ready[fqn])), { concurrency: "unbounded" });
+	const waitForDeps = (fqns) => Effect.all(fqns.filter((fqn) => fqn in ready).map((fqn) => plan.cycleMembers.has(fqn) ? Deferred.await(ready[fqn]) : Deferred.await(readyStable[fqn])), { concurrency: "unbounded" });
 	const waitForStableDeps = (fqns) => Effect.all(fqns.filter((fqn) => fqn in readyStable).map((fqn) => Deferred.await(readyStable[fqn])), { concurrency: "unbounded" });
 	const failures = [];
 	yield* Effect.all(Object.entries(allNodes).map(([fqn, node]) => node.kind === "action" ? executeActionNode(fqn, node, tracker, ready, readyStable, terminalStatuses, session, state, stackName, stage$1, getOutputs, waitForStableDeps, failures) : executeNode(fqn, node, tracker, ready, readyStable, terminalStatuses, session, state, stackName, stage$1, getOutputs, waitForDeps, failures, plan.cycleMembers.has(fqn))), { concurrency: "unbounded" });
@@ -2533,9 +2563,38 @@ const resourceFilter = Flag.string("filter").pipe(Flag.withDescription("Comma-se
 * ```
 */
 const instrumentCommand = (command, attrs) => (handler) => (args) => handler(args).pipe(Effect.withSpan(`cli.${command}`, { attributes: attrs ? attrs(args) : {} }), recordCli(command));
+/**
+* Render a profile's stored credential entries the same way across
+* `alchemy login` and `alchemy profile show`: one `── Provider ──`
+* header per entry, then either the provider's own `prettyPrint` block
+* (preferred) or a JSON-style fallback when the provider isn't
+* registered in the supplied {@link AuthProviders} registry.
+*/
+const printProfile = Effect.fn(function* (profile$1, stored, registry) {
+	yield* Console.log(`Profile: ${profile$1}`);
+	const names = Object.keys(stored).sort();
+	if (names.length === 0) {
+		yield* Console.log("(no providers configured)");
+		return;
+	}
+	for (const name of names) {
+		const cfg = stored[name];
+		yield* Console.log("");
+		yield* Console.log(`── ${name} ──`);
+		const provider = registry[name];
+		if (provider == null) {
+			yield* Console.log(`  method: ${cfg.method}`);
+			const { method: _method,...rest } = cfg;
+			for (const [k, v] of Object.entries(rest)) yield* Console.log(`  ${k}: ${typeof v === "string" ? v : JSON.stringify(v)}`);
+			continue;
+		}
+		yield* provider.prettyPrint(profile$1, cfg);
+	}
+});
 const importStack = Effect.fn(function* (main) {
 	const path$1 = yield* Path$1.Path;
-	const stackEffect = (yield* Effect.promise(() => import(__rewriteRelativeImportExtension(path$1.resolve(process.cwd(), main))))).default;
+	const url = import.meta.resolve(path$1.resolve(main));
+	const stackEffect = (yield* Effect.promise(() => import(__rewriteRelativeImportExtension(url)))).default;
 	if (!Effect.isEffect(stackEffect)) return yield* Effect.die(/* @__PURE__ */ new Error(`Main file '${main}' must export a default stack definition (export default Alchemy.Stack({...}))`));
 	return stackEffect;
 });