@se-studio/contentful-rest-api 1.0.18 → 1.0.20

package/dist/index.js

@@ -36,6 +36,9 @@ function personTag(slug) {
 function assetTag(assetId) {
   return `${AssetTag}#${assetId}`;
 }
+function templateTag(label) {
+  return `${TemplateTag}#${label}`;
+}
 function locationTag(slug) {
   return `${LocationTag}#${slug}`;
 }
@@ -209,6 +212,27 @@ function buildQueryString(query) {
   });
   return params.toString();
 }
+function sleep(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+function calculateRetryDelay(attempt, retryAfterSeconds) {
+  let baseDelay;
+  if (retryAfterSeconds !== void 0 && retryAfterSeconds > 0) {
+    baseDelay = retryAfterSeconds * 1e3;
+  } else {
+    baseDelay = 1e3 * 2 ** attempt;
+  }
+  const jitter = Math.random() * baseDelay;
+  return Math.min(baseDelay + jitter, 15e3);
+}
+function parseRetryAfter(response) {
+  const retryAfterHeader = response.headers.get("X-Contentful-RateLimit-Reset") || response.headers.get("Retry-After");
+  if (retryAfterHeader) {
+    const parsed = Number.parseInt(retryAfterHeader, 10);
+    return Number.isNaN(parsed) ? void 0 : parsed;
+  }
+  return void 0;
+}
 async function parseErrorResponse(response) {
   const statusCode = response.status;
   let errorData;
@@ -247,7 +271,7 @@ var ContentfulFetchClient = class {
     this.accessToken = config.accessToken;
   }
   /**
-   * Fetches entries from Contentful
+   * Fetches entries from Contentful with automatic retry on rate limit errors
    */
   async getEntries(query, options) {
     const queryString = buildQueryString(query);
@@ -261,11 +285,26 @@ var ContentfulFetchClient = class {
     if (options?.next) {
       fetchOptions.next = options.next;
     }
-    const response = await fetch(url, fetchOptions);
-    if (!response.ok) {
+    const maxRetries = 3;
+    for (let attempt = 0; attempt <= maxRetries; attempt++) {
+      const response = await fetch(url, fetchOptions);
+      if (response.ok) {
+        return response.json();
+      }
+      if (response.status === 429 && attempt < maxRetries) {
+        const retryAfter = parseRetryAfter(response);
+        const delay3 = calculateRetryDelay(attempt, retryAfter);
+        if (typeof process !== "undefined" && process.env?.NODE_ENV !== "production") {
+          console.warn(
+            `[Contentful] Rate limited, retrying in ${delay3}ms (attempt ${attempt + 1}/${maxRetries})`
+          );
+        }
+        await sleep(delay3);
+        continue;
+      }
       throw await parseErrorResponse(response);
     }
-    return response.json();
+    throw new ContentfulError("Unexpected error in retry loop", 500);
   }
 };
 function createContentfulClient(config) {
@@ -306,14 +345,25 @@ var DEFAULT_POSITION_FIELDS = {
   indexOfType: 0
 };
 function createInternalLink(id, fields, context, href, internalType, additionalProps) {
-  const { cmsLabel, title, featuredImage, backgroundColour, textColour, indexed, hidden, slug } = fields;
+  const {
+    cmsLabel,
+    title,
+    featuredImage,
+    backgroundColour,
+    textColour,
+    indexed,
+    hidden,
+    slug,
+    description
+  } = fields;
+  const text = makeContentfulTitle(title, id);
   return {
     type: "Internal link",
     internalType,
     id,
     name: cmsLabel ?? "",
     useName: true,
-    text: makeContentfulTitle(title, id),
+    text,
     visual: lookupAsset(context, featuredImage),
     backgroundColour,
     textColour,
@@ -321,6 +371,8 @@ function createInternalLink(id, fields, context, href, internalType, additionalP
     hidden,
     slug,
     href,
+    title,
+    description,
     ...additionalProps
   };
 }
@@ -573,6 +625,9 @@ function lookupMediaEntry(context, link) {
   return void 0;
 }
 
+// src/api/helpers.ts
+init_utils();
+
 // src/utils/arrayUtils.ts
 function notEmpty(value) {
   if (value === null || value === void 0) return false;
@@ -615,16 +670,24 @@ var DEFAULT_RETRY_CONFIG = {
   // 30 seconds
   backoffMultiplier: 2
 };
-function sleep(ms) {
+function sleep2(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
 function calculateBackoffDelay(attempt, config, retryAfter) {
   if (retryAfter !== void 0) {
-    return Math.min(retryAfter * 1e3, config.maxDelay);
+    const result2 = Math.min(retryAfter * 1e3, config.maxDelay);
+    console.log(
+      `Calculated backoff delay: ${result2}ms (attempt ${attempt + 1}), retryAfter: ${retryAfter}`
+    );
+    return result2;
   }
   const exponentialDelay = config.initialDelay * config.backoffMultiplier ** attempt;
   const jitter = Math.random() * exponentialDelay;
-  return Math.min(exponentialDelay + jitter, config.maxDelay);
+  const result = Math.min(exponentialDelay + jitter, config.maxDelay);
+  console.log(
+    `Calculated backoff delay: ${result}ms (attempt ${attempt + 1}), exponentialDelay: ${exponentialDelay}, jitter: ${jitter}`
+  );
+  return result;
 }
 async function withRetry(fn, config) {
   const retryConfig = {
@@ -651,7 +714,7 @@ async function withRetry(fn, config) {
           error
         );
       }
-      await sleep(delay3);
+      await sleep2(delay3);
     }
   }
   throw lastError;
@@ -693,7 +756,7 @@ var RateLimiter = class {
   async consume() {
     while (!this.tryConsume()) {
       const waitTime = 1 / this.refillRate * 1e3;
-      await sleep(waitTime);
+      await sleep2(waitTime);
     }
   }
   /**
@@ -705,6 +768,211 @@ var RateLimiter = class {
   }
 };
 
+// src/api/helpers.ts
+var PAGE_LINK_FIELDS = "sys,fields.cmsLabel,fields.title,fields.slug,fields.featuredImage,fields.backgroundColour,fields.textColour,fields.indexed,fields.hidden,fields.tags";
+var ARTICLE_LINK_FIELDS = "sys,fields.cmsLabel,fields.title,fields.slug,fields.featuredImage,fields.backgroundColour,fields.textColour,fields.indexed,fields.hidden,fields.tags,fields.articleType,fields.date,fields.author";
+var ARTICLE_TYPE_LINK_FIELDS = "sys,fields.name,fields.slug,fields.featuredImage,fields.backgroundColour,fields.textColour,fields.indexed,fields.hidden";
+var TAG_LINK_FIELDS = "sys,fields.cmsLabel,fields.name,fields.slug,fields.featuredImage,fields.backgroundColour,fields.textColour,fields.indexed,fields.hidden";
+var PERSON_LINK_FIELDS = "sys,fields.name,fields.slug,fields.media,fields.backgroundColour,fields.textColour,fields.indexed,fields.hidden";
+function convertAllAssets(response, context) {
+  const visuals = /* @__PURE__ */ new Map();
+  const assets = response.includes?.Asset;
+  if (assets && assets.length > 0) {
+    for (const asset of assets) {
+      const visual = convertAssetToVisual(context, asset);
+      if (visual) {
+        visuals.set(visual.id, visual);
+      }
+    }
+  }
+  return visuals;
+}
+function convertAllIncludes(response) {
+  const includes = /* @__PURE__ */ new Map();
+  const entries = [...response.items, ...response.includes?.Entry || []];
+  if (entries && entries.length > 0) {
+    for (const entry of entries) {
+      if (entry?.sys && entry.fields) {
+        includes.set(entry.sys.id, {
+          id: entry.sys.id,
+          type: entry.sys.contentType.sys.id,
+          entry
+        });
+      }
+    }
+  }
+  return includes;
+}
+async function fetchSingleEntity(context, config, fetchConfig, options) {
+  const client = getContentfulClient(config, options?.preview);
+  const cacheTags = getCacheTags(
+    fetchConfig.cacheTagType,
+    fetchConfig.cacheTagIdentifier,
+    options?.preview
+  );
+  const requestOptions = {
+    ...options,
+    next: {
+      ...options?.next,
+      tags: cacheTags
+    }
+  };
+  const fetchFn = async () => {
+    const response = await client.getEntries(
+      {
+        content_type: fetchConfig.contentType,
+        ...fetchConfig.query,
+        include: 10,
+        locale: options?.locale,
+        limit: 1
+      },
+      requestOptions
+    );
+    const entry = response.items[0];
+    if (!entry || !entry.fields) {
+      return { data: null, errors: [] };
+    }
+    try {
+      const assets = convertAllAssets(response, context);
+      const includes = convertAllIncludes(response);
+      const fullContext = {
+        ...context,
+        includes,
+        assets,
+        errors: []
+      };
+      const converted = fetchConfig.resolver(fullContext, entry);
+      if (fullContext.errors.length > 0 && typeof process !== "undefined" && process.env?.NODE_ENV === "production") {
+        console.error(`CMS conversion errors for ${fetchConfig.contentType}:`, {
+          entryId: entry.sys.id,
+          ...fetchConfig.errorLogContext,
+          errors: fullContext.errors
+        });
+      }
+      return { data: converted, errors: fullContext.errors };
+    } catch (error) {
+      const entryId = entry.sys.id;
+      const entryType = entry.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();
+}
+async function fetchAllLinks(contentType, client, requestOptions, converter, context, pageSize = 100, select) {
+  const allLinks = [];
+  const errors = [];
+  let skip = 0;
+  let hasMore = true;
+  const fetchFn = async () => {
+    while (hasMore) {
+      try {
+        const response = await client.getEntries(
+          {
+            content_type: contentType,
+            include: 2,
+            // Minimal include for link-only fetching
+            locale: requestOptions?.locale,
+            limit: pageSize,
+            skip,
+            ...select && { select }
+          },
+          requestOptions
+        );
+        if (response.items.length === 0) {
+          hasMore = false;
+          break;
+        }
+        const includes = convertAllIncludes(response);
+        const assets = convertAllAssets(response, context);
+        const fullContext = {
+          ...context,
+          includes,
+          assets,
+          errors: []
+        };
+        for (const entry of response.items) {
+          if (!entry.fields) continue;
+          try {
+            const converted = converter(
+              fullContext,
+              entry
+            );
+            converted.lastModified = entry.sys.updatedAt ? new Date(entry.sys.updatedAt) : void 0;
+            allLinks.push(converted);
+          } catch (error) {
+            const entryId = entry.sys.id;
+            const entryType = entry.sys.contentType?.sys?.id;
+            const errorMessage = error instanceof Error ? error.message : "Unknown conversion error";
+            errors.push({
+              entryId,
+              entryType,
+              message: errorMessage,
+              error
+            });
+          }
+        }
+        skip += pageSize;
+        if (skip >= response.total) {
+          hasMore = false;
+        }
+      } catch (error) {
+        console.error("Error fetching links", typeof error, error, JSON.stringify(error, null, 2));
+        throw error;
+      }
+    }
+    return { data: allLinks, errors };
+  };
+  return await fetchFn();
+}
+
+// src/api/article.ts
+async function contentfulArticleRest(context, config, slug, articleTypeSlug, options) {
+  return fetchSingleEntity(
+    context,
+    config,
+    {
+      contentType: "article",
+      cacheTagType: "article",
+      cacheTagIdentifier: slug,
+      query: {
+        "fields.slug": slug,
+        "fields.articleType.sys.contentType.sys.id": "articleType",
+        "fields.articleType.fields.slug": articleTypeSlug
+      },
+      resolver: (ctx, entry) => ctx.articleResolver(ctx, entry),
+      errorLogContext: { slug, articleTypeSlug }
+    },
+    options
+  );
+}
+
+// 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
+  );
+}
+
 // src/converters/resolver.ts
 function resolveHelper(context, fromId, entry, getResolver) {
   const id = entry.sys.id;
@@ -758,17 +1026,22 @@ function resolveNavigationItem(context, fromId, entry) {
   return result;
 }
 function resolveCollectionContent(context, fromId, entry) {
-  return resolveHelper(context, fromId, entry, (type) => {
-    const resolver = context.contentResolver.get(type);
-    if (resolver) {
-      return resolver;
-    }
-    const linkResolver = context.linkResolver.get(type);
-    if (linkResolver) {
-      return linkResolver;
+  return resolveHelper(
+    context,
+    fromId,
+    entry,
+    (type) => {
+      const resolver = context.contentResolver.get(type);
+      if (resolver) {
+        return resolver;
+      }
+      const linkResolver = context.linkResolver.get(type);
+      if (linkResolver) {
+        return linkResolver;
+      }
+      return void 0;
     }
-    return void 0;
-  });
+  );
 }
 function resolvePageContent(context, fromId, entry) {
   const id = entry.sys.id;
@@ -973,46 +1246,322 @@ function resolveRichTextDocument(context, fromId, richText) {
   return { json: resolved };
 }
 
-// src/converters/collection.ts
-function baseCollectionConverter(context, entry) {
-  const { sys, fields } = entry;
-  const { id } = sys;
+// src/converters/navigationItem.ts
+function createLink(context, entry) {
   const {
-    // Fields requiring transformation
-    backgroundVisual: bgVisual,
-    mobileBackgroundVisual: mobileBgVisual,
-    visual: visualField,
-    mobileVisual: mobileVisualField,
-    visualCustomSize,
-    icon: iconField,
-    links: linksField,
-    contents: contentsField,
-    body: bodyField,
-    additionalCopy: additionalCopyField,
-    // Field name change
-    collectionType,
-    showHeading,
-    heading,
-    // Already handled elsewhere
-    cmsLabel,
-    ...simpleFields
-    // anchor, backgroundColour, textColour, preHeading, heading, postHeading, backgroundOverlayOpacity
+    sys: { id },
+    fields
+  } = entry;
+  const {
+    title,
+    link,
+    text,
+    internal,
+    icon: navIcon,
+    mobileIcon: mobileNavIcon,
+    useTitle,
+    ...otherFields
   } = fields;
-  const backgroundVisual = createResponsiveVisual(
-    lookupAsset(context, bgVisual),
-    lookupAsset(context, mobileBgVisual)
+  const icon = createResponsiveVisual(
+    lookupAsset(context, navIcon),
+    lookupAsset(context, mobileNavIcon)
   );
-  const visual = createResponsiveVisual(
-    lookupMediaEntry(context, visualField),
-    lookupMediaEntry(context, mobileVisualField),
-    visualCustomSize
+  const realText = useTitle ? resolveBuildYear(title) : text ? resolveBuildYear(text) : void 0;
+  if (link) {
+    return {
+      type: "External link",
+      id,
+      href: link,
+      icon,
+      name: makeContentfulTitle(title, id),
+      ...otherFields,
+      text: realText
+    };
+  }
+  if (internal) {
+    const resolved = resolveLink(context, id, internal);
+    return { ...resolved, icon, id, text: realText };
+  }
+  const blank = {
+    type: "Blank link",
+    nick: true,
+    id,
+    name: makeContentfulTitle(title, id),
+    ...otherFields,
+    icon,
+    text: realText
+  };
+  return blank;
+}
+function baseNavigationItemConverter(context, entry) {
+  const {
+    sys: { id },
+    fields
+  } = entry;
+  const { navigationItems } = fields;
+  const link = createLink(context, entry);
+  const resolvedNavigationItems = navigationItems?.map((item) => resolveNavigationItem(context, id, item)).filter((item) => item !== void 0);
+  const result = {
+    id,
+    link,
+    entries: resolvedNavigationItems
+  };
+  return result;
+}
+function resolveNavigation(context, link) {
+  const id = link.sys.id;
+  const possibleEntry = context.includes.get(id);
+  if (!possibleEntry || possibleEntry.type !== "navigation") {
+    return void 0;
+  }
+  const entry = possibleEntry.entry;
+  const { fields } = entry;
+  if (!fields) {
+    return void 0;
+  }
+  const { name, entries: fieldEntries, ...rest } = fields;
+  const entries = fieldEntries?.map((item) => resolveNavigationItem(context, id, item)) ?? [];
+  return {
+    id,
+    name,
+    entries,
+    ...rest
+  };
+}
+
+// src/converters/template.ts
+function resolveTemplate(context, link) {
+  const id = link.sys.id;
+  const possibleEntry = context.includes.get(id);
+  if (!possibleEntry || possibleEntry.type !== "template") {
+    return null;
+  }
+  const entry = possibleEntry.entry;
+  const { fields } = entry;
+  if (!fields) {
+    return null;
+  }
+  const preContent = fields.preContent?.map((content) => resolvePageContent(context, id, content)).filter((item) => item !== null) ?? [];
+  const postContent = fields.postContent?.map((content) => resolvePageContent(context, id, content)).filter((item) => item !== null) ?? [];
+  const menu = fields.menu ? resolveNavigation(context, fields.menu) : void 0;
+  const footer = fields.footer ? resolveNavigation(context, fields.footer) : void 0;
+  const stickyNav = fields.flags?.includes("Sticky nav") ?? false;
+  const { backgroundColour, textColour } = fields;
+  return {
+    preContent,
+    postContent,
+    menu,
+    footer,
+    backgroundColour,
+    textColour,
+    stickyNav
+  };
+}
+
+// src/converters/article.ts
+function resolveArticleTemplateHierarchy(context, articleTypeLink, directTemplateLink) {
+  if (directTemplateLink) {
+    return resolveTemplate(context, directTemplateLink);
+  }
+  const articleTypeEntry = context.includes.get(articleTypeLink.sys.id);
+  if (!articleTypeEntry) {
+    console.warn(`ArticleType entry not found for id: ${articleTypeLink.sys.id}`);
+    return null;
+  }
+  const articleTypeFields = articleTypeEntry.entry.fields;
+  if (articleTypeFields?.articleTemplate) {
+    return resolveTemplate(context, articleTypeFields.articleTemplate);
+  }
+  return null;
+}
+function baseArticleConverter(context, entry) {
+  const { sys, fields } = entry;
+  const { id } = sys;
+  const {
+    slug,
+    title,
+    description,
+    featuredImage,
+    tags,
+    content,
+    template: templateLink,
+    topContent: topContentLinks,
+    bottomContent: bottomContentLinks,
+    articleType,
+    ...simpleFields
+  } = fields;
+  const articleTypeLink = resolveLink(context, id, articleType);
+  const template = resolveArticleTemplateHierarchy(context, articleType, templateLink);
+  const topContent = topContentLinks?.map((c) => resolvePageContent(context, id, c)).filter((item) => item !== null) ?? [];
+  const articleContent = content?.map((c) => resolvePageContent(context, id, c)).filter((item) => item !== null) ?? [];
+  const bottomContent = bottomContentLinks?.map((c) => resolvePageContent(context, id, c)).filter((item) => item !== null) ?? [];
+  const preContent = template?.preContent ?? [];
+  const postContent = template?.postContent ?? [];
+  const contents = addPositionMetadata([
+    ...topContent,
+    ...preContent,
+    ...articleContent,
+    ...postContent,
+    ...bottomContent
+  ]);
+  const article = {
+    type: "Article",
+    id,
+    slug,
+    title: makeContentfulTitle(title, sys.id),
+    description: makeContentfulDescription(description, sys.id),
+    featuredImage: lookupAsset(context, featuredImage),
+    articleType: articleTypeLink,
+    tags: tags?.map((tag) => resolveLink(context, id, tag)),
+    contents,
+    ...simpleFields,
+    // Note: summary field exists in Contentful but is not part of IArticle interface
+    // Keeping it in simpleFields for potential future use
+    menu: template?.menu,
+    footer: template?.footer
+  };
+  return article;
+}
+function calculateArticleTypeHref(slug) {
+  return `/${slug}/`;
+}
+function calculateArticleHref(articleTypeSlug, slug) {
+  return `${calculateArticleTypeHref(articleTypeSlug)}${slug}/`;
+}
+function baseArticleLinkConverter(context, entry) {
+  const { sys, fields } = entry;
+  if (sys.contentType.sys.id !== "article") {
+    throw new Error(`Invalid content type: expected "article", got "${sys.contentType.sys.id}"`);
+  }
+  const articleTypeLink = resolveLink(context, sys.id, fields.articleType);
+  const tags = fields.tags?.map((tag) => resolveLink(context, sys.id, tag));
+  const primaryTag = tags?.[0] ?? void 0;
+  const author = fields.author ? resolveLink(context, sys.id, fields.author) : void 0;
+  return createInternalLink(
+    sys.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
+    },
+    context,
+    calculateArticleHref(articleTypeLink.slug, fields.slug),
+    "Article",
+    {
+      tags,
+      primaryTag,
+      articleType: articleTypeLink,
+      date: fields.date,
+      author
+    }
+  );
+}
+function baseArticleTypeLinkConverter(context, entry) {
+  const { sys, fields } = entry;
+  if (sys.contentType.sys.id !== "articleType") {
+    throw new Error(
+      `Invalid content type: expected "articleType", got "${sys.contentType.sys.id}"`
+    );
+  }
+  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
+    },
+    context,
+    calculateArticleTypeHref(fields.slug),
+    "ArticleType",
+    { indexPageSlug: fields.indexPageSlug }
+  );
+}
+function baseArticleTypeConverter(context, entry) {
+  const { sys, fields } = entry;
+  const { id } = sys;
+  const {
+    indexPageSlug,
+    indexPageName,
+    indexPageDescription,
+    featuredImage,
+    menu: menuLink,
+    footer: footerLink,
+    indexPageTemplate: templateLink,
+    indexPageTopContent: topContentLinks,
+    structuredData,
+    slug: _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 topContent = topContentLinks?.map((c) => resolvePageContent(context, id, c)).filter((item) => item !== null) ?? [];
+  const preContent = template?.preContent ?? [];
+  const postContent = template?.postContent ?? [];
+  const contents = addPositionMetadata([...topContent, ...preContent, ...postContent]);
+  const articleType = {
+    type: "Article type",
+    id,
+    slug: indexPageSlug,
+    title: makeContentfulTitle(indexPageName, sys.id),
+    description: makeContentfulDescription(indexPageDescription, sys.id),
+    featuredImage: lookupAsset(context, featuredImage),
+    contents,
+    structuredData,
+    menu,
+    footer,
+    ...other
+  };
+  return articleType;
+}
+
+// src/converters/collection.ts
+function baseCollectionConverter(context, entry) {
+  const { sys, fields } = entry;
+  const { id } = sys;
+  const {
+    // Fields requiring transformation
+    backgroundVisual: bgVisual,
+    mobileBackgroundVisual: mobileBgVisual,
+    visual: visualField,
+    mobileVisual: mobileVisualField,
+    visualCustomSize,
+    icon: iconField,
+    links: linksField,
+    contents: contentsField,
+    body: bodyField,
+    additionalCopy: additionalCopyField,
+    showHeading,
+    heading,
+    // Already handled elsewhere
+    cmsLabel,
+    ...simpleFields
+    // anchor, backgroundColour, textColour, preHeading, heading, postHeading, backgroundOverlayOpacity
+  } = fields;
+  const backgroundVisual = createResponsiveVisual(
+    lookupAsset(context, bgVisual),
+    lookupAsset(context, mobileBgVisual)
+  );
+  const visual = createResponsiveVisual(
+    lookupMediaEntry(context, visualField),
+    lookupMediaEntry(context, mobileVisualField),
+    visualCustomSize
   );
   const collection = {
     type: "Collection",
     id,
     name: cmsLabel,
     cmsLabel,
-    collectionType,
     ...DEFAULT_POSITION_FIELDS,
     ...simpleFields,
     heading: showHeading ? heading : void 0,
@@ -1043,7 +1592,6 @@ function baseComponentConverter(context, entry) {
     body: bodyField,
     additionalCopy: additionalCopyField,
     // Field name change
-    componentType,
     showHeading,
     heading,
     otherMedia: otherMediaField,
@@ -1067,7 +1615,6 @@ function baseComponentConverter(context, entry) {
     id,
     name: cmsLabel,
     cmsLabel,
-    componentType,
     ...DEFAULT_POSITION_FIELDS,
     ...simpleFields,
     heading: showHeading ? heading : void 0,
@@ -1082,6 +1629,49 @@ function baseComponentConverter(context, entry) {
   return component;
 }
 
+// src/converters/customType.ts
+function baseCustomTypeConverter(context, entry) {
+  const { sys, fields } = entry;
+  const { id } = sys;
+  const {
+    slug,
+    indexPageSlug,
+    indexPageName,
+    indexPageDescription,
+    featuredImage,
+    menu: menuLink,
+    footer: footerLink,
+    indexPageTemplate: templateLink,
+    indexPageTopContent: topContentLinks,
+    structuredData,
+    ...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 topContent = topContentLinks?.map((c) => resolvePageContent(context, id, c)).filter((item) => item !== null) ?? [];
+  const preContent = template?.preContent ?? [];
+  const postContent = template?.postContent ?? [];
+  const contents = addPositionMetadata([...topContent, ...preContent, ...postContent]);
+  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),
+    featuredImage: lookupAsset(context, featuredImage),
+    contents,
+    structuredData,
+    menu,
+    footer,
+    ...other
+  };
+  return customType;
+}
+
 // src/converters/link.ts
 function baseLinkConverter(context, entry) {
   const { sys, fields } = entry;
@@ -1123,7 +1713,9 @@ function baseLinkConverter(context, entry) {
       slug: internalTarget.slug,
       indexed: internalTarget.indexed,
       hidden: internalTarget.hidden,
-      tags: internalTarget.tags
+      tags: internalTarget.tags,
+      title: internalTarget.title,
+      description: internalTarget.description
     };
   }
   if (fields.external) {
@@ -1155,124 +1747,11 @@ function baseLinkConverter(context, entry) {
       href,
       visual: asset
     };
-  }
-  return {
-    ...baseProps,
-    type: "Blank link",
-    href: null
-  };
-}
-
-// src/converters/navigationItem.ts
-function createLink(context, entry) {
-  const {
-    sys: { id },
-    fields
-  } = entry;
-  const {
-    title,
-    link,
-    text,
-    internal,
-    icon: navIcon,
-    mobileIcon: mobileNavIcon,
-    useTitle,
-    ...otherFields
-  } = fields;
-  const icon = createResponsiveVisual(
-    lookupAsset(context, navIcon),
-    lookupAsset(context, mobileNavIcon)
-  );
-  const realText = useTitle ? resolveBuildYear(title) : text ? resolveBuildYear(text) : void 0;
-  if (link) {
-    return {
-      type: "External link",
-      id,
-      href: link,
-      icon,
-      name: makeContentfulTitle(title, id),
-      ...otherFields,
-      text: realText
-    };
-  }
-  if (internal) {
-    const resolved = resolveLink(context, id, internal);
-    return { ...resolved, icon, id, text: realText };
-  }
-  const blank = {
-    type: "Blank link",
-    nick: true,
-    id,
-    name: makeContentfulTitle(title, id),
-    ...otherFields,
-    icon,
-    text: realText
-  };
-  return blank;
-}
-function baseNavigationItemConverter(context, entry) {
-  const {
-    sys: { id },
-    fields
-  } = entry;
-  const { navigationItems } = fields;
-  const link = createLink(context, entry);
-  const resolvedNavigationItems = navigationItems?.map((item) => resolveNavigationItem(context, id, item)).filter((item) => item !== void 0);
-  const result = {
-    id,
-    link,
-    entries: resolvedNavigationItems
-  };
-  return result;
-}
-function resolveNavigation(context, link) {
-  const id = link.sys.id;
-  const possibleEntry = context.includes.get(id);
-  if (!possibleEntry || possibleEntry.type !== "navigation") {
-    return void 0;
-  }
-  const entry = possibleEntry.entry;
-  const { fields } = entry;
-  if (!fields) {
-    return void 0;
-  }
-  const entries = fields.entries?.map((item) => resolveNavigationItem(context, id, item)) ?? [];
-  const { name, textColour, backgroundColour } = fields;
-  return {
-    id,
-    name,
-    entries,
-    textColour,
-    backgroundColour
-  };
-}
-
-// src/converters/template.ts
-function resolveTemplate(context, link) {
-  const id = link.sys.id;
-  const possibleEntry = context.includes.get(id);
-  if (!possibleEntry || possibleEntry.type !== "template") {
-    return null;
-  }
-  const entry = possibleEntry.entry;
-  const { fields } = entry;
-  if (!fields) {
-    return null;
-  }
-  const preContent = fields.preContent?.map((content) => resolvePageContent(context, id, content)).filter((item) => item !== null) ?? [];
-  const postContent = fields.postContent?.map((content) => resolvePageContent(context, id, content)).filter((item) => item !== null) ?? [];
-  const menu = fields.menu ? resolveNavigation(context, fields.menu) : void 0;
-  const footer = fields.footer ? resolveNavigation(context, fields.footer) : void 0;
-  const stickyNav = fields.flags?.includes("Sticky nav") ?? false;
-  const { backgroundColour, textColour } = fields;
-  return {
-    preContent,
-    postContent,
-    menu,
-    footer,
-    backgroundColour,
-    textColour,
-    stickyNav
+  }
+  return {
+    ...baseProps,
+    type: "Blank link",
+    href: null
   };
 }
 
@@ -1401,16 +1880,7 @@ function basePersonLinkConverter(context, entry) {
   return createInternalLink(
     sys.id,
     {
-      cmsLabel: fields.name,
-      // Person has no cmsLabel, use name field
-      title: fields.name,
-      featuredImage: fields.media,
-      // Person uses 'media' not 'featuredImage'
-      backgroundColour: fields.backgroundColour,
-      textColour: fields.textColour,
-      indexed: fields.indexed,
-      hidden: fields.hidden,
-      slug: fields.slug
+      ...fields
     },
     context,
     calculatePersonHref(fields.slug),
@@ -1418,140 +1888,39 @@ function basePersonLinkConverter(context, entry) {
   );
 }
 
-// src/converters/article.ts
-function resolveArticleTemplateHierarchy(context, articleTypeLink, directTemplateLink) {
-  if (directTemplateLink) {
-    return resolveTemplate(context, directTemplateLink);
-  }
-  const articleTypeEntry = context.includes.get(articleTypeLink.sys.id);
-  if (!articleTypeEntry) {
-    console.warn(`ArticleType entry not found for id: ${articleTypeLink.sys.id}`);
-    return null;
-  }
-  const articleTypeFields = articleTypeEntry.entry.fields;
-  if (articleTypeFields?.articleTemplate) {
-    return resolveTemplate(context, articleTypeFields.articleTemplate);
-  }
-  return null;
-}
-function baseArticleConverter(context, entry) {
-  const { sys, fields } = entry;
-  const { id } = sys;
-  const {
-    slug,
-    title,
-    description,
-    featuredImage,
-    tags,
-    content,
-    template: templateLink,
-    topContent: topContentLinks,
-    bottomContent: bottomContentLinks,
-    articleType,
-    ...simpleFields
-  } = fields;
-  const articleTypeLink = resolveLink(context, id, articleType);
-  const template = resolveArticleTemplateHierarchy(context, articleType, templateLink);
-  const topContent = topContentLinks?.map((c) => resolvePageContent(context, id, c)).filter((item) => item !== null) ?? [];
-  const articleContent = content?.map((c) => resolvePageContent(context, id, c)).filter((item) => item !== null) ?? [];
-  const bottomContent = bottomContentLinks?.map((c) => resolvePageContent(context, id, c)).filter((item) => item !== null) ?? [];
-  const preContent = template?.preContent ?? [];
-  const postContent = template?.postContent ?? [];
-  const contents = addPositionMetadata([
-    ...topContent,
-    ...preContent,
-    ...articleContent,
-    ...postContent,
-    ...bottomContent
-  ]);
-  const article = {
-    type: "Article",
-    id,
-    slug,
-    title: makeContentfulTitle(title, sys.id),
-    description: makeContentfulDescription(description, sys.id),
-    featuredImage: lookupAsset(context, featuredImage),
-    articleType: articleTypeLink,
-    tags: tags?.map((tag) => resolveLink(context, id, tag)),
-    contents,
-    ...simpleFields,
-    // Note: summary field exists in Contentful but is not part of IArticle interface
-    // Keeping it in simpleFields for potential future use
-    menu: template?.menu,
-    footer: template?.footer
-  };
-  return article;
-}
-function calculateArticleTypeHref(slug) {
-  return `/${slug}/`;
-}
-function calculateArticleHref(articleTypeSlug, slug) {
-  return `${calculateArticleTypeHref(articleTypeSlug)}${slug}/`;
-}
-function baseArticleLinkConverter(context, entry) {
-  const { sys, fields } = entry;
-  if (sys.contentType.sys.id !== "article") {
-    throw new Error(`Invalid content type: expected "article", got "${sys.contentType.sys.id}"`);
-  }
-  const articleTypeLink = resolveLink(context, sys.id, fields.articleType);
-  return createInternalLink(
-    sys.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
-    },
-    context,
-    calculateArticleHref(articleTypeLink.slug, fields.slug),
-    "Article",
-    {
-      tags: fields.tags?.map((tag) => resolveLink(context, sys.id, tag)),
-      articleType: articleTypeLink
-    }
-  );
+// src/converters/tag.ts
+function calculateTagHref(slug) {
+  return `/tag/${slug}/`;
 }
-function baseArticleTypeLinkConverter(context, entry) {
+function baseTagLinkConverter(context, entry) {
   const { sys, fields } = entry;
-  if (sys.contentType.sys.id !== "articleType") {
-    throw new Error(
-      `Invalid content type: expected "articleType", got "${sys.contentType.sys.id}"`
-    );
+  if (sys.contentType.sys.id !== "tag") {
+    throw new Error(`Invalid content type: expected "tag", got "${sys.contentType.sys.id}"`);
   }
   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
+      ...fields
     },
     context,
-    calculateArticleTypeHref(fields.slug),
-    "ArticleType"
+    calculateTagHref(fields.slug),
+    "Tag"
   );
 }
-function baseArticleTypeConverter(context, entry) {
+function baseTagConverter(context, entry) {
   const { sys, fields } = entry;
   const { id } = sys;
   const {
+    name,
     slug,
-    indexPageName,
-    indexPageDescription,
+    description,
     featuredImage,
+    tagType,
     menu: menuLink,
     footer: footerLink,
-    indexPageTemplate: templateLink,
-    indexPageTopContent: topContentLinks,
-    ...simpleFields
+    template: templateLink,
+    topContent: topContentLinks,
+    ...rest
   } = fields;
   const template = templateLink ? resolveTemplate(context, templateLink) : null;
   const menu = menuLink ? resolveNavigation(context, menuLink) : template?.menu;
@@ -1559,152 +1928,34 @@ function baseArticleTypeConverter(context, entry) {
   const topContent = topContentLinks?.map((c) => resolvePageContent(context, id, c)).filter((item) => item !== null) ?? [];
   const preContent = template?.preContent ?? [];
   const postContent = template?.postContent ?? [];
-  const indexPageContent = addPositionMetadata([...topContent, ...preContent, ...postContent]);
-  const articleType = {
-    type: "Article type",
+  const contents = addPositionMetadata([...topContent, ...preContent, ...postContent]);
+  const tagTypeEntry = tagType ? context.includes.get(tagType.sys.id) : null;
+  const tagTypeName = tagTypeEntry?.entry?.fields?.name;
+  const tag = {
+    type: "Tag",
     id,
     slug,
-    title: makeContentfulTitle(indexPageName, sys.id),
-    description: makeContentfulDescription(indexPageDescription, sys.id),
+    title: makeContentfulTitle(name, sys.id),
+    description: makeContentfulDescription(description, sys.id),
     featuredImage: lookupAsset(context, featuredImage),
-    indexPageContent,
-    ...simpleFields,
+    tagType: tagTypeName ?? null,
+    contents,
+    ...rest,
     menu,
-    footer
-  };
-  return articleType;
-}
-
-// src/converters/tag.ts
-function calculateTagHref(slug) {
-  return `/tag/${slug}/`;
-}
-function baseTagLinkConverter(context, entry) {
-  const { sys, fields } = entry;
-  if (sys.contentType.sys.id !== "tag") {
-    throw new Error(`Invalid content type: expected "tag", got "${sys.contentType.sys.id}"`);
-  }
-  return createInternalLink(
-    sys.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
-    },
-    context,
-    calculateTagHref(fields.slug),
-    "Tag"
-  );
-}
-
-// src/api.ts
-init_utils();
-var PAGE_LINK_FIELDS = "sys,fields.cmsLabel,fields.title,fields.slug,fields.featuredImage,fields.backgroundColour,fields.textColour,fields.indexed,fields.hidden,fields.tags";
-var ARTICLE_LINK_FIELDS = "sys,fields.cmsLabel,fields.title,fields.slug,fields.featuredImage,fields.backgroundColour,fields.textColour,fields.indexed,fields.hidden,fields.tags,fields.articleType";
-var ARTICLE_RELATED_FIELDS = "sys,fields.cmsLabel,fields.title,fields.slug,fields.featuredImage,fields.backgroundColour,fields.textColour,fields.indexed,fields.hidden,fields.tags,fields.articleType,fields.date,fields.author";
-var ARTICLE_TYPE_LINK_FIELDS = "sys,fields.name,fields.slug,fields.featuredImage,fields.backgroundColour,fields.textColour,fields.indexed,fields.hidden";
-var TAG_LINK_FIELDS = "sys,fields.cmsLabel,fields.name,fields.slug,fields.featuredImage,fields.backgroundColour,fields.textColour,fields.indexed,fields.hidden";
-var PERSON_LINK_FIELDS = "sys,fields.name,fields.slug,fields.media,fields.backgroundColour,fields.textColour,fields.indexed,fields.hidden";
-function convertAllAssets(response, context) {
-  const visuals = /* @__PURE__ */ new Map();
-  const assets = response.includes?.Asset;
-  if (assets && assets.length > 0) {
-    for (const asset of assets) {
-      const visual = convertAssetToVisual(context, asset);
-      if (visual) {
-        visuals.set(visual.id, visual);
-      }
-    }
-  }
-  return visuals;
-}
-function convertAllIncludes(response) {
-  const includes = /* @__PURE__ */ new Map();
-  const entries = [...response.items, ...response.includes?.Entry || []];
-  if (entries && entries.length > 0) {
-    for (const entry of entries) {
-      if (entry?.sys && entry.fields) {
-        includes.set(entry.sys.id, {
-          id: entry.sys.id,
-          type: entry.sys.contentType.sys.id,
-          entry
-        });
-      }
-    }
-  }
-  return includes;
-}
-async function contentfulPageRest(context, config, slug, options) {
-  const client = getContentfulClient(config, options?.preview);
-  const cacheTags = getCacheTags("page", slug, options?.preview);
-  const requestOptions = {
-    ...options,
-    next: {
-      ...options?.next,
-      tags: cacheTags
-    }
-  };
-  const fetchFn = async () => {
-    const response = await client.getEntries(
-      {
-        content_type: "page",
-        "fields.slug": slug,
-        include: 10,
-        locale: options?.locale,
-        limit: 1
-      },
-      requestOptions
-    );
-    const pageEntry = response.items[0];
-    if (!pageEntry || !pageEntry.fields) {
-      return { data: null, errors: [] };
-    }
-    try {
-      const assets = convertAllAssets(response, context);
-      const includes = convertAllIncludes(response);
-      const fullContext = {
-        ...context,
-        includes,
-        assets,
-        errors: []
-      };
-      const converted = fullContext.pageResolver(fullContext, pageEntry);
-      if (fullContext.errors.length > 0 && typeof process !== "undefined" && process.env?.NODE_ENV === "production") {
-        console.error("CMS conversion errors for page:", {
-          pageId: pageEntry.sys.id,
-          slug,
-          errors: fullContext.errors
-        });
-      }
-      return { data: converted, errors: fullContext.errors };
-    } catch (error) {
-      const entryId = pageEntry.sys.id;
-      const entryType = pageEntry.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] };
-    }
+    footer
   };
-  if (options?.retry) {
-    return await withRetry(fetchFn, options.retry);
-  }
-  return await fetchFn();
+  return tag;
 }
+
+// src/api/context.ts
 function createBaseConverterContext() {
   const linkResolver = /* @__PURE__ */ new Map();
   linkResolver.set("page", basePageLinkConverter);
   linkResolver.set("article", baseArticleLinkConverter);
-  linkResolver.set("articleType", baseArticleTypeLinkConverter);
+  linkResolver.set(
+    "articleType",
+    baseArticleTypeLinkConverter
+  );
   linkResolver.set("tag", baseTagLinkConverter);
   linkResolver.set("person", basePersonLinkConverter);
   linkResolver.set("pageVariant", basePageVariantLinkConverter);
@@ -1721,6 +1972,8 @@ function createBaseConverterContext() {
     navigationItemResolver: baseNavigationItemConverter,
     articleResolver: baseArticleConverter,
     articleTypeResolver: baseArticleTypeConverter,
+    tagResolver: baseTagConverter,
+    customTypeResolver: baseCustomTypeConverter,
     componentResolver: baseComponentConverter,
     collectionResolver: baseCollectionConverter,
     linkResolver,
@@ -1728,279 +1981,26 @@ function createBaseConverterContext() {
     videoPrefix: ""
   };
 }
-async function contentfulArticleRest(context, config, slug, articleTypeSlug, options) {
-  const client = getContentfulClient(config, options?.preview);
-  const cacheTags = getCacheTags("article", slug, options?.preview);
-  const requestOptions = {
-    ...options,
-    next: {
-      ...options?.next,
-      tags: cacheTags
-    }
-  };
-  const fetchFn = async () => {
-    const response = await client.getEntries(
-      {
-        content_type: "article",
-        "fields.slug": slug,
-        "fields.articleType.sys.contentType.sys.id": "articleType",
-        "fields.articleType.fields.slug": articleTypeSlug,
-        include: 10,
-        locale: options?.locale,
-        limit: 1
-      },
-      requestOptions
-    );
-    const articleEntry = response.items[0];
-    if (!articleEntry || !articleEntry.fields) {
-      return { data: null, errors: [] };
-    }
-    const assets = convertAllAssets(response, context);
-    const includes = convertAllIncludes(response);
-    const fullContext = {
-      ...context,
-      includes,
-      assets,
-      errors: []
-    };
-    try {
-      const converted = fullContext.articleResolver(fullContext, articleEntry);
-      if (fullContext.errors.length > 0 && typeof process !== "undefined" && process.env?.NODE_ENV === "production") {
-        console.error("CMS conversion errors for article:", {
-          articleId: articleEntry.sys.id,
-          slug,
-          articleTypeSlug,
-          errors: fullContext.errors
-        });
-      }
-      return { data: converted, errors: fullContext.errors };
-    } catch (error) {
-      const entryId = articleEntry.sys.id;
-      const entryType = articleEntry.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();
-}
-async function contentfulArticleTypeRest(context, config, slug, options) {
-  const client = getContentfulClient(config, options?.preview);
-  const cacheTags = getCacheTags("articleType", slug, options?.preview);
-  const requestOptions = {
-    ...options,
-    next: {
-      ...options?.next,
-      tags: cacheTags
-    }
-  };
-  const fetchFn = async () => {
-    const response = await client.getEntries(
-      {
-        content_type: "articleType",
-        "fields.slug": slug,
-        include: 10,
-        locale: options?.locale,
-        limit: 1
-      },
-      requestOptions
-    );
-    const articleTypeEntry = response.items[0];
-    if (!articleTypeEntry || !articleTypeEntry.fields) {
-      return { data: null, errors: [] };
-    }
-    const assets = convertAllAssets(response, context);
-    const includes = convertAllIncludes(response);
-    const fullContext = {
-      ...context,
-      includes,
-      assets,
-      errors: []
-    };
-    try {
-      const converted = fullContext.articleTypeResolver(fullContext, articleTypeEntry);
-      if (fullContext.errors.length > 0 && typeof process !== "undefined" && process.env?.NODE_ENV === "production") {
-        console.error("CMS conversion errors for article type:", {
-          articleTypeId: articleTypeEntry.sys.id,
-          slug,
-          errors: fullContext.errors
-        });
-      }
-      return { data: converted, errors: fullContext.errors };
-    } catch (error) {
-      const entryId = articleTypeEntry.sys.id;
-      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();
-}
-function baseArticleLinkConverterWithMetadata(context, entry) {
-  const baseLink = baseArticleLinkConverter(context, entry);
-  return {
-    ...baseLink,
-    date: entry.fields.date ? new Date(entry.fields.date) : void 0,
-    author: entry.fields.author ? resolveLink(context, baseLink.id, entry.fields.author) : void 0,
-    articleType: entry.fields.articleType ? resolveLink(context, baseLink.id, entry.fields.articleType) : void 0
-  };
-}
-async function getAllArticlesForRelated(context, config, options) {
-  const client = getContentfulClient(config, options?.preview);
-  const allArticles = [];
-  const errors = [];
-  const pageSize = 100;
-  let skip = 0;
-  let hasMore = true;
-  const cacheTags = getCacheTags("article", void 0, options?.preview);
-  const requestOptions = {
-    ...options,
-    next: {
-      ...options?.next,
-      tags: cacheTags
-    }
-  };
-  const fetchFn = async () => {
-    while (hasMore) {
-      const response = await client.getEntries(
-        {
-          content_type: "article",
-          "fields.indexed": true,
-          "fields.hidden[ne]": true,
-          order: "-fields.date",
-          include: 2,
-          // Shallow include - just enough for tags, articleType, author
-          locale: options?.locale,
-          limit: pageSize,
-          skip,
-          select: ARTICLE_RELATED_FIELDS
-        },
-        requestOptions
-      );
-      if (response.items.length === 0) {
-        hasMore = false;
-        break;
-      }
-      const assets = convertAllAssets(response, context);
-      const includes = convertAllIncludes(response);
-      const fullContext = {
-        ...context,
-        includes,
-        assets,
-        errors: []
-      };
-      for (const entry of response.items) {
-        if (!entry.fields) continue;
-        try {
-          const converted = baseArticleLinkConverterWithMetadata(fullContext, entry);
-          allArticles.push(converted);
-        } catch (error) {
-          const entryId = entry.sys.id;
-          const entryType = entry.sys.contentType?.sys?.id;
-          const errorMessage = error instanceof Error ? error.message : "Unknown conversion error";
-          errors.push({
-            entryId,
-            entryType,
-            message: errorMessage,
-            error
-          });
-        }
-      }
-      skip += pageSize;
-      if (skip >= response.total) {
-        hasMore = false;
-      }
-    }
-    return { data: allArticles, errors };
-  };
-  if (options?.retry) {
-    return await withRetry(fetchFn, options.retry);
-  }
-  return await fetchFn();
-}
-async function fetchAllLinks(contentType, client, requestOptions, converter, context, pageSize = 100, select) {
-  const allLinks = [];
-  const errors = [];
-  let skip = 0;
-  let hasMore = true;
-  const fetchFn = async () => {
-    while (hasMore) {
-      try {
-        const response = await client.getEntries(
-          {
-            content_type: contentType,
-            include: 2,
-            // Minimal include for link-only fetching
-            locale: requestOptions?.locale,
-            limit: pageSize,
-            skip,
-            ...select && { select }
-          },
-          requestOptions
-        );
-        if (response.items.length === 0) {
-          hasMore = false;
-          break;
-        }
-        const includes = convertAllIncludes(response);
-        const assets = convertAllAssets(response, context);
-        const fullContext = {
-          ...context,
-          includes,
-          assets,
-          errors: []
-        };
-        for (const entry of response.items) {
-          if (!entry.fields) continue;
-          try {
-            const converted = converter(
-              fullContext,
-              entry
-            );
-            converted.lastModified = entry.sys.updatedAt ? new Date(entry.sys.updatedAt) : void 0;
-            allLinks.push(converted);
-          } catch (error) {
-            const entryId = entry.sys.id;
-            const entryType = entry.sys.contentType?.sys?.id;
-            const errorMessage = error instanceof Error ? error.message : "Unknown conversion error";
-            errors.push({
-              entryId,
-              entryType,
-              message: errorMessage,
-              error
-            });
-          }
-        }
-        skip += pageSize;
-        if (skip >= response.total) {
-          hasMore = false;
-        }
-      } catch (error) {
-        console.error("Error fetching links", typeof error, error, JSON.stringify(error, null, 2));
-        throw error;
-      }
-    }
-    return { data: allLinks, errors };
-  };
-  return await fetchFn();
+
+// src/api/custom-type.ts
+async function contentfulCustomTypeRest(context, config, indexPageSlug, options) {
+  return fetchSingleEntity(
+    context,
+    config,
+    {
+      contentType: "customType",
+      cacheTagType: "customType",
+      cacheTagIdentifier: indexPageSlug,
+      query: { "fields.indexPageSlug": indexPageSlug },
+      resolver: (ctx, entry) => ctx.customTypeResolver(ctx, entry),
+      errorLogContext: { indexPageSlug }
+    },
+    options
+  );
 }
+
+// src/api/links.ts
+init_utils();
 async function contentfulAllPageLinks(context, config, options) {
   const client = getContentfulClient(config, options?.preview);
   const cacheTags = getCacheTags("page", void 0, options?.preview);
@@ -2121,34 +2121,67 @@ async function contentfulAllArticleTypeLinks(context, config, options) {
   }
   return await fetchFn();
 }
+
+// src/api/page.ts
+async function contentfulPageRest(context, config, slug, options) {
+  return fetchSingleEntity(
+    context,
+    config,
+    {
+      contentType: "page",
+      cacheTagType: "page",
+      cacheTagIdentifier: slug,
+      query: { "fields.slug": slug },
+      resolver: (ctx, entry) => ctx.pageResolver(ctx, entry),
+      errorLogContext: { slug }
+    },
+    options
+  );
+}
+
+// src/api/related-articles.ts
 function filterRelatedArticles(articles, options) {
-  const { articleTypeId, tagIds, authorId, excludeIds, before, after, count } = options;
+  const {
+    excludeArticleIds,
+    articleTypeIds: rawArticleTypeIds,
+    tagIds: rawTagIds,
+    authorIds: rawAuthorIds,
+    before,
+    after,
+    count
+  } = options;
+  const excludeIds = excludeArticleIds ? [...new Set(excludeArticleIds)] : [];
+  const articleTypeIds = rawArticleTypeIds ? [...new Set(rawArticleTypeIds)] : [];
+  const tagIds = rawTagIds ? [...new Set(rawTagIds)] : [];
+  const authorIds = rawAuthorIds ? [...new Set(rawAuthorIds)] : [];
   const scoredArticles = articles.map((article) => {
     let score = 0;
-    if (excludeIds?.includes(article.id)) {
-      return null;
-    }
-    if (articleTypeId && article.articleType?.id !== articleTypeId) {
+    if (excludeIds.length > 0 && excludeIds.includes(article.id)) {
       return null;
     }
-    if (authorId && article.author?.id !== authorId) {
-      return null;
+    if (articleTypeIds.length > 0) {
+      if (!article.articleType?.id || !articleTypeIds.includes(article.articleType.id)) {
+        return null;
+      }
     }
     if (article.date) {
-      if (before && article.date > before) {
+      const articleDate = new Date(article.date);
+      if (before && articleDate > before) {
         return null;
       }
-      if (after && article.date < after) {
+      if (after && articleDate < after) {
         return null;
       }
     }
-    if (tagIds && tagIds.length > 0 && article.tags) {
+    if (tagIds.length > 0 && article.tags) {
       const articleTagIds = article.tags.map((tag) => tag.id);
       const matchingTags = tagIds.filter((tagId) => articleTagIds.includes(tagId));
       score += matchingTags.length * 10;
     }
-    if (authorId && article.author?.id === authorId) {
-      score += 5;
+    if (authorIds.length > 0 && article.author?.id) {
+      if (authorIds.includes(article.author.id)) {
+        score += 5;
+      }
     }
     return { article, score };
   }).filter((item) => item !== null);
@@ -2157,16 +2190,17 @@ function filterRelatedArticles(articles, options) {
       return b.score - a.score;
     }
     if (a.article.date && b.article.date) {
-      return b.article.date.getTime() - a.article.date.getTime();
+      const articleDateA = new Date(a.article.date);
+      const articleDateB = new Date(b.article.date);
+      return articleDateB.getTime() - articleDateA.getTime();
     }
     return 0;
   });
-  const topArticles = count ? scoredArticles.slice(0, count) : scoredArticles;
-  return topArticles.map(({ article }) => {
-    const { date: _date, author: _author, articleType: _articleType, ...cleanLink } = article;
-    return cleanLink;
-  });
+  const topArticles = count !== void 0 ? scoredArticles.slice(0, count) : scoredArticles;
+  return topArticles.map(({ article }) => article);
 }
+
+// src/api/sitemap.ts
 function linksToSitemapEntries(links, sitemapConfig) {
   return links.filter((link) => link.indexed !== false && link.hidden !== true && link.href).map((link) => ({
     url: link.href,
@@ -2226,6 +2260,60 @@ function createSitemapProvider(fetcher, sitemapConfig) {
   return (context, config, options) => fetcher(context, config, sitemapConfig, options);
 }
 
+// src/api/tag.ts
+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
+  );
+}
+
+// src/api/template.ts
+function templateConverter(context, entry) {
+  const { fields, sys } = entry;
+  const id = sys.id;
+  const preContent = fields.preContent?.map((content) => resolvePageContent(context, id, content)).filter((item) => item !== null) ?? [];
+  const postContent = fields.postContent?.map((content) => resolvePageContent(context, id, content)).filter((item) => item !== null) ?? [];
+  const menu = fields.menu ? resolveNavigation(context, fields.menu) : void 0;
+  const footer = fields.footer ? resolveNavigation(context, fields.footer) : void 0;
+  const stickyNav = fields.flags?.includes("Sticky nav") ?? false;
+  return {
+    id,
+    cmsLabel: fields.cmsLabel,
+    preContent,
+    postContent,
+    menu,
+    footer,
+    backgroundColour: fields.backgroundColour,
+    textColour: fields.textColour,
+    stickyNav
+  };
+}
+async function contentfulTemplateRest(context, config, cmsLabel, options) {
+  return fetchSingleEntity(
+    context,
+    config,
+    {
+      contentType: "template",
+      cacheTagType: "template",
+      cacheTagIdentifier: cmsLabel,
+      query: { "fields.cmsLabel": cmsLabel },
+      resolver: (ctx, entry) => templateConverter(ctx, entry),
+      errorLogContext: { cmsLabel }
+    },
+    options
+  );
+}
+
 // src/revalidation/handlers.ts
 init_tags();
 init_utils();
@@ -2257,6 +2345,11 @@ var pageVariantHandler = {
   makeTags: (extracted) => [extracted ? pageTag(extracted) : void 0],
   getGlobalTags: () => [PageTag]
 };
+var templateHandler = {
+  extract: (data) => data.fields?.cmsLabel?.[defaultLocale],
+  makeTags: (extracted) => [extracted ? templateTag(extracted) : void 0],
+  getGlobalTags: () => [TemplateTag]
+};
 var contentTypeHandlers = {
   page: {
     extract: (data) => data.fields?.slug?.[defaultLocale],
@@ -2278,11 +2371,8 @@ var contentTypeHandlers = {
     makeTags: (extracted) => [extracted ? tagTag(extracted) : void 0],
     getGlobalTags: () => [TagTag]
   },
-  template: {
-    extract: () => void 0,
-    makeTags: () => void 0,
-    getGlobalTags: () => ["template"]
-  },
+  // biome-ignore lint/suspicious/noExplicitAny: Any is ok for handlers with different types
+  template: templateHandler,
   customType: {
     extract: () => void 0,
     makeTags: () => void 0,
@@ -2446,6 +2536,6 @@ function createRevalidationHandler(config = {}) {
 init_tags();
 init_utils();
 
-export { AllTags, ArticleTag, ArticleTypeTag, AssetTag, AuthenticationError, BannerTag, ContentfulError, CustomTypeTag, EntryNotFoundError, GlobalTag, LocationTag, NavigationTag, PageTag, PersonTag, RateLimitError, RateLimiter, TagTag, TemplateTag, ValidationError, arrayOrUndefined, articleTag, articleTypeIndexTag, articleTypeTag, assetTag, basePageConverter, calculateBackoffDelay, contentfulAllArticleLinks, contentfulAllArticleTypeLinks, contentfulAllPageLinks, contentfulAllPersonLinks, contentfulAllTagLinks, contentfulArticleRest, contentfulArticleSitemapEntries, contentfulArticleTypeRest, contentfulArticleTypeSitemapEntries, contentfulPageRest, contentfulPageSitemapEntries, contentfulPersonSitemapEntries, contentfulTagSitemapEntries, createBaseConverterContext, createContentfulClient, createContentfulPreviewClient, createResponsiveVisual, createRevalidationHandler, createSitemapProvider, customTypeTag, filterRelatedArticles, getAllArticlesForRelated, getAllSitemapEntries, getCacheTags, getCacheTagsForPreview, getCacheTagsForProduction, getContentfulClient, getRetryAfter, isContentfulError, isRateLimitError, isRetryableError, isValidDate, locationTag, lookupAsset, notEmpty, pageTag, personTag, resolveLink, resolveLinks, resolveRichTextDocument, revalidateSingleTag, revalidateTags, safeDate, tagTag, withRetry };
+export { AllTags, ArticleTag, ArticleTypeTag, AssetTag, AuthenticationError, BannerTag, ContentfulError, CustomTypeTag, EntryNotFoundError, GlobalTag, LocationTag, NavigationTag, PageTag, PersonTag, RateLimitError, RateLimiter, TagTag, TemplateTag, ValidationError, arrayOrUndefined, articleTag, articleTypeIndexTag, articleTypeTag, assetTag, basePageConverter, calculateBackoffDelay, contentfulAllArticleLinks, contentfulAllArticleTypeLinks, contentfulAllPageLinks, contentfulAllPersonLinks, contentfulAllTagLinks, contentfulArticleRest, contentfulArticleSitemapEntries, contentfulArticleTypeRest, contentfulArticleTypeSitemapEntries, contentfulCustomTypeRest, contentfulPageRest, contentfulPageSitemapEntries, contentfulPersonSitemapEntries, contentfulTagRest, contentfulTagSitemapEntries, contentfulTemplateRest, createBaseConverterContext, createContentfulClient, createContentfulPreviewClient, createResponsiveVisual, createRevalidationHandler, createSitemapProvider, customTypeTag, filterRelatedArticles, getAllSitemapEntries, getCacheTags, getCacheTagsForPreview, getCacheTagsForProduction, getContentfulClient, getRetryAfter, isContentfulError, isRateLimitError, isRetryableError, isValidDate, locationTag, lookupAsset, notEmpty, pageTag, personTag, resolveLink, resolveLinks, resolveRichTextDocument, revalidateSingleTag, revalidateTags, safeDate, tagTag, templateTag, withRetry };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map