@nstarkman/data-resolver 20261023.0.1 → 20261028.0.0

package/CHANGELOG.md

@@ -3,6 +3,13 @@
 Versions are dates, `YYYYMMDD.0.N`; the four research-kit packages are released together at one
 version. A breaking change says how to migrate.
 
+## 20261028.0.0
+
+### Changed
+
+- Released with `@nstarkman/collaborator-map` 20261028.0.0. `collect()` is unchanged: a paper's
+  snapshot keeps the people among its authors, which now includes the site's author.
+
 ## 20261023.0.1
 
 ### Fixed

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nstarkman/data-resolver",
-  "version": "20261023.0.1",
+  "version": "20261028.0.0",
   "description": "The nstarkman.space data layer as a store, and the collector a paper site snapshots from.",
   "type": "module",
   "license": "MIT",

package/src/inline.js

@@ -10,6 +10,7 @@
 
 import { dateLabel } from '@nstarkman/research-store';
 import { sortAchievements } from './mentees.js';
+import { money } from './money.js';
 
 // `[text](https://…)` for the web, and `[text](item:some-id)` to point at
 // another entry on the same CV — the CV cross-references itself (a position
@@ -75,16 +76,66 @@ export function lines(long, base = '') {
  * The extra lines go last, after the thesis and supervisors, so a line index
  * means the same thing whether or not they are included — the builder ticks
  * lines by index, and inserting in the middle would silently move its ticks.
+ * A talk's title (`talk`) is the exception that proves it: it comes first, in
+ * quotation marks, because it is what a presentation's first line always was.
  */
-export function detailLines(item, { complete = false } = {}) {
+export function detailLines(item, { complete = false, currency, forms = false } = {}) {
+  const prose = (long) => amountLines(long, item, { currency, forms }).map(noFinalPeriod);
   return [
-    ...lines(item.details),
-    ...(item.thesis ? [spans(`Thesis: ${item.thesis}`)] : []),
-    ...(item.supervisors?.length ? [spans(`Supervisors: ${item.supervisors.join(', ')}`)] : []),
-    ...(complete ? lines(item.detailsComplete) : []),
+    ...(item.talk ? [quoted(item.talk)] : []),
+    ...prose(item.details),
+    ...(item.thesis ? [noFinalPeriod(spans(`Thesis: ${item.thesis}`))] : []),
+    ...(item.supervisors?.length ? [noFinalPeriod(spans(`Supervisors: ${item.supervisors.join(', ')}`))] : []),
+    ...(complete ? prose(item.detailsComplete) : []),
   ];
 }
 
+/**
+ * A title as a line in quotation marks: “…”. The marks belong to the rendering, not the record,
+ * and a double quote inside the title becomes a single one. The closing mark follows the title
+ * without its final period, as any line under a heading has none.
+ */
+export function quoted(title) {
+  const inner = title.replace(/["“]([^"”]*)["”]/g, '‘$1’');
+  return [{ t: '“' }, ...noFinalPeriod(spans(inner)), { t: '”' }];
+}
+
+/**
+ * A CV line is a label or a phrase under a heading, so it does not end in a period: the
+ * last span loses one. A line ending in an abbreviation ("et al.", "etc.") or an ellipsis
+ * keeps it. The record is not changed, only what is shown.
+ */
+export const KEEPS_PERIOD = /(\.\.|\b(?:al|etc|Jr|Sr|Inc|vs|St|Co|Ltd)\.)$/;
+export function noFinalPeriod(line) {
+  const last = line[line.length - 1];
+  if (!last || !last.t) return line;
+  const t = last.t.trimEnd();
+  if (!t.endsWith('.') || KEEPS_PERIOD.test(t)) return line;
+  const rest = t.slice(0, -1);
+  return rest ? [...line.slice(0, -1), { ...last, t: rest }] : line.slice(0, -1);
+}
+
+/**
+ * `lines`, with `{amount}` standing for the item's `amount` written as `money` writes
+ * it in `currency`: so a figure in prose is stored once, in the data, and follows
+ * the CV's currency style. With `forms` the span carries all three forms, for the
+ * builder's page to swap; a token on an item with no `amount` is left as it is,
+ * which the data tests refuse.
+ */
+function amountLines(long, item, { currency, forms }) {
+  const token = '{amount}';
+  return (Array.isArray(long) ? long : [long]).filter(Boolean).map((line) => {
+    if (!item.amount || !line.includes(token)) return spans(line);
+    return line.split(token).flatMap((piece, k) => [
+      ...(k ? [{
+        t: money(item.amount, currency),
+        ...(forms && { forms: { code: money(item.amount), us: money(item.amount, 'us'), dollar: money(item.amount, 'dollar') } }),
+      }] : []),
+      ...spans(piece),
+    ]);
+  });
+}
+
 /**
  * A mentee's marked achievements, one span array per line, oldest first so the
  * entry reads as a progression. They follow everything `detailLines` returns,

package/src/money.js

@@ -0,0 +1,16 @@
+// How an `amount` is written. Pure, and its own module so the store and the prose
+// expansion in inline.js can both use it without importing each other.
+
+/** By style: `us` replaces the D with a sign, `dollar` gives US dollars the bare
+ *  sign. A currency with no sign keeps its code. */
+const SIGNS = { us: { USD: 'US$', CAD: 'CA$' }, dollar: { USD: '$', CAD: 'CA$' } };
+
+/** "USD 10,000", "CAD 20,000–30,000 p.a.", or null; in a `style`, "US$10,000",
+ *  "$10,000", "CA$20,000–30,000 p.a.". The code is the default. */
+export function money(a, style) {
+  if (!a) return null;
+  const n = (v) => v.toLocaleString('en-US');
+  const span = a.valueMax ? `${n(a.value)}–${n(a.valueMax)}` : n(a.value);
+  const sign = SIGNS[style]?.[a.currency];
+  return `${sign ?? `${a.currency} `}${span}${a.perAnnum ? ' p.a.' : ''}`;
+}

package/src/store.js

@@ -3,6 +3,8 @@
 // given — the website's whole data/ (its src/lib/data.js), or the slice of it a paper
 // site keeps (collect.js). Moved here from src/lib/data.js unchanged but for that.
 
+import { money } from './money.js';
+
 /**
  * Partial dates (YYYY, YYYY-MM, YYYY-MM-DD) compare correctly as strings, so a
  * month orders items inside a year even though only the year is ever shown.
@@ -291,14 +293,6 @@ export function createStore({ items: given, lists = new Map(), config }) {
     return stops;
   }
 
-  /** "USD 10,000", "CAD 20,000\u201330,000 p.a.", or null. */
-  function money(a) {
-    if (!a) return null;
-    const n = (v) => v.toLocaleString('en-US');
-    const span = a.valueMax ? `${n(a.value)}\u2013${n(a.valueMax)}` : n(a.value);
-    return `${a.currency} ${span}${a.perAnnum ? ' p.a.' : ''}`;
-  }
-
   /** "The Astrophysical Journal 979, 155"; short, "ApJ 979, 155", where
    * config/journals.json has the journal's short name. */
   function venueLine(item, { short = false } = {}) {
@@ -355,6 +349,9 @@ export function createStore({ items: given, lists = new Map(), config }) {
     event: 'link', homepage: 'link',
   };
 
+  /** A link's mark: its rel's, but a school's homepage is a graduation cap. */
+  const linkIcon = (item, l) => (item.type === 'education' && l.rel === 'homepage' ? 'cap' : REL_ICON[relKey(l)] ?? 'link');
+
   /**
    * The one link a title points at: the article, else the preprint, else its
    * ADS record, else null. The ADS link is synthesised as a `paper` rel, so it
@@ -465,5 +462,5 @@ export function createStore({ items: given, lists = new Map(), config }) {
     return { start, end };
   }
 
-  return { items, lists, config, byType, featured, resolve, titleOf, splitTitle, HIGHLIGHT_TOPICS, SOFTWARE_GROUPS, displayName, authorPosition, venueUrl, softwarePapers, softwareUsed, affiliationAt, authors, positionStops, money, venueLine, year, dateLabel, relKey, REL_ICON, primaryLink, links, assists, assistItem, groupedByDefault, institutionGroups, groupTitle, groupDate };
+  return { items, lists, config, byType, featured, resolve, titleOf, splitTitle, HIGHLIGHT_TOPICS, SOFTWARE_GROUPS, displayName, authorPosition, venueUrl, softwarePapers, softwareUsed, affiliationAt, authors, positionStops, money, venueLine, year, dateLabel, relKey, REL_ICON, linkIcon, primaryLink, links, assists, assistItem, groupedByDefault, institutionGroups, groupTitle, groupDate };
 }