@cmssy/react 9.5.0 → 9.6.1

package/dist/client.cjs

@@ -522,6 +522,7 @@ function CmssyBlock({
   patchedContent,
   patchedStyle,
   patchedAdvanced,
+  schema,
   editable,
   editMode,
   layoutPosition,
@@ -569,6 +570,7 @@ function CmssyBlock({
   }
   const base = 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(
@@ -680,6 +682,7 @@ function EditableBlocks({
         patchedContent: patches[block.id],
         patchedStyle: patchesStyle[block.id],
         patchedAdvanced: patchesAdvanced[block.id],
+        schema: bridgeConfig.schemas?.[block.type],
         blockMap,
         editable: true,
         context,

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,7 @@ function CmssyBlock({
   patchedContent,
   patchedStyle,
   patchedAdvanced,
+  schema,
   editable,
   editMode,
   layoutPosition,
@@ -568,6 +569,7 @@ function CmssyBlock({
   }
   const base = 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(
@@ -679,6 +681,7 @@ function EditableBlocks({
         patchedContent: patches[block.id],
         patchedStyle: patchesStyle[block.id],
         patchedAdvanced: patchesAdvanced[block.id],
+        schema: bridgeConfig.schemas?.[block.type],
         blockMap,
         editable: true,
         context,

package/dist/index.cjs

@@ -199,15 +199,27 @@ function renderResolvedBlock(block, map, locale, defaultLocale, options = {}) {
     )
   );
 }
-async function resolveBlocks(blocks, loaderMap, locale, defaultLocale, context, enabledLocales) {
+async function resolveBlocks(blocks, loaderMap, locale, defaultLocale, context, enabledLocales, options) {
+  const contents = blocks.map(
+    (block) => core.getBlockContentForLanguage(
+      block.content,
+      locale,
+      defaultLocale,
+      enabledLocales?.length ? enabledLocales : void 0
+    )
+  );
+  if (options?.config && options.schemas) {
+    await core.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) => {
-      const content = core.getBlockContentForLanguage(
-        block.content,
-        locale,
-        defaultLocale,
-        enabledLocales?.length ? enabledLocales : void 0
-      );
+    blocks.map(async (block, i) => {
+      const content = contents[i];
       const loader = loaderMap[block.type];
       let data;
       let error;
@@ -291,7 +303,8 @@ async function CmssyServerPage({
     locale,
     defaultLocale,
     context,
-    enabledLocales
+    enabledLocales,
+    { schemas: blocksToSchemas(blocks), config, workspaceId: workspace?.id }
   );
   return /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, { children: page.blocks.map(
     (block, i) => renderResolvedBlock(block, map, locale, defaultLocale, {
@@ -324,7 +337,8 @@ async function resolveBlockData({
   defaultLocale,
   enabledLocales,
   forms,
-  isPreview = false
+  isPreview = false,
+  config
 }) {
   if (!page) return {};
   const loaderMap = buildLoaderMap(blocks);
@@ -341,7 +355,8 @@ async function resolveBlockData({
     locale,
     defaultLocale,
     context,
-    enabledLocales
+    enabledLocales,
+    { schemas: blocksToSchemas(blocks), config }
   );
   return collectBlockData(page.blocks, resolved, isPreview);
 }
@@ -353,7 +368,8 @@ async function resolveLayoutBlockData({
   defaultLocale,
   enabledLocales,
   forms,
-  isPreview = false
+  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) : [];
@@ -372,7 +388,8 @@ async function resolveLayoutBlockData({
     locale,
     defaultLocale,
     context,
-    enabledLocales
+    enabledLocales,
+    { schemas: blocksToSchemas(blocks), config }
   );
   return collectBlockData(layoutBlocks, resolved, isPreview);
 }
@@ -404,7 +421,8 @@ async function CmssyServerLayout({
     locale,
     defaultLocale,
     context,
-    enabledLocales
+    enabledLocales,
+    { schemas: blocksToSchemas(blocks), config }
   );
   return /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, { children: layoutBlocks.map(
     (block, i) => renderResolvedBlock(block, map, locale, defaultLocale, {
@@ -425,6 +443,7 @@ function CmssyBlock({
   patchedContent,
   patchedStyle,
   patchedAdvanced,
+  schema,
   editable,
   editMode,
   layoutPosition,
@@ -472,6 +491,7 @@ function CmssyBlock({
   }
   const base = 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(

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';
 
@@ -41,8 +42,10 @@ interface ResolveBlockDataOptions {
     enabledLocales?: string[];
     forms?: Record<string, CmssyFormDefinition>;
     isPreview?: boolean;
+    /** Workspace the relation records are read from. No config, no resolution. */
+    config?: CmssyClientConfig;
 }
-declare function resolveBlockData({ page, blocks, locale, defaultLocale, enabledLocales, forms, isPreview, }: ResolveBlockDataOptions): Promise<Record<string, unknown>>;
+declare function resolveBlockData({ page, blocks, locale, defaultLocale, enabledLocales, forms, isPreview, config, }: ResolveBlockDataOptions): Promise<Record<string, unknown>>;
 interface ResolveLayoutBlockDataOptions {
     groups: CmssyLayoutGroup[];
     blocks: BlockDefinition[];
@@ -52,8 +55,10 @@ interface ResolveLayoutBlockDataOptions {
     enabledLocales?: string[];
     forms?: Record<string, CmssyFormDefinition>;
     isPreview?: boolean;
+    /** Workspace the relation records are read from. No config, no resolution. */
+    config?: CmssyClientConfig;
 }
-declare function resolveLayoutBlockData({ groups, blocks, position, locale, defaultLocale, enabledLocales, forms, isPreview, }: ResolveLayoutBlockDataOptions): Promise<Record<string, unknown>>;
+declare function resolveLayoutBlockData({ groups, blocks, position, locale, defaultLocale, enabledLocales, forms, isPreview, config, }: ResolveLayoutBlockDataOptions): Promise<Record<string, unknown>>;
 
 interface CmssyServerLayoutProps {
     groups: CmssyLayoutGroup[];
@@ -86,13 +91,15 @@ interface CmssyBlockProps {
     patchedContent?: Record<string, unknown>;
     patchedStyle?: Record<string, unknown>;
     patchedAdvanced?: 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, schema, editable, editMode, layoutPosition, context, data, }: CmssyBlockProps): react_jsx_runtime.JSX.Element | null;
 
 interface UnknownBlockProps {
     type: string;

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';
 
@@ -41,8 +42,10 @@ interface ResolveBlockDataOptions {
     enabledLocales?: string[];
     forms?: Record<string, CmssyFormDefinition>;
     isPreview?: boolean;
+    /** Workspace the relation records are read from. No config, no resolution. */
+    config?: CmssyClientConfig;
 }
-declare function resolveBlockData({ page, blocks, locale, defaultLocale, enabledLocales, forms, isPreview, }: ResolveBlockDataOptions): Promise<Record<string, unknown>>;
+declare function resolveBlockData({ page, blocks, locale, defaultLocale, enabledLocales, forms, isPreview, config, }: ResolveBlockDataOptions): Promise<Record<string, unknown>>;
 interface ResolveLayoutBlockDataOptions {
     groups: CmssyLayoutGroup[];
     blocks: BlockDefinition[];
@@ -52,8 +55,10 @@ interface ResolveLayoutBlockDataOptions {
     enabledLocales?: string[];
     forms?: Record<string, CmssyFormDefinition>;
     isPreview?: boolean;
+    /** Workspace the relation records are read from. No config, no resolution. */
+    config?: CmssyClientConfig;
 }
-declare function resolveLayoutBlockData({ groups, blocks, position, locale, defaultLocale, enabledLocales, forms, isPreview, }: ResolveLayoutBlockDataOptions): Promise<Record<string, unknown>>;
+declare function resolveLayoutBlockData({ groups, blocks, position, locale, defaultLocale, enabledLocales, forms, isPreview, config, }: ResolveLayoutBlockDataOptions): Promise<Record<string, unknown>>;
 
 interface CmssyServerLayoutProps {
     groups: CmssyLayoutGroup[];
@@ -86,13 +91,15 @@ interface CmssyBlockProps {
     patchedContent?: Record<string, unknown>;
     patchedStyle?: Record<string, unknown>;
     patchedAdvanced?: 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, schema, editable, editMode, layoutPosition, context, data, }: CmssyBlockProps): react_jsx_runtime.JSX.Element | null;
 
 interface UnknownBlockProps {
     type: string;

package/dist/index.js

@@ -1,4 +1,4 @@
-import { buildBlockContext, getBlockContentForLanguage, asBucket, resolveSiteLocales } 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';
@@ -198,15 +198,27 @@ function renderResolvedBlock(block, map, locale, defaultLocale, options = {}) {
     )
   );
 }
-async function resolveBlocks(blocks, loaderMap, locale, defaultLocale, context, enabledLocales) {
+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) => {
-      const content = getBlockContentForLanguage(
-        block.content,
-        locale,
-        defaultLocale,
-        enabledLocales?.length ? enabledLocales : void 0
-      );
+    blocks.map(async (block, i) => {
+      const content = contents[i];
       const loader = loaderMap[block.type];
       let data;
       let error;
@@ -290,7 +302,8 @@ async function CmssyServerPage({
     locale,
     defaultLocale,
     context,
-    enabledLocales
+    enabledLocales,
+    { schemas: blocksToSchemas(blocks), config, workspaceId: workspace?.id }
   );
   return /* @__PURE__ */ jsx(Fragment, { children: page.blocks.map(
     (block, i) => renderResolvedBlock(block, map, locale, defaultLocale, {
@@ -323,7 +336,8 @@ async function resolveBlockData({
   defaultLocale,
   enabledLocales,
   forms,
-  isPreview = false
+  isPreview = false,
+  config
 }) {
   if (!page) return {};
   const loaderMap = buildLoaderMap(blocks);
@@ -340,7 +354,8 @@ async function resolveBlockData({
     locale,
     defaultLocale,
     context,
-    enabledLocales
+    enabledLocales,
+    { schemas: blocksToSchemas(blocks), config }
   );
   return collectBlockData(page.blocks, resolved, isPreview);
 }
@@ -352,7 +367,8 @@ async function resolveLayoutBlockData({
   defaultLocale,
   enabledLocales,
   forms,
-  isPreview = false
+  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) : [];
@@ -371,7 +387,8 @@ async function resolveLayoutBlockData({
     locale,
     defaultLocale,
     context,
-    enabledLocales
+    enabledLocales,
+    { schemas: blocksToSchemas(blocks), config }
   );
   return collectBlockData(layoutBlocks, resolved, isPreview);
 }
@@ -403,7 +420,8 @@ async function CmssyServerLayout({
     locale,
     defaultLocale,
     context,
-    enabledLocales
+    enabledLocales,
+    { schemas: blocksToSchemas(blocks), config }
   );
   return /* @__PURE__ */ jsx(Fragment, { children: layoutBlocks.map(
     (block, i) => renderResolvedBlock(block, map, locale, defaultLocale, {
@@ -424,6 +442,7 @@ function CmssyBlock({
   patchedContent,
   patchedStyle,
   patchedAdvanced,
+  schema,
   editable,
   editMode,
   layoutPosition,
@@ -471,6 +490,7 @@ function CmssyBlock({
   }
   const base = 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(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cmssy/react",
-  "version": "9.5.0",
+  "version": "9.6.1",
   "description": "React blocks, renderers, data client and editor bridge for cmssy headless sites",
   "keywords": [
     "cmssy",
@@ -61,8 +61,8 @@
     "vitest": "^2.1.0"
   },
   "dependencies": {
-    "@cmssy/types": "0.28.0",
-    "@cmssy/core": "9.5.0"
+    "@cmssy/types": "0.29.0",
+    "@cmssy/core": "9.6.1"
   },
   "scripts": {
     "build": "tsup",