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

package/dist/index.d.ts

@@ -59,8 +59,9 @@ type BaseTemplateSkeleton = EntrySkeletonType<BaseTemplateFields, 'template'>;
 
 interface BaseArticleTypeFields {
     name: EntryFieldTypes.Symbol;
+    cmsLabel: EntryFieldTypes.Symbol;
     slug: EntryFieldTypes.Symbol;
-    indexPageName: EntryFieldTypes.Symbol;
+    indexPageTitle: EntryFieldTypes.Symbol;
     indexPageDescription: EntryFieldTypes.Symbol;
     featuredImage: EntryFieldTypes.AssetLink;
     menu?: EntryFieldTypes.EntryLink<BaseNavigationSkeleton>;
@@ -321,8 +322,9 @@ type BaseNavigationSkeleton = EntrySkeletonType<BaseNavigationFields, 'navigatio
 
 interface BaseCustomTypeFields {
     name: EntryFieldTypes.Symbol;
+    cmsLabel: EntryFieldTypes.Symbol;
     slug: EntryFieldTypes.Symbol;
-    indexPageName: EntryFieldTypes.Symbol;
+    indexPageTitle: EntryFieldTypes.Symbol;
     indexPageDescription: EntryFieldTypes.Symbol;
     featuredImage: EntryFieldTypes.AssetLink;
     menu?: EntryFieldTypes.EntryLink<BaseNavigationSkeleton>;

package/dist/index.js

@@ -635,6 +635,9 @@ function addPositionMetadata(items) {
     };
   });
 }
+function calculateContentCount(...contents) {
+  return contents.reduce((acc, content) => acc + content.length, 0);
+}
 
 // src/converters/asset.ts
 function convertAssetToVisual(context, asset, options) {
@@ -1175,13 +1178,6 @@ async function fetchSingleEntity(context, config, fetchConfig, options) {
       },
       requestOptions
     );
-    if (typeof process !== "undefined" && process.env?.NODE_ENV !== "production") {
-      console.log(`[Contentful Fetch] ${fetchConfig.contentType}`, {
-        query: fetchConfig.query,
-        cacheTags,
-        total: response.total
-      });
-    }
     const entry = response.items[0];
     if (!entry || !entry.fields) {
       return { data: null, errors: [] };
@@ -1981,13 +1977,16 @@ function baseArticleConverter(context, entry) {
     collectIconsFromNavigation(finalMenu),
     collectIconsFromNavigation(finalFooter)
   );
+  const articleTitle = makeContentfulTitle(title, sys.id);
   const article = {
     type: "Article",
     id,
     slug,
-    title: makeContentfulTitle(title, sys.id),
+    name: articleTitle,
+    title: articleTitle,
     description: makeContentfulDescription(description, sys.id),
     featuredImage: lookupAsset(context, featuredImage),
+    contentCount: calculateContentCount(topContent, articleContent, bottomContent),
     articleType: articleTypeLink,
     tags: tags?.map((tag) => resolveLink(context, id, tag)),
     contents,
@@ -2037,11 +2036,11 @@ function baseArticleTypeLinkConverter(context, entry) {
       `Invalid content type: expected "articleType", got "${sys.contentType.sys.id}"`
     );
   }
-  const { name, featuredImage, slug, ...simpleFields } = fields;
+  const { name, cmsLabel, featuredImage, slug, ...simpleFields } = fields;
   return createInternalLink(
     sys.id,
     {
-      cmsLabel: name,
+      cmsLabel,
       title: name,
       featuredImage,
       slug,
@@ -2056,8 +2055,9 @@ function baseArticleTypeConverter(context, entry, customTypeEntry) {
   const { sys, fields } = entry;
   const { id } = sys;
   const {
-    indexPageName,
+    name,
     indexPageDescription,
+    indexPageTitle,
     featuredImage,
     menu: menuLink,
     footer: footerLink,
@@ -2090,9 +2090,11 @@ function baseArticleTypeConverter(context, entry, customTypeEntry) {
     type: "Article type",
     id,
     slug,
-    title: makeContentfulTitle(indexPageName, sys.id),
+    name,
+    title: makeContentfulTitle(indexPageTitle, sys.id),
     description: makeContentfulDescription(indexPageDescription, sys.id),
     featuredImage: lookupAsset(context, featuredImage),
+    contentCount: 0,
     contents,
     icons,
     structuredData: [
@@ -2218,8 +2220,9 @@ function baseCustomTypeConverter(context, entry) {
   const { sys, fields } = entry;
   const { id } = sys;
   const {
+    name,
     slug,
-    indexPageName,
+    indexPageTitle,
     indexPageDescription,
     featuredImage,
     menu: menuLink,
@@ -2242,15 +2245,17 @@ function baseCustomTypeConverter(context, entry) {
     collectIconsFromNavigation(menu),
     collectIconsFromNavigation(footer)
   );
+  const title = makeContentfulTitle(indexPageTitle, sys.id);
+  const description = makeContentfulDescription(indexPageDescription, sys.id);
   const customType = {
     type: "Custom type",
     id,
     slug,
-    indexPageName: makeContentfulTitle(indexPageName, sys.id),
-    indexPageDescription: makeContentfulDescription(indexPageDescription, sys.id),
-    title: makeContentfulTitle(indexPageName, sys.id),
-    description: makeContentfulDescription(indexPageDescription, sys.id),
+    name,
+    title,
+    description,
     featuredImage: lookupAsset(context, featuredImage),
+    contentCount: 0,
     contents,
     icons,
     structuredData: [
@@ -2274,7 +2279,7 @@ function baseCustomTypeLinkConverter(context, entry) {
   return createInternalLink(
     id,
     {
-      cmsLabel: fields.name,
+      cmsLabel: fields.cmsLabel,
       title: fields.name,
       featuredImage: fields.featuredImage,
       backgroundColour: fields.backgroundColour,
@@ -2437,10 +2442,12 @@ function basePageConverter(context, entry) {
     id,
     isHomePage: slug === "index",
     slug,
+    name: title,
     title: makeContentfulTitle(title, id),
     description: makeContentfulDescription(description, id),
     featuredImage: lookupAsset(context, featuredImage),
     tags: tags?.map((tag) => resolveLink(context, id, tag)),
+    contentCount: calculateContentCount(topContent, pageContent, bottomContent),
     contents,
     icons,
     structuredData: structuredData?.map((link) => resolveSchema(context, id, link)).filter((item) => item !== null),
@@ -2586,12 +2593,14 @@ function basePersonConverter(context, entry, customTypeEntry) {
     type: "Person",
     id,
     slug,
+    name,
     title: makeContentfulTitle(name, id),
     description: description ?? `Description for ${id}`,
     featuredImage: lookupAsset(context, media),
     // Person uses 'media' not 'featuredImage'
     href: context.urlCalculators.person(slug),
     bio: resolveRichTextDocument(context, id, bioField) ?? null,
+    contentCount: calculateContentCount(personContent),
     contents,
     menu,
     footer,
@@ -2605,7 +2614,7 @@ function basePersonConverter(context, entry, customTypeEntry) {
 // src/converters/tag.ts
 function baseTagLinkConverter(context, entry) {
   const { sys, fields } = entry;
-  const { name, ...simpleFields } = fields;
+  const { name, cmsLabel, ...simpleFields } = fields;
   if (sys.contentType.sys.id !== "tag") {
     throw new Error(`Invalid content type: expected "tag", got "${sys.contentType.sys.id}"`);
   }
@@ -2613,6 +2622,8 @@ function baseTagLinkConverter(context, entry) {
     sys.id,
     {
       ...simpleFields,
+      cmsLabel,
+      useName: false,
       title: name
     },
     context,
@@ -2658,10 +2669,12 @@ function baseTagConverter(context, entry, customTypeEntry) {
     type: "Tag",
     id,
     slug,
+    name,
     title: makeContentfulTitle(name, sys.id),
     description: makeContentfulDescription(description, sys.id),
     featuredImage: lookupAsset(context, featuredImage),
     tagType: tagTypeName ?? null,
+    contentCount: calculateContentCount(topContent),
     contents,
     icons,
     structuredData: structuredData?.map((link) => resolveSchema(context, id, link)).filter((item) => item !== null),