@se-studio/contentful-rest-api 0.1.0 → 0.1.1

package/dist/index.js

@@ -1,193 +1,144 @@
-import { createClient } from 'contentful';
-
-var __defProp = Object.defineProperty;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __esm = (fn, res) => function __init() {
-  return fn && (res = (0, fn[__getOwnPropNames(fn)[0]])(fn = 0)), res;
+// src/utils/errors.ts
+var ContentfulError = class _ContentfulError extends Error {
+  constructor(message, statusCode, details) {
+    super(message);
+    this.statusCode = statusCode;
+    this.details = details;
+    this.name = "ContentfulError";
+    Object.setPrototypeOf(this, _ContentfulError.prototype);
+  }
 };
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
+var RateLimitError = class _RateLimitError extends ContentfulError {
+  constructor(message, retryAfter, details) {
+    super(message, 429, details);
+    this.retryAfter = retryAfter;
+    this.name = "RateLimitError";
+    Object.setPrototypeOf(this, _RateLimitError.prototype);
+  }
 };
-
-// src/utils/timing.ts
-var timing_exports = {};
-__export(timing_exports, {
-  Timer: () => Timer,
-  createTimer: () => createTimer,
-  logTimingResult: () => logTimingResult
-});
-function formatTimingResult(result, indent = "") {
-  const lines = [];
-  let output = `${result.label}: ${result.duration}ms`;
-  if (result.metadata) {
-    const metadataStr = Object.entries(result.metadata).map(([k, v]) => `${k}: ${v}`).join(", ");
-    output += ` (${metadataStr})`;
+var EntryNotFoundError = class _EntryNotFoundError extends ContentfulError {
+  constructor(entryId, contentType) {
+    super(`Entry not found: ${entryId}${contentType ? ` (${contentType})` : ""}`, 404);
+    this.entryId = entryId;
+    this.contentType = contentType;
+    this.name = "EntryNotFoundError";
+    Object.setPrototypeOf(this, _EntryNotFoundError.prototype);
   }
-  if (result.memoryDelta) {
-    const mem = result.memoryDelta;
-    const parts = [];
-    if (Math.abs(mem.heapUsedMB) > 0.01) {
-      parts.push(`heap: ${mem.heapUsedMB >= 0 ? "+" : ""}${mem.heapUsedMB}MB`);
-    }
-    if (Math.abs(mem.rssMB) > 0.01) {
-      parts.push(`rss: ${mem.rssMB >= 0 ? "+" : ""}${mem.rssMB}MB`);
-    }
-    if (Math.abs(mem.externalMB) > 0.01) {
-      parts.push(`ext: ${mem.externalMB >= 0 ? "+" : ""}${mem.externalMB}MB`);
-    }
-    if (parts.length > 0) {
-      output += ` [${parts.join(", ")}]`;
-    }
+};
+var AuthenticationError = class _AuthenticationError extends ContentfulError {
+  constructor(message = "Authentication failed") {
+    super(message, 401);
+    this.name = "AuthenticationError";
+    Object.setPrototypeOf(this, _AuthenticationError.prototype);
   }
-  lines.push(`${indent}${output}`);
-  if (result.children && result.children.length > 0) {
-    for (let i = 0; i < result.children.length; i++) {
-      const child = result.children[i];
-      if (!child) continue;
-      const isLast = i === result.children.length - 1;
-      const childIndent = indent + (isLast ? "  \u2514\u2500 " : "  \u251C\u2500 ");
-      const grandchildIndent = indent + (isLast ? "     " : "  \u2502  ");
-      const childLines = formatTimingResult(child, "").split("\n");
-      lines.push(childIndent + childLines[0]);
-      for (let j = 1; j < childLines.length; j++) {
-        lines.push(grandchildIndent + childLines[j]);
-      }
-    }
+};
+var ValidationError = class _ValidationError extends ContentfulError {
+  constructor(message, validationErrors) {
+    super(message, 400, validationErrors);
+    this.validationErrors = validationErrors;
+    this.name = "ValidationError";
+    Object.setPrototypeOf(this, _ValidationError.prototype);
+  }
+};
+function isContentfulError(error) {
+  return error instanceof ContentfulError;
+}
+function isRateLimitError(error) {
+  return error instanceof RateLimitError;
+}
+function isRetryableError(error) {
+  if (isRateLimitError(error)) {
+    return true;
   }
-  return lines.join("\n");
+  if (isContentfulError(error)) {
+    return error.statusCode !== void 0 && (error.statusCode >= 500 || error.statusCode === 429);
+  }
+  return false;
 }
-function logTimingResult(result) {
-  if (!shouldLog) return;
-  console.log(`
-[Timing] ${formatTimingResult(result)}`);
+function getRetryAfter(error) {
+  if (isRateLimitError(error)) {
+    return error.retryAfter;
+  }
+  return void 0;
 }
-function createTimer(label) {
-  return new Timer(label);
+
+// src/client.ts
+function buildQueryString(query) {
+  const params = new URLSearchParams();
+  Object.entries(query).forEach(([key, value]) => {
+    if (value !== void 0 && value !== null) {
+      params.append(key, String(value));
+    }
+  });
+  return params.toString();
 }
-var isDevelopment, isDebugTimingEnabled, shouldLog, Timer;
-var init_timing = __esm({
-  "src/utils/timing.ts"() {
-    isDevelopment = process.env.NODE_ENV === "development";
-    isDebugTimingEnabled = process.env.DEBUG_TIMING === "true";
-    shouldLog = isDevelopment || isDebugTimingEnabled;
-    Timer = class _Timer {
-      startTime;
-      memoryStart;
-      label;
-      children = [];
-      metadata = {};
-      trackMemory;
-      constructor(label, trackMemory = true) {
-        this.label = label;
-        this.startTime = performance.now();
-        this.trackMemory = trackMemory && shouldLog;
-        if (this.trackMemory && typeof process !== "undefined" && process.memoryUsage) {
-          this.memoryStart = process.memoryUsage();
-        }
-      }
-      /**
-       * Add metadata to the timing result
-       */
-      addMetadata(key, value) {
-        this.metadata[key] = value;
-      }
-      /**
-       * Create and return a child timer
-       */
-      child(label) {
-        return new _Timer(`${this.label} > ${label}`);
-      }
-      /**
-       * End the timer and return the result
-       */
-      end() {
-        const duration = performance.now() - this.startTime;
-        const result = {
-          label: this.label,
-          duration: Math.round(duration * 100) / 100,
-          // Round to 2 decimal places
-          children: this.children.length > 0 ? this.children : void 0,
-          metadata: Object.keys(this.metadata).length > 0 ? this.metadata : void 0
-        };
-        if (this.memoryStart && typeof process !== "undefined" && process.memoryUsage) {
-          const memoryEnd = process.memoryUsage();
-          result.memoryDelta = {
-            heapUsedMB: Number(
-              ((memoryEnd.heapUsed - this.memoryStart.heapUsed) / 1024 / 1024).toFixed(2)
-            ),
-            heapTotalMB: Number(
-              ((memoryEnd.heapTotal - this.memoryStart.heapTotal) / 1024 / 1024).toFixed(2)
-            ),
-            rssMB: Number(((memoryEnd.rss - this.memoryStart.rss) / 1024 / 1024).toFixed(2)),
-            externalMB: Number(
-              ((memoryEnd.external - this.memoryStart.external) / 1024 / 1024).toFixed(2)
-            )
-          };
-        }
-        return result;
-      }
-      /**
-       * End timer and log the result
-       */
-      endAndLog() {
-        const result = this.end();
-        if (shouldLog) {
-          logTimingResult(result);
-        }
-        return result;
-      }
-      /**
-       * Execute a function and time it
-       */
-      static async time(label, fn, metadata) {
-        const timer = new _Timer(label);
-        if (metadata) {
-          for (const [key, value] of Object.entries(metadata)) {
-            timer.addMetadata(key, value);
-          }
-        }
-        const result = await fn();
-        const timing = timer.end();
-        return { result, timing };
-      }
-      /**
-       * Execute a synchronous function and time it
-       */
-      static timeSync(label, fn, metadata) {
-        const timer = new _Timer(label);
-        if (metadata) {
-          for (const [key, value] of Object.entries(metadata)) {
-            timer.addMetadata(key, value);
-          }
-        }
-        const result = fn();
-        const timing = timer.end();
-        return { result, timing };
+async function parseErrorResponse(response) {
+  const statusCode = response.status;
+  let errorData;
+  try {
+    errorData = await response.json();
+  } catch {
+    errorData = { message: response.statusText };
+  }
+  const message = errorData?.message || `Contentful API error: ${statusCode}`;
+  switch (statusCode) {
+    case 401:
+      return new AuthenticationError(message);
+    case 404:
+      return new EntryNotFoundError(
+        errorData?.sys?.id || "unknown",
+        errorData?.sys?.contentType?.sys?.id
+      );
+    case 429: {
+      const retryAfterHeader = response.headers.get("X-Contentful-RateLimit-Reset") || response.headers.get("Retry-After");
+      const retryAfter = retryAfterHeader ? Number.parseInt(retryAfterHeader, 10) : void 0;
+      return new RateLimitError(message, retryAfter, errorData);
+    }
+    case 400:
+      return new ValidationError(message, errorData);
+    default:
+      return new ContentfulError(message, statusCode, errorData);
+  }
+}
+var ContentfulFetchClient = class {
+  baseUrl;
+  accessToken;
+  constructor(config, preview = false) {
+    const host = config.host || (preview ? "preview.contentful.com" : "cdn.contentful.com");
+    const environment = config.environment || "master";
+    this.baseUrl = `https://${host}/spaces/${config.spaceId}/environments/${environment}`;
+    this.accessToken = config.accessToken;
+  }
+  /**
+   * Fetches entries from Contentful
+   */
+  async getEntries(query, options) {
+    const queryString = buildQueryString(query);
+    const url = `${this.baseUrl}/entries?${queryString}`;
+    const fetchOptions = {
+      headers: {
+        Authorization: `Bearer ${this.accessToken}`,
+        "Content-Type": "application/json"
       }
     };
+    if (options?.next) {
+      fetchOptions.next = options.next;
+    }
+    const response = await fetch(url, fetchOptions);
+    if (!response.ok) {
+      throw await parseErrorResponse(response);
+    }
+    return response.json();
   }
-});
+};
 function createContentfulClient(config) {
-  return createClient({
-    space: config.spaceId,
-    accessToken: config.accessToken,
-    environment: config.environment || "master",
-    host: config.host,
-    ...config.options
-  });
+  return new ContentfulFetchClient(config, false);
 }
 function createContentfulPreviewClient(config) {
-  return createClient({
-    space: config.spaceId,
-    accessToken: config.accessToken,
-    environment: config.environment || "master",
-    host: "preview.contentful.com",
-    ...config.options
-  });
+  return new ContentfulFetchClient(config, true);
 }
 function getContentfulClient(config, preview = false) {
-  return (preview ? createContentfulPreviewClient(config) : createContentfulClient(config)).withoutLinkResolution;
+  return preview ? createContentfulPreviewClient(config) : createContentfulClient(config);
 }
 
 // src/converters/helpers.ts
@@ -212,7 +163,7 @@ function createInternalLink(id, fields, context, href, additionalProps) {
   return {
     type: "Internal link",
     id,
-    name: cmsLabel,
+    name: cmsLabel ?? "",
     useName: true,
     text: makeContentfulTitle(title, id),
     visual: lookupAsset(context, featuredImage),
@@ -242,7 +193,7 @@ function addPositionMetadata(items) {
 }
 
 // src/converters/asset.ts
-function convertAssetToVisual(asset, options) {
+function convertAssetToVisual(context, asset, options) {
   if (!asset) return void 0;
   const { fields, sys } = asset;
   if (!fields) return void 0;
@@ -259,7 +210,13 @@ function convertAssetToVisual(asset, options) {
     };
   }
   if (contentType?.startsWith("video/")) {
-    const video = convertAssetToVideo(file, fields, sys, options);
+    const video = convertAssetToVideo(
+      file,
+      fields,
+      sys,
+      context,
+      options
+    );
     return {
       id,
       type: "Visual",
@@ -299,7 +256,7 @@ function convertAssetToVideoDetails(file, sys) {
     fileName
   };
 }
-function convertAssetToVideo(file, fields, sys, options) {
+function convertAssetToVideo(file, fields, sys, context, options) {
   const { id } = sys;
   const { title, description } = fields;
   const { details } = file;
@@ -311,6 +268,7 @@ function convertAssetToVideo(file, fields, sys, options) {
     id,
     type: "Local video",
     preview: videoDetails,
+    videoPrefix: context.videoPrefix,
     width: width || 0,
     height: height || 0,
     name: makeContentfulTitle(title, id),
@@ -416,32 +374,6 @@ function lookupMediaEntry(context, link) {
   return void 0;
 }
 
-// src/converters/externalComponent.ts
-function baseExternalComponentConverter(_context, entry) {
-  const { sys, fields } = entry;
-  const {
-    externalComponentType,
-    cmsLabel,
-    data,
-    heading: _heading,
-    // Exclude: not in target interface
-    ...simpleFields
-    // backgroundColour, textColour
-  } = fields;
-  return {
-    type: "External component",
-    id: sys.id,
-    name: cmsLabel ?? `External component ${sys.id}`,
-    cmsLabel: cmsLabel ?? null,
-    externalType: externalComponentType,
-    data: data ?? null,
-    ...DEFAULT_POSITION_FIELDS,
-    ...simpleFields,
-    backgroundOverlayOpacity: null,
-    backgroundVisual: void 0
-  };
-}
-
 // src/converters/resolver.ts
 function resolveHelper(context, entry, getResolver) {
   const id = entry.sys.id;
@@ -456,6 +388,9 @@ function resolveHelper(context, entry, getResolver) {
         `No resolver found for link type ${possibleEntry.type} (${JSON.stringify(possibleEntry)}) [${JSON.stringify(entry)}]`
       );
     }
+    if (typeof resolver !== "function") {
+      console.log("Resolver type", possibleEntry.type, typeof resolver, resolver);
+    }
     const resolved = resolver(
       context,
       possibleEntry.entry
@@ -472,6 +407,15 @@ function resolveLink(context, entry) {
     (type) => context.linkResolver.get(type)
   );
 }
+function resolveLinks(context, entries) {
+  return entries?.map((entry) => resolveLink(context, entry)) || [];
+}
+function resolveContent(context, entry) {
+  return resolveHelper(context, entry, (type) => {
+    const resolver = context.contentResolver.get(type);
+    return resolver;
+  });
+}
 function resolveNavigationItem(context, entry) {
   return resolveHelper(
     context,
@@ -480,15 +424,14 @@ function resolveNavigationItem(context, entry) {
   );
 }
 function resolveCollectionContent(context, entry) {
-  return resolveHelper(context, entry, (type) => {
-    if (type === "component") {
-      return context.componentResolver;
-    }
-    if (type === "collection") {
-      return context.collectionResolver;
+  return resolveHelper(
+    context,
+    entry,
+    (type) => {
+      const resolver = context.contentResolver.get(type);
+      return resolver;
     }
-    return void 0;
-  });
+  );
 }
 function resolvePageContent(context, entry) {
   const id = entry.sys.id;
@@ -497,9 +440,6 @@ function resolvePageContent(context, entry) {
     throw new Error(`Cannot find included entry for content with id ${id}`);
   }
   const { type } = possibleEntry;
-  if (type === "component" || type === "collection") {
-    return resolveCollectionContent(context, entry);
-  }
   if (type === "media") {
     const visual = convertMediaEntryToVisual(
       context,
@@ -520,8 +460,8 @@ function resolvePageContent(context, entry) {
     }
     return visual;
   }
-  if (type === "externalComponent") {
-    return resolveHelper(context, entry, () => baseExternalComponentConverter);
+  if (context.contentResolver.has(type)) {
+    return resolveContent(context, entry);
   }
   if (context.linkResolver.has(type)) {
     return resolveLink(context, entry);
@@ -631,9 +571,8 @@ function baseCollectionConverter(context, entry) {
     additionalCopy: additionalCopyField,
     // Field name change
     collectionType,
-    // CMS-only fields (must exclude)
-    textSize: _textSize,
-    showHeading: _showHeading,
+    showHeading,
+    heading,
     // Already handled elsewhere
     cmsLabel,
     ...simpleFields
@@ -648,7 +587,7 @@ function baseCollectionConverter(context, entry) {
     lookupMediaEntry(context, mobileVisualField),
     visualCustomSize
   );
-  return {
+  const collection = {
     type: "Collection",
     id: sys.id,
     name: cmsLabel,
@@ -656,6 +595,7 @@ function baseCollectionConverter(context, entry) {
     collectionType,
     ...DEFAULT_POSITION_FIELDS,
     ...simpleFields,
+    heading: showHeading ? heading : void 0,
     body: resolveRichTextDocument(context, bodyField),
     additionalCopy: resolveRichTextDocument(context, additionalCopyField),
     icon: lookupAsset(context, iconField),
@@ -664,6 +604,7 @@ function baseCollectionConverter(context, entry) {
     links: linksField?.map((link) => resolveLink(context, link)),
     contents: contentsField?.map((content) => resolveCollectionContent(context, content))
   };
+  return collection;
 }
 
 // src/converters/component.ts
@@ -682,9 +623,8 @@ function baseComponentConverter(context, entry) {
     additionalCopy: additionalCopyField,
     // Field name change
     componentType,
-    // CMS-only fields (must exclude)
-    textSize: _textSize,
-    showHeading: _showHeading,
+    showHeading,
+    heading,
     otherMedia: _otherMedia,
     otherVisuals: _otherVisuals,
     // Already handled elsewhere
@@ -701,7 +641,7 @@ function baseComponentConverter(context, entry) {
     lookupMediaEntry(context, mobileVisualField),
     visualCustomSize
   );
-  return {
+  const component = {
     type: "Component",
     id: sys.id,
     name: cmsLabel,
@@ -709,13 +649,15 @@ function baseComponentConverter(context, entry) {
     componentType,
     ...DEFAULT_POSITION_FIELDS,
     ...simpleFields,
+    heading: showHeading ? heading : void 0,
     body: resolveRichTextDocument(context, bodyField),
     additionalCopy: resolveRichTextDocument(context, additionalCopyField),
     icon: lookupAsset(context, iconField),
     backgroundVisual,
     visual,
-    links: linksField?.map((link) => resolveLink(context, link))
+    links: resolveLinks(context, linksField)
   };
+  return component;
 }
 
 // src/converters/link.ts
@@ -871,7 +813,7 @@ function basePageConverter(context, entry) {
     ...postContent,
     ...bottomContent
   ]);
-  return {
+  const page = {
     type: "Page",
     id: sys.id,
     isHomePage: slug === "index",
@@ -885,6 +827,7 @@ function basePageConverter(context, entry) {
     menu: template?.menu,
     footer: template?.footer
   };
+  return page;
 }
 function calculatePageHref(slug) {
   if (slug === "index") {
@@ -1000,7 +943,7 @@ function baseArticleConverter(context, entry) {
     ...postContent,
     ...bottomContent
   ]);
-  return {
+  const article = {
     type: "Article",
     id: sys.id,
     slug,
@@ -1016,6 +959,7 @@ function baseArticleConverter(context, entry) {
     menu: template?.menu,
     footer: template?.footer
   };
+  return article;
 }
 function calculateArticleTypeHref(slug) {
   return `/${slug}/`;
@@ -1096,12 +1040,11 @@ function createLink(context, entry) {
 }
 function baseNavigationItemConverter(context, entry) {
   const { sys, fields } = entry;
-  const { longText, navigationItems } = fields;
+  const { navigationItems } = fields;
   const link = createLink(context, entry);
   const resolvedNavigationItems = navigationItems?.map((item) => resolveNavigationItem(context, item)).filter((item) => item !== void 0);
   return {
     id: sys.id,
-    longText,
     link,
     entries: resolvedNavigationItems
   };
@@ -1133,70 +1076,6 @@ function baseTagLinkConverter(context, entry) {
   );
 }
 
-// src/utils/errors.ts
-var ContentfulError = class _ContentfulError extends Error {
-  constructor(message, statusCode, details) {
-    super(message);
-    this.statusCode = statusCode;
-    this.details = details;
-    this.name = "ContentfulError";
-    Object.setPrototypeOf(this, _ContentfulError.prototype);
-  }
-};
-var RateLimitError = class _RateLimitError extends ContentfulError {
-  constructor(message, retryAfter, details) {
-    super(message, 429, details);
-    this.retryAfter = retryAfter;
-    this.name = "RateLimitError";
-    Object.setPrototypeOf(this, _RateLimitError.prototype);
-  }
-};
-var EntryNotFoundError = class _EntryNotFoundError extends ContentfulError {
-  constructor(entryId, contentType) {
-    super(`Entry not found: ${entryId}${contentType ? ` (${contentType})` : ""}`, 404);
-    this.entryId = entryId;
-    this.contentType = contentType;
-    this.name = "EntryNotFoundError";
-    Object.setPrototypeOf(this, _EntryNotFoundError.prototype);
-  }
-};
-var AuthenticationError = class _AuthenticationError extends ContentfulError {
-  constructor(message = "Authentication failed") {
-    super(message, 401);
-    this.name = "AuthenticationError";
-    Object.setPrototypeOf(this, _AuthenticationError.prototype);
-  }
-};
-var ValidationError = class _ValidationError extends ContentfulError {
-  constructor(message, validationErrors) {
-    super(message, 400, validationErrors);
-    this.validationErrors = validationErrors;
-    this.name = "ValidationError";
-    Object.setPrototypeOf(this, _ValidationError.prototype);
-  }
-};
-function isContentfulError(error) {
-  return error instanceof ContentfulError;
-}
-function isRateLimitError(error) {
-  return error instanceof RateLimitError;
-}
-function isRetryableError(error) {
-  if (isRateLimitError(error)) {
-    return true;
-  }
-  if (isContentfulError(error)) {
-    return error.statusCode !== void 0 && (error.statusCode >= 500 || error.statusCode === 429);
-  }
-  return false;
-}
-function getRetryAfter(error) {
-  if (isRateLimitError(error)) {
-    return error.retryAfter;
-  }
-  return void 0;
-}
-
 // src/utils/retry.ts
 var DEFAULT_RETRY_CONFIG = {
   maxRetries: 3,
@@ -1296,16 +1175,13 @@ var RateLimiter = class {
   }
 };
 
-// src/utils/index.ts
-init_timing();
-
 // src/api.ts
-function convertAllAssets(response) {
+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(asset);
+      const visual = convertAssetToVisual(context, asset);
       if (visual) {
         visuals.set(visual.id, visual);
       }
@@ -1330,43 +1206,30 @@ function convertAllIncludes(response) {
   return includes;
 }
 async function contentfulPageRest(context, config, slug, options) {
-  const totalTimer = new Timer(`contentfulPageRest(${slug})`);
   const client = getContentfulClient(config, options?.preview);
   const fetchFn = async () => {
-    const apiFetchTimer = new Timer("API fetch");
-    const response = await client.getEntries({
-      content_type: "page",
-      "fields.slug": slug,
-      include: 10,
-      locale: options?.locale,
-      limit: 1
-    });
-    const apiFetchTiming = apiFetchTimer.end();
+    const response = await client.getEntries(
+      {
+        content_type: "page",
+        "fields.slug": slug,
+        include: 10,
+        locale: options?.locale,
+        limit: 1
+      },
+      options
+    );
     const pageEntry = response.items[0];
     if (!pageEntry || !pageEntry.fields) {
-      totalTimer.endAndLog();
       return null;
     }
-    const assetTimer = new Timer("Asset conversion");
-    const assets = convertAllAssets(response);
-    const assetTiming = assetTimer.end();
-    assetTiming.metadata = { count: assets.size };
-    const includesTimer = new Timer("Includes indexing");
+    const assets = convertAllAssets(response, context);
     const includes = convertAllIncludes(response);
-    const includesTiming = includesTimer.end();
-    includesTiming.metadata = { count: includes.size };
     const fullContext = {
       ...context,
       includes,
       assets
     };
-    const conversionTimer = new Timer("Page conversion");
     const converted = fullContext.pageResolver(fullContext, pageEntry);
-    const conversionTiming = conversionTimer.end();
-    const totalTiming = totalTimer.end();
-    totalTiming.children = [apiFetchTiming, assetTiming, includesTiming, conversionTiming];
-    const { logTimingResult: logTimingResult2 } = await Promise.resolve().then(() => (init_timing(), timing_exports));
-    logTimingResult2(totalTiming);
     return converted;
   };
   if (options?.retry) {
@@ -1378,43 +1241,49 @@ 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
-  );
+  linkResolver.set("pageVariant", basePageVariantLinkConverter);
   linkResolver.set("link", baseLinkConverter);
+  const contentResolver = /* @__PURE__ */ new Map();
+  contentResolver.set("collection", baseCollectionConverter);
+  contentResolver.set("component", baseComponentConverter);
+  contentResolver.set(
+    "externalComponent",
+    baseComponentConverter
+  );
   return {
     pageResolver: basePageConverter,
     navigationItemResolver: baseNavigationItemConverter,
     articleResolver: baseArticleConverter,
     componentResolver: baseComponentConverter,
     collectionResolver: baseCollectionConverter,
-    linkResolver
+    linkResolver,
+    contentResolver,
+    videoPrefix: ""
   };
 }
 async function contentfulArticleRest(context, config, slug, articleTypeSlug, options) {
   const client = getContentfulClient(config, options?.preview);
   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
-    });
+    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
+      },
+      options
+    );
     const articleEntry = response.items[0];
     if (!articleEntry || !articleEntry.fields) {
       return null;
     }
-    const assets = convertAllAssets(response);
+    const assets = convertAllAssets(response, context);
     const includes = convertAllIncludes(response);
     const fullContext = {
       ...context,
@@ -1430,6 +1299,6 @@ async function contentfulArticleRest(context, config, slug, articleTypeSlug, opt
   return await fetchFn();
 }
 
-export { AuthenticationError, ContentfulError, EntryNotFoundError, RateLimitError, RateLimiter, Timer, ValidationError, basePageConverter, calculateBackoffDelay, contentfulArticleRest, contentfulPageRest, createBaseConverterContext, createContentfulClient, createContentfulPreviewClient, createTimer, getContentfulClient, getRetryAfter, isContentfulError, isRateLimitError, isRetryableError, logTimingResult, withRetry };
+export { AuthenticationError, ContentfulError, EntryNotFoundError, RateLimitError, RateLimiter, ValidationError, basePageConverter, calculateBackoffDelay, contentfulArticleRest, contentfulPageRest, createBaseConverterContext, createContentfulClient, createContentfulPreviewClient, createResponsiveVisual, getContentfulClient, getRetryAfter, isContentfulError, isRateLimitError, isRetryableError, lookupAsset, resolveLink, resolveLinks, resolveRichTextDocument, withRetry };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map