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

package/dist/index.d.ts

@@ -41,7 +41,7 @@ type BaseMediaSkeleton = EntrySkeletonType<BaseMediaFields, 'media'>;
 
 interface BaseSchemaFields {
     cmsLabel: EntryFieldTypes.Symbol;
-    markup: EntryFieldTypes.Object;
+    markup?: EntryFieldTypes.Text;
 }
 type BaseSchemaSkeleton = EntrySkeletonType<BaseSchemaFields, 'schema'>;
 
@@ -61,7 +61,6 @@ interface BaseArticleTypeFields {
     name: EntryFieldTypes.Symbol;
     slug: EntryFieldTypes.Symbol;
     indexPageName: EntryFieldTypes.Symbol;
-    indexPageSlug: EntryFieldTypes.Symbol;
     indexPageDescription: EntryFieldTypes.Symbol;
     featuredImage: EntryFieldTypes.AssetLink;
     menu?: EntryFieldTypes.EntryLink<BaseNavigationSkeleton>;
@@ -324,7 +323,6 @@ interface BaseCustomTypeFields {
     name: EntryFieldTypes.Symbol;
     slug: EntryFieldTypes.Symbol;
     indexPageName: EntryFieldTypes.Symbol;
-    indexPageSlug: EntryFieldTypes.Symbol;
     indexPageDescription: EntryFieldTypes.Symbol;
     featuredImage: EntryFieldTypes.AssetLink;
     menu?: EntryFieldTypes.EntryLink<BaseNavigationSkeleton>;
@@ -383,7 +381,7 @@ interface CmsResponse<T> {
 }
 
 declare function baseArticleConverter(context: ConverterContext, entry: Entry<BaseArticleSkeleton, DefaultChainModifier, string>): IBaseArticle;
-declare function baseArticleTypeConverter(context: ConverterContext, entry: Entry<BaseArticleTypeSkeleton, DefaultChainModifier, string>): IBaseArticleType;
+declare function baseArticleTypeConverter(context: ConverterContext, entry: Entry<BaseArticleTypeSkeleton, DefaultChainModifier, string>, customTypeEntry?: Entry<BaseCustomTypeSkeleton, DefaultChainModifier, string>): IBaseArticleType;
 
 type IContentfulCollection<TContents = BaseCollectionContent> = IBaseCollection<TContents> & {
     body?: IContentfulRichText | null;
@@ -405,7 +403,7 @@ declare function basePageConverter(context: ConverterContext, entry: Entry<BaseP
 declare function calculatePageHref(slug: string): string;
 declare function calculatePageVariantHref(slug: string): string;
 
-declare function baseTagConverter(context: ConverterContext, entry: Entry<BaseTagSkeleton, DefaultChainModifier, string>): IBaseTag;
+declare function baseTagConverter(context: ConverterContext, entry: Entry<BaseTagSkeleton, DefaultChainModifier, string>, customTypeEntry?: Entry<BaseCustomTypeSkeleton, DefaultChainModifier, string>): IBaseTag;
 
 declare function lookupAsset(context: ConverterContext, asset: UnresolvedLink<'Asset'> | undefined): IVisual | undefined;
 type ContentResolverFunction = (context: ConverterContext, entry: Entry<BaseContent, DefaultChainModifier, string>) => unknown;
@@ -445,7 +443,10 @@ type ConverterContext = BaseConverterContext & {
 
 declare function contentfulArticleRest(context: BaseConverterContext, config: ContentfulConfig, slug: string, articleTypeSlug: string, options?: FetchOptions): Promise<CmsResponse<IBaseArticle | null>>;
 
-declare function contentfulArticleTypeRest(context: BaseConverterContext, config: ContentfulConfig, indexPageSlug: string, options?: FetchOptions): Promise<CmsResponse<IBaseArticleType | null>>;
+interface ArticleTypeFetchOptions extends FetchOptions {
+    customType?: string;
+}
+declare function contentfulArticleTypeRest(context: BaseConverterContext, config: ContentfulConfig, slug: string, options?: ArticleTypeFetchOptions): Promise<CmsResponse<IBaseArticleType | null>>;
 
 interface ContentfulResponse<T = any> {
     sys: {
@@ -523,7 +524,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 {
@@ -595,7 +596,10 @@ declare function contentfulPersonSitemapEntries(context: BaseConverterContext, c
 declare function getAllSitemapEntries(context: BaseConverterContext, config: ContentfulConfig, sitemapConfig: SitemapConfig, options?: FetchOptions): Promise<CmsResponse<ISitemapEntry[]>>;
 declare function createSitemapProvider(fetcher: (context: BaseConverterContext, config: ContentfulConfig, sitemapConfig?: SitemapContentTypeConfig, options?: FetchOptions) => Promise<CmsResponse<ISitemapEntry[]>>, sitemapConfig?: SitemapContentTypeConfig): SitemapEntryProvider;
 
-declare function contentfulTagRest(context: BaseConverterContext, config: ContentfulConfig, slug: string, options?: FetchOptions): Promise<CmsResponse<IBaseTag | null>>;
+interface TagFetchOptions extends FetchOptions {
+    customType?: string;
+}
+declare function contentfulTagRest(context: BaseConverterContext, config: ContentfulConfig, slug: string, options?: TagFetchOptions): Promise<CmsResponse<IBaseTag | null>>;
 
 interface IFetchedTemplate {
     id: string;
@@ -705,4 +709,4 @@ declare class RateLimiter {
     getIntervalMs(): number;
 }
 
-export { AllTags, ArticleTag, ArticleTypeTag, AssetTag, AuthenticationError, BannerTag, type BaseConverterContext, type CmsError, type CmsResponse, type ContentResolverFunction, ContentfulFetchClient as ContentfulClient, type ContentfulConfig, ContentfulError, ContentfulFetchClient, type ConverterContext, CustomTypeTag, type DefaultChainModifier, type DownloadHandlerConfig, type DownloadRouteParams, EntryNotFoundError, type FetchOptions, GlobalTag, type IContentfulCollection, type IContentfulComponent, type IContentfulPerson, type IContentfulRichText, type IFetchedTemplate, type ISitemapEntry, LocationTag, NavigationTag, PageTag, PersonTag, type PreviewContentType, type PreviewEntryInfo, RateLimitError, RateLimiter, type RelatedArticlesOptions, type RetryConfig, type RevalidationConfig, type SitemapChangeFrequency, type SitemapConfig, type SitemapContentTypeConfig, type SitemapEntryProvider, TagTag, TemplateTag, type UrlCalculators, ValidationError, arrayOrUndefined, articleTag, articleTypeIndexTag, articleTypeTag, assetTag, basePageConverter, calculateBackoffDelay, calculatePageHref, calculatePageVariantHref, contentfulAllArticleLinks, contentfulAllArticleTypeLinks, contentfulAllPageLinks, contentfulAllPersonLinks, contentfulAllTagLinks, contentfulArticleRest, contentfulArticleSitemapEntries, contentfulArticleTypeRest, contentfulArticleTypeSitemapEntries, contentfulAssetRest, contentfulCustomTypeRest, contentfulPageRest, contentfulPageSitemapEntries, contentfulPersonRest, contentfulPersonSitemapEntries, contentfulTagRest, contentfulTagSitemapEntries, contentfulTemplateRest, createBaseConverterContext, createContentfulClient, createContentfulPreviewClient, createDownloadHandler, createResponsiveVisual, createRevalidationHandler, createSitemapProvider, customTypeTag, filterRelatedArticles, getAllSitemapEntries, getCacheTags, getCacheTagsForPreview, getCacheTagsForProduction, getContentfulClient, getPreviewEntryInfo, getRetryAfter, isBrowserViewable, isContentfulError, isRateLimitError, isRetryableError, isValidDate, locationTag, lookupAsset, notEmpty, pageTag, personTag, resolveLink, resolveLinks, resolveRichTextDocument, revalidateSingleTag, revalidateTags, safeDate, tagTag, templateTag, withRetry };
+export { AllTags, ArticleTag, type ArticleTypeFetchOptions, ArticleTypeTag, AssetTag, AuthenticationError, BannerTag, type BaseConverterContext, type CmsError, type CmsResponse, type ContentResolverFunction, ContentfulFetchClient as ContentfulClient, type ContentfulConfig, ContentfulError, ContentfulFetchClient, type ConverterContext, CustomTypeTag, type DefaultChainModifier, type DownloadHandlerConfig, type DownloadRouteParams, EntryNotFoundError, type FetchOptions, GlobalTag, type IContentfulCollection, type IContentfulComponent, type IContentfulPerson, type IContentfulRichText, type IFetchedTemplate, type ISitemapEntry, LocationTag, NavigationTag, PageTag, type PersonFetchOptions, PersonTag, type PreviewContentType, type PreviewEntryInfo, RateLimitError, RateLimiter, type RelatedArticlesOptions, type RetryConfig, type RevalidationConfig, type SitemapChangeFrequency, type SitemapConfig, type SitemapContentTypeConfig, type SitemapEntryProvider, type TagFetchOptions, TagTag, TemplateTag, type UrlCalculators, ValidationError, arrayOrUndefined, articleTag, articleTypeIndexTag, articleTypeTag, assetTag, basePageConverter, calculateBackoffDelay, calculatePageHref, calculatePageVariantHref, contentfulAllArticleLinks, contentfulAllArticleTypeLinks, contentfulAllPageLinks, contentfulAllPersonLinks, contentfulAllTagLinks, contentfulArticleRest, contentfulArticleSitemapEntries, contentfulArticleTypeRest, contentfulArticleTypeSitemapEntries, contentfulAssetRest, contentfulCustomTypeRest, contentfulPageRest, contentfulPageSitemapEntries, contentfulPersonRest, contentfulPersonSitemapEntries, contentfulTagRest, contentfulTagSitemapEntries, contentfulTemplateRest, createBaseConverterContext, createContentfulClient, createContentfulPreviewClient, createDownloadHandler, createResponsiveVisual, createRevalidationHandler, createSitemapProvider, customTypeTag, filterRelatedArticles, getAllSitemapEntries, getCacheTags, getCacheTagsForPreview, getCacheTagsForProduction, getContentfulClient, getPreviewEntryInfo, getRetryAfter, isBrowserViewable, isContentfulError, isRateLimitError, isRetryableError, isValidDate, locationTag, lookupAsset, notEmpty, pageTag, personTag, resolveLink, resolveLinks, resolveRichTextDocument, revalidateSingleTag, revalidateTags, safeDate, tagTag, templateTag, withRetry };

package/dist/index.js

@@ -1175,6 +1175,13 @@ 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: [] };
@@ -1315,20 +1322,97 @@ async function contentfulArticleRest(context, config, slug, articleTypeSlug, opt
 }
 
 // src/api/article-type.ts
-async function contentfulArticleTypeRest(context, config, indexPageSlug, options) {
-  return fetchSingleEntity(
-    context,
-    config,
-    {
-      contentType: "articleType",
-      cacheTagType: "articleType",
-      cacheTagIdentifier: indexPageSlug,
-      query: { "fields.indexPageSlug": indexPageSlug },
-      resolver: (ctx, entry) => ctx.articleTypeResolver(ctx, entry),
-      errorLogContext: { indexPageSlug }
-    },
-    options
-  );
+init_utils();
+async function contentfulArticleTypeRest(context, config, slug, options) {
+  const client = getContentfulClient(config, options?.preview);
+  const articleTypeCacheTags = getCacheTags("articleType", slug, options?.preview);
+  const customTypeCacheTags = options?.customType ? getCacheTags("customType", options.customType, options?.preview) : [];
+  const requestOptions = {
+    ...options,
+    next: {
+      ...options?.next,
+      tags: [...articleTypeCacheTags, ...customTypeCacheTags]
+    }
+  };
+  const fetchFn = async () => {
+    const articleTypePromise = client.getEntries(
+      {
+        content_type: "articleType",
+        "fields.slug": slug,
+        include: 10,
+        locale: options?.locale,
+        limit: 1
+      },
+      requestOptions
+    );
+    const customTypePromise = options?.customType ? client.getEntries(
+      {
+        content_type: "customType",
+        "fields.slug": options.customType,
+        include: 10,
+        locale: options?.locale,
+        limit: 1
+      },
+      requestOptions
+    ) : Promise.resolve(null);
+    const [articleTypeResponse, customTypeResponse] = await Promise.all([
+      articleTypePromise,
+      customTypePromise
+    ]);
+    const articleTypeEntry = articleTypeResponse.items[0];
+    if (!articleTypeEntry || !articleTypeEntry.fields) {
+      return { data: null, errors: [] };
+    }
+    const customTypeEntry = customTypeResponse?.items[0];
+    try {
+      const assets = convertAllAssets(articleTypeResponse, context);
+      const rawAssets = convertAllRawAssets(articleTypeResponse);
+      const includes = convertAllIncludes(articleTypeResponse);
+      if (customTypeResponse) {
+        const customAssets = convertAllAssets(customTypeResponse, context);
+        const customRawAssets = convertAllRawAssets(customTypeResponse);
+        const customIncludes = convertAllIncludes(customTypeResponse);
+        for (const [key, value] of customAssets) assets.set(key, value);
+        for (const [key, value] of customRawAssets) rawAssets.set(key, value);
+        for (const [key, value] of customIncludes) includes.set(key, value);
+      }
+      const fullContext = {
+        ...context,
+        includes,
+        assets,
+        rawAssets,
+        errors: []
+      };
+      const converted = context.articleTypeResolver(fullContext, articleTypeEntry, customTypeEntry);
+      if (converted?.icons && converted.icons.length > 0) {
+        const processedIcons = await processIconsForSprite(converted.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 articleType:`, {
+          entryId: articleTypeEntry.sys.id,
+          slug,
+          errors: fullContext.errors
+        });
+      }
+      return { data: converted, errors: fullContext.errors };
+    } catch (error) {
+      const entryId = articleTypeEntry?.sys.id || "unknown";
+      const entryType = articleTypeEntry?.sys.contentType?.sys?.id;
+      const errorMessage = error instanceof Error ? error.message : "Unknown conversion error";
+      const cmsError = {
+        entryId,
+        entryType,
+        message: errorMessage,
+        error
+      };
+      return { data: null, errors: [cmsError] };
+    }
+  };
+  if (options?.retry) {
+    return await withRetry(fetchFn, options.retry);
+  }
+  return await fetchFn();
 }
 
 // src/api/asset.ts
@@ -1405,6 +1489,18 @@ function createDownloadHandler(config) {
   };
 }
 
+// src/converters/schema.ts
+function baseSchemaConverter(_context, entry) {
+  const { sys, fields } = entry;
+  const { cmsLabel, markup } = fields;
+  return {
+    id: sys.id,
+    name: cmsLabel,
+    markup: markup ?? "",
+    description: `Schema for ${cmsLabel}`
+  };
+}
+
 // src/converters/resolver.ts
 function resolveHelper(context, fromId, entry, getResolver) {
   const id = entry.sys.id;
@@ -1431,6 +1527,14 @@ function resolveHelper(context, fromId, entry, getResolver) {
   }
   return possibleEntry.resolved;
 }
+function resolveSchema(context, fromId, entry) {
+  return resolveHelper(
+    context,
+    fromId,
+    entry,
+    () => baseSchemaConverter
+  );
+}
 function resolveLink(context, fromId, entry) {
   return resolveHelper(
     context,
@@ -1853,6 +1957,7 @@ function baseArticleConverter(context, entry) {
     topContent: topContentLinks,
     bottomContent: bottomContentLinks,
     articleType,
+    structuredData,
     ...simpleFields
   } = fields;
   const articleTypeLink = resolveLink(context, id, articleType);
@@ -1887,6 +1992,7 @@ function baseArticleConverter(context, entry) {
     tags: tags?.map((tag) => resolveLink(context, id, tag)),
     contents,
     icons,
+    structuredData: structuredData?.map((link) => resolveSchema(context, id, link)).filter((item) => item !== null),
     ...simpleFields,
     // Note: summary field exists in Contentful but is not part of IArticle interface
     // Keeping it in simpleFields for potential future use
@@ -1931,29 +2037,25 @@ function baseArticleTypeLinkConverter(context, entry) {
       `Invalid content type: expected "articleType", got "${sys.contentType.sys.id}"`
     );
   }
+  const { name, 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: name,
+      title: name,
+      featuredImage,
+      slug,
+      ...simpleFields
     },
     context,
-    context.urlCalculators.articleType(fields.slug),
-    "ArticleType",
-    { indexPageSlug: fields.indexPageSlug }
+    context.urlCalculators.articleType(slug),
+    "ArticleType"
   );
 }
-function baseArticleTypeConverter(context, entry) {
+function baseArticleTypeConverter(context, entry, customTypeEntry) {
   const { sys, fields } = entry;
   const { id } = sys;
   const {
-    indexPageSlug,
     indexPageName,
     indexPageDescription,
     featuredImage,
@@ -1962,12 +2064,17 @@ function baseArticleTypeConverter(context, entry) {
     indexPageTemplate: templateLink,
     indexPageTopContent: topContentLinks,
     structuredData,
-    slug: _slug,
+    indexPageStructuredData,
+    slug,
     ...other
   } = fields;
-  const template = templateLink ? resolveTemplate(context, templateLink) : null;
-  const menu = menuLink ? resolveNavigation(context, menuLink) : template?.menu;
-  const footer = footerLink ? resolveNavigation(context, footerLink) : template?.footer;
+  const customType = customTypeEntry ? context.customTypeResolver(context, customTypeEntry) : void 0;
+  let template = templateLink ? resolveTemplate(context, templateLink) : null;
+  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;
   const topContent = topContentLinks?.map((c) => resolvePageContent(context, id, c)).filter((item) => item !== null) ?? [];
   const preContent = template?.preContent ?? [];
   const postContent = template?.postContent ?? [];
@@ -1982,17 +2089,23 @@ function baseArticleTypeConverter(context, entry) {
   const articleType = {
     type: "Article type",
     id,
-    slug: indexPageSlug,
+    slug,
     title: makeContentfulTitle(indexPageName, sys.id),
     description: makeContentfulDescription(indexPageDescription, sys.id),
     featuredImage: lookupAsset(context, featuredImage),
     contents,
     icons,
-    structuredData,
+    structuredData: [
+      ...structuredData?.map((link) => resolveSchema(context, id, link)) ?? [],
+      ...indexPageStructuredData?.map((link) => resolveSchema(context, id, link)) ?? []
+    ].filter((item) => item !== null),
     menu: finalMenu,
     footer: finalFooter,
     ...other
   };
+  if (customType) {
+    articleType.customType = customType;
+  }
   return articleType;
 }
 
@@ -2106,7 +2219,6 @@ function baseCustomTypeConverter(context, entry) {
   const { id } = sys;
   const {
     slug,
-    indexPageSlug,
     indexPageName,
     indexPageDescription,
     featuredImage,
@@ -2115,6 +2227,7 @@ function baseCustomTypeConverter(context, entry) {
     indexPageTemplate: templateLink,
     indexPageTopContent: topContentLinks,
     structuredData,
+    indexPageStructuredData,
     ...other
   } = fields;
   const template = templateLink ? resolveTemplate(context, templateLink) : null;
@@ -2133,7 +2246,6 @@ function baseCustomTypeConverter(context, entry) {
     type: "Custom type",
     id,
     slug,
-    indexPageSlug,
     indexPageName: makeContentfulTitle(indexPageName, sys.id),
     indexPageDescription: makeContentfulDescription(indexPageDescription, sys.id),
     title: makeContentfulTitle(indexPageName, sys.id),
@@ -2141,7 +2253,10 @@ function baseCustomTypeConverter(context, entry) {
     featuredImage: lookupAsset(context, featuredImage),
     contents,
     icons,
-    structuredData,
+    structuredData: [
+      ...structuredData?.map((link) => resolveSchema(context, id, link)) ?? [],
+      ...indexPageStructuredData?.map((link) => resolveSchema(context, id, link)) ?? []
+    ].filter((item) => item !== null),
     menu,
     footer,
     ...other
@@ -2166,10 +2281,10 @@ function baseCustomTypeLinkConverter(context, entry) {
       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"
   );
 }
@@ -2292,6 +2407,7 @@ function basePageConverter(context, entry) {
     template: templateLink,
     topContent: topContentLinks,
     bottomContent: bottomContentLinks,
+    structuredData,
     ...simpleFields
   } = fields;
   const pageMenuNav = pageMenu ? resolveNavigation(context, pageMenu) : void 0;
@@ -2327,6 +2443,7 @@ function basePageConverter(context, entry) {
     tags: tags?.map((tag) => resolveLink(context, id, tag)),
     contents,
     icons,
+    structuredData: structuredData?.map((link) => resolveSchema(context, id, link)).filter((item) => item !== null),
     ...simpleFields,
     menu: finalMenu,
     footer: finalFooter
@@ -2442,7 +2559,16 @@ function basePersonConverter(context, entry, customTypeEntry) {
   if (contentType.sys.id !== "person") {
     throw new Error(`Invalid content type: expected "person", got "${contentType.sys.id}"`);
   }
-  const { slug, name, description, media, bio: bioField, content: contentLinks, ...rest } = fields;
+  const {
+    slug,
+    name,
+    description,
+    media,
+    bio: bioField,
+    content: contentLinks,
+    structuredData,
+    ...rest
+  } = fields;
   const customType = customTypeEntry ? context.customTypeResolver(context, customTypeEntry) : void 0;
   const template = customTypeEntry?.fields.template ? resolveTemplate(context, customTypeEntry.fields.template) : null;
   const personContent = contentLinks?.map((c) => resolvePageContent(context, id, c)).filter((item) => item !== null) ?? [];
@@ -2471,6 +2597,7 @@ function basePersonConverter(context, entry, customTypeEntry) {
     footer,
     icons,
     customType,
+    structuredData: structuredData?.map((link) => resolveSchema(context, id, link)).filter((item) => item !== null),
     ...rest
   };
 }
@@ -2493,7 +2620,7 @@ function baseTagLinkConverter(context, entry) {
     "Tag"
   );
 }
-function baseTagConverter(context, entry) {
+function baseTagConverter(context, entry, customTypeEntry) {
   const { sys, fields } = entry;
   const { id } = sys;
   const {
@@ -2506,11 +2633,16 @@ function baseTagConverter(context, entry) {
     footer: footerLink,
     template: templateLink,
     topContent: topContentLinks,
+    structuredData,
     ...rest
   } = fields;
-  const template = templateLink ? resolveTemplate(context, templateLink) : null;
-  const menu = menuLink ? resolveNavigation(context, menuLink) : template?.menu;
-  const footer = footerLink ? resolveNavigation(context, footerLink) : template?.footer;
+  const customType = customTypeEntry ? context.customTypeResolver(context, customTypeEntry) : void 0;
+  let template = templateLink ? resolveTemplate(context, templateLink) : null;
+  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;
   const topContent = topContentLinks?.map((c) => resolvePageContent(context, id, c)).filter((item) => item !== null) ?? [];
   const preContent = template?.preContent ?? [];
   const postContent = template?.postContent ?? [];
@@ -2532,10 +2664,14 @@ function baseTagConverter(context, entry) {
     tagType: tagTypeName ?? null,
     contents,
     icons,
+    structuredData: structuredData?.map((link) => resolveSchema(context, id, link)).filter((item) => item !== null),
     ...rest,
     menu,
     footer
   };
+  if (customType) {
+    tag.customType = customType;
+  }
   return tag;
 }
 
@@ -2578,17 +2714,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
   );
@@ -2882,7 +3018,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",
@@ -2912,7 +3048,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",
@@ -3063,20 +3199,94 @@ function createSitemapProvider(fetcher, sitemapConfig) {
 }
 
 // src/api/tag.ts
+init_utils();
 async function contentfulTagRest(context, config, slug, options) {
-  return fetchSingleEntity(
-    context,
-    config,
-    {
-      contentType: "tag",
-      cacheTagType: "tag",
-      cacheTagIdentifier: slug,
-      query: { "fields.slug": slug },
-      resolver: (ctx, entry) => ctx.tagResolver(ctx, entry),
-      errorLogContext: { slug }
-    },
-    options
-  );
+  const client = getContentfulClient(config, options?.preview);
+  const tagCacheTags = getCacheTags("tag", slug, options?.preview);
+  const customTypeCacheTags = options?.customType ? getCacheTags("customType", options.customType, options?.preview) : [];
+  const requestOptions = {
+    ...options,
+    next: {
+      ...options?.next,
+      tags: [...tagCacheTags, ...customTypeCacheTags]
+    }
+  };
+  const fetchFn = async () => {
+    const tagPromise = client.getEntries(
+      {
+        content_type: "tag",
+        "fields.slug": slug,
+        include: 10,
+        locale: options?.locale,
+        limit: 1
+      },
+      requestOptions
+    );
+    const customTypePromise = options?.customType ? client.getEntries(
+      {
+        content_type: "customType",
+        "fields.slug": options.customType,
+        include: 10,
+        locale: options?.locale,
+        limit: 1
+      },
+      requestOptions
+    ) : Promise.resolve(null);
+    const [tagResponse, customTypeResponse] = await Promise.all([tagPromise, customTypePromise]);
+    const tagEntry = tagResponse.items[0];
+    if (!tagEntry || !tagEntry.fields) {
+      return { data: null, errors: [] };
+    }
+    const customTypeEntry = customTypeResponse?.items[0];
+    try {
+      const assets = convertAllAssets(tagResponse, context);
+      const rawAssets = convertAllRawAssets(tagResponse);
+      const includes = convertAllIncludes(tagResponse);
+      if (customTypeResponse) {
+        const customAssets = convertAllAssets(customTypeResponse, context);
+        const customRawAssets = convertAllRawAssets(customTypeResponse);
+        const customIncludes = convertAllIncludes(customTypeResponse);
+        for (const [key, value] of customAssets) assets.set(key, value);
+        for (const [key, value] of customRawAssets) rawAssets.set(key, value);
+        for (const [key, value] of customIncludes) includes.set(key, value);
+      }
+      const fullContext = {
+        ...context,
+        includes,
+        assets,
+        rawAssets,
+        errors: []
+      };
+      const converted = context.tagResolver(fullContext, tagEntry, customTypeEntry);
+      if (converted?.icons && converted.icons.length > 0) {
+        const processedIcons = await processIconsForSprite(converted.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 tag:`, {
+          entryId: tagEntry.sys.id,
+          slug,
+          errors: fullContext.errors
+        });
+      }
+      return { data: converted, errors: fullContext.errors };
+    } catch (error) {
+      const entryId = tagEntry?.sys.id || "unknown";
+      const entryType = tagEntry?.sys.contentType?.sys?.id;
+      const errorMessage = error instanceof Error ? error.message : "Unknown conversion error";
+      const cmsError = {
+        entryId,
+        entryType,
+        message: errorMessage,
+        error
+      };
+      return { data: null, errors: [cmsError] };
+    }
+  };
+  if (options?.retry) {
+    return await withRetry(fetchFn, options.retry);
+  }
+  return await fetchFn();
 }
 
 // src/api/template.ts
@@ -3135,13 +3345,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 = {