@backmatter/next 0.0.29 → 0.0.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@backmatter/next",
-  "version": "0.0.29",
+  "version": "0.0.31",
   "description": "Experimental Next.js adapter for Backmatter. APIs will break. Not ready for production.",
   "type": "module",
   "publishConfig": {
@@ -47,10 +47,10 @@
     "test": "bun test"
   },
   "dependencies": {
-    "@backmatter/core": "^0.0.23",
+    "@backmatter/core": "^0.0.25",
     "@mdx-js/mdx": "^3.1.1",
     "remark-gfm": "^4.0.1",
-    "@backmatter/studio": "^0.0.6"
+    "@backmatter/studio": "^0.0.8"
   },
   "peerDependencies": {
     "next": ">=16.3.0",

package/src/routes.ts

@@ -6,14 +6,17 @@
 import { Fragment, Suspense, createElement, type ReactNode } from "react";
 import { HeldPreview, HoldPreview } from "./preview-hold";
 import {
+  decodeDocLocale,
   DEFAULT_TEMPLATE_SLUG,
   isRoutable,
   isTemplateSlug,
   matchRoute,
   PREVIEW_CHECKOUT_QUERY,
   PREVIEW_COOKIE,
+  PREVIEW_LOCALE_QUERY,
   readPreviewCookie,
   routeSegments,
+  routeTemplate,
   type BackmatterDoc,
   type ModelDef,
   type SourceDef,
@@ -137,6 +140,18 @@ export function previewReplacesPublished(
 
 type RouteHit = { locale: string; type: string; slug: string };
 
+async function previewLocaleQuery(
+  searchParams: Promise<CatchAllSearchParams> | CatchAllSearchParams | undefined,
+): Promise<string | undefined> {
+  if (!searchParams) return undefined;
+  const query = await searchParams;
+  const raw = query[PREVIEW_LOCALE_QUERY];
+  if (raw === undefined) return undefined;
+  const value = Array.isArray(raw) ? raw[0] : raw;
+  if (value === undefined) return undefined;
+  return decodeDocLocale(value);
+}
+
 async function checkoutQueryToken(
   searchParams: Promise<CatchAllSearchParams> | CatchAllSearchParams | undefined,
 ): Promise<string | undefined> {
@@ -390,12 +405,28 @@ export function createCatchAll<Models extends readonly ModelDef[]>(
     return failFor();
   }
 
+  /**
+   * Routes without `{locale}` always match as the default locale. The editor
+   * puts the file's locale on the preview URL so a conflicted or translated
+   * copy is the document that gets fetched.
+   */
+  async function previewHit(
+    hit: RouteHit,
+    searchParams: Promise<CatchAllSearchParams> | CatchAllSearchParams | undefined,
+  ): Promise<RouteHit> {
+    const model = byType.get(hit.type);
+    if (!model || routeTemplate(model).includes("{locale}")) return hit;
+    const locale = await previewLocaleQuery(searchParams);
+    if (locale === undefined) return hit;
+    return { ...hit, locale };
+  }
+
   const CmsRoute: CatchAllRoute["CmsRoute"] = async ({ params, searchParams }) => {
     const resolved = await cachedRouteParams(params);
     const hit = resolve(resolved[CATCH_ALL_PARAM]);
     if (!hit) return failFor();
     const preview = await resolvePreviewState(cms, options.preview, searchParams);
-    if (previewReplacesPublished(preview)) return loadPreviewDoc(hit, preview);
+    if (previewReplacesPublished(preview)) return loadPreviewDoc(await previewHit(hit, searchParams), preview);
     return publishedBody(hit.locale, hit.type, hit.slug);
   };
 
@@ -425,6 +456,7 @@ export function createCatchAll<Models extends readonly ModelDef[]>(
     if (!hit) return null;
     const preview = await resolvePreviewState(cms, options.preview, searchParams);
     if (!previewReplacesPublished(preview)) return null;
+    const docHit = await previewHit(hit, searchParams);
     return createElement(
       HoldPreview,
       null,
@@ -436,8 +468,8 @@ export function createCatchAll<Models extends readonly ModelDef[]>(
             __html: "[data-backmatter-published]{display:none!important}",
           },
         }),
-        docBridge(hit),
-        await loadPreviewDoc(hit, preview),
+        docBridge(docHit),
+        await loadPreviewDoc(docHit, preview),
       ),
     );
   };

package/src/site-doc.ts

@@ -11,11 +11,10 @@ export function parseSiteDoc(content: string | null | undefined): SiteDocRef | n
   try {
     const value = JSON.parse(content) as Record<string, unknown>;
     if (
-      typeof value.locale !== "string" ||
+      (value.locale !== undefined && typeof value.locale !== "string") ||
       typeof value.type !== "string" ||
       typeof value.slug !== "string" ||
       typeof value.workspaceId !== "string" ||
-      !value.locale ||
       !value.type ||
       !value.slug ||
       !value.workspaceId
@@ -23,7 +22,7 @@ export function parseSiteDoc(content: string | null | undefined): SiteDocRef | n
       return null;
     }
     return {
-      locale: value.locale,
+      locale: value.locale ?? "",
       type: value.type,
       slug: value.slug,
       workspaceId: value.workspaceId,
@@ -43,7 +42,7 @@ export function readSiteDoc(): SiteDocRef | null {
       slug: marked.getAttribute("data-slug") ?? "",
       workspaceId: marked.getAttribute("data-workspace") ?? "",
     };
-    if (doc.locale && doc.type && doc.slug && doc.workspaceId) return doc;
+    if (doc.type && doc.slug && doc.workspaceId) return doc;
   }
   return parseSiteDoc(document.querySelector('meta[name="backmatter:doc"]')?.getAttribute("content"));
 }