@cmssy/next 14.0.0 → 14.1.0

package/dist/index.d.cts

@@ -1,4 +1,4 @@
-export { CMSSY_EDIT_HEADER, CMSSY_EDIT_QUERY_PARAM, CMSSY_LOCALE_HEADER, CMSSY_SECRET_QUERY_PARAM, CmssyConfig, CmssyEnvConfig, CmssyLayout, CmssyPageData, CmssyPageMeta, CmssyPageSummary, CmssyRegion, CmssyRegionOf, CmssyRegionSettings, CmssyRetryMode, CmssyWebhookError, CmssyWebhookEvent, DEFAULT_CMSSY_EDITOR_ORIGINS, LayoutRegion, RetryOption, RetryPolicy, VerifyCmssyWebhookOptions, defineCmssyConfig, defineCmssyLayout, localizeHref, resolveEditorOrigin, verifyCmssyWebhook } from '@cmssy/core';
+export { CMSSY_EDIT_HEADER, CMSSY_EDIT_QUERY_PARAM, CMSSY_LOCALE_HEADER, CMSSY_SECRET_QUERY_PARAM, CmssyConfig, CmssyEnvConfig, CmssyLayout, CmssyPageData, CmssyPageMeta, CmssyPageSummary, CmssyRegion, CmssyRegionOf, CmssyRegionSettings, CmssyRegionSettingsOf, CmssyRetryMode, CmssyWebhookError, CmssyWebhookEvent, DEFAULT_CMSSY_EDITOR_ORIGINS, LayoutRegion, RetryOption, RetryPolicy, VerifyCmssyWebhookOptions, defineCmssyConfig, defineCmssyLayout, localizeHref, resolveEditorOrigin, verifyCmssyWebhook } from '@cmssy/core';
 export { C as CmssyAppContext, a as CmssyEditorProps, b as CreateCmssyPageOptions, N as NEXT_BUILD_PHASE, n as nextRetryMode } from './index-ZUEbpOlo.cjs';
 import 'react/jsx-runtime';
 import 'react';

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-export { CMSSY_EDIT_HEADER, CMSSY_EDIT_QUERY_PARAM, CMSSY_LOCALE_HEADER, CMSSY_SECRET_QUERY_PARAM, CmssyConfig, CmssyEnvConfig, CmssyLayout, CmssyPageData, CmssyPageMeta, CmssyPageSummary, CmssyRegion, CmssyRegionOf, CmssyRegionSettings, CmssyRetryMode, CmssyWebhookError, CmssyWebhookEvent, DEFAULT_CMSSY_EDITOR_ORIGINS, LayoutRegion, RetryOption, RetryPolicy, VerifyCmssyWebhookOptions, defineCmssyConfig, defineCmssyLayout, localizeHref, resolveEditorOrigin, verifyCmssyWebhook } from '@cmssy/core';
+export { CMSSY_EDIT_HEADER, CMSSY_EDIT_QUERY_PARAM, CMSSY_LOCALE_HEADER, CMSSY_SECRET_QUERY_PARAM, CmssyConfig, CmssyEnvConfig, CmssyLayout, CmssyPageData, CmssyPageMeta, CmssyPageSummary, CmssyRegion, CmssyRegionOf, CmssyRegionSettings, CmssyRegionSettingsOf, CmssyRetryMode, CmssyWebhookError, CmssyWebhookEvent, DEFAULT_CMSSY_EDITOR_ORIGINS, LayoutRegion, RetryOption, RetryPolicy, VerifyCmssyWebhookOptions, defineCmssyConfig, defineCmssyLayout, localizeHref, resolveEditorOrigin, verifyCmssyWebhook } from '@cmssy/core';
 export { C as CmssyAppContext, a as CmssyEditorProps, b as CreateCmssyPageOptions, N as NEXT_BUILD_PHASE, n as nextRetryMode } from './index-ZUEbpOlo.js';
 import 'react/jsx-runtime';
 import 'react';

package/dist/server.cjs

@@ -264,51 +264,33 @@ async function CmssyLayoutSlot({
   path,
   locale: explicitLocale,
   editMode,
+  preview,
   page,
-  editable: Editable,
+  editable,
   appContext,
-  retry
+  retry,
+  children
 }) {
-  const resolved = await react.resolveCmssyLayoutSlot(config, {
+  const layout = await react.resolveCmssyLayout(config, {
     position,
     blocks,
     editMode,
+    preview,
+    editable,
     ...page !== void 0 ? { page } : {},
     appContext,
     retry: retry ?? nextRetryMode(),
     ...explicitLocale !== void 0 ? { locale: explicitLocale } : { path: path ?? [] }
   });
-  const { groups, locale, defaultLocale, enabledLocales } = resolved;
-  if (!editMode) {
-    return /* @__PURE__ */ jsxRuntime.jsx(
-      react.CmssyServerLayout,
-      {
-        groups,
-        blocks,
-        position,
-        locale,
-        defaultLocale,
-        enabledLocales,
-        config,
-        appContext
-      }
-    );
-  }
-  const origin = resolved.editorOrigin;
-  return /* @__PURE__ */ jsxRuntime.jsx(
-    Editable,
-    {
-      groups,
-      position,
-      locale,
-      defaultLocale,
-      enabledLocales,
-      edit: { editorOrigin: origin ?? "" },
-      data: resolved.data,
-      resolvedContent: resolved.resolvedContent,
-      appContext
-    }
-  );
+  if (!children) return layout.element;
+  const { groups, settings, page: routed, element } = layout;
+  return /* @__PURE__ */ jsxRuntime.jsx(jsxRuntime.Fragment, { children: children({ groups, settings, page: routed, element }) });
+}
+function resolveCmssyLayout2(config, options) {
+  return react.resolveCmssyLayout(config, {
+    ...options,
+    retry: options.retry ?? nextRetryMode()
+  });
 }
 
 exports.CmssyLayoutSlot = CmssyLayoutSlot;
@@ -318,3 +300,4 @@ exports.createCmssyPage = createCmssyPage;
 exports.createDraftRoute = createDraftRoute;
 exports.isCmssyEditMode = isCmssyEditMode;
 exports.nextRetryMode = nextRetryMode;
+exports.resolveCmssyLayout = resolveCmssyLayout2;

package/dist/server.d.cts

@@ -2,8 +2,9 @@ export { C as CmssyAppContext, a as CmssyEditorProps, b as CreateCmssyPageOption
 import { CmssyConfig, CmssyRegionOf, RetryOption } from '@cmssy/core';
 export { CmssyRetryMode, RetryOption, RetryPolicy } from '@cmssy/core';
 import * as react_jsx_runtime from 'react/jsx-runtime';
-import { ComponentType } from 'react';
-import { BlockDefinition, CmssyLayoutGroup } from '@cmssy/react';
+import { ComponentType, ReactNode } from 'react';
+import { BlockDefinition, CmssyLayoutEditableProps, CmssyLayoutResolution, ResolveCmssyLayoutOptions } from '@cmssy/react';
+export { CmssyLayoutEditableProps, CmssyLayoutResolution, ResolveCmssyLayoutOptions } from '@cmssy/react';
 import '@cmssy/react/client';
 
 type CmssyDraftRouteConfig = Pick<CmssyConfig, "draftSecret"> & {
@@ -13,27 +14,18 @@ declare function createDraftRoute(config: CmssyDraftRouteConfig): (request: Requ
 
 declare function isCmssyEditMode(): Promise<boolean>;
 
-interface CmssyLayoutSlotBaseProps<C extends CmssyConfig> {
+type CmssyLayoutSlotRenderProps<C extends CmssyConfig = CmssyConfig, P extends CmssyRegionOf<C> = CmssyRegionOf<C>> = Pick<CmssyLayoutResolution<C, P>, "groups" | "settings" | "page" | "element">;
+interface CmssyLayoutSlotBaseProps<C extends CmssyConfig, P extends CmssyRegionOf<C>> {
     config: C;
     blocks: BlockDefinition[];
-    position: CmssyRegionOf<C>;
+    position: P;
     editMode: boolean;
+    preview?: boolean;
     page?: string;
-    editable: ComponentType<{
-        groups: CmssyLayoutGroup[];
-        position: string;
-        locale: string;
-        defaultLocale: string;
-        enabledLocales: string[];
-        edit: {
-            editorOrigin: string | string[];
-        };
-        data?: Record<string, unknown>;
-        resolvedContent?: Record<string, Record<string, unknown>>;
-        appContext?: Record<string, unknown>;
-    }>;
+    editable: ComponentType<CmssyLayoutEditableProps>;
     appContext?: Record<string, unknown>;
     retry?: RetryOption;
+    children?: (layout: CmssyLayoutSlotRenderProps<C, P>) => ReactNode;
 }
 type CmssyLayoutSlotLocaleSource = {
     path: string[];
@@ -42,7 +34,9 @@ type CmssyLayoutSlotLocaleSource = {
     locale: string;
     path?: never;
 };
-type CmssyLayoutSlotProps<C extends CmssyConfig = CmssyConfig> = CmssyLayoutSlotBaseProps<C> & CmssyLayoutSlotLocaleSource;
-declare function CmssyLayoutSlot<C extends CmssyConfig>({ config, blocks, position, path, locale: explicitLocale, editMode, page, editable: Editable, appContext, retry, }: CmssyLayoutSlotProps<C>): Promise<react_jsx_runtime.JSX.Element>;
+type CmssyLayoutSlotProps<C extends CmssyConfig = CmssyConfig, P extends CmssyRegionOf<C> = CmssyRegionOf<C>> = CmssyLayoutSlotBaseProps<C, P> & CmssyLayoutSlotLocaleSource;
+declare function CmssyLayoutSlot<C extends CmssyConfig, P extends CmssyRegionOf<C>>({ config, blocks, position, path, locale: explicitLocale, editMode, preview, page, editable, appContext, retry, children, }: CmssyLayoutSlotProps<C, P>): Promise<react_jsx_runtime.JSX.Element>;
 
-export { type CmssyDraftRouteConfig, CmssyLayoutSlot, type CmssyLayoutSlotProps, createDraftRoute, isCmssyEditMode };
+declare function resolveCmssyLayout<C extends CmssyConfig, P extends CmssyRegionOf<C>>(config: C, options: ResolveCmssyLayoutOptions<C, P>): Promise<CmssyLayoutResolution<C, P>>;
+
+export { type CmssyDraftRouteConfig, CmssyLayoutSlot, type CmssyLayoutSlotProps, type CmssyLayoutSlotRenderProps, createDraftRoute, isCmssyEditMode, resolveCmssyLayout };

package/dist/server.d.ts

@@ -2,8 +2,9 @@ export { C as CmssyAppContext, a as CmssyEditorProps, b as CreateCmssyPageOption
 import { CmssyConfig, CmssyRegionOf, RetryOption } from '@cmssy/core';
 export { CmssyRetryMode, RetryOption, RetryPolicy } from '@cmssy/core';
 import * as react_jsx_runtime from 'react/jsx-runtime';
-import { ComponentType } from 'react';
-import { BlockDefinition, CmssyLayoutGroup } from '@cmssy/react';
+import { ComponentType, ReactNode } from 'react';
+import { BlockDefinition, CmssyLayoutEditableProps, CmssyLayoutResolution, ResolveCmssyLayoutOptions } from '@cmssy/react';
+export { CmssyLayoutEditableProps, CmssyLayoutResolution, ResolveCmssyLayoutOptions } from '@cmssy/react';
 import '@cmssy/react/client';
 
 type CmssyDraftRouteConfig = Pick<CmssyConfig, "draftSecret"> & {
@@ -13,27 +14,18 @@ declare function createDraftRoute(config: CmssyDraftRouteConfig): (request: Requ
 
 declare function isCmssyEditMode(): Promise<boolean>;
 
-interface CmssyLayoutSlotBaseProps<C extends CmssyConfig> {
+type CmssyLayoutSlotRenderProps<C extends CmssyConfig = CmssyConfig, P extends CmssyRegionOf<C> = CmssyRegionOf<C>> = Pick<CmssyLayoutResolution<C, P>, "groups" | "settings" | "page" | "element">;
+interface CmssyLayoutSlotBaseProps<C extends CmssyConfig, P extends CmssyRegionOf<C>> {
     config: C;
     blocks: BlockDefinition[];
-    position: CmssyRegionOf<C>;
+    position: P;
     editMode: boolean;
+    preview?: boolean;
     page?: string;
-    editable: ComponentType<{
-        groups: CmssyLayoutGroup[];
-        position: string;
-        locale: string;
-        defaultLocale: string;
-        enabledLocales: string[];
-        edit: {
-            editorOrigin: string | string[];
-        };
-        data?: Record<string, unknown>;
-        resolvedContent?: Record<string, Record<string, unknown>>;
-        appContext?: Record<string, unknown>;
-    }>;
+    editable: ComponentType<CmssyLayoutEditableProps>;
     appContext?: Record<string, unknown>;
     retry?: RetryOption;
+    children?: (layout: CmssyLayoutSlotRenderProps<C, P>) => ReactNode;
 }
 type CmssyLayoutSlotLocaleSource = {
     path: string[];
@@ -42,7 +34,9 @@ type CmssyLayoutSlotLocaleSource = {
     locale: string;
     path?: never;
 };
-type CmssyLayoutSlotProps<C extends CmssyConfig = CmssyConfig> = CmssyLayoutSlotBaseProps<C> & CmssyLayoutSlotLocaleSource;
-declare function CmssyLayoutSlot<C extends CmssyConfig>({ config, blocks, position, path, locale: explicitLocale, editMode, page, editable: Editable, appContext, retry, }: CmssyLayoutSlotProps<C>): Promise<react_jsx_runtime.JSX.Element>;
+type CmssyLayoutSlotProps<C extends CmssyConfig = CmssyConfig, P extends CmssyRegionOf<C> = CmssyRegionOf<C>> = CmssyLayoutSlotBaseProps<C, P> & CmssyLayoutSlotLocaleSource;
+declare function CmssyLayoutSlot<C extends CmssyConfig, P extends CmssyRegionOf<C>>({ config, blocks, position, path, locale: explicitLocale, editMode, preview, page, editable, appContext, retry, children, }: CmssyLayoutSlotProps<C, P>): Promise<react_jsx_runtime.JSX.Element>;
 
-export { type CmssyDraftRouteConfig, CmssyLayoutSlot, type CmssyLayoutSlotProps, createDraftRoute, isCmssyEditMode };
+declare function resolveCmssyLayout<C extends CmssyConfig, P extends CmssyRegionOf<C>>(config: C, options: ResolveCmssyLayoutOptions<C, P>): Promise<CmssyLayoutResolution<C, P>>;
+
+export { type CmssyDraftRouteConfig, CmssyLayoutSlot, type CmssyLayoutSlotProps, type CmssyLayoutSlotRenderProps, createDraftRoute, isCmssyEditMode, resolveCmssyLayout };

package/dist/server.js

@@ -1,12 +1,12 @@
 import 'server-only';
 import { draftMode, headers } from 'next/headers';
 import { notFound, redirect } from 'next/navigation';
-import { createCmssyClient, CmssyServerPage, resolveCmssyLayoutSlot, CmssyServerLayout } from '@cmssy/react';
+import { createCmssyClient, CmssyServerPage, resolveCmssyLayout } from '@cmssy/react';
 import { CmssyLocaleProvider } from '@cmssy/react/internal';
 import { blocksToSchemas, resolveEditorBlockData } from '@cmssy/react/internal-server';
 import { isDevelopment, resolveSiteLocales, splitLocaleFromPath, fetchPage, resolveForms, toCspOrigin, cmssySecretsMatch } from '@cmssy/core/internal';
 import { CMSSY_SECRET_QUERY_PARAM, resolveEditorOrigin, CMSSY_EDIT_HEADER, CMSSY_EDIT_QUERY_PARAM } from '@cmssy/core';
-import { jsx } from 'react/jsx-runtime';
+import { jsx, Fragment } from 'react/jsx-runtime';
 
 // src/server.ts
 
@@ -262,51 +262,33 @@ async function CmssyLayoutSlot({
   path,
   locale: explicitLocale,
   editMode,
+  preview,
   page,
-  editable: Editable,
+  editable,
   appContext,
-  retry
+  retry,
+  children
 }) {
-  const resolved = await resolveCmssyLayoutSlot(config, {
+  const layout = await resolveCmssyLayout(config, {
     position,
     blocks,
     editMode,
+    preview,
+    editable,
     ...page !== void 0 ? { page } : {},
     appContext,
     retry: retry ?? nextRetryMode(),
     ...explicitLocale !== void 0 ? { locale: explicitLocale } : { path: path ?? [] }
   });
-  const { groups, locale, defaultLocale, enabledLocales } = resolved;
-  if (!editMode) {
-    return /* @__PURE__ */ jsx(
-      CmssyServerLayout,
-      {
-        groups,
-        blocks,
-        position,
-        locale,
-        defaultLocale,
-        enabledLocales,
-        config,
-        appContext
-      }
-    );
-  }
-  const origin = resolved.editorOrigin;
-  return /* @__PURE__ */ jsx(
-    Editable,
-    {
-      groups,
-      position,
-      locale,
-      defaultLocale,
-      enabledLocales,
-      edit: { editorOrigin: origin ?? "" },
-      data: resolved.data,
-      resolvedContent: resolved.resolvedContent,
-      appContext
-    }
-  );
+  if (!children) return layout.element;
+  const { groups, settings, page: routed, element } = layout;
+  return /* @__PURE__ */ jsx(Fragment, { children: children({ groups, settings, page: routed, element }) });
+}
+function resolveCmssyLayout2(config, options) {
+  return resolveCmssyLayout(config, {
+    ...options,
+    retry: options.retry ?? nextRetryMode()
+  });
 }
 
-export { CmssyLayoutSlot, NEXT_BUILD_PHASE, createCmssyEditPage, createCmssyPage, createDraftRoute, isCmssyEditMode, nextRetryMode };
+export { CmssyLayoutSlot, NEXT_BUILD_PHASE, createCmssyEditPage, createCmssyPage, createDraftRoute, isCmssyEditMode, nextRetryMode, resolveCmssyLayout2 as resolveCmssyLayout };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cmssy/next",
-  "version": "14.0.0",
+  "version": "14.1.0",
   "description": "Next.js App Router bindings for cmssy headless sites (createCmssyPage + draft preview)",
   "keywords": [
     "cmssy",
@@ -71,7 +71,7 @@
     "dist"
   ],
   "peerDependencies": {
-    "@cmssy/react": "^14.0.0",
+    "@cmssy/react": "^14.1.0",
     "next": ">=15",
     "react": "^18.2.0 || ^19.0.0",
     "react-dom": "^18.2.0 || ^19.0.0"
@@ -85,12 +85,12 @@
     "tsup": "^8.3.0",
     "typescript": "^5.6.0",
     "vitest": "^2.1.0",
-    "@cmssy/react": "14.0.0"
+    "@cmssy/react": "14.1.0"
   },
   "dependencies": {
-    "@cmssy/types": "0.38.0",
+    "@cmssy/types": "0.39.0",
     "server-only": "^0.0.1",
-    "@cmssy/core": "14.0.0"
+    "@cmssy/core": "14.1.0"
   },
   "scripts": {
     "build": "tsup",