@protobase/server 0.21.10 → 0.21.12

package/dist/check-views.js

@@ -6,7 +6,9 @@ import { chartErrors } from "./view-chart.js";
 import { mapDisplayErrors, mapErrors } from "./view-map.js";
 import { relatedColumnErrors } from "./view-related-column.js";
 import { editableErrors } from "./view-editable.js";
-import { actionInputErrors, addressErrors, addressPlaceholders, boardErrors, calendarErrors, chartFields, displayFields, fieldRefsIn, hrefField, hrefPlaceholders, linkActionError, promptError, promptFields } from "@protobase/schema/internal";
+import { conditionProblems } from "@protobase/layout";
+import { actionInputErrors, addressErrors, addressPlaceholders, boardErrors, calendarErrors, chartFields, displayFields, fieldRefsIn, hrefField, hrefPlaceholders, layoutItems, linkActionError, promptError, promptFields } from "@protobase/schema/internal";
+import { isRecordCondition } from "@protobase/schema";
 //#region src/check-views.ts
 const linkFields = (run) => run?.kind !== "link" ? [] : "to" in run ? addressPlaceholders(run.to) : hrefPlaceholders(run.href);
 const actionFields = (run) => {
@@ -123,6 +125,12 @@ const galleryErrors = (item, resource, model, models) => {
 	const image = item.image === void 0 ? void 0 : model.fields[item.image];
 	return [...image && image.type !== "file" ? [`"${item.image}" is not a file field`] : [], ...item.photos ? cardPhotosErrors(item.photos, resource, models).map((error) => `photos: ${error}`) : []];
 };
+const conditionErrors = (view, models) => view.layout.flatMap((item) => {
+	if (item.kind !== "section" && item.kind !== "sidebar" && item.kind !== "related") return [];
+	if (!isRecordCondition(item.when)) return [];
+	const place = item.kind === "sidebar" ? "sidebar" : `${item.kind} "${item.title}"`;
+	return conditionProblems(item.when, view.resource, models).map((error) => `${place}: ${error}`);
+});
 const listOfErrors = (model, name, models) => {
 	const target = models[model.fields[name]?.relation?.resource ?? ""];
 	if (!target) return [`"${name}" points at no resource of the app`];
@@ -133,7 +141,7 @@ const listOfErrors = (model, name, models) => {
 * field the resource does not have, labels or colours values its enum does not have, shows a field with a field type of
 * `fieldTypes` (each with the storage types it shows) that does not show it,
 * edits a list column in its cell that is not a field with an editor of one line the API may write,
-* has a related section or related list column, a cards display's or gallery's photos or a cards display's favorite button, a `listOf`, a "Save search" button or a
+* has a section, related section or sidebar whose `when` condition names what the app does not have, a related section or related list column, a cards display's or gallery's photos or a cards display's favorite button, a `listOf`, a "Save search" button or a
 * `searchesOf` that do not fit the resources, cards
 * displays of one list that name different photos, a chart per value that cannot group or add up its fields, a map that cannot show the
 * record's position or a map display that cannot find the records in its view, a board whose columns are no filterable enum, a calendar whose dates are no filterable date or timestamp fields, a link to an address the app does not have, an AI action that cannot write its field, action inputs that do not fit, or a create page that is not one of `pages`.
@@ -144,7 +152,7 @@ const checkViews = (registry, views, pages = [], fieldTypes = {}) => {
 	const problems = views.flatMap((view) => {
 		const model = models[view.resource];
 		if (!model) return [];
-		const related = [...view.layout.flatMap((item) => item.kind === "related" ? relatedErrors(item, view.resource, models).map((error) => `related "${item.title}": ${error}`) : []), ...relatedColumnsErrors(view, model, models)];
+		const related = [...layoutItems(view.layout).flatMap((item) => item.kind === "related" ? relatedErrors(item, view.resource, models).map((error) => `related "${item.title}": ${error}`) : []), ...relatedColumnsErrors(view, model, models)];
 		const photos = [
 			...(view.list?.displays ?? []).flatMap((display) => display.kind === "cards" && display.photos ? cardPhotosErrors(display.photos, view.resource, models).map((error) => `display "${display.name}" photos: ${error}`) : []),
 			...sharedPhotosErrors(view),
@@ -168,6 +176,7 @@ const checkViews = (registry, views, pages = [], fieldTypes = {}) => {
 			...listEditErrors(view, model),
 			...widgetErrors(view, model, fieldTypes),
 			...related,
+			...conditionErrors(view, models),
 			...photos,
 			...favorites,
 			...listOf,

package/dist/view-access.js

@@ -3,10 +3,12 @@ import { cardPhotosErrors } from "./view-card-photos.js";
 import { cardFavoriteErrors } from "./view-card-favorite.js";
 import { searchesOfFor } from "./view-saved-search.js";
 import { relatedColumnErrors } from "./view-related-column.js";
-import { resolveFieldPath } from "@protobase/layout";
+import { conditionReadable, resolveFieldPath } from "@protobase/layout";
 import { addressErrors, chartFields, hrefPlaceholders, navRecentErrors, promptFields, pruneByShape, shapes, tableDisplay } from "@protobase/schema/internal";
+import { isRecordCondition } from "@protobase/schema";
 //#region src/view-access.ts
 const pruneRelated = (item, resource, models) => {
+	if (isRecordCondition(item.when) && !conditionReadable(item.when, resource, models)) return void 0;
 	const { columns, open, ...rest } = item;
 	const visible = models[item.resource] ? columns?.filter((column) => resolveFieldPath(models, item.resource, column).ok) : void 0;
 	const narrowed = visible && visible.length > 0 ? {
@@ -22,6 +24,7 @@ const pruneRelated = (item, resource, models) => {
 	} : narrowed;
 	return relatedErrors(opened, resource, models).length === 0 ? opened : void 0;
 };
+const recordWhenShape = (resource, models) => shapes.map((when) => isRecordCondition(when) && !conditionReadable(when, resource, models) ? void 0 : when);
 const pruneGallery = (item, resource, model, models) => {
 	const image = item.image !== void 0 && Object.hasOwn(model.fields, item.image) ? item.image : void 0;
 	const photos = item.photos && cardPhotosErrors(item.photos, resource, models).length === 0 ? item.photos : void 0;
@@ -155,52 +158,67 @@ const widgetShape = shapes.oneOf({
 		label: shapes.data
 	}, { requires: ["fields"] })
 });
-const layoutShape = (resource, model, models) => shapes.oneOf({
-	section: shapes.object({
+const layoutShape = (resource, model, models) => {
+	const when = recordWhenShape(resource, models);
+	const section = shapes.object({
 		kind: shapes.data,
 		title: shapes.data,
 		help: shapes.data,
 		helpWhen: shapes.data,
 		presentation: shapes.data,
-		when: shapes.data,
+		when,
 		fields: shapes.list(shapes.field, { nonEmpty: true })
-	}, { requires: ["fields"] }),
-	sidebar: shapes.object({
-		kind: shapes.data,
-		fields: shapes.list(shapes.field, { nonEmpty: true }),
-		when: shapes.data
-	}, { requires: ["fields"] }),
-	related: shapes.map((item) => pruneRelated(item, resource, models)),
-	custom: shapes.object({
-		kind: shapes.data,
-		component: shapes.data,
-		title: shapes.data,
-		sidebar: shapes.data,
-		when: shapes.data,
-		props: shapes.refs
-	}, { requires: ["props"] }),
-	map: shapes.object({
-		kind: shapes.data,
-		title: shapes.data,
-		latitude: shapes.field,
-		longitude: shapes.field,
-		zoom: shapes.data,
-		sidebar: shapes.data,
-		when: shapes.data
-	}, { requires: ["latitude", "longitude"] }),
-	gallery: shapes.map((item) => pruneGallery(item, resource, model, models)),
-	history: shapes.object({
-		kind: shapes.data,
-		title: shapes.data,
-		limit: shapes.data,
-		when: shapes.data
-	}),
-	comments: shapes.object({
-		kind: shapes.data,
-		title: shapes.data,
-		when: shapes.data
-	})
-});
+	}, { requires: ["fields", "when"] });
+	const related = shapes.map((item) => pruneRelated(item, resource, models));
+	return shapes.oneOf({
+		section,
+		sidebar: shapes.object({
+			kind: shapes.data,
+			fields: shapes.list(shapes.field, { nonEmpty: true }),
+			when
+		}, { requires: ["fields", "when"] }),
+		related,
+		group: shapes.object({
+			kind: shapes.data,
+			title: shapes.data,
+			collapsed: shapes.data,
+			when,
+			items: shapes.list(shapes.oneOf({
+				section,
+				related
+			}), { nonEmpty: true })
+		}, { requires: ["items", "when"] }),
+		custom: shapes.object({
+			kind: shapes.data,
+			component: shapes.data,
+			title: shapes.data,
+			sidebar: shapes.data,
+			when: shapes.data,
+			props: shapes.refs
+		}, { requires: ["props"] }),
+		map: shapes.object({
+			kind: shapes.data,
+			title: shapes.data,
+			latitude: shapes.field,
+			longitude: shapes.field,
+			zoom: shapes.data,
+			sidebar: shapes.data,
+			when: shapes.data
+		}, { requires: ["latitude", "longitude"] }),
+		gallery: shapes.map((item) => pruneGallery(item, resource, model, models)),
+		history: shapes.object({
+			kind: shapes.data,
+			title: shapes.data,
+			limit: shapes.data,
+			when: shapes.data
+		}),
+		comments: shapes.object({
+			kind: shapes.data,
+			title: shapes.data,
+			when: shapes.data
+		})
+	});
+};
 const linkShape = (model, models) => shapes.map((run) => {
 	return ("to" in run ? addressErrors(run.to, {
 		models,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@protobase/server",
-  "version": "0.21.10",
+  "version": "0.21.12",
   "description": "The Protobase REST API as a Hono app, with Better Auth sign-in.",
   "license": "Apache-2.0",
   "repository": {
@@ -31,9 +31,9 @@
   "dependencies": {
     "@better-auth/passkey": "^1.7.7",
     "@better-auth/sso": "^1.7.7",
-    "@protobase/layout": "0.21.10",
-    "@protobase/query": "0.21.10",
-    "@protobase/schema": "0.21.10",
+    "@protobase/layout": "0.21.12",
+    "@protobase/query": "0.21.12",
+    "@protobase/schema": "0.21.12",
     "@react-email/render": "^2.1.0",
     "@scalar/hono-api-reference": "^0.12.10",
     "@sentry/core": "^11.7.0",