@se-studio/contentful-rest-api 1.0.40 → 1.0.42

package/dist/index.d.ts

@@ -233,8 +233,12 @@ interface BaseExternalComponentFields {
     externalComponentType: EntryFieldTypes.Symbol<string>;
     heading?: EntryFieldTypes.Symbol;
     data: EntryFieldTypes.Object;
+    html: EntryFieldTypes.Text;
     backgroundColour?: EntryFieldTypes.Symbol<string>;
     textColour?: EntryFieldTypes.Symbol<string>;
+    backgroundVisual?: EntryFieldTypes.AssetLink;
+    mobileBackgroundVisual?: EntryFieldTypes.AssetLink;
+    backgroundOverlayOpacity?: EntryFieldTypes.Number;
 }
 type BaseExternalComponentSkeleton = EntrySkeletonType<BaseExternalComponentFields, 'externalComponent'>;
 

package/dist/index.js

@@ -591,6 +591,7 @@ function createInternalLink(id, fields, context, href, internalType, additionalP
   const {
     cmsLabel,
     title,
+    name,
     useName,
     featuredImage,
     backgroundColour,
@@ -605,7 +606,7 @@ function createInternalLink(id, fields, context, href, internalType, additionalP
     type: "Internal link",
     internalType,
     id,
-    name: cmsLabel ?? "",
+    name: name ?? cmsLabel ?? "",
     useName,
     text,
     visual: lookupAsset(context, featuredImage),
@@ -986,19 +987,42 @@ function collectIconsFromNavigation(navigation) {
   }
   return icons;
 }
+function collectIconsFromRichText(richText, processContent) {
+  if (!richText?.json) {
+    return;
+  }
+  const traverseNode = (node) => {
+    if (node.data?.target && typeof node.data.target === "object" && "type" in node.data.target && "id" in node.data.target) {
+      processContent(node.data.target);
+    }
+    if ("content" in node && Array.isArray(node.content)) {
+      for (const child of node.content) {
+        if (typeof child === "object" && child !== null && "nodeType" in child) {
+          traverseNode(child);
+        }
+      }
+    }
+  };
+  traverseNode(richText.json);
+}
 function collectIconsFromContent(contents) {
   if (!contents) {
     return [];
   }
   const icons = [];
   const seenIds = /* @__PURE__ */ new Set();
+  const processedIds = /* @__PURE__ */ new Set();
   function addIcon(icon) {
     if (!seenIds.has(icon.id)) {
       seenIds.add(icon.id);
       icons.push(icon);
     }
   }
-  for (const content of contents) {
+  function processContentItem(content) {
+    if (processedIds.has(content.id)) {
+      return;
+    }
+    processedIds.add(content.id);
     if (content.type === "Component") {
       const componentIcons = collectIconsFromComponent(content);
       for (const icon of componentIcons) {
@@ -1006,11 +1030,12 @@ function collectIconsFromContent(contents) {
       }
       const component = content;
       if (component.contents) {
-        const nestedIcons = collectIconsFromContent(component.contents);
-        for (const icon of nestedIcons) {
-          addIcon(icon);
+        for (const nested of component.contents) {
+          processContentItem(nested);
         }
       }
+      collectIconsFromRichText(component.body, processContentItem);
+      collectIconsFromRichText(component.additionalCopy, processContentItem);
     }
     if (content.type === "Collection") {
       const collectionIcons = collectIconsFromCollection(content);
@@ -1019,11 +1044,14 @@ function collectIconsFromContent(contents) {
       }
       const collection = content;
       if (collection.contents) {
-        const nestedIcons = collectIconsFromContent(collection.contents);
-        for (const icon of nestedIcons) {
-          addIcon(icon);
+        for (const nested of collection.contents) {
+          if (typeof nested === "object" && nested !== null && "type" in nested && "id" in nested) {
+            processContentItem(nested);
+          }
         }
       }
+      collectIconsFromRichText(collection.body, processContentItem);
+      collectIconsFromRichText(collection.additionalCopy, processContentItem);
     }
     if (content.type === "Internal link" || content.type === "External link" || content.type === "Download link" || content.type === "Blank link") {
       const link = content;
@@ -1035,6 +1063,9 @@ function collectIconsFromContent(contents) {
       }
     }
   }
+  for (const content of contents) {
+    processContentItem(content);
+  }
   return icons;
 }
 function deduplicateIcons(...iconArrays) {
@@ -2020,14 +2051,21 @@ function baseArticleLinkConverter(context, entry) {
   const author = fieldsAuthor ? resolveLink(context, sys.id, fieldsAuthor) : void 0;
   const download = lookupDownloadAsset(context, fieldsDownload);
   const href = externalLink ? externalLink : context.urlCalculators.article(articleType.slug, fields.slug, primaryTag?.slug);
-  return createInternalLink(sys.id, simpleFields, context, href, "Article", {
-    tags,
-    primaryTag,
-    articleType,
-    date,
-    author,
-    download
-  });
+  return createInternalLink(
+    sys.id,
+    { ...simpleFields, name: fields.cmsLabel },
+    context,
+    href,
+    "Article",
+    {
+      tags,
+      primaryTag,
+      articleType,
+      date,
+      author,
+      download
+    }
+  );
 }
 function baseArticleTypeLinkConverter(context, entry) {
   const { sys, fields } = entry;
@@ -2041,6 +2079,7 @@ function baseArticleTypeLinkConverter(context, entry) {
     sys.id,
     {
       cmsLabel,
+      name,
       title: name,
       featuredImage,
       slug,
@@ -2278,16 +2317,7 @@ function baseCustomTypeLinkConverter(context, entry) {
   }
   return createInternalLink(
     id,
-    {
-      cmsLabel: fields.cmsLabel,
-      title: fields.name,
-      featuredImage: fields.featuredImage,
-      backgroundColour: fields.backgroundColour,
-      textColour: fields.textColour,
-      indexed: fields.indexed,
-      hidden: fields.hidden,
-      slug: fields.slug
-    },
+    fields,
     context,
     context.urlCalculators.customType(fields.slug),
     "CustomType"
@@ -2295,9 +2325,18 @@ function baseCustomTypeLinkConverter(context, entry) {
 }
 
 // src/converters/externalComponent.ts
-function baseExternalComponentConverter(_context, entry) {
+function baseExternalComponentConverter(context, entry) {
   const { sys, fields } = entry;
-  const { cmsLabel, ...simpleFields } = fields;
+  const {
+    cmsLabel,
+    backgroundVisual: bgVisual,
+    mobileBackgroundVisual: mobileBgVisual,
+    ...simpleFields
+  } = fields;
+  const backgroundVisual = createResponsiveVisual(
+    lookupAsset(context, bgVisual),
+    lookupAsset(context, mobileBgVisual)
+  );
   const externalComponent = {
     type: "External component",
     id: sys.id,
@@ -2305,8 +2344,7 @@ function baseExternalComponentConverter(_context, entry) {
     cmsLabel,
     ...DEFAULT_POSITION_FIELDS,
     ...simpleFields,
-    backgroundOverlayOpacity: null,
-    backgroundVisual: void 0
+    backgroundVisual
   };
   return externalComponent;
 }
@@ -2474,14 +2512,8 @@ function basePageLinkConverter(context, entry) {
   return createInternalLink(
     id,
     {
-      cmsLabel: fields.cmsLabel,
-      title: fields.title,
-      featuredImage: fields.featuredImage,
-      backgroundColour: fields.backgroundColour,
-      textColour: fields.textColour,
-      indexed: fields.indexed,
-      hidden: fields.hidden,
-      slug: fields.slug
+      ...fields,
+      name: fields.cmsLabel
     },
     context,
     context.urlCalculators.page(fields.slug),
@@ -2503,14 +2535,8 @@ function basePageVariantLinkConverter(context, entry) {
   return createInternalLink(
     id,
     {
-      cmsLabel: fields.cmsLabel,
-      title: fields.title,
-      featuredImage: fields.featuredImage,
-      backgroundColour: fields.backgroundColour,
-      textColour: fields.textColour,
-      indexed: fields.indexed,
-      hidden: fields.hidden,
-      slug: fields.slug
+      ...fields,
+      name: fields.cmsLabel
     },
     context,
     context.urlCalculators.pageVariant(fields.slug),
@@ -2541,6 +2567,7 @@ function basePersonLinkConverter(context, entry) {
     sys.id,
     {
       ...simpleFields,
+      name,
       title,
       featuredImage: media,
       cmsLabel: title
@@ -2623,6 +2650,7 @@ function baseTagLinkConverter(context, entry) {
     {
       ...simpleFields,
       cmsLabel,
+      name,
       useName: false,
       title: name
     },