@marvalt/wparser 0.1.67 → 0.1.69

package/dist/index.cjs

@@ -1602,14 +1602,23 @@ function getBlockTextContent(block) {
  */
 function getImageUrl(block) {
     const attrs = block.attributes || {};
-    // Check various possible URL attributes
-    let url = attrs['url'] ||
-        attrs['src'] ||
-        attrs['imageUrl'] ||
-        attrs['mediaUrl'] ||
-        attrs['backgroundImage'];
-    if (typeof url === 'string' && url.trim()) {
-        return url.trim();
+    // Check various possible URL attributes - prioritize Cloudflare URLs
+    const possibleUrls = [
+        attrs['url'],
+        attrs['src'],
+        attrs['imageUrl'],
+        attrs['mediaUrl'],
+        attrs['backgroundImage']
+    ].filter((url) => typeof url === 'string' && url.trim() !== '');
+    // If any URL is a Cloudflare URL, return it
+    for (const url of possibleUrls) {
+        if (isValidCloudflareUrl(url)) {
+            return url.trim();
+        }
+    }
+    // If no Cloudflare URL found, return first available URL
+    if (possibleUrls.length > 0) {
+        return possibleUrls[0].trim();
     }
     // Try to extract from innerHTML if it's an img tag
     if (block.innerHTML) {
@@ -1628,10 +1637,12 @@ function getImageUrl(block) {
 }
 /**
  * Extract image attributes (alt, width, height, alignment) from block
+ * Prioritizes Cloudflare URLs over WordPress URLs
  */
 function getImageAttributes(block) {
     const attrs = block.attributes || {};
-    const url = getImageUrl(block);
+    // Use extractImageUrlWithFallback to prioritize Cloudflare URLs
+    const url = extractImageUrlWithFallback(block);
     // Extract width - can be number or string like "640px"
     let width;
     const widthAttr = attrs['width'];
@@ -1711,24 +1722,46 @@ function extractImageUrlWithFallback(block) {
     const attrs = block.attributes || {};
     // Check for cloudflareUrl first (from WordPress plugin)
     const cloudflareUrl = attrs['cloudflareUrl'];
-    if (cloudflareUrl && isValidCloudflareUrl(cloudflareUrl)) {
-        return cloudflareUrl;
+    if (cloudflareUrl) {
+        // If cloudflareUrl exists, validate it
+        if (isValidCloudflareUrl(cloudflareUrl)) {
+            return cloudflareUrl;
+        }
+        // If cloudflareUrl exists but is invalid, log for debugging (in development)
+        if (typeof process !== 'undefined' && process.env?.NODE_ENV === 'development') {
+            console.warn('extractImageUrlWithFallback: cloudflareUrl exists but is invalid:', cloudflareUrl);
+        }
     }
     // Try to extract from innerHTML (should be converted by plugin)
     if (block.innerHTML) {
         // Extract img src from innerHTML
         const imgMatch = block.innerHTML.match(/<img[^>]+src=["']([^"']+)["']/i);
         if (imgMatch && imgMatch[1]) {
-            return imgMatch[1];
+            const innerHtmlUrl = imgMatch[1];
+            // If innerHTML has a Cloudflare URL, use it (plugin converted it)
+            if (isValidCloudflareUrl(innerHtmlUrl)) {
+                return innerHtmlUrl;
+            }
+            // If innerHTML has WordPress URL, continue to check regular attributes
         }
         // Try background-image in style attribute
         const bgMatch = block.innerHTML.match(/background-image:\s*url\(["']?([^"')]+)["']?\)/i);
         if (bgMatch && bgMatch[1]) {
-            return bgMatch[1];
+            const bgUrl = bgMatch[1];
+            // If background-image has a Cloudflare URL, use it
+            if (isValidCloudflareUrl(bgUrl)) {
+                return bgUrl;
+            }
         }
     }
     // Fall back to regular URL attributes
-    return getImageUrl(block);
+    const regularUrl = getImageUrl(block);
+    // If regular URL is a Cloudflare URL, use it
+    if (regularUrl && isValidCloudflareUrl(regularUrl)) {
+        return regularUrl;
+    }
+    // Last resort: return regular URL (WordPress URL as fallback)
+    return regularUrl;
 }
 
 /**