@nest-my-admin/core 0.3.2 → 0.5.0

package/dist/crud/computed-columns.js

@@ -0,0 +1,264 @@
+import { resolvePath } from '../schema/relation-fields.js';
+import { recordIdOf } from './record-id.js';
+import { serializeValue } from './serialize.js';
+const KINDS = ['image', 'title', 'money', 'badge', 'count', 'toggle'];
+const AGGREGATES = ['min', 'max', 'sum', 'count'];
+/**
+ * Checks `list.computed` at boot (spec §5.4) and compiles each column: sources exist, relations are one-to-many of a
+ * single-key entity, `sortable` only on aggregates and first rows, a toggle's values are its enum's, `map` only on badges.
+ */
+export function checkComputed(computed, metadata, enumValues, fail) {
+    const out = new Map();
+    for (const [key, column] of Object.entries(computed ?? {})) {
+        const where = `list.computed.${key}`;
+        if (!KINDS.includes(column.kind))
+            fail(`${where}: unknown kind "${String(column.kind)}" (use ${KINDS.join(', ')})`);
+        const deps = { own: [], children: [] };
+        const compile = (source, part) => compileSource(source, `${where}.${part}`, metadata, enumValues, deps, fail);
+        const source = compile(column.source, 'source');
+        if (column.sortable && source.type !== 'aggregate' && source.type !== 'first')
+            fail(`${where}: only aggregate and first sources can be sortable`);
+        if (column.map !== undefined && (column.kind !== 'badge' || typeof column.map !== 'function'))
+            fail(`${where}: \`map\` is a function, for badges only`);
+        if ((column.kind === 'toggle') !== (source.type === 'toggle'))
+            fail(`${where}: a toggle column needs a { toggle, on, off } source, and only it`);
+        if (column.subline !== undefined && column.kind !== 'title')
+            fail(`${where}: \`subline\` goes with the title kind`);
+        if (column.previous !== undefined && column.kind !== 'money')
+            fail(`${where}: \`previous\` goes with the money kind`);
+        out.set(key, {
+            key,
+            column,
+            source,
+            ...(column.subline !== undefined ? { subline: compile(column.subline, 'subline') } : {}),
+            ...(column.previous !== undefined ? { previous: compile(column.previous, 'previous') } : {}),
+            deps,
+        });
+    }
+    return out;
+}
+function compileSource(source, where, metadata, enumValues, deps, fail) {
+    const ownField = (name, what) => {
+        if (!metadata.findColumnsWithPropertyPath(name).length && !metadata.relations.some((relation) => relation.propertyName === name))
+            fail(`${where}: unknown ${what} "${name}" on ${metadata.name}`);
+        deps.own.push(name);
+    };
+    const toMany = (name) => {
+        if (metadata.primaryColumns.length !== 1)
+            fail(`${where}: relation sources need an entity with one primary key column`);
+        const relation = metadata.relations.find((candidate) => candidate.propertyName === name);
+        if (!relation)
+            fail(`${where}: unknown relation "${name}" on ${metadata.name}`);
+        if (relation.relationType !== 'one-to-many' || !relation.inverseRelation)
+            fail(`${where}: "${name}" is not a one-to-many relation`);
+        return relation;
+    };
+    const childField = (relation, name) => {
+        const child = relation.inverseEntityMetadata;
+        if (!child.findColumnsWithPropertyPath(name).length)
+            fail(`${where}: unknown field "${name}" on ${child.name}`);
+        const entry = deps.children.find((candidate) => candidate.entity === child.target);
+        if (entry)
+            entry.fields.push(name);
+        else
+            deps.children.push({ entity: child.target, fields: [name] });
+    };
+    if (typeof source === 'string') {
+        if (source.includes('.')) {
+            const resolved = resolvePath(metadata, source);
+            if ('error' in resolved)
+                fail(`${where}: cannot use "${source}": ${resolved.error}`);
+            deps.own.push(source);
+        }
+        else
+            ownField(source, 'field');
+        return { type: 'field', path: source };
+    }
+    if ('aggregate' in source) {
+        if (!AGGREGATES.includes(source.aggregate))
+            fail(`${where}: unknown aggregate "${String(source.aggregate)}"`);
+        const relation = toMany(source.relation);
+        if (source.aggregate !== 'count' && !source.field)
+            fail(`${where}: ${source.aggregate} needs a field`);
+        if (source.field)
+            childField(relation, source.field);
+        else if (!deps.children.some((entry) => entry.entity === relation.inverseEntityMetadata.target))
+            deps.children.push({ entity: relation.inverseEntityMetadata.target, fields: [] });
+        return { type: 'aggregate', fn: source.aggregate, relation, ...(source.field ? { field: source.field } : {}) };
+    }
+    if ('first' in source) {
+        const relation = toMany(source.first);
+        childField(relation, source.field);
+        childField(relation, source.by);
+        return { type: 'first', relation, field: source.field, by: source.by };
+    }
+    if ('toggle' in source) {
+        ownField(source.toggle, 'field');
+        const values = enumValues(source.toggle);
+        if (!values)
+            fail(`${where}: "${source.toggle}" is not an enum field`);
+        for (const value of [source.on, source.off])
+            if (!values.includes(value))
+                fail(`${where}: "${value}" is not one of ${values.join(', ')}`);
+        return { type: 'toggle', field: source.toggle, on: source.on, off: source.off };
+    }
+    if ('compute' in source) {
+        if (typeof source.compute !== 'function')
+            fail(`${where}: compute must be a function`);
+        if (!Array.isArray(source.fields))
+            fail(`${where}: compute needs \`fields\`, the fields it reads (a viewer who cannot see one does not get the column)`);
+        for (const field of source.fields)
+            ownField(field, 'field');
+        return { type: 'compute', fn: source.compute, fields: source.fields };
+    }
+    return fail(`${where}: unknown source`);
+}
+/**
+ * The page's computed values, by record id: one query per relation or path source and one `compute` call, whatever the
+ * page size (no N+1). Badge labels are localized with `text`.
+ */
+export async function loadComputed(columns, rows, metadata, ctx, childQuery, pathQuery, text, 
+/** A field's schema (to serialize decimals as strings, dates as ISO…): the entity's resource field, if any. */
+fieldFor) {
+    const keys = metadata.primaryColumns.map((column) => column.propertyName);
+    const out = new Map(rows.map((row) => [recordIdOf(row, keys), {}]));
+    if (rows.length === 0 || columns.length === 0)
+        return out;
+    const pk = keys[0];
+    const ids = rows.map((row) => row[pk]);
+    const cache = new Map();
+    const resolve = (source) => {
+        const id = sourceId(source);
+        let found = cache.get(id);
+        if (!found)
+            cache.set(id, (found = read(source)));
+        return found;
+    };
+    const read = async (source) => {
+        const raw = await readRaw(source);
+        const field = source.type === 'field'
+            ? fieldFor(metadata.target, source.path)
+            : source.type === 'first' || (source.type === 'aggregate' && source.fn !== 'count' && source.field)
+                ? fieldFor(source.relation.inverseEntityMetadata.target, source.field)
+                : undefined;
+        if (!field)
+            return raw;
+        // Drivers answer SUM/MIN/MAX of an integer as text (Postgres bigint): a number field stays a number.
+        const typed = (value) => (field.type === 'number' && typeof value === 'string' && value.trim() !== '' && !Number.isNaN(Number(value)) ? Number(value) : value);
+        return new Map([...raw].map(([id, value]) => [id, serializeValue(typed(value), field)]));
+    };
+    const readRaw = async (source) => {
+        const byRow = new Map();
+        switch (source.type) {
+            case 'field': {
+                if (!source.path.includes('.')) {
+                    for (const row of rows)
+                        byRow.set(recordIdOf(row, keys), row[source.path] ?? null);
+                    return byRow;
+                }
+                const qb = pathQuery('nma_p');
+                const segments = source.path.split('.');
+                let alias = 'nma_p';
+                segments.slice(0, -1).forEach((segment, index) => {
+                    qb.leftJoin(`${alias}.${segment}`, `nma_j${index}`);
+                    alias = `nma_j${index}`;
+                });
+                const raw = await qb.select(`nma_p.${pk}`, 'k').addSelect(`${alias}.${segments.at(-1)}`, 'v').where(`nma_p.${pk} IN (:...nmaIds)`, { nmaIds: ids }).getRawMany();
+                for (const { k, v } of raw)
+                    byRow.set(String(k), v ?? null);
+                return byRow;
+            }
+            case 'aggregate': {
+                const child = source.relation.inverseEntityMetadata;
+                const fk = `nma_c.${source.relation.inverseRelation.propertyName}`;
+                const target = source.field ? `nma_c.${source.field}` : `nma_c.${child.primaryColumns[0].propertyName}`;
+                const raw = await childQuery(child.target, 'nma_c', ctx)
+                    .select(fk, 'k')
+                    .addSelect(`${source.fn.toUpperCase()}(${target})`, 'v')
+                    .andWhere(`${fk} IN (:...nmaIds)`, { nmaIds: ids })
+                    .groupBy(fk)
+                    .getRawMany();
+                for (const { k, v } of raw)
+                    byRow.set(String(k), source.fn === 'count' ? Number(v) : v);
+                if (source.fn === 'count')
+                    for (const row of rows)
+                        if (!byRow.has(recordIdOf(row, keys)))
+                            byRow.set(recordIdOf(row, keys), 0);
+                return byRow;
+            }
+            case 'first': {
+                const child = source.relation.inverseEntityMetadata;
+                const fk = `nma_c.${source.relation.inverseRelation.propertyName}`;
+                const raw = await childQuery(child.target, 'nma_c', ctx)
+                    .select(fk, 'k')
+                    .addSelect(`nma_c.${source.field}`, 'v')
+                    .andWhere(`${fk} IN (:...nmaIds)`, { nmaIds: ids })
+                    .orderBy(`nma_c.${source.by}`, 'ASC')
+                    .addOrderBy(`nma_c.${child.primaryColumns[0].propertyName}`, 'ASC')
+                    .getRawMany();
+                for (const { k, v } of raw)
+                    if (!byRow.has(String(k)))
+                        byRow.set(String(k), v ?? null);
+                return byRow;
+            }
+            case 'toggle':
+                for (const row of rows)
+                    byRow.set(recordIdOf(row, keys), row[source.field] === source.on);
+                return byRow;
+            case 'compute': {
+                const values = await source.fn(rows, ctx);
+                for (const row of rows)
+                    byRow.set(recordIdOf(row, keys), values[recordIdOf(row, keys)] ?? null);
+                return byRow;
+            }
+        }
+    };
+    for (const compiled of columns) {
+        const [main, subline, previous] = await Promise.all([resolve(compiled.source), compiled.subline && resolve(compiled.subline), compiled.previous && resolve(compiled.previous)]);
+        for (const row of rows) {
+            const id = recordIdOf(row, keys);
+            const value = main.get(id) ?? null;
+            const cell = { value };
+            if (subline)
+                cell.subline = subline.get(id) ?? null;
+            if (previous)
+                cell.previous = previous.get(id) ?? null;
+            if (compiled.column.map) {
+                const mapped = compiled.column.map(value, row);
+                cell.label = text(mapped.label);
+                cell.tone = mapped.tone;
+            }
+            out.get(id)[compiled.key] = cell;
+        }
+    }
+    return out;
+}
+const sourceId = (source) => source.type === 'field'
+    ? `f:${source.path}`
+    : source.type === 'aggregate'
+        ? `a:${source.fn}:${source.relation.propertyName}:${source.field ?? ''}`
+        : source.type === 'first'
+            ? `1:${source.relation.propertyName}:${source.field}:${source.by}`
+            : source.type === 'toggle'
+                ? `t:${source.field}`
+                : `c:${Math.random()}`; // each compute function runs once anyway
+/**
+ * Sorting by an aggregate or first-row column: a correlated subquery over the rows the viewer may read, selected as
+ * `nma_sort` so paging with joins can order by it. Returns the expression to order by.
+ */
+export function addComputedSort(qb, compiled, metadata, ctx, childQuery) {
+    const source = compiled.source;
+    if (source.type !== 'aggregate' && source.type !== 'first')
+        throw new Error(`nest-my-admin: ${compiled.key} is not sortable`);
+    const child = source.relation.inverseEntityMetadata;
+    const childPk = child.primaryColumns[0].propertyName;
+    const sub = childQuery(child.target, 'nma_s', ctx).andWhere(`nma_s.${source.relation.inverseRelation.propertyName} = ${qb.alias}.${metadata.primaryColumns[0].propertyName}`);
+    // A sum over no rows is 0, not NULL: drivers place NULLs differently when sorting (first in Postgres descending).
+    if (source.type === 'aggregate')
+        sub.select(source.fn === 'sum' ? `COALESCE(SUM(nma_s.${source.field}), 0)` : `${source.fn.toUpperCase()}(nma_s.${source.field ?? childPk})`);
+    else
+        sub.select(`nma_s.${source.field}`).orderBy(`nma_s.${source.by}`, 'ASC').addOrderBy(`nma_s.${childPk}`, 'ASC').limit(1);
+    qb.addSelect(`(${sub.getQuery()})`, 'nma_sort').setParameters({ ...qb.getParameters(), ...sub.getParameters() });
+    return 'nma_sort';
+}
+//# sourceMappingURL=computed-columns.js.map

package/dist/crud/computed-columns.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"computed-columns.js","sourceRoot":"","sources":["../../src/crud/computed-columns.ts"],"names":[],"mappings":"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"}

package/dist/crud/list-query-builder.d.ts

@@ -12,4 +12,6 @@ export declare function likePattern(text: string, position: 'anywhere' | 'start'
  * Applies filters, search, sort (with the primary key as tie-breaker, so pages never overlap) and paging.
  * Field names come from the resource schema's allow-lists (parseListQuery); values are always bound parameters.
  */
-export declare function applyListParams<T extends ObjectLiteral>(qb: SelectQueryBuilder<T>, params: ListParams, metadata: EntityMetadata): SelectQueryBuilder<T>;
+export declare function applyListParams<T extends ObjectLiteral>(qb: SelectQueryBuilder<T>, params: ListParams, metadata: EntityMetadata, 
+/** A sortable computed column (`list.computed`): adds its subquery and returns what to order by, else undefined. */
+computedSort?: (qb: SelectQueryBuilder<T>, field: string) => string | undefined): SelectQueryBuilder<T>;

package/dist/crud/list-query-builder.js

@@ -83,7 +83,9 @@ function applyFilter(qb, column, filter, name) {
  * Applies filters, search, sort (with the primary key as tie-breaker, so pages never overlap) and paging.
  * Field names come from the resource schema's allow-lists (parseListQuery); values are always bound parameters.
  */
-export function applyListParams(qb, params, metadata) {
+export function applyListParams(qb, params, metadata, 
+/** A sortable computed column (`list.computed`): adds its subquery and returns what to order by, else undefined. */
+computedSort) {
     const alias = qb.alias;
     const deleted = metadata.deleteDateColumn;
     if (params.trashed && deleted) {
@@ -104,7 +106,8 @@ export function applyListParams(qb, params, metadata) {
         // Every clause binds the same parameters (same term), so one set serves them all.
         qb.andWhere(`(${clauses.map((clause) => clause.sql).join(' OR ')})`, clauses[0]?.params ?? {});
     }
-    const sort = targetOf(qb, metadata, params.sort.field);
+    const computed = computedSort?.(qb, params.sort.field);
+    const sort = computed !== undefined ? { column: computed } : targetOf(qb, metadata, params.sort.field);
     // With joins, skip/take paginates with a DISTINCT query that can only order by selected columns.
     if (sort.joinAlias && !qb.expressionMap.selects.some(({ selection }) => selection === sort.column || selection === sort.joinAlias)) {
         qb.addSelect(sort.column);

package/dist/crud/list-query-builder.js.map

@@ -1 +1 @@
-{"version":3,"file":"list-query-builder.js","sourceRoot":"","sources":["../../src/crud/list-query-builder.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"list-query-builder.js","sourceRoot":"","sources":["../../src/crud/list-query-builder.ts"],"names":[],"mappings":"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"}

package/dist/crud/list-query.js

@@ -2,7 +2,7 @@ import { AdminValidationError } from '../errors.js';
 import { MAX_PAGE_SIZE } from '../schema/build-resource-schema.js';
 import { decodeCursor } from './cursor.js';
 import { toLatinNumber } from '../i18n/persian.js';
-const PAGING_KEYS = new Set(['page', 'pageSize', 'sort', 'search', 'trashed', 'after']);
+const PAGING_KEYS = new Set(['page', 'pageSize', 'sort', 'search', 'trashed', 'after', 'tab']);
 const FILTER_KEY = /^filter\[([^\][]+)\](?:\[([^\][]+)\])?$/;
 const MAX_LIST_VALUES = 100;
 const MAX_TEXT = 200;
@@ -93,9 +93,14 @@ export function parseListQuery(query, schema) {
         else
             after = parsed.value;
     }
+    // `tab`: a list tab (`list.tabs`) whose own restriction (`where`) applies; its filters come as filter params.
+    const tab = readOne(query, 'tab', errors);
+    if (tab !== undefined && !schema.list.tabs?.some((candidate) => candidate.key === tab))
+        errors.tab = [`unknown tab "${tab}"`];
     if (Object.keys(errors).length > 0)
         throw new AdminValidationError(errors, 'Invalid list query');
     return {
+        ...(tab !== undefined ? { tab } : {}),
         page: keyset ? 1 : page,
         pageSize,
         sort,

package/dist/crud/list-query.js.map

@@ -1 +1 @@
-{"version":3,"file":"list-query.js","sourceRoot":"","sources":["../../src/crud/list-query.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"list-query.js","sourceRoot":"","sources":["../../src/crud/list-query.ts"],"names":[],"mappings":"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"}

package/dist/crud/list-tabs.d.ts

@@ -0,0 +1,7 @@
+import type { ResourceSchema } from '../contract.js';
+import type { ListTab } from '../resource/admin-resource-base.js';
+export declare const MAX_TABS = 6;
+/** `list.tabs` at boot (spec §5.5): at most six, unique keys, filters the list accepts (`list.filters`), a function `where`. */
+export declare function checkTabs(schema: ResourceSchema, tabs: ListTab[] | undefined, fail: (message: string) => never): void;
+/** The tabs a viewer may use: those whose filters name only fields of the schema they see (anti-oracle, spec §6.5). */
+export declare function visibleTabs(schema: ResourceSchema): ResourceSchema['list']['tabs'];

package/dist/crud/list-tabs.js

@@ -0,0 +1,44 @@
+import { parseListQuery } from './list-query.js';
+export const MAX_TABS = 6;
+/** `list.tabs` at boot (spec §5.5): at most six, unique keys, filters the list accepts (`list.filters`), a function `where`. */
+export function checkTabs(schema, tabs, fail) {
+    if (tabs === undefined)
+        return;
+    if (!Array.isArray(tabs) || tabs.length > MAX_TABS)
+        fail(`list.tabs: at most ${MAX_TABS} tabs`);
+    const keys = new Set();
+    for (const tab of tabs) {
+        if (typeof tab.key !== 'string' || !/^[a-z0-9][a-z0-9_-]*$/i.test(tab.key))
+            fail(`list.tabs: the key "${String(tab.key)}" must be letters, digits, - and _`);
+        if (keys.has(tab.key))
+            fail(`list.tabs: the key "${tab.key}" is used twice`);
+        keys.add(tab.key);
+        if (tab.where !== undefined && typeof tab.where !== 'function')
+            fail(`list.tabs.${tab.key}: where must be a function (qb, ctx)`);
+        if (tab.count !== undefined && !['exact', 'estimate', 'none'].includes(tab.count))
+            fail(`list.tabs.${tab.key}: count is exact, estimate or none`);
+        for (const key of Object.keys(tab.filter ?? {}))
+            if (!key.startsWith('filter['))
+                fail(`list.tabs.${tab.key}: filter holds filter[...] parameters, not "${key}"`);
+        try {
+            parseListQuery(new URLSearchParams(tab.filter ?? {}), schema);
+        }
+        catch (error) {
+            const fields = Object.keys(error.fields ?? {});
+            fail(`list.tabs.${tab.key}: ${fields.join(', ') || error.message} is not a filter the list allows (list.filters)`);
+        }
+    }
+}
+/** The tabs a viewer may use: those whose filters name only fields of the schema they see (anti-oracle, spec §6.5). */
+export function visibleTabs(schema) {
+    return schema.list.tabs?.filter((tab) => {
+        try {
+            parseListQuery(new URLSearchParams(tab.filter), schema);
+            return true;
+        }
+        catch {
+            return false;
+        }
+    });
+}
+//# sourceMappingURL=list-tabs.js.map

package/dist/crud/list-tabs.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"list-tabs.js","sourceRoot":"","sources":["../../src/crud/list-tabs.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEjD,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,CAAC;AAE1B,gIAAgI;AAChI,MAAM,UAAU,SAAS,CAAC,MAAsB,EAAE,IAA2B,EAAE,IAAgC;IAC7G,IAAI,IAAI,KAAK,SAAS;QAAE,OAAO;IAC/B,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,GAAG,QAAQ;QAAE,IAAI,CAAC,sBAAsB,QAAQ,OAAO,CAAC,CAAC;IAChG,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,IAAI,OAAO,GAAG,CAAC,GAAG,KAAK,QAAQ,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;YAAE,IAAI,CAAC,uBAAuB,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,oCAAoC,CAAC,CAAC;QAC7J,IAAI,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC;YAAE,IAAI,CAAC,uBAAuB,GAAG,CAAC,GAAG,iBAAiB,CAAC,CAAC;QAC7E,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAClB,IAAI,GAAG,CAAC,KAAK,KAAK,SAAS,IAAI,OAAO,GAAG,CAAC,KAAK,KAAK,UAAU;YAAE,IAAI,CAAC,aAAa,GAAG,CAAC,GAAG,sCAAsC,CAAC,CAAC;QACjI,IAAI,GAAG,CAAC,KAAK,KAAK,SAAS,IAAI,CAAC,CAAC,OAAO,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC;YAAE,IAAI,CAAC,aAAa,GAAG,CAAC,GAAG,oCAAoC,CAAC,CAAC;QAClJ,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC;YAAE,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,SAAS,CAAC;gBAAE,IAAI,CAAC,aAAa,GAAG,CAAC,GAAG,+CAA+C,GAAG,GAAG,CAAC,CAAC;QACjK,IAAI,CAAC;YACH,cAAc,CAAC,IAAI,eAAe,CAAC,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC;QAChE,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAE,KAA+C,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC;YAC1F,IAAI,CAAC,aAAa,GAAG,CAAC,GAAG,KAAK,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAK,KAAe,CAAC,OAAO,iDAAiD,CAAC,CAAC;QAChI,CAAC;IACH,CAAC;AACH,CAAC;AAED,uHAAuH;AACvH,MAAM,UAAU,WAAW,CAAC,MAAsB;IAChD,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE;QACtC,IAAI,CAAC;YACH,cAAc,CAAC,IAAI,eAAe,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC;YACxD,OAAO,IAAI,CAAC;QACd,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC"}

package/dist/dashboard/dashboard-routes.d.ts

@@ -0,0 +1,18 @@
+import type { ServerResponse } from 'node:http';
+import type { Router } from '../http/router.js';
+import type { AdminContext } from '../resource/admin-context.js';
+import type { DashboardService } from './dashboard.service.js';
+interface State {
+    res: ServerResponse;
+    url: URL;
+    ctx: AdminContext;
+}
+/**
+ * The dashboard (spec §5.8): `GET /api/dashboard` lists the widgets this user may see (`DashboardResponse`);
+ * `GET /api/dashboard/:widget?period=&from=&to=&previousFrom=&previousTo=` answers one widget's `WidgetData` (404 for
+ * one they may not see, 400 for a bad period). Each widget loads on its own: one that fails leaves the others.
+ */
+export declare function addDashboardRoutes<S extends State>(router: Router<S>, services: {
+    dashboard: DashboardService;
+}): void;
+export {};

package/dist/dashboard/dashboard-routes.js

@@ -0,0 +1,13 @@
+import { sendJson } from '../http/http-io.js';
+/**
+ * The dashboard (spec §5.8): `GET /api/dashboard` lists the widgets this user may see (`DashboardResponse`);
+ * `GET /api/dashboard/:widget?period=&from=&to=&previousFrom=&previousTo=` answers one widget's `WidgetData` (404 for
+ * one they may not see, 400 for a bad period). Each widget loads on its own: one that fails leaves the others.
+ */
+export function addDashboardRoutes(router, services) {
+    const { dashboard } = services;
+    router
+        .add('GET', '/api/dashboard', ({ res, ctx }) => sendJson(res, 200, dashboard.layout(ctx)))
+        .add('GET', '/api/dashboard/:widget', async ({ res, url, ctx }, p) => sendJson(res, 200, await dashboard.load(p.widget, url.searchParams, ctx)));
+}
+//# sourceMappingURL=dashboard-routes.js.map

package/dist/dashboard/dashboard-routes.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"dashboard-routes.js","sourceRoot":"","sources":["../../src/dashboard/dashboard-routes.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAW9C;;;;GAIG;AACH,MAAM,UAAU,kBAAkB,CAAkB,MAAiB,EAAE,QAAyC;IAC9G,MAAM,EAAE,SAAS,EAAE,GAAG,QAAQ,CAAC;IAC/B,MAAM;SACH,GAAG,CAAC,KAAK,EAAE,gBAAgB,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,EAAE,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;SACzF,GAAG,CAAC,KAAK,EAAE,wBAAwB,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,MAAO,EAAE,GAAG,CAAC,YAAY,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;AACtJ,CAAC"}

package/dist/dashboard/dashboard.service.d.ts

@@ -0,0 +1,20 @@
+import type { DashboardResponse, WidgetData, WidgetParams } from '../contract.js';
+import type { ResolvedAdminOptions } from '../options.js';
+import { AdminPolicy } from '../policy/admin-policy.service.js';
+import type { AdminContext } from '../resource/admin-context.js';
+import { WidgetRegistry } from './widget-registry.js';
+/** The dashboard (spec §5.8): the widgets a user may see, and each one's data for a period. */
+export declare class DashboardService {
+    private readonly widgets;
+    private readonly policy;
+    private readonly options;
+    constructor(widgets: WidgetRegistry, policy: AdminPolicy, options: ResolvedAdminOptions);
+    private visible;
+    /** Whether the user has a dashboard at all (`meta.dashboard`). */
+    has(ctx: AdminContext): boolean;
+    layout(ctx: AdminContext): DashboardResponse;
+    /** One widget's data: 404 for a widget the user may not see (or that does not exist), 400 for a bad period. */
+    load(name: string, query: URLSearchParams, ctx: AdminContext): Promise<WidgetData>;
+}
+/** The period from the query: a known kind, instants in order, at most 366 days (the comparison window too). */
+export declare function parsePeriod(query: URLSearchParams): WidgetParams;