alchemy 2.0.0-beta.52 → 2.0.0-beta.54

package/bin/exec.js

@@ -71,15 +71,15 @@ const emptyConfig = () => ({
 	version: CONFIG_VERSION,
 	profiles: {}
 });
-var Profile = class extends EffectContext.Service()("Alchemy::Profile") {};
+var AlchemyProfile = class extends EffectContext.Service()("Alchemy::Profile") {};
 /**
-* Layer that builds the {@link Profile} service. Captures the
+* Layer that builds the {@link AlchemyProfile} service. Captures the
 * {@link FileSystem.FileSystem} dependency at layer-build time, so any
-* Effect that yields {@link Profile} ends up with `R = Profile` (no
+* Effect that yields {@link AlchemyProfile} ends up with `R = Profile` (no
 * `FileSystem` leak). Provide this once at the top of your runtime
 * (alongside `PlatformServices` / `NodeContext`).
 */
-const ProfileLive = Layer.effect(Profile, Effect.gen(function* () {
+const ProfileLive = Layer.effect(AlchemyProfile, Effect.gen(function* () {
 	const fs = yield* FileSystem.FileSystem;
 	const readConfig = fs.readFileString(configFilePath).pipe(Effect.flatMap((data) => Effect.try({
 		try: () => {
@@ -750,8 +750,8 @@ 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 (Config.isConfig(expr)) return yield* evaluate(yield* expr, upstream$1);
+	else if (Duration.isDuration(expr) || Redacted.isRedacted(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;
 });
@@ -893,7 +893,7 @@ const platform = Layer.mergeAll(PlatformServices, FetchHttpClient.layer, Logger.
 //#endregion
 //#region lib/Local/RpcSerialization.js
 const unwrapRpcHandlers = (handlers, streamKeys) => {
-	return Object.fromEntries(Object.entries(handlers).map(([key, value]) => [key, typeof value === "function" ? streamKeys?.includes(key) ? unwrapRpcStreamHandler(value) : unwrapRpcEffectHandler(value) : typeof value === "object" && value !== null ? unwrapRpcHandlers(value) : value]));
+	return Object.fromEntries(Object.entries(handlers).map(([key, value]) => [key, typeof value === "function" ? streamKeys?.includes(key) ? unwrapRpcStreamHandler(value) : unwrapRpcEffectHandler(value) : typeof value === "object" && value !== null && !Array.isArray(value) ? unwrapRpcHandlers(value) : value]));
 };
 const serializeError = Schema.encodeSync(Schema.Defect());
 const unwrapRpcEffectHandler = (handler) => flow((...args) => serializeRpcArgs(args), (args) => Effect.promise(() => handler(args)), Effect.flatMap((exit) => {
@@ -1251,8 +1251,8 @@ const make = (stack, options = {}) => Effect.gen(function* () {
 	const resolveInput = (input) => 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 (Config.isConfig(input)) return yield* resolveInput(yield* input);
+		else if (Duration.isDuration(input) || Redacted.isRedacted(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" }));