@se-studio/contentful-rest-api 1.0.37 → 1.0.39

package/dist/index.d.ts

@@ -59,9 +59,9 @@ type BaseTemplateSkeleton = EntrySkeletonType<BaseTemplateFields, 'template'>;
 
 interface BaseArticleTypeFields {
     name: EntryFieldTypes.Symbol;
+    cmsLabel: EntryFieldTypes.Symbol;
     slug: EntryFieldTypes.Symbol;
-    indexPageName: EntryFieldTypes.Symbol;
-    indexPageSlug: EntryFieldTypes.Symbol;
+    indexPageTitle: EntryFieldTypes.Symbol;
     indexPageDescription: EntryFieldTypes.Symbol;
     featuredImage: EntryFieldTypes.AssetLink;
     menu?: EntryFieldTypes.EntryLink<BaseNavigationSkeleton>;
@@ -322,9 +322,9 @@ type BaseNavigationSkeleton = EntrySkeletonType<BaseNavigationFields, 'navigatio
 
 interface BaseCustomTypeFields {
     name: EntryFieldTypes.Symbol;
+    cmsLabel: EntryFieldTypes.Symbol;
     slug: EntryFieldTypes.Symbol;
-    indexPageName: EntryFieldTypes.Symbol;
-    indexPageSlug: EntryFieldTypes.Symbol;
+    indexPageTitle: EntryFieldTypes.Symbol;
     indexPageDescription: EntryFieldTypes.Symbol;
     featuredImage: EntryFieldTypes.AssetLink;
     menu?: EntryFieldTypes.EntryLink<BaseNavigationSkeleton>;
@@ -448,7 +448,7 @@ declare function contentfulArticleRest(context: BaseConverterContext, config: Co
 interface ArticleTypeFetchOptions extends FetchOptions {
     customType?: string;
 }
-declare function contentfulArticleTypeRest(context: BaseConverterContext, config: ContentfulConfig, indexPageSlug: string, options?: ArticleTypeFetchOptions): Promise<CmsResponse<IBaseArticleType | null>>;
+declare function contentfulArticleTypeRest(context: BaseConverterContext, config: ContentfulConfig, slug: string, options?: ArticleTypeFetchOptions): Promise<CmsResponse<IBaseArticleType | null>>;
 
 interface ContentfulResponse<T = any> {
     sys: {
@@ -526,7 +526,7 @@ declare function createDownloadHandler(config: DownloadHandlerConfig): (_request
 
 declare function createBaseConverterContext(urlCalculators: UrlCalculators): BaseConverterContext;
 
-declare function contentfulCustomTypeRest(context: BaseConverterContext, config: ContentfulConfig, indexPageSlug: string, options?: FetchOptions): Promise<CmsResponse<IBaseCustomType | null>>;
+declare function contentfulCustomTypeRest(context: BaseConverterContext, config: ContentfulConfig, slug: string, options?: FetchOptions): Promise<CmsResponse<IBaseCustomType | null>>;
 
 type DefaultChainModifier = 'WITHOUT_LINK_RESOLUTION';
 interface IContentfulRichText {

package/dist/index.js

@@ -1175,13 +1175,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: [] };
@@ -1323,9 +1316,9 @@ async function contentfulArticleRest(context, config, slug, articleTypeSlug, opt
 
 // src/api/article-type.ts
 init_utils();
-async function contentfulArticleTypeRest(context, config, indexPageSlug, options) {
+async function contentfulArticleTypeRest(context, config, slug, options) {
   const client = getContentfulClient(config, options?.preview);
-  const articleTypeCacheTags = getCacheTags("articleType", indexPageSlug, options?.preview);
+  const articleTypeCacheTags = getCacheTags("articleType", slug, options?.preview);
   const customTypeCacheTags = options?.customType ? getCacheTags("customType", options.customType, options?.preview) : [];
   const requestOptions = {
     ...options,
@@ -1338,7 +1331,7 @@ async function contentfulArticleTypeRest(context, config, indexPageSlug, options
     const articleTypePromise = client.getEntries(
       {
         content_type: "articleType",
-        "fields.indexPageSlug": indexPageSlug,
+        "fields.slug": slug,
         include: 10,
         locale: options?.locale,
         limit: 1
@@ -1391,7 +1384,7 @@ async function contentfulArticleTypeRest(context, config, indexPageSlug, options
       if (fullContext.errors.length > 0 && typeof process !== "undefined" && process.env?.NODE_ENV === "production") {
         console.error(`CMS conversion errors for articleType:`, {
           entryId: articleTypeEntry.sys.id,
-          indexPageSlug,
+          slug,
           errors: fullContext.errors
         });
       }
@@ -1981,11 +1974,13 @@ 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),
     articleType: articleTypeLink,
@@ -2037,31 +2032,28 @@ function baseArticleTypeLinkConverter(context, entry) {
       `Invalid content type: expected "articleType", got "${sys.contentType.sys.id}"`
     );
   }
+  const { name, cmsLabel, featuredImage, slug, ...simpleFields } = fields;
   return createInternalLink(
     sys.id,
     {
-      cmsLabel: fields.name,
-      title: fields.name,
-      featuredImage: fields.featuredImage,
-      backgroundColour: fields.backgroundColour,
-      textColour: fields.textColour,
-      indexed: fields.indexed,
-      hidden: fields.hidden,
-      slug: fields.slug
+      cmsLabel,
+      title: name,
+      featuredImage,
+      slug,
+      ...simpleFields
     },
     context,
-    context.urlCalculators.articleType(fields.slug),
-    "ArticleType",
-    { indexPageSlug: fields.indexPageSlug }
+    context.urlCalculators.articleType(slug),
+    "ArticleType"
   );
 }
 function baseArticleTypeConverter(context, entry, customTypeEntry) {
   const { sys, fields } = entry;
   const { id } = sys;
   const {
-    indexPageSlug,
-    indexPageName,
+    name,
     indexPageDescription,
+    indexPageTitle,
     featuredImage,
     menu: menuLink,
     footer: footerLink,
@@ -2069,13 +2061,13 @@ function baseArticleTypeConverter(context, entry, customTypeEntry) {
     indexPageTopContent: topContentLinks,
     structuredData,
     indexPageStructuredData,
-    slug: _slug,
+    slug,
     ...other
   } = fields;
   const customType = customTypeEntry ? context.customTypeResolver(context, customTypeEntry) : void 0;
   let template = templateLink ? resolveTemplate(context, templateLink) : null;
-  if (!template && customTypeEntry?.fields.indexPageTemplate) {
-    template = resolveTemplate(context, customTypeEntry.fields.indexPageTemplate);
+  if (!template && customTypeEntry?.fields.template) {
+    template = resolveTemplate(context, customTypeEntry.fields.template);
   }
   const menu = menuLink ? resolveNavigation(context, menuLink) : customTypeEntry?.fields.menu ? resolveNavigation(context, customTypeEntry.fields.menu) : template?.menu;
   const footer = footerLink ? resolveNavigation(context, footerLink) : customTypeEntry?.fields.footer ? resolveNavigation(context, customTypeEntry.fields.footer) : template?.footer;
@@ -2093,8 +2085,9 @@ function baseArticleTypeConverter(context, entry, customTypeEntry) {
   const articleType = {
     type: "Article type",
     id,
-    slug: indexPageSlug,
-    title: makeContentfulTitle(indexPageName, sys.id),
+    slug,
+    name,
+    title: makeContentfulTitle(indexPageTitle, sys.id),
     description: makeContentfulDescription(indexPageDescription, sys.id),
     featuredImage: lookupAsset(context, featuredImage),
     contents,
@@ -2222,9 +2215,9 @@ function baseCustomTypeConverter(context, entry) {
   const { sys, fields } = entry;
   const { id } = sys;
   const {
+    name,
     slug,
-    indexPageSlug,
-    indexPageName,
+    indexPageTitle,
     indexPageDescription,
     featuredImage,
     menu: menuLink,
@@ -2247,15 +2240,15 @@ 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,
-    indexPageSlug,
-    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),
     contents,
     icons,
@@ -2280,17 +2273,17 @@ function baseCustomTypeLinkConverter(context, entry) {
   return createInternalLink(
     id,
     {
-      cmsLabel: fields.name,
+      cmsLabel: fields.cmsLabel,
       title: fields.name,
       featuredImage: fields.featuredImage,
       backgroundColour: fields.backgroundColour,
       textColour: fields.textColour,
       indexed: fields.indexed,
       hidden: fields.hidden,
-      slug: fields.indexPageSlug
+      slug: fields.slug
     },
     context,
-    context.urlCalculators.customType(fields.indexPageSlug),
+    context.urlCalculators.customType(fields.slug),
     "CustomType"
   );
 }
@@ -2443,6 +2436,7 @@ function basePageConverter(context, entry) {
     id,
     isHomePage: slug === "index",
     slug,
+    name: title,
     title: makeContentfulTitle(title, id),
     description: makeContentfulDescription(description, id),
     featuredImage: lookupAsset(context, featuredImage),
@@ -2592,6 +2586,7 @@ function basePersonConverter(context, entry, customTypeEntry) {
     type: "Person",
     id,
     slug,
+    name,
     title: makeContentfulTitle(name, id),
     description: description ?? `Description for ${id}`,
     featuredImage: lookupAsset(context, media),
@@ -2611,7 +2606,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}"`);
   }
@@ -2619,6 +2614,8 @@ function baseTagLinkConverter(context, entry) {
     sys.id,
     {
       ...simpleFields,
+      cmsLabel,
+      useName: false,
       title: name
     },
     context,
@@ -2664,6 +2661,7 @@ function baseTagConverter(context, entry, customTypeEntry) {
     type: "Tag",
     id,
     slug,
+    name,
     title: makeContentfulTitle(name, sys.id),
     description: makeContentfulDescription(description, sys.id),
     featuredImage: lookupAsset(context, featuredImage),
@@ -2720,17 +2718,17 @@ function createBaseConverterContext(urlCalculators) {
 }
 
 // src/api/custom-type.ts
-async function contentfulCustomTypeRest(context, config, indexPageSlug, options) {
+async function contentfulCustomTypeRest(context, config, slug, options) {
   return fetchSingleEntity(
     context,
     config,
     {
       contentType: "customType",
       cacheTagType: "customType",
-      cacheTagIdentifier: indexPageSlug,
-      query: { "fields.indexPageSlug": indexPageSlug },
+      cacheTagIdentifier: slug,
+      query: { "fields.slug": slug },
       resolver: (ctx, entry) => ctx.customTypeResolver(ctx, entry),
-      errorLogContext: { indexPageSlug }
+      errorLogContext: { slug }
     },
     options
   );
@@ -3024,7 +3022,7 @@ async function getPreviewEntryInfo(context, config, entryId, options) {
       };
     }
     case "articleType": {
-      const slug = fields.indexPageSlug ?? fields.slug;
+      const slug = fields.slug;
       if (!slug) return null;
       return {
         contentType: "articleType",
@@ -3054,7 +3052,7 @@ async function getPreviewEntryInfo(context, config, entryId, options) {
       };
     }
     case "customType": {
-      const slug = fields.indexPageSlug ?? fields.slug;
+      const slug = fields.slug;
       if (!slug) return null;
       return {
         contentType: "customType",
@@ -3351,13 +3349,9 @@ init_utils();
 var defaultLocale = "en-US";
 var articleTypeHandler = {
   extract: (data) => ({
-    slug: data.fields?.slug?.[defaultLocale],
-    indexPageSlug: data.fields?.indexPageSlug?.[defaultLocale]
+    slug: data.fields?.slug?.[defaultLocale]
   }),
-  makeTags: (extracted) => [
-    extracted.slug ? articleTypeTag(extracted.slug) : void 0,
-    extracted.indexPageSlug ? articleTypeIndexTag(extracted.indexPageSlug) : void 0
-  ],
+  makeTags: (extracted) => [extracted.slug ? articleTypeIndexTag(extracted.slug) : void 0],
   getGlobalTags: () => [ArticleTypeTag, ArticleTypeIndexTag]
 };
 var articleHandler = {