@abinnovision/payloadcms-mcpx 2.0.0-beta.18 → 2.0.0-beta.20

package/dist/admin/capability-toggles.mjs

@@ -1,15 +1,16 @@
-import { STORED_OPERATIONS, cellPath, toolPath } from "../api-keys/capability-matrix.mjs";
+import { ACCESS_CHAIN, STORED_OPERATIONS, requiresOf } from "../capabilities.mjs";
+import { cellPath, rowOperations, toolPath } from "../api-keys/capability-matrix.mjs";
 //#region src/admin/capability-toggles.ts
 /**
 * How far a key may go with an entity. Each level includes the ones before it.
-*/ const ACCESS_LEVELS = [
-	"none",
-	"read",
-	"write",
-	"publish"
-];
+*/ const ACCESS_LEVELS = ["none", ...ACCESS_CHAIN.map(({ id }) => id)];
+const toolGranted = (values, basePath, name) => values[toolPath(basePath, name)] === true;
+const cellGranted = (values, basePath, namespace, row, operation) => values[cellPath(basePath, namespace, row.fieldName, operation)] === true;
+/**
+* One value per stored operation.
+*/ const byOperation = (valueOf) => Object.fromEntries(STORED_OPERATIONS.map(({ id }) => [id, valueOf(id)]));
 const toolsState = (matrix, basePath, values) => {
-	const granted = matrix.tools.filter((tool) => values[toolPath(basePath, tool.name)] === true).length;
+	const granted = matrix.tools.filter((tool) => toolGranted(values, basePath, tool.name)).length;
 	if (granted === 0) return "off";
 	return granted === matrix.tools.length ? "on" : "mixed";
 };
@@ -21,24 +22,19 @@ const toolsState = (matrix, basePath, values) => {
 * config exposes. A write without a read reads as none, as on the server.
 */ const accessLevelOf = (basePath, namespace, row, values) => {
 	let reached = "none";
-	for (const level of ACCESS_LEVELS) {
-		if (level === "none") continue;
-		if (!row[level] || values[cellPath(basePath, namespace, row.fieldName, level)] !== true) break;
-		reached = level;
+	for (const { id } of ACCESS_CHAIN) {
+		if (!row[id] || !cellGranted(values, basePath, namespace, row, id)) break;
+		reached = id;
 	}
 	return reached;
 };
 /**
 * The delete mode a row's stored flags read as.
 */ const deleteModeOf = (basePath, namespace, row, values) => {
-	const granted = (operation) => values[cellPath(basePath, namespace, row.fieldName, operation)] === true;
+	const granted = (operation) => cellGranted(values, basePath, namespace, row, operation);
 	if (!granted("read") || !granted("delete")) return "off";
 	return row.deleteUnattended && granted("deleteUnattended") ? "trash" : "approve";
 };
-const requiresOf = (operation) => {
-	const found = STORED_OPERATIONS.find((candidate) => candidate.id === operation);
-	return found && "requires" in found ? found.requires : void 0;
-};
 const prerequisitesOf = (operation) => {
 	const required = requiresOf(operation);
 	return required ? [required, ...prerequisitesOf(required)] : [];
@@ -50,18 +46,18 @@ const reconcile = (next, touched) => {
 	return result;
 };
 const rowActions = (basePath, namespace, row, values, changes) => {
-	const current = Object.fromEntries(STORED_OPERATIONS.map((operation) => [operation.id, values[cellPath(basePath, namespace, row.fieldName, operation.id)] === true]));
+	const current = byOperation((operation) => cellGranted(values, basePath, namespace, row, operation));
 	const touched = /* @__PURE__ */ new Set();
 	const next = { ...current };
-	for (const operation of STORED_OPERATIONS) {
+	for (const operation of rowOperations(row)) {
 		const change = changes[operation.id];
-		if (change !== void 0 && row[operation.id]) {
+		if (change !== void 0) {
 			next[operation.id] = change;
 			touched.add(operation.id);
 		}
 	}
 	const reconciled = reconcile(next, touched);
-	return STORED_OPERATIONS.filter((operation) => row[operation.id] && reconciled[operation.id] !== current[operation.id]).map((operation) => ({
+	return rowOperations(row).filter((operation) => reconciled[operation.id] !== current[operation.id]).map((operation) => ({
 		type: "UPDATE",
 		path: cellPath(basePath, namespace, row.fieldName, operation.id),
 		value: reconciled[operation.id]
@@ -69,11 +65,7 @@ const rowActions = (basePath, namespace, row, values, changes) => {
 };
 const grantsOf = (level) => {
 	const rank = ACCESS_LEVELS.indexOf(level);
-	return {
-		read: rank >= 1,
-		write: rank >= 2,
-		publish: rank >= 3
-	};
+	return Object.fromEntries(ACCESS_CHAIN.map(({ id }, i) => [id, rank > i]));
 };
 /**
 * The form-state updates one click implies, as literal actions. Every click
@@ -84,7 +76,7 @@ const grantsOf = (level) => {
 * nothing does not mark the form modified. A level above a row's ceiling
 * grants what the row exposes and no more.
 */ const buildToggleActions = (matrix, basePath, values, intent) => {
-	if (intent.kind === "tool" || intent.kind === "tools") return matrix.tools.filter((tool) => intent.kind === "tools" || tool.name === intent.name).filter((tool) => values[toolPath(basePath, tool.name)] === true !== intent.value).map((tool) => ({
+	if (intent.kind === "tool" || intent.kind === "tools") return matrix.tools.filter((tool) => intent.kind === "tools" || tool.name === intent.name).filter((tool) => toolGranted(values, basePath, tool.name) !== intent.value).map((tool) => ({
 		type: "UPDATE",
 		path: toolPath(basePath, tool.name),
 		value: intent.value
@@ -96,22 +88,23 @@ const grantsOf = (level) => {
 	};
 	return rows.flatMap((row) => rowActions(basePath, intent.namespace, row, values, changes));
 };
+const firstNoop = (candidates, matrix, basePath, values, intentOf) => candidates.find((candidate) => buildToggleActions(matrix, basePath, values, intentOf(candidate)).length === 0);
 /**
 * The level a namespace's "All" control shows: the one that would change
 * nothing if picked, so rows capped below it still count. `undefined` while
 * the rows differ.
-*/ const allAccessLevel = (matrix, basePath, namespace, values) => ACCESS_LEVELS.find((level) => buildToggleActions(matrix, basePath, values, {
+*/ const allAccessLevel = (matrix, basePath, namespace, values) => firstNoop(ACCESS_LEVELS, matrix, basePath, values, (level) => ({
 	kind: "access",
 	namespace,
 	level
-}).length === 0);
+}));
 /**
 * The delete mode the "All" control shows, by the same rule. It offers no
 * trash, so a row that trashes directly reads as mixed.
-*/ const allDeleteMode = (matrix, basePath, namespace, values) => ["off", "approve"].find((mode) => buildToggleActions(matrix, basePath, values, {
+*/ const allDeleteMode = (matrix, basePath, namespace, values) => firstNoop(["off", "approve"], matrix, basePath, values, (mode) => ({
 	kind: "deleteMode",
 	namespace,
 	mode
-}).length === 0);
+}));
 //#endregion
 export { accessLevelOf, accessLevelsOf, allAccessLevel, allDeleteMode, buildToggleActions, deleteModeOf, toolsState };

package/dist/admin/confirmations-panel.mjs

@@ -1,5 +1,5 @@
 "use client";
-import { jsx, jsxs } from "react/jsx-runtime";
+import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 import { Button } from "@payloadcms/ui";
 //#region src/admin/confirmations-panel.tsx
 /**
@@ -58,11 +58,42 @@ const styles = {
 		gap: "calc(var(--base) * 0.5)"
 	}
 };
+const HEADS = [
+	"Collection",
+	"Document",
+	"Effect",
+	"Reason"
+];
 const groupsOf = (confirmations) => {
 	const groups = /* @__PURE__ */ new Map();
-	for (const confirmation of confirmations) groups.set(confirmation.group, [...groups.get(confirmation.group) ?? [], confirmation]);
+	for (const confirmation of confirmations) {
+		const entries = groups.get(confirmation.group) ?? [];
+		entries.push(confirmation);
+		groups.set(confirmation.group, entries);
+	}
 	return [...groups];
 };
+const DecisionButtons = ({ approve, busy, onDecide, reject, small = false }) => /*#__PURE__*/ jsxs(Fragment, { children: [/*#__PURE__*/ jsx(Button, {
+	buttonStyle: "primary",
+	disabled: busy,
+	margin: false,
+	onClick: () => {
+		onDecide("approved");
+	},
+	size: small ? "small" : "medium",
+	type: "button",
+	children: approve
+}), /*#__PURE__*/ jsx(Button, {
+	buttonStyle: "secondary",
+	disabled: busy,
+	margin: false,
+	onClick: () => {
+		onDecide("rejected");
+	},
+	size: small ? "small" : "medium",
+	type: "button",
+	children: reject
+})] });
 const approveAllLabel = (confirmations) => {
 	const permanent = confirmations.filter((confirmation) => confirmation.summary.permanent).length;
 	return permanent === 0 ? `Approve all (${String(confirmations.length)})` : `Approve all (${String(confirmations.length)}, ${String(permanent)} permanent)`;
@@ -124,29 +155,17 @@ const Row = ({ busy, confirmation, onDecide }) => {
 			}),
 			/*#__PURE__*/ jsx("td", {
 				style: cell,
-				children: /*#__PURE__*/ jsxs("div", {
+				children: /*#__PURE__*/ jsx("div", {
 					style: styles.actions,
-					children: [/*#__PURE__*/ jsx(Button, {
-						buttonStyle: "primary",
-						disabled: busy,
-						margin: false,
-						onClick: () => {
-							onDecide([handle], "approved");
-						},
-						size: "small",
-						type: "button",
-						children: "Approve"
-					}), /*#__PURE__*/ jsx(Button, {
-						buttonStyle: "secondary",
-						disabled: busy,
-						margin: false,
-						onClick: () => {
-							onDecide([handle], "rejected");
+					children: /*#__PURE__*/ jsx(DecisionButtons, {
+						approve: "Approve",
+						busy,
+						onDecide: (decision) => {
+							onDecide([handle], decision);
 						},
-						size: "small",
-						type: "button",
-						children: "Reject"
-					})]
+						reject: "Reject",
+						small: true
+					})
 				})
 			})
 		]
@@ -177,63 +196,34 @@ const Row = ({ busy, confirmation, onDecide }) => {
 					children: group
 				}), /*#__PURE__*/ jsxs("table", {
 					style: styles.table,
-					children: [/*#__PURE__*/ jsx("thead", { children: /*#__PURE__*/ jsxs("tr", { children: [
-						/*#__PURE__*/ jsx("th", {
-							scope: "col",
-							style: styles.head,
-							children: "Collection"
-						}),
-						/*#__PURE__*/ jsx("th", {
-							scope: "col",
-							style: styles.head,
-							children: "Document"
-						}),
-						/*#__PURE__*/ jsx("th", {
-							scope: "col",
-							style: styles.head,
-							children: "Effect"
-						}),
-						/*#__PURE__*/ jsx("th", {
-							scope: "col",
-							style: styles.head,
-							children: "Reason"
-						}),
-						/*#__PURE__*/ jsx("th", {
-							scope: "col",
-							style: styles.head,
-							children: /*#__PURE__*/ jsx("span", {
-								className: "sr-only",
-								children: "Decision"
-							})
+					children: [/*#__PURE__*/ jsx("thead", { children: /*#__PURE__*/ jsxs("tr", { children: [HEADS.map((head) => /*#__PURE__*/ jsx("th", {
+						scope: "col",
+						style: styles.head,
+						children: head
+					}, head)), /*#__PURE__*/ jsx("th", {
+						scope: "col",
+						style: styles.head,
+						children: /*#__PURE__*/ jsx("span", {
+							className: "sr-only",
+							children: "Decision"
 						})
-					] }) }), /*#__PURE__*/ jsx("tbody", { children: entries.map((confirmation) => /*#__PURE__*/ jsx(Row, {
+					})] }) }), /*#__PURE__*/ jsx("tbody", { children: entries.map((confirmation) => /*#__PURE__*/ jsx(Row, {
 						busy,
 						confirmation,
 						onDecide
 					}, confirmation.handle)) })]
 				})]
 			}, group)),
-			/*#__PURE__*/ jsxs("div", {
+			/*#__PURE__*/ jsx("div", {
 				style: styles.footer,
-				children: [/*#__PURE__*/ jsx(Button, {
-					buttonStyle: "primary",
-					disabled: busy,
-					margin: false,
-					onClick: () => {
-						onDecide(handles, "approved");
-					},
-					type: "button",
-					children: approveAllLabel(confirmations)
-				}), /*#__PURE__*/ jsx(Button, {
-					buttonStyle: "secondary",
-					disabled: busy,
-					margin: false,
-					onClick: () => {
-						onDecide(handles, "rejected");
+				children: /*#__PURE__*/ jsx(DecisionButtons, {
+					approve: approveAllLabel(confirmations),
+					busy,
+					onDecide: (decision) => {
+						onDecide(handles, decision);
 					},
-					type: "button",
-					children: "Reject all"
-				})]
+					reject: "Reject all"
+				})
 			})
 		]
 	});

package/dist/admin/confirmations.mjs

@@ -1,6 +1,7 @@
 "use client";
 import { CONFIRMATIONS_PATH } from "../api-keys/confirmation-view.mjs";
 import { ConfirmationsPanel, confirmationRowId } from "./confirmations-panel.mjs";
+import { endpointUrl } from "./endpoint-url.mjs";
 import { jsx } from "react/jsx-runtime";
 import { toast, useConfig, useDocumentInfo } from "@payloadcms/ui";
 import { useCallback, useEffect, useState } from "react";
@@ -15,7 +16,7 @@ import { useCallback, useEffect, useState } from "react";
 	const [confirmations, setConfirmations] = useState([]);
 	const [busy, setBusy] = useState(false);
 	const [version, setVersion] = useState(0);
-	const url = `${config.serverURL}${config.routes.api}${endpointPath}${CONFIRMATIONS_PATH}`;
+	const url = `${endpointUrl(config.serverURL, config.routes.api, endpointPath)}${CONFIRMATIONS_PATH}`;
 	useEffect(() => {
 		if (id === void 0) return;
 		let active = true;

package/dist/admin/endpoint-url.mjs

@@ -0,0 +1,7 @@
+//#region src/admin/endpoint-url.ts
+/**
+* The plugin endpoint's URL below the API route, without a doubled slash
+* after the origin.
+*/ const endpointUrl = (origin, apiRoute, endpointPath) => `${origin.replace(/\/+$/, "")}${apiRoute}${endpointPath}`;
+//#endregion
+export { endpointUrl };

package/dist/admin/setup-guide.mjs

@@ -1,4 +1,5 @@
 "use client";
+import { endpointUrl } from "./endpoint-url.mjs";
 import { buildSetupGuide } from "../api-keys/setup-guide.mjs";
 import { jsx, jsxs } from "react/jsx-runtime";
 import { CopyToClipboard, useConfig, useDocumentInfo, useFormFields } from "@payloadcms/ui";
@@ -48,7 +49,7 @@ const styles = {
 	const origin = useOrigin(config.serverURL);
 	if (id === void 0) return null;
 	const sections = buildSetupGuide({
-		endpointUrl: `${origin.replace(/\/+$/, "")}${config.routes.api}${endpointPath}`,
+		endpointUrl: endpointUrl(origin, config.routes.api, endpointPath),
 		apiKey: asString(apiKey),
 		label: asString(label)
 	});

package/dist/api-keys/capability-matrix.d.mts

@@ -1,20 +1,17 @@
+import { McpxEntityCapabilities } from "../types.mjs";
 import "../options.mjs";
+import "../capabilities.mjs";
 //#region src/api-keys/capability-matrix.d.ts
 /**
  * One entity's row. The booleans say what the plugin config exposes, not what
  * the key was granted. A `false` leaves its segment out of the row's controls.
  */
-export interface CapabilityRow {
+export interface CapabilityRow extends McpxEntityCapabilities {
   fieldName: string;
   /**
    * The slug, which is what MCP clients send and what refusals name.
    */
-  label: string;
-  read: boolean;
-  write: boolean;
-  publish: boolean;
-  delete: boolean;
-  deleteUnattended: boolean;
+  slug: string;
   /**
    * Writes go live immediately, as the entity keeps no drafts.
    */

package/dist/api-keys/capability-matrix.mjs

@@ -1,62 +1,23 @@
-import { CAPABILITIES_FIELD, canPublish, canWrite, isLiveWrite } from "../capabilities.mjs";
+import { CAPABILITIES_FIELD, STORED_OPERATIONS } from "../capabilities.mjs";
 //#region src/api-keys/capability-matrix.ts
 /**
 * The group's `admin.description`, rendered by the matrix in Payload's
-* description slot. It explains how to read the segmented controls.
-*/ const CAPABILITIES_DESCRIPTION = "What this key may do. Each level includes the ones before it, and a missing segment means the plugin config does not expose it.";
-/**
-* The operations a collection or global can expose. The generated checkboxes
-* and the matrix segments share this wording. `requires` names the
-* operation a grant depends on, which the server and the matrix both enforce.
-*/ const CAPABILITY_OPERATIONS = [
-	{
-		id: "read",
-		label: "Read",
-		description: "Describe, find and read."
-	},
-	{
-		id: "write",
-		label: "Write",
-		description: "Create, patch and validate drafts.",
-		requires: "read"
-	},
-	{
-		id: "publish",
-		label: "Publish",
-		description: "Promote the current draft to what the public sees.",
-		requires: "write"
-	},
-	{
-		id: "delete",
-		label: "Delete",
-		description: "Delete documents. Each one is approved by this key's user in the admin panel, unless the config allows trashing directly and this key is set to.",
-		requires: "read"
-	}
-];
-/**
-* Stored as a checkbox of its own but drawn as the Trash segment of the Delete
-* control.
-*/ const DELETE_UNATTENDED = {
-	id: "deleteUnattended",
-	label: "Trash directly",
-	description: "Move documents to trash without asking this key's user.",
-	requires: "delete"
-};
-/**
-* Every operation with a stored checkbox: the capability operations plus
-* the unattended delete.
-*/ const STORED_OPERATIONS = [...CAPABILITY_OPERATIONS, DELETE_UNATTENDED];
+* description slot. It explains how to read the controls.
+*/ const CAPABILITIES_DESCRIPTION = "What this key may do. Each level includes the ones before it, and a missing segment means the plugin config does not expose it. A shield means this key's user approves each call.";
 const toRow = (entity) => ({
 	fieldName: entity.fieldName,
-	label: entity.slug,
+	slug: entity.slug,
 	read: entity.read,
-	write: canWrite(entity),
-	publish: canPublish(entity),
+	write: entity.write,
+	publish: entity.publish,
 	delete: entity.delete,
 	deleteUnattended: entity.deleteUnattended,
-	...isLiveWrite(entity) ? { live: true } : {}
+	...entity.liveWrite ? { live: true } : {}
 });
 /**
+* The operations a row exposes, in stored order.
+*/ const rowOperations = (row) => STORED_OPERATIONS.filter((operation) => row[operation.id]);
+/**
 * The single description of what the config exposes. `createCapabilityFields`
 * and the admin component both draw from it, so a control cannot appear without a
 * field behind it.
@@ -72,6 +33,6 @@ const cellPath = (basePath, namespace, fieldName, operation) => `${basePath}.${n
 const toolPath = (basePath, name) => `${basePath}.tools.${name}`;
 /**
 * Every path the matrix can address, in a stable order.
-*/ const capabilityPaths = (matrix, basePath = CAPABILITIES_FIELD) => [...["collections", "globals"].flatMap((namespace) => matrix[namespace].flatMap((row) => STORED_OPERATIONS.filter((operation) => row[operation.id]).map((operation) => cellPath(basePath, namespace, row.fieldName, operation.id)))), ...matrix.tools.map((tool) => toolPath(basePath, tool.name))];
+*/ const capabilityPaths = (matrix, basePath = CAPABILITIES_FIELD) => [...["collections", "globals"].flatMap((namespace) => matrix[namespace].flatMap((row) => rowOperations(row).map((operation) => cellPath(basePath, namespace, row.fieldName, operation.id)))), ...matrix.tools.map((tool) => toolPath(basePath, tool.name))];
 //#endregion
-export { CAPABILITIES_DESCRIPTION, CAPABILITY_OPERATIONS, STORED_OPERATIONS, capabilityPaths, cellPath, createCapabilityMatrix, toolPath };
+export { CAPABILITIES_DESCRIPTION, capabilityPaths, cellPath, createCapabilityMatrix, rowOperations, toolPath };

package/dist/api-keys/collection.mjs

@@ -1,4 +1,4 @@
-import { createCapabilityFields, createConfirmationFields, createKeyFields, withSetupGuideTab } from "./fields.mjs";
+import { SERVER_ONLY, createCapabilityFields, createConfirmationFields, createKeyFields, withKeyTabs } from "./fields.mjs";
 import { generateApiKey, hashApiKey } from "./key.mjs";
 //#region src/api-keys/collection.ts
 /**
@@ -37,22 +37,15 @@ import { generateApiKey, hashApiKey } from "./key.mjs";
 			delete: ownKeysOnly
 		},
 		hooks: { beforeChange: [keyBeforeChange] },
-		fields: [...createConfirmationFields(options), ...withSetupGuideTab([
-			{
-				name: "user",
-				type: "relationship",
-				relationTo: userCollection,
-				required: true,
-				access: {
-					create: () => false,
-					update: () => false
-				},
-				defaultValue: ({ req }) => isUser({ req }) ? req.user?.id : void 0,
-				admin: { description: "The user this key acts as." }
-			},
-			...createKeyFields(),
-			...createCapabilityFields(options)
-		], options)]
+		fields: [...createConfirmationFields(options), ...withKeyTabs([{
+			name: "user",
+			type: "relationship",
+			relationTo: userCollection,
+			required: true,
+			access: SERVER_ONLY,
+			defaultValue: ({ req }) => isUser({ req }) ? req.user?.id : void 0,
+			admin: { description: "The user this key acts as." }
+		}, ...createKeyFields()], createCapabilityFields(options), options)]
 	};
 };
 //#endregion

package/dist/api-keys/confirmation-view.mjs

@@ -2,5 +2,6 @@
 /**
 * Path of the confirmations endpoints below the plugin's endpoint path.
 */ const CONFIRMATIONS_PATH = "/confirmations";
+const DECISIONS = ["approved", "rejected"];
 //#endregion
-export { CONFIRMATIONS_PATH };
+export { CONFIRMATIONS_PATH, DECISIONS };