camox 0.42.0 → 0.43.0

package/dist/core/components/lexical/TextLinkPopover.js

@@ -1,8 +1,7 @@
-import { useProjectSlug } from "../../../lib/auth.js";
-import { createPageTextLinkTarget, getPageIdFromTextLinkTarget } from "../../lib/textLinks.js";
-import { pageQueries, projectQueries } from "../../../lib/queries.js";
+import { getPageIdFromTextLinkTarget, isValidTextLinkTarget } from "../../lib/textLinks.js";
+import { destinationTextLink } from "../../pageDestinations.js";
+import { usePageDestinations } from "../../../hooks/use-page-destinations.js";
 import { c } from "react/compiler-runtime";
-import { useQuery } from "@tanstack/react-query";
 import * as React from "react";
 import { jsx, jsxs } from "react/jsx-runtime";
 import { Button } from "@camox/ui/button";
@@ -14,50 +13,32 @@ import { Tabs, TabsList, TabsTrigger } from "@camox/ui/tabs";
 
 //#region src/core/components/lexical/TextLinkPopover.tsx
 function TextLinkPopover(t0) {
-	const $ = c(67);
-	if ($[0] !== "7c8db8e526690648d7ded9c61109093d7db1e840e5fd768c697120d428d94f0f") {
-		for (let $i = 0; $i < 67; $i += 1) $[$i] = Symbol.for("react.memo_cache_sentinel");
-		$[0] = "7c8db8e526690648d7ded9c61109093d7db1e840e5fd768c697120d428d94f0f";
+	const $ = c(64);
+	if ($[0] !== "88824dfd1c731cbf3353050e8cf8a5de209861b0dd4f32c3d21d9b49cba42e9b") {
+		for (let $i = 0; $i < 64; $i += 1) $[$i] = Symbol.for("react.memo_cache_sentinel");
+		$[0] = "88824dfd1c731cbf3353050e8cf8a5de209861b0dd4f32c3d21d9b49cba42e9b";
 	}
 	const { open, onOpenChange, trigger, text, target, onSave, onUnlink } = t0;
 	const [textValue, setTextValue] = React.useState(text);
 	const [mode, setMode] = React.useState("page");
 	const [pageValue, setPageValue] = React.useState("");
 	const [urlValue, setUrlValue] = React.useState("");
-	const projectSlug = useProjectSlug();
+	const pages = usePageDestinations();
 	let t1;
-	if ($[1] !== projectSlug) {
-		t1 = projectQueries.getBySlug(projectSlug);
-		$[1] = projectSlug;
-		$[2] = t1;
-	} else t1 = $[2];
-	const { data: project } = useQuery(t1);
+	if ($[1] !== pages || $[2] !== target) {
+		t1 = target != null && (getPageIdFromTextLinkTarget(target) != null || pages.some((page) => destinationTextLink(page) === target));
+		$[1] = pages;
+		$[2] = target;
+		$[3] = t1;
+	} else t1 = $[3];
+	const isPageTarget = t1;
 	let t2;
-	if ($[3] !== project?.id) {
-		t2 = pageQueries.list(project?.id ?? 0);
-		$[3] = project?.id;
-		$[4] = t2;
-	} else t2 = $[4];
-	const t3 = !!project;
-	let t4;
-	if ($[5] !== t2 || $[6] !== t3) {
-		t4 = {
-			...t2,
-			enabled: t3
-		};
-		$[5] = t2;
-		$[6] = t3;
-		$[7] = t4;
-	} else t4 = $[7];
-	const { data: pages } = useQuery(t4);
-	let t5;
-	if ($[8] !== target || $[9] !== text) {
-		t5 = () => {
+	if ($[4] !== isPageTarget || $[5] !== target || $[6] !== text) {
+		t2 = () => {
 			setTextValue(text);
-			const pageId = target ? getPageIdFromTextLinkTarget(target) : null;
-			if (pageId != null) {
+			if (target && isPageTarget) {
 				setMode("page");
-				setPageValue(pageId);
+				setPageValue(target);
 				setUrlValue("");
 				return;
 			}
@@ -65,116 +46,117 @@ function TextLinkPopover(t0) {
 			setUrlValue(target ?? "");
 			setPageValue("");
 		};
-		$[8] = target;
-		$[9] = text;
-		$[10] = t5;
-	} else t5 = $[10];
-	const prepare = t5;
-	let t6;
-	let t7;
-	if ($[11] !== open || $[12] !== prepare) {
-		t6 = () => {
+		$[4] = isPageTarget;
+		$[5] = target;
+		$[6] = text;
+		$[7] = t2;
+	} else t2 = $[7];
+	const prepare = t2;
+	let t3;
+	let t4;
+	if ($[8] !== open || $[9] !== prepare) {
+		t3 = () => {
 			if (!open) return;
 			prepare();
 		};
-		t7 = [open, prepare];
-		$[11] = open;
-		$[12] = prepare;
-		$[13] = t6;
-		$[14] = t7;
+		t4 = [open, prepare];
+		$[8] = open;
+		$[9] = prepare;
+		$[10] = t3;
+		$[11] = t4;
 	} else {
-		t6 = $[13];
-		t7 = $[14];
+		t3 = $[10];
+		t4 = $[11];
 	}
-	React.useEffect(t6, t7);
-	let t8;
-	if ($[15] !== onOpenChange || $[16] !== prepare) {
-		t8 = (nextOpen) => {
+	React.useEffect(t3, t4);
+	let t5;
+	if ($[12] !== onOpenChange || $[13] !== prepare) {
+		t5 = (nextOpen) => {
 			onOpenChange(nextOpen);
 			if (nextOpen) prepare();
 		};
-		$[15] = onOpenChange;
-		$[16] = prepare;
-		$[17] = t8;
-	} else t8 = $[17];
-	const handleOpenChange = t8;
-	let t9;
-	if ($[18] !== mode || $[19] !== onSave || $[20] !== pageValue || $[21] !== textValue || $[22] !== urlValue) {
-		t9 = (event) => {
+		$[12] = onOpenChange;
+		$[13] = prepare;
+		$[14] = t5;
+	} else t5 = $[14];
+	const handleOpenChange = t5;
+	let t6;
+	if ($[15] !== mode || $[16] !== onSave || $[17] !== pageValue || $[18] !== textValue || $[19] !== urlValue) {
+		t6 = (event) => {
 			event.preventDefault();
 			const nextText = textValue.trim();
 			if (!nextText) return;
 			if (mode === "page") {
 				if (!pageValue) return;
-				onSave(createPageTextLinkTarget(pageValue), nextText);
+				onSave(pageValue, nextText);
 				return;
 			}
 			const nextTarget = urlValue.trim();
-			if (!/^https?:\/\//i.test(nextTarget)) return;
+			if (!isValidTextLinkTarget(nextTarget)) return;
 			onSave(nextTarget, nextText);
 		};
-		$[18] = mode;
-		$[19] = onSave;
-		$[20] = pageValue;
-		$[21] = textValue;
-		$[22] = urlValue;
-		$[23] = t9;
-	} else t9 = $[23];
-	const handleSubmit = t9;
-	let t10;
-	if ($[24] === Symbol.for("react.memo_cache_sentinel")) {
-		t10 = /* @__PURE__ */ jsx(Link2, {});
-		$[24] = t10;
-	} else t10 = $[24];
-	let t11;
-	if ($[25] !== trigger) {
-		t11 = /* @__PURE__ */ jsx(PopoverTrigger, {
+		$[15] = mode;
+		$[16] = onSave;
+		$[17] = pageValue;
+		$[18] = textValue;
+		$[19] = urlValue;
+		$[20] = t6;
+	} else t6 = $[20];
+	const handleSubmit = t6;
+	let t7;
+	if ($[21] === Symbol.for("react.memo_cache_sentinel")) {
+		t7 = /* @__PURE__ */ jsx(Link2, {});
+		$[21] = t7;
+	} else t7 = $[21];
+	let t8;
+	if ($[22] !== trigger) {
+		t8 = /* @__PURE__ */ jsx(PopoverTrigger, {
 			render: trigger,
-			children: t10
+			children: t7
 		});
-		$[25] = trigger;
-		$[26] = t11;
-	} else t11 = $[26];
-	let t12;
-	if ($[27] === Symbol.for("react.memo_cache_sentinel")) {
-		t12 = /* @__PURE__ */ jsx(Label, {
+		$[22] = trigger;
+		$[23] = t8;
+	} else t8 = $[23];
+	let t9;
+	if ($[24] === Symbol.for("react.memo_cache_sentinel")) {
+		t9 = /* @__PURE__ */ jsx(Label, {
 			htmlFor: "text-link-text",
 			children: "Text"
 		});
-		$[27] = t12;
-	} else t12 = $[27];
-	let t13;
-	if ($[28] === Symbol.for("react.memo_cache_sentinel")) {
-		t13 = (event_0) => setTextValue(event_0.target.value);
-		$[28] = t13;
-	} else t13 = $[28];
-	let t14;
-	if ($[29] !== textValue) {
-		t14 = /* @__PURE__ */ jsxs("div", {
+		$[24] = t9;
+	} else t9 = $[24];
+	let t10;
+	if ($[25] === Symbol.for("react.memo_cache_sentinel")) {
+		t10 = (event_0) => setTextValue(event_0.target.value);
+		$[25] = t10;
+	} else t10 = $[25];
+	let t11;
+	if ($[26] !== textValue) {
+		t11 = /* @__PURE__ */ jsxs("div", {
 			className: "grid gap-1.5",
-			children: [t12, /* @__PURE__ */ jsx(Input, {
+			children: [t9, /* @__PURE__ */ jsx(Input, {
 				id: "text-link-text",
 				value: textValue,
-				onChange: t13,
+				onChange: t10,
 				autoFocus: true
 			})]
 		});
-		$[29] = textValue;
-		$[30] = t14;
-	} else t14 = $[30];
-	let t15;
-	if ($[31] === Symbol.for("react.memo_cache_sentinel")) {
-		t15 = /* @__PURE__ */ jsx(Label, { children: "Destination" });
-		$[31] = t15;
-	} else t15 = $[31];
-	let t16;
-	if ($[32] === Symbol.for("react.memo_cache_sentinel")) {
-		t16 = (nextMode) => setMode(nextMode);
-		$[32] = t16;
-	} else t16 = $[32];
-	let t17;
-	if ($[33] === Symbol.for("react.memo_cache_sentinel")) {
-		t17 = /* @__PURE__ */ jsxs(TabsList, {
+		$[26] = textValue;
+		$[27] = t11;
+	} else t11 = $[27];
+	let t12;
+	if ($[28] === Symbol.for("react.memo_cache_sentinel")) {
+		t12 = /* @__PURE__ */ jsx(Label, { children: "Destination" });
+		$[28] = t12;
+	} else t12 = $[28];
+	let t13;
+	if ($[29] === Symbol.for("react.memo_cache_sentinel")) {
+		t13 = (nextMode) => setMode(nextMode);
+		$[29] = t13;
+	} else t13 = $[29];
+	let t14;
+	if ($[30] === Symbol.for("react.memo_cache_sentinel")) {
+		t14 = /* @__PURE__ */ jsxs(TabsList, {
 			className: "w-full",
 			children: [/* @__PURE__ */ jsx(TabsTrigger, {
 				value: "page",
@@ -184,21 +166,21 @@ function TextLinkPopover(t0) {
 				children: "URL"
 			})]
 		});
-		$[33] = t17;
-	} else t17 = $[33];
-	let t18;
-	if ($[34] !== mode) {
-		t18 = /* @__PURE__ */ jsx(Tabs, {
+		$[30] = t14;
+	} else t14 = $[30];
+	let t15;
+	if ($[31] !== mode) {
+		t15 = /* @__PURE__ */ jsx(Tabs, {
 			value: mode,
-			onValueChange: t16,
-			children: t17
+			onValueChange: t13,
+			children: t14
 		});
-		$[34] = mode;
-		$[35] = t18;
-	} else t18 = $[35];
-	let t19;
-	if ($[36] !== mode || $[37] !== pageValue || $[38] !== pages || $[39] !== urlValue) {
-		t19 = mode === "page" ? /* @__PURE__ */ jsxs("select", {
+		$[31] = mode;
+		$[32] = t15;
+	} else t15 = $[32];
+	let t16;
+	if ($[33] !== mode || $[34] !== pageValue || $[35] !== pages || $[36] !== urlValue) {
+		t16 = mode === "page" ? /* @__PURE__ */ jsxs("select", {
 			className: "border-input bg-background text-foreground h-9 rounded-md border px-2 text-sm",
 			value: pageValue,
 			onChange: (event_1) => setPageValue(event_1.target.value),
@@ -207,120 +189,121 @@ function TextLinkPopover(t0) {
 				children: pages && pages.length > 0 ? "Select a page" : "No pages found"
 			}), pages?.map(_temp)]
 		}) : /* @__PURE__ */ jsx(Input, {
-			type: "url",
-			placeholder: "https://",
+			type: "text",
+			inputMode: "url",
+			placeholder: "https:// or /path",
 			value: urlValue,
 			onChange: (event_2) => setUrlValue(event_2.target.value)
 		});
-		$[36] = mode;
-		$[37] = pageValue;
-		$[38] = pages;
-		$[39] = urlValue;
-		$[40] = t19;
-	} else t19 = $[40];
-	let t20;
-	if ($[41] !== t18 || $[42] !== t19) {
-		t20 = /* @__PURE__ */ jsxs("div", {
+		$[33] = mode;
+		$[34] = pageValue;
+		$[35] = pages;
+		$[36] = urlValue;
+		$[37] = t16;
+	} else t16 = $[37];
+	let t17;
+	if ($[38] !== t15 || $[39] !== t16) {
+		t17 = /* @__PURE__ */ jsxs("div", {
 			className: "grid gap-1.5",
 			children: [
+				t12,
 				t15,
-				t18,
-				t19
+				t16
 			]
 		});
-		$[41] = t18;
-		$[42] = t19;
-		$[43] = t20;
-	} else t20 = $[43];
-	let t21;
-	if ($[44] !== mode || $[45] !== pageValue || $[46] !== textValue || $[47] !== urlValue) {
-		t21 = !textValue.trim() || (mode === "page" ? !pageValue : !/^https?:\/\//i.test(urlValue.trim()));
-		$[44] = mode;
-		$[45] = pageValue;
-		$[46] = textValue;
-		$[47] = urlValue;
-		$[48] = t21;
-	} else t21 = $[48];
-	let t22;
-	if ($[49] !== t21) {
-		t22 = /* @__PURE__ */ jsx(Button, {
+		$[38] = t15;
+		$[39] = t16;
+		$[40] = t17;
+	} else t17 = $[40];
+	let t18;
+	if ($[41] !== mode || $[42] !== pageValue || $[43] !== textValue || $[44] !== urlValue) {
+		t18 = !textValue.trim() || (mode === "page" ? !pageValue : !/^https?:\/\//i.test(urlValue.trim()));
+		$[41] = mode;
+		$[42] = pageValue;
+		$[43] = textValue;
+		$[44] = urlValue;
+		$[45] = t18;
+	} else t18 = $[45];
+	let t19;
+	if ($[46] !== t18) {
+		t19 = /* @__PURE__ */ jsx(Button, {
 			type: "submit",
 			size: "sm",
-			disabled: t21,
+			disabled: t18,
 			children: "Save"
 		});
-		$[49] = t21;
-		$[50] = t22;
-	} else t22 = $[50];
-	let t23;
-	if ($[51] !== onUnlink || $[52] !== target) {
-		t23 = target && /* @__PURE__ */ jsx(Button, {
+		$[46] = t18;
+		$[47] = t19;
+	} else t19 = $[47];
+	let t20;
+	if ($[48] !== onUnlink || $[49] !== target) {
+		t20 = target && /* @__PURE__ */ jsx(Button, {
 			type: "button",
 			variant: "outline",
 			size: "sm",
 			onClick: onUnlink,
 			children: "Unlink"
 		});
-		$[51] = onUnlink;
-		$[52] = target;
-		$[53] = t23;
-	} else t23 = $[53];
-	let t24;
-	if ($[54] !== t22 || $[55] !== t23) {
-		t24 = /* @__PURE__ */ jsxs("div", {
+		$[48] = onUnlink;
+		$[49] = target;
+		$[50] = t20;
+	} else t20 = $[50];
+	let t21;
+	if ($[51] !== t19 || $[52] !== t20) {
+		t21 = /* @__PURE__ */ jsxs("div", {
 			className: "grid gap-2",
-			children: [t22, t23]
+			children: [t19, t20]
 		});
-		$[54] = t22;
-		$[55] = t23;
-		$[56] = t24;
-	} else t24 = $[56];
-	let t25;
-	if ($[57] !== handleSubmit || $[58] !== t14 || $[59] !== t20 || $[60] !== t24) {
-		t25 = /* @__PURE__ */ jsx(PopoverContent, {
+		$[51] = t19;
+		$[52] = t20;
+		$[53] = t21;
+	} else t21 = $[53];
+	let t22;
+	if ($[54] !== handleSubmit || $[55] !== t11 || $[56] !== t17 || $[57] !== t21) {
+		t22 = /* @__PURE__ */ jsx(PopoverContent, {
 			align: "center",
 			className: "w-72 p-3",
 			children: /* @__PURE__ */ jsxs("form", {
 				className: "grid gap-3",
 				onSubmit: handleSubmit,
 				children: [
-					t14,
-					t20,
-					t24
+					t11,
+					t17,
+					t21
 				]
 			})
 		});
-		$[57] = handleSubmit;
-		$[58] = t14;
-		$[59] = t20;
-		$[60] = t24;
-		$[61] = t25;
-	} else t25 = $[61];
-	let t26;
-	if ($[62] !== handleOpenChange || $[63] !== open || $[64] !== t11 || $[65] !== t25) {
-		t26 = /* @__PURE__ */ jsxs(Popover, {
+		$[54] = handleSubmit;
+		$[55] = t11;
+		$[56] = t17;
+		$[57] = t21;
+		$[58] = t22;
+	} else t22 = $[58];
+	let t23;
+	if ($[59] !== handleOpenChange || $[60] !== open || $[61] !== t22 || $[62] !== t8) {
+		t23 = /* @__PURE__ */ jsxs(Popover, {
 			open,
 			onOpenChange: handleOpenChange,
-			children: [t11, t25]
+			children: [t8, t22]
 		});
-		$[62] = handleOpenChange;
-		$[63] = open;
-		$[64] = t11;
-		$[65] = t25;
-		$[66] = t26;
-	} else t26 = $[66];
-	return t26;
+		$[59] = handleOpenChange;
+		$[60] = open;
+		$[61] = t22;
+		$[62] = t8;
+		$[63] = t23;
+	} else t23 = $[63];
+	return t23;
 }
-function _temp(page) {
+function _temp(page_0) {
 	return /* @__PURE__ */ jsxs("option", {
-		value: page.id,
+		value: destinationTextLink(page_0),
 		children: [
-			page.nickname,
+			page_0.title,
 			" (",
-			page.fullPath,
+			page_0.fullPath,
 			")"
 		]
-	}, page.id);
+	}, page_0.key);
 }
 
 //#endregion

package/dist/core/components/lexical/editorConfig.js

@@ -1,5 +1,5 @@
 import { isLexicalState, markdownToLexicalState } from "../../lib/lexicalState.js";
-import { GradientNode } from "./GradientNode.js";
+import { HighlightNode } from "./HighlightNode.js";
 import { InlineParagraphNode } from "./InlineParagraphNode.js";
 import { LinkNode } from "@lexical/link";
 import { ParagraphNode } from "lexical";
@@ -39,7 +39,7 @@ function createEditorConfig(initialState) {
 		theme: {},
 		nodes: [
 			LinkNode,
-			GradientNode,
+			HighlightNode,
 			InlineParagraphNode,
 			{
 				replace: ParagraphNode,

package/dist/core/createApp.d.ts

@@ -844,7 +844,7 @@ declare function createApp({
     useData(): unknown;
     _internal: {
       id: string;
-      kind: "derived" | "curated";
+      kind: "curated" | "derived" | "singleton";
       loader: ((context: {
         params: Record<string, string>;
       }) => unknown) | undefined;
@@ -919,7 +919,7 @@ declare function createApp({
     useData(): unknown;
     _internal: {
       id: string;
-      kind: "derived" | "curated";
+      kind: "curated" | "derived" | "singleton";
       loader: ((context: {
         params: Record<string, string>;
       }) => unknown) | undefined;
@@ -1004,6 +1004,7 @@ declare function createApp({
   }[];
   getSerializableLayoutDefinitions(): {
     layoutId: string;
+    kind: "curated" | "derived" | "singleton";
     description: string;
     blocks: ({
       type: string;

package/dist/core/createApp.js

@@ -7,7 +7,7 @@ function createApp({ blocks, layouts = [] }) {
 	for (const layout of layouts) {
 		const { id, kind } = layout._internal;
 		if (layoutsMap.has(id)) throw new Error(`Duplicate layout: ${id}`);
-		if (kind === "derived") {
+		if (kind !== "curated") {
 			const pattern = id.split(".").map((segment) => segment.startsWith("$") ? "$" : segment).join(".");
 			if (derivedPatterns.has(pattern)) throw new Error(`Equivalent derived route: ${id}`);
 			derivedPatterns.add(pattern);
@@ -46,6 +46,7 @@ function createApp({ blocks, layouts = [] }) {
 		getSerializableLayoutDefinitions() {
 			return Array.from(layoutsMap.values()).map((layout) => ({
 				layoutId: layout._internal.id,
+				kind: layout._internal.kind,
 				description: layout._internal.description,
 				blocks: layout._internal.blockDefinitions
 			}));

package/dist/core/createLayout.d.ts

@@ -51,7 +51,7 @@ type ValidateLayoutOnlyBlocks<T extends readonly LayoutBlock[]> = { [K in keyof
 type ValidatePageContentBlocks<T extends readonly LayoutBlock[]> = { [K in keyof T]: T[K] extends LayoutBlock<true> ? "❌ Camox: blocks in `blocks.initial` must NOT be `layoutOnly: true` — `initial` is for page-content blocks. Remove `layoutOnly: true` from this block's `createBlock` options." : T[K] };
 interface CreateLayoutOptions<TBefore extends readonly LayoutBlock[], TAfter extends readonly LayoutBlock[], TInitial extends readonly LayoutBlock[]> {
   id: string;
-  kind?: "curated" | "derived";
+  kind?: "curated" | "derived" | "singleton";
   loader?: (context: {
     params: Record<string, string>;
   }) => unknown;
@@ -84,7 +84,7 @@ declare function createLayoutDefinition<const TBefore extends readonly LayoutBlo
   useData(): unknown;
   _internal: {
     id: string;
-    kind: "derived" | "curated";
+    kind: "curated" | "derived" | "singleton";
     loader: ((context: {
       params: Record<string, string>;
     }) => unknown) | undefined;
@@ -156,6 +156,19 @@ type FileOptions<Id extends string, Data, B extends readonly LayoutBlock[], A ex
     children: React.ReactNode;
   }>;
   loader?: never;
+} | {
+  kind: "singleton";
+  blocks: {
+    before: ValidateLayoutOnlyBlocks<B>;
+    after: ValidateLayoutOnlyBlocks<A>;
+    initial?: never;
+  };
+  loader?: (context: {
+    params: Record<string, never>;
+  }) => Data;
+  component: React.ComponentType<{
+    children?: never;
+  }>;
 } | {
   kind: "derived";
   blocks: {
@@ -172,7 +185,7 @@ type FileOptions<Id extends string, Data, B extends readonly LayoutBlock[], A ex
     children?: never;
   }>;
 });
-declare function createLayout<const Id extends string>(id: Id): <Data, const B extends readonly LayoutBlock[], const A extends readonly LayoutBlock[], const I extends readonly LayoutBlock[] = []>(options: FileOptions<Id, Data, B, A, I>) => Omit<Layout, "useData"> & {
+declare function createLayout<const Id extends string>(id: Id): <Data = undefined, const B extends readonly LayoutBlock[] = [], const A extends readonly LayoutBlock[] = [], const I extends readonly LayoutBlock[] = []>(options: FileOptions<Id, Data, B, A, I>) => Omit<Layout, "useData"> & {
   useData: () => Awaited<Data>;
 };
 declare function createLayout<const B extends readonly LayoutBlock[], const A extends readonly LayoutBlock[], const I extends readonly LayoutBlock[] = []>(options: CreateLayoutOptions<B, A, I>): Layout;