camox 0.44.0 → 0.46.0

package/dist/lib/normalized-data.js

@@ -1,62 +1,147 @@
-import { viewBlockQueries } from "./view-queries.js";
+import { reads, useReadQueries } from "./studio-reads.js";
 import { c } from "react/compiler-runtime";
-import { useQueries } from "@tanstack/react-query";
 import * as React from "react";
-import { queryKeys } from "@camox/api-contract/query-keys";
 
 //#region src/lib/normalized-data.ts
+const EMPTY_REFERENCE_BLOCKS = [];
+/** Every record a block's references and reference lists resolve to. */
+function referencedRecords(references) {
+	return Object.values(references ?? {}).flatMap((value) => value ?? []);
+}
+/** The records references resolve to, and the records those link in turn (both hops). */
+function linkedRecords(references) {
+	return referencedRecords(references).flatMap((record) => [record, ...referencedRecords(record.references)]);
+}
+/** A single reference field's record; reference lists never resolve to one record. */
+function singleReference(references, fieldName) {
+	const value = references?.[fieldName];
+	return value && !Array.isArray(value) ? value : null;
+}
+/** A reference list field's records, in list order; single references resolve to none. */
+function referenceList(references, fieldName) {
+	const value = references?.[fieldName];
+	return Array.isArray(value) ? value : [];
+}
+/** The records a reference or reference list field places, in order. */
+function placedRecords(references, fieldName) {
+	return [references?.[fieldName] ?? []].flat();
+}
 const NormalizedDataContext = React.createContext({
 	filesMap: /* @__PURE__ */ new Map(),
-	itemsMap: /* @__PURE__ */ new Map()
+	itemsMap: /* @__PURE__ */ new Map(),
+	recordsMap: /* @__PURE__ */ new Map(),
+	blockReferences: /* @__PURE__ */ new Map()
 });
+/**
+* The record ids a query-backed list resolved to on the server, in order. The block or item
+* stores no value for it: its owner's resolved references carry the results.
+*/
+function queryResultIds(data, owner, fieldName) {
+	return referenceList(owner.itemId == null ? data.blockReferences.get(owner.blockId) : data.itemsMap.get(owner.itemId)?.references, fieldName).map((record) => record.id);
+}
 const NormalizedDataProvider = (t0) => {
-	const $ = c(13);
-	if ($[0] !== "28aab7b25bd21e351d34503ab3d745344dc158d8c4a4ad7a8c63e2c8732703bb") {
-		for (let $i = 0; $i < 13; $i += 1) $[$i] = Symbol.for("react.memo_cache_sentinel");
-		$[0] = "28aab7b25bd21e351d34503ab3d745344dc158d8c4a4ad7a8c63e2c8732703bb";
-	}
-	const { files, repeatableItems, children } = t0;
-	let t1;
-	if ($[1] !== files) {
-		t1 = new Map(files.map(_temp));
-		$[1] = files;
-		$[2] = t1;
-	} else t1 = $[2];
+	const $ = c(19);
+	const { files, repeatableItems, blocks: t1, children } = t0;
+	const blocks = t1 === void 0 ? EMPTY_REFERENCE_BLOCKS : t1;
 	let t2;
-	if ($[3] !== repeatableItems) {
-		t2 = new Map(repeatableItems.map(_temp2));
-		$[3] = repeatableItems;
-		$[4] = t2;
-	} else t2 = $[4];
+	if ($[0] !== files) {
+		t2 = new Map(files.map(_temp));
+		$[0] = files;
+		$[1] = t2;
+	} else t2 = $[1];
 	let t3;
-	if ($[5] !== t1 || $[6] !== t2) {
-		t3 = {
-			filesMap: t1,
-			itemsMap: t2
-		};
-		$[5] = t1;
-		$[6] = t2;
-		$[7] = t3;
-	} else t3 = $[7];
-	const value = t3;
+	if ($[2] !== repeatableItems) {
+		t3 = new Map(repeatableItems.map(_temp2));
+		$[2] = repeatableItems;
+		$[3] = t3;
+	} else t3 = $[3];
 	let t4;
-	if ($[8] !== children || $[9] !== value) {
-		let t5;
-		if ($[11] !== value) {
-			t5 = { value };
-			$[11] = value;
-			$[12] = t5;
-		} else t5 = $[12];
-		t4 = React.createElement(NormalizedDataContext.Provider, t5, children);
-		$[8] = children;
-		$[9] = value;
-		$[10] = t4;
-	} else t4 = $[10];
-	return t4;
+	if ($[4] !== blocks || $[5] !== repeatableItems) {
+		t4 = new Map([...blocks, ...repeatableItems].flatMap(_temp4));
+		$[4] = blocks;
+		$[5] = repeatableItems;
+		$[6] = t4;
+	} else t4 = $[6];
+	let t5;
+	if ($[7] !== blocks) {
+		t5 = new Map(blocks.flatMap(_temp5));
+		$[7] = blocks;
+		$[8] = t5;
+	} else t5 = $[8];
+	let t6;
+	if ($[9] !== t2 || $[10] !== t3 || $[11] !== t4 || $[12] !== t5) {
+		t6 = {
+			filesMap: t2,
+			itemsMap: t3,
+			recordsMap: t4,
+			blockReferences: t5
+		};
+		$[9] = t2;
+		$[10] = t3;
+		$[11] = t4;
+		$[12] = t5;
+		$[13] = t6;
+	} else t6 = $[13];
+	const value = t6;
+	let t7;
+	if ($[14] !== children || $[15] !== value) {
+		let t8;
+		if ($[17] !== value) {
+			t8 = { value };
+			$[17] = value;
+			$[18] = t8;
+		} else t8 = $[18];
+		t7 = React.createElement(NormalizedDataContext.Provider, t8, children);
+		$[14] = children;
+		$[15] = value;
+		$[16] = t7;
+	} else t7 = $[16];
+	return t7;
 };
 function useNormalizedData() {
 	return React.use(NormalizedDataContext);
 }
+/**
+* Adds the records a record page's record links to the records its fields resolve
+* references from. A record page places its record through no block, so no block carries them.
+*/
+const LinkedRecordsProvider = (t0) => {
+	const $ = c(11);
+	const { references, children } = t0;
+	const outer = React.use(NormalizedDataContext);
+	let t1;
+	if ($[0] !== outer.recordsMap || $[1] !== references) {
+		t1 = new Map([...outer.recordsMap, ...linkedRecords(references).map(_temp6)]);
+		$[0] = outer.recordsMap;
+		$[1] = references;
+		$[2] = t1;
+	} else t1 = $[2];
+	let t2;
+	if ($[3] !== outer || $[4] !== t1) {
+		t2 = {
+			...outer,
+			recordsMap: t1
+		};
+		$[3] = outer;
+		$[4] = t1;
+		$[5] = t2;
+	} else t2 = $[5];
+	const value = t2;
+	let t3;
+	if ($[6] !== children || $[7] !== value) {
+		let t4;
+		if ($[9] !== value) {
+			t4 = { value };
+			$[9] = value;
+			$[10] = t4;
+		} else t4 = $[10];
+		t3 = React.createElement(NormalizedDataContext.Provider, t4, children);
+		$[6] = children;
+		$[7] = value;
+		$[8] = t3;
+	} else t3 = $[8];
+	return t3;
+};
 const EMPTY_IDS = [];
 /**
 * Returns the previously-returned array when `next` is element-wise identical to
@@ -67,131 +152,130 @@ const EMPTY_IDS = [];
 * React Compiler, since its memoization keys on input identity.
 */
 function useStableArray(next) {
-	const ref = React.useRef(next);
-	const prev = ref.current;
-	if (prev !== next && (prev.length !== next.length || prev.some((v, i) => v !== next[i]))) ref.current = next;
-	return ref.current;
-}
-function usePageBlocks(pageStructure, t0) {
-	const $ = c(37);
-	if ($[0] !== "28aab7b25bd21e351d34503ab3d745344dc158d8c4a4ad7a8c63e2c8732703bb") {
-		for (let $i = 0; $i < 37; $i += 1) $[$i] = Symbol.for("react.memo_cache_sentinel");
-		$[0] = "28aab7b25bd21e351d34503ab3d745344dc158d8c4a4ad7a8c63e2c8732703bb";
+	const [prev, setPrev] = React.useState(next);
+	if (prev !== next && (prev.length !== next.length || prev.some((v, i) => v !== next[i]))) {
+		setPrev(next);
+		return next;
 	}
-	const source = t0 === void 0 ? "draft" : t0;
+	return prev;
+}
+function usePageBlocks(pageStructure) {
+	const $ = c(35);
 	const blockIds = pageStructure.page.blockIds;
 	const beforeIds = pageStructure.layout?.beforeBlockIds ?? EMPTY_IDS;
 	const afterIds = pageStructure.layout?.afterBlockIds ?? EMPTY_IDS;
-	let t1;
-	if ($[1] !== afterIds || $[2] !== beforeIds || $[3] !== blockIds) {
-		t1 = [
+	let t0;
+	if ($[0] !== afterIds || $[1] !== beforeIds || $[2] !== blockIds) {
+		t0 = [
 			...blockIds,
 			...beforeIds,
 			...afterIds
 		];
-		$[1] = afterIds;
-		$[2] = beforeIds;
-		$[3] = blockIds;
-		$[4] = t1;
-	} else t1 = $[4];
-	const allIds = t1;
-	let t2;
-	if ($[5] !== allIds || $[6] !== source) {
-		t2 = { queries: allIds.map((id) => viewBlockQueries.get(id, source)) };
-		$[5] = allIds;
-		$[6] = source;
-		$[7] = t2;
-	} else t2 = $[7];
-	const results = useQueries(t2);
+		$[0] = afterIds;
+		$[1] = beforeIds;
+		$[2] = blockIds;
+		$[3] = t0;
+	} else t0 = $[3];
+	const allIds = t0;
+	let t1;
+	if ($[4] !== allIds) {
+		t1 = allIds.map(_temp7);
+		$[4] = allIds;
+		$[5] = t1;
+	} else t1 = $[5];
+	const results = useReadQueries(t1);
 	let map;
-	if ($[8] !== allIds || $[9] !== results) {
+	if ($[6] !== allIds || $[7] !== results) {
 		map = /* @__PURE__ */ new Map();
 		for (let i = 0; i < allIds.length; i++) {
 			const data = results[i]?.data;
 			if (data) map.set(allIds[i], data);
 		}
-		$[8] = allIds;
-		$[9] = results;
-		$[10] = map;
-	} else map = $[10];
+		$[6] = allIds;
+		$[7] = results;
+		$[8] = map;
+	} else map = $[8];
 	const bundleMap = map;
+	let t2;
+	if ($[9] !== afterIds || $[10] !== beforeIds) {
+		t2 = [...beforeIds, ...afterIds];
+		$[9] = afterIds;
+		$[10] = beforeIds;
+		$[11] = t2;
+	} else t2 = $[11];
+	const layoutIds = t2;
 	let t3;
-	if ($[11] !== afterIds || $[12] !== beforeIds) {
-		t3 = [...beforeIds, ...afterIds];
-		$[11] = afterIds;
-		$[12] = beforeIds;
+	if ($[12] !== bundleMap) {
+		t3 = (ids) => ids.map((id_0) => bundleMap.get(id_0)?.block).filter(_temp8);
+		$[12] = bundleMap;
 		$[13] = t3;
 	} else t3 = $[13];
-	const layoutIds = t3;
+	const resolveBlocks = t3;
 	let t4;
-	if ($[14] !== bundleMap) {
-		t4 = (ids) => ids.map((id_0) => bundleMap.get(id_0)?.block).filter(_temp3);
-		$[14] = bundleMap;
-		$[15] = t4;
-	} else t4 = $[15];
-	const resolveBlocks = t4;
+	if ($[14] !== blockIds || $[15] !== resolveBlocks) {
+		t4 = resolveBlocks(blockIds);
+		$[14] = blockIds;
+		$[15] = resolveBlocks;
+		$[16] = t4;
+	} else t4 = $[16];
+	const pageBlocks = useStableArray(t4);
 	let t5;
-	if ($[16] !== blockIds || $[17] !== resolveBlocks) {
-		t5 = resolveBlocks(blockIds);
-		$[16] = blockIds;
-		$[17] = resolveBlocks;
-		$[18] = t5;
-	} else t5 = $[18];
-	const pageBlocks = useStableArray(t5);
+	if ($[17] !== beforeIds || $[18] !== resolveBlocks) {
+		t5 = resolveBlocks(beforeIds);
+		$[17] = beforeIds;
+		$[18] = resolveBlocks;
+		$[19] = t5;
+	} else t5 = $[19];
+	const beforeBlocks = useStableArray(t5);
 	let t6;
-	if ($[19] !== beforeIds || $[20] !== resolveBlocks) {
-		t6 = resolveBlocks(beforeIds);
-		$[19] = beforeIds;
-		$[20] = resolveBlocks;
-		$[21] = t6;
-	} else t6 = $[21];
-	const beforeBlocks = useStableArray(t6);
+	if ($[20] !== afterIds || $[21] !== resolveBlocks) {
+		t6 = resolveBlocks(afterIds);
+		$[20] = afterIds;
+		$[21] = resolveBlocks;
+		$[22] = t6;
+	} else t6 = $[22];
+	const afterBlocks = useStableArray(t6);
 	let t7;
-	if ($[22] !== afterIds || $[23] !== resolveBlocks) {
-		t7 = resolveBlocks(afterIds);
-		$[22] = afterIds;
-		$[23] = resolveBlocks;
-		$[24] = t7;
-	} else t7 = $[24];
-	const afterBlocks = useStableArray(t7);
+	if ($[23] !== bundleMap || $[24] !== layoutIds) {
+		t7 = layoutIds.flatMap((id_1) => bundleMap.get(id_1)?.files ?? []);
+		$[23] = bundleMap;
+		$[24] = layoutIds;
+		$[25] = t7;
+	} else t7 = $[25];
+	const layoutFiles = useStableArray(t7);
 	let t8;
-	if ($[25] !== bundleMap || $[26] !== layoutIds) {
-		t8 = layoutIds.flatMap((id_1) => bundleMap.get(id_1)?.files ?? []);
-		$[25] = bundleMap;
-		$[26] = layoutIds;
-		$[27] = t8;
-	} else t8 = $[27];
-	const layoutFiles = useStableArray(t8);
+	if ($[26] !== bundleMap || $[27] !== layoutIds) {
+		t8 = layoutIds.flatMap((id_2) => bundleMap.get(id_2)?.repeatableItems ?? []);
+		$[26] = bundleMap;
+		$[27] = layoutIds;
+		$[28] = t8;
+	} else t8 = $[28];
+	const layoutItems = useStableArray(t8);
 	let t9;
-	if ($[28] !== bundleMap || $[29] !== layoutIds) {
-		t9 = layoutIds.flatMap((id_2) => bundleMap.get(id_2)?.repeatableItems ?? []);
-		$[28] = bundleMap;
-		$[29] = layoutIds;
-		$[30] = t9;
-	} else t9 = $[30];
-	const layoutItems = useStableArray(t9);
-	let t10;
-	if ($[31] !== afterBlocks || $[32] !== beforeBlocks || $[33] !== layoutFiles || $[34] !== layoutItems || $[35] !== pageBlocks) {
-		t10 = {
+	if ($[29] !== afterBlocks || $[30] !== beforeBlocks || $[31] !== layoutFiles || $[32] !== layoutItems || $[33] !== pageBlocks) {
+		t9 = {
 			pageBlocks,
 			beforeBlocks,
 			afterBlocks,
 			layoutFiles,
 			layoutItems
 		};
-		$[31] = afterBlocks;
-		$[32] = beforeBlocks;
-		$[33] = layoutFiles;
-		$[34] = layoutItems;
-		$[35] = pageBlocks;
-		$[36] = t10;
-	} else t10 = $[36];
-	return t10;
+		$[29] = afterBlocks;
+		$[30] = beforeBlocks;
+		$[31] = layoutFiles;
+		$[32] = layoutItems;
+		$[33] = pageBlocks;
+		$[34] = t9;
+	} else t9 = $[34];
+	return t9;
 }
-/** Check if a value is a { _fileId } marker */
-function _temp3(b) {
+function _temp8(b) {
 	return b != null;
 }
+function _temp7(id) {
+	return reads.blockBundle(id);
+}
+/** Check if a value is a { _fileId } marker */
 function isFileMarker(value) {
 	return value != null && typeof value === "object" && "_fileId" in value && value._fileId != null;
 }
@@ -201,7 +285,7 @@ function isItemMarker(value) {
 }
 function visitForFileIds(value, ids) {
 	if (value == null || typeof value !== "object") return;
-	if ("_fileId" in value && typeof value._fileId === "number") {
+	if ("_fileId" in value && typeof value._fileId === "string") {
 		ids.add(value._fileId);
 		return;
 	}
@@ -214,21 +298,25 @@ function visitForFileIds(value, ids) {
 function collectFileIdsFromContent(content, ids) {
 	for (const value of Object.values(content)) visitForFileIds(value, ids);
 }
-function seedBlockCaches(queryClient, pageData, source = "draft") {
-	const filesById = new Map(pageData.files.map((f) => [f.id, f]));
-	for (const block of pageData.blocks) {
-		const blockItems = pageData.repeatableItems.filter((i) => i.blockId === block.id);
-		const fileIds = /* @__PURE__ */ new Set();
-		collectFileIdsFromContent(block.content, fileIds);
-		for (const item of blockItems) collectFileIdsFromContent(item.content, fileIds);
-		const blockFiles = [...fileIds].map((id) => filesById.get(id)).filter((f) => f != null);
-		queryClient.setQueryData(queryKeys.blocks.get(block.id, source), {
-			block,
-			repeatableItems: blockItems,
-			files: blockFiles
-		});
-		for (const file of blockFiles) queryClient.setQueryData(queryKeys.files.get(file.id), file);
+/**
+* The files a block places: in its content, its items' content, and the content of the records
+* they link.
+*/
+function collectFileIds(block, items) {
+	const fileIds = /* @__PURE__ */ new Set();
+	for (const owner of [block, ...items]) {
+		collectFileIdsFromContent(owner.content, fileIds);
+		for (const record of linkedRecords(owner.references)) collectFileIdsFromContent(record.content, fileIds);
 	}
+	return fileIds;
+}
+/** Materialized collection revisions own their asset metadata. Only marker-only
+* values consult the mutable file map, so a published source cannot change when
+* the file's current metadata changes.
+*/
+function resolveAssetValue(value, filesMap) {
+	if (value && typeof value === "object" && "url" in value && typeof value.url === "string") return value;
+	return isFileMarker(value) ? resolveFileMarker(value, filesMap) : value;
 }
 /** Resolve a file marker to a full file object */
 function resolveFileMarker(marker, filesMap) {
@@ -256,6 +344,18 @@ function _temp(f) {
 function _temp2(i) {
 	return [i.id, i];
 }
+function _temp3(record) {
+	return [record.id, record];
+}
+function _temp4(owner) {
+	return linkedRecords(owner.references).map(_temp3);
+}
+function _temp5(block) {
+	return block.id == null ? [] : [[block.id, block.references ?? {}]];
+}
+function _temp6(record) {
+	return [record.id, record];
+}
 
 //#endregion
-export { NormalizedDataProvider, isFileMarker, isItemMarker, resolveFileMarker, seedBlockCaches, useNormalizedData, usePageBlocks };
+export { LinkedRecordsProvider, NormalizedDataProvider, collectFileIds, isFileMarker, isItemMarker, linkedRecords, placedRecords, queryResultIds, referenceList, referencedRecords, resolveAssetValue, resolveFileMarker, singleReference, useNormalizedData, usePageBlocks };

package/dist/lib/preview-handoff.js

@@ -4,9 +4,9 @@ function validatePreviewTarget(raw, target) {
 	if (raw === null) return null;
 	try {
 		const expected = JSON.parse(raw);
-		if (expected.projectSlug === target.projectSlug && expected.environmentName === target.environmentName && typeof expected.apiUrl === "string" && expected.apiUrl.replace(/\/+$/, "") === target.apiUrl.replace(/\/+$/, "")) return null;
+		if (expected.projectUuid === target.projectUuid && typeof expected.apiUrl === "string" && expected.apiUrl.replace(/\/+$/, "") === target.apiUrl.replace(/\/+$/, "")) return null;
 	} catch {}
-	return "Preview destination does not match the CLI project, backend, or environment. Check --cwd and --url, then run camox preview again.";
+	return "Preview destination does not match the CLI project or backend. Check --cwd and --url, then run camox preview again.";
 }
 
 //#endregion

package/dist/lib/queries.d.ts

@@ -0,0 +1,11 @@
+import { ApiClient } from "./api-client.js";
+//#region src/lib/queries.d.ts
+export type PageWithBlocks = Awaited<ReturnType<ApiClient["pages"]["getByPath"]>>;
+/** Slim structural data stored in the page query cache (no blocks/items/files). */
+export type PageStructure = {
+  page: PageWithBlocks["page"];
+  layout: PageWithBlocks["layout"];
+  projectName: string;
+  project: PageWithBlocks["project"];
+};
+//#endregion