@akinon/pz-theme 2.0.79-beta.1 → 2.0.79-rc.0

package/CHANGELOG.md

@@ -1,20 +1,38 @@
 # @akinon/pz-theme
 
-## 2.0.79-beta.1
-
-### Patch Changes
-
-- Updated dependencies [cbbbfd757]
-  - @akinon/next@2.0.79-beta.1
-  - @akinon/theme-contract@2.0.79-beta.1
-
-## 2.0.79-beta.0
-
-### Patch Changes
-
-- Updated dependencies [cbbbfd757]
-  - @akinon/next@2.0.79-beta.0
-  - @akinon/theme-contract@2.0.79-beta.0
+## 2.0.79-rc.0
+
+### Patch Changes
+
+- Updated dependencies [86187b1c]
+- Updated dependencies [0cf9ea239]
+- Updated dependencies [324f97d55]
+- Updated dependencies [51ea06888]
+- Updated dependencies
+- Updated dependencies [2fea4143]
+- Updated dependencies [b55acb768]
+- Updated dependencies [760258c1c]
+- Updated dependencies [143be2b9d]
+- Updated dependencies [7889b08fe]
+- Updated dependencies [9f8cd3bc5]
+- Updated dependencies [bfafa3f49]
+- Updated dependencies [57d7eb305]
+- Updated dependencies [d99a6a7d5]
+- Updated dependencies [9db81a714]
+- Updated dependencies [591e345e1]
+- Updated dependencies [4de5303c5]
+- Updated dependencies [95b139dc1]
+- Updated dependencies [1d00f2d06]
+- Updated dependencies [4ac7b2a1e]
+- Updated dependencies [e9598c71]
+- Updated dependencies [4998a9631]
+- Updated dependencies [804d2bd6c]
+- Updated dependencies [3909d3224]
+- Updated dependencies [6a3d8a631]
+- Updated dependencies [e18836b20]
+- Updated dependencies [b1111d7b]
+  - @akinon/next@2.0.79-rc.0
+  - @akinon/theme-contract@2.0.79-rc.0
 
 ## 2.0.78
 

package/package.json

@@ -1,26 +1,26 @@
 {
   "name": "@akinon/pz-theme",
   "description": "Theme package for Project Zero Next — ThemePlaceholder system and theme editor infrastructure",
-  "version": "2.0.79-beta.1",
+  "version": "2.0.79-rc.0",
   "license": "MIT",
   "main": "src/index.ts",
   "scripts": {
     "test": "jest"
   },
   "peerDependencies": {
-    "@akinon/next": "2.0.79-beta.1",
+    "@akinon/next": "2.0.79-rc.0",
     "react": "^18.0.0 || ^19.0.0",
     "react-dom": "^18.0.0 || ^19.0.0"
   },
   "dependencies": {
-    "@akinon/theme-contract": "2.0.79-beta.1",
+    "@akinon/theme-contract": "2.0.79-rc.0",
     "clsx": "2.1.1",
     "lottie-web": "^5.13.0",
     "tailwind-merge": "^2.5.4",
     "zod": "4.4.1"
   },
   "devDependencies": {
-    "@akinon/next": "2.0.79-beta.1",
+    "@akinon/next": "2.0.79-rc.0",
     "@testing-library/jest-dom": "5.16.4",
     "@testing-library/react": "16.3.2",
     "@testing-library/user-event": "14.1.1",

package/src/chrome/__tests__/composition-source.test.ts

@@ -27,17 +27,12 @@ jest.mock('react', () => {
 const getWidgetData = jest.fn();
 const getWidgetSchemaData = jest.fn();
 const getCollectionWidgetData = jest.fn();
-// Named preview snapshot reader (draft mode only). Resolves null by default:
-// "not a preview", the live path.
-const getPreviewSnapshot = jest.fn(async () => null as unknown);
 
 jest.mock('@akinon/next/data/server', () => ({
   getWidgetData: (...args: unknown[]) => getWidgetData(...args),
   getWidgetSchemaData: (...args: unknown[]) => getWidgetSchemaData(...args),
   getCollectionWidgetData: (...args: unknown[]) =>
-    getCollectionWidgetData(...args),
-  getPreviewSnapshot: (...args: unknown[]) =>
-    (getPreviewSnapshot as (...a: unknown[]) => unknown)(...args)
+    getCollectionWidgetData(...args)
 }));
 
 jest.mock(
@@ -128,76 +123,3 @@ describe('shared placeholder widget fetch', () => {
     expect(attempts).toBe(3);
   });
 });
-
-describe('named preview snapshots', () => {
-  beforeEach(() => {
-    getWidgetData.mockReset();
-    getWidgetSchemaData.mockReset();
-    getCollectionWidgetData.mockReset();
-    getPreviewSnapshot.mockReset();
-    getPreviewSnapshot.mockResolvedValue(null);
-  });
-
-  const blob = {
-    version: 1,
-    themeSettings: { mainMenuSticky: true },
-    dataSources: [],
-    sections: [
-      {
-        id: 'sec-preview',
-        type: 'custom',
-        label: 'Preview hero',
-        properties: {},
-        styles: {},
-        blocks: [],
-        order: 0
-      }
-    ]
-  };
-
-  it('composes the slot and loads the sections from the blob, never the live widget', async () => {
-    getPreviewSnapshot.mockResolvedValue(blob);
-    getWidgetData.mockResolvedValue(placeholderPayload('preview-slot-a'));
-
-    const state = await getSlugCompositionState('preview-slot-a');
-    const loaded = await loadPlaceholderSections('preview-slot-a');
-
-    expect(state).toEqual({ kind: 'composed', sectionCount: 1 });
-    expect(loaded?.sections.map((s) => s.id)).toEqual(['sec-preview']);
-    expect(loaded?.placeholderId).toBe('preview-slot-a');
-    expect(loaded?.themeSettings).toEqual({ mainMenuSticky: true });
-    // The blob owns the render: no per-section or theme-config reads.
-    expect(getWidgetData).not.toHaveBeenCalled();
-    expect(getWidgetSchemaData).not.toHaveBeenCalled();
-  });
-
-  it('an empty blob withdraws the slot even when live is composed', async () => {
-    getPreviewSnapshot.mockResolvedValue({ ...blob, sections: [] });
-    getWidgetData.mockResolvedValue(placeholderPayload('preview-slot-b'));
-
-    expect(await getSlugCompositionState('preview-slot-b')).toEqual({
-      kind: 'empty'
-    });
-    expect((await loadPlaceholderSections('preview-slot-b'))?.sections).toEqual(
-      []
-    );
-  });
-
-  it('falls through to the live path without a blob or when the reader throws', async () => {
-    getPreviewSnapshot.mockRejectedValue(new Error('backend down'));
-    getWidgetData.mockResolvedValue(placeholderPayload('preview-slot-c'));
-    getWidgetSchemaData.mockResolvedValue({
-      schema: { 'sec-a': { metadata: { blocks: [] } } }
-    });
-
-    expect(await getSlugCompositionState('preview-slot-c')).toEqual({
-      kind: 'composed',
-      sectionCount: 1
-    });
-    expect(
-      (await loadPlaceholderSections('preview-slot-c'))?.sections.map(
-        (s) => s.id
-      )
-    ).toEqual(['sec-a']);
-  });
-});

package/src/chrome/__tests__/sticky-slot.test.tsx

@@ -27,14 +27,6 @@ jest.mock('../theme-config-source', () => ({
   getThemeConfig: () => themeConfig()
 }));
 
-// A named preview's snapshot owns the theme settings; null = not a preview.
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-const previewSnapshot = jest.fn<any, [string]>(() => null);
-
-jest.mock('../preview-snapshot-source', () => ({
-  getPlaceholderPreviewSnapshot: (slug: string) => previewSnapshot(slug)
-}));
-
 // The placeholder is an async server component that reaches for the data
 // layer; what the slot decides about itself is what is under test.
 jest.mock('../../theme-placeholder', () => ({
@@ -229,35 +221,3 @@ describe('ChromeSlot sticky', () => {
     expect(themeConfig).not.toHaveBeenCalled();
   });
 });
-
-describe('ChromeSlot sticky in a named preview', () => {
-  afterEach(() => {
-    cleanup();
-    previewSnapshot.mockReset();
-    previewSnapshot.mockReturnValue(null);
-  });
-
-  it('follows the preview snapshot, not the live theme-config', async () => {
-    compositionState.mockResolvedValue(composed);
-    themeConfig.mockResolvedValue({ settings: { mainMenuSticky: false } });
-    previewSnapshot.mockResolvedValue({
-      version: 1,
-      sections: [{ id: 'sec' }],
-      themeSettings: { mainMenuSticky: true }
-    });
-
-    await renderSlot({ slug: 'header', fallback: <div>brand</div> });
-
-    expect(slotElement('header').dataset.sticky).toBe('true');
-  });
-
-  it('falls back to the live theme-config when the preview has no blob', async () => {
-    compositionState.mockResolvedValue(composed);
-    themeConfig.mockResolvedValue({ settings: { mainMenuSticky: true } });
-    previewSnapshot.mockResolvedValue(null);
-
-    await renderSlot({ slug: 'header', fallback: <div>brand</div> });
-
-    expect(slotElement('header').dataset.sticky).toBe('true');
-  });
-});

package/src/chrome/chrome-slot.tsx

@@ -2,7 +2,6 @@ import React from 'react';
 import ThemePlaceholder from '../theme-placeholder';
 import { warnAboutUncomposedSlot } from './composition-state';
 import { getSlugCompositionState } from './composition-source';
-import { getPlaceholderPreviewSnapshot } from './preview-snapshot-source';
 import { getThemeConfig } from './theme-config-source';
 import { ChromeFallback } from './chrome-fallback';
 import { ChromeScrollState } from './scroll-state';
@@ -80,16 +79,9 @@ export default async function ChromeSlot({
   warnAboutUncomposedSlot(slug, state);
 
   // Only read when the mounting code said nothing, and memoized per request, so
-  // a page full of slots costs at most one theme-config read. In a named
-  // preview the snapshot blob owns the theme settings (theme-config is never
-  // preview-transformed), so the pin must follow the blob the placeholder
-  // renders from — otherwise "sticky header" toggled in the preview would
-  // only show once published.
+  // a page full of slots costs at most one theme-config read.
   const themeSettings =
-    sticky === undefined
-      ? (await getPlaceholderPreviewSnapshot(slug))?.themeSettings ??
-        (await getThemeConfig()).settings
-      : null;
+    sticky === undefined ? (await getThemeConfig()).settings : null;
   const pinned = resolveSlotSticky({
     slug,
     sticky,

package/src/chrome/composition-source.ts

@@ -1,7 +1,6 @@
 import * as React from 'react';
 
 import { CompositionState, readCompositionState } from './composition-state';
-import { getPlaceholderPreviewSnapshot } from './preview-snapshot-source';
 import { getWidgetDataWithRetry } from './retrying-widget-data';
 
 // `React.cache` exists on the RSC-capable React this package renders under;
@@ -50,16 +49,6 @@ export const getPlaceholderWidget = cache
  */
 const load = async (slug: string): Promise<CompositionState> => {
   try {
-    // A named preview (draft mode) composes from its snapshot, not from the
-    // live placeholder: a slug composed only in the preview must still take
-    // the slot over there, and one emptied in the preview must give it back.
-    const preview = await getPlaceholderPreviewSnapshot(slug);
-    if (preview) {
-      return preview.sections.length > 0
-        ? { kind: 'composed', sectionCount: preview.sections.length }
-        : { kind: 'empty' };
-    }
-
     const data = await getPlaceholderWidget(slug);
 
     return readCompositionState(data);

package/src/load-placeholder-sections.ts

@@ -8,10 +8,6 @@ import { Section } from './theme-section';
 import { devWarn } from './utils/dev-warn';
 import { validateThemeSectionsInDev } from './schemas/theme-schema';
 import { getPlaceholderWidget } from './chrome/composition-source';
-import {
-  getPlaceholderPreviewSnapshot,
-  PreviewSnapshot
-} from './chrome/preview-snapshot-source';
 import { getThemeConfig, ThemeConfig } from './chrome/theme-config-source';
 
 const { getWidgetData } = serverData;
@@ -62,135 +58,6 @@ const getWidgetSchemaData = async <T,>(args: {
   return directFetch<T>(`/widgets/${args.widgetSlug}/schema/`);
 };
 
-/**
- * Resolves a section's data source reference into the object the renderer
- * expects, fetching collection data for collection-backed sources. Shared by
- * the live render path and the preview-snapshot path so the two cannot drift.
- */
-async function resolveSectionDataSource(
-  dataSourceId: string | undefined,
-  dataSources: ThemeConfig['dataSources'],
-  sectionSlug: string
-): Promise<any | undefined> {
-  if (!dataSourceId) {
-    return undefined;
-  }
-
-  const dataSource = dataSources.find((ds) => ds.id === dataSourceId);
-
-  if (!dataSource) {
-    devWarn(
-      'ThemePlaceholder',
-      `Section "${sectionSlug}" references data source "${dataSourceId}" which was not found; rendering placeholder items`
-    );
-    return undefined;
-  }
-
-  if (!dataSource.details) {
-    return dataSource;
-  }
-
-  // Only fetch collection data if we have a valid widget slug
-  // (not the section's own slug which contains config, not products)
-  const collectionSlug = dataSource.details.collection?.slug;
-  if (!collectionSlug) {
-    // The saved products from the editor (details.collection.products)
-    // will be used as fallback
-    return dataSource;
-  }
-
-  try {
-    let collectionData = await getWidgetData<{
-      [key: string]: unknown;
-    }>({
-      slug: collectionSlug
-    });
-
-    if (!collectionData) {
-      collectionData = await getCollectionWidgetData<{
-        [key: string]: unknown;
-      }>({
-        slug: collectionSlug
-      });
-    }
-
-    if (collectionData) {
-      return {
-        ...dataSource,
-        details: {
-          ...dataSource.details,
-          collection: {
-            ...dataSource.details.collection,
-            data: collectionData
-          }
-        }
-      };
-    }
-  } catch (error) {
-    console.error(
-      `Error fetching widget data for section ${sectionSlug}:`,
-      error
-    );
-  }
-
-  return dataSource;
-}
-
-/**
- * Preview (draft mode): the theme editor writes the whole placeholder as one
- * snapshot blob — sections arrive in render shape, so none of the per-widget
- * fetches of the live path happen. The blob also owns the theme settings and
- * data sources it was saved with.
- */
-async function loadFromPreviewSnapshot(
-  slug: string,
-  snapshot: PreviewSnapshot
-): Promise<LoadedPlaceholder> {
-  const dataSources: ThemeConfig['dataSources'] = Array.isArray(
-    snapshot.dataSources
-  )
-    ? (snapshot.dataSources as any[])
-    : [];
-
-  const resolved = await Promise.all(
-    snapshot.sections.map(async (raw: any): Promise<Section | null> => {
-      if (!raw?.id) {
-        return null;
-      }
-
-      return {
-        id: raw.id,
-        type: raw.type || 'default',
-        name: raw.name || raw.id,
-        label: raw.label || raw.id,
-        properties: raw.properties || {},
-        styles: raw.styles || {},
-        blocks: Array.isArray(raw.blocks) ? raw.blocks : [],
-        order: raw.order ?? 0,
-        hidden: raw.hidden || false,
-        dataSourceId: raw.dataSourceId,
-        dataSource: await resolveSectionDataSource(
-          raw.dataSourceId,
-          dataSources,
-          raw.id
-        )
-      };
-    })
-  );
-
-  const sections = resolved.filter((s): s is Section => s !== null);
-
-  validateThemeSectionsInDev(sections);
-
-  return {
-    sections,
-    placeholderId: slug,
-    dataSources,
-    themeSettings:
-      (snapshot.themeSettings as Record<string, unknown> | null) ?? null
-  };
-}
-
 export interface LoadedPlaceholder {
   sections: Section[];
   placeholderId: string;
@@ -214,12 +81,6 @@ export async function loadPlaceholderSections(
   slug: string
 ): Promise<LoadedPlaceholder | null> {
   try {
-    // Absent/malformed blob (or no draft mode) falls through to the live path.
-    const previewSnapshot = await getPlaceholderPreviewSnapshot(slug);
-    if (previewSnapshot) {
-      return loadFromPreviewSnapshot(slug, previewSnapshot);
-    }
-
     // theme-config is optional for placeholder rendering, and the reader is
     // memoized per request — a page with several placeholders, or a ChromeSlot
     // asking the same question to decide whether it is pinned, reads it once.
@@ -363,11 +224,60 @@ export async function loadPlaceholderSections(
             (getBlockValue('dataSourceId') as string | undefined) ||
             (getBlockValue('selectedDataSourceId') as string | undefined);
 
-          const dataSourceWithData = await resolveSectionDataSource(
-            dataSourceId,
-            dataSources,
-            sectionSlug
-          );
+          const dataSource = dataSourceId
+            ? dataSources.find((ds) => ds.id === dataSourceId)
+            : undefined;
+
+          if (dataSourceId && !dataSource) {
+            devWarn(
+              'ThemePlaceholder',
+              `Section "${sectionSlug}" references data source "${dataSourceId}" which was not found; rendering placeholder items`
+            );
+          }
+
+          let dataSourceWithData = dataSource;
+          if (dataSource && dataSource.details) {
+            // Only fetch collection data if we have a valid widget slug
+            // (not the section's own slug which contains config, not products)
+            const collectionSlug = dataSource.details.collection?.slug;
+            if (collectionSlug) {
+              try {
+                let collectionData = await getWidgetData<{
+                  [key: string]: unknown;
+                }>({
+                  slug: collectionSlug
+                });
+
+                if (!collectionData) {
+                  collectionData = await getCollectionWidgetData<{
+                    [key: string]: unknown;
+                  }>({
+                    slug: collectionSlug
+                  });
+                }
+
+                if (collectionData) {
+                  dataSourceWithData = {
+                    ...dataSource,
+                    details: {
+                      ...dataSource.details,
+                      collection: {
+                        ...dataSource.details.collection,
+                        data: collectionData
+                      }
+                    }
+                  };
+                }
+              } catch (error) {
+                console.error(
+                  `Error fetching widget data for section ${sectionSlug}:`,
+                  error
+                );
+              }
+            }
+            // If no collection slug, the saved products from editor
+            // (details.collection.products) will be used as fallback
+          }
 
           const section: Section = {
             id: sectionSlug,

package/src/chrome/preview-snapshot-source.ts

@@ -1,51 +0,0 @@
-import * as React from 'react';
-import * as serverData from '@akinon/next/data/server';
-
-/**
- * Whole-placeholder snapshot the theme editor writes for a named preview
- * (`<slug>-preview-<id>`, `preview_snapshot` attribute). Sections arrive in
- * render shape. See akinon-next's `getPreviewSnapshot` for the contract.
- */
-export interface PreviewSnapshot {
-  version: number;
-  savedAt?: string;
-  themeSettings?: Record<string, unknown> | null;
-  dataSources?: unknown[];
-  sections: unknown[];
-}
-
-type GetPreviewSnapshot = (args: {
-  slug: string;
-}) => Promise<PreviewSnapshot | null>;
-
-const fetchPreviewSnapshot = async (
-  slug: string
-): Promise<PreviewSnapshot | null> => {
-  // v1 cores predate widget preview: no reader means never a preview. The
-  // reader itself answers null outside draft mode or without a preview id.
-  const fn = (
-    serverData as unknown as { getPreviewSnapshot?: GetPreviewSnapshot }
-  ).getPreviewSnapshot;
-  if (!fn) return null;
-
-  try {
-    return (await fn({ slug })) ?? null;
-  } catch {
-    // A failed preview read must fall back to the live render, never blank it.
-    return null;
-  }
-};
-
-// `React.cache` exists on the RSC-capable React this package renders under;
-// fall back to the raw function on older cores, where correctness is identical
-// and the only cost is a second fetch.
-const cache = (React as { cache?: <T>(fn: T) => T }).cache;
-
-/**
- * The one preview-snapshot read per placeholder per request — shared by the
- * slot's composed/uncomposed decision and the section loader so the two can
- * never disagree about which content a preview shows.
- */
-export const getPlaceholderPreviewSnapshot = cache
-  ? cache(fetchPreviewSnapshot)
-  : fetchPreviewSnapshot;