@cmssy/react 14.0.0 → 14.1.0

package/dist/client.cjs

@@ -1012,6 +1012,7 @@ function CmssyEditableLayout({
   groups,
   blocks,
   position,
+  page,
   locale = "en",
   defaultLocale = "en",
   enabledLocales,
@@ -1032,9 +1033,10 @@ function CmssyEditableLayout({
   const patches = useLayoutPatchBridge(position, edit);
   const context = react.useMemo(
     () => internal.buildBlockContext(locale, defaultLocale, enabledLocales, true, void 0, {
+      page,
       app: appContext
     }),
-    [locale, defaultLocale, enabledLocales, appContext]
+    [locale, defaultLocale, enabledLocales, page, appContext]
   );
   if (layoutBlocks.length === 0) return null;
   return /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, { children: layoutBlocks.map((block) => /* @__PURE__ */ jsxRuntime.jsx(

package/dist/client.d.cts

@@ -1,6 +1,6 @@
 import * as react_jsx_runtime from 'react/jsx-runtime';
 import { BlockSchema, BlockMeta, LayoutRegion, CmssyPageData, CmssyFormDefinition, CmssyLayoutGroup } from '@cmssy/core';
-import { B as BlockDefinition } from './registry-CwJ2cby4.cjs';
+import { B as BlockDefinition, L as LayoutBlockPage } from './internal-server-CP0tEgpM.cjs';
 import 'react';
 
 interface EditBridgeConfig {
@@ -72,6 +72,7 @@ interface CmssyEditableLayoutProps {
     groups: CmssyLayoutGroup[];
     blocks: BlockDefinition[];
     position: string;
+    page?: LayoutBlockPage;
     locale?: string;
     defaultLocale?: string;
     enabledLocales?: string[];
@@ -80,11 +81,12 @@ interface CmssyEditableLayoutProps {
     resolvedContent?: Record<string, Record<string, unknown>>;
     appContext?: Record<string, unknown>;
 }
-declare function CmssyEditableLayout({ groups, blocks, position, locale, defaultLocale, enabledLocales, edit, data, resolvedContent, appContext, }: CmssyEditableLayoutProps): react_jsx_runtime.JSX.Element | null;
+declare function CmssyEditableLayout({ groups, blocks, position, page, locale, defaultLocale, enabledLocales, edit, data, resolvedContent, appContext, }: CmssyEditableLayoutProps): react_jsx_runtime.JSX.Element | null;
 
 interface CmssyLazyLayoutProps {
     groups: CmssyLayoutGroup[];
     position: string;
+    page?: LayoutBlockPage;
     locale?: string;
     defaultLocale?: string;
     enabledLocales?: string[];

package/dist/client.d.ts

@@ -1,6 +1,6 @@
 import * as react_jsx_runtime from 'react/jsx-runtime';
 import { BlockSchema, BlockMeta, LayoutRegion, CmssyPageData, CmssyFormDefinition, CmssyLayoutGroup } from '@cmssy/core';
-import { B as BlockDefinition } from './registry-CwJ2cby4.js';
+import { B as BlockDefinition, L as LayoutBlockPage } from './internal-server-CP0tEgpM.js';
 import 'react';
 
 interface EditBridgeConfig {
@@ -72,6 +72,7 @@ interface CmssyEditableLayoutProps {
     groups: CmssyLayoutGroup[];
     blocks: BlockDefinition[];
     position: string;
+    page?: LayoutBlockPage;
     locale?: string;
     defaultLocale?: string;
     enabledLocales?: string[];
@@ -80,11 +81,12 @@ interface CmssyEditableLayoutProps {
     resolvedContent?: Record<string, Record<string, unknown>>;
     appContext?: Record<string, unknown>;
 }
-declare function CmssyEditableLayout({ groups, blocks, position, locale, defaultLocale, enabledLocales, edit, data, resolvedContent, appContext, }: CmssyEditableLayoutProps): react_jsx_runtime.JSX.Element | null;
+declare function CmssyEditableLayout({ groups, blocks, position, page, locale, defaultLocale, enabledLocales, edit, data, resolvedContent, appContext, }: CmssyEditableLayoutProps): react_jsx_runtime.JSX.Element | null;
 
 interface CmssyLazyLayoutProps {
     groups: CmssyLayoutGroup[];
     position: string;
+    page?: LayoutBlockPage;
     locale?: string;
     defaultLocale?: string;
     enabledLocales?: string[];

package/dist/client.js

@@ -1010,6 +1010,7 @@ function CmssyEditableLayout({
   groups,
   blocks,
   position,
+  page,
   locale = "en",
   defaultLocale = "en",
   enabledLocales,
@@ -1030,9 +1031,10 @@ function CmssyEditableLayout({
   const patches = useLayoutPatchBridge(position, edit);
   const context = useMemo(
     () => buildBlockContext(locale, defaultLocale, enabledLocales, true, void 0, {
+      page,
       app: appContext
     }),
-    [locale, defaultLocale, enabledLocales, appContext]
+    [locale, defaultLocale, enabledLocales, page, appContext]
   );
   if (layoutBlocks.length === 0) return null;
   return /* @__PURE__ */ jsx(Fragment, { children: layoutBlocks.map((block) => /* @__PURE__ */ jsx(

package/dist/index.cjs

@@ -364,6 +364,7 @@ async function resolveEditorLayoutBlockData({
   groups,
   blocks,
   position,
+  page,
   locale,
   defaultLocale,
   enabledLocales,
@@ -382,7 +383,7 @@ async function resolveEditorLayoutBlockData({
     enabledLocales,
     isPreview,
     forms,
-    { app: appContext }
+    { page, app: appContext }
   );
   const resolved = await resolveBlocks(
     layoutBlocks,
@@ -395,12 +396,16 @@ async function resolveEditorLayoutBlockData({
   );
   return collectBlockData(layoutBlocks, resolved, isPreview);
 }
+function layoutSlotPage(slug) {
+  return { slug, path: slug.split("/").filter(Boolean) };
+}
 async function resolveCmssyLayoutSlot(config, options) {
   const {
     position,
     blocks,
     editMode,
-    page,
+    preview = false,
+    page: explicitPage,
     forms,
     appContext,
     path,
@@ -412,13 +417,15 @@ async function resolveCmssyLayoutSlot(config, options) {
   const fromPath = path ? locale.splitLocaleFromPath(path, siteLocales) : { locale: siteLocales.defaultLocale, path: [] };
   const locale$1 = explicitLocale ?? fromPath.locale;
   const slugSegments = fromPath.path ?? [];
-  const pageSlug = page ?? "/" + slugSegments.join("/");
-  const groups = await internal.fetchLayouts(config, pageSlug, {
-    previewSecret: editMode ? config.draftSecret : void 0,
+  const page = layoutSlotPage(explicitPage ?? "/" + slugSegments.join("/"));
+  const groups = await internal.fetchLayouts(config, page.slug, {
+    previewSecret: editMode || preview ? config.draftSecret : void 0,
     ...requestOptions
   });
   const base = {
     groups,
+    settings: groups.find((g) => g.position === position)?.settings ?? null,
+    page,
     locale: locale$1,
     defaultLocale: siteLocales.defaultLocale,
     enabledLocales: siteLocales.locales,
@@ -429,6 +436,7 @@ async function resolveCmssyLayoutSlot(config, options) {
     groups,
     blocks,
     position,
+    page,
     locale: locale$1,
     defaultLocale: siteLocales.defaultLocale,
     enabledLocales: siteLocales.locales,
@@ -448,12 +456,14 @@ async function CmssyServerLayout({
   groups,
   blocks,
   position,
+  page,
   locale: localeProp,
   defaultLocale: defaultLocaleProp,
   enabledLocales: enabledLocalesProp,
   config,
   appContext,
-  editMode
+  editMode,
+  preview = false
 }) {
   const { locale, defaultLocale, enabledLocales } = await resolveRenderLocale({
     locale: localeProp,
@@ -470,9 +480,9 @@ async function CmssyServerLayout({
     locale,
     defaultLocale,
     enabledLocales,
-    false,
+    preview,
     void 0,
-    { app: appContext }
+    { page, app: appContext }
   );
   const resolved = await resolveBlocks(
     layoutBlocks,
@@ -494,6 +504,54 @@ async function CmssyServerLayout({
     })
   ) });
 }
+async function resolveCmssyLayout(config, options) {
+  const { editable: Editable, ...slotOptions } = options;
+  if (slotOptions.editMode && !Editable) {
+    throw new Error(
+      "cmssy: resolveCmssyLayout needs an `editable` component in edit mode - the editor bridge lives on the client"
+    );
+  }
+  const resolved = await resolveCmssyLayoutSlot(
+    config,
+    slotOptions
+  );
+  const { groups, settings, page, locale, defaultLocale, enabledLocales } = resolved;
+  const shared = {
+    groups,
+    position: options.position,
+    page,
+    locale,
+    defaultLocale,
+    enabledLocales,
+    appContext: options.appContext
+  };
+  const element = slotOptions.editMode && Editable ? /* @__PURE__ */ jsxRuntime.jsx(
+    Editable,
+    {
+      ...shared,
+      edit: { editorOrigin: resolved.editorOrigin ?? "" },
+      data: resolved.data,
+      resolvedContent: resolved.resolvedContent
+    }
+  ) : /* @__PURE__ */ jsxRuntime.jsx(
+    CmssyServerLayout,
+    {
+      ...shared,
+      blocks: options.blocks,
+      config,
+      preview: slotOptions.preview
+    }
+  );
+  return {
+    groups,
+    settings,
+    page,
+    locale,
+    defaultLocale,
+    enabledLocales,
+    element
+  };
+}
 function CmssyBlock({
   block,
   locale,
@@ -635,6 +693,7 @@ exports.CmssyServerPage = CmssyServerPage;
 exports.UnknownBlock = UnknownBlock;
 exports.buildBlockMap = buildBlockMap;
 exports.defineBlock = defineBlock;
+exports.resolveCmssyLayout = resolveCmssyLayout;
 exports.resolveCmssyLayoutSlot = resolveCmssyLayoutSlot;
 exports.resolveEditorBlockData = resolveEditorBlockData;
 exports.resolveEditorLayoutBlockData = resolveEditorLayoutBlockData;

package/dist/index.d.cts

@@ -1,13 +1,12 @@
-import { CmssyPageData, CmssyClientConfig, CmssyFormDefinition, CmssyBlockAuthContext, CmssyBlockWorkspace, CmssyLayoutGroup, RetryOption, CmssyConfig, RawBlock, CmssyBlockContext } from '@cmssy/core';
-export { AppToEditorMessage, BlockMeta, BlockPropsSchema, BlockRect, BlockSchema, BoundsMessage, BuildBlockContextExtra, ClickMessage, CmssyBlockAuthContext, CmssyBlockContext, CmssyBlockMember, CmssyBlockPage, CmssyBlockWorkspace, CmssyBranding, CmssyClient, CmssyClientConfig, CmssyFormDefinition, CmssyFormField, CmssyFormSettings, CmssyFormSubmitResponse, CmssyLayout, CmssyLayoutGroup, CmssyLocaleContext, CmssyLocalizedValue, CmssyModelDefinition, CmssyModelRecord, CmssyPageData, CmssyPageMeta, CmssyPageSummary, CmssyRecordList, CmssyRegion, CmssyRegionOf, CmssyRegionSettings, CmssyRequestError, CmssyRetryMode, CmssySiteConfig, CmssyTypedDocument, EditorToAppMessage, FetchLike, FetchLikeResponse, FetchPageOptions, FieldControl, FieldDefinition, FieldType, GraphqlRequestOptions, InferBlockContent, LayoutPosition, LayoutRegion, MediaLike, PROTOCOL_VERSION, ParentReadyMessage, PatchMessage, PostTarget, QueryScopedOptions, RawBlock, RawLayoutBlock, ReadyMessage, RetryOption, RetryPolicy, SelectMessage, SubmitFormInput, TypedField, createCmssyClient, defineCmssyLayout, fields, graphqlRequest, isProtocolCompatible, mediaAlt, mediaUrl, mediaUrls, normalizeOrigin, parseEditorMessage, postToEditor } from '@cmssy/core';
-import { B as BlockDefinition, a as BlockMap } from './registry-CwJ2cby4.cjs';
-export { b as BlockProps, c as buildBlockMap, d as defineBlock } from './registry-CwJ2cby4.cjs';
+import { CmssyPageData, CmssyClientConfig, CmssyFormDefinition, CmssyBlockAuthContext, CmssyBlockWorkspace, CmssyLayoutGroup, CmssyBlockPage, RetryOption, CmssyConfig, CmssyRegionOf, CmssyRegionSettingsOf, RawBlock, CmssyBlockContext } from '@cmssy/core';
+export { AppToEditorMessage, BlockMeta, BlockPropsSchema, BlockRect, BlockSchema, BoundsMessage, BuildBlockContextExtra, ClickMessage, CmssyBlockAuthContext, CmssyBlockContext, CmssyBlockMember, CmssyBlockPage, CmssyBlockWorkspace, CmssyBranding, CmssyClient, CmssyClientConfig, CmssyFormDefinition, CmssyFormField, CmssyFormSettings, CmssyFormSubmitResponse, CmssyLayout, CmssyLayoutGroup, CmssyLocaleContext, CmssyLocalizedValue, CmssyModelDefinition, CmssyModelRecord, CmssyPageData, CmssyPageMeta, CmssyPageSummary, CmssyRecordList, CmssyRegion, CmssyRegionOf, CmssyRegionSettings, CmssyRegionSettingsOf, CmssyRequestError, CmssyRetryMode, CmssySiteConfig, CmssyTypedDocument, EditorToAppMessage, FetchLike, FetchLikeResponse, FetchPageOptions, FieldControl, FieldDefinition, FieldType, GraphqlRequestOptions, InferBlockContent, LayoutPosition, LayoutRegion, MediaLike, PROTOCOL_VERSION, ParentReadyMessage, PatchMessage, PostTarget, QueryScopedOptions, RawBlock, RawLayoutBlock, ReadyMessage, RetryOption, RetryPolicy, SelectMessage, SubmitFormInput, TypedField, createCmssyClient, defineCmssyLayout, fields, graphqlRequest, isProtocolCompatible, mediaAlt, mediaUrl, mediaUrls, normalizeOrigin, parseEditorMessage, postToEditor } from '@cmssy/core';
+import { B as BlockDefinition, L as LayoutBlockPage, a as BlockMap } from './internal-server-CP0tEgpM.cjs';
+export { b as BlockProps, E as EditorBlockData, R as ResolveBlockDataOptions, c as ResolveLayoutBlockDataOptions, d as buildBlockMap, e as defineBlock, r as resolveEditorBlockData, f as resolveEditorLayoutBlockData } from './internal-server-CP0tEgpM.cjs';
 import { FieldDefinition } from '@cmssy/types';
 export { FieldCondition, FieldConditionGroup, FieldConditionLogic } from '@cmssy/types';
 export { buildBlockContext } from '@cmssy/core/internal';
 import * as react_jsx_runtime from 'react/jsx-runtime';
-export { EditorBlockData, ResolveBlockDataOptions, ResolveLayoutBlockDataOptions, resolveEditorBlockData, resolveEditorLayoutBlockData } from './internal-server.cjs';
-import 'react';
+import { ReactElement, ComponentType } from 'react';
 
 interface CmssyServerPageProps {
     page: CmssyPageData | null;
@@ -28,6 +27,7 @@ interface ResolveCmssyLayoutSlotBase {
     position: string;
     blocks: BlockDefinition[];
     editMode: boolean;
+    preview?: boolean;
     page?: string;
     forms?: Record<string, CmssyFormDefinition>;
     appContext?: Record<string, unknown>;
@@ -43,6 +43,8 @@ type CmssyLayoutSlotLocaleSource = {
 type ResolveCmssyLayoutSlotOptions = ResolveCmssyLayoutSlotBase & CmssyLayoutSlotLocaleSource;
 interface CmssyLayoutSlotResolution {
     groups: CmssyLayoutGroup[];
+    settings: Record<string, unknown> | null;
+    page: CmssyBlockPage;
     locale: string;
     defaultLocale: string;
     enabledLocales: string[];
@@ -53,18 +55,49 @@ interface CmssyLayoutSlotResolution {
 }
 declare function resolveCmssyLayoutSlot(config: CmssyConfig, options: ResolveCmssyLayoutSlotOptions): Promise<CmssyLayoutSlotResolution>;
 
+interface CmssyLayoutEditableProps {
+    groups: CmssyLayoutGroup[];
+    position: string;
+    page?: CmssyBlockPage;
+    locale: string;
+    defaultLocale: string;
+    enabledLocales: string[];
+    edit: {
+        editorOrigin: string | string[];
+    };
+    data?: Record<string, unknown>;
+    resolvedContent?: Record<string, Record<string, unknown>>;
+    appContext?: Record<string, unknown>;
+}
+type ResolveCmssyLayoutOptions<C extends CmssyConfig, P extends CmssyRegionOf<C>> = Omit<ResolveCmssyLayoutSlotOptions, "position" | keyof CmssyLayoutSlotLocaleSource> & CmssyLayoutSlotLocaleSource & {
+    position: P;
+    editable?: ComponentType<CmssyLayoutEditableProps>;
+};
+interface CmssyLayoutResolution<C extends CmssyConfig = CmssyConfig, P extends CmssyRegionOf<C> = CmssyRegionOf<C>> {
+    groups: CmssyLayoutGroup[];
+    settings: CmssyRegionSettingsOf<C, P> | null;
+    page: CmssyBlockPage;
+    locale: string;
+    defaultLocale: string;
+    enabledLocales: string[];
+    element: ReactElement<Record<string, unknown>>;
+}
+declare function resolveCmssyLayout<C extends CmssyConfig, P extends CmssyRegionOf<C>>(config: C, options: ResolveCmssyLayoutOptions<C, P>): Promise<CmssyLayoutResolution<C, P>>;
+
 interface CmssyServerLayoutProps {
     groups: CmssyLayoutGroup[];
     blocks: BlockDefinition[];
     position: string;
+    page?: LayoutBlockPage;
     locale?: string;
     defaultLocale?: string;
     enabledLocales?: string[];
     config?: CmssyClientConfig;
     appContext?: Record<string, unknown>;
     editMode?: boolean;
+    preview?: boolean;
 }
-declare function CmssyServerLayout({ groups, blocks, position, locale: localeProp, defaultLocale: defaultLocaleProp, enabledLocales: enabledLocalesProp, config, appContext, editMode, }: CmssyServerLayoutProps): Promise<react_jsx_runtime.JSX.Element | null>;
+declare function CmssyServerLayout({ groups, blocks, position, page, locale: localeProp, defaultLocale: defaultLocaleProp, enabledLocales: enabledLocalesProp, config, appContext, editMode, preview, }: CmssyServerLayoutProps): Promise<react_jsx_runtime.JSX.Element | null>;
 
 interface CmssyBlockProps {
     block: RawBlock;
@@ -89,4 +122,4 @@ interface UnknownBlockProps {
 }
 declare function UnknownBlock({ type }: UnknownBlockProps): react_jsx_runtime.JSX.Element;
 
-export { BlockDefinition, BlockMap, CmssyBlock, type CmssyBlockProps, type CmssyLayoutSlotLocaleSource, type CmssyLayoutSlotResolution, CmssyServerLayout, type CmssyServerLayoutProps, CmssyServerPage, type CmssyServerPageProps, type ResolveCmssyLayoutSlotOptions, UnknownBlock, type UnknownBlockProps, resolveCmssyLayoutSlot };
+export { BlockDefinition, BlockMap, CmssyBlock, type CmssyBlockProps, type CmssyLayoutEditableProps, type CmssyLayoutResolution, type CmssyLayoutSlotLocaleSource, type CmssyLayoutSlotResolution, CmssyServerLayout, type CmssyServerLayoutProps, CmssyServerPage, type CmssyServerPageProps, LayoutBlockPage, type ResolveCmssyLayoutOptions, type ResolveCmssyLayoutSlotOptions, UnknownBlock, type UnknownBlockProps, resolveCmssyLayout, resolveCmssyLayoutSlot };

package/dist/index.d.ts

@@ -1,13 +1,12 @@
-import { CmssyPageData, CmssyClientConfig, CmssyFormDefinition, CmssyBlockAuthContext, CmssyBlockWorkspace, CmssyLayoutGroup, RetryOption, CmssyConfig, RawBlock, CmssyBlockContext } from '@cmssy/core';
-export { AppToEditorMessage, BlockMeta, BlockPropsSchema, BlockRect, BlockSchema, BoundsMessage, BuildBlockContextExtra, ClickMessage, CmssyBlockAuthContext, CmssyBlockContext, CmssyBlockMember, CmssyBlockPage, CmssyBlockWorkspace, CmssyBranding, CmssyClient, CmssyClientConfig, CmssyFormDefinition, CmssyFormField, CmssyFormSettings, CmssyFormSubmitResponse, CmssyLayout, CmssyLayoutGroup, CmssyLocaleContext, CmssyLocalizedValue, CmssyModelDefinition, CmssyModelRecord, CmssyPageData, CmssyPageMeta, CmssyPageSummary, CmssyRecordList, CmssyRegion, CmssyRegionOf, CmssyRegionSettings, CmssyRequestError, CmssyRetryMode, CmssySiteConfig, CmssyTypedDocument, EditorToAppMessage, FetchLike, FetchLikeResponse, FetchPageOptions, FieldControl, FieldDefinition, FieldType, GraphqlRequestOptions, InferBlockContent, LayoutPosition, LayoutRegion, MediaLike, PROTOCOL_VERSION, ParentReadyMessage, PatchMessage, PostTarget, QueryScopedOptions, RawBlock, RawLayoutBlock, ReadyMessage, RetryOption, RetryPolicy, SelectMessage, SubmitFormInput, TypedField, createCmssyClient, defineCmssyLayout, fields, graphqlRequest, isProtocolCompatible, mediaAlt, mediaUrl, mediaUrls, normalizeOrigin, parseEditorMessage, postToEditor } from '@cmssy/core';
-import { B as BlockDefinition, a as BlockMap } from './registry-CwJ2cby4.js';
-export { b as BlockProps, c as buildBlockMap, d as defineBlock } from './registry-CwJ2cby4.js';
+import { CmssyPageData, CmssyClientConfig, CmssyFormDefinition, CmssyBlockAuthContext, CmssyBlockWorkspace, CmssyLayoutGroup, CmssyBlockPage, RetryOption, CmssyConfig, CmssyRegionOf, CmssyRegionSettingsOf, RawBlock, CmssyBlockContext } from '@cmssy/core';
+export { AppToEditorMessage, BlockMeta, BlockPropsSchema, BlockRect, BlockSchema, BoundsMessage, BuildBlockContextExtra, ClickMessage, CmssyBlockAuthContext, CmssyBlockContext, CmssyBlockMember, CmssyBlockPage, CmssyBlockWorkspace, CmssyBranding, CmssyClient, CmssyClientConfig, CmssyFormDefinition, CmssyFormField, CmssyFormSettings, CmssyFormSubmitResponse, CmssyLayout, CmssyLayoutGroup, CmssyLocaleContext, CmssyLocalizedValue, CmssyModelDefinition, CmssyModelRecord, CmssyPageData, CmssyPageMeta, CmssyPageSummary, CmssyRecordList, CmssyRegion, CmssyRegionOf, CmssyRegionSettings, CmssyRegionSettingsOf, CmssyRequestError, CmssyRetryMode, CmssySiteConfig, CmssyTypedDocument, EditorToAppMessage, FetchLike, FetchLikeResponse, FetchPageOptions, FieldControl, FieldDefinition, FieldType, GraphqlRequestOptions, InferBlockContent, LayoutPosition, LayoutRegion, MediaLike, PROTOCOL_VERSION, ParentReadyMessage, PatchMessage, PostTarget, QueryScopedOptions, RawBlock, RawLayoutBlock, ReadyMessage, RetryOption, RetryPolicy, SelectMessage, SubmitFormInput, TypedField, createCmssyClient, defineCmssyLayout, fields, graphqlRequest, isProtocolCompatible, mediaAlt, mediaUrl, mediaUrls, normalizeOrigin, parseEditorMessage, postToEditor } from '@cmssy/core';
+import { B as BlockDefinition, L as LayoutBlockPage, a as BlockMap } from './internal-server-CP0tEgpM.js';
+export { b as BlockProps, E as EditorBlockData, R as ResolveBlockDataOptions, c as ResolveLayoutBlockDataOptions, d as buildBlockMap, e as defineBlock, r as resolveEditorBlockData, f as resolveEditorLayoutBlockData } from './internal-server-CP0tEgpM.js';
 import { FieldDefinition } from '@cmssy/types';
 export { FieldCondition, FieldConditionGroup, FieldConditionLogic } from '@cmssy/types';
 export { buildBlockContext } from '@cmssy/core/internal';
 import * as react_jsx_runtime from 'react/jsx-runtime';
-export { EditorBlockData, ResolveBlockDataOptions, ResolveLayoutBlockDataOptions, resolveEditorBlockData, resolveEditorLayoutBlockData } from './internal-server.js';
-import 'react';
+import { ReactElement, ComponentType } from 'react';
 
 interface CmssyServerPageProps {
     page: CmssyPageData | null;
@@ -28,6 +27,7 @@ interface ResolveCmssyLayoutSlotBase {
     position: string;
     blocks: BlockDefinition[];
     editMode: boolean;
+    preview?: boolean;
     page?: string;
     forms?: Record<string, CmssyFormDefinition>;
     appContext?: Record<string, unknown>;
@@ -43,6 +43,8 @@ type CmssyLayoutSlotLocaleSource = {
 type ResolveCmssyLayoutSlotOptions = ResolveCmssyLayoutSlotBase & CmssyLayoutSlotLocaleSource;
 interface CmssyLayoutSlotResolution {
     groups: CmssyLayoutGroup[];
+    settings: Record<string, unknown> | null;
+    page: CmssyBlockPage;
     locale: string;
     defaultLocale: string;
     enabledLocales: string[];
@@ -53,18 +55,49 @@ interface CmssyLayoutSlotResolution {
 }
 declare function resolveCmssyLayoutSlot(config: CmssyConfig, options: ResolveCmssyLayoutSlotOptions): Promise<CmssyLayoutSlotResolution>;
 
+interface CmssyLayoutEditableProps {
+    groups: CmssyLayoutGroup[];
+    position: string;
+    page?: CmssyBlockPage;
+    locale: string;
+    defaultLocale: string;
+    enabledLocales: string[];
+    edit: {
+        editorOrigin: string | string[];
+    };
+    data?: Record<string, unknown>;
+    resolvedContent?: Record<string, Record<string, unknown>>;
+    appContext?: Record<string, unknown>;
+}
+type ResolveCmssyLayoutOptions<C extends CmssyConfig, P extends CmssyRegionOf<C>> = Omit<ResolveCmssyLayoutSlotOptions, "position" | keyof CmssyLayoutSlotLocaleSource> & CmssyLayoutSlotLocaleSource & {
+    position: P;
+    editable?: ComponentType<CmssyLayoutEditableProps>;
+};
+interface CmssyLayoutResolution<C extends CmssyConfig = CmssyConfig, P extends CmssyRegionOf<C> = CmssyRegionOf<C>> {
+    groups: CmssyLayoutGroup[];
+    settings: CmssyRegionSettingsOf<C, P> | null;
+    page: CmssyBlockPage;
+    locale: string;
+    defaultLocale: string;
+    enabledLocales: string[];
+    element: ReactElement<Record<string, unknown>>;
+}
+declare function resolveCmssyLayout<C extends CmssyConfig, P extends CmssyRegionOf<C>>(config: C, options: ResolveCmssyLayoutOptions<C, P>): Promise<CmssyLayoutResolution<C, P>>;
+
 interface CmssyServerLayoutProps {
     groups: CmssyLayoutGroup[];
     blocks: BlockDefinition[];
     position: string;
+    page?: LayoutBlockPage;
     locale?: string;
     defaultLocale?: string;
     enabledLocales?: string[];
     config?: CmssyClientConfig;
     appContext?: Record<string, unknown>;
     editMode?: boolean;
+    preview?: boolean;
 }
-declare function CmssyServerLayout({ groups, blocks, position, locale: localeProp, defaultLocale: defaultLocaleProp, enabledLocales: enabledLocalesProp, config, appContext, editMode, }: CmssyServerLayoutProps): Promise<react_jsx_runtime.JSX.Element | null>;
+declare function CmssyServerLayout({ groups, blocks, position, page, locale: localeProp, defaultLocale: defaultLocaleProp, enabledLocales: enabledLocalesProp, config, appContext, editMode, preview, }: CmssyServerLayoutProps): Promise<react_jsx_runtime.JSX.Element | null>;
 
 interface CmssyBlockProps {
     block: RawBlock;
@@ -89,4 +122,4 @@ interface UnknownBlockProps {
 }
 declare function UnknownBlock({ type }: UnknownBlockProps): react_jsx_runtime.JSX.Element;
 
-export { BlockDefinition, BlockMap, CmssyBlock, type CmssyBlockProps, type CmssyLayoutSlotLocaleSource, type CmssyLayoutSlotResolution, CmssyServerLayout, type CmssyServerLayoutProps, CmssyServerPage, type CmssyServerPageProps, type ResolveCmssyLayoutSlotOptions, UnknownBlock, type UnknownBlockProps, resolveCmssyLayoutSlot };
+export { BlockDefinition, BlockMap, CmssyBlock, type CmssyBlockProps, type CmssyLayoutEditableProps, type CmssyLayoutResolution, type CmssyLayoutSlotLocaleSource, type CmssyLayoutSlotResolution, CmssyServerLayout, type CmssyServerLayoutProps, CmssyServerPage, type CmssyServerPageProps, LayoutBlockPage, type ResolveCmssyLayoutOptions, type ResolveCmssyLayoutSlotOptions, UnknownBlock, type UnknownBlockProps, resolveCmssyLayout, resolveCmssyLayoutSlot };

package/dist/index.js

@@ -364,6 +364,7 @@ async function resolveEditorLayoutBlockData({
   groups,
   blocks,
   position,
+  page,
   locale,
   defaultLocale,
   enabledLocales,
@@ -382,7 +383,7 @@ async function resolveEditorLayoutBlockData({
     enabledLocales,
     isPreview,
     forms,
-    { app: appContext }
+    { page, app: appContext }
   );
   const resolved = await resolveBlocks(
     layoutBlocks,
@@ -395,12 +396,16 @@ async function resolveEditorLayoutBlockData({
   );
   return collectBlockData(layoutBlocks, resolved, isPreview);
 }
+function layoutSlotPage(slug) {
+  return { slug, path: slug.split("/").filter(Boolean) };
+}
 async function resolveCmssyLayoutSlot(config, options) {
   const {
     position,
     blocks,
     editMode,
-    page,
+    preview = false,
+    page: explicitPage,
     forms,
     appContext,
     path,
@@ -412,13 +417,15 @@ async function resolveCmssyLayoutSlot(config, options) {
   const fromPath = path ? splitLocaleFromPath(path, siteLocales) : { locale: siteLocales.defaultLocale, path: [] };
   const locale = explicitLocale ?? fromPath.locale;
   const slugSegments = fromPath.path ?? [];
-  const pageSlug = page ?? "/" + slugSegments.join("/");
-  const groups = await fetchLayouts(config, pageSlug, {
-    previewSecret: editMode ? config.draftSecret : void 0,
+  const page = layoutSlotPage(explicitPage ?? "/" + slugSegments.join("/"));
+  const groups = await fetchLayouts(config, page.slug, {
+    previewSecret: editMode || preview ? config.draftSecret : void 0,
     ...requestOptions
   });
   const base = {
     groups,
+    settings: groups.find((g) => g.position === position)?.settings ?? null,
+    page,
     locale,
     defaultLocale: siteLocales.defaultLocale,
     enabledLocales: siteLocales.locales,
@@ -429,6 +436,7 @@ async function resolveCmssyLayoutSlot(config, options) {
     groups,
     blocks,
     position,
+    page,
     locale,
     defaultLocale: siteLocales.defaultLocale,
     enabledLocales: siteLocales.locales,
@@ -448,12 +456,14 @@ async function CmssyServerLayout({
   groups,
   blocks,
   position,
+  page,
   locale: localeProp,
   defaultLocale: defaultLocaleProp,
   enabledLocales: enabledLocalesProp,
   config,
   appContext,
-  editMode
+  editMode,
+  preview = false
 }) {
   const { locale, defaultLocale, enabledLocales } = await resolveRenderLocale({
     locale: localeProp,
@@ -470,9 +480,9 @@ async function CmssyServerLayout({
     locale,
     defaultLocale,
     enabledLocales,
-    false,
+    preview,
     void 0,
-    { app: appContext }
+    { page, app: appContext }
   );
   const resolved = await resolveBlocks(
     layoutBlocks,
@@ -494,6 +504,54 @@ async function CmssyServerLayout({
     })
   ) });
 }
+async function resolveCmssyLayout(config, options) {
+  const { editable: Editable, ...slotOptions } = options;
+  if (slotOptions.editMode && !Editable) {
+    throw new Error(
+      "cmssy: resolveCmssyLayout needs an `editable` component in edit mode - the editor bridge lives on the client"
+    );
+  }
+  const resolved = await resolveCmssyLayoutSlot(
+    config,
+    slotOptions
+  );
+  const { groups, settings, page, locale, defaultLocale, enabledLocales } = resolved;
+  const shared = {
+    groups,
+    position: options.position,
+    page,
+    locale,
+    defaultLocale,
+    enabledLocales,
+    appContext: options.appContext
+  };
+  const element = slotOptions.editMode && Editable ? /* @__PURE__ */ jsx(
+    Editable,
+    {
+      ...shared,
+      edit: { editorOrigin: resolved.editorOrigin ?? "" },
+      data: resolved.data,
+      resolvedContent: resolved.resolvedContent
+    }
+  ) : /* @__PURE__ */ jsx(
+    CmssyServerLayout,
+    {
+      ...shared,
+      blocks: options.blocks,
+      config,
+      preview: slotOptions.preview
+    }
+  );
+  return {
+    groups,
+    settings,
+    page,
+    locale,
+    defaultLocale,
+    enabledLocales,
+    element
+  };
+}
 function CmssyBlock({
   block,
   locale,
@@ -573,4 +631,4 @@ function CmssyBlock({
   );
 }
 
-export { CmssyBlock, CmssyServerLayout, CmssyServerPage, UnknownBlock, buildBlockMap, defineBlock, resolveCmssyLayoutSlot, resolveEditorBlockData, resolveEditorLayoutBlockData };
+export { CmssyBlock, CmssyServerLayout, CmssyServerPage, UnknownBlock, buildBlockMap, defineBlock, resolveCmssyLayout, resolveCmssyLayoutSlot, resolveEditorBlockData, resolveEditorLayoutBlockData };

package/dist/{registry-CwJ2cby4.d.cts → internal-server-CP0tEgpM.d.cts}

@@ -1,5 +1,5 @@
+import { FieldDefinition, CmssyBlockContext, BlockPropsSchema, InferBlockContent, BlockSchema, BuildBlockContextExtra, CmssyPageData, CmssyFormDefinition, CmssyClientConfig, CmssyLayoutGroup } from '@cmssy/core';
 import { ComponentType } from 'react';
-import { FieldDefinition, CmssyBlockContext, BlockPropsSchema, InferBlockContent, BlockSchema } from '@cmssy/core';
 
 interface BlockProps<P extends BlockPropsSchema, D = unknown> {
     content: InferBlockContent<P>;
@@ -67,4 +67,38 @@ type BlockMap = Record<string, ComponentType<{
 declare function buildBlockMap(blocks: BlockDefinition[]): BlockMap;
 declare function blocksToSchemas(blocks: BlockDefinition[]): Record<string, BlockSchema>;
 
-export { type BlockDefinition as B, type BlockMap as a, type BlockProps as b, buildBlockMap as c, defineBlock as d, blocksToSchemas as e };
+type LayoutBlockPage = NonNullable<BuildBlockContextExtra["page"]>;
+interface EditorBlockData {
+    data: Record<string, unknown>;
+    content: Record<string, Record<string, unknown>>;
+}
+interface ResolveBlockDataOptions {
+    page: CmssyPageData | null;
+    blocks: BlockDefinition[];
+    locale: string;
+    defaultLocale: string;
+    enabledLocales?: string[];
+    forms?: Record<string, CmssyFormDefinition>;
+    isPreview?: boolean;
+    config?: CmssyClientConfig;
+    appContext?: Record<string, unknown>;
+}
+declare function resolveEditorBlockData({ page, blocks, locale, defaultLocale, enabledLocales, forms, isPreview, config, appContext, }: ResolveBlockDataOptions): Promise<EditorBlockData>;
+declare function resolveBlockData(options: ResolveBlockDataOptions): Promise<Record<string, unknown>>;
+interface ResolveLayoutBlockDataOptions {
+    groups: CmssyLayoutGroup[];
+    blocks: BlockDefinition[];
+    position: string;
+    page?: LayoutBlockPage;
+    locale: string;
+    defaultLocale: string;
+    enabledLocales?: string[];
+    forms?: Record<string, CmssyFormDefinition>;
+    isPreview?: boolean;
+    config?: CmssyClientConfig;
+    appContext?: Record<string, unknown>;
+}
+declare function resolveEditorLayoutBlockData({ groups, blocks, position, page, locale, defaultLocale, enabledLocales, forms, isPreview, config, appContext, }: ResolveLayoutBlockDataOptions): Promise<EditorBlockData>;
+declare function resolveLayoutBlockData(options: ResolveLayoutBlockDataOptions): Promise<Record<string, unknown>>;
+
+export { type BlockDefinition as B, type EditorBlockData as E, type LayoutBlockPage as L, type ResolveBlockDataOptions as R, type BlockMap as a, type BlockProps as b, type ResolveLayoutBlockDataOptions as c, buildBlockMap as d, defineBlock as e, resolveEditorLayoutBlockData as f, blocksToSchemas as g, resolveBlockData as h, resolveLayoutBlockData as i, resolveEditorBlockData as r };

package/dist/{registry-CwJ2cby4.d.ts → internal-server-CP0tEgpM.d.ts}

@@ -1,5 +1,5 @@
+import { FieldDefinition, CmssyBlockContext, BlockPropsSchema, InferBlockContent, BlockSchema, BuildBlockContextExtra, CmssyPageData, CmssyFormDefinition, CmssyClientConfig, CmssyLayoutGroup } from '@cmssy/core';
 import { ComponentType } from 'react';
-import { FieldDefinition, CmssyBlockContext, BlockPropsSchema, InferBlockContent, BlockSchema } from '@cmssy/core';
 
 interface BlockProps<P extends BlockPropsSchema, D = unknown> {
     content: InferBlockContent<P>;
@@ -67,4 +67,38 @@ type BlockMap = Record<string, ComponentType<{
 declare function buildBlockMap(blocks: BlockDefinition[]): BlockMap;
 declare function blocksToSchemas(blocks: BlockDefinition[]): Record<string, BlockSchema>;
 
-export { type BlockDefinition as B, type BlockMap as a, type BlockProps as b, buildBlockMap as c, defineBlock as d, blocksToSchemas as e };
+type LayoutBlockPage = NonNullable<BuildBlockContextExtra["page"]>;
+interface EditorBlockData {
+    data: Record<string, unknown>;
+    content: Record<string, Record<string, unknown>>;
+}
+interface ResolveBlockDataOptions {
+    page: CmssyPageData | null;
+    blocks: BlockDefinition[];
+    locale: string;
+    defaultLocale: string;
+    enabledLocales?: string[];
+    forms?: Record<string, CmssyFormDefinition>;
+    isPreview?: boolean;
+    config?: CmssyClientConfig;
+    appContext?: Record<string, unknown>;
+}
+declare function resolveEditorBlockData({ page, blocks, locale, defaultLocale, enabledLocales, forms, isPreview, config, appContext, }: ResolveBlockDataOptions): Promise<EditorBlockData>;
+declare function resolveBlockData(options: ResolveBlockDataOptions): Promise<Record<string, unknown>>;
+interface ResolveLayoutBlockDataOptions {
+    groups: CmssyLayoutGroup[];
+    blocks: BlockDefinition[];
+    position: string;
+    page?: LayoutBlockPage;
+    locale: string;
+    defaultLocale: string;
+    enabledLocales?: string[];
+    forms?: Record<string, CmssyFormDefinition>;
+    isPreview?: boolean;
+    config?: CmssyClientConfig;
+    appContext?: Record<string, unknown>;
+}
+declare function resolveEditorLayoutBlockData({ groups, blocks, position, page, locale, defaultLocale, enabledLocales, forms, isPreview, config, appContext, }: ResolveLayoutBlockDataOptions): Promise<EditorBlockData>;
+declare function resolveLayoutBlockData(options: ResolveLayoutBlockDataOptions): Promise<Record<string, unknown>>;
+
+export { type BlockDefinition as B, type EditorBlockData as E, type LayoutBlockPage as L, type ResolveBlockDataOptions as R, type BlockMap as a, type BlockProps as b, type ResolveLayoutBlockDataOptions as c, buildBlockMap as d, defineBlock as e, resolveEditorLayoutBlockData as f, blocksToSchemas as g, resolveBlockData as h, resolveLayoutBlockData as i, resolveEditorBlockData as r };

package/dist/internal-server.cjs

@@ -137,6 +137,7 @@ async function resolveEditorLayoutBlockData({
   groups,
   blocks,
   position,
+  page,
   locale,
   defaultLocale,
   enabledLocales,
@@ -155,7 +156,7 @@ async function resolveEditorLayoutBlockData({
     enabledLocales,
     isPreview,
     forms,
-    { app: appContext }
+    { page, app: appContext }
   );
   const resolved = await resolveBlocks(
     layoutBlocks,

package/dist/internal-server.d.cts

@@ -1,38 +1,3 @@
-import { CmssyPageData, CmssyFormDefinition, CmssyClientConfig, CmssyLayoutGroup } from '@cmssy/core';
-import { B as BlockDefinition } from './registry-CwJ2cby4.cjs';
-export { e as blocksToSchemas } from './registry-CwJ2cby4.cjs';
+export { E as EditorBlockData, R as ResolveBlockDataOptions, c as ResolveLayoutBlockDataOptions, g as blocksToSchemas, h as resolveBlockData, r as resolveEditorBlockData, f as resolveEditorLayoutBlockData, i as resolveLayoutBlockData } from './internal-server-CP0tEgpM.cjs';
+import '@cmssy/core';
 import 'react';
-
-interface EditorBlockData {
-    data: Record<string, unknown>;
-    content: Record<string, Record<string, unknown>>;
-}
-interface ResolveBlockDataOptions {
-    page: CmssyPageData | null;
-    blocks: BlockDefinition[];
-    locale: string;
-    defaultLocale: string;
-    enabledLocales?: string[];
-    forms?: Record<string, CmssyFormDefinition>;
-    isPreview?: boolean;
-    config?: CmssyClientConfig;
-    appContext?: Record<string, unknown>;
-}
-declare function resolveEditorBlockData({ page, blocks, locale, defaultLocale, enabledLocales, forms, isPreview, config, appContext, }: ResolveBlockDataOptions): Promise<EditorBlockData>;
-declare function resolveBlockData(options: ResolveBlockDataOptions): Promise<Record<string, unknown>>;
-interface ResolveLayoutBlockDataOptions {
-    groups: CmssyLayoutGroup[];
-    blocks: BlockDefinition[];
-    position: string;
-    locale: string;
-    defaultLocale: string;
-    enabledLocales?: string[];
-    forms?: Record<string, CmssyFormDefinition>;
-    isPreview?: boolean;
-    config?: CmssyClientConfig;
-    appContext?: Record<string, unknown>;
-}
-declare function resolveEditorLayoutBlockData({ groups, blocks, position, locale, defaultLocale, enabledLocales, forms, isPreview, config, appContext, }: ResolveLayoutBlockDataOptions): Promise<EditorBlockData>;
-declare function resolveLayoutBlockData(options: ResolveLayoutBlockDataOptions): Promise<Record<string, unknown>>;
-
-export { type EditorBlockData, type ResolveBlockDataOptions, type ResolveLayoutBlockDataOptions, resolveBlockData, resolveEditorBlockData, resolveEditorLayoutBlockData, resolveLayoutBlockData };

package/dist/internal-server.d.ts

@@ -1,38 +1,3 @@
-import { CmssyPageData, CmssyFormDefinition, CmssyClientConfig, CmssyLayoutGroup } from '@cmssy/core';
-import { B as BlockDefinition } from './registry-CwJ2cby4.js';
-export { e as blocksToSchemas } from './registry-CwJ2cby4.js';
+export { E as EditorBlockData, R as ResolveBlockDataOptions, c as ResolveLayoutBlockDataOptions, g as blocksToSchemas, h as resolveBlockData, r as resolveEditorBlockData, f as resolveEditorLayoutBlockData, i as resolveLayoutBlockData } from './internal-server-CP0tEgpM.js';
+import '@cmssy/core';
 import 'react';
-
-interface EditorBlockData {
-    data: Record<string, unknown>;
-    content: Record<string, Record<string, unknown>>;
-}
-interface ResolveBlockDataOptions {
-    page: CmssyPageData | null;
-    blocks: BlockDefinition[];
-    locale: string;
-    defaultLocale: string;
-    enabledLocales?: string[];
-    forms?: Record<string, CmssyFormDefinition>;
-    isPreview?: boolean;
-    config?: CmssyClientConfig;
-    appContext?: Record<string, unknown>;
-}
-declare function resolveEditorBlockData({ page, blocks, locale, defaultLocale, enabledLocales, forms, isPreview, config, appContext, }: ResolveBlockDataOptions): Promise<EditorBlockData>;
-declare function resolveBlockData(options: ResolveBlockDataOptions): Promise<Record<string, unknown>>;
-interface ResolveLayoutBlockDataOptions {
-    groups: CmssyLayoutGroup[];
-    blocks: BlockDefinition[];
-    position: string;
-    locale: string;
-    defaultLocale: string;
-    enabledLocales?: string[];
-    forms?: Record<string, CmssyFormDefinition>;
-    isPreview?: boolean;
-    config?: CmssyClientConfig;
-    appContext?: Record<string, unknown>;
-}
-declare function resolveEditorLayoutBlockData({ groups, blocks, position, locale, defaultLocale, enabledLocales, forms, isPreview, config, appContext, }: ResolveLayoutBlockDataOptions): Promise<EditorBlockData>;
-declare function resolveLayoutBlockData(options: ResolveLayoutBlockDataOptions): Promise<Record<string, unknown>>;
-
-export { type EditorBlockData, type ResolveBlockDataOptions, type ResolveLayoutBlockDataOptions, resolveBlockData, resolveEditorBlockData, resolveEditorLayoutBlockData, resolveLayoutBlockData };

package/dist/internal-server.js

@@ -135,6 +135,7 @@ async function resolveEditorLayoutBlockData({
   groups,
   blocks,
   position,
+  page,
   locale,
   defaultLocale,
   enabledLocales,
@@ -153,7 +154,7 @@ async function resolveEditorLayoutBlockData({
     enabledLocales,
     isPreview,
     forms,
-    { app: appContext }
+    { page, app: appContext }
   );
   const resolved = await resolveBlocks(
     layoutBlocks,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cmssy/react",
-  "version": "14.0.0",
+  "version": "14.1.0",
   "description": "React blocks, renderers, data client and editor bridge for cmssy headless sites",
   "keywords": [
     "cmssy",
@@ -96,8 +96,8 @@
     "vitest": "^2.1.0"
   },
   "dependencies": {
-    "@cmssy/types": "0.38.0",
-    "@cmssy/core": "14.0.0"
+    "@cmssy/types": "0.39.0",
+    "@cmssy/core": "14.1.0"
   },
   "scripts": {
     "build": "tsup",