@protobase/server 0.12.14 → 0.12.16

package/dist/check-views.js

@@ -1,4 +1,5 @@
 import { relatedErrors } from "./view-related.js";
+import { cardPhotosErrors } from "./view-card-photos.js";
 import { addressErrors, addressPlaceholders, appHrefError, displayFields, fieldRefsIn, hrefPlaceholders } from "@protobase/schema";
 //#region src/check-views.ts
 const linkFields = (run) => run?.kind !== "link" ? [] : "to" in run ? addressPlaceholders(run.to) : hrefPlaceholders(run.href);
@@ -58,7 +59,7 @@ const widgetErrors = (view, model, fieldTypes) => Object.entries(view.fields).fl
 * Fails at startup when a view uses a sensitive field where it would show empty, a display or custom section names a
 * 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,
-* has a related section that does not fit the resources, or a link to an address the app does not have.
+* has a related section or a cards display's photos that do not fit the resources, or a link to an address the app does not have.
 */
 const checkViews = (registry, views, pages = [], fieldTypes = {}) => {
 	const models = Object.fromEntries(registry.entries.map((entry) => [entry.name, entry.model]));
@@ -67,6 +68,7 @@ const checkViews = (registry, views, pages = [], fieldTypes = {}) => {
 		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}`) : []);
+		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}`) : []);
 		return [
 			...sensitiveErrors(view, model),
 			...unknownFieldErrors(view, model),
@@ -74,6 +76,7 @@ const checkViews = (registry, views, pages = [], fieldTypes = {}) => {
 			...valueColorErrors(view, model),
 			...widgetErrors(view, model, fieldTypes),
 			...related,
+			...photos,
 			...linkErrors(view, model, models, pageNames)
 		].map((problem) => `View "${view.resource}": ${problem}`);
 	});

package/dist/view-access.js

@@ -1,4 +1,5 @@
 import { relatedErrors } from "./view-related.js";
+import { cardPhotosErrors } from "./view-card-photos.js";
 import { resolveFieldPath } from "@protobase/layout";
 import { addressErrors, hrefPlaceholders, navRecentErrors, pruneByShape, shapes, tableDisplay } from "@protobase/schema";
 //#region src/view-access.ts
@@ -20,7 +21,7 @@ const keepDefault = ({ default: opens, displays, ...list }) => {
 		...opens !== void 0 && kept && { default: opens }
 	};
 };
-const listShape = shapes.object({
+const listShape = (resource, models) => shapes.object({
 	columns: shapes.list(shapes.field),
 	sort: shapes.list(shapes.tuple(shapes.field, shapes.data)),
 	search: shapes.list(shapes.field),
@@ -36,7 +37,8 @@ const listShape = shapes.object({
 			badge: shapes.field,
 			meta: shapes.list(shapes.field),
 			flags: shapes.list(shapes.field),
-			card: shapes.data
+			card: shapes.data,
+			photos: shapes.map((photos) => cardPhotosErrors(photos, resource, models).length === 0 ? photos : void 0)
 		}),
 		custom: shapes.object({
 			kind: shapes.data,
@@ -135,7 +137,7 @@ const viewShape = (resource, model, models) => shapes.object({
 	icon: shapes.data,
 	help: shapes.data,
 	fields: shapes.keys(),
-	list: listShape,
+	list: listShape(resource, models),
 	filters: shapes.list(widgetShape),
 	layout: shapes.list(layoutShape(resource, models)),
 	chart: shapes.object({

package/dist/view-card-photos.js

@@ -0,0 +1,20 @@
+import { matchErrors, sortErrors } from "./view-related.js";
+//#region src/view-card-photos.ts
+/**
+* What is wrong with the photos of a cards display on `resource`, against these models; empty when the cards can show
+* them. Against the full models it checks the config; against a caller's models, whether that caller can load them.
+*/
+const cardPhotosErrors = (photos, resource, models) => {
+	const owner = models[resource];
+	const target = models[photos.resource];
+	if (!owner || !target) return [`unknown resource "${owner ? photos.resource : resource}"`];
+	if (owner.primaryKey.length !== 1) return [`${resource} has a composite key, so its cards cannot match photos`];
+	const image = Object.hasOwn(target.fields, photos.image) ? target.fields[photos.image] : void 0;
+	return [
+		...matchErrors(target, photos.field, resource),
+		...!image ? [`unknown field "${photos.image}" on ${target.name}`] : image.type === "file" ? [] : [`"${photos.image}" on ${target.name} is not a file field`],
+		...sortErrors(target, photos.sort).map((error) => `sort: ${error}`)
+	];
+};
+//#endregion
+export { cardPhotosErrors };

package/dist/view-related.js

@@ -56,4 +56,4 @@ const relatedErrors = (item, resource, models) => {
 	];
 };
 //#endregion
-export { relatedErrors, throughKey };
+export { matchErrors, relatedErrors, sortErrors, throughKey };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@protobase/server",
-  "version": "0.12.14",
+  "version": "0.12.16",
   "description": "The Protobase REST API as a Hono app, with Better Auth sign-in.",
   "license": "Apache-2.0",
   "repository": {
@@ -30,9 +30,9 @@
   },
   "dependencies": {
     "@better-auth/passkey": "^1.7.7",
-    "@protobase/layout": "0.12.14",
-    "@protobase/query": "0.12.14",
-    "@protobase/schema": "0.12.14",
+    "@protobase/layout": "0.12.16",
+    "@protobase/query": "0.12.16",
+    "@protobase/schema": "0.12.16",
     "@scalar/hono-api-reference": "^0.12.10",
     "@sentry/core": "^11.7.0",
     "@simplewebauthn/server": "^13.3.1",