@cmssy/next 0.1.5 → 0.1.7

package/dist/index.cjs

@@ -67,7 +67,6 @@ function createCmssyPage(config, blocks, options) {
     apiUrl: config.apiUrl,
     workspaceSlug: config.workspaceSlug
   };
-  const defaultLocale = config.defaultLocale ?? "en";
   return async function CmssyCatchAllPage({
     params,
     searchParams
@@ -76,19 +75,41 @@ function createCmssyPage(config, blocks, options) {
     const { isEnabled } = await headers.draftMode();
     const query = searchParams ? await searchParams : {};
     const editMode = isEnabled || hasEditFlag(query[EDIT_QUERY_PARAM]);
-    const locale = config.resolveLocale ? await config.resolveLocale() : defaultLocale;
-    const page = await react.fetchPage(clientConfig, path, {
+    let locale;
+    let pagePath = path;
+    let defaultLocale;
+    let enabledLocales = config.enabledLocales;
+    if (config.resolveLocale) {
+      defaultLocale = config.defaultLocale ?? "en";
+      locale = await config.resolveLocale();
+    } else {
+      const siteLocales = await react.resolveSiteLocales(clientConfig);
+      defaultLocale = config.defaultLocale ?? siteLocales.defaultLocale;
+      const locales = config.enabledLocales ?? siteLocales.locales;
+      enabledLocales = locales;
+      const split = react.splitLocaleFromPath(path, { defaultLocale, locales });
+      locale = split.locale;
+      pagePath = split.path;
+    }
+    const page = await react.fetchPage(clientConfig, pagePath, {
       previewSecret: editMode ? config.draftSecret : void 0
     });
     if (!page) {
       navigation.notFound();
     }
-    if (editMode) {
-      if (!Editor) {
-        throw new Error(
-          'cmssy: edit mode requires options.editor \u2014 pass a "use client" editor that imports your blocks and renders <CmssyEditablePage blocks={blocks} \u2026 />'
-        );
-      }
+    if (editMode && !Editor) {
+      throw new Error(
+        'cmssy: edit mode requires options.editor \u2014 pass a "use client" editor that imports your blocks and renders <CmssyEditablePage blocks={blocks} \u2026 />'
+      );
+    }
+    const resolvedForms = await react.resolveForms(
+      clientConfig,
+      page.blocks,
+      locale,
+      defaultLocale
+    );
+    const forms = Object.keys(resolvedForms).length > 0 ? resolvedForms : void 0;
+    if (editMode && Editor) {
       const bridgeOrigin = resolveBridgeOrigin(config.editorOrigin);
       return /* @__PURE__ */ jsxRuntime.jsx(
         Editor,
@@ -96,8 +117,9 @@ function createCmssyPage(config, blocks, options) {
           page,
           locale,
           defaultLocale,
-          enabledLocales: config.enabledLocales,
-          edit: { editorOrigin: bridgeOrigin }
+          enabledLocales,
+          edit: { editorOrigin: bridgeOrigin },
+          forms
         }
       );
     }
@@ -108,7 +130,8 @@ function createCmssyPage(config, blocks, options) {
         blocks,
         locale,
         defaultLocale,
-        enabledLocales: config.enabledLocales
+        enabledLocales,
+        forms
       }
     );
   };
@@ -185,11 +208,33 @@ async function isCmssyEditMode() {
   const h = await headers.headers();
   return h.get(CMSSY_EDIT_HEADER) === "1";
 }
+var CMSSY_LOCALE_HEADER = "x-cmssy-locale";
+async function localeForPathname(config, pathname) {
+  const siteLocales = await react.resolveSiteLocales(config);
+  const segments = pathname.split("/").filter(Boolean);
+  return react.splitLocaleFromPath(segments, siteLocales).locale;
+}
+async function splitCmssyLocale(config, path) {
+  const siteLocales = await react.resolveSiteLocales(config);
+  return react.splitLocaleFromPath(path, siteLocales);
+}
+async function getCmssyLocale(config) {
+  const { headers: headers2 } = await import('next/headers');
+  const headerList = await headers2();
+  const fromHeader = headerList.get(CMSSY_LOCALE_HEADER);
+  if (fromHeader) return fromHeader;
+  const { defaultLocale } = await react.resolveSiteLocales(config);
+  return defaultLocale;
+}
 
 exports.CMSSY_EDIT_HEADER = CMSSY_EDIT_HEADER;
+exports.CMSSY_LOCALE_HEADER = CMSSY_LOCALE_HEADER;
 exports.applyCmssyCsp = applyCmssyCsp;
 exports.cmssyCspHeaders = cmssyCspHeaders;
 exports.createCmssyPage = createCmssyPage;
 exports.createDraftRoute = createDraftRoute;
+exports.getCmssyLocale = getCmssyLocale;
 exports.isCmssyEditMode = isCmssyEditMode;
 exports.isCmssyEditRequest = isCmssyEditRequest;
+exports.localeForPathname = localeForPathname;
+exports.splitCmssyLocale = splitCmssyLocale;

package/dist/index.d.cts

@@ -1,6 +1,6 @@
 import * as react_jsx_runtime from 'react/jsx-runtime';
 import { ComponentType } from 'react';
-import { CmssyPageData, BlockDefinition } from '@cmssy/react';
+import { CmssyPageData, CmssyFormDefinition, BlockDefinition, CmssyClientConfig } from '@cmssy/react';
 import { EditBridgeConfig } from '@cmssy/react/client';
 
 interface CmssyNextConfig {
@@ -20,6 +20,7 @@ interface CmssyEditorProps {
     defaultLocale: string;
     enabledLocales?: string[];
     edit: EditBridgeConfig;
+    forms?: Record<string, CmssyFormDefinition>;
 }
 interface CreateCmssyPageOptions {
     editor?: ComponentType<CmssyEditorProps>;
@@ -66,4 +67,12 @@ interface EditRequestLike {
 declare function isCmssyEditRequest(request: EditRequestLike): boolean;
 declare function isCmssyEditMode(): Promise<boolean>;
 
-export { CMSSY_EDIT_HEADER, type CmssyCspOptions, type CmssyDraftRouteConfig, type CmssyEditorProps, type CmssyNextConfig, type CreateCmssyPageOptions, applyCmssyCsp, cmssyCspHeaders, createCmssyPage, createDraftRoute, isCmssyEditMode, isCmssyEditRequest };
+declare const CMSSY_LOCALE_HEADER = "x-cmssy-locale";
+declare function localeForPathname(config: CmssyClientConfig, pathname: string): Promise<string>;
+declare function splitCmssyLocale(config: CmssyClientConfig, path: string[] | undefined): Promise<{
+    locale: string;
+    path: string[] | undefined;
+}>;
+declare function getCmssyLocale(config: CmssyClientConfig): Promise<string>;
+
+export { CMSSY_EDIT_HEADER, CMSSY_LOCALE_HEADER, type CmssyCspOptions, type CmssyDraftRouteConfig, type CmssyEditorProps, type CmssyNextConfig, type CreateCmssyPageOptions, applyCmssyCsp, cmssyCspHeaders, createCmssyPage, createDraftRoute, getCmssyLocale, isCmssyEditMode, isCmssyEditRequest, localeForPathname, splitCmssyLocale };

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import * as react_jsx_runtime from 'react/jsx-runtime';
 import { ComponentType } from 'react';
-import { CmssyPageData, BlockDefinition } from '@cmssy/react';
+import { CmssyPageData, CmssyFormDefinition, BlockDefinition, CmssyClientConfig } from '@cmssy/react';
 import { EditBridgeConfig } from '@cmssy/react/client';
 
 interface CmssyNextConfig {
@@ -20,6 +20,7 @@ interface CmssyEditorProps {
     defaultLocale: string;
     enabledLocales?: string[];
     edit: EditBridgeConfig;
+    forms?: Record<string, CmssyFormDefinition>;
 }
 interface CreateCmssyPageOptions {
     editor?: ComponentType<CmssyEditorProps>;
@@ -66,4 +67,12 @@ interface EditRequestLike {
 declare function isCmssyEditRequest(request: EditRequestLike): boolean;
 declare function isCmssyEditMode(): Promise<boolean>;
 
-export { CMSSY_EDIT_HEADER, type CmssyCspOptions, type CmssyDraftRouteConfig, type CmssyEditorProps, type CmssyNextConfig, type CreateCmssyPageOptions, applyCmssyCsp, cmssyCspHeaders, createCmssyPage, createDraftRoute, isCmssyEditMode, isCmssyEditRequest };
+declare const CMSSY_LOCALE_HEADER = "x-cmssy-locale";
+declare function localeForPathname(config: CmssyClientConfig, pathname: string): Promise<string>;
+declare function splitCmssyLocale(config: CmssyClientConfig, path: string[] | undefined): Promise<{
+    locale: string;
+    path: string[] | undefined;
+}>;
+declare function getCmssyLocale(config: CmssyClientConfig): Promise<string>;
+
+export { CMSSY_EDIT_HEADER, CMSSY_LOCALE_HEADER, type CmssyCspOptions, type CmssyDraftRouteConfig, type CmssyEditorProps, type CmssyNextConfig, type CreateCmssyPageOptions, applyCmssyCsp, cmssyCspHeaders, createCmssyPage, createDraftRoute, getCmssyLocale, isCmssyEditMode, isCmssyEditRequest, localeForPathname, splitCmssyLocale };

package/dist/index.js

@@ -1,6 +1,6 @@
 import { draftMode, headers } from 'next/headers';
 import { notFound, redirect } from 'next/navigation';
-import { fetchPage, CmssyServerPage } from '@cmssy/react';
+import { resolveSiteLocales, splitLocaleFromPath, fetchPage, resolveForms, CmssyServerPage } from '@cmssy/react';
 import { jsx } from 'react/jsx-runtime';
 import { createHash, timingSafeEqual } from 'crypto';
 
@@ -65,7 +65,6 @@ function createCmssyPage(config, blocks, options) {
     apiUrl: config.apiUrl,
     workspaceSlug: config.workspaceSlug
   };
-  const defaultLocale = config.defaultLocale ?? "en";
   return async function CmssyCatchAllPage({
     params,
     searchParams
@@ -74,19 +73,41 @@ function createCmssyPage(config, blocks, options) {
     const { isEnabled } = await draftMode();
     const query = searchParams ? await searchParams : {};
     const editMode = isEnabled || hasEditFlag(query[EDIT_QUERY_PARAM]);
-    const locale = config.resolveLocale ? await config.resolveLocale() : defaultLocale;
-    const page = await fetchPage(clientConfig, path, {
+    let locale;
+    let pagePath = path;
+    let defaultLocale;
+    let enabledLocales = config.enabledLocales;
+    if (config.resolveLocale) {
+      defaultLocale = config.defaultLocale ?? "en";
+      locale = await config.resolveLocale();
+    } else {
+      const siteLocales = await resolveSiteLocales(clientConfig);
+      defaultLocale = config.defaultLocale ?? siteLocales.defaultLocale;
+      const locales = config.enabledLocales ?? siteLocales.locales;
+      enabledLocales = locales;
+      const split = splitLocaleFromPath(path, { defaultLocale, locales });
+      locale = split.locale;
+      pagePath = split.path;
+    }
+    const page = await fetchPage(clientConfig, pagePath, {
       previewSecret: editMode ? config.draftSecret : void 0
     });
     if (!page) {
       notFound();
     }
-    if (editMode) {
-      if (!Editor) {
-        throw new Error(
-          'cmssy: edit mode requires options.editor \u2014 pass a "use client" editor that imports your blocks and renders <CmssyEditablePage blocks={blocks} \u2026 />'
-        );
-      }
+    if (editMode && !Editor) {
+      throw new Error(
+        'cmssy: edit mode requires options.editor \u2014 pass a "use client" editor that imports your blocks and renders <CmssyEditablePage blocks={blocks} \u2026 />'
+      );
+    }
+    const resolvedForms = await resolveForms(
+      clientConfig,
+      page.blocks,
+      locale,
+      defaultLocale
+    );
+    const forms = Object.keys(resolvedForms).length > 0 ? resolvedForms : void 0;
+    if (editMode && Editor) {
       const bridgeOrigin = resolveBridgeOrigin(config.editorOrigin);
       return /* @__PURE__ */ jsx(
         Editor,
@@ -94,8 +115,9 @@ function createCmssyPage(config, blocks, options) {
           page,
           locale,
           defaultLocale,
-          enabledLocales: config.enabledLocales,
-          edit: { editorOrigin: bridgeOrigin }
+          enabledLocales,
+          edit: { editorOrigin: bridgeOrigin },
+          forms
         }
       );
     }
@@ -106,7 +128,8 @@ function createCmssyPage(config, blocks, options) {
         blocks,
         locale,
         defaultLocale,
-        enabledLocales: config.enabledLocales
+        enabledLocales,
+        forms
       }
     );
   };
@@ -183,5 +206,23 @@ async function isCmssyEditMode() {
   const h = await headers();
   return h.get(CMSSY_EDIT_HEADER) === "1";
 }
+var CMSSY_LOCALE_HEADER = "x-cmssy-locale";
+async function localeForPathname(config, pathname) {
+  const siteLocales = await resolveSiteLocales(config);
+  const segments = pathname.split("/").filter(Boolean);
+  return splitLocaleFromPath(segments, siteLocales).locale;
+}
+async function splitCmssyLocale(config, path) {
+  const siteLocales = await resolveSiteLocales(config);
+  return splitLocaleFromPath(path, siteLocales);
+}
+async function getCmssyLocale(config) {
+  const { headers: headers2 } = await import('next/headers');
+  const headerList = await headers2();
+  const fromHeader = headerList.get(CMSSY_LOCALE_HEADER);
+  if (fromHeader) return fromHeader;
+  const { defaultLocale } = await resolveSiteLocales(config);
+  return defaultLocale;
+}
 
-export { CMSSY_EDIT_HEADER, applyCmssyCsp, cmssyCspHeaders, createCmssyPage, createDraftRoute, isCmssyEditMode, isCmssyEditRequest };
+export { CMSSY_EDIT_HEADER, CMSSY_LOCALE_HEADER, applyCmssyCsp, cmssyCspHeaders, createCmssyPage, createDraftRoute, getCmssyLocale, isCmssyEditMode, isCmssyEditRequest, localeForPathname, splitCmssyLocale };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cmssy/next",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "description": "Next.js App Router bindings for cmssy headless sites (createCmssyPage + draft preview)",
   "keywords": [
     "cmssy",
@@ -36,7 +36,7 @@
     "dist"
   ],
   "peerDependencies": {
-    "@cmssy/react": "^0.1.5",
+    "@cmssy/react": "^0.1.7",
     "next": ">=15",
     "react": "^18.2.0 || ^19.0.0",
     "react-dom": "^18.2.0 || ^19.0.0"
@@ -49,7 +49,7 @@
     "tsup": "^8.3.0",
     "typescript": "^5.6.0",
     "vitest": "^2.1.0",
-    "@cmssy/react": "0.1.5"
+    "@cmssy/react": "0.1.7"
   },
   "scripts": {
     "build": "tsup",