wiki-formant 0.33.0 → 0.34.0

package/README.md

@@ -641,8 +641,10 @@ address and browser under a salt that is replaced every UTC day, and the old
 salt is deleted, so a visitor is told apart within a day and never followed
 into the next. Rows are kept 400 days. The package owns the SQL and the app
 owns the connection: `Sql` is one function that runs a statement with `$1, $2…`
-placeholders, and the three tables it needs are stated as Prisma models at the
-top of `src/analytics.ts`.
+placeholders, and the four tables it needs are stated as Prisma models at the
+top of `src/analytics.ts`. The fourth, `ViewDay`, holds days a site counted
+elsewhere before it counted its own; `digest` adds them to any window that
+reaches back that far, and a site with no such history leaves it empty.
 
 ```ts
 // src/lib/track.ts
@@ -722,7 +724,7 @@ export const POST = gate.route;
 // src/app/stats/page.tsx
 if (!(await gate.signedIn((await cookies()).get(gate.cookie)?.value)))
   return <PasskeyButton endpoint="/api/passkey" invite={invite} create={await gate.open()} />;
-const days = statsDays((await searchParams).days); // 1, 7, 30 or 90, else 30
+const days = statsDays((await searchParams).days); // 1, 7, 30, 90 or 365, else 30
 return <Stats digest={await digest(sql, { days })} days={days} />;
 ```
 

package/dist/analytics.d.ts

@@ -111,7 +111,8 @@ export interface Digest {
 /**
  * Everything a report needs about one site's last `days` days, in one query.
  * Visitor figures count distinct visitors, so a person who comes back on
- * another day counts once for each day.
+ * another day counts once for each day. Days in `ViewDay` add to the visitor,
+ * page, source, country, device and per-day figures; events have no history.
  */
 export declare function digest(sql: Sql, { site, days, handle, siblings, gaps, ownAgents }: DigestOptions): Promise<Digest>;
 /**

package/dist/analytics.js

@@ -14,7 +14,7 @@
 //
 // The package owns the SQL; the app owns the connection. `Sql` is one function
 // that runs a parameterised statement, which Prisma, `pg` and postgres.js can
-// all supply in a line. The app declares the three tables in its own schema,
+// all supply in a line. The app declares the four tables in its own schema,
 // so `prisma db push` keeps them:
 //
 //   model View {
@@ -45,6 +45,28 @@
 //     value String
 //   }
 //
+//   model ViewDay {
+//     siteId     String   @default("")
+//     day        DateTime @db.Date
+//     visitors   Int
+//     pageviews  Int
+//     visits     Int
+//     bounces    Int
+//     seconds    Int
+//     pages      Json     @default("{}")
+//     entryPages Json     @default("{}")
+//     sources    Json     @default("{}")
+//     countries  Json     @default("{}")
+//     devices    Json     @default("{}")
+//     @@id([siteId, day])
+//   }
+//
+// `ViewDay` holds days a site counted somewhere else before it counted its
+// own, one row a day with each breakdown as `{ value: visitors }`. Nothing
+// writes or deletes it: the app loads it once, and `digest` adds the days in a
+// window to the views. Summing days agrees with the views, whose visitor is
+// one browser on one day. A site with no history leaves it empty.
+//
 // `siteId` is "" in an app that serves one site. A multi-tenant app passes its
 // own site key to every call.
 //
@@ -169,13 +191,16 @@ export const SEARCH_GAPS = { event: 'Search Query', prop: 'q', where: { results:
 /**
  * Everything a report needs about one site's last `days` days, in one query.
  * Visitor figures count distinct visitors, so a person who comes back on
- * another day counts once for each day.
+ * another day counts once for each day. Days in `ViewDay` add to the visitor,
+ * page, source, country, device and per-day figures; events have no history.
  */
 export async function digest(sql, { site = '', days, handle, siblings = [], gaps = [SEARCH_GAPS], ownAgents = ['-mcp-test', 'radix-studio'] }) {
     // The window is the database's clock, which stamped the rows; the app's can run behind it.
     const values = [site, Math.max(1, Math.round(days))];
     const $ = (v) => `$${values.push(v)}`;
     const list = (select, limit, order = '2 DESC, 1') => `(SELECT coalesce(json_agg(t), '[]') FROM (${select} ORDER BY ${order}${limit ? ` LIMIT ${limit}` : ''}) t)`;
+    /** A ranked list from the views, plus the same breakdown from `ViewDay`. */
+    const merged = (label, column, live) => `SELECT k AS ${label}, sum(n) AS visitors FROM (${live} UNION ALL SELECT key, value::int FROM a, jsonb_each_text(a."${column}")) t(k, n) GROUP BY 1`;
     const gapSelects = gaps.map(g => {
         const prop = $(g.prop);
         return `(SELECT props->>${prop} AS query, count(*) AS events FROM e
@@ -195,23 +220,41 @@ export async function digest(sql, { site = '', days, handle, siblings = [], gaps
       FROM numbered GROUP BY visitor, visit
     ), e AS (
       SELECT name, props, visitor FROM "Event" WHERE "siteId" = $1 AND "createdAt" >= now() - make_interval(days => $2::int)
+    ), a AS (
+      SELECT * FROM "ViewDay" WHERE "siteId" = $1 AND day >= (now() AT TIME ZONE 'UTC' - make_interval(days => $2::int))::date
+    ), sessions AS (
+      SELECT sum(bounces) AS bounces, sum(visits) AS visits, sum(seconds) AS seconds FROM (
+        SELECT count(*) FILTER (WHERE views = 1), count(*), coalesce(sum(seconds), 0) FROM visits
+        UNION ALL SELECT coalesce(sum(bounces), 0), coalesce(sum(visits), 0), coalesce(sum(seconds), 0) FROM a
+      ) s(bounces, visits, seconds)
+    ), src AS (
+      SELECT coalesce(source, '(none)') AS source, count(DISTINCT visitor) AS visitors FROM visits GROUP BY 1
+      UNION ALL SELECT key, value::int FROM a, jsonb_each_text(a.sources)
+    ), archived AS (
+      SELECT coalesce(sum(visitors), 0) AS visitors, coalesce(sum(pageviews), 0) AS pageviews FROM a
     )
     SELECT json_build_object(
-      'visitors', (SELECT count(DISTINCT visitor) FROM v),
-      'pageviews', (SELECT count(*) FROM v),
-      'bounce_rate', (SELECT round(100.0 * count(*) FILTER (WHERE views = 1) / nullif(count(*), 0)) FROM visits),
-      'visit_duration', (SELECT round(avg(seconds)) FROM visits),
-      'visitors_incl_agents', (SELECT count(DISTINCT visitor) FROM (SELECT visitor FROM v UNION SELECT visitor FROM e) a),
+      'visitors', (SELECT count(DISTINCT visitor) FROM v) + (SELECT visitors FROM archived),
+      'pageviews', (SELECT count(*) FROM v) + (SELECT pageviews FROM archived),
+      'bounce_rate', (SELECT round(100.0 * bounces / nullif(visits, 0)) FROM sessions),
+      'visit_duration', (SELECT round(seconds / nullif(visits, 0)) FROM sessions),
+      'visitors_incl_agents', (SELECT count(DISTINCT visitor) FROM (SELECT visitor FROM v UNION SELECT visitor FROM e) u) + (SELECT visitors FROM archived),
       'previous_visitors', (SELECT count(DISTINCT visitor) FROM "View"
-        WHERE "siteId" = $1 AND "createdAt" >= now() - make_interval(days => 2 * $2::int) AND "createdAt" < now() - make_interval(days => $2::int)),
-      'top_sources', ${list(`SELECT coalesce(source, '(none)') AS source, count(DISTINCT visitor) AS visitors FROM visits GROUP BY 1`, 6)},
-      'top_pages', ${list('SELECT path AS page, count(DISTINCT visitor) AS visitors FROM v GROUP BY 1', 6)},
-      'entry_pages', ${list('SELECT entry AS page, count(DISTINCT visitor) AS visitors FROM visits GROUP BY 1', 6)},
+        WHERE "siteId" = $1 AND "createdAt" >= now() - make_interval(days => 2 * $2::int) AND "createdAt" < now() - make_interval(days => $2::int))
+        + (SELECT coalesce(sum(visitors), 0) FROM "ViewDay" WHERE "siteId" = $1
+          AND day >= (now() AT TIME ZONE 'UTC' - make_interval(days => 2 * $2::int))::date
+          AND day < (now() AT TIME ZONE 'UTC' - make_interval(days => $2::int))::date),
+      'top_sources', ${list('SELECT source, sum(visitors) AS visitors FROM src GROUP BY 1', 6)},
+      'top_pages', ${list(merged('page', 'pages', 'SELECT path, count(DISTINCT visitor) FROM v GROUP BY 1'), 6)},
+      'entry_pages', ${list(merged('page', 'entryPages', 'SELECT entry, count(DISTINCT visitor) FROM visits GROUP BY 1'), 6)},
       'from_posts', ${list(`SELECT entry AS page, count(DISTINCT visitor) AS visitors FROM visits WHERE source = 'x' GROUP BY 1`, 15)},
-      'sibling_referrals', ${list(`SELECT source, count(DISTINCT visitor) AS visitors FROM visits WHERE source = ANY(${$(siblings)}::text[]) GROUP BY 1`, 6)},
-      'countries', ${list('SELECT country, count(DISTINCT visitor) AS visitors FROM v WHERE country IS NOT NULL GROUP BY 1', 10)},
-      'devices', ${list('SELECT device, count(DISTINCT visitor) AS visitors FROM v GROUP BY 1')},
-      'by_day', ${list(`SELECT to_char(at AT TIME ZONE 'UTC', 'YYYY-MM-DD') AS date, count(DISTINCT visitor) AS visitors FROM v GROUP BY 1`, undefined, '1')},
+      'sibling_referrals', ${list(`SELECT source, sum(visitors) AS visitors FROM src WHERE source = ANY(${$(siblings)}::text[]) GROUP BY 1`, 6)},
+      'countries', ${list(merged('country', 'countries', 'SELECT country, count(DISTINCT visitor) FROM v WHERE country IS NOT NULL GROUP BY 1'), 10)},
+      'devices', ${list(merged('device', 'devices', 'SELECT device, count(DISTINCT visitor) FROM v GROUP BY 1'))},
+      'by_day', ${list(`SELECT date, sum(n) AS visitors FROM (
+          SELECT to_char(at AT TIME ZONE 'UTC', 'YYYY-MM-DD'), count(DISTINCT visitor) FROM v GROUP BY 1
+          UNION ALL SELECT to_char(day, 'YYYY-MM-DD'), visitors FROM a
+        ) t(date, n) GROUP BY 1`, undefined, '1')},
       'follow_clicks', ${handle
         ? `(SELECT json_build_object('events', count(*), 'visitors', count(DISTINCT visitor)) FROM e
               WHERE name = 'Outbound Link: Click' AND props->>'url' ILIKE ANY(${$([`%x.com/${handle}%`, `%twitter.com/${handle}%`])}::text[]))`

package/dist/base.css

@@ -186,7 +186,8 @@ pre:hover > .code-copy-btn,
 .stats-chart {
   display: flex;
   align-items: flex-end;
-  gap: 2px;
+  /* A year's bars on a phone would be all gap at 2px each. */
+  gap: min(2px, 100% / var(--bars, 1) / 4);
   height: 8rem;
   margin: 0;
   padding: 0;

package/dist/react-server.d.ts

@@ -277,7 +277,7 @@ export interface StatsProps {
     ranges?: readonly number[];
 }
 /** The windows the stats page offers, in days. */
-export declare const STATS_RANGES: readonly [1, 7, 30, 90];
+export declare const STATS_RANGES: readonly [1, 7, 30, 90, 365];
 /** A `?days=` value as one of `ranges`, else `fallback`: the page's only input. */
 export declare const statsDays: (param: unknown, ranges?: readonly number[], fallback?: number) => number;
 /**

package/dist/react-server.js

@@ -226,7 +226,7 @@ export function RevisionChanges({ changes, label = type => type }) {
     return (_jsx("ul", { className: "revision-changes", children: changes.map((c, i) => (_jsxs("li", { className: "revision-change", "data-action": c.action, children: [_jsx("span", { className: "revision-change-action", children: ACTION_LABEL[c.action] }), ` – ${label(c.type)} at ${blockLocation(c.path)}`, c.leafDiff && (_jsx("p", { className: "revision-diff", children: c.leafDiff.map(([op, text], j) => op === -1 ? _jsx("del", { children: text }, j) : op === 1 ? _jsx("ins", { children: text }, j) : _jsx("span", { children: text }, j)) }))] }, i))) }));
 }
 /** The windows the stats page offers, in days. */
-export const STATS_RANGES = [1, 7, 30, 90];
+export const STATS_RANGES = [1, 7, 30, 90, 365];
 /** A `?days=` value as one of `ranges`, else `fallback`: the page's only input. */
 export const statsDays = (param, ranges = STATS_RANGES, fallback = 30) => ranges.find(n => String(n) === param) ?? fallback;
 const count = (n) => n.toLocaleString('en');
@@ -278,5 +278,5 @@ export function Stats({ digest: d, days, ranges = STATS_RANGES }) {
     if (d.follow_clicks)
         figures.push(['Clicks to X', count(d.follow_clicks.events), null]);
     const rows = (list, k, m) => list.map(r => [r[k], r[m]]);
-    return (_jsxs("div", { className: "stats", children: [_jsx("nav", { className: "stats-ranges", "aria-label": "Window", children: ranges.map(n => (_jsx("a", { href: `?days=${n}`, "aria-current": n === days ? 'page' : undefined, children: n === 1 ? '24 hours' : `${n} days` }, n))) }), _jsx("dl", { className: "stats-figures", children: figures.map(([label, value, delta]) => (_jsxs("div", { children: [_jsx("dt", { children: label }), _jsxs("dd", { children: [value, delta && _jsx("small", { children: ` ${delta}` })] })] }, label))) }), _jsx("ol", { className: "stats-chart", "aria-label": "Visitors per day", children: series.map(([date, n]) => (_jsx("li", { title: `${date}: ${count(n)}`, style: { '--share': n / peak } }, date))) }), _jsxs("div", { className: "stats-lists", children: [_jsx(StatsList, { title: "Pages", rows: rows(d.top_pages, 'page', 'visitors') }), _jsx(StatsList, { title: "Entry pages", rows: rows(d.entry_pages, 'page', 'visitors') }), _jsx(StatsList, { title: "Sources", rows: rows(d.top_sources, 'source', 'visitors') }), _jsx(StatsList, { title: "From X posts", rows: rows(d.from_posts, 'page', 'visitors') }), _jsx(StatsList, { title: "Sibling sites", rows: rows(d.sibling_referrals, 'source', 'visitors') }), _jsx(StatsList, { title: "Countries", rows: rows(d.countries, 'country', 'visitors'), label: country }), _jsx(StatsList, { title: "Devices", rows: rows(d.devices, 'device', 'visitors') }), _jsx(StatsList, { title: "Agent tool calls", rows: rows(d.agent_tool_calls, 'tool', 'events') }), _jsx(StatsList, { title: "Searches that found nothing", rows: rows(d.gaps, 'query', 'events') })] })] }));
+    return (_jsxs("div", { className: "stats", children: [_jsx("nav", { className: "stats-ranges", "aria-label": "Window", children: ranges.map(n => (_jsx("a", { href: `?days=${n}`, "aria-current": n === days ? 'page' : undefined, children: n === 1 ? '24 hours' : `${n} days` }, n))) }), _jsx("dl", { className: "stats-figures", children: figures.map(([label, value, delta]) => (_jsxs("div", { children: [_jsx("dt", { children: label }), _jsxs("dd", { children: [value, delta && _jsx("small", { children: ` ${delta}` })] })] }, label))) }), _jsx("ol", { className: "stats-chart", "aria-label": "Visitors per day", style: { '--bars': series.length }, children: series.map(([date, n]) => (_jsx("li", { title: `${date}: ${count(n)}`, style: { '--share': n / peak } }, date))) }), _jsxs("div", { className: "stats-lists", children: [_jsx(StatsList, { title: "Pages", rows: rows(d.top_pages, 'page', 'visitors') }), _jsx(StatsList, { title: "Entry pages", rows: rows(d.entry_pages, 'page', 'visitors') }), _jsx(StatsList, { title: "Sources", rows: rows(d.top_sources, 'source', 'visitors') }), _jsx(StatsList, { title: "From X posts", rows: rows(d.from_posts, 'page', 'visitors') }), _jsx(StatsList, { title: "Sibling sites", rows: rows(d.sibling_referrals, 'source', 'visitors') }), _jsx(StatsList, { title: "Countries", rows: rows(d.countries, 'country', 'visitors'), label: country }), _jsx(StatsList, { title: "Devices", rows: rows(d.devices, 'device', 'visitors') }), _jsx(StatsList, { title: "Agent tool calls", rows: rows(d.agent_tool_calls, 'tool', 'events') }), _jsx(StatsList, { title: "Searches that found nothing", rows: rows(d.gaps, 'query', 'events') })] })] }));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wiki-formant",
-  "version": "0.33.0",
+  "version": "0.34.0",
   "description": "The portable half of a wiki: derived taxonomy and facet controls, a version-negotiating MCP transport, markdown twins, block rendering, a rich-text editor engine, conditional-GET plumbing, and the headers and CSP every origin sends.",
   "type": "module",
   "license": "MIT",