@protobase/server 0.22.13 → 0.23.1

package/dist/aggregate-groups.js

@@ -104,7 +104,7 @@ const aggregate = async (deps, entry, session, input) => {
 	if (dated) {
 		const granularity = params.granularity ?? "day";
 		const timeZone = params.time_zone ?? "UTC";
-		const range = await seriesRange(deps, access, params.group_by, params, scope);
+		const range = await seriesRange(deps, access, params.group_by, params, timeZone, scope);
 		if (params.split_by !== void 0) {
 			const split = {
 				by: params.split_by,

package/dist/aggregate-service.js

@@ -5,6 +5,7 @@ import { columnId, filterCondition, scopeConditions, tableId, whereClause } from
 import { readTransaction } from "./transactions.js";
 import { parseParams } from "./params.js";
 import { labelRequests, relatedLabels } from "./related-labels.js";
+import { rangeEnd, rangeStart } from "./range-ends.js";
 import { z } from "zod";
 import { sql } from "kysely";
 import { facetCounts, histogram, series, withoutField } from "@protobase/query";
@@ -103,22 +104,24 @@ const earliest = async (deps, access, fieldName, scope) => {
 	return (await readTransaction(deps.db, deps.statementTimeoutMs, (trx) => sql`select min(${columnId(target)})::text as lowest from ${tableId(access.full)} as t${whereClause(conditions)}`.execute(trx))).rows[0]?.lowest ?? void 0;
 };
 const bound = (model, fieldName, value) => model.fields[fieldName]?.type === "date" ? value.slice(0, 10) : value;
-/** The span a series of `field` covers: `from` and `to`, else the `range` up to now, `all` from the earliest row. */
-const seriesRange = async (deps, access, field, params, scope) => {
-	const to = params.to ?? (/* @__PURE__ */ new Date()).toISOString();
+/**
+* The span a series of `field` covers: `from` and `to`, else the `range` up to now, `all` from the earliest row. A
+* relative range of a date field runs over the days of `timeZone`, the viewer's today included.
+*/
+const seriesRange = async (deps, access, field, params, timeZone, scope) => {
 	const { model } = access;
+	const type = model.fields[field]?.type;
+	const now = Date.now();
+	const to = params.to ?? rangeEnd(type, now, timeZone);
 	if (params.from) return {
 		from: bound(model, field, params.from),
 		to: bound(model, field, to)
 	};
 	const range = params.range ?? "30d";
-	if (range !== "all") {
-		const from = (/* @__PURE__ */ new Date(Date.now() - rangeDays[range] * 864e5)).toISOString();
-		return {
-			from: bound(model, field, from),
-			to: bound(model, field, to)
-		};
-	}
+	if (range !== "all") return {
+		from: rangeStart(type, now - rangeDays[range] * 864e5, timeZone),
+		to: bound(model, field, to)
+	};
 	const lowest = await earliest(deps, access, field, scope);
 	return lowest ? {
 		from: bound(model, field, lowest),
@@ -133,8 +136,8 @@ const timeSeries = async (deps, entry, session, input) => {
 		parameter: "field",
 		message: "Unknown field"
 	}] });
-	const range = await seriesRange(deps, access, params.field, params, scope);
 	const timeZone = params.time_zone ?? "UTC";
+	const range = await seriesRange(deps, access, params.field, params, timeZone, scope);
 	const points = range ? await readTransaction(deps.db, deps.statementTimeoutMs, (trx) => series(trx, model, params.field, {
 		range,
 		granularity: params.granularity,

package/dist/range-ends.js

@@ -0,0 +1,29 @@
+import { badRequest } from "./problem.js";
+//#region src/range-ends.ts
+const dayMs = 864e5;
+/** The day an instant falls on in `zone`, as YYYY-MM-DD; an unknown zone is a bad request. */
+const dayIn = (ms, zone) => {
+	try {
+		return new Intl.DateTimeFormat("en-CA", {
+			timeZone: zone,
+			year: "numeric",
+			month: "2-digit",
+			day: "2-digit"
+		}).format(ms);
+	} catch (error) {
+		if (error instanceof RangeError) throw badRequest("invalid-parameter", `Unknown time zone "${zone}"`, { errors: [{
+			parameter: "time_zone",
+			message: "Unknown time zone"
+		}] });
+		throw error;
+	}
+};
+/** Where a range starting at instant `ms` starts: that instant, or for a date the viewer's day of it. */
+const rangeStart = (type, ms, zone) => type === "date" ? dayIn(ms, zone) : new Date(ms).toISOString();
+/** Where a range up to `now` ends, exclusive: that instant, or for a date the day after the viewer's today. */
+const rangeEnd = (type, now, zone) => {
+	if (type !== "date") return new Date(now).toISOString();
+	return new Date(Date.parse(dayIn(now, zone)) + dayMs).toISOString().slice(0, 10);
+};
+//#endregion
+export { dayIn, rangeEnd, rangeStart };

package/package.json

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