camox 0.52.2 → 0.53.1

package/dist/features/runtime/runtime.js

@@ -933,17 +933,41 @@ async function loadLayoutResult(app, match, context, locale) {
 }
 /**
 * The Markdown of a singleton or derived page: front matter, its before blocks, the layout's
-* toMarkdown output, then its after blocks. Without toMarkdown, the page is HTML only.
+* toMarkdown output, then its after blocks. Null without toMarkdown: the page is then HTML only.
+* The layout's blocks settle which draft it reads, as they do for the page's HTML.
 */
-async function createLayoutMarkdownResponse(options, match, locale, page) {
+async function buildLayoutMarkdown(options, match, locale, page, reader = { member: false }) {
 	const { toMarkdown, id } = match.layout._internal;
 	const { apiUrl, projectUuid } = options;
 	if (!toMarkdown || !apiUrl || !projectUuid) return null;
-	const api = createServerApiClient(apiUrl, { locale });
+	const authCookieHeader = reader.member ? reader.authCookieHeader : void 0;
+	const api = (draftId) => createServerApiClient(apiUrl, {
+		authCookieHeader,
+		draftId,
+		locale
+	});
+	const { value: slots, draftId } = await readDraftOrLive(reader.requestedDraft, reader.member, (draftId) => api(draftId).blocks.getLayoutMarkdown({
+		projectUuid,
+		layoutId: id
+	})).catch((error) => {
+		if (!isNotFoundError(error)) throw error;
+		return {
+			value: {
+				before: "",
+				after: "",
+				projectName: ""
+			},
+			draftId: reader.member ? reader.requestedDraft : void 0
+		};
+	});
 	const app = await options.getCamoxApp?.();
 	/** The layout's own Markdown, between its before and after blocks, and what built it. */
 	const layoutMarkdown = async () => {
-		const result = await loadLayoutResult(app, match, createLayoutRequestContext(options, "live", { locale }), locale);
+		const result = await loadLayoutResult(app, match, createLayoutRequestContext(options, reader.member ? "draft" : "live", {
+			authCookieHeader,
+			draftId,
+			locale
+		}), locale);
 		const record = asCollectionItem(result);
 		const collection = record && app?.getCollectionById(record.collectionId);
 		if (!record || !collection) return {
@@ -960,7 +984,7 @@ async function createLayoutMarkdownResponse(options, match, locale, page) {
 			item
 		}));
 		return {
-			body: [await api.collectionDefinitions.recordMarkdown({
+			body: [await api(draftId).collectionDefinitions.recordMarkdown({
 				projectUuid,
 				collectionId: record.collectionId,
 				id: data.id,
@@ -970,24 +994,7 @@ async function createLayoutMarkdownResponse(options, match, locale, page) {
 			record: recordPageValues(collection, record)
 		};
 	};
-	let rendered;
-	try {
-		rendered = await layoutMarkdown();
-	} catch (error) {
-		if (isNotFoundError(error)) return new Response("Page not found", { status: 404 });
-		throw error;
-	}
-	const slots = await api.blocks.getLayoutMarkdown({
-		projectUuid,
-		layoutId: id
-	}).catch((error) => {
-		if (isNotFoundError(error)) return {
-			before: "",
-			after: "",
-			projectName: ""
-		};
-		throw error;
-	});
+	const rendered = await layoutMarkdown();
 	const meta = buildPageMeta({
 		layout: match.layout._internal,
 		context: buildLayoutContext(match.layout._internal, {
@@ -1004,10 +1011,59 @@ async function createLayoutMarkdownResponse(options, match, locale, page) {
 		...rendered.body,
 		slots.after
 	].filter(Boolean).join("\n\n");
-	return new Response(withFrontMatter(markdown, {
+	return withFrontMatter(markdown, {
 		...meta,
 		url: page.url
-	}), { headers: { "Content-Type": "text/markdown; charset=utf-8" } });
+	});
+}
+/**
+* A singleton or derived page's public Markdown Representation. Markdown is a public output: it
+* reads published records and blocks whoever asks.
+*/
+async function createLayoutMarkdownResponse(options, match, locale, page) {
+	let markdown;
+	try {
+		markdown = await buildLayoutMarkdown(options, match, locale, page);
+	} catch (error) {
+		if (isNotFoundError(error)) return new Response("Page not found", { status: 404 });
+		throw error;
+	}
+	if (markdown === null) return null;
+	return new Response(markdown, { headers: { "Content-Type": "text/markdown; charset=utf-8" } });
+}
+/**
+* A singleton or derived page's Markdown Representation as JSON (`/_camox/data?markdown`), read
+* like the page's data: in the draft the URL names, for a member. The studio shows it, while the
+* page's `.md` URL always reads Live. `markdown` is null when the layout declares none.
+*/
+async function createLayoutMarkdownDataResponse(options, request, pathname) {
+	const located = await locateRequest(request, options, pathname);
+	const app = await options.getCamoxApp?.();
+	const match = app && matchDerivedLayout(app.getLayouts(), located.path);
+	if (!match || matchLocalizedRoute(located.path)?.kind !== "page") return new Response("Not found", { status: 404 });
+	const { project, clearAuthCookie } = await resolveRequestMember(request, options);
+	const headers = {
+		...isPrivateRender(request, options) ? { "Cache-Control": "private, no-store" } : {},
+		Vary: "Cookie",
+		...clearAuthCookie ? { "Set-Cookie": buildClearServerAuthCookieHeader() } : {}
+	};
+	try {
+		const markdown = await buildLayoutMarkdown(options, match, located.locale, {
+			pathname,
+			url: absoluteUrl(request, options)(pathname)
+		}, {
+			member: project !== void 0,
+			authCookieHeader: getServerAuthCookieHeader(request.headers),
+			requestedDraft: getRequestDraftId(request, options)
+		});
+		return Response.json({ markdown }, { headers });
+	} catch (error) {
+		if (isNotFoundError(error)) return new Response("Not found", {
+			status: 404,
+			headers
+		});
+		throw error;
+	}
 }
 async function createDerivedResponse(options, pathname, located, request, { dataOnly = false, singletonOnly = false } = {}) {
 	const app = await options.getCamoxApp?.();
@@ -1337,8 +1393,10 @@ async function handleCamoxRequest(request, options = {}) {
 	if (match.kind === "llms-txt") return createLlmsTxtResponse(request, options);
 	if (match.kind === "routes") return createRoutesResponse(request, options);
 	if (match.kind === "data") {
-		const targetPathname = normalizePagePath(new URL(request.url).searchParams.get("path"));
+		const { searchParams } = new URL(request.url);
+		const targetPathname = normalizePagePath(searchParams.get("path"));
 		if (matchRuntimeOwnedRoute(targetPathname)) return new Response("Not found", { status: 404 });
+		if (searchParams.has("markdown")) return createLayoutMarkdownDataResponse(options, request, targetPathname);
 		return respondInLocale(options, request, targetPathname, { dataOnly: true });
 	}
 	if (isPreviewHandoff(request, options) && match.kind === "page") return createPreviewHandoffResponse({

package/dist/features/studio/components/ChatSidebar.js

@@ -2,6 +2,8 @@ import { AuthContext } from "../../../lib/auth.js";
 import { useCurrentDraftId, useDraftScope } from "../../../lib/draft-scope.js";
 import { useNavigate } from "../../navigation/navigation.js";
 import { reads, useReadQuery } from "../../../lib/studio-reads.js";
+import { cn } from "../../../lib/utils.js";
+import { BOTTOM_CARD_EDGES, CARD_BODY_EDGES, SIDEBAR_GUTTER } from "../../preview/components/SidebarStack.js";
 import { draftLabel } from "../draftLabel.js";
 import { FollowAgentContext } from "../followAgentContext.js";
 import { useThread } from "../../../lib/use-thread.js";
@@ -20,45 +22,51 @@ import { EMPTY_THREAD_VIEW } from "@camox/api-contract/threads";
 * When the Live thread starts a draft, the studio enters it with the thread.
 */
 function ChatSidebar(t0) {
-	const $ = c(5);
+	const $ = c(6);
 	const { hidden: t1 } = t0;
 	const hidden = t1 === void 0 ? false : t1;
 	let t2;
-	if ($[0] === Symbol.for("react.memo_cache_sentinel")) {
-		t2 = { width: 265 };
-		$[0] = t2;
-	} else t2 = $[0];
 	let t3;
 	let t4;
-	if ($[1] === Symbol.for("react.memo_cache_sentinel")) {
-		t3 = /* @__PURE__ */ jsxs("header", {
-			className: "border-border box-content flex h-8 min-w-0 items-center gap-2 border-b px-2 py-2",
+	let t5;
+	if ($[0] === Symbol.for("react.memo_cache_sentinel")) {
+		t2 = cn("absolute inset-y-0 right-0 z-10 flex flex-col py-2 max-md:hidden", SIDEBAR_GUTTER);
+		t3 = { width: 265 };
+		t4 = /* @__PURE__ */ jsxs("header", {
+			className: cn("bg-background flex h-11 min-w-0 shrink-0 items-center justify-center gap-2 px-3", BOTTOM_CARD_EDGES),
 			children: [/* @__PURE__ */ jsx(CamoxMark, {}), /* @__PURE__ */ jsx("h2", {
 				className: "truncate text-sm font-medium",
 				children: "Chat"
 			})]
 		});
-		t4 = /* @__PURE__ */ jsx(CurrentThread, {});
+		t5 = /* @__PURE__ */ jsx("div", {
+			className: cn("bg-background flex min-h-0 flex-1 flex-col", CARD_BODY_EDGES),
+			children: /* @__PURE__ */ jsx(CurrentThread, {})
+		});
+		$[0] = t2;
 		$[1] = t3;
 		$[2] = t4;
+		$[3] = t5;
 	} else {
+		t2 = $[0];
 		t3 = $[1];
 		t4 = $[2];
+		t5 = $[3];
 	}
-	let t5;
-	if ($[3] !== hidden) {
-		t5 = /* @__PURE__ */ jsxs("aside", {
+	let t6;
+	if ($[4] !== hidden) {
+		t6 = /* @__PURE__ */ jsxs("aside", {
 			"aria-label": "Chat",
 			"data-chat-sidebar": true,
 			hidden,
-			className: "bg-background flex shrink-0 flex-col border-l-2 max-md:hidden",
-			style: t2,
-			children: [t3, t4]
+			className: t2,
+			style: t3,
+			children: [t4, t5]
 		});
-		$[3] = hidden;
-		$[4] = t5;
-	} else t5 = $[4];
-	return t5;
+		$[4] = hidden;
+		$[5] = t6;
+	} else t6 = $[5];
+	return t6;
 }
 /** Camox's logo, beside the heading: the agent is Camox. */
 function CamoxMark() {

package/dist/features/studio/components/Navbar.js

@@ -151,7 +151,7 @@ const Navbar = (t0) => {
 	let t11;
 	if ($[24] !== t9) {
 		t11 = /* @__PURE__ */ jsxs("nav", {
-			className: "bg-background relative flex items-center justify-between gap-4 border-b-2 px-2 py-2",
+			className: "bg-background relative flex items-center justify-between gap-4 border-b px-2 py-2",
 			children: [t9, t10]
 		});
 		$[24] = t9;

package/dist/features/studio/components/UserButton.js

@@ -1,8 +1,8 @@
 import { useAuthContext, useAuthState } from "../../../lib/auth.js";
 import { useNavigate } from "../../navigation/navigation.js";
 import { useLocalePath, useLocalizedPath } from "../../../lib/view-locale.js";
-import { PlatformLabel } from "../../../components/PlatformLabel.js";
 import { previewStore, selectIsCanvasShown } from "../../preview/previewStore.js";
+import { PlatformLabel } from "../../../components/PlatformLabel.js";
 import { STUDIO_BASE_PATH } from "../routes.js";
 import { studioStore } from "../studioStore.js";
 import { useApplyTheme } from "../useTheme.js";

package/dist/lib/studio-reads.js

@@ -251,6 +251,24 @@ const reads = {
 		fetch: async (context, { runtimeBasePath, pathname }) => (await readRender(context, runtimeBasePath, pathname))?.derived?.result ?? null,
 		staleTime: Infinity
 	}),
+	layoutPageMarkdown: entry({
+		key: ({ projectUuid, runtimeBasePath, pathname }) => [
+			...queryKeys.layouts.all,
+			"markdown",
+			projectUuid,
+			runtimeBasePath,
+			pathname
+		],
+		fetch: async ({ runtimeJson, draft, signal }, { runtimeBasePath, pathname }) => {
+			const response = await runtimeJson("/_camox/data", runtimeBasePath, {
+				path: pathname,
+				markdown: ""
+			}, draft, signal);
+			if (!response.ok) throw new Error(`Could not load the Markdown of ${pathname}.`);
+			return (await response.json()).markdown;
+		},
+		retry: false
+	}),
 	discoveredPath: entry({
 		key: ({ projectUuid, runtimeBasePath, layoutId, recordId }) => [
 			...queryKeys.layouts.all,

package/dist/package.js

@@ -1,5 +1,5 @@
 //#region package.json
-var version = "0.52.2";
+var version = "0.53.1";
 
 //#endregion
 export { version };