@inneropen/marvin-astro 1.1.0 → 1.2.0

package/dist/index.js

@@ -9,6 +9,7 @@ var ENV_KEYS = {
   debug: "MARVIN_DEBUG"
 };
 var DEFAULT_DEV_RETRY_MS = 3e4;
+var DEFAULT_HYDRATE_CONCURRENCY = 6;
 function metaEnv() {
   try {
     return import.meta.env;
@@ -47,6 +48,7 @@ function resolveConfig(options = {}) {
     workspaceSlug,
     debug,
     retryAfterMs: options.retryAfterMs ?? (isProduction(env) ? Number.POSITIVE_INFINITY : DEFAULT_DEV_RETRY_MS),
+    hydrateConcurrency: Math.max(1, Math.floor(options.hydrateConcurrency ?? DEFAULT_HYDRATE_CONCURRENCY)),
     logger: options.logger ?? console,
     markdown: options.markdown,
     now: options.now ?? (() => Date.now()),
@@ -402,6 +404,24 @@ function createChromeLoader(fetcher, siteLoader, options = {}) {
 }
 
 // src/fetch.ts
+var HYDRATE_ATTEMPTS = 3;
+var HYDRATE_BACKOFF_MS = 500;
+function sleep(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+async function mapWithConcurrency(items, limit, run) {
+  const results = new Array(items.length);
+  let next = 0;
+  async function worker() {
+    while (next < items.length) {
+      const index = next++;
+      results[index] = await run(items[index]);
+    }
+  }
+  const workers = Array.from({ length: Math.min(limit, items.length) }, worker);
+  await Promise.all(workers);
+  return results;
+}
 function createFetcher(backend) {
   async function guarded(label, empty, run) {
     if (!backend.hasBackend()) return empty;
@@ -416,14 +436,36 @@ function createFetcher(backend) {
   async function entry(slug) {
     return guarded(`Entry "${slug}"`, null, () => backend.client().entry(slug));
   }
+  async function entryForHydration(slug) {
+    if (!backend.hasBackend()) return null;
+    let failure;
+    for (let attempt = 1; attempt <= HYDRATE_ATTEMPTS; attempt++) {
+      if (attempt > 1) {
+        await sleep(HYDRATE_BACKOFF_MS * 2 ** (attempt - 2));
+        if (backend.isLatched()) backend.clearLatch();
+      }
+      try {
+        return await backend.client().entry(slug);
+      } catch (error) {
+        failure = error;
+      }
+    }
+    backend.remember(failure);
+    backend.warn(
+      `Entry "${slug}" dropped after ${HYDRATE_ATTEMPTS} attempts: ${errorMessage(failure)}`
+    );
+    return null;
+  }
   async function hydrate(entries) {
-    const hydrated = await Promise.all(
-      entries.map(async (item) => {
+    const hydrated = await mapWithConcurrency(
+      entries,
+      backend.config.hydrateConcurrency,
+      async (item) => {
         if (typeof item.field === "function" || "data" in item || "dataJson" in item) {
           return item;
         }
-        return entry(item.slug ?? "");
-      })
+        return entryForHydration(item.slug ?? "");
+      }
     );
     return hydrated.filter((item) => Boolean(item));
   }
@@ -485,13 +527,79 @@ function createFetcher(backend) {
 
 // src/markdown.ts
 import { Marked } from "marked";
+
+// src/embeds.ts
+var EMBED_MODES = /* @__PURE__ */ new Set(["direct", "click_to_load"]);
+function readEmbedsField(entry) {
+  if (!entry || typeof entry !== "object") return void 0;
+  const direct = entry.embeds;
+  if (direct !== void 0) return direct;
+  const toJSON = entry.toJSON;
+  if (typeof toJSON === "function") {
+    return asRecord(toJSON.call(entry)).embeds;
+  }
+  return void 0;
+}
+function entryEmbeds(entry) {
+  const raw = readEmbedsField(entry);
+  if (!raw || typeof raw !== "object" || Array.isArray(raw)) return void 0;
+  const embeds = {};
+  for (const [key, value] of Object.entries(raw)) {
+    if (value && typeof value === "object" && !Array.isArray(value)) {
+      embeds[key] = value;
+    }
+  }
+  return Object.keys(embeds).length > 0 ? embeds : void 0;
+}
+function findEmbed(embeds, url) {
+  if (!embeds || !url) return void 0;
+  const key = url.trim();
+  if (!key) return void 0;
+  return Object.prototype.hasOwnProperty.call(embeds, key) ? embeds[key] : void 0;
+}
+function siteEmbeds(raw) {
+  if (!raw || typeof raw !== "object") return void 0;
+  const value = asRecord(raw);
+  const mode = asString(value.mode);
+  const frameSources = Array.isArray(value.frameSources) ? value.frameSources.filter(
+    (source) => typeof source === "string" && source.trim().length > 0
+  ) : [];
+  return {
+    // Unknown or missing mode → the privacy-preserving default.
+    mode: mode && EMBED_MODES.has(mode) ? mode : "click_to_load",
+    consentText: asString(value.consentText) ?? "",
+    frameSources
+  };
+}
+
+// src/markdown.ts
+var EMBEDS = /* @__PURE__ */ Symbol("marvin.embeds");
+var BARE_URL = /^https?:\/\/\S+$/i;
+function paragraphEmbedHtml(token, embeds) {
+  if (!embeds) return void 0;
+  const text = token.text.trim();
+  if (!BARE_URL.test(text)) return void 0;
+  const html = findEmbed(embeds, text)?.html;
+  return typeof html === "string" && html.trim() ? html : void 0;
+}
 function createMarkdownRenderer(options = {}) {
   const marked = new Marked();
   marked.setOptions({ gfm: true, breaks: false, ...options });
-  return async (markdown) => {
+  marked.use({
+    renderer: {
+      paragraph(token) {
+        const embeds = this.options[EMBEDS];
+        const html = paragraphEmbedHtml(token, embeds);
+        return html === void 0 ? false : `${html}
+`;
+      }
+    }
+  });
+  return async (markdown, renderOptions = {}) => {
     const source = Array.isArray(markdown) ? markdown.join("\n\n") : markdown ?? "";
     if (!source) return "";
-    return await marked.parse(source);
+    const parseOptions = { [EMBEDS]: renderOptions.embeds ?? null };
+    return await marked.parse(source, parseOptions);
   };
 }
 function preserveSoftBreaks(source) {
@@ -543,6 +651,7 @@ function selectValuesForPage(items, pageSlug, count = 4) {
 var DEFAULT_IMAGE_ROLES = ["hero", "featured", "card"];
 function createFieldAccessor(entry, context) {
   const title = asString(entry.title);
+  const embeds = entryEmbeds(entry);
   const accessor = {
     /** The entry itself, for anything the accessor doesn't cover. */
     entry,
@@ -605,7 +714,17 @@ function createFieldAccessor(entry, context) {
       const raw = field(entry, key) ?? entry.contentMarkdown;
       const source = Array.isArray(raw) ? raw.join("\n\n") : asString(raw);
       if (!source) return void 0;
-      return context.renderMarkdown(options.softBreaks ? preserveSoftBreaks(source) : source);
+      return context.renderMarkdown(options.softBreaks ? preserveSoftBreaks(source) : source, {
+        embeds: options.embeds === false ? void 0 : embeds
+      });
+    },
+    /**
+     * The resolved embed for an `embed` field (its value is the provider URL), or `undefined`
+     * when the field is empty or the server hasn't resolved it. Render it with `<Embed>` from
+     * `@inneropen/marvin-astro/components`, or output `embed.html`.
+     */
+    embed(key) {
+      return findEmbed(embeds, asString(field(entry, key)));
     },
     /**
      * The entry's primary image. Checks, in order: a hand-authored `metadata_json.featuredImage`,
@@ -769,7 +888,14 @@ function createRepository(context, options) {
     }
     return useFallback();
   }
+  function findInList(items, slug) {
+    return items.find((item) => slugOf(item) === slug);
+  }
   async function loadBySlug(slug) {
+    if (allPromise) {
+      const listed = findInList(await allPromise, slug);
+      if (listed) return listed;
+    }
     if (fetcher.backend.hasBackend()) {
       try {
         const entry = await fetcher.entry(slug);
@@ -779,7 +905,7 @@ function createRepository(context, options) {
         fetcher.backend.warn(`Entry "${slug}" failed, using fallback: ${errorMessage(error)}`);
       }
     }
-    return (await all()).find((item) => slugOf(item) === slug);
+    return findInList(await all(), slug);
   }
   function all() {
     allPromise ??= load();
@@ -816,7 +942,7 @@ async function loadSectionLanding(fetcher, slug, renderMarkdown = createMarkdown
   const source = asString(entryField(entry, options.bodyField ?? "body")) ?? asString(entry.summary);
   return {
     title: asString(entry.title),
-    introHtml: source ? await renderMarkdown(preserveSoftBreaks(source)) : void 0,
+    introHtml: source ? await renderMarkdown(preserveSoftBreaks(source), { embeds: entryEmbeds(entry) }) : void 0,
     hero: assetUrl(selectAssetByRole(entry, options.heroRole ?? "hero"))
   };
 }
@@ -903,6 +1029,10 @@ function transformMarvinSite(marvinSite, fallback) {
       canonicalUrl: asString(config.canonicalUrl),
       siteName: title
     }),
+    // Older servers and SDKs don't send it; `siteEmbeds` returns undefined then.
+    embeds: siteEmbeds(
+      config.embeds ?? marvinSite.embeds
+    ),
     metadata
   };
 }
@@ -1009,6 +1139,7 @@ function createMarvinContent(options = {}) {
 }
 export {
   DEFAULT_DEV_RETRY_MS,
+  DEFAULT_HYDRATE_CONCURRENCY,
   ENV_KEYS,
   asNumber,
   asRecord,
@@ -1033,11 +1164,13 @@ export {
   describeConfig,
   entryAssets,
   entryData,
+  entryEmbeds,
   entryField,
   entryMetadata,
   entryResources,
   errorMessage,
   field,
+  findEmbed,
   focalPoint,
   formatDisplayDate,
   isExternalHref,
@@ -1055,6 +1188,7 @@ export {
   selectIconAsset,
   selectImageAsset,
   selectValuesForPage,
+  siteEmbeds,
   socialLinkFromKey,
   toNavigationLink
 };