@marvalt/wparser 0.1.17 → 0.1.19

package/dist/index.cjs

@@ -1605,15 +1605,30 @@ function isValidCloudflareUrl(url) {
     // Check if it's a Cloudflare URL
     if (!url.includes('imagedelivery.net'))
         return false;
-    // A complete URL should have at least 3 path segments: /account/image-id/
-    // Incomplete URLs might end with just /account/ or /account
-    const urlObj = new URL(url);
-    const pathSegments = urlObj.pathname.split('/').filter(Boolean);
-    // Should have at least account hash and image ID (2 segments minimum)
-    // But we also accept URLs that end with / (which means they might be complete)
-    // The issue is URLs like: https://imagedelivery.net/ZFArYcvsK9lQ3btUK-x2rA/
-    // This is incomplete - it's missing the image ID
-    return pathSegments.length >= 2;
+    try {
+        const urlObj = new URL(url);
+        const pathSegments = urlObj.pathname.split('/').filter(Boolean);
+        // A complete Cloudflare URL should have:
+        // - Account hash (first segment)
+        // - Image ID (second segment, typically a UUID)
+        // Example: /ZFArYcvsK9lQ3btUK-x2rA/240f5739-ca22-4edb-5726-87fd1ad6c900/
+        // Incomplete URLs like: /ZFArYcvsK9lQ3btUK-x2rA/ (only account hash)
+        // Image IDs are typically UUIDs (36 chars with dashes) or similar long strings
+        if (pathSegments.length < 2) {
+            return false; // Missing image ID
+        }
+        // Check if the second segment looks like an image ID (UUID format or long alphanumeric)
+        const imageId = pathSegments[1];
+        // UUID format: 8-4-4-4-12 (e.g., 240f5739-ca22-4edb-5726-87fd1ad6c900)
+        // Or long alphanumeric string
+        const isUuidLike = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(imageId);
+        const isLongId = imageId.length >= 20; // Long alphanumeric ID
+        return isUuidLike || isLongId;
+    }
+    catch {
+        // Invalid URL format
+        return false;
+    }
 }
 /**
  * Extract image URL from block with priority:
@@ -1875,12 +1890,24 @@ const Column = ({ block, children }) => {
 const Separator = () => jsxRuntimeExports.jsx("hr", { className: "border-gray-200 my-8" });
 const ButtonBlock = ({ block }) => {
     const attrs = block.attributes || {};
-    const url = attrs['url'];
-    const text = attrs['text'];
+    let url = attrs['url'];
+    let text = attrs['text'];
     attrs['linkDestination'];
+    // Extract from innerHTML if not in attributes (buttons often store data in innerHTML)
+    if (!url && block.innerHTML) {
+        const linkMatch = block.innerHTML.match(/<a[^>]+href=["']([^"']+)["'][^>]*>([^<]+)<\/a>/i);
+        if (linkMatch) {
+            url = linkMatch[1];
+            text = linkMatch[2] || text;
+        }
+    }
+    // Get text from block content if still missing
+    if (!text) {
+        text = getBlockTextContent(block);
+    }
     if (!url && !text)
         return null;
-    const buttonText = text || getBlockTextContent(block) || 'Learn more';
+    const buttonText = text || 'Learn more';
     // Handle internal vs external links
     const isExternal = url && (url.startsWith('http://') || url.startsWith('https://'));
     const linkProps = isExternal ? { target: '_blank', rel: 'noopener noreferrer' } : {};
@@ -1954,19 +1981,34 @@ const MediaText = ({ block, children, context }) => {
             const finalImageUrl = isCloudflareImageUrl(imageUrl)
                 ? getCloudflareVariantUrl(imageUrl, { width: 1024 })
                 : imageUrl;
-            mediaElement = (jsxRuntimeExports.jsx("img", { src: finalImageUrl, alt: "", className: "w-full h-auto rounded-lg object-cover", loading: "lazy" }));
+            mediaElement = (jsxRuntimeExports.jsx("img", { src: finalImageUrl, alt: "", className: "w-full h-auto rounded-lg shadow-lg object-cover", loading: "lazy" }));
         }
     }
     // Content is all other children
     const contentElements = childrenArray.filter((_, index) => index !== mediaBlockIndex);
     // Build alignment classes - ensure proper container width
-    // For 'wide', use max-w-7xl; for 'full', use w-full; default to contained
+    // For 'wide', check if we're inside a constrained group context
+    // If innerBlocks contain a group with constrained layout, the parent likely has constrained layout too
+    // In that case, use w-full to fill the parent container (which is already boxed)
+    // Otherwise, use max-w-7xl for standalone wide blocks
     let alignClass;
     if (align === 'full') {
         alignClass = 'w-full';
     }
     else if (align === 'wide') {
-        alignClass = 'max-w-7xl mx-auto';
+        // Check if media-text content is wrapped in a constrained group
+        // This indicates the block is in a constrained layout context
+        // In that case, fill the parent container (which is already boxed) rather than applying another container
+        const hasConstrainedGroup = innerBlocks.some((b) => {
+            if (b.name === 'core/group') {
+                const groupLayout = b.attributes?.layout;
+                return groupLayout?.type === 'constrained';
+            }
+            return false;
+        });
+        // If we have a constrained group in innerBlocks, use w-full to fill parent container
+        // Otherwise, use max-w-7xl for standalone wide blocks
+        alignClass = hasConstrainedGroup ? 'w-full' : 'max-w-7xl mx-auto';
     }
     else {
         // Default to contained width (not full width)