@protobase/server 0.22.9 → 0.22.11

package/dist/check-views.js

@@ -29,9 +29,9 @@ const sensitiveErrors = (view, model) => {
 		["a list display", (view.list?.displays ?? []).flatMap(displayFields)],
 		["a filter", view.filters.flatMap((widget) => widget.kind === "flags" ? widget.fields : [widget.field])],
 		["the chart", view.chart ? chartFields(view.chart) : []],
-		["the sidebar", view.layout.flatMap((item) => item.kind === "sidebar" ? item.fields : [])],
-		["a map", view.layout.flatMap((item) => item.kind === "map" ? [item.latitude, item.longitude] : [])],
-		["a gallery", view.layout.flatMap((item) => item.kind === "gallery" && item.image !== void 0 ? [item.image] : [])],
+		["the sidebar", layoutItems(view.layout).flatMap((item) => item.kind === "sidebar" ? item.fields : [])],
+		["a map", layoutItems(view.layout).flatMap((item) => item.kind === "map" ? [item.latitude, item.longitude] : [])],
+		["a gallery", layoutItems(view.layout).flatMap((item) => item.kind === "gallery" && item.image !== void 0 ? [item.image] : [])],
 		["the recent records", view.nav?.recent ? [view.nav.recent.status] : []],
 		["an action", view.actions.flatMap((action) => actionFields(action.run))]
 	].flatMap(([place, names]) => [...new Set(names.filter(sensitive))].map((name) => `sensitive field "${name}" cannot be in ${place}`));
@@ -99,8 +99,8 @@ const unknownFieldErrors = (view, model) => {
 	const unknown = (names, what) => names.filter((name) => !Object.hasOwn(model.fields, name)).map((name) => `${what} names field "${name}", which ${model.name} does not have`);
 	return [
 		...(view.list?.displays ?? []).flatMap((display) => unknown(displayFields(display), `display "${display.name}"`)),
-		...view.layout.flatMap((item) => item.kind === "custom" ? unknown(fieldRefsIn(item.props), `custom section ${item.component}`) : []),
-		...view.layout.flatMap((item) => item.kind === "gallery" && item.image !== void 0 ? unknown([item.image], `gallery "${item.title}"`) : [])
+		...layoutItems(view.layout).flatMap((item) => item.kind === "custom" ? unknown(fieldRefsIn(item.props), `custom section ${item.component}`) : []),
+		...layoutItems(view.layout).flatMap((item) => item.kind === "gallery" && item.image !== void 0 ? unknown([item.image], `gallery "${item.title}"`) : [])
 	];
 };
 const widgetErrors = (view, model, fieldTypes) => Object.entries(view.fields).flatMap(([name, hints]) => {
@@ -127,7 +127,7 @@ 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) => {
+const conditionErrors = (view, models) => layoutItems(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}"`;
@@ -156,17 +156,17 @@ const checkViews = (registry, views, pages = [], fieldTypes = {}) => {
 		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),
-			...view.layout.flatMap((item) => item.kind === "gallery" ? galleryErrors(item, view.resource, model, models).map((error) => `gallery "${item.title}": ${error}`) : [])
+			...layoutItems(view.layout).flatMap((item) => item.kind === "gallery" ? galleryErrors(item, view.resource, model, models).map((error) => `gallery "${item.title}": ${error}`) : [])
 		];
 		const favorites = (view.list?.displays ?? []).flatMap((display) => display.kind === "cards" && display.favorite ? [...cardFavoriteErrors(display.favorite, view.resource, models), ...favoriteOwnerErrors(display.favorite, models)].map((error) => `display "${display.name}" favorite: ${error}`) : []);
 		const listOf = view.listOf === void 0 ? [] : listOfErrors(model, view.listOf, models).map((error) => `listOf: ${error}`);
 		const searches = [...view.saveSearch ? saveSearchErrors(view.saveSearch, view.resource, models, views).map((error) => `saveSearch: ${error}`) : [], ...view.searchesOf ? searchesOfErrors(view.searchesOf, view.resource, models).map((error) => `searchesOf: ${error}`) : []];
-		const maps = [...view.layout.flatMap((item) => item.kind === "map" ? mapErrors(item, model).map((error) => `map "${item.title}": ${error}`) : []), ...(view.list?.displays ?? []).flatMap((display) => display.kind === "map" ? mapDisplayErrors(display, model).map((error) => `display "${display.name}": ${error}`) : [])];
+		const maps = [...layoutItems(view.layout).flatMap((item) => item.kind === "map" ? mapErrors(item, model).map((error) => `map "${item.title}": ${error}`) : []), ...(view.list?.displays ?? []).flatMap((display) => display.kind === "map" ? mapDisplayErrors(display, model).map((error) => `display "${display.name}": ${error}`) : [])];
 		const boards = (view.list?.displays ?? []).flatMap((display) => display.kind === "board" ? boardErrors(display, model).map((error) => `display "${display.name}": ${error}`) : []);
 		const calendars = (view.list?.displays ?? []).flatMap((display) => display.kind === "calendar" ? calendarErrors(display, model).map((error) => `display "${display.name}": ${error}`) : []);
 		const chart = view.chart ? chartErrors(view.chart, model).map((error) => `chart: ${error}`) : [];
-		const history = model.history ? [] : view.layout.flatMap((item) => item.kind === "history" ? [`history "${item.title}" needs .history() on resource "${view.resource}"`] : []);
-		const comments = model.comments ? [] : view.layout.flatMap((item) => item.kind === "comments" ? [`comments "${item.title}" needs .comments() on resource "${view.resource}"`] : []);
+		const history = model.history ? [] : layoutItems(view.layout).flatMap((item) => item.kind === "history" ? [`history "${item.title}" needs .history() on resource "${view.resource}"`] : []);
+		const comments = model.comments ? [] : layoutItems(view.layout).flatMap((item) => item.kind === "comments" ? [`comments "${item.title}" needs .comments() on resource "${view.resource}"`] : []);
 		return [
 			...sensitiveErrors(view, model),
 			...unknownFieldErrors(view, model),

package/dist/view-access.js

@@ -176,13 +176,8 @@ const layoutShape = (resource, model, models) => {
 		fields: shapes.list(shapes.field, { nonEmpty: true })
 	}, { requires: ["fields", "when"] });
 	const related = shapes.map((item) => pruneRelated(item, resource, models));
-	return shapes.oneOf({
+	const main = {
 		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,
@@ -223,6 +218,19 @@ const layoutShape = (resource, model, models) => {
 			title: shapes.data,
 			when: shapes.data
 		})
+	};
+	return shapes.oneOf({
+		...main,
+		sidebar: shapes.object({
+			kind: shapes.data,
+			fields: shapes.list(shapes.field, { nonEmpty: true }),
+			when
+		}, { requires: ["fields", "when"] }),
+		tab: shapes.object({
+			kind: shapes.data,
+			title: shapes.data,
+			items: shapes.list(shapes.oneOf(main), { nonEmpty: true })
+		}, { requires: ["items"] })
 	});
 };
 const linkShape = (model, models) => shapes.map((run) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@protobase/server",
-  "version": "0.22.9",
+  "version": "0.22.11",
   "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.22.9",
-    "@protobase/query": "0.22.9",
-    "@protobase/schema": "0.22.9",
+    "@protobase/layout": "0.22.11",
+    "@protobase/query": "0.22.11",
+    "@protobase/schema": "0.22.11",
     "@react-email/render": "^2.1.0",
     "@scalar/hono-api-reference": "^0.12.10",
     "@sentry/core": "^11.7.0",