camox 0.75.0 → 0.76.1

package/dist/features/studio/showInCanvas.js

@@ -3,6 +3,7 @@ import { useViewLocale } from "../../lib/view-locale-context.js";
 import { useLocation, useNavigate } from "../navigation/navigation.js";
 import { useProjectUuid } from "../../lib/auth.js";
 import { reads, useStudioCache } from "../../lib/studio-reads.js";
+import { fieldOwner, ownerSelection, slotSelection } from "../../core/editing/fieldSlot.js";
 import { previewStore, sameEditingOwner } from "../preview/previewStore.js";
 import { fieldTypesDictionary } from "../../core/lib/fieldTypes.js";
 import { c } from "react/compiler-runtime";
@@ -18,27 +19,16 @@ const isFieldType = (kind) => !!kind && Object.hasOwn(fieldTypesDictionary, kind
 /** What to select on the target's page: its field, else its item or block, else nothing. */
 function selectionOf({ blockId, itemId, field }) {
 	if (!blockId) return null;
-	const fieldType = field && isFieldType(field.kind) ? field.kind : null;
-	if (itemId) return field && fieldType ? {
-		type: "item-field",
-		blockId,
-		itemId,
-		fieldName: field.name,
-		fieldType
-	} : {
-		type: "item",
+	const owner = fieldOwner({
 		blockId,
 		itemId
-	};
-	return field && fieldType ? {
-		type: "block-field",
-		blockId,
-		fieldName: field.name,
-		fieldType
-	} : {
-		type: "block",
-		blockId
-	};
+	});
+	if (!field || !isFieldType(field.kind)) return ownerSelection(owner);
+	return slotSelection({
+		owner,
+		name: field.name,
+		type: field.kind
+	});
 }
 /** Stops selecting what was last shown in the Canvas. */
 let stopSelecting = null;

package/dist/features/studio/studioStore.js

@@ -6,7 +6,7 @@ const studioStore = createStore({
 		isCommandPaletteOpen: false,
 		commandPalettePages: [],
 		isReviewDraftDialogOpen: false,
-		isDeleteDraftDialogOpen: false,
+		isDraftsSheetOpen: false,
 		localeDialog: null,
 		websiteLocation: null,
 		agentMessages: [],
@@ -58,16 +58,16 @@ const studioStore = createStore({
 				isReviewDraftDialogOpen: false
 			};
 		},
-		openDeleteDraftDialog: (context) => {
+		openDraftsSheet: (context) => {
 			return {
 				...context,
-				isDeleteDraftDialogOpen: true
+				isDraftsSheetOpen: true
 			};
 		},
-		closeDeleteDraftDialog: (context) => {
+		closeDraftsSheet: (context) => {
 			return {
 				...context,
-				isDeleteDraftDialogOpen: false
+				isDraftsSheetOpen: false
 			};
 		},
 		openLocaleDialog: (context, event) => {

package/dist/features/studio/useArchiveDraft.js

@@ -0,0 +1,60 @@
+import { draftMutations } from "../../lib/queries.js";
+import { useLeaveDraft } from "./viewSwitch.js";
+import { c } from "react/compiler-runtime";
+import { useMutation } from "@tanstack/react-query";
+import { toast } from "@camox/ui/toaster";
+
+//#region src/features/studio/useArchiveDraft.ts
+/**
+* Archives the draft the studio views, then switches to Live (ADR 0046). Archiving loses nothing
+* and any member can restore the draft, so it asks for no confirmation.
+*/
+function useArchiveDraft(projectId) {
+	const $ = c(9);
+	const leaveDraft = useLeaveDraft();
+	let t0;
+	if ($[0] === Symbol.for("react.memo_cache_sentinel")) {
+		t0 = draftMutations.archive();
+		$[0] = t0;
+	} else t0 = $[0];
+	let t1;
+	if ($[1] !== leaveDraft) {
+		t1 = {
+			...t0,
+			onSuccess: (t2) => {
+				const { archived } = t2;
+				return leaveDraft(archived);
+			},
+			onError: _temp
+		};
+		$[1] = leaveDraft;
+		$[2] = t1;
+	} else t1 = $[2];
+	const archive = useMutation(t1);
+	let t2;
+	if ($[3] !== archive || $[4] !== projectId) {
+		t2 = () => {
+			if (projectId) archive.mutate({ projectId });
+		};
+		$[3] = archive;
+		$[4] = projectId;
+		$[5] = t2;
+	} else t2 = $[5];
+	let t3;
+	if ($[6] !== archive.isPending || $[7] !== t2) {
+		t3 = {
+			archive: t2,
+			archiving: archive.isPending
+		};
+		$[6] = archive.isPending;
+		$[7] = t2;
+		$[8] = t3;
+	} else t3 = $[8];
+	return t3;
+}
+function _temp(error) {
+	return toast.error(error.message || "Could not archive the draft");
+}
+
+//#endregion
+export { useArchiveDraft };

package/dist/features/studio/useEditorSelection.js

@@ -1,11 +1,11 @@
 import { placedRecords } from "../../lib/normalized-data.js";
 import { reads, useReadQuery } from "../../lib/studio-reads.js";
 import { useBlockDefinition, useCollectionDefinition } from "../../lib/studio-definitions.js";
-import { isBlockPlacement, previewStore, selectionBlockId, selectionForOwner, selectionItemId } from "../preview/previewStore.js";
+import { isBlockPlacement, slotOf } from "../../core/editing/fieldSlot.js";
+import { previewStore, selectionBlockId, selectionForOwner, selectionItemId } from "../preview/previewStore.js";
 import { entityName } from "../preview/entityName.js";
-import { contentFieldSchema } from "../preview/components/contentFieldSchema.js";
-import { formatFieldName } from "../preview/components/ItemFieldsEditor.js";
-import { getSchemaForItem } from "../preview/components/SelectionEditor.js";
+import { itemContentSchema, itemPath } from "../preview/repeatableItemPath.js";
+import { contentFieldSchema, formatFieldName } from "../preview/components/contentFieldSchema.js";
 import { c } from "react/compiler-runtime";
 import { useSelector } from "@xstate/store-react";
 
@@ -32,14 +32,8 @@ function editorSelectionOf({ selection, block, items, schema, records, recordSch
 	for (const item of items) path.push(entityName(item, "Item"));
 	const recordSelected = selection.type === "record" || selection.type === "record-field";
 	if (recordSelected) path.push(...records.length > 0 ? records.map((record) => record.title || "Record") : ["Record"]);
-	let fieldName;
-	if (selection.type === "block-field" || selection.type === "item-field") {
-		fieldName = selection.fieldName;
-		path.push(fieldLabel(schema, fieldName));
-	} else if (selection.type === "record-field") {
-		fieldName = selection.recordFieldName;
-		path.push(fieldLabel(recordSchema, fieldName));
-	}
+	const fieldName = slotOf(selection)?.name;
+	if (fieldName) path.push(fieldLabel(recordSelected ? recordSchema : schema, fieldName));
 	const itemId = selectionItemId(selection) ?? void 0;
 	const recordId = recordSelected ? selection.nested?.recordId ?? selection.recordId : void 0;
 	return {
@@ -94,13 +88,8 @@ function useEditorSelection(where) {
 		$[8] = t4;
 		$[9] = t5;
 	} else t5 = $[9];
-	const itemsMap = t5;
-	const items = [];
-	for (let item_0 = itemId ? itemsMap.get(itemId) : void 0; item_0;) {
-		items.unshift(item_0);
-		item_0 = item_0.parentItemId ? itemsMap.get(item_0.parentItemId) : void 0;
-	}
-	const schema = blockDef && itemId ? getSchemaForItem(blockDef.contentSchema, itemId, itemsMap) : blockDef?.contentSchema;
+	const items = itemPath(itemId, t5);
+	const schema = blockDef && itemContentSchema(blockDef.contentSchema, items);
 	const records = [];
 	if ((selection?.type === "record" || selection?.type === "record-field") && isBlockPlacement(selection)) {
 		const placer = itemId ? items.at(-1) : bundle?.block;

package/dist/features/studio/useRestoreDraft.js

@@ -0,0 +1,70 @@
+import { useNavigate } from "../navigation/navigation.js";
+import { draftMutations } from "../../lib/queries.js";
+import { useSwitchView } from "./viewSwitch.js";
+import { c } from "react/compiler-runtime";
+import { useMutation } from "@tanstack/react-query";
+import { toast } from "@camox/ui/toaster";
+
+//#region src/features/studio/useRestoreDraft.ts
+/**
+* Restores an archived draft, then takes the member into it on the same page (ADR 0046): the
+* draft is back as it was, so they go on where it stopped. `label` names it in the toast.
+*/
+function useRestoreDraft(projectId, options) {
+	const $ = c(10);
+	const navigate = useNavigate();
+	const switchView = useSwitchView();
+	let t0;
+	if ($[0] === Symbol.for("react.memo_cache_sentinel")) {
+		t0 = {
+			...draftMutations.restore(),
+			onError: _temp
+		};
+		$[0] = t0;
+	} else t0 = $[0];
+	const restore = useMutation(t0);
+	let t1;
+	if ($[1] !== navigate || $[2] !== options || $[3] !== projectId || $[4] !== restore || $[5] !== switchView) {
+		t1 = (draftId, t2) => {
+			const label = t2 === void 0 ? "the draft" : t2;
+			if (!projectId) return;
+			restore.mutate({
+				projectId,
+				draftId
+			}, { onSuccess: () => {
+				options?.onRestored?.();
+				switchView(() => navigate({
+					to: window.location.href,
+					draft: draftId
+				}), {
+					loading: `Restoring ${label}…`,
+					success: `Restored ${label}. You're now viewing it.`
+				});
+			} });
+		};
+		$[1] = navigate;
+		$[2] = options;
+		$[3] = projectId;
+		$[4] = restore;
+		$[5] = switchView;
+		$[6] = t1;
+	} else t1 = $[6];
+	const t2 = restore.isPending ? restore.variables?.draftId : void 0;
+	let t3;
+	if ($[7] !== t1 || $[8] !== t2) {
+		t3 = {
+			restore: t1,
+			restoring: t2
+		};
+		$[7] = t1;
+		$[8] = t2;
+		$[9] = t3;
+	} else t3 = $[9];
+	return t3;
+}
+function _temp(error) {
+	return toast.error(error.message || "Could not restore the draft");
+}
+
+//#endregion
+export { useRestoreDraft };

package/dist/features/studio/viewSwitch.js

@@ -4,6 +4,7 @@ import { c } from "react/compiler-runtime";
 import { toast } from "@camox/ui/toaster";
 
 //#region src/features/studio/viewSwitch.ts
+const SWITCH_FAILED = "Something went wrong while switching. Reload the page to try again.";
 /**
 * Tells the editor the studio heard them while it switches to another draft or locale: the
 * studio keeps showing what it showed until the next view is ready, then shows it at once.
@@ -12,7 +13,7 @@ import { toast } from "@camox/ui/toaster";
 function toastSwitch(switching, messages) {
 	toast.promise(switching, {
 		...messages,
-		error: "Something went wrong while switching. Reload the page to try again."
+		error: SWITCH_FAILED
 	});
 }
 /**
@@ -31,9 +32,10 @@ function useSwitchView() {
 	return t0;
 }
 /**
-* Switches the studio to Live once the draft it views ended, by this member, here or in another
-* tab, replacing the draft's URL entry. Called once the studio already left the draft, it does
-* nothing.
+* Switches the studio to Live once the draft it views ended or was archived, by this member, here
+* or in another tab, replacing the draft's URL entry. An ended draft's dialog already showed it
+* working, so its toast only says so once Live shows; an archived draft's toast shows meanwhile
+* too. Called once the studio already left the draft, it does nothing.
 */
 function useLeaveDraft() {
 	const $ = c(3);
@@ -41,14 +43,17 @@ function useLeaveDraft() {
 	const shown = useViewShown();
 	let t0;
 	if ($[0] !== draftScope || $[1] !== shown) {
-		t0 = (ended) => {
-			if (ended && draftScope.current() !== ended.draftId) return;
-			draftScope.leave(ended);
-			if (!ended) return;
-			const what = `Draft ${ended.outcome}`;
+		t0 = (left) => {
+			if (left && draftScope.current() !== left.draftId) return;
+			draftScope.leave(left);
+			if (!left) return;
+			if ("outcome" in left) {
+				shown().then(() => toast.success(`Draft ${left.outcome}. You're now viewing Live.`), _temp);
+				return;
+			}
 			toastSwitch(shown(), {
-				loading: `${what}. Switching to Live…`,
-				success: `${what}. You're now viewing Live.`
+				loading: "Draft archived. Switching to Live…",
+				success: "Draft archived. You're now viewing Live."
 			});
 		};
 		$[0] = draftScope;
@@ -57,6 +62,9 @@ function useLeaveDraft() {
 	} else t0 = $[2];
 	return t0;
 }
+function _temp() {
+	return toast.error(SWITCH_FAILED);
+}
 
 //#endregion
 export { useLeaveDraft, useSwitchView };

package/dist/lib/draft-scope.d.ts

@@ -1,5 +1,5 @@
 import "./locale-path.js";
 import "../features/routes/pageRuntime.js";
 import "react";
-import { EndedDraft } from "@camox/api-contract/drafts";
+import { ArchivedDraft, EndedDraft } from "@camox/api-contract/drafts";
 import { QueryClient } from "@tanstack/react-query";

package/dist/lib/draft-scope.js

@@ -136,14 +136,17 @@ function createDraftScope({ queryClient, browser }) {
 			}
 			notify("adopted");
 		},
-		leave(ended, { notice = false } = {}) {
+		leave(left, { notice = false } = {}) {
 			queryClient.invalidateQueries({ queryKey: ["camox"] });
 			pending = null;
 			current = null;
 			replaceUrl(null);
-			if (notice && ended) report({
+			if (notice && left) report("outcome" in left ? {
 				reason: "ended",
-				...ended
+				...left
+			} : {
+				reason: "archived",
+				...left
 			});
 			notify("left");
 		},

package/dist/lib/queries.js

@@ -42,8 +42,19 @@ const projectMutations = {
 		await sendFaviconChange(String(projectId), { method: "DELETE" });
 	} })
 };
+const publicationMutations = {
+	/** Starts a draft reverting a Publication (ADR 0045), named in the input. */
+	revert: () => getOrpc().publications.revert.mutationOptions(),
+	/** Clears a Publication's thread for good, named in the input (ADR 0045). */
+	clearThread: () => getOrpc().publications.clearThread.mutationOptions()
+};
 const draftMutations = {
 	publish: () => getOrpc().drafts.publish.mutationOptions(),
+	/** Archives the draft the studio views (ADR 0046). */
+	archive: () => getOrpc().drafts.archive.mutationOptions(),
+	/** Restores an archived draft, named in the input. */
+	restore: () => getOrpc().drafts.restore.mutationOptions(),
+	/** Deletes an archived draft for good, named in the input. */
 	delete: () => getOrpc().drafts.delete.mutationOptions(),
 	/** Requests the draft's overview again right away, once it failed. */
 	retryOverview: () => getOrpc().drafts.retryOverview.mutationOptions(),
@@ -138,4 +149,4 @@ const fileMutations = {
 };
 
 //#endregion
-export { blockMutations, collectionMutations, draftMutations, fileMutations, localeMutations, pageMutations, projectMutations, repeatableItemMutations, specialistMutations };
+export { blockMutations, collectionMutations, draftMutations, fileMutations, localeMutations, pageMutations, projectMutations, publicationMutations, repeatableItemMutations, specialistMutations };

package/dist/lib/studio-reads.js

@@ -197,6 +197,28 @@ const reads = {
 		fetch: ({ api, signal }, { projectId }) => api.drafts.list({ projectId }, { signal }),
 		staleTime: Infinity
 	}),
+	archivedDrafts: entry({
+		key: ({ projectId }) => [...queryKeys.drafts.archived, projectId],
+		shared: true,
+		fetch: async ({ api, signal }, { projectId }) => (await api.drafts.listArchived({ projectId }, { signal })).drafts,
+		staleTime: Infinity
+	}),
+	publications: entry({
+		key: ({ projectId }) => [...queryKeys.publications.list, projectId],
+		shared: true,
+		fetch: async ({ api, signal }, { projectId }) => (await api.publications.list({ projectId }, { signal })).publications,
+		staleTime: Infinity
+	}),
+	publication: entry({
+		key: ({ projectId, id }) => [
+			...queryKeys.publications.get,
+			projectId,
+			id
+		],
+		shared: true,
+		fetch: async ({ api, signal }, input) => (await api.publications.get(input, { signal })).publication,
+		staleTime: Infinity
+	}),
 	draft: entry({
 		key: ({ draftId }) => [...queryKeys.drafts.get, draftId],
 		shared: true,

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(13);
+	const $ = c(14);
 	let t1;
 	if ($[0] !== t0) {
 		t1 = t0 === void 0 ? {} : t0;
 		$[0] = t0;
 		$[1] = t1;
 	} else t1 = $[1];
-	const { onDraftEnded, onRevision } = t1;
+	const { onDraftEnded, onDraftArchived, 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] !== onRevision || $[7] !== projectId || $[8] !== studioCache || $[9] !== t3 || $[10] !== t4 || $[11] !== t5) {
+	if ($[5] !== onDraftArchived || $[6] !== onDraftEnded || $[7] !== onRevision || $[8] !== projectId || $[9] !== studioCache || $[10] !== t3 || $[11] !== t4 || $[12] !== t5) {
 		t6 = {
 			...t3,
 			party: "project-room",
@@ -63,8 +63,13 @@ function useProjectRoom(apiUrl, projectId, studioCache, t0) {
 					onDraftEnded?.(ended);
 					return;
 				}
+				if (data.type === "draftArchived") {
+					const { type: _type_0, ...archived } = data;
+					onDraftArchived?.(archived);
+					return;
+				}
 				if (data.type === "revision") {
-					const { type: _type_0, ...revision } = data;
+					const { type: _type_1, ...revision } = data;
 					onRevision?.(revision);
 					return;
 				}
@@ -78,15 +83,16 @@ function useProjectRoom(apiUrl, projectId, studioCache, t0) {
 				}, DEBOUNCE_MS);
 			}
 		};
-		$[5] = onDraftEnded;
-		$[6] = onRevision;
-		$[7] = projectId;
-		$[8] = studioCache;
-		$[9] = t3;
-		$[10] = t4;
-		$[11] = t5;
-		$[12] = t6;
-	} else t6 = $[12];
+		$[5] = onDraftArchived;
+		$[6] = onDraftEnded;
+		$[7] = onRevision;
+		$[8] = projectId;
+		$[9] = studioCache;
+		$[10] = t3;
+		$[11] = t4;
+		$[12] = t5;
+		$[13] = t6;
+	} else t6 = $[13];
 	usePartySocket(t6);
 }
 

package/dist/lib/use-thread.js

@@ -147,7 +147,7 @@ function useThread(apiUrl, projectId, draftId, t0) {
 					if (asked(frame_1.startedDraft)) {
 						handedOff.set(threadKey(apiUrl, projectId, frame_1.startedDraft.draftId), {
 							sent,
-							view: runOf(threadViewOf(latest.current))
+							...!frame_1.startedDraft.restored && { view: runOf(threadViewOf(latest.current)) }
 						});
 						onEnterDraft?.(frame_1.startedDraft.draftId);
 					}

package/dist/package.js

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