@protobase/server 0.22.3 → 0.22.5

package/dist/check-view-queries.js

@@ -1,4 +1,5 @@
 import { isGroupChart } from "@protobase/schema/internal";
+import { checkFilter, parseFilter } from "@protobase/schema";
 //#region src/check-view-queries.ts
 const widgetName = {
 	facets: "facets filter",
@@ -17,16 +18,26 @@ const listSortErrors = (model, view) => (view.list?.sort ?? []).flatMap(([name])
 	if (!field) return [`the list sorts by "${name}", which is not a field of ${model.name}`];
 	return field.sortable ? [] : [`the list sorts by "${name}", which is not sortable, so the API refuses it: mark "${name}" .sortable()`];
 });
+const listFilterErrors = (model, view) => {
+	const source = view.list?.filter;
+	if (source === void 0) return [];
+	const parsed = parseFilter(source);
+	if (!parsed.ok) return parsed.errors.map((error) => `the list's filter: ${error.message}`);
+	if (!parsed.ast) return [];
+	const checked = checkFilter(model, parsed.ast);
+	return checked.ok ? [] : checked.errors.map((error) => `the list's filter: ${error.message}`);
+};
 const searchErrors = (model, view) => (view.list?.search ?? []).filter((name) => !(model.search ?? []).includes(name)).map((name) => `the list searches "${name}", which ${model.name} does not search: add it to the resource's .search(...)`);
 /**
 * What a view asks the API for that its resource does not allow, which the API refuses only once a page asks: a filter
-* widget or the chart on a field that is not `.filterable()`, a list sorted by one that is not `.sortable()`, and a list
+* widget or the chart on a field that is not `.filterable()`, a list sorted by one that is not `.sortable()`, a list filter that does not parse or check, and a list
 * search on a field the resource does not search. The server's startup checks the rest of a view.
 */
 const viewQueryErrors = (view, model) => [
 	...view.filters.flatMap((widget) => filterableErrors(model, widget.kind === "flags" ? widget.fields : [widget.field], `the ${widgetName[widget.kind]}`)),
 	...view.chart ? filterableErrors(model, [isGroupChart(view.chart) ? view.chart.groupBy : view.chart.field], "the chart") : [],
 	...listSortErrors(model, view),
+	...listFilterErrors(model, view),
 	...searchErrors(model, view)
 ];
 /** Throws one error listing what every view asks for that its resource does not allow; views of unknown resources are left to the other checks. */

package/dist/view-access.js

@@ -130,32 +130,38 @@ const listShape = (resource, model, models, prompted) => shapes.object({
 			props: shapes.refs
 		}, { requires: ["props"] })
 	})),
+	filter: shapes.data,
 	default: shapes.data
 }, { after: tidyList(model) });
 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) => {

package/package.json

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