@riverbankcms/sdk 0.151.0 → 0.153.0

package/dist/client/{locationMap-BVvPou4O.mjs → locationMap-Di1K0O2S.mjs}

@@ -1,8 +1,7 @@
-import { r as textColorStyle } from "./colorStyles-DTunOThj.mjs";
-import { t as defineIslandPropsDecoder } from "./propsDecoder-DO5iXphQ.mjs";
-import { n as ThemedButtonLink } from "./ThemedButton-DZKjtaDD.mjs";
+import { Yr as textColorStyle, t as defineIslandPropsDecoder } from "./propsDecoder-lf_dTeZS.mjs";
+import { n as ThemedButtonLink } from "./ThemedButton-B7HFqFBg.mjs";
 import { t as mountReactIsland } from "./reactMount-SY8AVRof.mjs";
-import { t as LeafletStaticMap } from "./LeafletStaticMap-DuFiOHq_.mjs";
+import { t as LeafletStaticMap } from "./LeafletStaticMap-B0WhRr3j.mjs";
 import "react";
 import { jsx, jsxs } from "react/jsx-runtime";
 //#region ../core/src/location.ts

package/dist/client/{media-47fcnhzD.mjs → media-D29-F1u_.mjs}

@@ -1,5 +1,6 @@
-import { n as ok$1, r as clsx, t as err } from "./result-DRW7JWXz.mjs";
-import { F as resolveMediaTransformForAspect, G as unsafeAsStorageBucketName, K as unsafeAsStoragePath, N as isExplicitRectCrop, P as parseAspectRatioValue, U as unsafeAsMediaAssetId, n as mergeStyles, r as textColorStyle, t as backgroundColorStyle } from "./colorStyles-DTunOThj.mjs";
+import { _ as err, g as unsafeAsStoragePath, h as unsafeAsStorageBucketName, p as unsafeAsMediaAssetId, r as resolveManagedMediaReference, v as ok$1 } from "./renderableMediaAssetAdmission-CHkXYDC_.mjs";
+import { Jr as mergeStyles, Yr as textColorStyle, ci as parseAspectRatioValue, li as resolveMediaTransformForAspect, ni as clsx, qr as backgroundColorStyle, si as isExplicitRectCrop } from "./propsDecoder-lf_dTeZS.mjs";
+import { a as getSupabaseUrl, i as getSiteId, n as getCurrentResolveImageUrlContext, r as getMediaAssetIndex } from "./mediaContext-CwbbimYB.mjs";
 import "react";
 import { jsx } from "react/jsx-runtime";
 //#region ../media-core/src/fileSafety.ts
@@ -201,45 +202,6 @@ function rotateNormalizedPoint(point, rotation) {
 	}
 }
 //#endregion
-//#region ../media-core/src/renderableMediaAsset.ts
-function buildRenderableMediaAssetIndex(assets) {
-	if (!assets || assets.length === 0) return void 0;
-	const byId = /* @__PURE__ */ new Map();
-	const byIdentifier = /* @__PURE__ */ new Map();
-	for (const asset of assets) {
-		if (!asset?.id) continue;
-		byId.set(asset.id, asset);
-		const identifier = typeof asset.identifier === "string" ? asset.identifier.trim() : "";
-		if (identifier) byIdentifier.set(identifier, asset);
-	}
-	return {
-		byId,
-		byIdentifier
-	};
-}
-function attachRenderableMediaAssetFields(media, asset) {
-	return {
-		...media,
-		assetId: asset.id,
-		id: asset.id,
-		identifier: mediaIdentifierOrFallback(media.identifier, asset.identifier),
-		storageBucket: asset.storageBucket ?? media.storageBucket,
-		storagePath: asset.storagePath ?? media.storagePath,
-		width: asset.width ?? media.width,
-		height: asset.height ?? media.height,
-		mimeType: asset.mimeType ?? media.mimeType
-	};
-}
-/**
-* Preserve an explicit per-usage identifier when one exists. Otherwise prefer
-* the canonical asset identifier, while keeping intentionally blank legacy
-* string values from becoming null.
-*/
-function mediaIdentifierOrFallback(current, fallback) {
-	if (typeof current === "string" && current.trim().length > 0) return current;
-	return fallback ?? (typeof current === "string" ? current : void 0);
-}
-//#endregion
 //#region ../blocks/src/system/media/slotContracts.ts
 const DEFAULT_MIN_SOURCE_WIDTH = 1200;
 const LARGE_MIN_SOURCE_WIDTH = 1400;
@@ -645,22 +607,9 @@ function resolveMediaSlotContract({ blockKind, fieldPath, values, fieldAspectRat
 }
 //#endregion
 //#region ../blocks/src/system/runtime/nodes/media.tsx
-function buildMediaAssetIndex(assets) {
-	return buildRenderableMediaAssetIndex(assets);
-}
 const MAX_RENDER_DIMENSION = 4096;
 const MAX_SRCSET_WIDTH = 2560;
 const RELATIVE_IMG_PROXY_BASE_PATH = "/api/img";
-function normalizeSupabaseUrl(value) {
-	return value?.replace(/\/$/, "");
-}
-function buildResolveImageUrlContext(input) {
-	return {
-		supabaseUrl: normalizeSupabaseUrl(input?.supabaseUrl),
-		siteId: input?.siteId,
-		mediaAssetIndex: input?.mediaAssetIndex ?? buildMediaAssetIndex(input?.mediaAssets)
-	};
-}
 function getValidSourceDimension(value) {
 	return typeof value === "number" && Number.isFinite(value) && value > 0 ? value : void 0;
 }
@@ -785,52 +734,55 @@ function warnForMediaUrlResolution(result) {
 	}
 }
 function resolveMediaStorageUrlResult(value, context, transformOptions) {
-	const canonical = resolveMediaWithCanonicalAsset(value, context ?? void 0);
-	if (!canonical.storagePath || canonical.storagePath.length === 0) return {
+	const canonical = resolveRuntimeMedia(value, context ?? void 0);
+	if (!canonical) return {
+		kind: "missing-storage-path",
+		identifier: value.identifier
+	};
+	return resolveResolvedMediaStorageUrlResult(canonical, context, transformOptions);
+}
+function resolveDirectStoragePathUrl(asset, supabaseUrl, siteId, transformOptions) {
+	const bucket = asset.storageBucket ?? "media";
+	if (isSiteScopedDirectImageStoragePath(asset.storagePath)) return {
+		kind: "resolved",
+		url: getDirectImageUrlForSiteScopedPath(supabaseUrl, asset.storagePath, bucket, transformOptions)
+	};
+	const relativePath = parseRelativeStoragePath(asset.storagePath);
+	if (!relativePath.ok) return {
+		kind: "invalid-storage-path",
+		storagePath: asset.storagePath
+	};
+	if (!siteId) return {
+		kind: "missing-site-context",
+		storagePath: asset.storagePath
+	};
+	return {
+		kind: "resolved",
+		url: getDirectImageUrlForRelativePath(supabaseUrl, relativePath.value, siteId, bucket, transformOptions)
+	};
+}
+function resolveResolvedMediaStorageUrlResult(canonical, context, transformOptions) {
+	const storagePath = canonical.storagePath;
+	if (!storagePath) return {
 		kind: "missing-storage-path",
 		assetId: canonical.assetId,
 		identifier: canonical.identifier
 	};
-	const siteId = context?.siteId ?? getSiteId();
-	const bucket = canonical.storageBucket ?? "media";
-	const siteScopedPath = isSiteScopedDirectImageStoragePath(canonical.storagePath) ? canonical.storagePath : null;
-	let supabaseUrl;
 	try {
-		supabaseUrl = context?.supabaseUrl?.replace(/\/$/, "") ?? getSupabaseUrl();
+		const supabaseUrl = context?.supabaseUrl?.replace(/\/$/, "") ?? getSupabaseUrl();
+		return resolveDirectStoragePathUrl({
+			...canonical,
+			storagePath
+		}, supabaseUrl, context?.siteId ?? getSiteId(), transformOptions);
 	} catch (error) {
 		return {
 			kind: "missing-supabase-url",
 			message: error instanceof Error ? error.message : "Supabase URL is not configured."
 		};
 	}
-	let directUrl;
-	if (siteScopedPath) directUrl = getDirectImageUrlForSiteScopedPath(supabaseUrl, siteScopedPath, bucket, transformOptions);
-	else {
-		const relativePath = parseRelativeStoragePath(canonical.storagePath);
-		if (!relativePath.ok) return {
-			kind: "invalid-storage-path",
-			storagePath: canonical.storagePath
-		};
-		if (!siteId) return {
-			kind: "missing-site-context",
-			storagePath: canonical.storagePath
-		};
-		directUrl = getDirectImageUrlForRelativePath(supabaseUrl, relativePath.value, siteId, bucket, transformOptions);
-	}
-	debugMediaNodeLog("resolve:direct-supabase", {
-		storagePath: canonical.storagePath,
-		siteId,
-		bucket,
-		directUrl,
-		transformOptions
-	});
-	return {
-		kind: "resolved",
-		url: directUrl
-	};
 }
 function getDirectImageUrlForValue(value, options, context) {
-	const result = resolveMediaStorageUrlResult(value, context, buildDirectTransformOptions(options));
+	const result = resolveResolvedMediaStorageUrlResult(value, context, buildDirectTransformOptions(options));
 	return result.kind === "resolved" ? result.url : void 0;
 }
 function resolveStorageImageUrl(value, options, context, transformAspectRatio, resolved) {
@@ -869,133 +821,6 @@ const ImagePresets = {
 		resize: "contain"
 	}
 };
-/**
-* Server-side: AsyncLocalStorage for request isolation.
-* Prevents race conditions when multiple requests are processed concurrently.
-*
-* Lazy initialization to avoid issues in environments that don't support async_hooks.
-*/
-let _serverStorage = null;
-let _serverStorageChecked = false;
-function getServerStorage() {
-	if (typeof window !== "undefined") return null;
-	if (_serverStorageChecked) return _serverStorage;
-	_serverStorageChecked = true;
-	try {
-		const globalWithNonWebpackRequire = globalThis;
-		const AsyncLocalStorage = (typeof globalWithNonWebpackRequire.__non_webpack_require__ === "function" ? globalWithNonWebpackRequire.__non_webpack_require__ : new Function("id", "return require(id)"))("async_hooks").AsyncLocalStorage;
-		if (AsyncLocalStorage) {
-			_serverStorage = new AsyncLocalStorage();
-			return _serverStorage;
-		}
-		return null;
-	} catch {
-		console.warn("[blocks] AsyncLocalStorage not available - using module-level state");
-		return null;
-	}
-}
-/**
-* Client-side context storage.
-* Safe because browsers are single-threaded per tab.
-*
-* IMPORTANT: This must be shared across bundles.
-* SDK preview mode can load multiple independently-bundled entrypoints
-* (e.g. `@riverbankcms/sdk/rendering` + `@riverbankcms/sdk/preview-next/client`),
-* which can otherwise each get their own module-scoped singleton.
-*/
-const RB_MEDIA_CONTEXT_KEY = Symbol.for("riverbankcms.blocks.mediaContext");
-function getClientContextStore() {
-	const g = globalThis;
-	const existing = g[RB_MEDIA_CONTEXT_KEY];
-	if (existing && typeof existing === "object") return existing;
-	const next = {};
-	g[RB_MEDIA_CONTEXT_KEY] = next;
-	return next;
-}
-/**
-* Get the current media context.
-* Server-side: Uses AsyncLocalStorage for request isolation.
-* Client-side: Uses module-level state (safe in single-threaded browser).
-*/
-function getMediaContext() {
-	const storage = getServerStorage();
-	if (storage) return storage.getStore() ?? {};
-	return getClientContextStore();
-}
-/**
-* Set the Supabase URL in the current context.
-* @deprecated Use runWithMediaContext instead for request isolation.
-*/
-function setContextSupabaseUrl(url) {
-	const normalizedUrl = normalizeSupabaseUrl(url);
-	const storage = getServerStorage();
-	if (storage) {
-		const current = storage.getStore();
-		if (current) current.supabaseUrl = normalizedUrl;
-		else if (storage.enterWith) {
-			const next = { supabaseUrl: normalizedUrl };
-			storage.enterWith(next);
-		} else getClientContextStore().supabaseUrl = normalizedUrl;
-	} else getClientContextStore().supabaseUrl = normalizedUrl;
-}
-/**
-* Set the site ID in the current context.
-* @deprecated Use runWithMediaContext instead for request isolation.
-*/
-function setContextSiteId(siteId) {
-	const storage = getServerStorage();
-	if (storage) {
-		const current = storage.getStore();
-		if (current) current.siteId = siteId;
-		else if (storage.enterWith) {
-			const next = { siteId };
-			storage.enterWith(next);
-		} else getClientContextStore().siteId = siteId;
-	} else getClientContextStore().siteId = siteId;
-}
-function setContextMediaAssetIndex(index) {
-	const storage = getServerStorage();
-	if (storage) {
-		const current = storage.getStore();
-		if (current) current.mediaAssetIndex = index;
-		else if (storage.enterWith) {
-			const next = { mediaAssetIndex: index };
-			storage.enterWith(next);
-		} else getClientContextStore().mediaAssetIndex = index;
-	} else getClientContextStore().mediaAssetIndex = index;
-}
-function setContextResolveImageUrlContext(context) {
-	setContextSupabaseUrl(context?.supabaseUrl);
-	setContextSiteId(context?.siteId);
-	setContextMediaAssetIndex(context?.mediaAssetIndex);
-}
-function getCurrentResolveImageUrlContext() {
-	const context = getMediaContext();
-	if (!context.supabaseUrl && !context.siteId && !context.mediaAssetIndex) return;
-	return {
-		supabaseUrl: context.supabaseUrl,
-		siteId: context.siteId,
-		mediaAssetIndex: context.mediaAssetIndex
-	};
-}
-/**
-* Get the Supabase URL for constructing direct storage URLs.
-* Used for serving images directly from Supabase storage CDN.
-*
-* Resolution order:
-* 1. Context URL (set via runWithMediaContext or setContextSupabaseUrl)
-* 2. Environment variable NEXT_PUBLIC_SUPABASE_URL
-*
-* SDK sites receive the URL from the API, so they don't need the env var.
-* Dashboard and frontend apps use the env var.
-*/
-function getSupabaseUrl() {
-	const context = getMediaContext();
-	if (context.supabaseUrl) return context.supabaseUrl;
-	const url = process.env.NEXT_PUBLIC_SUPABASE_URL;
-	if (!url) throw new Error("NEXT_PUBLIC_SUPABASE_URL is not configured. Set it to your Supabase project URL (e.g., https://xxx.supabase.co)");
-	return url.replace(/\/$/, "");
-}
 function resolveDashboardOrigin(raw) {
 	if (!raw) return void 0;
 	const trimmed = raw.trim();
@@ -1013,47 +838,41 @@ function getImageProxyBasePath() {
 	if (!dashboardOrigin) return RELATIVE_IMG_PROXY_BASE_PATH;
 	return `${dashboardOrigin}${RELATIVE_IMG_PROXY_BASE_PATH}`;
 }
-/**
-* Get the site ID for constructing storage paths.
-* Required for relative path resolution.
-*/
-function getSiteId() {
-	return getMediaContext().siteId;
-}
-function getMediaAssetIndex(context) {
-	return context?.mediaAssetIndex ?? getMediaContext().mediaAssetIndex;
-}
-function resolveCanonicalMediaAsset(value, context) {
-	const index = getMediaAssetIndex(context);
-	if (!index) return void 0;
-	if (value.assetId) {
-		const hit = index.byId.get(value.assetId);
-		if (hit) return hit;
-	}
-	const identifier = typeof value.identifier === "string" ? value.identifier.trim() : "";
-	if (identifier) {
-		const hit = index.byIdentifier.get(identifier);
-		if (hit) return hit;
-	}
+/** Resolve portable content without exposing runtime metadata as saved values. */
+function resolveMediaWithContext(reference, context) {
+	return resolveManagedMediaReference(reference, getMediaAssetIndex(context ?? void 0));
 }
-function resolveMediaWithCanonicalAsset(value, context) {
-	const asset = resolveCanonicalMediaAsset(value, context);
-	if (!asset) return value;
-	return attachRenderableMediaAssetFields(value, asset);
+function sourceFromAsset(value, asset) {
+	return {
+		type: value.type,
+		alt: value.alt,
+		filename: value.filename,
+		purpose: value.purpose,
+		placeholder: value.placeholder,
+		transform: value.transform,
+		poster: value.poster,
+		identifier: asset.identifier,
+		assetId: asset.id,
+		storageBucket: asset.storageBucket,
+		storagePath: asset.storagePath,
+		mimeType: asset.mimeType,
+		width: asset.width,
+		height: asset.height
+	};
+}
+function resolveRuntimeMedia(value, context) {
+	if ("asset" in value && value.asset) return sourceFromAsset(value, value.asset);
+	if ("src" in value && value.src) return value;
+	if (!value.identifier) return void 0;
+	const resolved = resolveMediaWithContext(value, context);
+	return resolved.kind === "resolved" ? sourceFromAsset(resolved.reference, resolved.asset) : void 0;
 }
 function resolveVideoPosterUrl(value, context) {
-	if (value.type !== "video") return void 0;
-	const poster = value.poster;
-	if (!poster) return void 0;
-	switch (poster.tag) {
-		case "external-src": return poster.src;
-		case "storage": return resolveMediaStorageUrl({
-			type: "image",
-			assetId: poster.assetId,
-			storageBucket: poster.storageBucket,
-			storagePath: poster.storagePath
-		}, context);
-	}
+	if (value.type !== "video" || !value.poster) return void 0;
+	return value.poster.tag === "external-src" ? value.poster.src : resolveMediaStorageUrl({
+		type: "image",
+		identifier: value.poster.identifier
+	}, context);
 }
 const debugMediaNodeLog = (...args) => {
 	if (typeof window === "undefined") return;
@@ -1130,7 +949,7 @@ function renderVideo(value, className, style, context, options = {}) {
 	});
 }
 function resolvePublicMediaUrl(value, context) {
-	return resolveMediaStorageUrl(value, context) ?? value.src;
+	return resolveMediaStorageUrl(value, context) ?? ("src" in value ? value.src : void 0);
 }
 function renderAudio(value, className, style, context) {
 	if (value.type !== "audio") return null;
@@ -1145,41 +964,43 @@ function renderAudio(value, className, style, context) {
 		"aria-label": value.alt ?? "Audio"
 	});
 }
-function computeMediaTransformStyle(value, style, targetAspectRatio, options) {
+function usesProxyFraming(source, transform) {
+	if (!source?.assetId || !isExplicitCropProxyEnabled()) return false;
+	return Boolean(transform.rotation) || isExplicitRectCrop(transform.rect, getValidSourceDimension(source.width), getValidSourceDimension(source.height));
+}
+function rectFramingPatch(source, rect, proxy, style) {
+	if (!source || !rect || proxy) return {};
+	const patch = buildCssRectStylePatch(source, rect);
+	return patch ? applyRectTransform(style, patch) : {};
+}
+function hotspotFramingPatch(transform, proxy, rectPatch, style) {
+	if (!transform.hotspot || rectPatch.objectPosition !== void 0) return {};
+	const fit = style?.objectFit;
+	if (fit && fit !== "cover" && fit !== "contain") return {};
+	const point = proxy && transform.rotation ? rotateNormalizedPoint(transform.hotspot, transform.rotation) : transform.hotspot;
+	return { objectPosition: `${point.x * 100}% ${point.y * 100}%` };
+}
+function rotationFramingPatch(rotation, proxy, rectPatch, style) {
+	if (!rotation || proxy) return {};
+	return {
+		transform: appendTransform(rectPatch.transform ?? style?.transform, `rotate(${rotation}deg)`),
+		transformOrigin: rectPatch.transformOrigin ?? "center"
+	};
+}
+/** CSS framing is a pure projection of the resolved source and per-use transform. */
+function deriveMediaFramingStyle(source, transform, proxy, style) {
+	if (!transform.rect && !transform.hotspot && !transform.rotation) return style;
+	const rectPatch = rectFramingPatch(source, transform.rect, proxy, style);
+	return mergeStyles(style, {
+		...rectPatch,
+		...hotspotFramingPatch(transform, proxy, rectPatch, style),
+		...rotationFramingPatch(transform.rotation, proxy, rectPatch, style)
+	});
+}
+function computeMediaTransformStyle(value, style, targetAspectRatio, options, context) {
+	const source = resolveRuntimeMedia(value, context ?? getCurrentResolveImageUrlContext());
 	const transform = options?.resolvedTransform ?? resolveMediaTransformForAspect(value.transform, targetAspectRatio);
-	const rect = transform.rect;
-	const hotspot = transform.hotspot;
-	const rotation = transform.rotation;
-	if (!rect && !hotspot && !rotation) return style;
-	const stylePatch = {};
-	const heuristicSuppressCss = Boolean(isExplicitCropProxyEnabled() && value.assetId && (typeof rotation === "number" && rotation !== 0 || isExplicitRectCrop(rect, getValidSourceDimension(value.width), getValidSourceDimension(value.height))));
-	const shouldSuppressCss = options?.isProxy ?? heuristicSuppressCss;
-	if (rect && !shouldSuppressCss) {
-		const rectPatch = buildCssRectStylePatch(value, rect);
-		if (rectPatch) {
-			const mergedRect = applyRectTransform(style, rectPatch);
-			Object.assign(stylePatch, mergedRect);
-		}
-	}
-	if (hotspot) {
-		const effectiveObjectFit = stylePatch.objectFit ?? style?.objectFit;
-		if ((!effectiveObjectFit || effectiveObjectFit === "cover" || effectiveObjectFit === "contain") && stylePatch.objectPosition === void 0) {
-			const resolved = shouldSuppressCss && rotation ? rotateNormalizedPoint({
-				x: hotspot.x,
-				y: hotspot.y
-			}, rotation) : {
-				x: hotspot.x,
-				y: hotspot.y
-			};
-			stylePatch.objectPosition = `${resolved.x * 100}% ${resolved.y * 100}%`;
-		}
-	}
-	if (rotation && !shouldSuppressCss) {
-		const existingTransform = stylePatch.transform ?? style?.transform;
-		stylePatch.transform = existingTransform ? `${existingTransform} rotate(${rotation}deg)` : `rotate(${rotation}deg)`;
-		if (!stylePatch.transformOrigin) stylePatch.transformOrigin = "center";
-	}
-	return mergeStyles(style, stylePatch);
+	return deriveMediaFramingStyle(source, transform, options?.isProxy ?? usesProxyFraming(source, transform), style);
 }
 function resolveTargetAspectRatio(size) {
 	if ("original" in size) return void 0;
@@ -1212,8 +1033,12 @@ function resolveImageUrlWithContextResult(value, options, context, transformAspe
 		kind: "resolved",
 		url
 	};
-	const canonical = resolveMediaWithCanonicalAsset(value, context ?? void 0);
-	if (canonical.storagePath && canonical.storagePath.length > 0) return resolveMediaStorageUrlResult(canonical, context, buildDirectTransformOptions(options));
+	const canonical = resolveRuntimeMedia(value, context ?? void 0);
+	if (!canonical) return {
+		kind: "missing-image-url",
+		identifier: value.identifier
+	};
+	if (canonical.storagePath) return resolveResolvedMediaStorageUrlResult(canonical, context, buildDirectTransformOptions(options));
 	return {
 		kind: "missing-image-url",
 		assetId: canonical.assetId,
@@ -1222,7 +1047,11 @@ function resolveImageUrlWithContextResult(value, options, context, transformAspe
 }
 function resolveImageUrlWithContextInternal(value, options, context, transformAspectRatio, resolved) {
 	if (value.type !== "image") return void 0;
-	const canonical = resolveMediaWithCanonicalAsset(value, context);
+	const canonical = resolveRuntimeMedia(value, context);
+	if (!canonical) return void 0;
+	return resolveImageUrlForSource(canonical, options, context, transformAspectRatio, resolved);
+}
+function resolveImageUrlForSource(canonical, options, context, transformAspectRatio, resolved) {
 	debugMediaNodeLog("resolveImageUrl input", {
 		assetId: canonical.assetId,
 		storagePath: canonical.storagePath,
@@ -1238,86 +1067,78 @@ function resolveImageUrlWithContextInternal(value, options, context, transformAs
 		debugMediaNodeLog("resolve:explicit-src", { src: canonical.src });
 		return canonical.src;
 	}
-	const legacyUrl = typeof canonical === "object" && canonical !== null ? Reflect.get(canonical, "url") : void 0;
-	debugMediaNodeLog("resolve:fallback-url", { fallbackUrl: typeof legacyUrl === "string" ? legacyUrl : null });
-	return typeof legacyUrl === "string" ? legacyUrl : void 0;
 }
-function resolveImageSourceSetWithContext(value, options, context) {
-	const normalizedContext = context ?? void 0;
-	if (value.type !== "image") return void 0;
-	const canonical = resolveMediaWithCanonicalAsset(value, normalizedContext);
-	const widthCandidates = normalizeWidthCandidates(options.widthCandidates, MAX_SRCSET_WIDTH);
-	if (widthCandidates.length === 0) return void 0;
+function deriveResponsiveMediaPlan(source, options) {
 	const targetAspectRatio = getPositiveAspectRatio(options.targetAspectRatio);
-	const quality = options.quality;
-	const resize = options.resize;
-	const resolvedTransform = resolveMediaTransformForAspect(canonical.transform, targetAspectRatio);
-	const sourceWidth = getValidSourceDimension(canonical.width);
-	const sourceHeight = getValidSourceDimension(canonical.height);
-	const hasExplicitRectCrop = isExplicitRectCrop(resolvedTransform.rect, sourceWidth, sourceHeight);
+	const transform = resolveTransformResolution(source, targetAspectRatio);
+	const explicitRect = isExplicitRectCrop(transform.resolvedTransform.rect, transform.sourceWidth, transform.sourceHeight);
 	const coverFactor = resolveCoverFactor({
-		resize,
+		resize: options.resize,
 		targetAspectRatio,
-		hasExplicitRectCrop,
-		sourceWidth,
-		sourceHeight
+		hasExplicitRectCrop: explicitRect,
+		sourceWidth: transform.sourceWidth,
+		sourceHeight: transform.sourceHeight
 	});
-	const shouldProxy = Boolean(isExplicitCropProxyEnabled() && canonical.assetId && (hasExplicitRectCrop || typeof resolvedTransform.rotation === "number" && resolvedTransform.rotation !== 0));
-	const effectiveSizes = coverFactor > 1 && typeof options.sizes === "string" && options.sizes.length > 0 ? scaleSizesAttribute(options.sizes, coverFactor) : options.sizes;
-	const srcSetParts = widthCandidates.map((width) => {
-		const height = shouldProxy && hasExplicitRectCrop ? getHeightForAspect(width, targetAspectRatio) : void 0;
-		const effectiveResize = height ? resize : "contain";
-		const url = resolveImageUrlWithContextInternal(canonical, height ? {
-			width,
-			height,
-			resize: effectiveResize,
-			quality
-		} : {
-			width,
-			resize: effectiveResize,
-			quality
-		}, normalizedContext, targetAspectRatio, {
-			resolvedTransform,
-			sourceWidth,
-			sourceHeight
-		});
-		if (!url) return null;
-		return `${url} ${width}w`;
-	}).filter((entry) => entry !== null);
-	if (srcSetParts.length === 0) return void 0;
-	const fallbackWidth = widthCandidates[Math.min(2, widthCandidates.length - 1)];
-	if (fallbackWidth === void 0) return void 0;
-	const defaultWidth = options.defaultWidth ?? fallbackWidth;
-	const scaledDefaultWidth = coverFactor > 1 ? Math.round(defaultWidth * coverFactor) : defaultWidth;
-	const nearestWidth = widthCandidates.find((candidate) => candidate >= scaledDefaultWidth) ?? widthCandidates[widthCandidates.length - 1];
-	if (nearestWidth === void 0) return void 0;
-	const defaultHeight = shouldProxy && hasExplicitRectCrop ? getHeightForAspect(nearestWidth, targetAspectRatio) : void 0;
-	const effectiveDefaultResize = defaultHeight ? resize : "contain";
-	const src = resolveImageUrlWithContextInternal(canonical, defaultHeight ? {
-		width: nearestWidth,
-		height: defaultHeight,
-		resize: effectiveDefaultResize,
-		quality
+	return {
+		widthCandidates: normalizeWidthCandidates(options.widthCandidates, MAX_SRCSET_WIDTH),
+		sizes: scaledResponsiveSizes(options.sizes, coverFactor),
+		targetAspectRatio,
+		quality: options.quality,
+		resize: options.resize,
+		transform,
+		proxy: usesProxyFraming(source, transform.resolvedTransform),
+		explicitRect,
+		coverFactor
+	};
+}
+function scaledResponsiveSizes(sizes, factor) {
+	return sizes && factor > 1 ? scaleSizesAttribute(sizes, factor) : sizes;
+}
+function responsiveMediaOptions(width, plan) {
+	const height = plan.proxy && plan.explicitRect ? getHeightForAspect(width, plan.targetAspectRatio) : void 0;
+	return height ? {
+		width,
+		height,
+		resize: plan.resize,
+		quality: plan.quality
 	} : {
-		width: nearestWidth,
-		resize: effectiveDefaultResize,
-		quality
-	}, normalizedContext, targetAspectRatio, {
-		resolvedTransform,
-		sourceWidth,
-		sourceHeight
-	});
-	if (!src) return void 0;
-	const fallbackSrc = shouldProxy ? getDirectImageUrlForValue(canonical, {
-		width: nearestWidth,
+		width,
 		resize: "contain",
-		quality
-	}, normalizedContext) : void 0;
+		quality: plan.quality
+	};
+}
+function defaultResponsiveWidth(plan, requested) {
+	const fallback = plan.widthCandidates[Math.min(2, plan.widthCandidates.length - 1)];
+	if (fallback === void 0) return void 0;
+	const target = Math.round((requested ?? fallback) * plan.coverFactor);
+	return plan.widthCandidates.find((candidate) => candidate >= target) ?? plan.widthCandidates.at(-1);
+}
+function responsiveSourceSet(source, plan, context) {
+	return plan.widthCandidates.flatMap((width) => {
+		const url = resolveImageUrlForSource(source, responsiveMediaOptions(width, plan), context, plan.targetAspectRatio, plan.transform);
+		return url ? [`${url} ${width}w`] : [];
+	}).join(", ");
+}
+function resolveImageSourceSetWithContext(value, options, context) {
+	if (value.type !== "image") return void 0;
+	const source = resolveRuntimeMedia(value, context ?? void 0);
+	if (!source) return void 0;
+	const plan = deriveResponsiveMediaPlan(source, options);
+	const width = defaultResponsiveWidth(plan, options.defaultWidth);
+	if (width === void 0) return void 0;
+	const srcSet = responsiveSourceSet(source, plan, context ?? void 0);
+	if (!srcSet) return void 0;
+	const src = resolveImageUrlForSource(source, responsiveMediaOptions(width, plan), context ?? void 0, plan.targetAspectRatio, plan.transform);
+	if (!src) return void 0;
 	return {
 		src,
-		srcSet: srcSetParts.join(", "),
-		sizes: effectiveSizes,
-		fallbackSrc
+		srcSet,
+		sizes: plan.sizes,
+		fallbackSrc: plan.proxy ? getDirectImageUrlForValue(source, {
+			width,
+			resize: "contain",
+			quality: plan.quality
+		}, context ?? void 0) : void 0
 	};
 }
 function resolveCoverFactor(input) {
@@ -1420,4 +1241,4 @@ function mediaImageHostProps(props, style) {
 	};
 }
 //#endregion
-export { getCurrentResolveImageUrlContext as a, renderVideo as c, setContextResolveImageUrlContext as d, computeMediaTransformStyle as i, resolveImageUrlWithContext as l, MediaPlaceholder as n, mediaImageHostProps as o, buildResolveImageUrlContext as r, renderAudio as s, ImagePresets as t, resolveMediaNodeResponsiveImage as u };
+export { renderAudio as a, resolveMediaNodeResponsiveImage as c, mediaImageHostProps as i, MediaPlaceholder as n, renderVideo as o, computeMediaTransformStyle as r, resolveImageUrlWithContext as s, ImagePresets as t };