@conduction/nextcloud-vue 2.78.0 → 2.80.0

package/src/utils/boardDate.js

@@ -0,0 +1,189 @@
+/**
+ * SPDX-FileCopyrightText: 2026 Conduction B.V.
+ * SPDX-License-Identifier: EUPL-1.2
+ *
+ * boardDate: the two short time readings the drawn boards put in a table cell.
+ *
+ * - A date ("5 okt", "30 okt", "14 feb 2024"): day and short month in the
+ *   user's language, the year only when it is not the current year.
+ * - An age ("4 uur", "1 dag", "3 dagen"): how long something has been
+ *   waiting, in hours under a day and in whole calendar days after that.
+ *
+ * Both read the Nextcloud user LANGUAGE for the month and unit names. A
+ * Nextcloud account keeps its locale (date order) apart from its language,
+ * and a Dutch reader whose locale was left at the en_US default saw
+ * "Feb 14, 2024": the language decides the words, so it decides here, and the
+ * locale is only used when it is a region of that same language.
+ *
+ * @module utils/boardDate
+ * @spec openspec/changes/screens-cell-date-parity/specs/cell-date-age/spec.md
+ */
+
+import { getCanonicalLocale, getLanguage, translatePlural as n } from '@nextcloud/l10n'
+import { parseDateValue } from './dateVariant.js'
+import { compareVisibleWhen } from './visibleWhen.js'
+
+const MS_PER_HOUR = 3600000
+const MS_PER_DAY = 86400000
+
+/** Variants an age rule may name. `danger` is accepted as an alias of `error`. */
+export const AGE_VARIANTS = Object.freeze(['default', 'success', 'warning', 'error'])
+
+/**
+ * Read a language or locale tag from an @nextcloud/l10n getter, which throws
+ * when Nextcloud has not set one (outside a Nextcloud page, in a test).
+ *
+ * @param {() => string} getter `getLanguage` or `getCanonicalLocale`.
+ * @return {string} The tag with `-` separators, or ''.
+ */
+function readTag(getter) {
+	try {
+		return String(getter() || '').replace(/_/g, '-')
+	} catch {
+		return ''
+	}
+}
+
+/**
+ * The BCP 47 tag the board dates are written in: the user's locale when it is
+ * a region of the user's language (`nl-BE` for language `nl`), else the
+ * language itself.
+ *
+ * @return {string|undefined} The tag, or undefined to let Intl choose.
+ * @spec openspec/changes/screens-cell-date-parity/specs/cell-date-age/spec.md#requirement-a-board-date-cell-reads-day-and-short-month-in-the-user-language
+ */
+export function boardDateLocale() {
+	const language = readTag(getLanguage)
+	const locale = readTag(getCanonicalLocale)
+	const base = (tag) => tag.split('-')[0].toLowerCase()
+	if (language && locale && base(language) === base(locale)) {
+		return locale
+	}
+	return language || locale || undefined
+}
+
+/**
+ * A date in the board's short form: "5 okt", or "14 feb 2024" outside the
+ * current year.
+ *
+ * @param {unknown} value A Date, a timestamp or an ISO string.
+ * @param {Date} [now] The reference moment (defaults to the current time).
+ * @param {string} [locale] BCP 47 tag (defaults to `boardDateLocale()`).
+ * @return {string} The short date, or '' when the value is not a date.
+ * @spec openspec/changes/screens-cell-date-parity/specs/cell-date-age/spec.md#requirement-a-board-date-cell-reads-day-and-short-month-in-the-user-language
+ */
+export function formatBoardDate(value, now = new Date(), locale = boardDateLocale()) {
+	const date = parseDateValue(value)
+	if (date === null) {
+		return ''
+	}
+	const options = { day: 'numeric', month: 'short' }
+	if (date.getFullYear() !== now.getFullYear()) {
+		options.year = 'numeric'
+	}
+	try {
+		return new Intl.DateTimeFormat(locale, options).format(date)
+	} catch {
+		return new Intl.DateTimeFormat(undefined, options).format(date)
+	}
+}
+
+/**
+ * Whole calendar days from the date until `now` (0 today, 1 yesterday), or
+ * null when the value is not a date. A future date gives a negative number.
+ *
+ * @param {unknown} value The date.
+ * @param {Date} [now] The reference moment.
+ * @return {number|null} The day count.
+ * @spec openspec/changes/screens-cell-date-parity/specs/cell-date-age/spec.md#requirement-an-age-cell-says-how-long-something-has-waited
+ */
+export function ageInDays(value, now = new Date()) {
+	const date = parseDateValue(value)
+	if (date === null) {
+		return null
+	}
+	// UTC midnights of the two LOCAL days, so a daylight-saving hour never
+	// turns one day into zero or two.
+	const start = Date.UTC(date.getFullYear(), date.getMonth(), date.getDate())
+	const today = Date.UTC(now.getFullYear(), now.getMonth(), now.getDate())
+	return Math.round((today - start) / MS_PER_DAY)
+}
+
+/**
+ * How long something has waited: "4 uur" under 24 hours (at least 1), else
+ * "1 dag" / "3 dagen" in whole calendar days. Plural forms come from the
+ * library's own catalogue (`nextcloud-vue`). A date in the future reads as
+ * waiting no time: "0 hours".
+ *
+ * @param {unknown} value The moment the wait started.
+ * @param {Date} [now] The reference moment.
+ * @return {string} The age, or '' when the value is not a date.
+ * @spec openspec/changes/screens-cell-date-parity/specs/cell-date-age/spec.md#requirement-an-age-cell-says-how-long-something-has-waited
+ */
+export function formatAge(value, now = new Date()) {
+	const date = parseDateValue(value)
+	if (date === null) {
+		return ''
+	}
+	const elapsed = now.getTime() - date.getTime()
+	if (elapsed < MS_PER_DAY) {
+		const hours = elapsed <= 0 ? 0 : Math.max(1, Math.floor(elapsed / MS_PER_HOUR))
+		return n('nextcloud-vue', '%n hour', '%n hours', hours)
+	}
+	const days = shownAgeDays(date, now)
+	return n('nextcloud-vue', '%n day', '%n days', days)
+}
+
+/**
+ * The number of days an age cell shows: 0 under 24 hours (the cell then reads
+ * hours), else the whole calendar days, at least 1. The threshold rules
+ * compare against this number, so the colour always agrees with the text.
+ *
+ * @param {unknown} value The moment the wait started.
+ * @param {Date} [now] The reference moment.
+ * @return {number|null} The day count, or null when the value is not a date.
+ * @spec openspec/changes/screens-cell-date-parity/specs/cell-date-age/spec.md#requirement-an-age-cell-turns-red-past-its-threshold
+ */
+export function shownAgeDays(value, now = new Date()) {
+	const date = parseDateValue(value)
+	if (date === null) {
+		return null
+	}
+	if (now.getTime() - date.getTime() < MS_PER_DAY) {
+		return 0
+	}
+	return Math.max(1, ageInDays(date, now))
+}
+
+/**
+ * The variant of the first `variantWhen` rule the age in days matches, or ''
+ * when none does. Same rule shape as the `date` widget (`{ op, value,
+ * variant }`, first match wins), compared against the number of days the cell
+ * shows (`shownAgeDays`): `[{ op: "gte", value: 3, variant: "error" }]` turns a wait of three
+ * days or more red.
+ *
+ * @param {unknown} value The moment the wait started.
+ * @param {Array<{op: string, value: number, variant: string}>} rules The rules.
+ * @param {Date} [now] The reference moment.
+ * @return {string} `success | warning | error | default`, or ''.
+ * @spec openspec/changes/screens-cell-date-parity/specs/cell-date-age/spec.md#requirement-an-age-cell-turns-red-past-its-threshold
+ */
+export function resolveAgeVariant(value, rules, now = new Date()) {
+	if (!Array.isArray(rules) || rules.length === 0) {
+		return ''
+	}
+	const days = shownAgeDays(value, now)
+	if (days === null) {
+		return ''
+	}
+	for (const rule of rules) {
+		if (!rule || typeof rule !== 'object') {
+			continue
+		}
+		if (compareVisibleWhen(days, rule.op || 'eq', rule.value) === true) {
+			const variant = rule.variant === 'danger' ? 'error' : rule.variant
+			return AGE_VARIANTS.includes(variant) ? variant : ''
+		}
+	}
+	return ''
+}

package/src/utils/detailActionModel.js

@@ -201,13 +201,29 @@ export function resolveNextStep(config, object, stageField = 'status') {
 /**
  * Resolve a header pill from the record.
  *
- * @param {{field?: string, colorMap?: object, labels?: object, variant?: string}|null} config The pill config.
+ * A pill with `field` reads it off the record; one without `field` and with
+ * `text` is a constant. A count pill (`countFrom`) is resolved by
+ * {@link resolveCountPill} once its count is known.
+ *
+ * @param {{field?: string, text?: string, colorMap?: object, labels?: object, variant?: string}|null} config The pill config.
  * @param {object|null} object The record.
  * @return {{label: string, colorKey: string, colorMap: object|null, variant: string}|null} What CnStatusBadge needs, or null when the field is empty.
  * @spec openspec/changes/detail-action-model-and-case-surfaces/specs/detail-action-model/spec.md#requirement-header-pills
  */
 export function resolvePill(config, object) {
-	if (!config || typeof config !== 'object' || typeof config.field !== 'string' || config.field === '') {
+	if (!config || typeof config !== 'object') {
+		return null
+	}
+	// A constant pill (`text`): "Inwoner", "Klant" (screens-relation-pages).
+	if ((typeof config.field !== 'string' || config.field === '') && typeof config.text === 'string' && config.text !== '') {
+		return {
+			label: config.text,
+			colorKey: config.text,
+			colorMap: config.colorMap && typeof config.colorMap === 'object' ? config.colorMap : null,
+			variant: typeof config.variant === 'string' && config.variant !== '' ? config.variant : 'default',
+		}
+	}
+	if (typeof config.field !== 'string' || config.field === '') {
 		return null
 	}
 	const raw = stageOf(object, config.field)
@@ -260,3 +276,44 @@ export function resolveTabCount(tab, object) {
 	const number = Number(value)
 	return Number.isFinite(number) ? number : null
 }
+
+/**
+ * The list a count pill counts (`countFrom`), or null for any other pill.
+ *
+ * @param {object|null} config The pill config.
+ * @return {{register: string, schema: string, filter: object}|null} The list.
+ * @spec openspec/changes/screens-relation-pages/specs/relation-pages/spec.md#requirement-a-header-pill-can-be-a-constant-or-a-count
+ */
+export function pillCountSource(config) {
+	const from = config && typeof config === 'object' && !config.field ? config.countFrom : null
+	if (!from || typeof from !== 'object' || typeof from.register !== 'string' || from.register === '' || typeof from.schema !== 'string' || from.schema === '') {
+		return null
+	}
+	const filter = from.filter && typeof from.filter === 'object' && !Array.isArray(from.filter) ? from.filter : {}
+	return { register: from.register, schema: from.schema, filter }
+}
+
+/**
+ * A count pill once its count is known: "1 lopende zaak", "2 lopende zaken".
+ * Nothing for a count of 0, an unknown count or a failed one.
+ *
+ * @param {{countLabel?: {one?: string, other?: string}, colorMap?: object, variant?: string}|null} config The pill config.
+ * @param {number|null|undefined} count The count.
+ * @param {(text: string) => string} [translate] Applied to the label before `{count}` is filled.
+ * @return {{label: string, colorKey: string, colorMap: object|null, variant: string}|null} What CnStatusBadge needs, or null.
+ * @spec openspec/changes/screens-relation-pages/specs/relation-pages/spec.md#requirement-a-header-pill-can-be-a-constant-or-a-count
+ */
+export function resolveCountPill(config, count, translate = (text) => text) {
+	if (!pillCountSource(config) || typeof count !== 'number' || !Number.isFinite(count) || count <= 0) {
+		return null
+	}
+	const labels = config.countLabel && typeof config.countLabel === 'object' ? config.countLabel : {}
+	const template = (count === 1 ? labels.one : labels.other) || labels.other || labels.one || '{count}'
+	const label = translate(template).replace(/\{count\}/g, String(count))
+	return {
+		label,
+		colorKey: '',
+		colorMap: config.colorMap && typeof config.colorMap === 'object' ? config.colorMap : null,
+		variant: typeof config.variant === 'string' && config.variant !== '' ? config.variant : 'default',
+	}
+}

package/src/utils/dynamicProperties.js

@@ -101,6 +101,7 @@ const DEFAULT_MAP = {
 	enum: 'enumValues',
 	required: 'isRequired',
 	default: 'defaultValue',
+	hideOnCreate: 'hideOnCreate',
 }
 
 /**
@@ -312,6 +313,8 @@ export function definitionQueryParams(config, value, formData = {}) {
  * @param {object} [config] The `x-openregister-extends-form` block (`map`, `typeMap`).
  * @param {object} [options] Extra options.
  * @param {number} [options.orderFrom] Order assigned to the first field; each subsequent field takes the next integer. Dynamic fields sort after the schema's own, so pass a number above every declared `order`.
+ * @param {boolean} [options.create] The form creates a new object: a definition whose `hideOnCreate` (or the field `config.map.hideOnCreate` names) is `true` gets no field, because the app fills that answer itself at creation. Edit forms still show it.
+ * @spec openspec/changes/dynamic-question-hide-on-create/specs/dynamic-question-hide-on-create/spec.md#requirement-a-question-can-stay-off-the-create-form
  * @return {{properties: object, required: string[]}} Properties keyed by prefixed id, plus the required key list.
  */
 export function propertiesFromDefinitions(definitions, config = {}, options = {}) {
@@ -321,7 +324,8 @@ export function propertiesFromDefinitions(definitions, config = {}, options = {}
 
 	const properties = {}
 	const required = []
-	const list = Array.isArray(definitions) ? definitions : []
+	const list = (Array.isArray(definitions) ? definitions : [])
+		.filter((record) => !(options.create === true && record && mapped(record, map, 'hideOnCreate') === true))
 
 	list.forEach((record, index) => {
 		if (!record || !record.id) {

package/src/utils/fillTemplate.js

@@ -0,0 +1,110 @@
+// SPDX-FileCopyrightText: 2026 Conduction B.V.
+// SPDX-License-Identifier: EUPL-1.2
+
+import { boardDateLocale, formatBoardDate } from './boardDate.js'
+import { parseDateValue } from './dateVariant.js'
+import { readPath } from './readPath.js'
+
+const TOKEN = /\{([^{}\s|]+)(?:\|([a-z]+))?\}/g
+
+/**
+ * A moment in the board's short form with the time: "4 okt, 10:52", or
+ * "14 feb 2024, 09:00" outside the current year.
+ *
+ * @param {unknown} value A Date, a timestamp or an ISO string.
+ * @param {Date} [now] The reference moment.
+ * @return {string} The text, or '' when the value is not a date.
+ * @spec openspec/changes/screens-relation-pages/specs/relation-pages/spec.md#requirement-a-record-list-shows-the-objects-that-point-at-this-record
+ */
+export function formatBoardDateTime(value, now = new Date()) {
+	const day = formatBoardDate(value, now)
+	const date = parseDateValue(value)
+	if (day === '' || date === null) {
+		return ''
+	}
+	let time
+	try {
+		time = new Intl.DateTimeFormat(boardDateLocale(), { hour: '2-digit', minute: '2-digit' }).format(date)
+	} catch {
+		time = new Intl.DateTimeFormat(undefined, { hour: '2-digit', minute: '2-digit' }).format(date)
+	}
+	return `${day}, ${time}`
+}
+
+/**
+ * Format one token value.
+ *
+ * @param {unknown} value The raw value.
+ * @param {string} format `date`, `datetime` or '' (as is).
+ * @param {Date} now The reference moment.
+ * @return {string} The text, '' when nothing can be shown.
+ */
+function formatValue(value, format, now) {
+	if (value === null || value === undefined || value === '' || typeof value === 'object') {
+		return ''
+	}
+	if (format === 'date') {
+		return formatBoardDate(value, now)
+	}
+	if (format === 'datetime') {
+		return formatBoardDateTime(value, now)
+	}
+	return String(value)
+}
+
+/**
+ * Fill a row template such as `"{identifier} · {caseTypeName}"` or
+ * `"Termijn {deadline|date}"` from an object.
+ *
+ * Every `{path}` token is a dot path into the object; `{path|date}` and
+ * `{path|datetime}` format it as the boards write dates. A token without a
+ * value empties the WHOLE template, because "Termijn " is worse than nothing.
+ * A template without tokens is returned as written (a constant label).
+ *
+ * @param {string} template The template, already translated.
+ * @param {object|null} object The object to read.
+ * @param {Date} [now] The reference moment for dates.
+ * @return {string} The filled text, or ''.
+ * @spec openspec/changes/screens-relation-pages/specs/relation-pages/spec.md#requirement-a-record-list-shows-the-objects-that-point-at-this-record
+ */
+export function fillTemplate(template, object, now = new Date()) {
+	if (typeof template !== 'string' || template.trim() === '') {
+		return ''
+	}
+	let missing = false
+	const text = template.replace(TOKEN, (_match, path, format) => {
+		const value = object && typeof object === 'object' ? readPath(object, path) : undefined
+		const shown = formatValue(value, format || '', now)
+		if (shown === '') {
+			missing = true
+		}
+		return shown
+	})
+	return missing ? '' : text.trim()
+}
+
+/**
+ * The first of several templates that fills: `["Klaar {closedAt|date}",
+ * "Termijn {deadline|date}"]` reads "Klaar ..." once the case is closed and
+ * "Termijn ..." while it is open. A single string is one candidate.
+ *
+ * @param {string|string[]} templates The candidates, in order.
+ * @param {object|null} object The object to read.
+ * @param {(key: string) => string} [translate] Applied to each template before filling.
+ * @param {Date} [now] The reference moment for dates.
+ * @return {string} The first filled text, or ''.
+ * @spec openspec/changes/screens-relation-pages/specs/relation-pages/spec.md#requirement-a-record-list-shows-the-objects-that-point-at-this-record
+ */
+export function firstFilled(templates, object, translate = (key) => key, now = new Date()) {
+	const list = Array.isArray(templates) ? templates : [templates]
+	for (const template of list) {
+		if (typeof template !== 'string') {
+			continue
+		}
+		const text = fillTemplate(translate(template), object, now)
+		if (text !== '') {
+			return text
+		}
+	}
+	return ''
+}

package/src/utils/libraryWidgetKeys.js

@@ -100,6 +100,8 @@ export const DASHBOARD_CATALOG_WIDGET_KEYS = Object.freeze([
 	'delta',
 	'divider',
 	'document-review',
+	'facts',
+	'field-list',
 	'files',
 	'flow-runs',
 	'gauge',
@@ -123,8 +125,10 @@ export const DASHBOARD_CATALOG_WIDGET_KEYS = Object.freeze([
 	'object-table',
 	'people',
 	'quicklinks',
+	'record-list',
 	'related',
 	'saved-view',
+	'sections',
 	'spend-analytics',
 	'stacked-bar',
 	'stages',

package/src/utils/queryPresets.js

@@ -0,0 +1,93 @@
+/**
+ * SPDX-FileCopyrightText: 2026 Conduction B.V.
+ * SPDX-License-Identifier: EUPL-1.2
+ *
+ * Query presets of an index page (`config.queryPresets`): a menu entry that
+ * deep-links to a list with a query (`{ caseType: '<uuid>' }`, the shape hydra
+ * gate-68 asks for instead of a second page) can bring its own lenses,
+ * columns and copy. The page names, per preset, the query it answers to and
+ * the keys it replaces; the first preset whose every `match` pair is in the
+ * current route query wins.
+ *
+ * @module utils/queryPresets
+ * @spec openspec/changes/screens-index-query-presets/specs/index-query-presets/spec.md#requirement-a-query-preset-overlays-lenses-columns-and-copy
+ */
+
+/**
+ * The config keys a preset may replace. Anything else in a preset is ignored:
+ * a preset changes what the list shows, never which register or schema it
+ * reads or what it may write.
+ *
+ * @type {ReadonlyArray<string>}
+ */
+export const QUERY_PRESET_KEYS = Object.freeze([
+	'title',
+	'quickFilters',
+	'columns',
+	'cardFields',
+	'countText',
+	'searchPlaceholder',
+	'footerNote',
+	'defaultSort',
+	'viewSwitch',
+])
+
+/**
+ * Whether one route query value satisfies one `match` value. A repeated query
+ * parameter (an array) matches when it holds the value.
+ *
+ * @param {unknown} actual The route query value.
+ * @param {string|number|boolean} expected The preset's value.
+ * @return {boolean} True when they match.
+ */
+function queryValueMatches(actual, expected) {
+	const want = String(expected)
+	if (Array.isArray(actual)) {
+		return actual.some((v) => String(v) === want)
+	}
+	return actual !== undefined && actual !== null && String(actual) === want
+}
+
+/**
+ * The index of the first preset whose every `match` pair is in the query.
+ * A preset without a non-empty `match` never matches.
+ *
+ * @param {Array<object>} presets The page's `queryPresets`.
+ * @param {object} query The current route query.
+ * @return {number} The preset index, or -1.
+ */
+export function matchQueryPreset(presets, query) {
+	if (!Array.isArray(presets)) {
+		return -1
+	}
+	const q = query && typeof query === 'object' ? query : {}
+	return presets.findIndex((preset) => {
+		const match = preset && typeof preset.match === 'object' && preset.match !== null ? preset.match : null
+		if (!match || Object.keys(match).length === 0) {
+			return false
+		}
+		return Object.entries(match).every(([key, value]) => queryValueMatches(q[key], value))
+	})
+}
+
+/**
+ * The page config with the preset's allowed keys laid over it, and without
+ * `queryPresets` itself (the page component has no such prop).
+ *
+ * @param {object} config The page config.
+ * @param {object|null} preset The matched preset, or null.
+ * @return {object} The effective config.
+ */
+export function applyQueryPreset(config, preset) {
+	const { queryPresets, ...rest } = config || {}
+	if (!preset || typeof preset !== 'object') {
+		return rest
+	}
+	const out = { ...rest }
+	for (const key of QUERY_PRESET_KEYS) {
+		if (key !== 'title' && preset[key] !== undefined) {
+			out[key] = preset[key]
+		}
+	}
+	return out
+}

package/src/utils/resolveFilterTokens.js

@@ -22,6 +22,10 @@
  *  - `@today±Nd`          → relative-date arithmetic at day granularity: N days
  *                           from today (e.g. `@today-30d`, `@today+7d`)
  *  - `@monthStart`        → first day of the current month, `YYYY-MM-DD`
+ *  - `@monthEnd`          → last day of the current month, `YYYY-MM-DD`; on a
+ *                           date-time field use `lt: '@nextMonthStart'` instead,
+ *                           since `lte` a date stops at that day's midnight
+ *  - `@nextMonthStart`    → first day of the next month, `YYYY-MM-DD`
  *  - `@quarterStart`      → first day of the current quarter, `YYYY-MM-DD`
  *  - `@yearStart`         → first day of the current year, `YYYY-MM-DD`
  *  - `@currentFiscalYear` → the current calendar year as a number string, e.g. `2026`
@@ -214,6 +218,13 @@ export function resolveFilterValue(v, ctx) {
 	if (v === '@monthStart') {
 		return ymd(new Date(now.getFullYear(), now.getMonth(), 1))
 	}
+	if (v === '@monthEnd') {
+		// Day 0 of the next month is the last day of this one.
+		return ymd(new Date(now.getFullYear(), now.getMonth() + 1, 0))
+	}
+	if (v === '@nextMonthStart') {
+		return ymd(new Date(now.getFullYear(), now.getMonth() + 1, 1))
+	}
 	if (v === '@quarterStart') {
 		return ymd(new Date(now.getFullYear(), Math.floor(now.getMonth() / 3) * 3, 1))
 	}

package/src/utils/schema.js

@@ -1050,12 +1050,33 @@ export function fieldsFromSchema(schema, options = {}) {
 		if (overrides[key]) {
 			Object.assign(field, overrides[key])
 			applyPickerOverride(field, overrides[key])
+			translateOverrideText(field, overrides[key], tr)
 		}
 
 		return field
 	})
 }
 
+/**
+ * Run an override's display text through the translate function, as the
+ * schema's own title and description are. A manifest writes `label`,
+ * `description` and `placeholder` in its source language; without this a
+ * form showed "Requester" to a Dutch user whose catalogue holds "Aanvrager".
+ *
+ * @param {object} field The field, with the override already merged in.
+ * @param {object} override The per-key override.
+ * @param {(text: string) => string} tr The translate function (identity when none).
+ * @return {void}
+ * @spec openspec/changes/screens-form-override-labels-parity/specs/form-override-labels/spec.md#requirement-override-text-reads-in-the-users-language
+ */
+function translateOverrideText(field, override, tr) {
+	for (const name of ['label', 'description', 'placeholder']) {
+		if (typeof override[name] === 'string' && override[name] !== '') {
+			field[name] = tr(override[name])
+		}
+	}
+}
+
 /**
  * Generate faceted filter definitions from a schema's facetable properties.
  *

package/src/utils/sentinelTokens.js

@@ -26,7 +26,7 @@
  * A token is valid only in the context whose resolver runs on it:
  *
  *  - **filter**       — `resolveFilterTokens`, resolved at fetch time:
- *                       `@me`, `@myGroups`, `@now`, `@today`, `@today±Nd`, `@monthStart`,
+ *                       `@me`, `@myGroups`, `@now`, `@today`, `@today±Nd`, `@monthStart`, `@monthEnd`, `@nextMonthStart`,
  *                       `@quarterStart`, `@yearStart`.
  *  - **config**       — `IAppConfig`-sourced: `@resolve:<key>`, `@config.<key>`
  *                       (trailing `?` marks optional).
@@ -67,7 +67,7 @@
  * @type {Readonly<Record<string, string>>}
  */
 export const SENTINEL_TOKEN_PATTERNS = Object.freeze({
-	filter: '^@(?:me(?:\\.(?:displayName|email))?|myGroups|now|today|monthStart|quarterStart|yearStart)$|^@today[+-][0-9]+d$',
+	filter: '^@(?:me(?:\\.(?:displayName|email))?|myGroups|now|today|monthStart|monthEnd|nextMonthStart|quarterStart|yearStart)$|^@today[+-][0-9]+d$',
 	config: '^@resolve:[a-z][a-z0-9_-]*$|^@config\\.[A-Za-z][A-Za-z0-9_.]*\\??$',
 	object: '^@objectId$|^@object\\.[A-Za-z][A-Za-z0-9_]*$',
 	workspace: '^@workspace\\.[A-Za-z][A-Za-z0-9_]*\\??$',
@@ -117,7 +117,7 @@ export const SENTINEL_VOCABULARY = Object.freeze({
 	filter: {
 		resolver: 'resolveFilterTokens',
 		description: 'Relative fetch-time tokens (current user, the current user\'s groups as an IN list, relative dates).',
-		members: ['@me', '@me.displayName', '@me.email', '@myGroups', '@now', '@today', '@today±Nd', '@monthStart', '@quarterStart', '@yearStart'],
+		members: ['@me', '@me.displayName', '@me.email', '@myGroups', '@now', '@today', '@today±Nd', '@monthStart', '@monthEnd', '@nextMonthStart', '@quarterStart', '@yearStart'],
 	},
 	config: {
 		resolver: 'resolveManifestSentinels / resolveFilterTokens',