camox 0.48.0 → 0.52.1

package/dist/lib/studio-definitions.js

@@ -0,0 +1,160 @@
+import { useProjectUuid } from "./auth.js";
+import { reads, useReadQuery } from "./studio-reads.js";
+import { c } from "react/compiler-runtime";
+
+//#region src/lib/studio-definitions.ts
+const toBlockDefinitions = (rows) => rows.map((row) => ({
+	id: row.blockId,
+	title: row.title,
+	description: row.description,
+	contentSchema: row.contentSchema,
+	settingsSchema: row.settingsSchema ?? void 0,
+	defaultContent: row.defaultContent ?? {},
+	defaultSettings: row.defaultSettings ?? {},
+	layoutOnly: !!row.layoutOnly,
+	synced: row.synced
+}));
+const toLayoutDefinitions = (rows) => rows.map((row) => ({
+	id: row.layoutId,
+	title: row.title ?? row.layoutId,
+	kind: row.kind
+}));
+function useProjectId() {
+	const { data: project } = useReadQuery(reads.project({ projectUuid: useProjectUuid() }));
+	return project?.id;
+}
+const NO_BLOCKS = [];
+const NO_LAYOUTS = [];
+/** Every block definition, empty until they load. */
+function useBlockDefinitions() {
+	const $ = c(4);
+	const projectId = useProjectId();
+	let t0;
+	if ($[0] !== projectId) {
+		t0 = reads.blockDefinitionList({ projectId: projectId ?? 0 });
+		$[0] = projectId;
+		$[1] = t0;
+	} else t0 = $[1];
+	const t1 = projectId != null;
+	let t2;
+	if ($[2] !== t1) {
+		t2 = {
+			enabled: t1,
+			select: toBlockDefinitions
+		};
+		$[2] = t1;
+		$[3] = t2;
+	} else t2 = $[3];
+	const { data } = useReadQuery(t0, t2);
+	return data ?? NO_BLOCKS;
+}
+/** The definition of a block type, undefined while loading or when the draft has none. */
+function useBlockDefinition(type) {
+	const $ = c(3);
+	const definitions = useBlockDefinitions();
+	let t0;
+	if ($[0] !== definitions || $[1] !== type) {
+		t0 = type === void 0 ? void 0 : definitions.find((definition) => definition.id === type);
+		$[0] = definitions;
+		$[1] = type;
+		$[2] = t0;
+	} else t0 = $[2];
+	return t0;
+}
+/** Every layout definition, empty until they load. */
+function useLayoutDefinitions() {
+	const $ = c(4);
+	const projectId = useProjectId();
+	let t0;
+	if ($[0] !== projectId) {
+		t0 = reads.layoutList({ projectId: projectId ?? 0 });
+		$[0] = projectId;
+		$[1] = t0;
+	} else t0 = $[1];
+	const t1 = projectId != null;
+	let t2;
+	if ($[2] !== t1) {
+		t2 = {
+			enabled: t1,
+			select: toLayoutDefinitions
+		};
+		$[2] = t1;
+		$[3] = t2;
+	} else t2 = $[3];
+	const { data } = useReadQuery(t0, t2);
+	return data ?? NO_LAYOUTS;
+}
+const NO_ROUTABLE_LAYOUTS = [];
+const toRoutableLayouts = (rows) => toLayoutDefinitions(rows).map((definition) => ({ _internal: definition }));
+/** Every layout definition, as the route helpers read layouts: empty until they load. */
+function useRoutableLayouts() {
+	const $ = c(4);
+	const projectId = useProjectId();
+	let t0;
+	if ($[0] !== projectId) {
+		t0 = reads.layoutList({ projectId: projectId ?? 0 });
+		$[0] = projectId;
+		$[1] = t0;
+	} else t0 = $[1];
+	const t1 = projectId != null;
+	let t2;
+	if ($[2] !== t1) {
+		t2 = {
+			enabled: t1,
+			select: toRoutableLayouts
+		};
+		$[2] = t1;
+		$[3] = t2;
+	} else t2 = $[3];
+	const { data } = useReadQuery(t0, t2);
+	return data ?? NO_ROUTABLE_LAYOUTS;
+}
+/** The definition of a layout, undefined while loading or when the draft has none. */
+function useLayoutDefinition(id) {
+	const $ = c(3);
+	const definitions = useLayoutDefinitions();
+	let t0;
+	if ($[0] !== definitions || $[1] !== id) {
+		t0 = id === void 0 ? void 0 : definitions.find((definition) => definition.id === id);
+		$[0] = definitions;
+		$[1] = id;
+		$[2] = t0;
+	} else t0 = $[2];
+	return t0;
+}
+const toCollectionDefinition = (row) => ({
+	id: row.collectionId,
+	title: row.title,
+	toTitle: row.toTitle,
+	toDescription: row.toDescription,
+	contentSchema: row.contentSchema
+});
+/** The definition of a collection, undefined while loading or when the draft has none. */
+function useCollectionDefinition(collectionId) {
+	const $ = c(5);
+	const projectUuid = useProjectUuid();
+	let t0;
+	if ($[0] !== collectionId || $[1] !== projectUuid) {
+		t0 = reads.collection({
+			projectUuid,
+			collectionId: collectionId ?? ""
+		});
+		$[0] = collectionId;
+		$[1] = projectUuid;
+		$[2] = t0;
+	} else t0 = $[2];
+	const t1 = collectionId != null;
+	let t2;
+	if ($[3] !== t1) {
+		t2 = {
+			enabled: t1,
+			select: toCollectionDefinition
+		};
+		$[3] = t1;
+		$[4] = t2;
+	} else t2 = $[4];
+	return useReadQuery(t0, t2).data;
+}
+
+//#endregion
+export { useBlockDefinition, useBlockDefinitions, useCollectionDefinition, useLayoutDefinition, useLayoutDefinitions, useRoutableLayouts };

package/dist/lib/studio-reads.d.ts

@@ -1,3 +1,4 @@
+import "./locale-path.js";
 import "../core/createLayout.js";
 import "../features/runtime/runtime.js";
 import "./draft-scope.js";

package/dist/lib/studio-reads.js

@@ -21,6 +21,11 @@ function entry(definition) {
 }
 const usageCountsPrefix = queryKeys.blocks.getUsageCounts;
 const collectionsPrefix = ["camox", "collections"];
+const blockDefinitionsPrefix = [
+	"camox",
+	"blockDefinitions",
+	"list"
+];
 const loadLayout = ({ api, signal }, { projectUuid, layoutId }) => api.layouts.get({
 	projectUuid,
 	layoutId
@@ -115,6 +120,11 @@ const reads = {
 		fetch: ({ api, signal }, { projectId }) => api.layouts.list({ projectId }, { signal }),
 		staleTime: Infinity
 	}),
+	blockDefinitionList: entry({
+		key: () => blockDefinitionsPrefix,
+		fetch: ({ api, signal }, { projectId }) => api.blockDefinitions.list({ projectId }, { signal }),
+		staleTime: Infinity
+	}),
 	blockBundle: entry({
 		key: (id) => queryKeys.blocks.get(id),
 		fetch: ({ api, signal }, id) => api.blocks.get({ id }, { signal }),
@@ -321,6 +331,28 @@ function createStudioCache({ queryClient, scope, api, runtimeJson = (endpoint, b
 		fill: (read, value) => queryClient.setQueryData(keyOf(read, target), value)
 	});
 	const neverAborted = () => new AbortController().signal;
+	const listeners = /* @__PURE__ */ new Set();
+	const changed = (change) => {
+		for (const listener of listeners) listener(change);
+	};
+	const write = (key, value) => {
+		const data = queryClient.setQueryData(key, value);
+		changed({
+			type: "wrote",
+			queryKey: key,
+			value: data
+		});
+	};
+	const forget = (key) => {
+		queryClient.removeQueries({
+			queryKey: key,
+			exact: true
+		});
+		changed({
+			type: "wrote",
+			queryKey: key
+		});
+	};
 	const options = (read, inDraft) => {
 		const target = targetOf(inDraft);
 		const definition = read.entry.definition;
@@ -361,21 +393,29 @@ function createStudioCache({ queryClient, scope, api, runtimeJson = (endpoint, b
 	return {
 		options,
 		get: (read, inDraft) => queryClient.getQueryData(keyOf(read, targetOf(inDraft))),
-		set: (read, value, inDraft) => queryClient.setQueryData(keyOf(read, targetOf(inDraft)), value),
+		set: (read, value, inDraft) => write(keyOf(read, targetOf(inDraft)), value),
 		land,
 		ensure: async (read, inDraft) => {
 			const cached = queryClient.getQueryData(keyOf(read, targetOf(inDraft)));
 			return cached !== void 0 ? cached : loadFully(read, inDraft);
 		},
 		reload: loadFully,
-		invalidate: (read, inDraft) => queryClient.invalidateQueries({
-			queryKey: keyOf(read, targetOf(inDraft)),
-			exact: true
-		}),
-		remove: (read, inDraft) => queryClient.removeQueries({
-			queryKey: keyOf(read, targetOf(inDraft)),
-			exact: true
-		}),
+		invalidate: (read, inDraft) => {
+			const queryKey = keyOf(read, targetOf(inDraft));
+			changed({
+				type: "outdated",
+				queryKeys: [queryKey]
+			});
+			return queryClient.invalidateQueries({
+				queryKey,
+				exact: true
+			});
+		},
+		remove: (read, inDraft) => forget(keyOf(read, targetOf(inDraft))),
+		subscribe(listener) {
+			listeners.add(listener);
+			return () => listeners.delete(listener);
+		},
 		edit: () => {
 			const target = targetOf();
 			const snapshots = /* @__PURE__ */ new Map();
@@ -396,27 +436,31 @@ function createStudioCache({ queryClient, scope, api, runtimeJson = (endpoint, b
 			};
 			return {
 				get: (read) => queryClient.getQueryData(keyOf(read, target)),
-				set: (read, value) => queryClient.setQueryData(touch(read), value),
-				remove: (read) => queryClient.removeQueries({
-					queryKey: touch(read),
-					exact: true
-				}),
+				set: (read, value) => write(touch(read), value),
+				remove: (read) => forget(touch(read)),
 				rollback: () => {
-					for (const { key, data } of snapshots.values()) if (data === void 0) queryClient.removeQueries({
-						queryKey: key,
-						exact: true
-					});
-					else queryClient.setQueryData(key, data);
+					for (const { key, data } of snapshots.values()) if (data === void 0) forget(key);
+					else write(key, data);
 				},
 				settle: () => {
-					for (const { key } of snapshots.values()) queryClient.invalidateQueries({
-						queryKey: key,
+					const queryKeys = [...snapshots.values()].map(({ key }) => key);
+					if (queryKeys.length) changed({
+						type: "outdated",
+						queryKeys
+					});
+					for (const queryKey of queryKeys) queryClient.invalidateQueries({
+						queryKey,
 						exact: true
 					});
 				}
 			};
 		},
 		receive: async (message, projectId) => {
+			changed({
+				type: "received",
+				message,
+				projectId
+			});
 			const keyScope = message.draftId === null ? null : await scope.keyScopeOfDraft(message.draftId, projectId);
 			await Promise.all(message.targets.map((queryKey) => queryClient.invalidateQueries({
 				queryKey,

package/dist/lib/use-project-room.js

@@ -11,14 +11,14 @@ const DEBOUNCE_MS = 300;
 * wherever they change nothing. The studio cache applies each one to the reads it reaches.
 */
 function useProjectRoom(apiUrl, projectId, studioCache, t0) {
-	const $ = c(12);
+	const $ = c(13);
 	let t1;
 	if ($[0] !== t0) {
 		t1 = t0 === void 0 ? {} : t0;
 		$[0] = t0;
 		$[1] = t1;
 	} else t1 = $[1];
-	const { onDraftEnded } = t1;
+	const { onDraftEnded, onRevision } = t1;
 	const timerRef = useRef(void 0);
 	let t2;
 	if ($[2] === Symbol.for("react.memo_cache_sentinel")) {
@@ -35,7 +35,7 @@ function useProjectRoom(apiUrl, projectId, studioCache, t0) {
 	const t4 = String(projectId ?? "");
 	const t5 = !!projectId;
 	let t6;
-	if ($[5] !== onDraftEnded || $[6] !== projectId || $[7] !== studioCache || $[8] !== t3 || $[9] !== t4 || $[10] !== t5) {
+	if ($[5] !== onDraftEnded || $[6] !== onRevision || $[7] !== projectId || $[8] !== studioCache || $[9] !== t3 || $[10] !== t4 || $[11] !== t5) {
 		t6 = {
 			...t3,
 			party: "project-room",
@@ -63,6 +63,11 @@ function useProjectRoom(apiUrl, projectId, studioCache, t0) {
 					onDraftEnded?.(ended);
 					return;
 				}
+				if (data.type === "revision") {
+					const { type: _type_0, ...revision } = data;
+					onRevision?.(revision);
+					return;
+				}
 				if (data.type !== "invalidate") return;
 				pendingRef.current.push(data);
 				clearTimeout(timerRef.current);
@@ -74,13 +79,14 @@ function useProjectRoom(apiUrl, projectId, studioCache, t0) {
 			}
 		};
 		$[5] = onDraftEnded;
-		$[6] = projectId;
-		$[7] = studioCache;
-		$[8] = t3;
-		$[9] = t4;
-		$[10] = t5;
-		$[11] = t6;
-	} else t6 = $[11];
+		$[6] = onRevision;
+		$[7] = projectId;
+		$[8] = studioCache;
+		$[9] = t3;
+		$[10] = t4;
+		$[11] = t5;
+		$[12] = t6;
+	} else t6 = $[12];
 	usePartySocket(t6);
 }
 

package/dist/lib/utils.js

@@ -1,112 +1,9 @@
-import { PlatformLabel } from "../components/PlatformLabel.js";
-import { c } from "react/compiler-runtime";
-import { jsx } from "react/jsx-runtime";
-import { Kbd } from "@camox/ui/kbd";
 import { INPUT_BASE_STYLES, INPUT_FOCUS_STYLES, cn } from "@camox/ui/utils";
 
 //#region src/lib/utils.tsx
 function checkIfInputFocused(document = window.document) {
 	return document.activeElement?.tagName === "INPUT" || document.activeElement?.tagName === "TEXTAREA" || (document.activeElement?.getAttribute("contenteditable") ?? "false") === "true";
 }
-/**
-* Formats an action shortcut into a keyboard shortcut display component.
-* Automatically detects the platform and uses the appropriate modifier keys.
-*
-* @param shortcut - The shortcut configuration from an Action
-* @returns React element displaying the keyboard shortcut
-*
-* @example
-* ```tsx
-* formatShortcut({ key: "e", withMeta: true }) // Returns <KbdGroup><Kbd>⌘</Kbd><Kbd>E</Kbd></KbdGroup>
-* formatShortcut({ key: "l" })                 // Returns <Kbd>L</Kbd>
-* ```
-*/
-function formatShortcut(shortcut) {
-	if (!shortcut) return null;
-	return /* @__PURE__ */ jsx(Shortcut, { shortcut });
-}
-function Shortcut(t0) {
-	const $ = c(14);
-	const { shortcut } = t0;
-	let t1;
-	bb0: {
-		if (shortcut.key === "Enter") {
-			t1 = "↵";
-			break bb0;
-		}
-		if (shortcut.key === "Escape") {
-			t1 = "Esc";
-			break bb0;
-		}
-		if (shortcut.key === "Backspace") {
-			t1 = "⌫";
-			break bb0;
-		}
-		if (shortcut.key === "ArrowUp") {
-			t1 = "↑";
-			break bb0;
-		}
-		if (shortcut.key === "ArrowDown") {
-			t1 = "↓";
-			break bb0;
-		}
-		if (shortcut.key === "ArrowLeft") {
-			t1 = "←";
-			break bb0;
-		}
-		if (shortcut.key === "ArrowRight") {
-			t1 = "→";
-			break bb0;
-		}
-		let t2;
-		if ($[0] !== shortcut.key) {
-			t2 = shortcut.key.toUpperCase();
-			$[0] = shortcut.key;
-			$[1] = t2;
-		} else t2 = $[1];
-		t1 = t2;
-	}
-	const formattedKey = t1;
-	let t2;
-	if ($[2] !== formattedKey || $[3] !== shortcut.withAlt || $[4] !== shortcut.withMeta || $[5] !== shortcut.withShift) {
-		t2 = (mac) => {
-			const modifiers = [];
-			if (shortcut.withMeta) modifiers.push(mac ? "⌘" : "Ctrl");
-			if (shortcut.withAlt) modifiers.push(mac ? "⌥" : "Alt");
-			if (shortcut.withShift) modifiers.push(mac ? "⇧" : "Shift");
-			return `${modifiers.join()} ${formattedKey}`.trim();
-		};
-		$[2] = formattedKey;
-		$[3] = shortcut.withAlt;
-		$[4] = shortcut.withMeta;
-		$[5] = shortcut.withShift;
-		$[6] = t2;
-	} else t2 = $[6];
-	const label = t2;
-	let t3;
-	if ($[7] !== label) {
-		t3 = label(true);
-		$[7] = label;
-		$[8] = t3;
-	} else t3 = $[8];
-	let t4;
-	if ($[9] !== label) {
-		t4 = label(false);
-		$[9] = label;
-		$[10] = t4;
-	} else t4 = $[10];
-	let t5;
-	if ($[11] !== t3 || $[12] !== t4) {
-		t5 = /* @__PURE__ */ jsx(Kbd, { children: /* @__PURE__ */ jsx(PlatformLabel, {
-			mac: t3,
-			other: t4
-		}) });
-		$[11] = t3;
-		$[12] = t4;
-		$[13] = t5;
-	} else t5 = $[13];
-	return t5;
-}
 
 //#endregion
-export { INPUT_BASE_STYLES, INPUT_FOCUS_STYLES, checkIfInputFocused, cn, formatShortcut };
+export { INPUT_BASE_STYLES, INPUT_FOCUS_STYLES, checkIfInputFocused, cn };

package/dist/package.js

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