@protobase/server 0.21.11 → 0.21.12

package/dist/check-views.js

@@ -7,7 +7,7 @@ import { mapDisplayErrors, mapErrors } from "./view-map.js";
 import { relatedColumnErrors } from "./view-related-column.js";
 import { editableErrors } from "./view-editable.js";
 import { conditionProblems } from "@protobase/layout";
-import { actionInputErrors, addressErrors, addressPlaceholders, boardErrors, calendarErrors, chartFields, displayFields, fieldRefsIn, hrefField, hrefPlaceholders, linkActionError, promptError, promptFields } from "@protobase/schema/internal";
+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);
@@ -152,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),

package/dist/view-access.js

@@ -158,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: recordWhenShape(resource, models),
+		when,
 		fields: shapes.list(shapes.field, { nonEmpty: true })
-	}, { requires: ["fields", "when"] }),
-	sidebar: shapes.object({
-		kind: shapes.data,
-		fields: shapes.list(shapes.field, { nonEmpty: true }),
-		when: recordWhenShape(resource, models)
-	}, { requires: ["fields", "when"] }),
-	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.11",
+  "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.11",
-    "@protobase/query": "0.21.11",
-    "@protobase/schema": "0.21.11",
+    "@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",