@clyrex-digital/clyrex-controls-dev 0.8.1-dev.20260803102521 → 0.8.1-dev.20260803112407

package/dist/index.js

@@ -6133,36 +6133,6 @@ var parseMaybeNumber = (value) => {
   const n = Number(value);
   return Number.isFinite(n) ? n : void 0;
 };
-function resolveAssetUrl(fieldValue, tag) {
-  if (!fieldValue) {
-    return void 0;
-  }
-  if (typeof fieldValue === "string") {
-    const trimmed = fieldValue.trim();
-    if (trimmed.startsWith("itemassets/") || trimmed.startsWith("/itemassets/") || trimmed.startsWith("http")) {
-      return trimmed;
-    }
-    try {
-      const parsed = JSON.parse(trimmed);
-      return resolveAssetUrl(parsed, tag);
-    } catch {
-      return void 0;
-    }
-  }
-  if (Array.isArray(fieldValue)) {
-    const asset = tag ? fieldValue.find(
-      (x) => x?.tag?.toLowerCase() === tag?.toLowerCase()
-    ) : fieldValue[0];
-    return asset?.assetUrl;
-  }
-  if (typeof fieldValue === "object" && fieldValue !== null) {
-    const assetObject = fieldValue;
-    if (assetObject.assetUrl) {
-      return assetObject.assetUrl;
-    }
-  }
-  return void 0;
-}
 var getNestedValue3 = (obj, path) => {
   if (!obj || !path) {
     return void 0;
@@ -6172,57 +6142,114 @@ var getNestedValue3 = (obj, path) => {
   }, obj);
 };
 var ImageGalleryNode = (props) => {
-  const resolveImageUrl = (image) => {
+  function resolveAsset(fieldValue, tag) {
+    if (!fieldValue) {
+      return void 0;
+    }
+    if (typeof fieldValue === "string") {
+      const trimmed = fieldValue.trim();
+      if (trimmed.startsWith("itemassets/") || trimmed.startsWith("/itemassets/") || trimmed.startsWith("http")) {
+        return {
+          assetUrl: trimmed
+        };
+      }
+      try {
+        const parsed = JSON.parse(trimmed);
+        return resolveAsset(parsed, tag);
+      } catch {
+        return void 0;
+      }
+    }
+    if (Array.isArray(fieldValue)) {
+      const asset = tag ? fieldValue.find(
+        (x) => x?.tag?.toLowerCase() === tag?.toLowerCase()
+      ) : fieldValue[0];
+      if (!asset) return void 0;
+      return {
+        assetUrl: asset.assetUrl,
+        posterUrl: asset.posterUrl,
+        intrinsicWidth: asset.intrinsicWidth,
+        intrinsicHeight: asset.intrinsicHeight,
+        device: asset.device,
+        tag: asset.tag
+      };
+    }
+    if (typeof fieldValue === "object" && fieldValue !== null) {
+      const asset = fieldValue;
+      if (!asset.assetUrl) {
+        return void 0;
+      }
+      return {
+        assetUrl: asset.assetUrl,
+        posterUrl: asset.posterUrl,
+        intrinsicWidth: asset.intrinsicWidth,
+        intrinsicHeight: asset.intrinsicHeight,
+        device: asset.device,
+        tag: asset.tag
+      };
+    }
+    return void 0;
+  }
+  const resolveImage = (image) => {
     let imageUrl = image.imageUrl;
+    let posterUrl = image.posterUrl;
+    let intrinsicWidth = image.intrinsicWidth;
+    let intrinsicHeight = image.intrinsicHeight;
     if (image.datafield && props.dataitem) {
       const fieldValue = getNestedValue3(props.dataitem, image.datafield);
-      const resolvedAsset = resolveAssetUrl(fieldValue, image.tag);
+      const resolvedAsset = resolveAsset(fieldValue, image.tag);
       if (resolvedAsset) {
-        imageUrl = resolvedAsset;
+        imageUrl = resolvedAsset.assetUrl;
+        posterUrl = resolvedAsset.posterUrl;
+        intrinsicWidth = resolvedAsset.intrinsicWidth;
+        intrinsicHeight = resolvedAsset.intrinsicHeight;
       }
     }
     if (!imageUrl) {
-      return "";
-    }
-    if (imageUrl.startsWith("http")) {
-      return imageUrl;
+      return void 0;
     }
-    const base = props.assetBaseUrl.replace(/\/$/, "");
-    const path = imageUrl.replace(/^\//, "");
-    return `${base}/${path}`;
+    return {
+      imageUrl: imageUrl.startsWith("http") ? imageUrl : AssetUtility_default.resolveUrl(props.assetBaseUrl, imageUrl),
+      posterUrl: posterUrl ? AssetUtility_default.resolveUrl(props.assetBaseUrl, posterUrl) : void 0,
+      intrinsicWidth,
+      intrinsicHeight
+    };
   };
   const resolvePosterUrl = (posterUrl) => {
     if (!posterUrl) return void 0;
     return AssetUtility_default.resolveUrl(props.assetBaseUrl, posterUrl);
   };
   const rawImages = Array.isArray(props.node.images) ? props.node.images : [];
-  const hlsImages = rawImages.filter(
-    (img) => resolveImageUrl(img).endsWith(".m3u8")
-  );
-  const staticImages = rawImages.filter(
-    (img) => !resolveImageUrl(img).endsWith(".m3u8")
-  );
+  const hlsImages = rawImages.filter((img) => {
+    const resolved = resolveImage(img);
+    return resolved?.imageUrl?.endsWith(".m3u8");
+  });
+  const staticImages = rawImages.filter((img) => {
+    const resolved = resolveImage(img);
+    return resolved && !resolved.imageUrl?.endsWith(".m3u8");
+  });
   const hlsSources = [
     ...DEVICE_ORDER.flatMap((deviceKey) => {
       const img = hlsImages.find((i) => i.device === deviceKey);
       if (!img) return [];
-      const src = resolveImageUrl(img);
-      if (!src) return [];
-      const media = deviceToMediaQuery(img.device);
-      const posterUrl = resolvePosterUrl(img.posterUrl);
+      const resolved = resolveImage(img);
+      if (!resolved) return [];
       return [
         {
-          src,
-          ...media ? { media } : {},
-          ...posterUrl ? { posterUrl } : {}
+          src: resolved.imageUrl,
+          ...deviceToMediaQuery(img.device) ? { media: deviceToMediaQuery(img.device) } : {},
+          ...resolved.posterUrl ? { posterUrl: resolved.posterUrl } : {}
         }
       ];
     }),
     ...hlsImages.filter((img) => !img.device).map((img) => {
-      const src = resolveImageUrl(img);
-      const posterUrl = resolvePosterUrl(img.posterUrl);
-      return { src, ...posterUrl ? { posterUrl } : {} };
-    }).filter((s) => !!s.src)
+      const resolved = resolveImage(img);
+      if (!resolved) return void 0;
+      return {
+        src: resolved.imageUrl,
+        ...resolved.posterUrl ? { posterUrl: resolved.posterUrl } : {}
+      };
+    }).filter(Boolean)
   ];
   const primaryHls = hlsImages.find((img) => !img.device) ?? hlsImages[0];
   const hlsIntrinsicWidth = primaryHls ? parseMaybeNumber(primaryHls.intrinsicWidth)?.toString() : void 0;
@@ -6264,7 +6291,11 @@ var ImageGalleryNode = (props) => {
         if (!match) {
           return null;
         }
-        const srcUrl = resolveImageUrl(match);
+        const resolved = resolveImage(match);
+        if (!resolved) {
+          return null;
+        }
+        const srcUrl = resolved.imageUrl;
         if (!srcUrl) {
           return null;
         }
@@ -6281,7 +6312,8 @@ var ImageGalleryNode = (props) => {
       }),
       (() => {
         const img = staticFallback;
-        const imageUrl = resolveImageUrl(img);
+        const resolved = resolveImage(img);
+        const imageUrl = resolved?.imageUrl;
         if (!imageUrl) {
           return null;
         }
@@ -6308,7 +6340,8 @@ var ImageGalleryNode = (props) => {
     ] }) : (
       /* Case 2: Only device-specific images exist */
       /* @__PURE__ */ (0, import_jsx_runtime72.jsx)(import_jsx_runtime72.Fragment, { children: staticSources.map((img, index) => {
-        const imageUrl = resolveImageUrl(img);
+        const resolved = resolveImage(img);
+        const imageUrl = resolved?.imageUrl;
         if (!imageUrl) {
           return null;
         }
@@ -6950,7 +6983,7 @@ var getNestedValue6 = (obj, path) => {
     return current && current[key] !== void 0 ? current[key] : void 0;
   }, obj);
 };
-function resolveAssetUrl2(fieldValue, tag) {
+function resolveAssetUrl(fieldValue, tag) {
   if (!fieldValue) {
     return void 0;
   }
@@ -6961,7 +6994,7 @@ function resolveAssetUrl2(fieldValue, tag) {
     }
     try {
       const parsed = JSON.parse(trimmed);
-      return resolveAssetUrl2(parsed, tag);
+      return resolveAssetUrl(parsed, tag);
     } catch {
       return void 0;
     }
@@ -6988,7 +7021,7 @@ function generateCompleteBackgroundString(layers, apiBaseUrl, dataItem) {
       let assetUrl = imageValue.assetUrl || "";
       if (layer.datafield && dataItem) {
         const fieldValue = getNestedValue6(dataItem, layer.datafield);
-        const resolvedAssetUrl = resolveAssetUrl2(fieldValue, layer.tag);
+        const resolvedAssetUrl = resolveAssetUrl(fieldValue, layer.tag);
         if (resolvedAssetUrl) {
           assetUrl = resolvedAssetUrl;
         }

package/dist/index.mjs

@@ -1452,36 +1452,6 @@ var parseMaybeNumber = (value) => {
   const n = Number(value);
   return Number.isFinite(n) ? n : void 0;
 };
-function resolveAssetUrl(fieldValue, tag) {
-  if (!fieldValue) {
-    return void 0;
-  }
-  if (typeof fieldValue === "string") {
-    const trimmed = fieldValue.trim();
-    if (trimmed.startsWith("itemassets/") || trimmed.startsWith("/itemassets/") || trimmed.startsWith("http")) {
-      return trimmed;
-    }
-    try {
-      const parsed = JSON.parse(trimmed);
-      return resolveAssetUrl(parsed, tag);
-    } catch {
-      return void 0;
-    }
-  }
-  if (Array.isArray(fieldValue)) {
-    const asset = tag ? fieldValue.find(
-      (x) => x?.tag?.toLowerCase() === tag?.toLowerCase()
-    ) : fieldValue[0];
-    return asset?.assetUrl;
-  }
-  if (typeof fieldValue === "object" && fieldValue !== null) {
-    const assetObject = fieldValue;
-    if (assetObject.assetUrl) {
-      return assetObject.assetUrl;
-    }
-  }
-  return void 0;
-}
 var getNestedValue3 = (obj, path) => {
   if (!obj || !path) {
     return void 0;
@@ -1491,57 +1461,114 @@ var getNestedValue3 = (obj, path) => {
   }, obj);
 };
 var ImageGalleryNode = (props) => {
-  const resolveImageUrl = (image) => {
+  function resolveAsset(fieldValue, tag) {
+    if (!fieldValue) {
+      return void 0;
+    }
+    if (typeof fieldValue === "string") {
+      const trimmed = fieldValue.trim();
+      if (trimmed.startsWith("itemassets/") || trimmed.startsWith("/itemassets/") || trimmed.startsWith("http")) {
+        return {
+          assetUrl: trimmed
+        };
+      }
+      try {
+        const parsed = JSON.parse(trimmed);
+        return resolveAsset(parsed, tag);
+      } catch {
+        return void 0;
+      }
+    }
+    if (Array.isArray(fieldValue)) {
+      const asset = tag ? fieldValue.find(
+        (x) => x?.tag?.toLowerCase() === tag?.toLowerCase()
+      ) : fieldValue[0];
+      if (!asset) return void 0;
+      return {
+        assetUrl: asset.assetUrl,
+        posterUrl: asset.posterUrl,
+        intrinsicWidth: asset.intrinsicWidth,
+        intrinsicHeight: asset.intrinsicHeight,
+        device: asset.device,
+        tag: asset.tag
+      };
+    }
+    if (typeof fieldValue === "object" && fieldValue !== null) {
+      const asset = fieldValue;
+      if (!asset.assetUrl) {
+        return void 0;
+      }
+      return {
+        assetUrl: asset.assetUrl,
+        posterUrl: asset.posterUrl,
+        intrinsicWidth: asset.intrinsicWidth,
+        intrinsicHeight: asset.intrinsicHeight,
+        device: asset.device,
+        tag: asset.tag
+      };
+    }
+    return void 0;
+  }
+  const resolveImage = (image) => {
     let imageUrl = image.imageUrl;
+    let posterUrl = image.posterUrl;
+    let intrinsicWidth = image.intrinsicWidth;
+    let intrinsicHeight = image.intrinsicHeight;
     if (image.datafield && props.dataitem) {
       const fieldValue = getNestedValue3(props.dataitem, image.datafield);
-      const resolvedAsset = resolveAssetUrl(fieldValue, image.tag);
+      const resolvedAsset = resolveAsset(fieldValue, image.tag);
       if (resolvedAsset) {
-        imageUrl = resolvedAsset;
+        imageUrl = resolvedAsset.assetUrl;
+        posterUrl = resolvedAsset.posterUrl;
+        intrinsicWidth = resolvedAsset.intrinsicWidth;
+        intrinsicHeight = resolvedAsset.intrinsicHeight;
       }
     }
     if (!imageUrl) {
-      return "";
-    }
-    if (imageUrl.startsWith("http")) {
-      return imageUrl;
+      return void 0;
     }
-    const base = props.assetBaseUrl.replace(/\/$/, "");
-    const path = imageUrl.replace(/^\//, "");
-    return `${base}/${path}`;
+    return {
+      imageUrl: imageUrl.startsWith("http") ? imageUrl : AssetUtility_default.resolveUrl(props.assetBaseUrl, imageUrl),
+      posterUrl: posterUrl ? AssetUtility_default.resolveUrl(props.assetBaseUrl, posterUrl) : void 0,
+      intrinsicWidth,
+      intrinsicHeight
+    };
   };
   const resolvePosterUrl = (posterUrl) => {
     if (!posterUrl) return void 0;
     return AssetUtility_default.resolveUrl(props.assetBaseUrl, posterUrl);
   };
   const rawImages = Array.isArray(props.node.images) ? props.node.images : [];
-  const hlsImages = rawImages.filter(
-    (img) => resolveImageUrl(img).endsWith(".m3u8")
-  );
-  const staticImages = rawImages.filter(
-    (img) => !resolveImageUrl(img).endsWith(".m3u8")
-  );
+  const hlsImages = rawImages.filter((img) => {
+    const resolved = resolveImage(img);
+    return resolved?.imageUrl?.endsWith(".m3u8");
+  });
+  const staticImages = rawImages.filter((img) => {
+    const resolved = resolveImage(img);
+    return resolved && !resolved.imageUrl?.endsWith(".m3u8");
+  });
   const hlsSources = [
     ...DEVICE_ORDER.flatMap((deviceKey) => {
       const img = hlsImages.find((i) => i.device === deviceKey);
       if (!img) return [];
-      const src = resolveImageUrl(img);
-      if (!src) return [];
-      const media = deviceToMediaQuery(img.device);
-      const posterUrl = resolvePosterUrl(img.posterUrl);
+      const resolved = resolveImage(img);
+      if (!resolved) return [];
       return [
         {
-          src,
-          ...media ? { media } : {},
-          ...posterUrl ? { posterUrl } : {}
+          src: resolved.imageUrl,
+          ...deviceToMediaQuery(img.device) ? { media: deviceToMediaQuery(img.device) } : {},
+          ...resolved.posterUrl ? { posterUrl: resolved.posterUrl } : {}
         }
       ];
     }),
     ...hlsImages.filter((img) => !img.device).map((img) => {
-      const src = resolveImageUrl(img);
-      const posterUrl = resolvePosterUrl(img.posterUrl);
-      return { src, ...posterUrl ? { posterUrl } : {} };
-    }).filter((s) => !!s.src)
+      const resolved = resolveImage(img);
+      if (!resolved) return void 0;
+      return {
+        src: resolved.imageUrl,
+        ...resolved.posterUrl ? { posterUrl: resolved.posterUrl } : {}
+      };
+    }).filter(Boolean)
   ];
   const primaryHls = hlsImages.find((img) => !img.device) ?? hlsImages[0];
   const hlsIntrinsicWidth = primaryHls ? parseMaybeNumber(primaryHls.intrinsicWidth)?.toString() : void 0;
@@ -1583,7 +1610,11 @@ var ImageGalleryNode = (props) => {
         if (!match) {
           return null;
         }
-        const srcUrl = resolveImageUrl(match);
+        const resolved = resolveImage(match);
+        if (!resolved) {
+          return null;
+        }
+        const srcUrl = resolved.imageUrl;
         if (!srcUrl) {
           return null;
         }
@@ -1600,7 +1631,8 @@ var ImageGalleryNode = (props) => {
       }),
       (() => {
         const img = staticFallback;
-        const imageUrl = resolveImageUrl(img);
+        const resolved = resolveImage(img);
+        const imageUrl = resolved?.imageUrl;
         if (!imageUrl) {
           return null;
         }
@@ -1627,7 +1659,8 @@ var ImageGalleryNode = (props) => {
     ] }) : (
       /* Case 2: Only device-specific images exist */
       /* @__PURE__ */ jsx32(Fragment5, { children: staticSources.map((img, index) => {
-        const imageUrl = resolveImageUrl(img);
+        const resolved = resolveImage(img);
+        const imageUrl = resolved?.imageUrl;
         if (!imageUrl) {
           return null;
         }
@@ -2268,7 +2301,7 @@ var getNestedValue6 = (obj, path) => {
     return current && current[key] !== void 0 ? current[key] : void 0;
   }, obj);
 };
-function resolveAssetUrl2(fieldValue, tag) {
+function resolveAssetUrl(fieldValue, tag) {
   if (!fieldValue) {
     return void 0;
   }
@@ -2279,7 +2312,7 @@ function resolveAssetUrl2(fieldValue, tag) {
     }
     try {
       const parsed = JSON.parse(trimmed);
-      return resolveAssetUrl2(parsed, tag);
+      return resolveAssetUrl(parsed, tag);
     } catch {
       return void 0;
     }
@@ -2306,7 +2339,7 @@ function generateCompleteBackgroundString(layers, apiBaseUrl, dataItem) {
       let assetUrl = imageValue.assetUrl || "";
       if (layer.datafield && dataItem) {
         const fieldValue = getNestedValue6(dataItem, layer.datafield);
-        const resolvedAssetUrl = resolveAssetUrl2(fieldValue, layer.tag);
+        const resolvedAssetUrl = resolveAssetUrl(fieldValue, layer.tag);
         if (resolvedAssetUrl) {
           assetUrl = resolvedAssetUrl;
         }

package/dist/server.js

@@ -3984,36 +3984,6 @@ var parseMaybeNumber = (value) => {
   const n = Number(value);
   return Number.isFinite(n) ? n : void 0;
 };
-function resolveAssetUrl(fieldValue, tag) {
-  if (!fieldValue) {
-    return void 0;
-  }
-  if (typeof fieldValue === "string") {
-    const trimmed = fieldValue.trim();
-    if (trimmed.startsWith("itemassets/") || trimmed.startsWith("/itemassets/") || trimmed.startsWith("http")) {
-      return trimmed;
-    }
-    try {
-      const parsed = JSON.parse(trimmed);
-      return resolveAssetUrl(parsed, tag);
-    } catch {
-      return void 0;
-    }
-  }
-  if (Array.isArray(fieldValue)) {
-    const asset = tag ? fieldValue.find(
-      (x) => x?.tag?.toLowerCase() === tag?.toLowerCase()
-    ) : fieldValue[0];
-    return asset?.assetUrl;
-  }
-  if (typeof fieldValue === "object" && fieldValue !== null) {
-    const assetObject = fieldValue;
-    if (assetObject.assetUrl) {
-      return assetObject.assetUrl;
-    }
-  }
-  return void 0;
-}
 var getNestedValue3 = (obj, path) => {
   if (!obj || !path) {
     return void 0;
@@ -4023,57 +3993,114 @@ var getNestedValue3 = (obj, path) => {
   }, obj);
 };
 var ImageGalleryNode = (props) => {
-  const resolveImageUrl = (image) => {
+  function resolveAsset(fieldValue, tag) {
+    if (!fieldValue) {
+      return void 0;
+    }
+    if (typeof fieldValue === "string") {
+      const trimmed = fieldValue.trim();
+      if (trimmed.startsWith("itemassets/") || trimmed.startsWith("/itemassets/") || trimmed.startsWith("http")) {
+        return {
+          assetUrl: trimmed
+        };
+      }
+      try {
+        const parsed = JSON.parse(trimmed);
+        return resolveAsset(parsed, tag);
+      } catch {
+        return void 0;
+      }
+    }
+    if (Array.isArray(fieldValue)) {
+      const asset = tag ? fieldValue.find(
+        (x) => x?.tag?.toLowerCase() === tag?.toLowerCase()
+      ) : fieldValue[0];
+      if (!asset) return void 0;
+      return {
+        assetUrl: asset.assetUrl,
+        posterUrl: asset.posterUrl,
+        intrinsicWidth: asset.intrinsicWidth,
+        intrinsicHeight: asset.intrinsicHeight,
+        device: asset.device,
+        tag: asset.tag
+      };
+    }
+    if (typeof fieldValue === "object" && fieldValue !== null) {
+      const asset = fieldValue;
+      if (!asset.assetUrl) {
+        return void 0;
+      }
+      return {
+        assetUrl: asset.assetUrl,
+        posterUrl: asset.posterUrl,
+        intrinsicWidth: asset.intrinsicWidth,
+        intrinsicHeight: asset.intrinsicHeight,
+        device: asset.device,
+        tag: asset.tag
+      };
+    }
+    return void 0;
+  }
+  const resolveImage = (image) => {
     let imageUrl = image.imageUrl;
+    let posterUrl = image.posterUrl;
+    let intrinsicWidth = image.intrinsicWidth;
+    let intrinsicHeight = image.intrinsicHeight;
     if (image.datafield && props.dataitem) {
       const fieldValue = getNestedValue3(props.dataitem, image.datafield);
-      const resolvedAsset = resolveAssetUrl(fieldValue, image.tag);
+      const resolvedAsset = resolveAsset(fieldValue, image.tag);
       if (resolvedAsset) {
-        imageUrl = resolvedAsset;
+        imageUrl = resolvedAsset.assetUrl;
+        posterUrl = resolvedAsset.posterUrl;
+        intrinsicWidth = resolvedAsset.intrinsicWidth;
+        intrinsicHeight = resolvedAsset.intrinsicHeight;
       }
     }
     if (!imageUrl) {
-      return "";
-    }
-    if (imageUrl.startsWith("http")) {
-      return imageUrl;
+      return void 0;
     }
-    const base = props.assetBaseUrl.replace(/\/$/, "");
-    const path = imageUrl.replace(/^\//, "");
-    return `${base}/${path}`;
+    return {
+      imageUrl: imageUrl.startsWith("http") ? imageUrl : AssetUtility_default.resolveUrl(props.assetBaseUrl, imageUrl),
+      posterUrl: posterUrl ? AssetUtility_default.resolveUrl(props.assetBaseUrl, posterUrl) : void 0,
+      intrinsicWidth,
+      intrinsicHeight
+    };
   };
   const resolvePosterUrl = (posterUrl) => {
     if (!posterUrl) return void 0;
     return AssetUtility_default.resolveUrl(props.assetBaseUrl, posterUrl);
   };
   const rawImages = Array.isArray(props.node.images) ? props.node.images : [];
-  const hlsImages = rawImages.filter(
-    (img) => resolveImageUrl(img).endsWith(".m3u8")
-  );
-  const staticImages = rawImages.filter(
-    (img) => !resolveImageUrl(img).endsWith(".m3u8")
-  );
+  const hlsImages = rawImages.filter((img) => {
+    const resolved = resolveImage(img);
+    return resolved?.imageUrl?.endsWith(".m3u8");
+  });
+  const staticImages = rawImages.filter((img) => {
+    const resolved = resolveImage(img);
+    return resolved && !resolved.imageUrl?.endsWith(".m3u8");
+  });
   const hlsSources = [
     ...DEVICE_ORDER.flatMap((deviceKey) => {
       const img = hlsImages.find((i) => i.device === deviceKey);
       if (!img) return [];
-      const src = resolveImageUrl(img);
-      if (!src) return [];
-      const media = deviceToMediaQuery(img.device);
-      const posterUrl = resolvePosterUrl(img.posterUrl);
+      const resolved = resolveImage(img);
+      if (!resolved) return [];
       return [
         {
-          src,
-          ...media ? { media } : {},
-          ...posterUrl ? { posterUrl } : {}
+          src: resolved.imageUrl,
+          ...deviceToMediaQuery(img.device) ? { media: deviceToMediaQuery(img.device) } : {},
+          ...resolved.posterUrl ? { posterUrl: resolved.posterUrl } : {}
         }
       ];
     }),
     ...hlsImages.filter((img) => !img.device).map((img) => {
-      const src = resolveImageUrl(img);
-      const posterUrl = resolvePosterUrl(img.posterUrl);
-      return { src, ...posterUrl ? { posterUrl } : {} };
-    }).filter((s) => !!s.src)
+      const resolved = resolveImage(img);
+      if (!resolved) return void 0;
+      return {
+        src: resolved.imageUrl,
+        ...resolved.posterUrl ? { posterUrl: resolved.posterUrl } : {}
+      };
+    }).filter(Boolean)
   ];
   const primaryHls = hlsImages.find((img) => !img.device) ?? hlsImages[0];
   const hlsIntrinsicWidth = primaryHls ? parseMaybeNumber(primaryHls.intrinsicWidth)?.toString() : void 0;
@@ -4115,7 +4142,11 @@ var ImageGalleryNode = (props) => {
         if (!match) {
           return null;
         }
-        const srcUrl = resolveImageUrl(match);
+        const resolved = resolveImage(match);
+        if (!resolved) {
+          return null;
+        }
+        const srcUrl = resolved.imageUrl;
         if (!srcUrl) {
           return null;
         }
@@ -4132,7 +4163,8 @@ var ImageGalleryNode = (props) => {
       }),
       (() => {
         const img = staticFallback;
-        const imageUrl = resolveImageUrl(img);
+        const resolved = resolveImage(img);
+        const imageUrl = resolved?.imageUrl;
         if (!imageUrl) {
           return null;
         }
@@ -4159,7 +4191,8 @@ var ImageGalleryNode = (props) => {
     ] }) : (
       /* Case 2: Only device-specific images exist */
       /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(import_jsx_runtime44.Fragment, { children: staticSources.map((img, index) => {
-        const imageUrl = resolveImageUrl(img);
+        const resolved = resolveImage(img);
+        const imageUrl = resolved?.imageUrl;
         if (!imageUrl) {
           return null;
         }
@@ -4800,7 +4833,7 @@ var getNestedValue6 = (obj, path) => {
     return current && current[key] !== void 0 ? current[key] : void 0;
   }, obj);
 };
-function resolveAssetUrl2(fieldValue, tag) {
+function resolveAssetUrl(fieldValue, tag) {
   if (!fieldValue) {
     return void 0;
   }
@@ -4811,7 +4844,7 @@ function resolveAssetUrl2(fieldValue, tag) {
     }
     try {
       const parsed = JSON.parse(trimmed);
-      return resolveAssetUrl2(parsed, tag);
+      return resolveAssetUrl(parsed, tag);
     } catch {
       return void 0;
     }
@@ -4838,7 +4871,7 @@ function generateCompleteBackgroundString(layers, apiBaseUrl, dataItem) {
       let assetUrl = imageValue.assetUrl || "";
       if (layer.datafield && dataItem) {
         const fieldValue = getNestedValue6(dataItem, layer.datafield);
-        const resolvedAssetUrl = resolveAssetUrl2(fieldValue, layer.tag);
+        const resolvedAssetUrl = resolveAssetUrl(fieldValue, layer.tag);
         if (resolvedAssetUrl) {
           assetUrl = resolvedAssetUrl;
         }

package/dist/server.mjs

@@ -1433,36 +1433,6 @@ var parseMaybeNumber = (value) => {
   const n = Number(value);
   return Number.isFinite(n) ? n : void 0;
 };
-function resolveAssetUrl(fieldValue, tag) {
-  if (!fieldValue) {
-    return void 0;
-  }
-  if (typeof fieldValue === "string") {
-    const trimmed = fieldValue.trim();
-    if (trimmed.startsWith("itemassets/") || trimmed.startsWith("/itemassets/") || trimmed.startsWith("http")) {
-      return trimmed;
-    }
-    try {
-      const parsed = JSON.parse(trimmed);
-      return resolveAssetUrl(parsed, tag);
-    } catch {
-      return void 0;
-    }
-  }
-  if (Array.isArray(fieldValue)) {
-    const asset = tag ? fieldValue.find(
-      (x) => x?.tag?.toLowerCase() === tag?.toLowerCase()
-    ) : fieldValue[0];
-    return asset?.assetUrl;
-  }
-  if (typeof fieldValue === "object" && fieldValue !== null) {
-    const assetObject = fieldValue;
-    if (assetObject.assetUrl) {
-      return assetObject.assetUrl;
-    }
-  }
-  return void 0;
-}
 var getNestedValue3 = (obj, path) => {
   if (!obj || !path) {
     return void 0;
@@ -1472,57 +1442,114 @@ var getNestedValue3 = (obj, path) => {
   }, obj);
 };
 var ImageGalleryNode = (props) => {
-  const resolveImageUrl = (image) => {
+  function resolveAsset(fieldValue, tag) {
+    if (!fieldValue) {
+      return void 0;
+    }
+    if (typeof fieldValue === "string") {
+      const trimmed = fieldValue.trim();
+      if (trimmed.startsWith("itemassets/") || trimmed.startsWith("/itemassets/") || trimmed.startsWith("http")) {
+        return {
+          assetUrl: trimmed
+        };
+      }
+      try {
+        const parsed = JSON.parse(trimmed);
+        return resolveAsset(parsed, tag);
+      } catch {
+        return void 0;
+      }
+    }
+    if (Array.isArray(fieldValue)) {
+      const asset = tag ? fieldValue.find(
+        (x) => x?.tag?.toLowerCase() === tag?.toLowerCase()
+      ) : fieldValue[0];
+      if (!asset) return void 0;
+      return {
+        assetUrl: asset.assetUrl,
+        posterUrl: asset.posterUrl,
+        intrinsicWidth: asset.intrinsicWidth,
+        intrinsicHeight: asset.intrinsicHeight,
+        device: asset.device,
+        tag: asset.tag
+      };
+    }
+    if (typeof fieldValue === "object" && fieldValue !== null) {
+      const asset = fieldValue;
+      if (!asset.assetUrl) {
+        return void 0;
+      }
+      return {
+        assetUrl: asset.assetUrl,
+        posterUrl: asset.posterUrl,
+        intrinsicWidth: asset.intrinsicWidth,
+        intrinsicHeight: asset.intrinsicHeight,
+        device: asset.device,
+        tag: asset.tag
+      };
+    }
+    return void 0;
+  }
+  const resolveImage = (image) => {
     let imageUrl = image.imageUrl;
+    let posterUrl = image.posterUrl;
+    let intrinsicWidth = image.intrinsicWidth;
+    let intrinsicHeight = image.intrinsicHeight;
     if (image.datafield && props.dataitem) {
       const fieldValue = getNestedValue3(props.dataitem, image.datafield);
-      const resolvedAsset = resolveAssetUrl(fieldValue, image.tag);
+      const resolvedAsset = resolveAsset(fieldValue, image.tag);
       if (resolvedAsset) {
-        imageUrl = resolvedAsset;
+        imageUrl = resolvedAsset.assetUrl;
+        posterUrl = resolvedAsset.posterUrl;
+        intrinsicWidth = resolvedAsset.intrinsicWidth;
+        intrinsicHeight = resolvedAsset.intrinsicHeight;
       }
     }
     if (!imageUrl) {
-      return "";
-    }
-    if (imageUrl.startsWith("http")) {
-      return imageUrl;
+      return void 0;
     }
-    const base = props.assetBaseUrl.replace(/\/$/, "");
-    const path = imageUrl.replace(/^\//, "");
-    return `${base}/${path}`;
+    return {
+      imageUrl: imageUrl.startsWith("http") ? imageUrl : AssetUtility_default.resolveUrl(props.assetBaseUrl, imageUrl),
+      posterUrl: posterUrl ? AssetUtility_default.resolveUrl(props.assetBaseUrl, posterUrl) : void 0,
+      intrinsicWidth,
+      intrinsicHeight
+    };
   };
   const resolvePosterUrl = (posterUrl) => {
     if (!posterUrl) return void 0;
     return AssetUtility_default.resolveUrl(props.assetBaseUrl, posterUrl);
   };
   const rawImages = Array.isArray(props.node.images) ? props.node.images : [];
-  const hlsImages = rawImages.filter(
-    (img) => resolveImageUrl(img).endsWith(".m3u8")
-  );
-  const staticImages = rawImages.filter(
-    (img) => !resolveImageUrl(img).endsWith(".m3u8")
-  );
+  const hlsImages = rawImages.filter((img) => {
+    const resolved = resolveImage(img);
+    return resolved?.imageUrl?.endsWith(".m3u8");
+  });
+  const staticImages = rawImages.filter((img) => {
+    const resolved = resolveImage(img);
+    return resolved && !resolved.imageUrl?.endsWith(".m3u8");
+  });
   const hlsSources = [
     ...DEVICE_ORDER.flatMap((deviceKey) => {
       const img = hlsImages.find((i) => i.device === deviceKey);
       if (!img) return [];
-      const src = resolveImageUrl(img);
-      if (!src) return [];
-      const media = deviceToMediaQuery(img.device);
-      const posterUrl = resolvePosterUrl(img.posterUrl);
+      const resolved = resolveImage(img);
+      if (!resolved) return [];
       return [
         {
-          src,
-          ...media ? { media } : {},
-          ...posterUrl ? { posterUrl } : {}
+          src: resolved.imageUrl,
+          ...deviceToMediaQuery(img.device) ? { media: deviceToMediaQuery(img.device) } : {},
+          ...resolved.posterUrl ? { posterUrl: resolved.posterUrl } : {}
         }
       ];
     }),
     ...hlsImages.filter((img) => !img.device).map((img) => {
-      const src = resolveImageUrl(img);
-      const posterUrl = resolvePosterUrl(img.posterUrl);
-      return { src, ...posterUrl ? { posterUrl } : {} };
-    }).filter((s) => !!s.src)
+      const resolved = resolveImage(img);
+      if (!resolved) return void 0;
+      return {
+        src: resolved.imageUrl,
+        ...resolved.posterUrl ? { posterUrl: resolved.posterUrl } : {}
+      };
+    }).filter(Boolean)
   ];
   const primaryHls = hlsImages.find((img) => !img.device) ?? hlsImages[0];
   const hlsIntrinsicWidth = primaryHls ? parseMaybeNumber(primaryHls.intrinsicWidth)?.toString() : void 0;
@@ -1564,7 +1591,11 @@ var ImageGalleryNode = (props) => {
         if (!match) {
           return null;
         }
-        const srcUrl = resolveImageUrl(match);
+        const resolved = resolveImage(match);
+        if (!resolved) {
+          return null;
+        }
+        const srcUrl = resolved.imageUrl;
         if (!srcUrl) {
           return null;
         }
@@ -1581,7 +1612,8 @@ var ImageGalleryNode = (props) => {
       }),
       (() => {
         const img = staticFallback;
-        const imageUrl = resolveImageUrl(img);
+        const resolved = resolveImage(img);
+        const imageUrl = resolved?.imageUrl;
         if (!imageUrl) {
           return null;
         }
@@ -1608,7 +1640,8 @@ var ImageGalleryNode = (props) => {
     ] }) : (
       /* Case 2: Only device-specific images exist */
       /* @__PURE__ */ jsx32(Fragment5, { children: staticSources.map((img, index) => {
-        const imageUrl = resolveImageUrl(img);
+        const resolved = resolveImage(img);
+        const imageUrl = resolved?.imageUrl;
         if (!imageUrl) {
           return null;
         }
@@ -2249,7 +2282,7 @@ var getNestedValue6 = (obj, path) => {
     return current && current[key] !== void 0 ? current[key] : void 0;
   }, obj);
 };
-function resolveAssetUrl2(fieldValue, tag) {
+function resolveAssetUrl(fieldValue, tag) {
   if (!fieldValue) {
     return void 0;
   }
@@ -2260,7 +2293,7 @@ function resolveAssetUrl2(fieldValue, tag) {
     }
     try {
       const parsed = JSON.parse(trimmed);
-      return resolveAssetUrl2(parsed, tag);
+      return resolveAssetUrl(parsed, tag);
     } catch {
       return void 0;
     }
@@ -2287,7 +2320,7 @@ function generateCompleteBackgroundString(layers, apiBaseUrl, dataItem) {
       let assetUrl = imageValue.assetUrl || "";
       if (layer.datafield && dataItem) {
         const fieldValue = getNestedValue6(dataItem, layer.datafield);
-        const resolvedAssetUrl = resolveAssetUrl2(fieldValue, layer.tag);
+        const resolvedAssetUrl = resolveAssetUrl(fieldValue, layer.tag);
         if (resolvedAssetUrl) {
           assetUrl = resolvedAssetUrl;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clyrex-digital/clyrex-controls-dev",
-  "version": "0.8.1-dev.20260803102521",
+  "version": "0.8.1-dev.20260803112407",
   "description": "Reusable React components",
   "main": "dist/index.js",
   "module": "dist/index.mjs",