@cmssy/react 11.0.0 → 11.1.0

package/dist/client.cjs

@@ -817,7 +817,7 @@ function CmssyEditableLayout({
   );
   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) : [];
+    return group ? group.blocks.filter((b) => b.isActive !== false).slice().sort((a, b) => a.order - b.order) : [];
   }, [groups, position]);
   const patches = useLayoutPatchBridge(position, edit);
   const context = react.useMemo(

package/dist/client.js

@@ -815,7 +815,7 @@ function CmssyEditableLayout({
   );
   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) : [];
+    return group ? group.blocks.filter((b) => b.isActive !== false).slice().sort((a, b) => a.order - b.order) : [];
   }, [groups, position]);
   const patches = useLayoutPatchBridge(position, edit);
   const context = useMemo(

package/dist/index.cjs

@@ -5,6 +5,7 @@ var internal = require('@cmssy/core/internal');
 var react = require('react');
 var blockErrorBoundary = require('@cmssy/react/block-error-boundary');
 var jsxRuntime = require('react/jsx-runtime');
+var locale = require('@cmssy/core/internal/locale');
 
 // src/index.ts
 
@@ -364,7 +365,7 @@ async function resolveEditorLayoutBlockData({
   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) : [];
+  const layoutBlocks = group ? group.blocks.filter((b) => b.isActive !== false).slice().sort((a, b) => a.order - b.order) : [];
   if (layoutBlocks.length === 0) return { data: {}, content: {} };
   const loaderMap = buildLoaderMap(blocks);
   const context = internal.buildBlockContext(
@@ -386,6 +387,52 @@ async function resolveEditorLayoutBlockData({
   );
   return collectBlockData(layoutBlocks, resolved, isPreview);
 }
+async function resolveCmssyLayoutSlot(config, options) {
+  const {
+    position,
+    blocks,
+    editMode,
+    page,
+    forms,
+    appContext,
+    path,
+    locale: explicitLocale
+  } = options;
+  const siteLocales = await locale.resolveSiteLocales(config);
+  const fromPath = path ? locale.splitLocaleFromPath(path, siteLocales) : { locale: siteLocales.defaultLocale, path: [] };
+  const locale$1 = explicitLocale ?? fromPath.locale;
+  const slugSegments = fromPath.path ?? [];
+  const pageSlug = page ?? "/" + slugSegments.join("/");
+  const groups = await internal.fetchLayouts(config, pageSlug, {
+    previewSecret: editMode ? config.draftSecret : void 0
+  });
+  const base = {
+    groups,
+    locale: locale$1,
+    defaultLocale: siteLocales.defaultLocale,
+    enabledLocales: siteLocales.locales,
+    path: slugSegments
+  };
+  if (!editMode) return base;
+  const editorData = await resolveEditorLayoutBlockData({
+    groups,
+    blocks,
+    position,
+    locale: locale$1,
+    defaultLocale: siteLocales.defaultLocale,
+    enabledLocales: siteLocales.locales,
+    forms,
+    isPreview: true,
+    config,
+    appContext
+  });
+  return {
+    ...base,
+    data: editorData.data,
+    resolvedContent: editorData.content,
+    editorOrigin: core.resolveEditorOrigin(config.editorOrigin)
+  };
+}
 async function CmssyServerLayout({
   groups,
   blocks,
@@ -404,7 +451,7 @@ async function CmssyServerLayout({
     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) : [];
+  const layoutBlocks = group ? group.blocks.filter((b) => b.isActive !== false).slice().sort((a, b) => a.order - b.order) : [];
   if (layoutBlocks.length === 0) return null;
   const map = buildBlockMap(blocks);
   const loaderMap = buildLoaderMap(blocks);
@@ -565,5 +612,6 @@ exports.CmssyServerPage = CmssyServerPage;
 exports.UnknownBlock = UnknownBlock;
 exports.buildBlockMap = buildBlockMap;
 exports.defineBlock = defineBlock;
+exports.resolveCmssyLayoutSlot = resolveCmssyLayoutSlot;
 exports.resolveEditorBlockData = resolveEditorBlockData;
 exports.resolveEditorLayoutBlockData = resolveEditorLayoutBlockData;

package/dist/index.d.cts

@@ -1,4 +1,4 @@
-import { CmssyPageData, CmssyClientConfig, CmssyFormDefinition, CmssyBlockAuthContext, CmssyBlockWorkspace, CmssyLayoutGroup, RawBlock, CmssyBlockContext } from '@cmssy/core';
+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, PROTOCOL_VERSION, ParentReadyMessage, PatchMessage, PostTarget, QueryScopedOptions, RawBlock, RawLayoutBlock, ReadyMessage, RetryPolicy, SelectMessage, SubmitFormInput, TypedField, createCmssyClient, fields, graphqlRequest, isProtocolCompatible, layoutPositionValues, 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';
@@ -42,6 +42,83 @@ interface CmssyServerPageProps {
  */
 declare function CmssyServerPage({ page, blocks, locale: localeProp, defaultLocale: defaultLocaleProp, enabledLocales: enabledLocalesProp, config, forms, auth, workspace, appContext, editMode, }: CmssyServerPageProps): Promise<react_jsx_runtime.JSX.Element | null>;
 
+interface ResolveCmssyLayoutSlotBase {
+    position: string;
+    blocks: BlockDefinition[];
+    /**
+     * Whether to resolve for the edit bridge. A parameter, never a lookup: every
+     * way of asking the request is a dynamic API on Next, and one read makes the
+     * route uncacheable. Each adapter knows the answer already - from its own
+     * request object, or from the route segment.
+     */
+    editMode: boolean;
+    /**
+     * Whose layouts to render. Defaults to the routed page, which is what a page
+     * with its own header needs; pass `"/"` for the site-wide chrome.
+     */
+    page?: string;
+    forms?: Record<string, CmssyFormDefinition>;
+    appContext?: Record<string, unknown>;
+}
+/**
+ * Where the language comes from - one of two, never neither.
+ *
+ * `path` is the routed segments: the language prefix in them IS the language,
+ * and it is also where the page slug comes from. `locale` overrides the
+ * language without touching the slug, which is what an always-dynamic adapter
+ * wants when the proxy already resolved it into a header.
+ *
+ * What this deliberately does NOT do is read that header itself. On a cacheable
+ * route it is not there to read, and a fallback would render the wrong language
+ * while looking like it worked.
+ */
+type CmssyLayoutSlotLocaleSource = {
+    path: string[];
+    locale?: string;
+} | {
+    locale: string;
+    path?: undefined;
+};
+type ResolveCmssyLayoutSlotOptions = ResolveCmssyLayoutSlotBase & CmssyLayoutSlotLocaleSource;
+interface CmssyLayoutSlotResolution {
+    groups: CmssyLayoutGroup[];
+    locale: string;
+    defaultLocale: string;
+    enabledLocales: string[];
+    /**
+     * The routed segments with the language prefix removed - the page slug. It is
+     * returned because every caller needs it next, and resolving it twice is how
+     * the three adapters drifted apart in the first place.
+     */
+    path: string[];
+    /** Edit mode only: the loader data and the server-resolved content. */
+    data?: Record<string, unknown>;
+    resolvedContent?: Record<string, Record<string, unknown>>;
+    /**
+     * Edit mode only, and unchanged: `string | string[]`. The bridge handles a
+     * list natively and the default is two origins - collapsing it to the first
+     * silently breaks an editor served from the second.
+     */
+    editorOrigin?: string | string[];
+}
+/**
+ * Everything a layout slot needs, for any framework.
+ *
+ * Three things have to be right here, and each was got wrong at least once by
+ * an app that wrote this by hand:
+ *
+ *  1. in edit mode the layouts are fetched **with the preview secret** -
+ *     otherwise you edit the draft header and the editor shows the published
+ *     one;
+ *  2. the language comes from the routed path, not from a request header;
+ *  3. the editor gets `resolvedContent` as well as `data` - the canvas renders
+ *     stored content, where a relation field is raw ids.
+ *
+ * Rendering stays with the caller: three frameworks, three rendering models.
+ * This is the half that is the same in all of them.
+ */
+declare function resolveCmssyLayoutSlot(config: CmssyConfig, options: ResolveCmssyLayoutSlotOptions): Promise<CmssyLayoutSlotResolution>;
+
 interface CmssyServerLayoutProps {
     groups: CmssyLayoutGroup[];
     blocks: BlockDefinition[];
@@ -96,4 +173,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, UnknownBlock, type UnknownBlockProps };
+export { BlockDefinition, BlockMap, CmssyBlock, type CmssyBlockProps, type CmssyLayoutSlotLocaleSource, type CmssyLayoutSlotResolution, CmssyServerLayout, type CmssyServerLayoutProps, CmssyServerPage, type CmssyServerPageProps, type ResolveCmssyLayoutSlotOptions, UnknownBlock, type UnknownBlockProps, resolveCmssyLayoutSlot };

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { CmssyPageData, CmssyClientConfig, CmssyFormDefinition, CmssyBlockAuthContext, CmssyBlockWorkspace, CmssyLayoutGroup, RawBlock, CmssyBlockContext } from '@cmssy/core';
+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, PROTOCOL_VERSION, ParentReadyMessage, PatchMessage, PostTarget, QueryScopedOptions, RawBlock, RawLayoutBlock, ReadyMessage, RetryPolicy, SelectMessage, SubmitFormInput, TypedField, createCmssyClient, fields, graphqlRequest, isProtocolCompatible, layoutPositionValues, 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';
@@ -42,6 +42,83 @@ interface CmssyServerPageProps {
  */
 declare function CmssyServerPage({ page, blocks, locale: localeProp, defaultLocale: defaultLocaleProp, enabledLocales: enabledLocalesProp, config, forms, auth, workspace, appContext, editMode, }: CmssyServerPageProps): Promise<react_jsx_runtime.JSX.Element | null>;
 
+interface ResolveCmssyLayoutSlotBase {
+    position: string;
+    blocks: BlockDefinition[];
+    /**
+     * Whether to resolve for the edit bridge. A parameter, never a lookup: every
+     * way of asking the request is a dynamic API on Next, and one read makes the
+     * route uncacheable. Each adapter knows the answer already - from its own
+     * request object, or from the route segment.
+     */
+    editMode: boolean;
+    /**
+     * Whose layouts to render. Defaults to the routed page, which is what a page
+     * with its own header needs; pass `"/"` for the site-wide chrome.
+     */
+    page?: string;
+    forms?: Record<string, CmssyFormDefinition>;
+    appContext?: Record<string, unknown>;
+}
+/**
+ * Where the language comes from - one of two, never neither.
+ *
+ * `path` is the routed segments: the language prefix in them IS the language,
+ * and it is also where the page slug comes from. `locale` overrides the
+ * language without touching the slug, which is what an always-dynamic adapter
+ * wants when the proxy already resolved it into a header.
+ *
+ * What this deliberately does NOT do is read that header itself. On a cacheable
+ * route it is not there to read, and a fallback would render the wrong language
+ * while looking like it worked.
+ */
+type CmssyLayoutSlotLocaleSource = {
+    path: string[];
+    locale?: string;
+} | {
+    locale: string;
+    path?: undefined;
+};
+type ResolveCmssyLayoutSlotOptions = ResolveCmssyLayoutSlotBase & CmssyLayoutSlotLocaleSource;
+interface CmssyLayoutSlotResolution {
+    groups: CmssyLayoutGroup[];
+    locale: string;
+    defaultLocale: string;
+    enabledLocales: string[];
+    /**
+     * The routed segments with the language prefix removed - the page slug. It is
+     * returned because every caller needs it next, and resolving it twice is how
+     * the three adapters drifted apart in the first place.
+     */
+    path: string[];
+    /** Edit mode only: the loader data and the server-resolved content. */
+    data?: Record<string, unknown>;
+    resolvedContent?: Record<string, Record<string, unknown>>;
+    /**
+     * Edit mode only, and unchanged: `string | string[]`. The bridge handles a
+     * list natively and the default is two origins - collapsing it to the first
+     * silently breaks an editor served from the second.
+     */
+    editorOrigin?: string | string[];
+}
+/**
+ * Everything a layout slot needs, for any framework.
+ *
+ * Three things have to be right here, and each was got wrong at least once by
+ * an app that wrote this by hand:
+ *
+ *  1. in edit mode the layouts are fetched **with the preview secret** -
+ *     otherwise you edit the draft header and the editor shows the published
+ *     one;
+ *  2. the language comes from the routed path, not from a request header;
+ *  3. the editor gets `resolvedContent` as well as `data` - the canvas renders
+ *     stored content, where a relation field is raw ids.
+ *
+ * Rendering stays with the caller: three frameworks, three rendering models.
+ * This is the half that is the same in all of them.
+ */
+declare function resolveCmssyLayoutSlot(config: CmssyConfig, options: ResolveCmssyLayoutSlotOptions): Promise<CmssyLayoutSlotResolution>;
+
 interface CmssyServerLayoutProps {
     groups: CmssyLayoutGroup[];
     blocks: BlockDefinition[];
@@ -96,4 +173,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, UnknownBlock, type UnknownBlockProps };
+export { BlockDefinition, BlockMap, CmssyBlock, type CmssyBlockProps, type CmssyLayoutSlotLocaleSource, type CmssyLayoutSlotResolution, CmssyServerLayout, type CmssyServerLayoutProps, CmssyServerPage, type CmssyServerPageProps, type ResolveCmssyLayoutSlotOptions, UnknownBlock, type UnknownBlockProps, resolveCmssyLayoutSlot };

package/dist/index.js

@@ -1,9 +1,11 @@
+import { resolveEditorOrigin } from '@cmssy/core';
 export { CmssyRequestError, PROTOCOL_VERSION, createCmssyClient, fields, graphqlRequest, isProtocolCompatible, layoutPositionValues, normalizeOrigin, parseEditorMessage, postToEditor } from '@cmssy/core';
-import { buildBlockContext, getBlockContentForLanguage, normalizeRelationContent, asBucket, resolveSiteLocales, resolveRelationContent } from '@cmssy/core/internal';
+import { buildBlockContext, fetchLayouts, getBlockContentForLanguage, normalizeRelationContent, 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';
 import { jsx, Fragment, jsxs } from 'react/jsx-runtime';
+import { resolveSiteLocales, splitLocaleFromPath } from '@cmssy/core/internal/locale';
 
 // src/index.ts
 
@@ -234,7 +236,7 @@ async function resolveRenderLocale({
 }) {
   if (locale && defaultLocale) return { locale, defaultLocale, enabledLocales };
   if (config) {
-    const site = await resolveSiteLocales(config);
+    const site = await resolveSiteLocales$1(config);
     return {
       locale: locale ?? defaultLocale ?? site.defaultLocale,
       defaultLocale: defaultLocale ?? site.defaultLocale,
@@ -363,7 +365,7 @@ async function resolveEditorLayoutBlockData({
   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) : [];
+  const layoutBlocks = group ? group.blocks.filter((b) => b.isActive !== false).slice().sort((a, b) => a.order - b.order) : [];
   if (layoutBlocks.length === 0) return { data: {}, content: {} };
   const loaderMap = buildLoaderMap(blocks);
   const context = buildBlockContext(
@@ -385,6 +387,52 @@ async function resolveEditorLayoutBlockData({
   );
   return collectBlockData(layoutBlocks, resolved, isPreview);
 }
+async function resolveCmssyLayoutSlot(config, options) {
+  const {
+    position,
+    blocks,
+    editMode,
+    page,
+    forms,
+    appContext,
+    path,
+    locale: explicitLocale
+  } = options;
+  const siteLocales = await resolveSiteLocales(config);
+  const fromPath = path ? splitLocaleFromPath(path, siteLocales) : { locale: siteLocales.defaultLocale, path: [] };
+  const locale = explicitLocale ?? fromPath.locale;
+  const slugSegments = fromPath.path ?? [];
+  const pageSlug = page ?? "/" + slugSegments.join("/");
+  const groups = await fetchLayouts(config, pageSlug, {
+    previewSecret: editMode ? config.draftSecret : void 0
+  });
+  const base = {
+    groups,
+    locale,
+    defaultLocale: siteLocales.defaultLocale,
+    enabledLocales: siteLocales.locales,
+    path: slugSegments
+  };
+  if (!editMode) return base;
+  const editorData = await resolveEditorLayoutBlockData({
+    groups,
+    blocks,
+    position,
+    locale,
+    defaultLocale: siteLocales.defaultLocale,
+    enabledLocales: siteLocales.locales,
+    forms,
+    isPreview: true,
+    config,
+    appContext
+  });
+  return {
+    ...base,
+    data: editorData.data,
+    resolvedContent: editorData.content,
+    editorOrigin: resolveEditorOrigin(config.editorOrigin)
+  };
+}
 async function CmssyServerLayout({
   groups,
   blocks,
@@ -403,7 +451,7 @@ async function CmssyServerLayout({
     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) : [];
+  const layoutBlocks = group ? group.blocks.filter((b) => b.isActive !== false).slice().sort((a, b) => a.order - b.order) : [];
   if (layoutBlocks.length === 0) return null;
   const map = buildBlockMap(blocks);
   const loaderMap = buildLoaderMap(blocks);
@@ -514,4 +562,4 @@ function CmssyBlock({
   );
 }
 
-export { CmssyBlock, CmssyServerLayout, CmssyServerPage, UnknownBlock, buildBlockMap, defineBlock, resolveEditorBlockData, resolveEditorLayoutBlockData };
+export { CmssyBlock, CmssyServerLayout, CmssyServerPage, UnknownBlock, buildBlockMap, defineBlock, resolveCmssyLayoutSlot, resolveEditorBlockData, resolveEditorLayoutBlockData };

package/dist/internal-server.cjs

@@ -138,7 +138,7 @@ async function resolveEditorLayoutBlockData({
   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) : [];
+  const layoutBlocks = group ? group.blocks.filter((b) => b.isActive !== false).slice().sort((a, b) => a.order - b.order) : [];
   if (layoutBlocks.length === 0) return { data: {}, content: {} };
   const loaderMap = buildLoaderMap(blocks);
   const context = internal.buildBlockContext(

package/dist/internal-server.js

@@ -136,7 +136,7 @@ async function resolveEditorLayoutBlockData({
   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) : [];
+  const layoutBlocks = group ? group.blocks.filter((b) => b.isActive !== false).slice().sort((a, b) => a.order - b.order) : [];
   if (layoutBlocks.length === 0) return { data: {}, content: {} };
   const loaderMap = buildLoaderMap(blocks);
   const context = buildBlockContext(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cmssy/react",
-  "version": "11.0.0",
+  "version": "11.1.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": "11.0.0"
+    "@cmssy/core": "11.1.0"
   },
   "scripts": {
     "build": "tsup",