@ampless/runtime 1.0.0-beta.70 → 1.0.0-beta.72

package/dist/index.d.ts

@@ -403,9 +403,13 @@ interface PluginHeadApi {
     /**
      * Resolve the per-plugin `PluginPublicRenderContext` snapshot used by
      * `contentFields` renderers. Same `settings()` binding the public
-     * surfaces (`publicHead` / `publicBodyEnd`) use. Async because it
-     * reads the S3 site-settings cache once per request via
-     * `pluginSettings.loadAll()`.
+     * surfaces (`publicHead` / `publicBodyEnd`) use. Async because it reads
+     * the S3 site-settings cache once per request — both plugin settings
+     * (`pluginSettings.loadAll()`) AND, when `siteSettings` was passed to
+     * `createPluginHead`, the effective `site` block
+     * (`siteSettings.loadSiteSettings()`, admin overrides included; falls
+     * back to `cmsConfig.site` on fetch failure or when `siteSettings` was
+     * not supplied).
      */
     contextForPlugins(): Promise<(plugin: AmplessPlugin) => PluginPublicRenderContext>;
     /**
@@ -453,7 +457,7 @@ interface PublicHtmlForPostResult {
  *   U+2029   → '\u2029'
  */
 declare function escapeJsonLdInlineBody(value: string): string;
-declare function createPluginHead(cmsConfig: Config, pluginSettings: PluginSettingsApi): PluginHeadApi;
+declare function createPluginHead(cmsConfig: Config, pluginSettings: PluginSettingsApi, siteSettings?: SiteSettingsApi): PluginHeadApi;
 
 interface ThemesRegistry {
     /** Map of theme name → loaded theme module. */

package/dist/index.js

@@ -1336,6 +1336,25 @@ function makeCtx(plugin, site, snapshot) {
     }
   };
 }
+async function resolveEffectiveSite(cmsConfig, siteSettings) {
+  if (!siteSettings) return cmsConfig.site;
+  try {
+    const { site } = await siteSettings.loadSiteSettings();
+    return site;
+  } catch (err) {
+    warn(
+      `effective site settings fetch failed \u2014 falling back to cms.config.ts site block: ${err instanceof Error ? err.message : String(err)}`
+    );
+    return cmsConfig.site;
+  }
+}
+async function resolveRenderContext(cmsConfig, pluginSettings, siteSettings) {
+  const [snapshot, site] = await Promise.all([
+    pluginSettings.loadAll(),
+    resolveEffectiveSite(cmsConfig, siteSettings)
+  ]);
+  return { snapshot, site };
+}
 function collectFor(plugins, site, snapshot, surface, renderOne) {
   const entries = [];
   for (const plugin of plugins) {
@@ -1532,7 +1551,7 @@ async function isPublicRequest() {
   if (h.get(PREVIEW_THEME_HEADER) || h.get(PREVIEW_COLOR_SCHEME_HEADER)) return false;
   return true;
 }
-function createPluginHead(cmsConfig, pluginSettings) {
+function createPluginHead(cmsConfig, pluginSettings, siteSettings) {
   const plugins = (cmsConfig.plugins ?? []).filter(isPlugin2);
   const validPlugins = [];
   const seenNamespaces = /* @__PURE__ */ new Set();
@@ -1638,10 +1657,10 @@ function createPluginHead(cmsConfig, pluginSettings) {
   return {
     async renderHead() {
       if (!await isPublicRequest()) return null;
-      const snapshot = await pluginSettings.loadAll();
+      const { snapshot, site } = await resolveRenderContext(cmsConfig, pluginSettings, siteSettings);
       return collectFor(
         validPlugins,
-        cmsConfig.site,
+        site,
         snapshot,
         (p) => p.publicHead,
         renderHeadDescriptor
@@ -1649,38 +1668,38 @@ function createPluginHead(cmsConfig, pluginSettings) {
     },
     async renderBodyEnd() {
       if (!await isPublicRequest()) return null;
-      const snapshot = await pluginSettings.loadAll();
+      const { snapshot, site } = await resolveRenderContext(cmsConfig, pluginSettings, siteSettings);
       return collectFor(
         validPlugins,
-        cmsConfig.site,
+        site,
         snapshot,
         (p) => p.publicBodyEnd,
         renderBodyDescriptor
       );
     },
     async renderBodyForPost(post) {
-      const snapshot = await pluginSettings.loadAll();
-      return collectForPost(validPlugins, cmsConfig.site, snapshot, post);
+      const { snapshot, site } = await resolveRenderContext(cmsConfig, pluginSettings, siteSettings);
+      return collectForPost(validPlugins, site, snapshot, post);
     },
     async renderHtmlForPost(post) {
-      const snapshot = await pluginSettings.loadAll();
-      return collectHtmlForPost(validPlugins, cmsConfig.site, snapshot, post);
+      const { snapshot, site } = await resolveRenderContext(cmsConfig, pluginSettings, siteSettings);
+      return collectHtmlForPost(validPlugins, site, snapshot, post);
     },
     async renderPostScriptsForPage(posts) {
-      const snapshot = await pluginSettings.loadAll();
-      return collectPostScriptsForPage(validPlugins, cmsConfig.site, snapshot, posts);
+      const { snapshot, site } = await resolveRenderContext(cmsConfig, pluginSettings, siteSettings);
+      return collectPostScriptsForPage(validPlugins, site, snapshot, posts);
     },
     contentFieldsRegistry,
     markdownAdapters,
     async contextForPlugins() {
-      const snapshot = await pluginSettings.loadAll();
-      return (plugin) => makeCtx(plugin, cmsConfig.site, snapshot);
+      const { snapshot, site } = await resolveRenderContext(cmsConfig, pluginSettings, siteSettings);
+      return (plugin) => makeCtx(plugin, site, snapshot);
     },
     async renderHeadForPreview() {
-      const snapshot = await pluginSettings.loadAll();
+      const { snapshot, site } = await resolveRenderContext(cmsConfig, pluginSettings, siteSettings);
       return collectFor(
         validPlugins,
-        cmsConfig.site,
+        site,
         snapshot,
         (p) => p.publicHead,
         renderHeadDescriptor
@@ -1910,7 +1929,7 @@ function createAmpless(opts) {
   const settings = createSiteSettings(cmsConfig, storage);
   const seo = createSeo(cmsConfig, settings);
   const pluginSettings = createPluginSettings(storage);
-  const pluginHead = createPluginHead(cmsConfig, pluginSettings);
+  const pluginHead = createPluginHead(cmsConfig, pluginSettings, settings);
   const themeActive = createThemeActive(themes, storage);
   const themeConfig = createThemeConfig(themeActive, storage);
   return {

package/dist/routes/index.js

@@ -207,6 +207,7 @@ function createMarkdownRouteHandler(ampless) {
 }
 
 // src/routes/llms.ts
+import { collectBounded } from "ampless";
 var DEFAULT_LIMIT = 100;
 var MIN_LIMIT = 1;
 var MAX_LIMIT = 1e3;
@@ -241,36 +242,10 @@ function fixedEncodeURIComponent(s) {
   );
 }
 async function collectPosts(ampless, limit) {
-  const items = [];
-  const seenTokens = /* @__PURE__ */ new Set();
-  let token;
-  let truncated = null;
-  for (let page = 0; page < MAX_PAGES; page++) {
-    const remaining = limit + 1 - items.length;
-    const pageLimit = Math.min(PAGE_SIZE_CAP, remaining);
-    const res = await ampless.listPublishedPosts({ limit: pageLimit, nextToken: token });
-    items.push(...res.items);
-    if (items.length > limit) {
-      truncated = "limit";
-      break;
-    }
-    if (!res.nextToken) {
-      break;
-    }
-    if (seenTokens.has(res.nextToken)) {
-      truncated = "early";
-      break;
-    }
-    seenTokens.add(res.nextToken);
-    token = res.nextToken;
-    if (page === MAX_PAGES - 1) {
-      truncated = "early";
-    }
-  }
-  return {
-    items: truncated === "limit" ? items.slice(0, limit) : items,
-    truncated
-  };
+  return collectBounded(
+    (args) => ampless.listPublishedPosts({ limit: args.limit, nextToken: args.nextToken }),
+    { limit, pageSizeCap: PAGE_SIZE_CAP, maxPages: MAX_PAGES }
+  );
 }
 function truncationNote(truncated, limit) {
   if (truncated === "limit") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ampless/runtime",
-  "version": "1.0.0-beta.70",
+  "version": "1.0.0-beta.72",
   "description": "Public-side runtime for ampless: post fetching, theme dispatch, middleware, public route handlers",
   "license": "MIT",
   "type": "module",
@@ -51,8 +51,8 @@
     "marked": "^18.0.4",
     "sanitize-html": "^2.17.4",
     "tailwind-merge": "^3.6.0",
-    "@ampless/plugin-og-image": "0.2.0-beta.57",
-    "ampless": "1.0.0-beta.57"
+    "@ampless/plugin-og-image": "0.2.0-beta.59",
+    "ampless": "1.0.0-beta.59"
   },
   "peerDependencies": {
     "@aws-amplify/adapter-nextjs": "^1",