@cmssy/react 14.0.0 → 14.2.0

package/dist/client.cjs

@@ -7,43 +7,11 @@ var internal = require('@cmssy/core/internal');
 var blockErrorBoundary = require('@cmssy/react/block-error-boundary');
 var jsxRuntime = require('react/jsx-runtime');
 
-// src/registry.ts
 function buildBlockMap(blocks) {
   const map = /* @__PURE__ */ Object.create(null);
   for (const block of blocks) map[block.type] = block.component;
   return map;
 }
-function propsToSchema(props) {
-  const schema = {};
-  for (const [key, def] of Object.entries(props)) {
-    schema[key] = { ...def, label: def.label || key };
-  }
-  return schema;
-}
-function blocksToSchemas(blocks) {
-  const out = /* @__PURE__ */ Object.create(null);
-  for (const block of blocks) out[block.type] = propsToSchema(block.props);
-  return out;
-}
-function layoutRegionsToBridge(regions) {
-  return regions.map(
-    (region) => region.settings ? { ...region, settings: propsToSchema(region.settings) } : { ...region }
-  );
-}
-function blocksToMeta(blocks, defaults = {}) {
-  const out = /* @__PURE__ */ Object.create(null);
-  for (const block of blocks) {
-    const category = block.category ?? defaults.category;
-    out[block.type] = {
-      label: block.label ?? block.type,
-      ...category ? { category } : {},
-      ...block.icon ? { icon: block.icon } : {},
-      ...block.layoutPositions ? { layoutPositions: block.layoutPositions } : {},
-      ...block.description ? { description: block.description } : {}
-    };
-  }
-  return out;
-}
 
 // src/bridge/shortcut-keys.ts
 function isMacPlatform() {
@@ -322,7 +290,7 @@ function useEditBridge(page, config) {
           schemas: config.schemas ?? /* @__PURE__ */ Object.create(null),
           blockMeta: config.blockMeta ?? /* @__PURE__ */ Object.create(null),
           capabilities: canDetectInvisibleBlocks() ? ["shortcuts", "invisible-blocks"] : ["shortcuts"],
-          ...config.layoutRegions ? { layoutRegions: layoutRegionsToBridge(config.layoutRegions) } : {}
+          ...config.layoutRegions ? { layoutRegions: core.layoutRegionsToBridge(config.layoutRegions) } : {}
         });
       } catch (error) {
         if (typeof console !== "undefined") {
@@ -879,8 +847,8 @@ function EditableBlocks({
   const bridgeConfig = react.useMemo(
     () => ({
       ...edit,
-      schemas: edit.schemas ?? blocksToSchemas(blocks),
-      blockMeta: edit.blockMeta ?? blocksToMeta(blocks, { category })
+      schemas: edit.schemas ?? core.blocksToSchemas(blocks),
+      blockMeta: edit.blockMeta ?? core.blocksToMeta(blocks, { category })
     }),
     [edit, blocks, category]
   );
@@ -1012,6 +980,7 @@ function CmssyEditableLayout({
   groups,
   blocks,
   position,
+  page,
   locale = "en",
   defaultLocale = "en",
   enabledLocales,
@@ -1022,7 +991,7 @@ function CmssyEditableLayout({
 }) {
   const blockMap = react.useMemo(() => buildBlockMap(blocks), [blocks]);
   const schemas = react.useMemo(
-    () => edit.schemas ?? blocksToSchemas(blocks),
+    () => edit.schemas ?? core.blocksToSchemas(blocks),
     [edit.schemas, blocks]
   );
   const layoutBlocks = react.useMemo(() => {
@@ -1032,9 +1001,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-Hogm3pjD.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-Hogm3pjD.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

@@ -1,47 +1,15 @@
 "use client";
 import { useState, useRef, useEffect, useMemo, createElement } from 'react';
-import { postToEditor, PROTOCOL_VERSION, parseEditorMessage } from '@cmssy/core';
+import { blocksToMeta, blocksToSchemas, postToEditor, layoutRegionsToBridge, PROTOCOL_VERSION, parseEditorMessage } from '@cmssy/core';
 import { resolveInitialTarget, buildBlockContext, getBlockContentForLanguage, normalizeBlockContent, asBucket } from '@cmssy/core/internal';
 import { BlockErrorBoundary } from '@cmssy/react/block-error-boundary';
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 
-// src/registry.ts
 function buildBlockMap(blocks) {
   const map = /* @__PURE__ */ Object.create(null);
   for (const block of blocks) map[block.type] = block.component;
   return map;
 }
-function propsToSchema(props) {
-  const schema = {};
-  for (const [key, def] of Object.entries(props)) {
-    schema[key] = { ...def, label: def.label || key };
-  }
-  return schema;
-}
-function blocksToSchemas(blocks) {
-  const out = /* @__PURE__ */ Object.create(null);
-  for (const block of blocks) out[block.type] = propsToSchema(block.props);
-  return out;
-}
-function layoutRegionsToBridge(regions) {
-  return regions.map(
-    (region) => region.settings ? { ...region, settings: propsToSchema(region.settings) } : { ...region }
-  );
-}
-function blocksToMeta(blocks, defaults = {}) {
-  const out = /* @__PURE__ */ Object.create(null);
-  for (const block of blocks) {
-    const category = block.category ?? defaults.category;
-    out[block.type] = {
-      label: block.label ?? block.type,
-      ...category ? { category } : {},
-      ...block.icon ? { icon: block.icon } : {},
-      ...block.layoutPositions ? { layoutPositions: block.layoutPositions } : {},
-      ...block.description ? { description: block.description } : {}
-    };
-  }
-  return out;
-}
 
 // src/bridge/shortcut-keys.ts
 function isMacPlatform() {
@@ -1010,6 +978,7 @@ function CmssyEditableLayout({
   groups,
   blocks,
   position,
+  page,
   locale = "en",
   defaultLocale = "en",
   enabledLocales,
@@ -1030,9 +999,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

@@ -8,8 +8,6 @@ var jsxRuntime = require('react/jsx-runtime');
 var locale = require('@cmssy/core/internal/locale');
 
 // src/index.ts
-
-// src/registry.ts
 function defineBlock(def) {
   return def;
 }
@@ -25,18 +23,6 @@ function buildLoaderMap(blocks) {
   }
   return map;
 }
-function propsToSchema(props) {
-  const schema = {};
-  for (const [key, def] of Object.entries(props)) {
-    schema[key] = { ...def, label: def.label || key };
-  }
-  return schema;
-}
-function blocksToSchemas(blocks) {
-  const out = /* @__PURE__ */ Object.create(null);
-  for (const block of blocks) out[block.type] = propsToSchema(block.props);
-  return out;
-}
 
 // src/components/block-error.ts
 var BLOCK_ERROR_KEY = "__cmssyBlockError";
@@ -300,7 +286,7 @@ async function CmssyServerPage({
     defaultLocale,
     context,
     enabledLocales,
-    { schemas: blocksToSchemas(blocks), config, workspaceId: workspace?.id }
+    { schemas: core.blocksToSchemas(blocks), config, workspaceId: workspace?.id }
   );
   return /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, { children: page.blocks.map(
     (block, i) => renderResolvedBlock(block, map, locale, defaultLocale, {
@@ -356,7 +342,7 @@ async function resolveEditorBlockData({
     defaultLocale,
     context,
     enabledLocales,
-    { schemas: blocksToSchemas(blocks), config }
+    { schemas: core.blocksToSchemas(blocks), config }
   );
   return collectBlockData(page.blocks, resolved, isPreview);
 }
@@ -364,6 +350,7 @@ async function resolveEditorLayoutBlockData({
   groups,
   blocks,
   position,
+  page,
   locale,
   defaultLocale,
   enabledLocales,
@@ -382,7 +369,7 @@ async function resolveEditorLayoutBlockData({
     enabledLocales,
     isPreview,
     forms,
-    { app: appContext }
+    { page, app: appContext }
   );
   const resolved = await resolveBlocks(
     layoutBlocks,
@@ -391,16 +378,20 @@ async function resolveEditorLayoutBlockData({
     defaultLocale,
     context,
     enabledLocales,
-    { schemas: blocksToSchemas(blocks), config }
+    { schemas: core.blocksToSchemas(blocks), config }
   );
   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 +403,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 +422,7 @@ async function resolveCmssyLayoutSlot(config, options) {
     groups,
     blocks,
     position,
+    page,
     locale: locale$1,
     defaultLocale: siteLocales.defaultLocale,
     enabledLocales: siteLocales.locales,
@@ -448,12 +442,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 +466,9 @@ async function CmssyServerLayout({
     locale,
     defaultLocale,
     enabledLocales,
-    false,
+    preview,
     void 0,
-    { app: appContext }
+    { page, app: appContext }
   );
   const resolved = await resolveBlocks(
     layoutBlocks,
@@ -481,7 +477,7 @@ async function CmssyServerLayout({
     defaultLocale,
     context,
     enabledLocales,
-    { schemas: blocksToSchemas(blocks), config }
+    { schemas: core.blocksToSchemas(blocks), config }
   );
   return /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, { children: layoutBlocks.map(
     (block, i) => renderResolvedBlock(block, map, locale, defaultLocale, {
@@ -494,6 +490,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 +679,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-Hogm3pjD.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-Hogm3pjD.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-Hogm3pjD.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-Hogm3pjD.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

@@ -1,4 +1,4 @@
-import { resolveEditorOrigin } from '@cmssy/core';
+import { blocksToSchemas, resolveEditorOrigin } from '@cmssy/core';
 export { CmssyRequestError, PROTOCOL_VERSION, createCmssyClient, defineCmssyLayout, fields, graphqlRequest, isProtocolCompatible, mediaAlt, mediaUrl, mediaUrls, normalizeOrigin, parseEditorMessage, postToEditor } from '@cmssy/core';
 import { buildBlockContext, fetchLayouts, getBlockContentForLanguage, normalizeBlockContent, asBucket, resolveSiteLocales as resolveSiteLocales$1, resolveRelationContent } from '@cmssy/core/internal';
 export { buildBlockContext } from '@cmssy/core/internal';
@@ -8,8 +8,6 @@ import { jsx, Fragment, jsxs } from 'react/jsx-runtime';
 import { resolveSiteLocales, splitLocaleFromPath } from '@cmssy/core/internal/locale';
 
 // src/index.ts
-
-// src/registry.ts
 function defineBlock(def) {
   return def;
 }
@@ -25,18 +23,6 @@ function buildLoaderMap(blocks) {
   }
   return map;
 }
-function propsToSchema(props) {
-  const schema = {};
-  for (const [key, def] of Object.entries(props)) {
-    schema[key] = { ...def, label: def.label || key };
-  }
-  return schema;
-}
-function blocksToSchemas(blocks) {
-  const out = /* @__PURE__ */ Object.create(null);
-  for (const block of blocks) out[block.type] = propsToSchema(block.props);
-  return out;
-}
 
 // src/components/block-error.ts
 var BLOCK_ERROR_KEY = "__cmssyBlockError";
@@ -364,6 +350,7 @@ async function resolveEditorLayoutBlockData({
   groups,
   blocks,
   position,
+  page,
   locale,
   defaultLocale,
   enabledLocales,
@@ -382,7 +369,7 @@ async function resolveEditorLayoutBlockData({
     enabledLocales,
     isPreview,
     forms,
-    { app: appContext }
+    { page, app: appContext }
   );
   const resolved = await resolveBlocks(
     layoutBlocks,
@@ -395,12 +382,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 +403,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 +422,7 @@ async function resolveCmssyLayoutSlot(config, options) {
     groups,
     blocks,
     position,
+    page,
     locale,
     defaultLocale: siteLocales.defaultLocale,
     enabledLocales: siteLocales.locales,
@@ -448,12 +442,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 +466,9 @@ async function CmssyServerLayout({
     locale,
     defaultLocale,
     enabledLocales,
-    false,
+    preview,
     void 0,
-    { app: appContext }
+    { page, app: appContext }
   );
   const resolved = await resolveBlocks(
     layoutBlocks,
@@ -494,6 +490,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 +617,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-Hogm3pjD.d.cts}

@@ -1,5 +1,5 @@
+import { FieldDefinition, CmssyBlockContext, BlockPropsSchema, InferBlockContent, 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>;
@@ -65,6 +65,39 @@ type BlockMap = Record<string, ComponentType<{
     data?: unknown;
 }>>;
 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, resolveBlockData as g, resolveLayoutBlockData as h, resolveEditorBlockData as r };

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

@@ -1,5 +1,5 @@
+import { FieldDefinition, CmssyBlockContext, BlockPropsSchema, InferBlockContent, 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>;
@@ -65,6 +65,39 @@ type BlockMap = Record<string, ComponentType<{
     data?: unknown;
 }>>;
 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, resolveBlockData as g, resolveLayoutBlockData as h, resolveEditorBlockData as r };

package/dist/internal-server.cjs

@@ -1,10 +1,9 @@
 'use strict';
 
 var internal = require('@cmssy/core/internal');
+var core = require('@cmssy/core');
 
 // src/components/resolve-block-data.ts
-
-// src/registry.ts
 function buildLoaderMap(blocks) {
   const map = /* @__PURE__ */ Object.create(null);
   for (const block of blocks) {
@@ -12,18 +11,6 @@ function buildLoaderMap(blocks) {
   }
   return map;
 }
-function propsToSchema(props) {
-  const schema = {};
-  for (const [key, def] of Object.entries(props)) {
-    schema[key] = { ...def, label: def.label || key };
-  }
-  return schema;
-}
-function blocksToSchemas(blocks) {
-  const out = /* @__PURE__ */ Object.create(null);
-  for (const block of blocks) out[block.type] = propsToSchema(block.props);
-  return out;
-}
 
 // src/components/block-error.ts
 var BLOCK_ERROR_KEY = "__cmssyBlockError";
@@ -126,7 +113,7 @@ async function resolveEditorBlockData({
     defaultLocale,
     context,
     enabledLocales,
-    { schemas: blocksToSchemas(blocks), config }
+    { schemas: core.blocksToSchemas(blocks), config }
   );
   return collectBlockData(page.blocks, resolved, isPreview);
 }
@@ -137,6 +124,7 @@ async function resolveEditorLayoutBlockData({
   groups,
   blocks,
   position,
+  page,
   locale,
   defaultLocale,
   enabledLocales,
@@ -155,7 +143,7 @@ async function resolveEditorLayoutBlockData({
     enabledLocales,
     isPreview,
     forms,
-    { app: appContext }
+    { page, app: appContext }
   );
   const resolved = await resolveBlocks(
     layoutBlocks,
@@ -164,7 +152,7 @@ async function resolveEditorLayoutBlockData({
     defaultLocale,
     context,
     enabledLocales,
-    { schemas: blocksToSchemas(blocks), config }
+    { schemas: core.blocksToSchemas(blocks), config }
   );
   return collectBlockData(layoutBlocks, resolved, isPreview);
 }
@@ -172,7 +160,10 @@ async function resolveLayoutBlockData(options) {
   return (await resolveEditorLayoutBlockData(options)).data;
 }
 
-exports.blocksToSchemas = blocksToSchemas;
+Object.defineProperty(exports, "blocksToSchemas", {
+  enumerable: true,
+  get: function () { return core.blocksToSchemas; }
+});
 exports.resolveBlockData = resolveBlockData;
 exports.resolveEditorBlockData = resolveEditorBlockData;
 exports.resolveEditorLayoutBlockData = resolveEditorLayoutBlockData;

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 resolveBlockData, r as resolveEditorBlockData, f as resolveEditorLayoutBlockData, h as resolveLayoutBlockData } from './internal-server-Hogm3pjD.cjs';
+export { blocksToSchemas } from '@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 resolveBlockData, r as resolveEditorBlockData, f as resolveEditorLayoutBlockData, h as resolveLayoutBlockData } from './internal-server-Hogm3pjD.js';
+export { blocksToSchemas } from '@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

@@ -1,8 +1,8 @@
 import { buildBlockContext, getBlockContentForLanguage, resolveRelationContent, normalizeBlockContent } from '@cmssy/core/internal';
+import { blocksToSchemas } from '@cmssy/core';
+export { blocksToSchemas } from '@cmssy/core';
 
 // src/components/resolve-block-data.ts
-
-// src/registry.ts
 function buildLoaderMap(blocks) {
   const map = /* @__PURE__ */ Object.create(null);
   for (const block of blocks) {
@@ -10,18 +10,6 @@ function buildLoaderMap(blocks) {
   }
   return map;
 }
-function propsToSchema(props) {
-  const schema = {};
-  for (const [key, def] of Object.entries(props)) {
-    schema[key] = { ...def, label: def.label || key };
-  }
-  return schema;
-}
-function blocksToSchemas(blocks) {
-  const out = /* @__PURE__ */ Object.create(null);
-  for (const block of blocks) out[block.type] = propsToSchema(block.props);
-  return out;
-}
 
 // src/components/block-error.ts
 var BLOCK_ERROR_KEY = "__cmssyBlockError";
@@ -135,6 +123,7 @@ async function resolveEditorLayoutBlockData({
   groups,
   blocks,
   position,
+  page,
   locale,
   defaultLocale,
   enabledLocales,
@@ -153,7 +142,7 @@ async function resolveEditorLayoutBlockData({
     enabledLocales,
     isPreview,
     forms,
-    { app: appContext }
+    { page, app: appContext }
   );
   const resolved = await resolveBlocks(
     layoutBlocks,
@@ -170,4 +159,4 @@ async function resolveLayoutBlockData(options) {
   return (await resolveEditorLayoutBlockData(options)).data;
 }
 
-export { blocksToSchemas, resolveBlockData, resolveEditorBlockData, resolveEditorLayoutBlockData, resolveLayoutBlockData };
+export { resolveBlockData, resolveEditorBlockData, resolveEditorLayoutBlockData, resolveLayoutBlockData };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cmssy/react",
-  "version": "14.0.0",
+  "version": "14.2.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.2.0"
   },
   "scripts": {
     "build": "tsup",