@cmssy/react 12.4.0 → 12.6.0

package/dist/client.cjs

@@ -639,7 +639,7 @@ function CmssyBlock({
   }
   const base = resolvedContent ? { ...resolvedContent } : internal.getBlockContentForLanguage(block.content, locale, defaultLocale);
   const content = patchedContent ? { ...base, ...patchedContent } : base;
-  if (schema) internal.normalizeRelationContent(content, schema, resolvedContent);
+  if (schema) internal.normalizeBlockContent(content, schema, resolvedContent);
   const style = patchedStyle ? { ...internal.asBucket(block.style), ...patchedStyle } : internal.asBucket(block.style);
   const advanced = patchedAdvanced ? { ...internal.asBucket(block.advanced), ...patchedAdvanced } : internal.asBucket(block.advanced);
   return wrap(

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-fguZApc8.cjs';
+import { B as BlockDefinition } from './registry-CwJ2cby4.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-fguZApc8.js';
+import { B as BlockDefinition } from './registry-CwJ2cby4.js';
 import 'react';
 
 interface EditBridgeConfig {

package/dist/client.js

@@ -1,7 +1,7 @@
 "use client";
 import { useState, useRef, useEffect, useMemo, createElement } from 'react';
 import { postToEditor, PROTOCOL_VERSION, parseEditorMessage } from '@cmssy/core';
-import { resolveInitialTarget, buildBlockContext, getBlockContentForLanguage, normalizeRelationContent, asBucket } from '@cmssy/core/internal';
+import { resolveInitialTarget, buildBlockContext, getBlockContentForLanguage, normalizeBlockContent, asBucket } from '@cmssy/core/internal';
 import { BlockErrorBoundary } from '@cmssy/react/block-error-boundary';
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 
@@ -637,7 +637,7 @@ function CmssyBlock({
   }
   const base = resolvedContent ? { ...resolvedContent } : getBlockContentForLanguage(block.content, locale, defaultLocale);
   const content = patchedContent ? { ...base, ...patchedContent } : base;
-  if (schema) normalizeRelationContent(content, schema, resolvedContent);
+  if (schema) normalizeBlockContent(content, schema, resolvedContent);
   const style = patchedStyle ? { ...asBucket(block.style), ...patchedStyle } : asBucket(block.style);
   const advanced = patchedAdvanced ? { ...asBucket(block.advanced), ...patchedAdvanced } : asBucket(block.advanced);
   return wrap(

package/dist/index.cjs

@@ -195,14 +195,21 @@ async function resolveBlocks(blocks, loaderMap, locale, defaultLocale, context,
       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 } : {}
-    );
+  const schemas = options?.schemas;
+  if (schemas) {
+    if (options?.config) {
+      await internal.resolveRelationContent(
+        options.config,
+        blocks.map((block, i) => ({ type: block.type, content: contents[i] })),
+        schemas,
+        locale,
+        options.workspaceId ? { workspaceId: options.workspaceId } : {}
+      );
+    }
+    blocks.forEach((block, i) => {
+      const schema = schemas[block.type];
+      if (schema) internal.normalizeBlockContent(contents[i], schema);
+    });
   }
   return Promise.all(
     blocks.map(async (block, i) => {
@@ -540,7 +547,7 @@ function CmssyBlock({
   }
   const base = resolvedContent ? { ...resolvedContent } : internal.getBlockContentForLanguage(block.content, locale, defaultLocale);
   const content = patchedContent ? { ...base, ...patchedContent } : base;
-  if (schema) internal.normalizeRelationContent(content, schema, resolvedContent);
+  if (schema) internal.normalizeBlockContent(content, schema, resolvedContent);
   const style = patchedStyle ? { ...internal.asBucket(block.style), ...patchedStyle } : internal.asBucket(block.style);
   const advanced = patchedAdvanced ? { ...internal.asBucket(block.advanced), ...patchedAdvanced } : internal.asBucket(block.advanced);
   return wrap(

package/dist/index.d.cts

@@ -1,7 +1,7 @@
 import { CmssyPageData, CmssyClientConfig, CmssyFormDefinition, CmssyBlockAuthContext, CmssyBlockWorkspace, CmssyLayoutGroup, CmssyConfig, RawBlock, CmssyBlockContext } from '@cmssy/core';
 export { AppToEditorMessage, BlockMeta, BlockPropsSchema, BlockRect, BlockSchema, BoundsMessage, BuildBlockContextExtra, ClickMessage, CmssyBlockAuthContext, CmssyBlockContext, CmssyBlockMember, CmssyBlockPage, CmssyBlockWorkspace, CmssyBranding, CmssyClient, CmssyClientConfig, CmssyFormDefinition, CmssyFormField, CmssyFormSettings, CmssyFormSubmitResponse, CmssyLayoutGroup, CmssyLayoutSettings, CmssyLocaleContext, CmssyLocalizedValue, CmssyModelDefinition, CmssyModelRecord, CmssyPageData, CmssyPageMeta, CmssyPageSummary, CmssyRecordList, CmssyRequestError, CmssySiteConfig, CmssyTypedDocument, EditorToAppMessage, FetchLike, FetchLikeResponse, FetchPageOptions, FieldControl, FieldDefinition, FieldType, GraphqlRequestOptions, InferBlockContent, LayoutPosition, MediaLike, PROTOCOL_VERSION, ParentReadyMessage, PatchMessage, PostTarget, QueryScopedOptions, RawBlock, RawLayoutBlock, ReadyMessage, RetryPolicy, SelectMessage, SubmitFormInput, TypedField, createCmssyClient, fields, graphqlRequest, isProtocolCompatible, layoutPositionValues, mediaAlt, mediaUrl, mediaUrls, normalizeOrigin, parseEditorMessage, postToEditor } from '@cmssy/core';
-import { B as BlockDefinition, a as BlockMap } from './registry-fguZApc8.cjs';
-export { b as BlockProps, c as buildBlockMap, d as defineBlock } from './registry-fguZApc8.cjs';
+import { B as BlockDefinition, a as BlockMap } from './registry-CwJ2cby4.cjs';
+export { b as BlockProps, c as buildBlockMap, d as defineBlock } from './registry-CwJ2cby4.cjs';
 import { FieldDefinition } from '@cmssy/types';
 export { FieldCondition, FieldConditionGroup, FieldConditionLogic } from '@cmssy/types';
 export { buildBlockContext } from '@cmssy/core/internal';

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import { CmssyPageData, CmssyClientConfig, CmssyFormDefinition, CmssyBlockAuthContext, CmssyBlockWorkspace, CmssyLayoutGroup, CmssyConfig, RawBlock, CmssyBlockContext } from '@cmssy/core';
 export { AppToEditorMessage, BlockMeta, BlockPropsSchema, BlockRect, BlockSchema, BoundsMessage, BuildBlockContextExtra, ClickMessage, CmssyBlockAuthContext, CmssyBlockContext, CmssyBlockMember, CmssyBlockPage, CmssyBlockWorkspace, CmssyBranding, CmssyClient, CmssyClientConfig, CmssyFormDefinition, CmssyFormField, CmssyFormSettings, CmssyFormSubmitResponse, CmssyLayoutGroup, CmssyLayoutSettings, CmssyLocaleContext, CmssyLocalizedValue, CmssyModelDefinition, CmssyModelRecord, CmssyPageData, CmssyPageMeta, CmssyPageSummary, CmssyRecordList, CmssyRequestError, CmssySiteConfig, CmssyTypedDocument, EditorToAppMessage, FetchLike, FetchLikeResponse, FetchPageOptions, FieldControl, FieldDefinition, FieldType, GraphqlRequestOptions, InferBlockContent, LayoutPosition, MediaLike, PROTOCOL_VERSION, ParentReadyMessage, PatchMessage, PostTarget, QueryScopedOptions, RawBlock, RawLayoutBlock, ReadyMessage, RetryPolicy, SelectMessage, SubmitFormInput, TypedField, createCmssyClient, fields, graphqlRequest, isProtocolCompatible, layoutPositionValues, mediaAlt, mediaUrl, mediaUrls, normalizeOrigin, parseEditorMessage, postToEditor } from '@cmssy/core';
-import { B as BlockDefinition, a as BlockMap } from './registry-fguZApc8.js';
-export { b as BlockProps, c as buildBlockMap, d as defineBlock } from './registry-fguZApc8.js';
+import { B as BlockDefinition, a as BlockMap } from './registry-CwJ2cby4.js';
+export { b as BlockProps, c as buildBlockMap, d as defineBlock } from './registry-CwJ2cby4.js';
 import { FieldDefinition } from '@cmssy/types';
 export { FieldCondition, FieldConditionGroup, FieldConditionLogic } from '@cmssy/types';
 export { buildBlockContext } from '@cmssy/core/internal';

package/dist/index.js

@@ -1,6 +1,6 @@
 import { resolveEditorOrigin } from '@cmssy/core';
 export { CmssyRequestError, PROTOCOL_VERSION, createCmssyClient, fields, graphqlRequest, isProtocolCompatible, layoutPositionValues, mediaAlt, mediaUrl, mediaUrls, normalizeOrigin, parseEditorMessage, postToEditor } from '@cmssy/core';
-import { buildBlockContext, fetchLayouts, getBlockContentForLanguage, normalizeRelationContent, asBucket, resolveSiteLocales as resolveSiteLocales$1, resolveRelationContent } from '@cmssy/core/internal';
+import { buildBlockContext, fetchLayouts, getBlockContentForLanguage, normalizeBlockContent, asBucket, resolveSiteLocales as resolveSiteLocales$1, resolveRelationContent } from '@cmssy/core/internal';
 export { buildBlockContext } from '@cmssy/core/internal';
 import { createElement } from 'react';
 import { BlockErrorBoundary } from '@cmssy/react/block-error-boundary';
@@ -195,14 +195,21 @@ async function resolveBlocks(blocks, loaderMap, locale, defaultLocale, context,
       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 } : {}
-    );
+  const schemas = options?.schemas;
+  if (schemas) {
+    if (options?.config) {
+      await resolveRelationContent(
+        options.config,
+        blocks.map((block, i) => ({ type: block.type, content: contents[i] })),
+        schemas,
+        locale,
+        options.workspaceId ? { workspaceId: options.workspaceId } : {}
+      );
+    }
+    blocks.forEach((block, i) => {
+      const schema = schemas[block.type];
+      if (schema) normalizeBlockContent(contents[i], schema);
+    });
   }
   return Promise.all(
     blocks.map(async (block, i) => {
@@ -540,7 +547,7 @@ function CmssyBlock({
   }
   const base = resolvedContent ? { ...resolvedContent } : getBlockContentForLanguage(block.content, locale, defaultLocale);
   const content = patchedContent ? { ...base, ...patchedContent } : base;
-  if (schema) normalizeRelationContent(content, schema, resolvedContent);
+  if (schema) normalizeBlockContent(content, schema, resolvedContent);
   const style = patchedStyle ? { ...asBucket(block.style), ...patchedStyle } : asBucket(block.style);
   const advanced = patchedAdvanced ? { ...asBucket(block.advanced), ...patchedAdvanced } : asBucket(block.advanced);
   return wrap(

package/dist/internal-server.cjs

@@ -41,14 +41,21 @@ async function resolveBlocks(blocks, loaderMap, locale, defaultLocale, context,
       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 } : {}
-    );
+  const schemas = options?.schemas;
+  if (schemas) {
+    if (options?.config) {
+      await internal.resolveRelationContent(
+        options.config,
+        blocks.map((block, i) => ({ type: block.type, content: contents[i] })),
+        schemas,
+        locale,
+        options.workspaceId ? { workspaceId: options.workspaceId } : {}
+      );
+    }
+    blocks.forEach((block, i) => {
+      const schema = schemas[block.type];
+      if (schema) internal.normalizeBlockContent(contents[i], schema);
+    });
   }
   return Promise.all(
     blocks.map(async (block, i) => {
@@ -164,6 +171,7 @@ async function resolveLayoutBlockData(options) {
   return (await resolveEditorLayoutBlockData(options)).data;
 }
 
+exports.blocksToSchemas = blocksToSchemas;
 exports.resolveBlockData = resolveBlockData;
 exports.resolveEditorBlockData = resolveEditorBlockData;
 exports.resolveEditorLayoutBlockData = resolveEditorLayoutBlockData;

package/dist/internal-server.d.cts

@@ -1,5 +1,6 @@
 import { CmssyPageData, CmssyFormDefinition, CmssyClientConfig, CmssyLayoutGroup } from '@cmssy/core';
-import { B as BlockDefinition } from './registry-fguZApc8.cjs';
+import { B as BlockDefinition } from './registry-CwJ2cby4.cjs';
+export { e as blocksToSchemas } from './registry-CwJ2cby4.cjs';
 import 'react';
 
 interface EditorBlockData {

package/dist/internal-server.d.ts

@@ -1,5 +1,6 @@
 import { CmssyPageData, CmssyFormDefinition, CmssyClientConfig, CmssyLayoutGroup } from '@cmssy/core';
-import { B as BlockDefinition } from './registry-fguZApc8.js';
+import { B as BlockDefinition } from './registry-CwJ2cby4.js';
+export { e as blocksToSchemas } from './registry-CwJ2cby4.js';
 import 'react';
 
 interface EditorBlockData {

package/dist/internal-server.js

@@ -1,4 +1,4 @@
-import { buildBlockContext, getBlockContentForLanguage, resolveRelationContent } from '@cmssy/core/internal';
+import { buildBlockContext, getBlockContentForLanguage, resolveRelationContent, normalizeBlockContent } from '@cmssy/core/internal';
 
 // src/components/resolve-block-data.ts
 
@@ -39,14 +39,21 @@ async function resolveBlocks(blocks, loaderMap, locale, defaultLocale, context,
       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 } : {}
-    );
+  const schemas = options?.schemas;
+  if (schemas) {
+    if (options?.config) {
+      await resolveRelationContent(
+        options.config,
+        blocks.map((block, i) => ({ type: block.type, content: contents[i] })),
+        schemas,
+        locale,
+        options.workspaceId ? { workspaceId: options.workspaceId } : {}
+      );
+    }
+    blocks.forEach((block, i) => {
+      const schema = schemas[block.type];
+      if (schema) normalizeBlockContent(contents[i], schema);
+    });
   }
   return Promise.all(
     blocks.map(async (block, i) => {
@@ -162,4 +169,4 @@ async function resolveLayoutBlockData(options) {
   return (await resolveEditorLayoutBlockData(options)).data;
 }
 
-export { resolveBlockData, resolveEditorBlockData, resolveEditorLayoutBlockData, resolveLayoutBlockData };
+export { blocksToSchemas, resolveBlockData, resolveEditorBlockData, resolveEditorLayoutBlockData, resolveLayoutBlockData };

package/dist/{registry-fguZApc8.d.cts → registry-CwJ2cby4.d.cts}

@@ -1,5 +1,5 @@
 import { ComponentType } from 'react';
-import { FieldDefinition, CmssyBlockContext, BlockPropsSchema, InferBlockContent } from '@cmssy/core';
+import { FieldDefinition, CmssyBlockContext, BlockPropsSchema, InferBlockContent, BlockSchema } from '@cmssy/core';
 
 interface BlockProps<P extends BlockPropsSchema, D = unknown> {
     content: InferBlockContent<P>;
@@ -65,5 +65,6 @@ type BlockMap = Record<string, ComponentType<{
     data?: unknown;
 }>>;
 declare function buildBlockMap(blocks: BlockDefinition[]): BlockMap;
+declare function blocksToSchemas(blocks: BlockDefinition[]): Record<string, BlockSchema>;
 
-export { type BlockDefinition as B, type BlockMap as a, type BlockProps as b, buildBlockMap as c, defineBlock as d };
+export { type BlockDefinition as B, type BlockMap as a, type BlockProps as b, buildBlockMap as c, defineBlock as d, blocksToSchemas as e };

package/dist/{registry-fguZApc8.d.ts → registry-CwJ2cby4.d.ts}

@@ -1,5 +1,5 @@
 import { ComponentType } from 'react';
-import { FieldDefinition, CmssyBlockContext, BlockPropsSchema, InferBlockContent } from '@cmssy/core';
+import { FieldDefinition, CmssyBlockContext, BlockPropsSchema, InferBlockContent, BlockSchema } from '@cmssy/core';
 
 interface BlockProps<P extends BlockPropsSchema, D = unknown> {
     content: InferBlockContent<P>;
@@ -65,5 +65,6 @@ type BlockMap = Record<string, ComponentType<{
     data?: unknown;
 }>>;
 declare function buildBlockMap(blocks: BlockDefinition[]): BlockMap;
+declare function blocksToSchemas(blocks: BlockDefinition[]): Record<string, BlockSchema>;
 
-export { type BlockDefinition as B, type BlockMap as a, type BlockProps as b, buildBlockMap as c, defineBlock as d };
+export { type BlockDefinition as B, type BlockMap as a, type BlockProps as b, buildBlockMap as c, defineBlock as d, blocksToSchemas as e };

package/package.json

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