@columenlabs/lumen-ui 0.1.261 → 0.1.262

package/dist/assistant/usage-history.js

@@ -351,7 +351,44 @@ function UsageTip({ r, children }) {
     ];
     return (_jsxs(Tooltip, { children: [_jsx(TooltipTrigger, { asChild: true, children: children }), _jsx(TooltipContent, { className: "max-w-72", children: _jsxs("div", { className: "flex min-w-0 flex-col gap-1", children: [_jsx("span", { className: "whitespace-normal break-words font-medium", children: r.title }), _jsx("dl", { className: "grid grid-cols-[auto_auto] gap-x-4 gap-y-0.5", children: lines.map(([k, v]) => (_jsxs(Fragment, { children: [_jsx("dt", { className: "opacity-75", children: k }), _jsx("dd", { className: "num text-right", children: v })] }, k))) }), !t && _jsx("span", { className: "opacity-75", children: "Spent before each chat kept its own count." })] }) })] }));
 }
-const dayOf = (at) => at ? new Date(at).toLocaleDateString(undefined, { month: 'short', day: 'numeric' }) : EARLIER;
+/** Midnight of `d`'s day, local time. */
+const startOf = (d) => new Date(d.getFullYear(), d.getMonth(), d.getDate()).getTime();
+/** Days from `at`'s day back to today (0 today, 1 yesterday). */
+const daysAgo = (at) => Math.round((startOf(new Date()) - startOf(new Date(at))) / 86_400_000);
+/** Days since Monday, today included (0 on a Monday). */
+const sinceMonday = () => (new Date().getDay() + 6) % 7;
+const sameMonth = (at) => {
+    const d = new Date(at);
+    const n = new Date();
+    return d.getFullYear() === n.getFullYear() && d.getMonth() === n.getMonth();
+};
+/** Grouping by date: Today, Yesterday, This week, This month, then each month by name. Spend
+ *  from before chats kept their own count is this month's. */
+const dayOf = (at) => {
+    if (!at)
+        return 'This month';
+    const n = daysAgo(at);
+    if (n <= 0)
+        return 'Today';
+    if (n === 1)
+        return 'Yesterday';
+    if (n <= sinceMonday())
+        return 'This week';
+    if (sameMonth(at))
+        return 'This month';
+    return new Date(at).toLocaleDateString(undefined, { month: 'long', year: 'numeric' });
+};
+/** A row's date: today's time, Yesterday, the weekday this week, else the day. */
+const relWhen = (at) => {
+    const n = daysAgo(at);
+    if (n <= 0)
+        return new Date(at).toLocaleTimeString(undefined, { hour: 'numeric', minute: '2-digit' });
+    if (n === 1)
+        return 'Yesterday';
+    if (n <= sinceMonday())
+        return new Date(at).toLocaleDateString(undefined, { weekday: 'short' });
+    return new Date(at).toLocaleDateString(undefined, { month: 'short', day: 'numeric' });
+};
 const USAGE_FIELDS = [
     {
         key: 'title',
@@ -383,7 +420,7 @@ const USAGE_FIELDS = [
         format: 'integer',
         hideOnPhone: true,
         value: (r) => r.at,
-        render: (r) => (_jsx(UsageTip, { r: r, children: r.at ? (_jsx("time", { dateTime: new Date(r.at).toISOString(), className: "text-muted-foreground", children: when(r.at) })) : (_jsx("span", { className: "text-muted-foreground", children: EARLIER })) })),
+        render: (r) => (_jsx(UsageTip, { r: r, children: r.at ? (_jsx("time", { dateTime: new Date(r.at).toISOString(), className: "text-muted-foreground", children: relWhen(r.at) })) : (_jsx("span", { className: "text-muted-foreground", children: EARLIER })) })),
     },
     {
         key: 'calls',

package/dist/lumen-view.js

@@ -507,6 +507,12 @@ function CappedCell({ max, end, title, children, }) {
         return children;
     return (_jsx("div", { className: cn('flex min-w-0 *:min-w-0 *:max-w-full *:truncate', end && 'justify-end'), style: { maxWidth: max }, title: title, children: children }));
 }
+/** A group heading's row count, as a chip beside its name. */
+function GroupCount({ children }) {
+    if (children === '' || children == null)
+        return null;
+    return (_jsx(Badge, { variant: "secondary", className: "num h-4.5 shrink-0 px-1.5 font-normal text-xs", children: children }));
+}
 /** The flat or grouped table: sortable headers, a Total row, group rows that collapse. */
 // Sorting, and paging of flat tables (the page is LumenView's, set right of the row count).
 const SORTING = tableFeatures({
@@ -874,7 +880,7 @@ function LumenTableRows({ domain, columns = domain.fields, rows, groupBy = null,
                         const n = new Set(o);
                         n.has(k) ? n.delete(k) : n.add(k);
                         return n;
-                    }), children: [selection && _jsx(TableCell, {}), shown.map((f, i) => (_jsx(TableCell, { ...col(f, groupBy && i === 0 && 'pl-8'), children: i === 0 ? (_jsxs("span", { className: "flex min-w-0 items-center gap-1 whitespace-nowrap", children: [chevron(k, `${key} ${openLabel()}`), subgroup?.mark?.(key, ms), _jsx("span", { className: "truncate font-medium", title: key, children: titleOf(key, ms) }), _jsx("span", { className: "num shrink-0 text-xs text-muted-foreground", children: ms.length })] })) : (rollCell(f, ms, 'fold')) }, f.key))), add && _jsx(TableCell, {})] }), openParts.has(k) && ms.map((p) => partRow(p, subgroup?.name))] }, k));
+                    }), children: [selection && _jsx(TableCell, {}), shown.map((f, i) => (_jsx(TableCell, { ...col(f, groupBy && i === 0 && 'pl-8'), children: i === 0 ? (_jsxs("span", { className: "flex min-w-0 items-center gap-1 whitespace-nowrap", children: [chevron(k, `${key} ${openLabel()}`), subgroup?.mark?.(key, ms), _jsx("span", { className: "truncate font-medium", title: key, children: titleOf(key, ms) }), _jsx(GroupCount, { children: ms.length })] })) : (rollCell(f, ms, 'fold')) }, f.key))), add && _jsx(TableCell, {})] }), openParts.has(k) && ms.map((p) => partRow(p, subgroup?.name))] }, k));
     };
     const rowsOf = (list, scope) => {
         const under = folds ? subgroup?.under : undefined;
@@ -957,7 +963,7 @@ function LumenTableRows({ domain, columns = domain.fields, rows, groupBy = null,
                                                                                 const n = new Set(c);
                                                                                 n.has(key) ? n.delete(key) : n.add(key);
                                                                                 return n;
-                                                                            }), children: [_jsx(ChevronRightIcon, { className: cn('transition-transform', open && 'rotate-90') }), _jsx(GroupMark, { field: groupBy, value: key }), _jsx("span", { className: "truncate", children: key }), _jsx("span", { className: "num shrink-0 font-normal text-muted-foreground", children: serverGroups
+                                                                            }), children: [_jsx(ChevronRightIcon, { className: cn('transition-transform', open && 'rotate-90') }), _jsx(GroupMark, { field: groupBy, value: key }), _jsx("span", { className: "truncate", children: key }), _jsx(GroupCount, { children: serverGroups
                                                                                     ? (served.get(key)?.n?.toLocaleString() ?? '')
                                                                                     : members.length })] }), groupActions?.(key, members.map((m) => m.original))] }) }, f.key)) : (_jsx(TableCell, { ...col(f, PINNED_GROUP), children: !serverGroups &&
                                                                 rollCell(f, members.map((m) => m.original), 'group') }, f.key))), add && _jsx(TableCell, { className: PINNED_GROUP })] }), open && (serverGroups ? servedRows(members, key) : drawn(members, key))] }, key));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@columenlabs/lumen-ui",
-  "version": "0.1.261",
+  "version": "0.1.262",
   "description": "Lumen: shared React components (frame, views, widgets, charts, drawers).",
   "license": "MIT",
   "type": "module",
@@ -49,7 +49,7 @@
     "@codemirror/lang-javascript": "6.2.5",
     "@codemirror/lang-json": "6.0.2",
     "@codemirror/lang-sql": "6.10.0",
-    "@columenlabs/lumen-ui-types": "0.1.261",
+    "@columenlabs/lumen-ui-types": "0.1.262",
     "@dnd-kit/core": "6.3.1",
     "@dnd-kit/sortable": "10.0.0",
     "@dnd-kit/utilities": "3.2.2",