@protobase/server 0.63.4 → 0.64.0

package/dist/assistant/batch-approval.js

@@ -10,7 +10,10 @@ const batchApproval = ({ text, described, operations, before, softDeletes }) =>
 	}]] : []));
 	const refName = ({ $ref }) => {
 		const created = creates.get($ref);
-		return created ? text.fromWrite(resourceLabel(described(created.resource)), created.index + 1) : `"${shown($ref)}"`;
+		return created ? text("fromWrite", {
+			resource: resourceLabel(described(created.resource)),
+			write: created.index + 1
+		}) : `"${shown($ref)}"`;
 	};
 	const dataOf = (data) => Object.fromEntries(Object.entries(data).map(([name, value]) => [name, isRef(value) ? refName(value) : value]));
 	const nameOf = (operation, index) => {
@@ -24,34 +27,34 @@ const batchApproval = ({ text, described, operations, before, softDeletes }) =>
 			const { action, fields } = createChange(text, resource, dataOf(operation.data));
 			return {
 				label: label(action),
-				value: joined(fields, text.noFields)
+				value: joined(fields, text("noFields"))
 			};
 		}
 		if (operation.op === "update") {
 			const { action, fields } = updateChange(text, resource, nameOf(operation, index), before.get(index) ?? {}, dataOf(operation.data));
 			return {
 				label: label(action),
-				value: joined(fields, text.noChanges)
+				value: joined(fields, text("noChanges"))
 			};
 		}
 		return {
-			label: label(text.deleteAction(nameOf(operation, index))),
-			value: softDeletes.has(operation.resource) ? text.restorable : text.permanent
+			label: label(text("deleteAction", { record: nameOf(operation, index) })),
+			value: softDeletes.has(operation.resource) ? text("restorable") : text("permanent")
 		};
 	};
 	const permanent = operations.filter((operation) => operation.op === "delete" && !softDeletes.has(operation.resource)).length;
 	const rest = operations.length - 50;
 	return {
-		title: text.batchTitle(operations.length),
+		title: text("batchTitle", { count: operations.length }),
 		body: [
-			...permanent > 0 ? [text.permanentDeletes(permanent)] : [],
-			text.allOrNone,
-			...rest > 0 ? [text.moreWrites(rest)] : []
+			...permanent > 0 ? [text("permanentDeletes", { count: permanent })] : [],
+			text("allOrNone"),
+			...rest > 0 ? [text("moreWrites", { count: rest })] : []
 		].join("\n"),
 		fields: operations.slice(0, 50).map(entryOf),
 		tone: permanent > 0 ? "danger" : "warning",
-		approveLabel: text.writeAll,
-		rejectLabel: text.reject
+		approveLabel: text("writeAll"),
+		rejectLabel: text("reject")
 	};
 };
 //#endregion

package/dist/assistant/write-messages.js

@@ -1,61 +1,6 @@
-import { defineMessages } from "../locale/messages.js";
+import { messages } from "../locale/messages.js";
 //#region src/assistant/write-messages.ts
 /** The texts of the approvals the write tools ask for, which the user reads in their client. */
-const writeText = defineMessages({
-	en: {
-		createAction: (resource, title) => `Create ${resource}${title === void 0 ? "" : ` "${title}"`}`,
-		updateAction: (record) => `Update ${record}`,
-		deleteAction: (record) => `Delete ${record}`,
-		asked: (action) => `${action}?`,
-		batchTitle: (count) => `Run ${count} ${count === 1 ? "write" : "writes"} in one transaction?`,
-		allOrNone: "Either all of them are written or none.",
-		permanentDeletes: (count) => `${count} ${count === 1 ? "delete cannot" : "deletes cannot"} be undone: those records are removed for good.`,
-		moreWrites: (count) => `And ${count} more ${count === 1 ? "write" : "writes"}, not listed.`,
-		fromWrite: (resource, write) => `the ${resource} from write ${write}`,
-		writeAll: "Write all",
-		noFields: "No fields.",
-		commentTitle: (record) => `Comment on ${record}?`,
-		comment: "Comment",
-		create: "Create",
-		update: "Update",
-		delete: "Delete",
-		deleteForGood: "Delete for good",
-		reject: "Cancel",
-		noChanges: "No field changes.",
-		restorable: "It can be restored: the record is kept, marked deleted.",
-		permanent: "This cannot be undone: the record is removed for good.",
-		empty: "empty",
-		hidden: "hidden",
-		yes: "Yes",
-		no: "No"
-	},
-	nl: {
-		createAction: (resource, title) => `${resource}${title === void 0 ? "" : ` "${title}"`} aanmaken`,
-		updateAction: (record) => `${record} bijwerken`,
-		deleteAction: (record) => `${record} verwijderen`,
-		asked: (action) => `${action}?`,
-		batchTitle: (count) => `${count} ${count === 1 ? "schrijfactie" : "schrijfacties"} in één transactie uitvoeren?`,
-		allOrNone: "Ze worden allemaal opgeslagen of geen enkele.",
-		permanentDeletes: (count) => `${count} ${count === 1 ? "verwijdering kan" : "verwijderingen kunnen"} niet ongedaan worden gemaakt: die records worden definitief verwijderd.`,
-		moreWrites: (count) => `En nog ${count} ${count === 1 ? "schrijfactie" : "schrijfacties"}, niet vermeld.`,
-		fromWrite: (resource, write) => `de ${resource} uit schrijfactie ${write}`,
-		writeAll: "Alles opslaan",
-		noFields: "Geen velden.",
-		commentTitle: (record) => `Reageren op ${record}?`,
-		comment: "Reageren",
-		create: "Aanmaken",
-		update: "Bijwerken",
-		delete: "Verwijderen",
-		deleteForGood: "Definitief verwijderen",
-		reject: "Annuleren",
-		noChanges: "Er verandert geen veld.",
-		restorable: "Het kan worden teruggezet: het record blijft bewaard, gemarkeerd als verwijderd.",
-		permanent: "Dit kan niet ongedaan worden gemaakt: het record wordt definitief verwijderd.",
-		empty: "leeg",
-		hidden: "verborgen",
-		yes: "Ja",
-		no: "Nee"
-	}
-});
+const writeText = messages("assistant/write");
 //#endregion
 export { writeText };

package/dist/assistant/write-prompts.js

@@ -18,9 +18,9 @@ const resourceLabel = ({ name, view }) => shown(view?.names?.singular ?? humaniz
 const fieldLabel = ({ view }, name) => shown(view?.fields[name]?.label ?? humanize(name));
 const shownValue = (text, described, name, value) => {
 	const field = described.model?.fields[name];
-	if (field?.sensitive) return text.hidden;
-	if (value === null || value === void 0) return text.empty;
-	if (typeof value === "boolean") return value ? text.yes : text.no;
+	if (field?.sensitive) return text("hidden");
+	if (value === null || value === void 0) return text("empty");
+	if (typeof value === "boolean") return value ? text("yes") : text("no");
 	if (field?.type === "enum" && typeof value === "string") return shown(enumLabel(value, described.view?.fields[name]?.valueLabels));
 	if (typeof value === "string") return shown(value);
 	if (typeof value === "number" || typeof value === "bigint") return String(value);
@@ -38,9 +38,13 @@ const titleOfNew = (described, data) => {
 	return title === "" ? void 0 : title;
 };
 const same = (before, after) => JSON.stringify(before ?? null) === JSON.stringify(after ?? null);
+const createAction = (text, resource, title) => title === void 0 ? text("createAction", { resource }) : text("createNamedAction", {
+	resource,
+	title
+});
 /** A create as one change: `Create Task "Fix the sign-in lockout"`, and each field the new record is given by its label. */
 const createChange = (text, described, data) => ({
-	action: text.createAction(resourceLabel(described), titleOfNew(described, data)),
+	action: createAction(text, resourceLabel(described), titleOfNew(described, data)),
 	fields: Object.entries(data).map(([name, value]) => ({
 		label: fieldLabel(described, name),
 		value: shownValue(text, described, name, value)
@@ -60,7 +64,7 @@ const updateChange = (text, described, record, current, data) => {
 		};
 	});
 	return {
-		action: text.updateAction(record),
+		action: text("updateAction", { record }),
 		fields
 	};
 };
@@ -68,37 +72,37 @@ const updateChange = (text, described, record, current, data) => {
 const createApproval = (text, described, data) => {
 	const { action, fields } = createChange(text, described, data);
 	return {
-		title: text.asked(action),
+		title: text("asked", { action }),
 		fields,
-		approveLabel: text.create,
-		rejectLabel: text.reject
+		approveLabel: text("create"),
+		rejectLabel: text("reject")
 	};
 };
 /** `Update Task #42 "Fix the sign-in lockout"?`, with each field that changes, or saying none does. */
 const updateApproval = (text, described, key, current, data) => {
 	const { action, fields } = updateChange(text, described, recordName(described, key, current), current, data);
 	return {
-		title: text.asked(action),
-		...fields.length > 0 ? { fields } : { body: text.noChanges },
-		approveLabel: text.update,
-		rejectLabel: text.reject
+		title: text("asked", { action }),
+		...fields.length > 0 ? { fields } : { body: text("noChanges") },
+		approveLabel: text("update"),
+		rejectLabel: text("reject")
 	};
 };
 /** `Delete Task #42 "Fix the sign-in lockout"?`, saying whether it can be restored (a soft delete) or is gone for good. */
 const deleteApproval = (text, described, key, current, restorable) => ({
-	title: text.asked(text.deleteAction(recordName(described, key, current))),
-	body: restorable ? text.restorable : text.permanent,
+	title: text("asked", { action: text("deleteAction", { record: recordName(described, key, current) }) }),
+	body: restorable ? text("restorable") : text("permanent"),
 	tone: restorable ? "warning" : "danger",
-	approveLabel: restorable ? text.delete : text.deleteForGood,
-	rejectLabel: text.reject
+	approveLabel: restorable ? text("delete") : text("deleteForGood"),
+	rejectLabel: text("reject")
 });
 const hiddenInComment = /[\p{Cf}\p{Zl}\p{Zp}]|[^\P{Cc}\n]/gu;
 /** `Comment on Task #42 "Fix the sign-in lockout"?`, with the whole comment, as it will be posted. */
 const commentApproval = (text, described, key, current, comment) => ({
-	title: text.commentTitle(recordName(described, key, current)),
+	title: text("commentTitle", { record: recordName(described, key, current) }),
 	body: comment.trim().replace(hiddenInComment, " "),
-	approveLabel: text.comment,
-	rejectLabel: text.reject
+	approveLabel: text("comment"),
+	rejectLabel: text("reject")
 });
 //#endregion
 export { commentApproval, createApproval, createChange, deleteApproval, describedResource, recordName, resourceLabel, shown, updateApproval, updateChange };

package/dist/check-views.js

@@ -50,6 +50,13 @@ const valueColorErrors = (view, model) => Object.entries(view.fields).flatMap(([
 	if (field?.type !== "enum") return [`value colours of "${name}" need an enum field`];
 	return Object.keys(hints.valueColors).filter((value) => !field.enumValues?.includes(value)).map((value) => `value colour "${value}" is not a value of "${name}"`);
 });
+const numberHintErrors = (view, model) => Object.entries(view.fields).flatMap(([name, hints]) => {
+	const field = model.fields[name];
+	if (!field) return [];
+	const currency = hints.currency !== void 0 && field.type !== "decimal" ? [`currency of "${name}" needs a decimal field, not ${field.type}`] : [];
+	const signed = hints.format === "signed" && field.type !== "integer" && field.type !== "bigint" ? [`format('signed') of "${name}" needs an integer field, not ${field.type}`] : [];
+	return [...currency, ...signed];
+});
 const textHints = ["multiline", "markdown"];
 const textFormats = /* @__PURE__ */ new Set([
 	"email",
@@ -181,6 +188,7 @@ const checkViews = (registry, views, pages = [], fieldTypes = {}) => {
 			...valueLabelErrors(view, model),
 			...valueColorErrors(view, model),
 			...textHintErrors(view, model),
+			...numberHintErrors(view, model),
 			...listEditErrors(view, model),
 			...widgetErrors(view, model, fieldTypes),
 			...related,

package/dist/locale/en.js

@@ -0,0 +1,37 @@
+//#region src/locale/en.json
+var en_default = {
+	"assistant/write": {
+		"createAction": "Create {resource}",
+		"updateAction": "Update {record}",
+		"deleteAction": "Delete {record}",
+		"asked": "{action}?",
+		"batchTitle": "Run {count, plural, one {# write} other {# writes}} in one transaction?",
+		"allOrNone": "Either all of them are written or none.",
+		"permanentDeletes": "{count, plural, one {# delete cannot} other {# deletes cannot}} be undone: those records are removed for good.",
+		"moreWrites": "And {count} more {count, plural, one {write} other {writes}}, not listed.",
+		"fromWrite": "the {resource} from write {write}",
+		"writeAll": "Write all",
+		"noFields": "No fields.",
+		"commentTitle": "Comment on {record}?",
+		"comment": "Comment",
+		"create": "Create",
+		"update": "Update",
+		"delete": "Delete",
+		"deleteForGood": "Delete for good",
+		"reject": "Cancel",
+		"noChanges": "No field changes.",
+		"restorable": "It can be restored: the record is kept, marked deleted.",
+		"permanent": "This cannot be undone: the record is removed for good.",
+		"empty": "empty",
+		"hidden": "hidden",
+		"yes": "Yes",
+		"no": "No",
+		"createNamedAction": "Create {resource} \"{title}\""
+	},
+	"mcp/approval": {
+		"cannotAsk": "This client cannot ask you to approve a change, so nothing was written; use a client that supports MCP elicitation.",
+		"approve": "Approve"
+	}
+};
+//#endregion
+export { en_default as default };

package/dist/locale/messages.js

@@ -1,8 +1,30 @@
+import en_default from "./en.js";
+import nl_default from "./nl.js";
+import { IntlMessageFormat } from "intl-messageformat";
 //#region src/locale/messages.ts
+const catalogues = {
+	en: en_default,
+	nl: nl_default
+};
+const formatTags = {
+	en: "en-GB",
+	nl: "nl-NL"
+};
+const compiled = /* @__PURE__ */ new Map();
+const formatOf = (locale, namespace, id) => {
+	const key = `${locale}\0${namespace}\0${id}`;
+	const cached = compiled.get(key);
+	if (cached) return cached;
+	const source = catalogues[locale][namespace][id];
+	if (source === void 0) throw new Error(`No text ${namespace}.${id} in ${locale}`);
+	const format = new IntlMessageFormat(source, formatTags[locale]);
+	compiled.set(key, format);
+	return format;
+};
 /**
-* An area's built-in texts in every language the screens come in: the lookup gives those of one locale, as the server
-* has no single active one. Dutch must translate every English text, which the types check.
+* An area's built-in texts: the lookup gives those of one locale, as the server has no single active one,
+* `text('en')('approve')` or `text(locale)('batchTitle', { count: 3 })`.
 */
-const defineMessages = (catalogue) => (locale) => catalogue[locale];
+const messages = (namespace) => (locale) => (id, values) => formatOf(locale, namespace, id).format(values);
 //#endregion
-export { defineMessages };
+export { catalogues, messages };

package/dist/locale/nl.js

@@ -0,0 +1,37 @@
+//#region src/locale/nl.json
+var nl_default = {
+	"assistant/write": {
+		"createAction": "{resource} aanmaken",
+		"updateAction": "{record} bijwerken",
+		"deleteAction": "{record} verwijderen",
+		"asked": "{action}?",
+		"batchTitle": "{count, plural, one {# schrijfactie} other {# schrijfacties}} in één transactie uitvoeren?",
+		"allOrNone": "Ze worden allemaal opgeslagen of geen enkele.",
+		"permanentDeletes": "{count, plural, one {# verwijdering kan} other {# verwijderingen kunnen}} niet ongedaan worden gemaakt: die records worden definitief verwijderd.",
+		"moreWrites": "En nog {count} {count, plural, one {schrijfactie} other {schrijfacties}}, niet vermeld.",
+		"fromWrite": "de {resource} uit schrijfactie {write}",
+		"writeAll": "Alles opslaan",
+		"noFields": "Geen velden.",
+		"commentTitle": "Reageren op {record}?",
+		"comment": "Reageren",
+		"create": "Aanmaken",
+		"update": "Bijwerken",
+		"delete": "Verwijderen",
+		"deleteForGood": "Definitief verwijderen",
+		"reject": "Annuleren",
+		"noChanges": "Er verandert geen veld.",
+		"restorable": "Het kan worden teruggezet: het record blijft bewaard, gemarkeerd als verwijderd.",
+		"permanent": "Dit kan niet ongedaan worden gemaakt: het record wordt definitief verwijderd.",
+		"empty": "leeg",
+		"hidden": "verborgen",
+		"yes": "Ja",
+		"no": "Nee",
+		"createNamedAction": "{resource} \"{title}\" aanmaken"
+	},
+	"mcp/approval": {
+		"cannotAsk": "Deze client kan je niet vragen een wijziging goed te keuren, dus er is niets opgeslagen; gebruik een client die MCP-elicitation ondersteunt.",
+		"approve": "Goedkeuren"
+	}
+};
+//#endregion
+export { nl_default as default };

package/dist/mcp/mcp-approval.js

@@ -1,4 +1,4 @@
-import { defineMessages } from "../locale/messages.js";
+import { messages } from "../locale/messages.js";
 import { inputRequired, inputResponse } from "@modelcontextprotocol/server";
 //#region src/mcp/mcp-approval.ts
 /** Thrown by `approve` over MCP when the request carries no answer yet: the server then asks the client for one. */
@@ -42,20 +42,11 @@ const messageOf = (request) => [
 	request.fields?.map(({ label, value }) => `${label}: ${value}`).join("\n"),
 	request.code
 ].filter(Boolean).join("\n\n");
-const text = defineMessages({
-	en: {
-		cannotAsk: "This client cannot ask you to approve a change, so nothing was written; use a client that supports MCP elicitation.",
-		approve: "Approve"
-	},
-	nl: {
-		cannotAsk: "Deze client kan je niet vragen een wijziging goed te keuren, dus er is niets opgeslagen; gebruik een client die MCP-elicitation ondersteunt.",
-		approve: "Goedkeuren"
-	}
-});
+const text = messages("mcp/approval");
 const cannotAsk = (locale) => ({
 	content: [{
 		type: "text",
-		text: text(locale).cannotAsk
+		text: text(locale)("cannotAsk")
 	}],
 	isError: true
 });
@@ -74,7 +65,7 @@ const approvalAsked = async (request, capabilities, ask, locale = "en") => {
 				type: "object",
 				properties: { approve: {
 					type: "boolean",
-					title: request.approveLabel ?? text(locale).approve
+					title: request.approveLabel ?? text(locale)("approve")
 				} },
 				required: ["approve"]
 			}

package/dist/package.js

@@ -1,4 +1,4 @@
 //#region package.json
-var version = "0.63.4";
+var version = "0.64.0";
 //#endregion
 export { version };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@protobase/server",
-  "version": "0.63.4",
+  "version": "0.64.0",
   "description": "The Protobase REST API as a Hono app, with Better Auth sign-in.",
   "license": "Apache-2.0",
   "repository": {
@@ -42,9 +42,9 @@
     "@better-auth/sso": "^1.7.12",
     "@livekit/protocol": "1.53.1",
     "@modelcontextprotocol/server": "^2.3.1",
-    "@protobase/layout": "0.63.4",
-    "@protobase/query": "0.63.4",
-    "@protobase/schema": "0.63.4",
+    "@protobase/layout": "0.64.0",
+    "@protobase/query": "0.64.0",
+    "@protobase/schema": "0.64.0",
     "@react-email/render": "^2.1.0",
     "@scalar/hono-api-reference": "^0.12.10",
     "@sentry/core": "^11.7.0",
@@ -57,6 +57,7 @@
     "file-type": "^22.1.1",
     "hono": "^4.13.13",
     "image-size": "^2.0.4",
+    "intl-messageformat": "^12.1.4",
     "jose": "^6.2.12",
     "kysely": "^0.29.6",
     "nodemailer": "^10.0.16",