@se-studio/contentful-rest-api 1.0.22 → 1.0.23

package/dist/index.js

@@ -1,4 +1,5 @@
 import { revalidateTag } from 'next/cache';
+import { isSvgImage } from '@se-studio/core-data-types';
 import { NextResponse } from 'next/server';
 
 var __defProp = Object.defineProperty;
@@ -501,6 +502,20 @@ function lookupAsset(context, asset) {
   if (!asset) return void 0;
   return context.assets.get(asset.sys.id);
 }
+function lookupIconAsset(context, asset) {
+  const visual = lookupAsset(context, asset);
+  if (!visual) return void 0;
+  if (visual.image?.type === "Svg image") {
+    return {
+      ...visual,
+      image: {
+        ...visual.image,
+        isIcon: true
+      }
+    };
+  }
+  return visual;
+}
 var DEFAULT_POSITION_FIELDS = {
   index: 0,
   isFirst: false,
@@ -788,6 +803,170 @@ function lookupMediaEntry(context, link) {
   return void 0;
 }
 
+// src/converters/svgProcessor.ts
+async function fetchSvgContent(url) {
+  const response = await fetch(url);
+  if (!response.ok) {
+    throw new Error(`Failed to fetch SVG from ${url}: ${response.statusText}`);
+  }
+  return await response.text();
+}
+function processSvgForSprite(svgContent, iconId) {
+  const viewBoxMatch = svgContent.match(/viewBox\s*=\s*["']([^"']+)["']/i);
+  const viewBox = viewBoxMatch ? viewBoxMatch[1] : "0 0 24 24";
+  const innerContentMatch = svgContent.match(/<svg[^>]*>([\s\S]*)<\/svg>/i);
+  if (!innerContentMatch) {
+    throw new Error(`Invalid SVG content: could not parse SVG structure`);
+  }
+  let innerContent = innerContentMatch[1] ?? "";
+  innerContent = innerContent.replace(/\s(width|height)=["'][^"']*["']/gi, "");
+  const symbolId = `icon-${iconId}`;
+  return `<symbol id="${symbolId}" viewBox="${viewBox}">${innerContent}</symbol>`;
+}
+
+// src/converters/iconCollector.ts
+function extractIconFromVisual(visual) {
+  if (!visual?.image) {
+    return void 0;
+  }
+  if (isSvgImage(visual.image) && visual.image.isIcon) {
+    return visual.image;
+  }
+  return void 0;
+}
+function extractIconsFromResponsiveVisual(visual) {
+  const icons = [];
+  if (visual?.visual) {
+    const svg = extractIconFromVisual(visual.visual);
+    if (svg) {
+      icons.push(svg);
+    }
+  }
+  if (visual?.mobileVisual) {
+    const svg = extractIconFromVisual(visual.mobileVisual);
+    if (svg) {
+      icons.push(svg);
+    }
+  }
+  return icons;
+}
+function collectIconsFromComponent(component) {
+  if (!component) {
+    return [];
+  }
+  const icon = extractIconFromVisual(component.icon);
+  return icon ? [icon] : [];
+}
+function collectIconsFromCollection(collection) {
+  if (!collection) {
+    return [];
+  }
+  const icon = extractIconFromVisual(collection.icon);
+  return icon ? [icon] : [];
+}
+function collectIconsFromNavigation(navigation) {
+  if (!navigation) {
+    return [];
+  }
+  const icons = [];
+  const seenIds = /* @__PURE__ */ new Set();
+  function addIcon(icon) {
+    if (!seenIds.has(icon.id)) {
+      seenIds.add(icon.id);
+      icons.push(icon);
+    }
+  }
+  function processNavItem(item) {
+    if (item.link?.icon) {
+      const linkIcons = extractIconsFromResponsiveVisual(item.link.icon);
+      for (const icon of linkIcons) {
+        addIcon(icon);
+      }
+    }
+    if (item.entries) {
+      for (const nestedItem of item.entries) {
+        processNavItem(nestedItem);
+      }
+    }
+  }
+  for (const item of navigation.entries) {
+    processNavItem(item);
+  }
+  return icons;
+}
+function collectIconsFromContent(contents) {
+  if (!contents) {
+    return [];
+  }
+  const icons = [];
+  const seenIds = /* @__PURE__ */ new Set();
+  function addIcon(icon) {
+    if (!seenIds.has(icon.id)) {
+      seenIds.add(icon.id);
+      icons.push(icon);
+    }
+  }
+  for (const content of contents) {
+    if (content.type === "Component") {
+      const componentIcons = collectIconsFromComponent(content);
+      for (const icon of componentIcons) {
+        addIcon(icon);
+      }
+      const component = content;
+      if (component.contents) {
+        const nestedIcons = collectIconsFromContent(component.contents);
+        for (const icon of nestedIcons) {
+          addIcon(icon);
+        }
+      }
+    }
+    if (content.type === "Collection") {
+      const collectionIcons = collectIconsFromCollection(content);
+      for (const icon of collectionIcons) {
+        addIcon(icon);
+      }
+      const collection = content;
+      if (collection.contents) {
+        const nestedIcons = collectIconsFromContent(collection.contents);
+        for (const icon of nestedIcons) {
+          addIcon(icon);
+        }
+      }
+    }
+    if (content.type === "Internal link" || content.type === "External link" || content.type === "Download link" || content.type === "Blank link") {
+      const link = content;
+      if (link.icon) {
+        const linkIcons = extractIconsFromResponsiveVisual(link.icon);
+        for (const icon of linkIcons) {
+          addIcon(icon);
+        }
+      }
+    }
+  }
+  return icons;
+}
+async function processIconsForSprite(icons) {
+  if (icons.length === 0) {
+    return [];
+  }
+  const processedIcons = await Promise.all(
+    icons.map(async (icon) => {
+      try {
+        const svgContent = await fetchSvgContent(icon.svgSrc);
+        const symbolContent = processSvgForSprite(svgContent, icon.id);
+        return {
+          ...icon,
+          symbolContent
+        };
+      } catch (error) {
+        console.error(`Failed to process icon ${icon.id}:`, error);
+        return icon;
+      }
+    })
+  );
+  return processedIcons;
+}
+
 // src/api/helpers.ts
 init_utils();
 
@@ -898,6 +1077,13 @@ async function fetchSingleEntity(context, config, fetchConfig, options) {
         errors: []
       };
       const converted = fetchConfig.resolver(fullContext, entry);
+      if (converted && typeof converted === "object" && "icons" in converted) {
+        const icons = converted.icons;
+        if (icons && Array.isArray(icons) && icons.length > 0) {
+          const processedIcons = await processIconsForSprite(icons);
+          converted.icons = processedIcons.length > 0 ? processedIcons : void 0;
+        }
+      }
       if (fullContext.errors.length > 0 && typeof process !== "undefined" && process.env?.NODE_ENV === "production") {
         console.error(`CMS conversion errors for ${fetchConfig.contentType}:`, {
           entryId: entry.sys.id,
@@ -1319,8 +1505,8 @@ function createLink(context, entry) {
     ...otherFields
   } = fields;
   const icon = createResponsiveVisual(
-    lookupAsset(context, navIcon),
-    lookupAsset(context, mobileNavIcon)
+    lookupIconAsset(context, navIcon),
+    lookupIconAsset(context, mobileNavIcon)
   );
   const realText = useTitle ? resolveBuildYear(title) : text ? resolveBuildYear(text) : void 0;
   if (link) {
@@ -1460,6 +1646,20 @@ function baseArticleConverter(context, entry) {
     ...postContent,
     ...bottomContent
   ]);
+  const finalMenu = template?.menu;
+  const finalFooter = template?.footer;
+  const contentIcons = collectIconsFromContent(contents);
+  const menuIcons = collectIconsFromNavigation(finalMenu);
+  const footerIcons = collectIconsFromNavigation(finalFooter);
+  const allIcons = [...contentIcons, ...menuIcons, ...footerIcons];
+  const seenIconIds = /* @__PURE__ */ new Set();
+  const icons = allIcons.filter((icon) => {
+    if (seenIconIds.has(icon.id)) {
+      return false;
+    }
+    seenIconIds.add(icon.id);
+    return true;
+  });
   const article = {
     type: "Article",
     id,
@@ -1470,11 +1670,12 @@ function baseArticleConverter(context, entry) {
     articleType: articleTypeLink,
     tags: tags?.map((tag) => resolveLink(context, id, tag)),
     contents,
+    icons: icons.length > 0 ? icons : void 0,
     ...simpleFields,
     // Note: summary field exists in Contentful but is not part of IArticle interface
     // Keeping it in simpleFields for potential future use
-    menu: template?.menu,
-    footer: template?.footer
+    menu: finalMenu,
+    footer: finalFooter
   };
   return article;
 }
@@ -1565,6 +1766,20 @@ function baseArticleTypeConverter(context, entry) {
   const preContent = template?.preContent ?? [];
   const postContent = template?.postContent ?? [];
   const contents = addPositionMetadata([...topContent, ...preContent, ...postContent]);
+  const finalMenu = menu;
+  const finalFooter = footer;
+  const contentIcons = collectIconsFromContent(contents);
+  const menuIcons = collectIconsFromNavigation(finalMenu);
+  const footerIcons = collectIconsFromNavigation(finalFooter);
+  const allIcons = [...contentIcons, ...menuIcons, ...footerIcons];
+  const seenIconIds = /* @__PURE__ */ new Set();
+  const icons = allIcons.filter((icon) => {
+    if (seenIconIds.has(icon.id)) {
+      return false;
+    }
+    seenIconIds.add(icon.id);
+    return true;
+  });
   const articleType = {
     type: "Article type",
     id,
@@ -1573,9 +1788,10 @@ function baseArticleTypeConverter(context, entry) {
     description: makeContentfulDescription(indexPageDescription, sys.id),
     featuredImage: lookupAsset(context, featuredImage),
     contents,
+    icons: icons.length > 0 ? icons : void 0,
     structuredData,
-    menu,
-    footer,
+    menu: finalMenu,
+    footer: finalFooter,
     ...other
   };
   return articleType;
@@ -1623,7 +1839,7 @@ function baseCollectionConverter(context, entry) {
     heading: showHeading ? heading : void 0,
     body: resolveRichTextDocument(context, id, bodyField),
     additionalCopy: resolveRichTextDocument(context, id, additionalCopyField),
-    icon: lookupAsset(context, iconField),
+    icon: lookupIconAsset(context, iconField),
     backgroundVisual,
     visual,
     links: linksField?.map((link) => resolveLink(context, id, link)),
@@ -1676,7 +1892,7 @@ function baseComponentConverter(context, entry) {
     heading: showHeading ? heading : void 0,
     body: resolveRichTextDocument(context, id, bodyField),
     additionalCopy: resolveRichTextDocument(context, id, additionalCopyField),
-    icon: lookupAsset(context, iconField),
+    icon: lookupIconAsset(context, iconField),
     backgroundVisual,
     visual,
     links: resolveLinks(context, id, linksField),
@@ -1769,8 +1985,8 @@ function baseLinkConverter(context, entry) {
     useName ? name : fields.linkText ?? makeContentfulTitle(fields.linkText, id, "Link text for ")
   );
   const icon = createResponsiveVisual(
-    lookupAsset(context, fields.icon),
-    lookupAsset(context, fields.mobileIcon)
+    lookupIconAsset(context, fields.icon),
+    lookupIconAsset(context, fields.mobileIcon)
   );
   const backgroundColour = fields.backgroundColour ?? null;
   const textColour = fields.textColour ?? null;
@@ -1874,6 +2090,20 @@ function basePageConverter(context, entry) {
     ...postContent,
     ...bottomContent
   ]);
+  const finalMenu = pageMenuNav ?? template?.menu;
+  const finalFooter = pageFooterNav ?? template?.footer;
+  const contentIcons = collectIconsFromContent(contents);
+  const menuIcons = collectIconsFromNavigation(finalMenu);
+  const footerIcons = collectIconsFromNavigation(finalFooter);
+  const allIcons = [...contentIcons, ...menuIcons, ...footerIcons];
+  const seenIconIds = /* @__PURE__ */ new Set();
+  const icons = allIcons.filter((icon) => {
+    if (seenIconIds.has(icon.id)) {
+      return false;
+    }
+    seenIconIds.add(icon.id);
+    return true;
+  });
   const page = {
     type: "Page",
     id,
@@ -1884,9 +2114,10 @@ function basePageConverter(context, entry) {
     featuredImage: lookupAsset(context, featuredImage),
     tags: tags?.map((tag) => resolveLink(context, id, tag)),
     contents,
+    icons: icons.length > 0 ? icons : void 0,
     ...simpleFields,
-    menu: pageMenuNav ?? template?.menu,
-    footer: pageFooterNav ?? template?.footer
+    menu: finalMenu,
+    footer: finalFooter
   };
   return page;
 }