@cmssy/react 10.0.0 → 10.1.0

package/dist/client.cjs

@@ -657,7 +657,7 @@ function EditableBlocks({
 }) {
   const blockMap = react.useMemo(() => buildBlockMap(blocks), [blocks]);
   const context = react.useMemo(
-    () => core.buildBlockContext(locale, defaultLocale, enabledLocales, true, forms),
+    () => internal.buildBlockContext(locale, defaultLocale, enabledLocales, true, forms),
     [locale, defaultLocale, enabledLocales, forms]
   );
   const bridgeConfig = react.useMemo(
@@ -814,7 +814,7 @@ function CmssyEditableLayout({
   }, [groups, position]);
   const patches = useLayoutPatchBridge(position, edit);
   const context = react.useMemo(
-    () => core.buildBlockContext(locale, defaultLocale, enabledLocales, true),
+    () => internal.buildBlockContext(locale, defaultLocale, enabledLocales, true),
     [locale, defaultLocale, enabledLocales]
   );
   if (layoutBlocks.length === 0) return null;

package/dist/client.d.cts

@@ -1,6 +1,6 @@
 import * as react_jsx_runtime from 'react/jsx-runtime';
 import { BlockSchema, BlockMeta, CmssyPageData, CmssyFormDefinition, CmssyLayoutGroup } from '@cmssy/core';
-import { B as BlockDefinition } from './registry-Bfq4Pq18.cjs';
+import { B as BlockDefinition } from './registry-zeNh3t6y.cjs';
 import 'react';
 
 interface EditBridgeConfig {

package/dist/client.d.ts

@@ -1,6 +1,6 @@
 import * as react_jsx_runtime from 'react/jsx-runtime';
 import { BlockSchema, BlockMeta, CmssyPageData, CmssyFormDefinition, CmssyLayoutGroup } from '@cmssy/core';
-import { B as BlockDefinition } from './registry-Bfq4Pq18.js';
+import { B as BlockDefinition } from './registry-zeNh3t6y.js';
 import 'react';
 
 interface EditBridgeConfig {

package/dist/client.js

@@ -1,7 +1,7 @@
 "use client";
 import { useState, useRef, useEffect, useMemo, createElement } from 'react';
-import { buildBlockContext, postToEditor, PROTOCOL_VERSION, parseEditorMessage } from '@cmssy/core';
-import { resolveInitialTarget, getBlockContentForLanguage, normalizeRelationContent, asBucket } from '@cmssy/core/internal';
+import { postToEditor, PROTOCOL_VERSION, parseEditorMessage } from '@cmssy/core';
+import { resolveInitialTarget, buildBlockContext, getBlockContentForLanguage, normalizeRelationContent, asBucket } from '@cmssy/core/internal';
 import { BlockErrorBoundary } from '@cmssy/react/block-error-boundary';
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 

package/dist/index.cjs

@@ -1,9 +1,8 @@
 'use strict';
 
 var core = require('@cmssy/core');
-var types = require('@cmssy/types');
-var react = require('react');
 var internal = require('@cmssy/core/internal');
+var react = require('react');
 var blockErrorBoundary = require('@cmssy/react/block-error-boundary');
 var jsxRuntime = require('react/jsx-runtime');
 
@@ -36,20 +35,6 @@ function blocksToSchemas(blocks) {
   }
   return out;
 }
-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/components/block-error.ts
 var BLOCK_ERROR_KEY = "__cmssyBlockError";
@@ -67,9 +52,6 @@ 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];
@@ -290,7 +272,7 @@ async function CmssyServerPage({
   });
   const map = buildBlockMap(blocks);
   const loaderMap = buildLoaderMap(blocks);
-  const context = core.buildBlockContext(
+  const context = internal.buildBlockContext(
     locale,
     defaultLocale,
     enabledLocales,
@@ -318,90 +300,6 @@ 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
-}) {
-  if (!page) return { data: {}, content: {} };
-  const loaderMap = buildLoaderMap(blocks);
-  const context = core.buildBlockContext(
-    locale,
-    defaultLocale,
-    enabledLocales,
-    isPreview,
-    forms
-  );
-  const resolved = await resolveBlocks(
-    page.blocks,
-    loaderMap,
-    locale,
-    defaultLocale,
-    context,
-    enabledLocales,
-    { schemas: blocksToSchemas(blocks), config }
-  );
-  return collectBlockData(page.blocks, resolved, isPreview);
-}
-async function resolveBlockData(options) {
-  return (await resolveEditorBlockData(options)).data;
-}
-async function resolveEditorLayoutBlockData({
-  groups,
-  blocks,
-  position,
-  locale,
-  defaultLocale,
-  enabledLocales,
-  forms,
-  isPreview = false,
-  config
-}) {
-  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 = core.buildBlockContext(
-    locale,
-    defaultLocale,
-    enabledLocales,
-    isPreview,
-    forms
-  );
-  const resolved = await resolveBlocks(
-    layoutBlocks,
-    loaderMap,
-    locale,
-    defaultLocale,
-    context,
-    enabledLocales,
-    { schemas: blocksToSchemas(blocks), config }
-  );
-  return collectBlockData(layoutBlocks, resolved, isPreview);
-}
-async function resolveLayoutBlockData(options) {
-  return (await resolveEditorLayoutBlockData(options)).data;
-}
 async function CmssyServerLayout({
   groups,
   blocks,
@@ -423,7 +321,7 @@ async function CmssyServerLayout({
   if (layoutBlocks.length === 0) return null;
   const map = buildBlockMap(blocks);
   const loaderMap = buildLoaderMap(blocks);
-  const context = core.buildBlockContext(locale, defaultLocale, enabledLocales);
+  const context = internal.buildBlockContext(locale, defaultLocale, enabledLocales);
   const resolved = await resolveBlocks(
     layoutBlocks,
     loaderMap,
@@ -531,10 +429,6 @@ Object.defineProperty(exports, "PROTOCOL_VERSION", {
   enumerable: true,
   get: function () { return core.PROTOCOL_VERSION; }
 });
-Object.defineProperty(exports, "buildBlockContext", {
-  enumerable: true,
-  get: function () { return core.buildBlockContext; }
-});
 Object.defineProperty(exports, "createCmssyClient", {
   enumerable: true,
   get: function () { return core.createCmssyClient; }
@@ -563,19 +457,13 @@ Object.defineProperty(exports, "postToEditor", {
   enumerable: true,
   get: function () { return core.postToEditor; }
 });
-Object.defineProperty(exports, "evaluateFieldConditionGroup", {
+Object.defineProperty(exports, "buildBlockContext", {
   enumerable: true,
-  get: function () { return types.evaluateFieldConditionGroup; }
+  get: function () { return internal.buildBlockContext; }
 });
 exports.CmssyBlock = CmssyBlock;
 exports.CmssyServerLayout = CmssyServerLayout;
 exports.CmssyServerPage = CmssyServerPage;
 exports.UnknownBlock = UnknownBlock;
-exports.blocksToMeta = blocksToMeta;
-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

@@ -1,10 +1,12 @@
 import { CmssyPageData, CmssyClientConfig, CmssyFormDefinition, CmssyBlockAuthContext, CmssyBlockWorkspace, CmssyLayoutGroup, RawBlock, CmssyBlockContext } from '@cmssy/core';
-export { AppToEditorMessage, BlockMeta, BlockPropsSchema, BlockRect, BlockSchema, BoundsMessage, BuildBlockContextExtra, ClickMessage, CmssyBlockAuthContext, CmssyBlockContext, CmssyBlockMember, CmssyBlockWorkspace, CmssyBranding, CmssyClient, CmssyClientConfig, CmssyFormDefinition, CmssyFormField, CmssyFormSettings, CmssyFormSubmitResponse, CmssyLayoutGroup, CmssyLayoutSettings, CmssyLocaleContext, CmssyLocalizedValue, CmssyModelDefinition, CmssyModelRecord, CmssyPageData, CmssyPageMeta, CmssyPageSummary, CmssyRecordList, CmssyRequestError, CmssySiteConfig, EditorToAppMessage, FetchLike, FetchLikeResponse, FetchPageOptions, FieldControl, FieldDefinition, FieldType, GraphqlRequestOptions, InferBlockContent, PROTOCOL_VERSION, ParentReadyMessage, PatchMessage, PostTarget, QueryScopedOptions, RawBlock, RawLayoutBlock, ReadyMessage, RetryPolicy, SelectMessage, SubmitFormInput, TypedField, buildBlockContext, createCmssyClient, fields, graphqlRequest, isProtocolCompatible, normalizeOrigin, parseEditorMessage, postToEditor } from '@cmssy/core';
-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';
+export { AppToEditorMessage, BlockMeta, BlockPropsSchema, BlockRect, BlockSchema, BoundsMessage, BuildBlockContextExtra, ClickMessage, CmssyBlockAuthContext, CmssyBlockContext, CmssyBlockMember, CmssyBlockWorkspace, CmssyBranding, CmssyClient, CmssyClientConfig, CmssyFormDefinition, CmssyFormField, CmssyFormSettings, CmssyFormSubmitResponse, CmssyLayoutGroup, CmssyLayoutSettings, CmssyLocaleContext, CmssyLocalizedValue, CmssyModelDefinition, CmssyModelRecord, CmssyPageData, CmssyPageMeta, CmssyPageSummary, CmssyRecordList, CmssyRequestError, CmssySiteConfig, EditorToAppMessage, FetchLike, FetchLikeResponse, FetchPageOptions, FieldControl, FieldDefinition, FieldType, GraphqlRequestOptions, InferBlockContent, PROTOCOL_VERSION, ParentReadyMessage, PatchMessage, PostTarget, QueryScopedOptions, RawBlock, RawLayoutBlock, ReadyMessage, RetryPolicy, SelectMessage, SubmitFormInput, TypedField, createCmssyClient, fields, graphqlRequest, isProtocolCompatible, normalizeOrigin, parseEditorMessage, postToEditor } from '@cmssy/core';
+import { B as BlockDefinition, a as BlockMap } from './registry-zeNh3t6y.cjs';
+export { b as BlockProps, c as buildBlockMap, d as defineBlock } from './registry-zeNh3t6y.cjs';
 import { FieldDefinition } from '@cmssy/types';
-export { FieldCondition, FieldConditionGroup, FieldConditionLogic, evaluateFieldConditionGroup } 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';
 import 'react';
 
 interface CmssyServerPageProps {
@@ -34,38 +36,6 @@ 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[];
-    locale: string;
-    defaultLocale: string;
-    enabledLocales?: string[];
-    forms?: Record<string, CmssyFormDefinition>;
-    isPreview?: boolean;
-    /** Workspace the relation records are read from. No config, no resolution. */
-    config?: CmssyClientConfig;
-}
-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[];
-    position: string;
-    locale: string;
-    defaultLocale: string;
-    enabledLocales?: string[];
-    forms?: Record<string, CmssyFormDefinition>;
-    isPreview?: boolean;
-    /** Workspace the relation records are read from. No config, no resolution. */
-    config?: CmssyClientConfig;
-}
-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[];
     blocks: BlockDefinition[];
@@ -114,4 +84,4 @@ interface UnknownBlockProps {
 }
 declare function UnknownBlock({ type }: UnknownBlockProps): react_jsx_runtime.JSX.Element;
 
-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 };
+export { BlockDefinition, BlockMap, CmssyBlock, type CmssyBlockProps, CmssyServerLayout, type CmssyServerLayoutProps, CmssyServerPage, type CmssyServerPageProps, UnknownBlock, type UnknownBlockProps };

package/dist/index.d.ts

@@ -1,10 +1,12 @@
 import { CmssyPageData, CmssyClientConfig, CmssyFormDefinition, CmssyBlockAuthContext, CmssyBlockWorkspace, CmssyLayoutGroup, RawBlock, CmssyBlockContext } from '@cmssy/core';
-export { AppToEditorMessage, BlockMeta, BlockPropsSchema, BlockRect, BlockSchema, BoundsMessage, BuildBlockContextExtra, ClickMessage, CmssyBlockAuthContext, CmssyBlockContext, CmssyBlockMember, CmssyBlockWorkspace, CmssyBranding, CmssyClient, CmssyClientConfig, CmssyFormDefinition, CmssyFormField, CmssyFormSettings, CmssyFormSubmitResponse, CmssyLayoutGroup, CmssyLayoutSettings, CmssyLocaleContext, CmssyLocalizedValue, CmssyModelDefinition, CmssyModelRecord, CmssyPageData, CmssyPageMeta, CmssyPageSummary, CmssyRecordList, CmssyRequestError, CmssySiteConfig, EditorToAppMessage, FetchLike, FetchLikeResponse, FetchPageOptions, FieldControl, FieldDefinition, FieldType, GraphqlRequestOptions, InferBlockContent, PROTOCOL_VERSION, ParentReadyMessage, PatchMessage, PostTarget, QueryScopedOptions, RawBlock, RawLayoutBlock, ReadyMessage, RetryPolicy, SelectMessage, SubmitFormInput, TypedField, buildBlockContext, createCmssyClient, fields, graphqlRequest, isProtocolCompatible, normalizeOrigin, parseEditorMessage, postToEditor } from '@cmssy/core';
-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';
+export { AppToEditorMessage, BlockMeta, BlockPropsSchema, BlockRect, BlockSchema, BoundsMessage, BuildBlockContextExtra, ClickMessage, CmssyBlockAuthContext, CmssyBlockContext, CmssyBlockMember, CmssyBlockWorkspace, CmssyBranding, CmssyClient, CmssyClientConfig, CmssyFormDefinition, CmssyFormField, CmssyFormSettings, CmssyFormSubmitResponse, CmssyLayoutGroup, CmssyLayoutSettings, CmssyLocaleContext, CmssyLocalizedValue, CmssyModelDefinition, CmssyModelRecord, CmssyPageData, CmssyPageMeta, CmssyPageSummary, CmssyRecordList, CmssyRequestError, CmssySiteConfig, EditorToAppMessage, FetchLike, FetchLikeResponse, FetchPageOptions, FieldControl, FieldDefinition, FieldType, GraphqlRequestOptions, InferBlockContent, PROTOCOL_VERSION, ParentReadyMessage, PatchMessage, PostTarget, QueryScopedOptions, RawBlock, RawLayoutBlock, ReadyMessage, RetryPolicy, SelectMessage, SubmitFormInput, TypedField, createCmssyClient, fields, graphqlRequest, isProtocolCompatible, normalizeOrigin, parseEditorMessage, postToEditor } from '@cmssy/core';
+import { B as BlockDefinition, a as BlockMap } from './registry-zeNh3t6y.js';
+export { b as BlockProps, c as buildBlockMap, d as defineBlock } from './registry-zeNh3t6y.js';
 import { FieldDefinition } from '@cmssy/types';
-export { FieldCondition, FieldConditionGroup, FieldConditionLogic, evaluateFieldConditionGroup } 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';
 import 'react';
 
 interface CmssyServerPageProps {
@@ -34,38 +36,6 @@ 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[];
-    locale: string;
-    defaultLocale: string;
-    enabledLocales?: string[];
-    forms?: Record<string, CmssyFormDefinition>;
-    isPreview?: boolean;
-    /** Workspace the relation records are read from. No config, no resolution. */
-    config?: CmssyClientConfig;
-}
-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[];
-    position: string;
-    locale: string;
-    defaultLocale: string;
-    enabledLocales?: string[];
-    forms?: Record<string, CmssyFormDefinition>;
-    isPreview?: boolean;
-    /** Workspace the relation records are read from. No config, no resolution. */
-    config?: CmssyClientConfig;
-}
-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[];
     blocks: BlockDefinition[];
@@ -114,4 +84,4 @@ interface UnknownBlockProps {
 }
 declare function UnknownBlock({ type }: UnknownBlockProps): react_jsx_runtime.JSX.Element;
 
-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 };
+export { BlockDefinition, BlockMap, CmssyBlock, type CmssyBlockProps, CmssyServerLayout, type CmssyServerLayoutProps, CmssyServerPage, type CmssyServerPageProps, UnknownBlock, type UnknownBlockProps };

package/dist/index.js

@@ -1,8 +1,7 @@
-import { buildBlockContext } from '@cmssy/core';
-export { CmssyRequestError, PROTOCOL_VERSION, buildBlockContext, createCmssyClient, fields, graphqlRequest, isProtocolCompatible, normalizeOrigin, parseEditorMessage, postToEditor } from '@cmssy/core';
-export { evaluateFieldConditionGroup } from '@cmssy/types';
+export { CmssyRequestError, PROTOCOL_VERSION, createCmssyClient, fields, graphqlRequest, isProtocolCompatible, normalizeOrigin, parseEditorMessage, postToEditor } from '@cmssy/core';
+import { buildBlockContext, getBlockContentForLanguage, normalizeRelationContent, asBucket, resolveSiteLocales, resolveRelationContent } from '@cmssy/core/internal';
+export { buildBlockContext } from '@cmssy/core/internal';
 import { createElement } from 'react';
-import { getBlockContentForLanguage, normalizeRelationContent, asBucket, resolveSiteLocales, resolveRelationContent } from '@cmssy/core/internal';
 import { BlockErrorBoundary } from '@cmssy/react/block-error-boundary';
 import { jsx, Fragment, jsxs } from 'react/jsx-runtime';
 
@@ -35,20 +34,6 @@ function blocksToSchemas(blocks) {
   }
   return out;
 }
-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/components/block-error.ts
 var BLOCK_ERROR_KEY = "__cmssyBlockError";
@@ -66,9 +51,6 @@ 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];
@@ -317,90 +299,6 @@ 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
-}) {
-  if (!page) return { data: {}, content: {} };
-  const loaderMap = buildLoaderMap(blocks);
-  const context = buildBlockContext(
-    locale,
-    defaultLocale,
-    enabledLocales,
-    isPreview,
-    forms
-  );
-  const resolved = await resolveBlocks(
-    page.blocks,
-    loaderMap,
-    locale,
-    defaultLocale,
-    context,
-    enabledLocales,
-    { schemas: blocksToSchemas(blocks), config }
-  );
-  return collectBlockData(page.blocks, resolved, isPreview);
-}
-async function resolveBlockData(options) {
-  return (await resolveEditorBlockData(options)).data;
-}
-async function resolveEditorLayoutBlockData({
-  groups,
-  blocks,
-  position,
-  locale,
-  defaultLocale,
-  enabledLocales,
-  forms,
-  isPreview = false,
-  config
-}) {
-  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
-  );
-  const resolved = await resolveBlocks(
-    layoutBlocks,
-    loaderMap,
-    locale,
-    defaultLocale,
-    context,
-    enabledLocales,
-    { schemas: blocksToSchemas(blocks), config }
-  );
-  return collectBlockData(layoutBlocks, resolved, isPreview);
-}
-async function resolveLayoutBlockData(options) {
-  return (await resolveEditorLayoutBlockData(options)).data;
-}
 async function CmssyServerLayout({
   groups,
   blocks,
@@ -522,4 +420,4 @@ function CmssyBlock({
   );
 }
 
-export { CmssyBlock, CmssyServerLayout, CmssyServerPage, UnknownBlock, blocksToMeta, blocksToSchemas, buildBlockMap, defineBlock, resolveBlockData, resolveEditorBlockData, resolveEditorLayoutBlockData, resolveLayoutBlockData };
+export { CmssyBlock, CmssyServerLayout, CmssyServerPage, UnknownBlock, buildBlockMap, defineBlock };

package/dist/internal-server.cjs

@@ -0,0 +1,166 @@
+'use strict';
+
+var internal = require('@cmssy/core/internal');
+
+// src/components/resolve-block-data.ts
+
+// src/registry.ts
+function buildLoaderMap(blocks) {
+  const map = /* @__PURE__ */ Object.create(null);
+  for (const block of blocks) {
+    if (block.loader) map[block.type] = block.loader;
+  }
+  return map;
+}
+function blocksToSchemas(blocks) {
+  const out = /* @__PURE__ */ Object.create(null);
+  for (const block of blocks) {
+    const schema = {};
+    for (const [key, def] of Object.entries(block.props)) {
+      schema[key] = { ...def, label: def.label || key };
+    }
+    out[block.type] = schema;
+  }
+  return out;
+}
+
+// src/components/block-error.ts
+var BLOCK_ERROR_KEY = "__cmssyBlockError";
+function blockErrorMessage(err) {
+  return err instanceof Error ? err.message : String(err);
+}
+function markBlockError(error) {
+  return { [BLOCK_ERROR_KEY]: error };
+}
+async function resolveBlocks(blocks, loaderMap, locale, defaultLocale, context, enabledLocales, options) {
+  const contents = blocks.map(
+    (block) => internal.getBlockContentForLanguage(
+      block.content,
+      locale,
+      defaultLocale,
+      enabledLocales?.length ? enabledLocales : void 0
+    )
+  );
+  if (options?.config && options.schemas) {
+    await internal.resolveRelationContent(
+      options.config,
+      blocks.map((block, i) => ({ type: block.type, content: contents[i] })),
+      options.schemas,
+      locale,
+      options.workspaceId ? { workspaceId: options.workspaceId } : {}
+    );
+  }
+  return Promise.all(
+    blocks.map(async (block, i) => {
+      const content = contents[i];
+      const loader = loaderMap[block.type];
+      let data;
+      let error;
+      if (loader) {
+        try {
+          data = await loader({ content, context });
+        } catch (err) {
+          if (typeof console !== "undefined") {
+            console.error(
+              `[cmssy] loader for block "${block.type}" (${block.id}) failed`,
+              err
+            );
+          }
+          error = { message: blockErrorMessage(err), source: "loader" };
+        }
+      }
+      return { content, data, error };
+    })
+  );
+}
+
+// src/components/resolve-block-data.ts
+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
+}) {
+  if (!page) return { data: {}, content: {} };
+  const loaderMap = buildLoaderMap(blocks);
+  const context = internal.buildBlockContext(
+    locale,
+    defaultLocale,
+    enabledLocales,
+    isPreview,
+    forms
+  );
+  const resolved = await resolveBlocks(
+    page.blocks,
+    loaderMap,
+    locale,
+    defaultLocale,
+    context,
+    enabledLocales,
+    { schemas: blocksToSchemas(blocks), config }
+  );
+  return collectBlockData(page.blocks, resolved, isPreview);
+}
+async function resolveBlockData(options) {
+  return (await resolveEditorBlockData(options)).data;
+}
+async function resolveEditorLayoutBlockData({
+  groups,
+  blocks,
+  position,
+  locale,
+  defaultLocale,
+  enabledLocales,
+  forms,
+  isPreview = false,
+  config
+}) {
+  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
+  );
+  const resolved = await resolveBlocks(
+    layoutBlocks,
+    loaderMap,
+    locale,
+    defaultLocale,
+    context,
+    enabledLocales,
+    { schemas: blocksToSchemas(blocks), config }
+  );
+  return collectBlockData(layoutBlocks, resolved, isPreview);
+}
+async function resolveLayoutBlockData(options) {
+  return (await resolveEditorLayoutBlockData(options)).data;
+}
+
+exports.resolveBlockData = resolveBlockData;
+exports.resolveEditorBlockData = resolveEditorBlockData;
+exports.resolveEditorLayoutBlockData = resolveEditorLayoutBlockData;
+exports.resolveLayoutBlockData = resolveLayoutBlockData;

package/dist/internal-server.d.cts

@@ -0,0 +1,37 @@
+import { CmssyPageData, CmssyFormDefinition, CmssyClientConfig, CmssyLayoutGroup } from '@cmssy/core';
+import { B as BlockDefinition } from './registry-zeNh3t6y.cjs';
+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;
+    /** Workspace the relation records are read from. No config, no resolution. */
+    config?: CmssyClientConfig;
+}
+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[];
+    position: string;
+    locale: string;
+    defaultLocale: string;
+    enabledLocales?: string[];
+    forms?: Record<string, CmssyFormDefinition>;
+    isPreview?: boolean;
+    /** Workspace the relation records are read from. No config, no resolution. */
+    config?: CmssyClientConfig;
+}
+declare function resolveEditorLayoutBlockData({ groups, blocks, position, locale, defaultLocale, enabledLocales, forms, isPreview, config, }: 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

@@ -0,0 +1,37 @@
+import { CmssyPageData, CmssyFormDefinition, CmssyClientConfig, CmssyLayoutGroup } from '@cmssy/core';
+import { B as BlockDefinition } from './registry-zeNh3t6y.js';
+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;
+    /** Workspace the relation records are read from. No config, no resolution. */
+    config?: CmssyClientConfig;
+}
+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[];
+    position: string;
+    locale: string;
+    defaultLocale: string;
+    enabledLocales?: string[];
+    forms?: Record<string, CmssyFormDefinition>;
+    isPreview?: boolean;
+    /** Workspace the relation records are read from. No config, no resolution. */
+    config?: CmssyClientConfig;
+}
+declare function resolveEditorLayoutBlockData({ groups, blocks, position, locale, defaultLocale, enabledLocales, forms, isPreview, config, }: 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

@@ -0,0 +1,161 @@
+import { buildBlockContext, getBlockContentForLanguage, resolveRelationContent } from '@cmssy/core/internal';
+
+// src/components/resolve-block-data.ts
+
+// src/registry.ts
+function buildLoaderMap(blocks) {
+  const map = /* @__PURE__ */ Object.create(null);
+  for (const block of blocks) {
+    if (block.loader) map[block.type] = block.loader;
+  }
+  return map;
+}
+function blocksToSchemas(blocks) {
+  const out = /* @__PURE__ */ Object.create(null);
+  for (const block of blocks) {
+    const schema = {};
+    for (const [key, def] of Object.entries(block.props)) {
+      schema[key] = { ...def, label: def.label || key };
+    }
+    out[block.type] = schema;
+  }
+  return out;
+}
+
+// src/components/block-error.ts
+var BLOCK_ERROR_KEY = "__cmssyBlockError";
+function blockErrorMessage(err) {
+  return err instanceof Error ? err.message : String(err);
+}
+function markBlockError(error) {
+  return { [BLOCK_ERROR_KEY]: error };
+}
+async function resolveBlocks(blocks, loaderMap, locale, defaultLocale, context, enabledLocales, options) {
+  const contents = blocks.map(
+    (block) => getBlockContentForLanguage(
+      block.content,
+      locale,
+      defaultLocale,
+      enabledLocales?.length ? enabledLocales : void 0
+    )
+  );
+  if (options?.config && options.schemas) {
+    await resolveRelationContent(
+      options.config,
+      blocks.map((block, i) => ({ type: block.type, content: contents[i] })),
+      options.schemas,
+      locale,
+      options.workspaceId ? { workspaceId: options.workspaceId } : {}
+    );
+  }
+  return Promise.all(
+    blocks.map(async (block, i) => {
+      const content = contents[i];
+      const loader = loaderMap[block.type];
+      let data;
+      let error;
+      if (loader) {
+        try {
+          data = await loader({ content, context });
+        } catch (err) {
+          if (typeof console !== "undefined") {
+            console.error(
+              `[cmssy] loader for block "${block.type}" (${block.id}) failed`,
+              err
+            );
+          }
+          error = { message: blockErrorMessage(err), source: "loader" };
+        }
+      }
+      return { content, data, error };
+    })
+  );
+}
+
+// src/components/resolve-block-data.ts
+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
+}) {
+  if (!page) return { data: {}, content: {} };
+  const loaderMap = buildLoaderMap(blocks);
+  const context = buildBlockContext(
+    locale,
+    defaultLocale,
+    enabledLocales,
+    isPreview,
+    forms
+  );
+  const resolved = await resolveBlocks(
+    page.blocks,
+    loaderMap,
+    locale,
+    defaultLocale,
+    context,
+    enabledLocales,
+    { schemas: blocksToSchemas(blocks), config }
+  );
+  return collectBlockData(page.blocks, resolved, isPreview);
+}
+async function resolveBlockData(options) {
+  return (await resolveEditorBlockData(options)).data;
+}
+async function resolveEditorLayoutBlockData({
+  groups,
+  blocks,
+  position,
+  locale,
+  defaultLocale,
+  enabledLocales,
+  forms,
+  isPreview = false,
+  config
+}) {
+  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
+  );
+  const resolved = await resolveBlocks(
+    layoutBlocks,
+    loaderMap,
+    locale,
+    defaultLocale,
+    context,
+    enabledLocales,
+    { schemas: blocksToSchemas(blocks), config }
+  );
+  return collectBlockData(layoutBlocks, resolved, isPreview);
+}
+async function resolveLayoutBlockData(options) {
+  return (await resolveEditorLayoutBlockData(options)).data;
+}
+
+export { resolveBlockData, resolveEditorBlockData, resolveEditorLayoutBlockData, resolveLayoutBlockData };

package/dist/{registry-Bfq4Pq18.d.cts → registry-zeNh3t6y.d.cts}

@@ -1,5 +1,5 @@
 import { ComponentType } from 'react';
-import { FieldDefinition, CmssyBlockContext, BlockPropsSchema, InferBlockContent, BlockMeta, BlockSchema } from '@cmssy/core';
+import { FieldDefinition, CmssyBlockContext, BlockPropsSchema, InferBlockContent } from '@cmssy/core';
 
 /**
  * The props a block component receives, derived from the fields it declares:
@@ -99,9 +99,5 @@ type BlockMap = Record<string, ComponentType<{
     data?: unknown;
 }>>;
 declare function buildBlockMap(blocks: BlockDefinition[]): BlockMap;
-declare function blocksToSchemas(blocks: BlockDefinition[]): Record<string, BlockSchema>;
-declare function blocksToMeta(blocks: BlockDefinition[], defaults?: {
-    category?: string;
-}): Record<string, BlockMeta>;
 
-export { type BlockDefinition as B, type BlockMap as a, type BlockProps as b, blocksToMeta as c, blocksToSchemas as d, buildBlockMap as e, defineBlock as f };
+export { type BlockDefinition as B, type BlockMap as a, type BlockProps as b, buildBlockMap as c, defineBlock as d };

package/dist/{registry-Bfq4Pq18.d.ts → registry-zeNh3t6y.d.ts}

@@ -1,5 +1,5 @@
 import { ComponentType } from 'react';
-import { FieldDefinition, CmssyBlockContext, BlockPropsSchema, InferBlockContent, BlockMeta, BlockSchema } from '@cmssy/core';
+import { FieldDefinition, CmssyBlockContext, BlockPropsSchema, InferBlockContent } from '@cmssy/core';
 
 /**
  * The props a block component receives, derived from the fields it declares:
@@ -99,9 +99,5 @@ type BlockMap = Record<string, ComponentType<{
     data?: unknown;
 }>>;
 declare function buildBlockMap(blocks: BlockDefinition[]): BlockMap;
-declare function blocksToSchemas(blocks: BlockDefinition[]): Record<string, BlockSchema>;
-declare function blocksToMeta(blocks: BlockDefinition[], defaults?: {
-    category?: string;
-}): Record<string, BlockMeta>;
 
-export { type BlockDefinition as B, type BlockMap as a, type BlockProps as b, blocksToMeta as c, blocksToSchemas as d, buildBlockMap as e, defineBlock as f };
+export { type BlockDefinition as B, type BlockMap as a, type BlockProps as b, buildBlockMap as c, defineBlock as d };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cmssy/react",
-  "version": "10.0.0",
+  "version": "10.1.0",
   "description": "React blocks, renderers, data client and editor bridge for cmssy headless sites",
   "keywords": [
     "cmssy",
@@ -38,6 +38,11 @@
       "import": "./dist/internal.js",
       "require": "./dist/internal.cjs"
     },
+    "./internal-server": {
+      "types": "./dist/internal-server.d.ts",
+      "import": "./dist/internal-server.js",
+      "require": "./dist/internal-server.cjs"
+    },
     "./block-error-boundary": {
       "types": "./dist/block-error-boundary.d.ts",
       "import": "./dist/block-error-boundary.js",
@@ -67,7 +72,7 @@
   },
   "dependencies": {
     "@cmssy/types": "0.29.0",
-    "@cmssy/core": "10.0.0"
+    "@cmssy/core": "10.1.0"
   },
   "scripts": {
     "build": "tsup",