@se-studio/contentful-rest-api 1.0.25 → 1.0.26

package/dist/index.js

@@ -945,6 +945,19 @@ function collectIconsFromContent(contents) {
   }
   return icons;
 }
+function deduplicateIcons(...iconArrays) {
+  const seenIds = /* @__PURE__ */ new Set();
+  const icons = [];
+  for (const arr of iconArrays) {
+    for (const icon of arr) {
+      if (!seenIds.has(icon.id)) {
+        seenIds.add(icon.id);
+        icons.push(icon);
+      }
+    }
+  }
+  return icons.length > 0 ? icons : void 0;
+}
 async function processIconsForSprite(icons) {
   if (icons.length === 0) {
     return [];
@@ -1648,18 +1661,11 @@ function baseArticleConverter(context, entry) {
   ]);
   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 icons = deduplicateIcons(
+    collectIconsFromContent(contents),
+    collectIconsFromNavigation(finalMenu),
+    collectIconsFromNavigation(finalFooter)
+  );
   const article = {
     type: "Article",
     id,
@@ -1670,7 +1676,7 @@ function baseArticleConverter(context, entry) {
     articleType: articleTypeLink,
     tags: tags?.map((tag) => resolveLink(context, id, tag)),
     contents,
-    icons: icons.length > 0 ? icons : void 0,
+    icons,
     ...simpleFields,
     // Note: summary field exists in Contentful but is not part of IArticle interface
     // Keeping it in simpleFields for potential future use
@@ -1768,18 +1774,11 @@ function baseArticleTypeConverter(context, entry) {
   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 icons = deduplicateIcons(
+    collectIconsFromContent(contents),
+    collectIconsFromNavigation(finalMenu),
+    collectIconsFromNavigation(finalFooter)
+  );
   const articleType = {
     type: "Article type",
     id,
@@ -1788,7 +1787,7 @@ function baseArticleTypeConverter(context, entry) {
     description: makeContentfulDescription(indexPageDescription, sys.id),
     featuredImage: lookupAsset(context, featuredImage),
     contents,
-    icons: icons.length > 0 ? icons : void 0,
+    icons,
     structuredData,
     menu: finalMenu,
     footer: finalFooter,
@@ -1925,6 +1924,11 @@ function baseCustomTypeConverter(context, entry) {
   const preContent = template?.preContent ?? [];
   const postContent = template?.postContent ?? [];
   const contents = addPositionMetadata([...topContent, ...preContent, ...postContent]);
+  const icons = deduplicateIcons(
+    collectIconsFromContent(contents),
+    collectIconsFromNavigation(menu),
+    collectIconsFromNavigation(footer)
+  );
   const customType = {
     type: "Custom type",
     id,
@@ -1936,6 +1940,7 @@ function baseCustomTypeConverter(context, entry) {
     description: makeContentfulDescription(indexPageDescription, sys.id),
     featuredImage: lookupAsset(context, featuredImage),
     contents,
+    icons,
     structuredData,
     menu,
     footer,
@@ -2092,18 +2097,11 @@ function basePageConverter(context, entry) {
   ]);
   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 icons = deduplicateIcons(
+    collectIconsFromContent(contents),
+    collectIconsFromNavigation(finalMenu),
+    collectIconsFromNavigation(finalFooter)
+  );
   const page = {
     type: "Page",
     id,
@@ -2114,7 +2112,7 @@ function basePageConverter(context, entry) {
     featuredImage: lookupAsset(context, featuredImage),
     tags: tags?.map((tag) => resolveLink(context, id, tag)),
     contents,
-    icons: icons.length > 0 ? icons : void 0,
+    icons,
     ...simpleFields,
     menu: finalMenu,
     footer: finalFooter
@@ -2244,6 +2242,11 @@ function baseTagConverter(context, entry) {
   const preContent = template?.preContent ?? [];
   const postContent = template?.postContent ?? [];
   const contents = addPositionMetadata([...topContent, ...preContent, ...postContent]);
+  const icons = deduplicateIcons(
+    collectIconsFromContent(contents),
+    collectIconsFromNavigation(menu),
+    collectIconsFromNavigation(footer)
+  );
   const tagTypeEntry = tagType ? context.includes.get(tagType.sys.id) : null;
   const tagTypeName = tagTypeEntry?.entry?.fields?.name;
   const tag = {
@@ -2255,6 +2258,7 @@ function baseTagConverter(context, entry) {
     featuredImage: lookupAsset(context, featuredImage),
     tagType: tagTypeName ?? null,
     contents,
+    icons,
     ...rest,
     menu,
     footer