alchemy 2.0.0-beta.24 → 2.0.0-beta.25

package/bin/alchemy.js

@@ -145,7 +145,7 @@ var __require = /* @__PURE__ */ createRequire(import.meta.url);
 
 //#endregion
 //#region package.json
-var version = "2.0.0-beta.24";
+var version = "2.0.0-beta.25";
 
 //#endregion
 //#region src/AlchemyContext.ts
@@ -49622,7 +49622,7 @@ const readAssets = Effect.fnUntraced(function* (props) {
 	const path$1 = yield* Path$1.Path;
 	const resolvedDirectory = path$1.resolve(props.directory);
 	const [files, ignore, _headers, _redirects] = yield* Effect.all([
-		fs$3.readDirectory(resolvedDirectory, { recursive: true }).pipe(Effect.catchTag("PlatformError", (e) => e.reason._tag === "NotFound" ? Effect.succeed([]) : Effect.fail(e))),
+		fs$3.readDirectory(resolvedDirectory, { recursive: true }),
 		maybeReadString(path$1.join(resolvedDirectory, ".assetsignore")),
 		maybeReadString(path$1.join(resolvedDirectory, "_headers")),
 		maybeReadString(path$1.join(resolvedDirectory, "_redirects"))
@@ -51246,55 +51246,49 @@ const LiveWorkerProvider = () => effect(Worker, Effect.gen(function* () {
 		}
 		return yield* Effect.die(`Could not infer Cloudflare Zone for hostname "${hostname}". Ensure the parent zone exists in this account.`);
 	});
-	const reconcileDomains = (scriptName, desired, previous) => Effect.gen(function* () {
+	const reconcileDomains = (scriptName, desired, _previous) => Effect.gen(function* () {
+		const liveAll = yield* listDomains({
+			accountId,
+			service: scriptName
+		}).pipe(Effect.map((r) => (r.result ?? []).flatMap((d) => d.id && d.hostname && d.zoneId ? [{
+			id: d.id,
+			hostname: d.hostname,
+			zoneId: d.zoneId,
+			service: d.service ?? void 0
+		}] : [])), Effect.catch(() => Effect.succeed([])));
 		const desiredSet = new Set(desired);
-		const toRemove = previous.filter((p$1) => !desiredSet.has(p$1.hostname));
+		const liveByHostname = new Map(liveAll.map((d) => [d.hostname, d]));
+		const toRemove = liveAll.filter((d) => !desiredSet.has(d.hostname));
 		yield* Effect.all(toRemove.map((d) => deleteDomain({
 			accountId,
 			domainId: d.id
 		}).pipe(Effect.catchTag("DomainNotFound", () => Effect.void))), { concurrency: "unbounded" });
 		if (desired.length === 0) return [];
-		const adoptEnabled = yield* Effect.serviceOption(AdoptPolicy).pipe(Effect.map(Option.getOrElse(() => false)));
 		const zoneCache = /* @__PURE__ */ new Map();
-		/**
-		* Attach `hostname` to `scriptName`, recovering from a "hostname
-		* already in use" conflict when adoption is enabled.
-		*
-		* The Cloudflare API rejects a `PUT /workers/domains` whose
-		* hostname is already registered (even when the existing entry
-		* points at the same Worker, which is exactly what happens
-		* after a state-store wipe). The SDK surfaces this as the
-		* unmatched `UnknownCloudflareError` channel because there's
-		* no dedicated error tag for it. With adoption opted-in we
-		* list domains for the hostname; if the existing entry
-		* already targets *this* Worker we adopt it in place. We
-		* never transfer a hostname off another Worker — that would
-		* silently re-route someone else's traffic.
-		*/
 		const attachDomain = Effect.fnUntraced(function* (hostname) {
+			const live = liveByHostname.get(hostname);
+			if (live) return {
+				hostname: live.hostname,
+				id: live.id,
+				zoneId: live.zoneId
+			};
+			const otherOwner = yield* listDomains({
+				accountId,
+				hostname
+			}).pipe(Effect.map((r) => (r.result ?? []).find((d) => d.hostname === hostname && d.service !== scriptName)), Effect.catch(() => Effect.succeed(void 0)));
+			if (otherOwner?.id) return yield* Effect.die(/* @__PURE__ */ new Error(`Cannot attach hostname '${hostname}' to Worker '${scriptName}': it is already attached to Worker '${otherOwner.service ?? "<unknown>"}'. Detach it from that Worker first, or pick a different hostname.`));
 			const zoneId = yield* inferZoneIdForHostname(hostname, zoneCache);
-			return yield* putDomain({
+			const res = yield* putDomain({
 				accountId,
 				hostname,
 				service: scriptName,
 				zoneId
-			}).pipe(Effect.map((res) => ({
+			});
+			return {
 				hostname,
 				id: res.id ?? "",
 				zoneId: res.zoneId ?? zoneId
-			})), Effect.catchTag("UnknownCloudflareError", (err) => adoptEnabled && /already in use/i.test(err.message) ? adoptDomainIfSameService(hostname, zoneId, err) : Effect.fail(err)));
-		});
-		const adoptDomainIfSameService = Effect.fnUntraced(function* (hostname, zoneId, originalError) {
-			const existing = yield* listDomains({
-				accountId,
-				hostname
-			}).pipe(Effect.map((r) => (r.result ?? []).find((d) => d.hostname === hostname)));
-			if (existing?.id && existing.service === scriptName) return {
-				hostname,
-				id: existing.id,
-				zoneId: existing.zoneId ?? zoneId
 			};
-			return yield* Effect.die(/* @__PURE__ */ new Error(`Cannot attach hostname '${hostname}' to Worker '${scriptName}': it is already attached to Worker '${existing?.service ?? "<unknown>"}'. Detach it from that Worker first, or pick a different hostname. (Cloudflare reported: ${originalError.message})`));
 		});
 		return yield* Effect.all(desired.map(attachDomain), { concurrency: "unbounded" });
 	});
@@ -51333,13 +51327,10 @@ const LiveWorkerProvider = () => effect(Worker, Effect.gen(function* () {
 	});
 	const prepareAssets = Effect.fnUntraced(function* (assets) {
 		if (!assets) return;
-		if (typeof assets === "object" && "path" in assets && "hash" in assets) return {
-			...yield* readAssets({
-				directory: assets.path,
-				config: assets.config
-			}),
-			hash: assets.hash
-		};
+		if (typeof assets === "object" && "path" in assets && "hash" in assets) return yield* readAssets({
+			directory: assets.path,
+			config: assets.config
+		});
 		return yield* readAssets(typeof assets === "string" ? { directory: assets } : assets);
 	});
 	const getCompatibility$1 = (props) => ({
@@ -51552,20 +51543,14 @@ ${[...hasDoClasses ? ["const DurableObjectBridge = makeDurableObjectBridge(Durab
 		const metadataBindings = bindings.flatMap((b) => b.data.bindings ?? []);
 		const expectedDurableObjectClassNames = getExpectedDurableObjectClassNames(metadataBindings);
 		let metadataAssets;
-		let keepAssets = false;
+		const keepAssets = false;
 		if (assets) {
-			if (output?.hash?.assets !== assets.hash) {
-				yield* Effect.logInfo(`Cloudflare Worker ${olds ? "update" : "create"}: uploading assets for ${name}`);
-				const { jwt } = yield* uploadAssets(accountId, name, assets, session);
-				metadataAssets = {
-					jwt,
-					config: assets.config
-				};
-			} else {
-				yield* Effect.logInfo(`Cloudflare Worker update: reusing existing assets for ${name}`);
-				metadataAssets = { config: assets.config };
-				keepAssets = true;
-			}
+			yield* Effect.logInfo(`Cloudflare Worker ${olds ? "update" : "create"}: uploading assets for ${name}`);
+			const { jwt } = yield* uploadAssets(accountId, name, assets, session);
+			metadataAssets = {
+				jwt,
+				config: assets.config
+			};
 			metadataBindings.push({
 				type: "assets",
 				name: "ASSETS"
@@ -51721,7 +51706,7 @@ ${[...hasDoClasses ? ["const DurableObjectBridge = makeDurableObjectBridge(Durab
 	});
 	const hasChanged = Effect.fnUntraced(function* (id, props, output) {
 		if (props.vite) return (yield* hashDirectory(props.vite)) !== output.hash?.input;
-		const [assetsHash, bundleHash] = yield* Effect.all(["assets" in output && output.hash?.assets ? Effect.succeed(output.hash.assets) : prepareAssets(props.assets).pipe(Effect.map((a) => a?.hash)), prepareBundle(id, props).pipe(Effect.map((b) => b.hash))], { concurrency: "unbounded" });
+		const [assetsHash, bundleHash] = yield* Effect.all([prepareAssets(props.assets).pipe(Effect.map((a) => a?.hash)), prepareBundle(id, props).pipe(Effect.map((b) => b.hash))], { concurrency: "unbounded" });
 		return assetsHash !== output.hash?.assets || bundleHash !== output.hash?.bundle;
 	});
 	return Worker.Provider.of({