@ampless/runtime 1.0.0-alpha.19 → 1.0.0-alpha.20

package/dist/index.d.ts

@@ -108,6 +108,18 @@ interface ResolvedTheme {
 }
 interface ThemeActiveApi {
     resolveActiveTheme(): Promise<ResolvedTheme>;
+    /**
+     * Read the stored `theme.active` value directly from the S3 cache
+     * with `cache: 'no-store'` — bypassing Next.js's fetch cache and
+     * any tag-based revalidation. Returns the raw stored name (which
+     * may be a theme that isn't in the registry) or `null` when the
+     * S3 file is missing / unreadable.
+     *
+     * Used by the admin theme-switch flow to poll until the trusted
+     * processor has propagated a KvStore write to S3, so the post-
+     * switch hard reload doesn't race the cache rebuild.
+     */
+    readStoredActiveThemeFresh(): Promise<string | null>;
 }
 
 type ColorScheme = 'auto' | 'light' | 'dark';
@@ -213,6 +225,13 @@ interface Ampless {
     listPostsByTag(tag: string, opts?: ListPostsByTagOptions): Promise<ListPostsResult>;
     loadSiteSettings(): Promise<EffectiveSiteSettings>;
     resolveActiveTheme(): Promise<ResolvedTheme>;
+    /**
+     * Fresh-read of the stored `theme.active` value from S3, bypassing
+     * the Next.js fetch cache. Returns the raw stored name (no fallback
+     * to defaultTheme) or `null` when the cache file is missing. Used
+     * by the admin to poll for processor propagation after a switch.
+     */
+    readStoredActiveThemeFresh(): Promise<string | null>;
     loadThemeConfig(): Promise<EffectiveThemeConfig>;
     postMetadata(post: Post): Promise<Metadata>;
     siteMetadata(): Promise<Metadata>;

package/dist/index.js

@@ -178,14 +178,17 @@ function createSeo(cmsConfig, settingsApi) {
 // src/theme-active.ts
 import { headers } from "next/headers";
 function createThemeActive(registry, storage) {
-  async function fetchActiveFromCache() {
+  function settingsUrl() {
     if (!storage.isStorageConfigured()) return null;
-    let url;
     try {
-      url = storage.publicAssetUrl("public/site-settings.json");
+      return storage.publicAssetUrl("public/site-settings.json");
     } catch {
       return null;
     }
+  }
+  async function fetchActiveFromCache() {
+    const url = settingsUrl();
+    if (!url) return null;
     const res = await fetch(url, {
       next: { revalidate: 60, tags: ["site-settings"] }
     });
@@ -194,7 +197,17 @@ function createThemeActive(registry, storage) {
     const v = flat["theme.active"];
     return typeof v === "string" ? v : null;
   }
+  async function fetchActiveFresh() {
+    const url = settingsUrl();
+    if (!url) return null;
+    const res = await fetch(url, { cache: "no-store" });
+    if (!res.ok) return null;
+    const flat = await res.json();
+    const v = flat["theme.active"];
+    return typeof v === "string" ? v : null;
+  }
   return {
+    readStoredActiveThemeFresh: () => fetchActiveFresh(),
     async resolveActiveTheme() {
       let previewOverride = null;
       try {
@@ -601,6 +614,7 @@ function createAmpless(opts) {
     listPostsByTag: (tag, o) => posts.listPostsByTag(tag, o),
     loadSiteSettings: () => settings.loadSiteSettings(),
     resolveActiveTheme: () => themeActive.resolveActiveTheme(),
+    readStoredActiveThemeFresh: () => themeActive.readStoredActiveThemeFresh(),
     loadThemeConfig: () => themeConfig.loadThemeConfig(),
     postMetadata: (post) => seo.postMetadata(post),
     siteMetadata: () => seo.siteMetadata(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ampless/runtime",
-  "version": "1.0.0-alpha.19",
+  "version": "1.0.0-alpha.20",
   "description": "Public-side runtime for ampless: post fetching, theme dispatch, middleware, public route handlers",
   "license": "MIT",
   "type": "module",