@protobase/server 0.22.4 → 0.22.6

package/dist/check-view-queries.js

@@ -1,4 +1,4 @@
-import { isGroupChart } from "@protobase/schema/internal";
+import { isGroupChart, viewOfList } from "@protobase/schema/internal";
 import { checkFilter, parseFilter } from "@protobase/schema";
 //#region src/check-view-queries.ts
 const widgetName = {
@@ -45,7 +45,8 @@ const checkViewQueries = (models, views) => {
 	const byName = new Map(models.map((model) => [model.name, model]));
 	const problems = views.flatMap((view) => {
 		const model = byName.get(view.resource);
-		return model ? viewQueryErrors(view, model).map((problem) => `View "${view.resource}": ${problem}`) : [];
+		if (!model) return [];
+		return [...viewQueryErrors(view, model).map((problem) => `View "${view.resource}": ${problem}`), ...(view.lists ?? []).flatMap((named) => viewQueryErrors(viewOfList(view, named.name), model).map((problem) => `View "${view.resource}" list "${named.name}": ${problem}`))];
 	});
 	if (problems.length > 0) throw new Error(`The views ask for what their resources do not allow:\n${problems.map((problem) => `  - ${problem}`).join("\n")}`);
 };

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, layoutItems, linkActionError, promptError, promptFields, updateSetErrors } from "@protobase/schema/internal";
+import { actionInputErrors, addressErrors, addressPlaceholders, boardErrors, calendarErrors, chartFields, displayFields, fieldRefsIn, hrefField, hrefPlaceholders, layoutItems, linkActionError, promptError, promptFields, updateSetErrors, viewOfList } 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);
@@ -151,9 +151,7 @@ const listOfErrors = (model, name, models) => {
 const checkViews = (registry, views, pages = [], fieldTypes = {}) => {
 	const models = Object.fromEntries(registry.entries.map((entry) => [entry.name, entry.model]));
 	const pageNames = new Set(pages);
-	const problems = views.flatMap((view) => {
-		const model = models[view.resource];
-		if (!model) return [];
+	const viewProblems = (view, model) => {
 		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}`) : []),
@@ -193,7 +191,16 @@ const checkViews = (registry, views, pages = [], fieldTypes = {}) => {
 			...aiActionErrors(view, model),
 			...inputErrors(view, models),
 			...createErrors(view, pageNames)
-		].map((problem) => `View "${view.resource}": ${problem}`);
+		];
+	};
+	const problems = views.flatMap((view) => {
+		const model = models[view.resource];
+		if (!model) return [];
+		return [...viewProblems(view, model).map((problem) => `View "${view.resource}": ${problem}`), ...(view.lists ?? []).flatMap((named) => viewProblems({
+			...viewOfList(view, named.name),
+			layout: [],
+			actions: []
+		}, model).map((problem) => `View "${view.resource}" list "${named.name}": ${problem}`))];
 	});
 	if (problems.length > 0) throw new Error(`The views do not match the resources:\n${problems.map((problem) => `  - ${problem}`).join("\n")}`);
 };

package/dist/view-access.js

@@ -137,26 +137,31 @@ const widgetShape = shapes.oneOf({
 	range: shapes.object({
 		kind: shapes.data,
 		field: shapes.field,
-		histogram: shapes.data
+		histogram: shapes.data,
+		secondary: shapes.data
 	}, { requires: ["field"] }),
 	facets: shapes.object({
 		kind: shapes.data,
 		field: shapes.field,
-		search: shapes.data
+		search: shapes.data,
+		secondary: shapes.data
 	}, { requires: ["field"] }),
 	dateRange: shapes.object({
 		kind: shapes.data,
 		field: shapes.field,
-		presets: shapes.data
+		presets: shapes.data,
+		secondary: shapes.data
 	}, { requires: ["field"] }),
 	toggle: shapes.object({
 		kind: shapes.data,
-		field: shapes.field
+		field: shapes.field,
+		secondary: shapes.data
 	}, { requires: ["field"] }),
 	flags: shapes.object({
 		kind: shapes.data,
 		fields: shapes.list(shapes.field, { nonEmpty: true }),
-		label: shapes.data
+		label: shapes.data,
+		secondary: shapes.data
 	}, { requires: ["fields"] })
 });
 const layoutShape = (resource, model, models) => {
@@ -250,41 +255,54 @@ const actionShape = (model, models) => shapes.object({
 	}),
 	inputs: inputsShape(models)
 }, { requires: ["run", "inputs"] });
-const viewShape = (resource, model, models, prompted) => shapes.object({
-	resource: shapes.data,
-	roles: shapes.data,
-	title: shapes.field,
-	searchResult: shapes.object({
-		title: shapes.list(shapes.field, { nonEmpty: true }),
-		subtitle: shapes.field
-	}),
-	nav: shapes.object({
+const viewShape = (resource, model, models, prompted) => {
+	const nav = shapes.object({
 		hidden: shapes.data,
 		group: shapes.data,
 		order: shapes.data,
 		recent: shapes.map((recent) => navRecentErrors(recent, model).length === 0 ? recent : void 0)
-	}),
-	names: shapes.data,
-	icon: shapes.data,
-	help: shapes.data,
-	fields: shapes.keys(),
-	list: listShape(resource, model, models, prompted),
-	filters: shapes.list(widgetShape),
-	layout: shapes.list(layoutShape(resource, model, models)),
-	chart: shapes.map((chart) => chartFields(chart).every((name) => Object.hasOwn(model.fields, name)) ? chart : void 0),
-	recordMode: shapes.data,
-	helpWhen: shapes.data,
-	saveFeedback: shapes.data,
-	actions: shapes.list(actionShape(model, models)),
-	listOf: shapes.field,
-	signIn: shapes.data,
-	saveSearch: shapes.map((search) => prompted.has(search.resource) || models[search.resource] ? search : void 0),
-	searchesOf: shapes.map((searches) => searchesOfFor(searches, resource, models)),
-	import: shapes.data,
-	export: shapes.data,
-	create: shapes.data,
-	forms: shapes.map(() => void 0)
-});
+	});
+	const chart = shapes.map((chart) => chartFields(chart).every((name) => Object.hasOwn(model.fields, name)) ? chart : void 0);
+	return shapes.object({
+		resource: shapes.data,
+		roles: shapes.data,
+		title: shapes.field,
+		searchResult: shapes.object({
+			title: shapes.list(shapes.field, { nonEmpty: true }),
+			subtitle: shapes.field
+		}),
+		nav,
+		names: shapes.data,
+		icon: shapes.data,
+		help: shapes.data,
+		fields: shapes.keys(),
+		list: listShape(resource, model, models, prompted),
+		filters: shapes.list(widgetShape),
+		layout: shapes.list(layoutShape(resource, model, models)),
+		chart,
+		recordMode: shapes.data,
+		helpWhen: shapes.data,
+		saveFeedback: shapes.data,
+		actions: shapes.list(actionShape(model, models)),
+		listOf: shapes.field,
+		signIn: shapes.data,
+		saveSearch: shapes.map((search) => prompted.has(search.resource) || models[search.resource] ? search : void 0),
+		searchesOf: shapes.map((searches) => searchesOfFor(searches, resource, models)),
+		import: shapes.data,
+		export: shapes.data,
+		create: shapes.data,
+		forms: shapes.map(() => void 0),
+		lists: shapes.list(shapes.object({
+			name: shapes.data,
+			names: shapes.data,
+			nav,
+			help: shapes.data,
+			list: listShape(resource, model, models, prompted),
+			filters: shapes.list(widgetShape),
+			chart
+		}))
+	});
+};
 /**
 * The view with every reference to a field the caller cannot read removed: list columns, sort, search and displays,
 * field hints, filter widgets, record sections, maps, galleries and custom components' props, the chart, title and search result, the

package/package.json

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