@cmssy/react 10.7.0 → 10.9.0

package/dist/client.cjs

@@ -870,8 +870,10 @@ function CmssyLazyLayout({ load, ...props }) {
       active = false;
     };
   }, [load]);
-  if (!blocks) return null;
-  return /* @__PURE__ */ jsxRuntime.jsx(CmssyEditableLayout, { ...props, blocks });
+  return /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
+    /* @__PURE__ */ jsxRuntime.jsx("div", { "data-cmssy-layout-slot": props.position, hidden: true }),
+    blocks ? /* @__PURE__ */ jsxRuntime.jsx(CmssyEditableLayout, { ...props, blocks }) : null
+  ] });
 }
 
 exports.CmssyEditableLayout = CmssyEditableLayout;

package/dist/client.d.cts

@@ -99,6 +99,6 @@ interface CmssyLazyLayoutProps {
         blocks: BlockDefinition[];
     }>;
 }
-declare function CmssyLazyLayout({ load, ...props }: CmssyLazyLayoutProps): react_jsx_runtime.JSX.Element | null;
+declare function CmssyLazyLayout({ load, ...props }: CmssyLazyLayoutProps): react_jsx_runtime.JSX.Element;
 
 export { CmssyEditableLayout, type CmssyEditableLayoutProps, CmssyEditablePage, type CmssyEditablePageProps, CmssyLazyEditor, type CmssyLazyEditorProps, CmssyLazyLayout, type CmssyLazyLayoutProps, type EditBridgeConfig, type EditBridgeState, type PatchMap, useEditBridge };

package/dist/client.d.ts

@@ -99,6 +99,6 @@ interface CmssyLazyLayoutProps {
         blocks: BlockDefinition[];
     }>;
 }
-declare function CmssyLazyLayout({ load, ...props }: CmssyLazyLayoutProps): react_jsx_runtime.JSX.Element | null;
+declare function CmssyLazyLayout({ load, ...props }: CmssyLazyLayoutProps): react_jsx_runtime.JSX.Element;
 
 export { CmssyEditableLayout, type CmssyEditableLayoutProps, CmssyEditablePage, type CmssyEditablePageProps, CmssyLazyEditor, type CmssyLazyEditorProps, CmssyLazyLayout, type CmssyLazyLayoutProps, type EditBridgeConfig, type EditBridgeState, type PatchMap, useEditBridge };

package/dist/client.js

@@ -868,8 +868,10 @@ function CmssyLazyLayout({ load, ...props }) {
       active = false;
     };
   }, [load]);
-  if (!blocks) return null;
-  return /* @__PURE__ */ jsx(CmssyEditableLayout, { ...props, blocks });
+  return /* @__PURE__ */ jsxs(Fragment, { children: [
+    /* @__PURE__ */ jsx("div", { "data-cmssy-layout-slot": props.position, hidden: true }),
+    blocks ? /* @__PURE__ */ jsx(CmssyEditableLayout, { ...props, blocks }) : null
+  ] });
 }
 
 export { CmssyEditableLayout, CmssyEditablePage, CmssyLazyEditor, CmssyLazyLayout, useEditBridge };

package/dist/index.cjs

@@ -52,6 +52,9 @@ function unregisteredBlockError(type) {
     message: `Block type "${type}" is not registered in this site's blocks array.`
   };
 }
+function markBlockError(error) {
+  return { [BLOCK_ERROR_KEY]: error };
+}
 function readBlockError(value) {
   if (typeof value !== "object" || value === null) return void 0;
   const marked = value[BLOCK_ERROR_KEY];
@@ -301,6 +304,88 @@ 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, content };
+}
+async function resolveEditorBlockData({
+  page,
+  blocks,
+  locale,
+  defaultLocale,
+  enabledLocales,
+  forms,
+  isPreview = false,
+  config,
+  appContext
+}) {
+  if (!page) return { data: {}, content: {} };
+  const loaderMap = buildLoaderMap(blocks);
+  const context = internal.buildBlockContext(
+    locale,
+    defaultLocale,
+    enabledLocales,
+    isPreview,
+    forms,
+    { page, app: appContext }
+  );
+  const resolved = await resolveBlocks(
+    page.blocks,
+    loaderMap,
+    locale,
+    defaultLocale,
+    context,
+    enabledLocales,
+    { schemas: blocksToSchemas(blocks), config }
+  );
+  return collectBlockData(page.blocks, resolved, isPreview);
+}
+async function resolveEditorLayoutBlockData({
+  groups,
+  blocks,
+  position,
+  locale,
+  defaultLocale,
+  enabledLocales,
+  forms,
+  isPreview = false,
+  config,
+  appContext
+}) {
+  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 { data: {}, content: {} };
+  const loaderMap = buildLoaderMap(blocks);
+  const context = internal.buildBlockContext(
+    locale,
+    defaultLocale,
+    enabledLocales,
+    isPreview,
+    forms,
+    { app: appContext }
+  );
+  const resolved = await resolveBlocks(
+    layoutBlocks,
+    loaderMap,
+    locale,
+    defaultLocale,
+    context,
+    enabledLocales,
+    { schemas: blocksToSchemas(blocks), config }
+  );
+  return collectBlockData(layoutBlocks, resolved, isPreview);
+}
 async function CmssyServerLayout({
   groups,
   blocks,
@@ -476,3 +561,5 @@ exports.CmssyServerPage = CmssyServerPage;
 exports.UnknownBlock = UnknownBlock;
 exports.buildBlockMap = buildBlockMap;
 exports.defineBlock = defineBlock;
+exports.resolveEditorBlockData = resolveEditorBlockData;
+exports.resolveEditorLayoutBlockData = resolveEditorLayoutBlockData;

package/dist/index.d.cts

@@ -6,7 +6,7 @@ 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 } from './internal-server.cjs';
+export { EditorBlockData, ResolveBlockDataOptions, ResolveLayoutBlockDataOptions, resolveEditorBlockData, resolveEditorLayoutBlockData } from './internal-server.cjs';
 import 'react';
 
 interface CmssyServerPageProps {

package/dist/index.d.ts

@@ -6,7 +6,7 @@ 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 } from './internal-server.js';
+export { EditorBlockData, ResolveBlockDataOptions, ResolveLayoutBlockDataOptions, resolveEditorBlockData, resolveEditorLayoutBlockData } from './internal-server.js';
 import 'react';
 
 interface CmssyServerPageProps {

package/dist/index.js

@@ -51,6 +51,9 @@ function unregisteredBlockError(type) {
     message: `Block type "${type}" is not registered in this site's blocks array.`
   };
 }
+function markBlockError(error) {
+  return { [BLOCK_ERROR_KEY]: error };
+}
 function readBlockError(value) {
   if (typeof value !== "object" || value === null) return void 0;
   const marked = value[BLOCK_ERROR_KEY];
@@ -300,6 +303,88 @@ 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, content };
+}
+async function resolveEditorBlockData({
+  page,
+  blocks,
+  locale,
+  defaultLocale,
+  enabledLocales,
+  forms,
+  isPreview = false,
+  config,
+  appContext
+}) {
+  if (!page) return { data: {}, content: {} };
+  const loaderMap = buildLoaderMap(blocks);
+  const context = buildBlockContext(
+    locale,
+    defaultLocale,
+    enabledLocales,
+    isPreview,
+    forms,
+    { page, app: appContext }
+  );
+  const resolved = await resolveBlocks(
+    page.blocks,
+    loaderMap,
+    locale,
+    defaultLocale,
+    context,
+    enabledLocales,
+    { schemas: blocksToSchemas(blocks), config }
+  );
+  return collectBlockData(page.blocks, resolved, isPreview);
+}
+async function resolveEditorLayoutBlockData({
+  groups,
+  blocks,
+  position,
+  locale,
+  defaultLocale,
+  enabledLocales,
+  forms,
+  isPreview = false,
+  config,
+  appContext
+}) {
+  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 { data: {}, content: {} };
+  const loaderMap = buildLoaderMap(blocks);
+  const context = buildBlockContext(
+    locale,
+    defaultLocale,
+    enabledLocales,
+    isPreview,
+    forms,
+    { app: appContext }
+  );
+  const resolved = await resolveBlocks(
+    layoutBlocks,
+    loaderMap,
+    locale,
+    defaultLocale,
+    context,
+    enabledLocales,
+    { schemas: blocksToSchemas(blocks), config }
+  );
+  return collectBlockData(layoutBlocks, resolved, isPreview);
+}
 async function CmssyServerLayout({
   groups,
   blocks,
@@ -429,4 +514,4 @@ function CmssyBlock({
   );
 }
 
-export { CmssyBlock, CmssyServerLayout, CmssyServerPage, UnknownBlock, buildBlockMap, defineBlock };
+export { CmssyBlock, CmssyServerLayout, CmssyServerPage, UnknownBlock, buildBlockMap, defineBlock, resolveEditorBlockData, resolveEditorLayoutBlockData };

package/package.json

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