@cmssy/react 9.6.0 → 9.7.0

package/dist/client.cjs

@@ -522,6 +522,8 @@ function CmssyBlock({
   patchedContent,
   patchedStyle,
   patchedAdvanced,
+  resolvedContent,
+  schema,
   editable,
   editMode,
   layoutPosition,
@@ -567,8 +569,9 @@ function CmssyBlock({
       )
     );
   }
-  const base = core.getBlockContentForLanguage(block.content, locale, defaultLocale);
+  const base = resolvedContent ? { ...resolvedContent } : core.getBlockContentForLanguage(block.content, locale, defaultLocale);
   const content = patchedContent ? { ...base, ...patchedContent } : base;
+  if (schema) core.normalizeRelationContent(content, schema);
   const style = patchedStyle ? { ...core.asBucket(block.style), ...patchedStyle } : core.asBucket(block.style);
   const advanced = patchedAdvanced ? { ...core.asBucket(block.advanced), ...patchedAdvanced } : core.asBucket(block.advanced);
   return wrap(
@@ -598,7 +601,8 @@ function CmssyEditablePage({
   edit,
   category,
   forms,
-  data
+  data,
+  resolvedContent
 }) {
   if (!Array.isArray(blocks)) {
     throw new Error(
@@ -617,7 +621,8 @@ function CmssyEditablePage({
       edit,
       category,
       forms,
-      data
+      data,
+      resolvedContent
     }
   );
 }
@@ -630,7 +635,8 @@ function EditableBlocks({
   edit,
   category,
   forms,
-  data
+  data,
+  resolvedContent
 }) {
   const blockMap = react.useMemo(() => buildBlockMap(blocks), [blocks]);
   const context = react.useMemo(
@@ -680,6 +686,8 @@ function EditableBlocks({
         patchedContent: patches[block.id],
         patchedStyle: patchesStyle[block.id],
         patchedAdvanced: patchesAdvanced[block.id],
+        resolvedContent: resolvedContent?.[block.id],
+        schema: bridgeConfig.schemas?.[block.type],
         blockMap,
         editable: true,
         context,
@@ -775,9 +783,14 @@ function CmssyEditableLayout({
   defaultLocale = "en",
   enabledLocales,
   edit,
-  data
+  data,
+  resolvedContent
 }) {
   const blockMap = react.useMemo(() => buildBlockMap(blocks), [blocks]);
+  const schemas = react.useMemo(
+    () => edit.schemas ?? blocksToSchemas(blocks),
+    [edit.schemas, blocks]
+  );
   const layoutBlocks = react.useMemo(() => {
     const group = groups.find((g) => g.position === position);
     return group ? group.blocks.filter((b) => b.isActive).slice().sort((a, b) => a.order - b.order) : [];
@@ -796,6 +809,8 @@ function CmssyEditableLayout({
       defaultLocale,
       blockMap,
       patchedContent: patches[block.id],
+      resolvedContent: resolvedContent?.[block.id],
+      schema: schemas[block.type],
       editMode: true,
       layoutPosition: position,
       context,

package/dist/client.d.cts

@@ -48,8 +48,9 @@ interface CmssyEditablePageProps {
     category?: string;
     forms?: Record<string, CmssyFormDefinition>;
     data?: Record<string, unknown>;
+    resolvedContent?: Record<string, Record<string, unknown>>;
 }
-declare function CmssyEditablePage({ page, blocks, locale, defaultLocale, enabledLocales, edit, category, forms, data, }: CmssyEditablePageProps): react_jsx_runtime.JSX.Element | null;
+declare function CmssyEditablePage({ page, blocks, locale, defaultLocale, enabledLocales, edit, category, forms, data, resolvedContent, }: CmssyEditablePageProps): react_jsx_runtime.JSX.Element | null;
 
 interface CmssyLazyEditorProps {
     page: CmssyPageData | null;
@@ -59,6 +60,7 @@ interface CmssyLazyEditorProps {
     edit: EditBridgeConfig;
     forms?: Record<string, CmssyFormDefinition>;
     data?: Record<string, unknown>;
+    resolvedContent?: Record<string, Record<string, unknown>>;
     load: () => Promise<{
         blocks: BlockDefinition[];
         category?: string;
@@ -75,8 +77,9 @@ interface CmssyEditableLayoutProps {
     enabledLocales?: string[];
     edit: EditBridgeConfig;
     data?: Record<string, unknown>;
+    resolvedContent?: Record<string, Record<string, unknown>>;
 }
-declare function CmssyEditableLayout({ groups, blocks, position, locale, defaultLocale, enabledLocales, edit, data, }: CmssyEditableLayoutProps): react_jsx_runtime.JSX.Element | null;
+declare function CmssyEditableLayout({ groups, blocks, position, locale, defaultLocale, enabledLocales, edit, data, resolvedContent, }: CmssyEditableLayoutProps): react_jsx_runtime.JSX.Element | null;
 
 interface CmssyLazyLayoutProps {
     groups: CmssyLayoutGroup[];
@@ -86,6 +89,7 @@ interface CmssyLazyLayoutProps {
     enabledLocales?: string[];
     edit: EditBridgeConfig;
     data?: Record<string, unknown>;
+    resolvedContent?: Record<string, Record<string, unknown>>;
     load: () => Promise<{
         blocks: BlockDefinition[];
     }>;

package/dist/client.d.ts

@@ -48,8 +48,9 @@ interface CmssyEditablePageProps {
     category?: string;
     forms?: Record<string, CmssyFormDefinition>;
     data?: Record<string, unknown>;
+    resolvedContent?: Record<string, Record<string, unknown>>;
 }
-declare function CmssyEditablePage({ page, blocks, locale, defaultLocale, enabledLocales, edit, category, forms, data, }: CmssyEditablePageProps): react_jsx_runtime.JSX.Element | null;
+declare function CmssyEditablePage({ page, blocks, locale, defaultLocale, enabledLocales, edit, category, forms, data, resolvedContent, }: CmssyEditablePageProps): react_jsx_runtime.JSX.Element | null;
 
 interface CmssyLazyEditorProps {
     page: CmssyPageData | null;
@@ -59,6 +60,7 @@ interface CmssyLazyEditorProps {
     edit: EditBridgeConfig;
     forms?: Record<string, CmssyFormDefinition>;
     data?: Record<string, unknown>;
+    resolvedContent?: Record<string, Record<string, unknown>>;
     load: () => Promise<{
         blocks: BlockDefinition[];
         category?: string;
@@ -75,8 +77,9 @@ interface CmssyEditableLayoutProps {
     enabledLocales?: string[];
     edit: EditBridgeConfig;
     data?: Record<string, unknown>;
+    resolvedContent?: Record<string, Record<string, unknown>>;
 }
-declare function CmssyEditableLayout({ groups, blocks, position, locale, defaultLocale, enabledLocales, edit, data, }: CmssyEditableLayoutProps): react_jsx_runtime.JSX.Element | null;
+declare function CmssyEditableLayout({ groups, blocks, position, locale, defaultLocale, enabledLocales, edit, data, resolvedContent, }: CmssyEditableLayoutProps): react_jsx_runtime.JSX.Element | null;
 
 interface CmssyLazyLayoutProps {
     groups: CmssyLayoutGroup[];
@@ -86,6 +89,7 @@ interface CmssyLazyLayoutProps {
     enabledLocales?: string[];
     edit: EditBridgeConfig;
     data?: Record<string, unknown>;
+    resolvedContent?: Record<string, Record<string, unknown>>;
     load: () => Promise<{
         blocks: BlockDefinition[];
     }>;

package/dist/client.js

@@ -1,6 +1,6 @@
 "use client";
 import { createContext, useState, useRef, useEffect, useMemo, useContext, useCallback, createElement } from 'react';
-import { fields, resolveInitialTarget, buildBlockContext, postToEditor, PROTOCOL_VERSION, parseEditorMessage, getBlockContentForLanguage, asBucket, toMinorUnits, formatPrice } from '@cmssy/core';
+import { fields, resolveInitialTarget, buildBlockContext, postToEditor, PROTOCOL_VERSION, parseEditorMessage, getBlockContentForLanguage, normalizeRelationContent, asBucket, toMinorUnits, formatPrice } from '@cmssy/core';
 export { formatPrice, fractionDigits, fromMinorUnits, toMinorUnits } from '@cmssy/core';
 import { BlockErrorBoundary } from '@cmssy/react/block-error-boundary';
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
@@ -521,6 +521,8 @@ function CmssyBlock({
   patchedContent,
   patchedStyle,
   patchedAdvanced,
+  resolvedContent,
+  schema,
   editable,
   editMode,
   layoutPosition,
@@ -566,8 +568,9 @@ function CmssyBlock({
       )
     );
   }
-  const base = getBlockContentForLanguage(block.content, locale, defaultLocale);
+  const base = resolvedContent ? { ...resolvedContent } : getBlockContentForLanguage(block.content, locale, defaultLocale);
   const content = patchedContent ? { ...base, ...patchedContent } : base;
+  if (schema) normalizeRelationContent(content, schema);
   const style = patchedStyle ? { ...asBucket(block.style), ...patchedStyle } : asBucket(block.style);
   const advanced = patchedAdvanced ? { ...asBucket(block.advanced), ...patchedAdvanced } : asBucket(block.advanced);
   return wrap(
@@ -597,7 +600,8 @@ function CmssyEditablePage({
   edit,
   category,
   forms,
-  data
+  data,
+  resolvedContent
 }) {
   if (!Array.isArray(blocks)) {
     throw new Error(
@@ -616,7 +620,8 @@ function CmssyEditablePage({
       edit,
       category,
       forms,
-      data
+      data,
+      resolvedContent
     }
   );
 }
@@ -629,7 +634,8 @@ function EditableBlocks({
   edit,
   category,
   forms,
-  data
+  data,
+  resolvedContent
 }) {
   const blockMap = useMemo(() => buildBlockMap(blocks), [blocks]);
   const context = useMemo(
@@ -679,6 +685,8 @@ function EditableBlocks({
         patchedContent: patches[block.id],
         patchedStyle: patchesStyle[block.id],
         patchedAdvanced: patchesAdvanced[block.id],
+        resolvedContent: resolvedContent?.[block.id],
+        schema: bridgeConfig.schemas?.[block.type],
         blockMap,
         editable: true,
         context,
@@ -774,9 +782,14 @@ function CmssyEditableLayout({
   defaultLocale = "en",
   enabledLocales,
   edit,
-  data
+  data,
+  resolvedContent
 }) {
   const blockMap = useMemo(() => buildBlockMap(blocks), [blocks]);
+  const schemas = useMemo(
+    () => edit.schemas ?? blocksToSchemas(blocks),
+    [edit.schemas, blocks]
+  );
   const layoutBlocks = useMemo(() => {
     const group = groups.find((g) => g.position === position);
     return group ? group.blocks.filter((b) => b.isActive).slice().sort((a, b) => a.order - b.order) : [];
@@ -795,6 +808,8 @@ function CmssyEditableLayout({
       defaultLocale,
       blockMap,
       patchedContent: patches[block.id],
+      resolvedContent: resolvedContent?.[block.id],
+      schema: schemas[block.type],
       editMode: true,
       layoutPosition: position,
       context,

package/dist/index.cjs

@@ -319,18 +319,20 @@ async function CmssyServerPage({
 }
 function collectBlockData(blocks, resolved, isPreview) {
   const data = {};
+  const content = {};
   blocks.forEach((block, index) => {
     const entry = resolved[index];
     if (!entry) return;
+    content[block.id] = entry.content;
     if (entry.error && isPreview) {
       data[block.id] = markBlockError(entry.error);
     } else if (entry.data !== void 0) {
       data[block.id] = entry.data;
     }
   });
-  return data;
+  return { data, content };
 }
-async function resolveBlockData({
+async function resolveEditorBlockData({
   page,
   blocks,
   locale,
@@ -340,7 +342,7 @@ async function resolveBlockData({
   isPreview = false,
   config
 }) {
-  if (!page) return {};
+  if (!page) return { data: {}, content: {} };
   const loaderMap = buildLoaderMap(blocks);
   const context = core.buildBlockContext(
     locale,
@@ -360,7 +362,10 @@ async function resolveBlockData({
   );
   return collectBlockData(page.blocks, resolved, isPreview);
 }
-async function resolveLayoutBlockData({
+async function resolveBlockData(options) {
+  return (await resolveEditorBlockData(options)).data;
+}
+async function resolveEditorLayoutBlockData({
   groups,
   blocks,
   position,
@@ -373,7 +378,7 @@ async function resolveLayoutBlockData({
 }) {
   const group = groups.find((g) => g.position === position);
   const layoutBlocks = group ? group.blocks.filter((b) => b.isActive).slice().sort((a, b) => a.order - b.order) : [];
-  if (layoutBlocks.length === 0) return {};
+  if (layoutBlocks.length === 0) return { data: {}, content: {} };
   const loaderMap = buildLoaderMap(blocks);
   const context = core.buildBlockContext(
     locale,
@@ -393,6 +398,9 @@ async function resolveLayoutBlockData({
   );
   return collectBlockData(layoutBlocks, resolved, isPreview);
 }
+async function resolveLayoutBlockData(options) {
+  return (await resolveEditorLayoutBlockData(options)).data;
+}
 async function CmssyServerLayout({
   groups,
   blocks,
@@ -443,6 +451,8 @@ function CmssyBlock({
   patchedContent,
   patchedStyle,
   patchedAdvanced,
+  resolvedContent,
+  schema,
   editable,
   editMode,
   layoutPosition,
@@ -488,8 +498,9 @@ function CmssyBlock({
       )
     );
   }
-  const base = core.getBlockContentForLanguage(block.content, locale, defaultLocale);
+  const base = resolvedContent ? { ...resolvedContent } : core.getBlockContentForLanguage(block.content, locale, defaultLocale);
   const content = patchedContent ? { ...base, ...patchedContent } : base;
+  if (schema) core.normalizeRelationContent(content, schema);
   const style = patchedStyle ? { ...core.asBucket(block.style), ...patchedStyle } : core.asBucket(block.style);
   const advanced = patchedAdvanced ? { ...core.asBucket(block.advanced), ...patchedAdvanced } : core.asBucket(block.advanced);
   return wrap(
@@ -660,4 +671,6 @@ exports.blocksToSchemas = blocksToSchemas;
 exports.buildBlockMap = buildBlockMap;
 exports.defineBlock = defineBlock;
 exports.resolveBlockData = resolveBlockData;
+exports.resolveEditorBlockData = resolveEditorBlockData;
+exports.resolveEditorLayoutBlockData = resolveEditorLayoutBlockData;
 exports.resolveLayoutBlockData = resolveLayoutBlockData;

package/dist/index.d.cts

@@ -3,6 +3,7 @@ export { AppToEditorMessage, BlockMeta, BlockPropsSchema, BlockRect, BlockSchema
 import { B as BlockDefinition, a as BlockMap } from './registry-Bfq4Pq18.cjs';
 export { b as BlockProps, c as blocksToMeta, d as blocksToSchemas, e as buildBlockMap, f as defineBlock } from './registry-Bfq4Pq18.cjs';
 import * as react_jsx_runtime from 'react/jsx-runtime';
+import { FieldDefinition } from '@cmssy/types';
 export { FieldCondition, FieldConditionGroup, FieldConditionLogic, evaluateFieldConditionGroup } from '@cmssy/types';
 import 'react';
 
@@ -33,6 +34,10 @@ interface CmssyServerPageProps {
  */
 declare function CmssyServerPage({ page, blocks, locale: localeProp, defaultLocale: defaultLocaleProp, enabledLocales: enabledLocalesProp, config, forms, auth, workspace, editMode, }: CmssyServerPageProps): Promise<react_jsx_runtime.JSX.Element | null>;
 
+interface EditorBlockData {
+    data: Record<string, unknown>;
+    content: Record<string, Record<string, unknown>>;
+}
 interface ResolveBlockDataOptions {
     page: CmssyPageData | null;
     blocks: BlockDefinition[];
@@ -44,7 +49,8 @@ interface ResolveBlockDataOptions {
     /** Workspace the relation records are read from. No config, no resolution. */
     config?: CmssyClientConfig;
 }
-declare function resolveBlockData({ page, blocks, locale, defaultLocale, enabledLocales, forms, isPreview, config, }: ResolveBlockDataOptions): Promise<Record<string, unknown>>;
+declare function resolveEditorBlockData({ page, blocks, locale, defaultLocale, enabledLocales, forms, isPreview, config, }: ResolveBlockDataOptions): Promise<EditorBlockData>;
+declare function resolveBlockData(options: ResolveBlockDataOptions): Promise<Record<string, unknown>>;
 interface ResolveLayoutBlockDataOptions {
     groups: CmssyLayoutGroup[];
     blocks: BlockDefinition[];
@@ -57,7 +63,8 @@ interface ResolveLayoutBlockDataOptions {
     /** Workspace the relation records are read from. No config, no resolution. */
     config?: CmssyClientConfig;
 }
-declare function resolveLayoutBlockData({ groups, blocks, position, locale, defaultLocale, enabledLocales, forms, isPreview, config, }: ResolveLayoutBlockDataOptions): Promise<Record<string, unknown>>;
+declare function resolveEditorLayoutBlockData({ groups, blocks, position, locale, defaultLocale, enabledLocales, forms, isPreview, config, }: ResolveLayoutBlockDataOptions): Promise<EditorBlockData>;
+declare function resolveLayoutBlockData(options: ResolveLayoutBlockDataOptions): Promise<Record<string, unknown>>;
 
 interface CmssyServerLayoutProps {
     groups: CmssyLayoutGroup[];
@@ -90,17 +97,21 @@ interface CmssyBlockProps {
     patchedContent?: Record<string, unknown>;
     patchedStyle?: Record<string, unknown>;
     patchedAdvanced?: Record<string, unknown>;
+    /** Server-resolved content for this block (locale flattened, relations resolved). */
+    resolvedContent?: Record<string, unknown>;
+    /** The block's field schema; lets the client render coerce raw relation values. */
+    schema?: Record<string, FieldDefinition>;
     editable?: boolean;
     editMode?: boolean;
     layoutPosition?: string;
     context?: CmssyBlockContext;
     data?: unknown;
 }
-declare function CmssyBlock({ block, locale, defaultLocale, blockMap, patchedContent, patchedStyle, patchedAdvanced, editable, editMode, layoutPosition, context, data, }: CmssyBlockProps): react_jsx_runtime.JSX.Element | null;
+declare function CmssyBlock({ block, locale, defaultLocale, blockMap, patchedContent, patchedStyle, patchedAdvanced, resolvedContent, schema, editable, editMode, layoutPosition, context, data, }: CmssyBlockProps): react_jsx_runtime.JSX.Element | null;
 
 interface UnknownBlockProps {
     type: string;
 }
 declare function UnknownBlock({ type }: UnknownBlockProps): react_jsx_runtime.JSX.Element;
 
-export { BlockDefinition, BlockMap, CmssyBlock, type CmssyBlockProps, CmssyServerLayout, type CmssyServerLayoutProps, CmssyServerPage, type CmssyServerPageProps, type ResolveBlockDataOptions, type ResolveLayoutBlockDataOptions, UnknownBlock, type UnknownBlockProps, resolveBlockData, resolveLayoutBlockData };
+export { BlockDefinition, BlockMap, CmssyBlock, type CmssyBlockProps, CmssyServerLayout, type CmssyServerLayoutProps, CmssyServerPage, type CmssyServerPageProps, type EditorBlockData, type ResolveBlockDataOptions, type ResolveLayoutBlockDataOptions, UnknownBlock, type UnknownBlockProps, resolveBlockData, resolveEditorBlockData, resolveEditorLayoutBlockData, resolveLayoutBlockData };

package/dist/index.d.ts

@@ -3,6 +3,7 @@ export { AppToEditorMessage, BlockMeta, BlockPropsSchema, BlockRect, BlockSchema
 import { B as BlockDefinition, a as BlockMap } from './registry-Bfq4Pq18.js';
 export { b as BlockProps, c as blocksToMeta, d as blocksToSchemas, e as buildBlockMap, f as defineBlock } from './registry-Bfq4Pq18.js';
 import * as react_jsx_runtime from 'react/jsx-runtime';
+import { FieldDefinition } from '@cmssy/types';
 export { FieldCondition, FieldConditionGroup, FieldConditionLogic, evaluateFieldConditionGroup } from '@cmssy/types';
 import 'react';
 
@@ -33,6 +34,10 @@ interface CmssyServerPageProps {
  */
 declare function CmssyServerPage({ page, blocks, locale: localeProp, defaultLocale: defaultLocaleProp, enabledLocales: enabledLocalesProp, config, forms, auth, workspace, editMode, }: CmssyServerPageProps): Promise<react_jsx_runtime.JSX.Element | null>;
 
+interface EditorBlockData {
+    data: Record<string, unknown>;
+    content: Record<string, Record<string, unknown>>;
+}
 interface ResolveBlockDataOptions {
     page: CmssyPageData | null;
     blocks: BlockDefinition[];
@@ -44,7 +49,8 @@ interface ResolveBlockDataOptions {
     /** Workspace the relation records are read from. No config, no resolution. */
     config?: CmssyClientConfig;
 }
-declare function resolveBlockData({ page, blocks, locale, defaultLocale, enabledLocales, forms, isPreview, config, }: ResolveBlockDataOptions): Promise<Record<string, unknown>>;
+declare function resolveEditorBlockData({ page, blocks, locale, defaultLocale, enabledLocales, forms, isPreview, config, }: ResolveBlockDataOptions): Promise<EditorBlockData>;
+declare function resolveBlockData(options: ResolveBlockDataOptions): Promise<Record<string, unknown>>;
 interface ResolveLayoutBlockDataOptions {
     groups: CmssyLayoutGroup[];
     blocks: BlockDefinition[];
@@ -57,7 +63,8 @@ interface ResolveLayoutBlockDataOptions {
     /** Workspace the relation records are read from. No config, no resolution. */
     config?: CmssyClientConfig;
 }
-declare function resolveLayoutBlockData({ groups, blocks, position, locale, defaultLocale, enabledLocales, forms, isPreview, config, }: ResolveLayoutBlockDataOptions): Promise<Record<string, unknown>>;
+declare function resolveEditorLayoutBlockData({ groups, blocks, position, locale, defaultLocale, enabledLocales, forms, isPreview, config, }: ResolveLayoutBlockDataOptions): Promise<EditorBlockData>;
+declare function resolveLayoutBlockData(options: ResolveLayoutBlockDataOptions): Promise<Record<string, unknown>>;
 
 interface CmssyServerLayoutProps {
     groups: CmssyLayoutGroup[];
@@ -90,17 +97,21 @@ interface CmssyBlockProps {
     patchedContent?: Record<string, unknown>;
     patchedStyle?: Record<string, unknown>;
     patchedAdvanced?: Record<string, unknown>;
+    /** Server-resolved content for this block (locale flattened, relations resolved). */
+    resolvedContent?: Record<string, unknown>;
+    /** The block's field schema; lets the client render coerce raw relation values. */
+    schema?: Record<string, FieldDefinition>;
     editable?: boolean;
     editMode?: boolean;
     layoutPosition?: string;
     context?: CmssyBlockContext;
     data?: unknown;
 }
-declare function CmssyBlock({ block, locale, defaultLocale, blockMap, patchedContent, patchedStyle, patchedAdvanced, editable, editMode, layoutPosition, context, data, }: CmssyBlockProps): react_jsx_runtime.JSX.Element | null;
+declare function CmssyBlock({ block, locale, defaultLocale, blockMap, patchedContent, patchedStyle, patchedAdvanced, resolvedContent, schema, editable, editMode, layoutPosition, context, data, }: CmssyBlockProps): react_jsx_runtime.JSX.Element | null;
 
 interface UnknownBlockProps {
     type: string;
 }
 declare function UnknownBlock({ type }: UnknownBlockProps): react_jsx_runtime.JSX.Element;
 
-export { BlockDefinition, BlockMap, CmssyBlock, type CmssyBlockProps, CmssyServerLayout, type CmssyServerLayoutProps, CmssyServerPage, type CmssyServerPageProps, type ResolveBlockDataOptions, type ResolveLayoutBlockDataOptions, UnknownBlock, type UnknownBlockProps, resolveBlockData, resolveLayoutBlockData };
+export { BlockDefinition, BlockMap, CmssyBlock, type CmssyBlockProps, CmssyServerLayout, type CmssyServerLayoutProps, CmssyServerPage, type CmssyServerPageProps, type EditorBlockData, type ResolveBlockDataOptions, type ResolveLayoutBlockDataOptions, UnknownBlock, type UnknownBlockProps, resolveBlockData, resolveEditorBlockData, resolveEditorLayoutBlockData, resolveLayoutBlockData };

package/dist/index.js

@@ -1,4 +1,4 @@
-import { buildBlockContext, getBlockContentForLanguage, asBucket, resolveSiteLocales, resolveRelationContent } from '@cmssy/core';
+import { buildBlockContext, getBlockContentForLanguage, normalizeRelationContent, asBucket, resolveSiteLocales, resolveRelationContent } from '@cmssy/core';
 export { CmssyRequestError, DEFAULT_CMSSY_API_URL, FORM_QUERY, MODEL_DEFINITIONS_QUERY, MODEL_RECORDS_QUERY, PROTOCOL_VERSION, SITE_CONFIG_QUERY, SUBMIT_FORM_MUTATION, buildBlockContext, buildLocaleSwitchHref, collectFormIds, createCmssyClient, fetchLayouts, fetchPage, fetchPageById, fetchPageMeta, fetchPages, fetchSiteConfig, fields, getBlockContentForLanguage, graphqlRequest, isProtocolCompatible, localizeHref, localizeHtmlLinks, normalizeOrigin, normalizeSlug, parseEditorMessage, postToEditor, resolveApiUrl, resolveForms, resolvePublicUrl, resolveSiteLocales, resolveWorkspaceId, splitLocaleFromPath } from '@cmssy/core';
 import { createElement } from 'react';
 import { BlockErrorBoundary } from '@cmssy/react/block-error-boundary';
@@ -318,18 +318,20 @@ async function CmssyServerPage({
 }
 function collectBlockData(blocks, resolved, isPreview) {
   const data = {};
+  const content = {};
   blocks.forEach((block, index) => {
     const entry = resolved[index];
     if (!entry) return;
+    content[block.id] = entry.content;
     if (entry.error && isPreview) {
       data[block.id] = markBlockError(entry.error);
     } else if (entry.data !== void 0) {
       data[block.id] = entry.data;
     }
   });
-  return data;
+  return { data, content };
 }
-async function resolveBlockData({
+async function resolveEditorBlockData({
   page,
   blocks,
   locale,
@@ -339,7 +341,7 @@ async function resolveBlockData({
   isPreview = false,
   config
 }) {
-  if (!page) return {};
+  if (!page) return { data: {}, content: {} };
   const loaderMap = buildLoaderMap(blocks);
   const context = buildBlockContext(
     locale,
@@ -359,7 +361,10 @@ async function resolveBlockData({
   );
   return collectBlockData(page.blocks, resolved, isPreview);
 }
-async function resolveLayoutBlockData({
+async function resolveBlockData(options) {
+  return (await resolveEditorBlockData(options)).data;
+}
+async function resolveEditorLayoutBlockData({
   groups,
   blocks,
   position,
@@ -372,7 +377,7 @@ async function resolveLayoutBlockData({
 }) {
   const group = groups.find((g) => g.position === position);
   const layoutBlocks = group ? group.blocks.filter((b) => b.isActive).slice().sort((a, b) => a.order - b.order) : [];
-  if (layoutBlocks.length === 0) return {};
+  if (layoutBlocks.length === 0) return { data: {}, content: {} };
   const loaderMap = buildLoaderMap(blocks);
   const context = buildBlockContext(
     locale,
@@ -392,6 +397,9 @@ async function resolveLayoutBlockData({
   );
   return collectBlockData(layoutBlocks, resolved, isPreview);
 }
+async function resolveLayoutBlockData(options) {
+  return (await resolveEditorLayoutBlockData(options)).data;
+}
 async function CmssyServerLayout({
   groups,
   blocks,
@@ -442,6 +450,8 @@ function CmssyBlock({
   patchedContent,
   patchedStyle,
   patchedAdvanced,
+  resolvedContent,
+  schema,
   editable,
   editMode,
   layoutPosition,
@@ -487,8 +497,9 @@ function CmssyBlock({
       )
     );
   }
-  const base = getBlockContentForLanguage(block.content, locale, defaultLocale);
+  const base = resolvedContent ? { ...resolvedContent } : getBlockContentForLanguage(block.content, locale, defaultLocale);
   const content = patchedContent ? { ...base, ...patchedContent } : base;
+  if (schema) normalizeRelationContent(content, schema);
   const style = patchedStyle ? { ...asBucket(block.style), ...patchedStyle } : asBucket(block.style);
   const advanced = patchedAdvanced ? { ...asBucket(block.advanced), ...patchedAdvanced } : asBucket(block.advanced);
   return wrap(
@@ -510,4 +521,4 @@ function CmssyBlock({
   );
 }
 
-export { CmssyBlock, CmssyServerLayout, CmssyServerPage, UnknownBlock, blocksToMeta, blocksToSchemas, buildBlockMap, defineBlock, resolveBlockData, resolveLayoutBlockData };
+export { CmssyBlock, CmssyServerLayout, CmssyServerPage, UnknownBlock, blocksToMeta, blocksToSchemas, buildBlockMap, defineBlock, resolveBlockData, resolveEditorBlockData, resolveEditorLayoutBlockData, resolveLayoutBlockData };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cmssy/react",
-  "version": "9.6.0",
+  "version": "9.7.0",
   "description": "React blocks, renderers, data client and editor bridge for cmssy headless sites",
   "keywords": [
     "cmssy",
@@ -62,7 +62,7 @@
   },
   "dependencies": {
     "@cmssy/types": "0.29.0",
-    "@cmssy/core": "9.6.0"
+    "@cmssy/core": "9.7.0"
   },
   "scripts": {
     "build": "tsup",