camox 0.45.0 → 0.47.0

package/dist/features/studio/FollowAgentProvider.js

@@ -4,8 +4,6 @@ import { useViewLocale } from "../../lib/view-locale-context.js";
 import { useLocation, useNavigate } from "../navigation/navigation.js";
 import { useCamoxApp } from "../provider/components/CamoxAppContext.js";
 import { reads, useReadQueries, useReadQuery } from "../../lib/studio-reads.js";
-import { useLocalizedPath } from "../../lib/view-locale.js";
-import { blockCatalogPath } from "./routes.js";
 import { FollowAgentContext } from "./followAgentContext.js";
 import { canvasPageId, getCanvasPages } from "../canvas/canvasPages.js";
 import { selectedCanvasPage } from "../canvas/canvasSelection.js";
@@ -103,12 +101,11 @@ function _temp(id) {
 }
 /** Where the editor is, and the Studio content following locates the agent's touches with. */
 function useFollowWhere(runtimeBasePath) {
-	const $ = c(38);
+	const $ = c(35);
 	const app = useCamoxApp();
 	const projectUuid = useProjectUuid();
 	const location = useLocation();
 	const { locale, locales } = useViewLocale();
-	const localized = useLocalizedPath();
 	let t0;
 	if ($[0] !== projectUuid) {
 		t0 = reads.project({ projectUuid });
@@ -211,28 +208,20 @@ function useFollowWhere(runtimeBasePath) {
 	} else t9 = $[29];
 	const t10 = current?.key ?? null;
 	let t11;
-	if ($[30] !== localized) {
-		t11 = (type) => localized(blockCatalogPath(type));
-		$[30] = localized;
-		$[31] = t11;
-	} else t11 = $[31];
-	let t12;
-	if ($[32] !== locale.tag || $[33] !== pages || $[34] !== t10 || $[35] !== t11 || $[36] !== t9) {
-		t12 = {
+	if ($[30] !== locale.tag || $[31] !== pages || $[32] !== t10 || $[33] !== t9) {
+		t11 = {
 			pages,
 			locale: locale.tag,
 			location: t9,
-			pageKey: t10,
-			blockCatalogPath: t11
+			pageKey: t10
 		};
-		$[32] = locale.tag;
-		$[33] = pages;
-		$[34] = t10;
-		$[35] = t11;
-		$[36] = t9;
-		$[37] = t12;
-	} else t12 = $[37];
-	return t12;
+		$[30] = locale.tag;
+		$[31] = pages;
+		$[32] = t10;
+		$[33] = t9;
+		$[34] = t11;
+	} else t11 = $[34];
+	return t11;
 }
 function _temp2(page) {
 	return [page.id, page.layoutId];

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

@@ -1,7 +1,7 @@
 import { getApiUrl } from "../../../lib/api-client.js";
 import { reads, useStudioCache } from "../../../lib/studio-reads.js";
 import { projectMutations } from "../../../lib/queries.js";
-import { buildFaviconPlaceholderUrl, buildFaviconUrl } from "../../routes/pageRuntime.js";
+import { buildDefaultFaviconUrl, buildFaviconUrl } from "../../routes/pageRuntime.js";
 import { c } from "react/compiler-runtime";
 import * as React from "react";
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
@@ -63,7 +63,7 @@ function FaviconForm(t0) {
 	const [hasCurrent, setHasCurrent] = React.useState(false);
 	let t1;
 	if ($[0] !== project) {
-		t1 = buildFaviconUrl(getApiUrl(), project, { placeholder: false });
+		t1 = buildFaviconUrl(getApiUrl(), project, { withDefault: false });
 		$[0] = project;
 		$[1] = t1;
 	} else t1 = $[1];
@@ -202,7 +202,7 @@ function FaviconForm(t0) {
 	const showsFavicon = pending ? pending.type === "upload" : hasCurrent;
 	let t14;
 	if ($[27] !== currentUrl || $[28] !== pendingUrl || $[29] !== showsFavicon) {
-		t14 = pendingUrl ?? (showsFavicon ? currentUrl : buildFaviconPlaceholderUrl(getApiUrl()));
+		t14 = pendingUrl ?? (showsFavicon ? currentUrl : buildDefaultFaviconUrl(getApiUrl()));
 		$[27] = currentUrl;
 		$[28] = pendingUrl;
 		$[29] = showsFavicon;

package/dist/features/studio/followAgent.js

@@ -34,8 +34,7 @@ function locate(where, here, touch) {
 		return page ? at({ key: page.key }, touch.blockId) : null;
 	}
 	const placement = here?.blocks?.find((block) => block.type === touch.blockType);
-	if (here && placement) return at({ key: here.key }, placement.id);
-	return elsewhere ? null : { catalog: touch.blockType };
+	return here && placement ? at({ key: here.key }, placement.id) : null;
 }
 function destinationOf(where, batch) {
 	const here = currentPage(where);
@@ -50,7 +49,6 @@ function destinationOf(where, batch) {
 		return page ? `key:${page.key}` : refKey(ref);
 	};
 	for (const at of located) {
-		if ("catalog" in at) continue;
 		const key = identity(at.page);
 		const entry = touched.get(key) ?? {
 			page: at.page,
@@ -61,13 +59,7 @@ function destinationOf(where, batch) {
 		if (at.blockId && !entry.blockIds.includes(at.blockId)) entry.blockIds.push(at.blockId);
 		touched.set(key, entry);
 	}
-	if (touched.size === 0) {
-		const catalog = located.find((at) => "catalog" in at);
-		return catalog && "catalog" in catalog ? {
-			kind: "catalog",
-			blockType: catalog.catalog
-		} : null;
-	}
+	if (touched.size === 0) return null;
 	const order = (ref) => {
 		const page = findPage(where, ref);
 		return page ? where.pages.indexOf(page) : where.pages.length;
@@ -75,7 +67,6 @@ function destinationOf(where, batch) {
 	const entries = [...touched.values()];
 	const chosen = (here && touched.get(`key:${here.key}`)) ?? entries.reduce((best, entry) => entry.count > best.count || entry.count === best.count && order(entry.page) < order(best.page) ? entry : best);
 	return {
-		kind: "page",
 		page: chosen.page,
 		blockIds: chosen.blockIds
 	};
@@ -169,11 +160,11 @@ function createFollowAgent({ navigate, where: initial }) {
 			return;
 		}
 		const destination = pendingNavigation;
-		const pathname = destination.kind === "catalog" ? where.blockCatalogPath(destination.blockType) : findPage(where, destination.page)?.pathname;
+		const pathname = findPage(where, destination.page)?.pathname;
 		if (!pathname) return;
 		pendingNavigation = null;
 		arrivedAt = Date.now();
-		blocksToSelect = destination.kind === "page" && destination.blockIds.length ? destination : null;
+		blocksToSelect = destination.blockIds.length ? destination : null;
 		selected = null;
 		navigate({
 			to: `${pathname}${where.location.search}`,
@@ -208,7 +199,7 @@ function createFollowAgent({ navigate, where: initial }) {
 			const destination = destinationOf(where, batch);
 			if (!destination) return;
 			const here = currentPage(where);
-			if (destination.kind === "page" && here && findPage(where, destination.page) === here) {
+			if (here && findPage(where, destination.page) === here) {
 				pendingNavigation = null;
 				clearTimer();
 				if (!destination.blockIds.length) return;

package/dist/features/studio/routes.js

@@ -27,28 +27,6 @@ function matchCollectionContentPath(pathname) {
 }
 /** The Studio URL of the Canvas with nothing selected. */
 const STUDIO_CANVAS_PATH = `${STUDIO_BASE_PATH}/canvas`;
-const STUDIO_BLOCKS_PATH = `${STUDIO_BASE_PATH}/blocks`;
-/** The Studio URL of a block of the Block Catalog. */
-const blockCatalogPath = (blockId) => `${STUDIO_BLOCKS_PATH}/${encodeURIComponent(blockId)}`;
-/** The id of the Block Catalog block a pathname selects, if any. */
-function matchBlockCatalogPath(pathname) {
-	const match = /^\/camox\/blocks\/([^/]+)$/.exec(pathname);
-	if (!match) return null;
-	try {
-		return decodeURIComponent(match[1]) || null;
-	} catch {
-		return null;
-	}
-}
-/**
-* A location that only exists on the Canvas: the Canvas with
-* nothing selected, or a block of the Block Catalog.
-*/
-function matchCanvasOnlyPath(pathname) {
-	if (pathname === "/camox/canvas") return {};
-	const blockId = matchBlockCatalogPath(pathname);
-	return blockId ? { blockId } : null;
-}
 
 //#endregion
-export { STUDIO_ASSETS_PATH, STUDIO_BASE_PATH, STUDIO_BLOCKS_PATH, STUDIO_CANVAS_PATH, STUDIO_CONTENT_PATH, STUDIO_ROUTE_SEGMENT, blockCatalogPath, collectionContentPath, matchBlockCatalogPath, matchCanvasOnlyPath, matchCollectionContentPath };
+export { STUDIO_ASSETS_PATH, STUDIO_BASE_PATH, STUDIO_CANVAS_PATH, STUDIO_CONTENT_PATH, STUDIO_ROUTE_SEGMENT, collectionContentPath, matchCollectionContentPath };

package/dist/lib/auth.js

@@ -285,46 +285,58 @@ function useSessionState(authClient, track) {
 	return React.useSyncExternalStore(track ? subscribe : noSubscription, getSnapshot, getSnapshot);
 }
 function useAuthState() {
-	const $ = c(8);
-	const { authClient, initialAuthenticated: t0 } = useAuthContext();
+	const $ = c(9);
+	const { authClient, initialAuthenticated: t0, exchangingToken: t1 } = useAuthContext();
 	const initialAuthenticated = t0 === void 0 ? false : t0;
+	const exchangingToken = t1 === void 0 ? false : t1;
 	const hydrated = React.useSyncExternalStore(subscribeToHydration, _temp2, _temp3);
-	let t1;
+	let t2;
 	if ($[0] !== hydrated || $[1] !== initialAuthenticated) {
-		t1 = initialAuthenticated || hydrated && hasStoredAuthCookie();
+		t2 = initialAuthenticated || hydrated && hasStoredAuthCookie();
 		$[0] = hydrated;
 		$[1] = initialAuthenticated;
-		$[2] = t1;
-	} else t1 = $[2];
-	const tracksSession = t1;
+		$[2] = t2;
+	} else t2 = $[2];
+	const tracksSession = t2;
 	const { data: session, isPending } = useSessionState(authClient, tracksSession);
-	if (!tracksSession) {
-		const t2 = !hydrated;
+	if (exchangingToken && !initialAuthenticated) {
 		let t3;
-		if ($[3] !== t2) {
+		if ($[3] === Symbol.for("react.memo_cache_sentinel")) {
 			t3 = {
 				isAuthenticated: false,
-				isLoading: t2
+				isLoading: true
 			};
-			$[3] = t2;
-			$[4] = t3;
-		} else t3 = $[4];
+			$[3] = t3;
+		} else t3 = $[3];
 		return t3;
 	}
+	if (!tracksSession) {
+		const t3 = !hydrated;
+		let t4;
+		if ($[4] !== t3) {
+			t4 = {
+				isAuthenticated: false,
+				isLoading: t3
+			};
+			$[4] = t3;
+			$[5] = t4;
+		} else t4 = $[5];
+		return t4;
+	}
 	const useInitial = !hydrated || isPending;
-	const t2 = useInitial ? initialAuthenticated : !!session;
-	const t3 = useInitial && !initialAuthenticated;
-	let t4;
-	if ($[5] !== t2 || $[6] !== t3) {
-		t4 = {
-			isAuthenticated: t2,
-			isLoading: t3
+	const t3 = useInitial ? initialAuthenticated : !!session;
+	const t4 = useInitial && !initialAuthenticated;
+	let t5;
+	if ($[6] !== t3 || $[7] !== t4) {
+		t5 = {
+			isAuthenticated: t3,
+			isLoading: t4
 		};
-		$[5] = t2;
 		$[6] = t3;
 		$[7] = t4;
-	} else t4 = $[7];
-	return t4;
+		$[8] = t5;
+	} else t5 = $[8];
+	return t5;
 }
 function _temp3() {
 	return false;

package/dist/lib/studio-reads.js

@@ -148,26 +148,6 @@ const reads = {
 		fetch: async ({ api, signal }, { projectId }) => Object.fromEntries((await api.blocks.getUsageCounts({ projectId }, { signal })).map(({ type, count }) => [type, count])),
 		staleTime: Infinity
 	}),
-	pagesUsingBlock: entry({
-		key: ({ type }) => [
-			...usageCountsPrefix,
-			"pages",
-			type
-		],
-		fetch: ({ api, signal }, { projectId, type }) => api.blocks.getPagesUsing({
-			projectId,
-			type
-		}, { signal }),
-		staleTime: Infinity
-	}),
-	syncedContent: entry({
-		key: ({ type }) => queryKeys.blocks.getSyncedContent(type),
-		fetch: ({ api, signal }, { projectId, type }) => api.blocks.getSyncedContent({
-			projectId,
-			type
-		}, { signal }),
-		staleTime: Infinity
-	}),
 	pageMarkdown: entry({
 		key: (pageId) => queryKeys.blocks.getPageMarkdown(pageId),
 		fetch: async ({ api, signal }, pageId) => (await api.blocks.getPageMarkdown({ pageId }, { signal })).markdown,

package/dist/package.js

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