@diagrammo/dgmo 0.72.0 → 0.73.0

package/dist/{chunk-5DYDPP7K.js → chunk-ZQ5SROS2.js}

@@ -1,9 +1,10 @@
 import {
   monthIndex,
   resolveNext,
+  ruleFromAnchor,
   targetToMs,
   weekdayIndex
-} from "./chunk-OQKP2X3D.js";
+} from "./chunk-WFA6IULY.js";
 import {
   normalizeDate
 } from "./chunk-DAOFNU6J.js";
@@ -12,14 +13,47 @@ import {
   fillModeFromToken,
   measureIndent,
   parseFirstLine
-} from "./chunk-ZJJWON5O.js";
+} from "./chunk-MK55PZVB.js";
 import {
   makeDgmoError,
   makeFail
-} from "./chunk-OLMWTJVU.js";
+} from "./chunk-5SI6T5A5.js";
 
 // src/countdown/parser.ts
-var TIME_24H_RE = /^(\d{1,2}):(\d{2})$/;
+var RETIRED_SLOTS = /* @__PURE__ */ new Set(["on", "at", "from"]);
+function retiredSlotMessage(slot) {
+  if (slot === "at")
+    return "`at` is gone \u2014 the time rides the anchor: `since 2026-01-05T18:00`, then `every week`.";
+  if (slot === "from")
+    return "`from` is gone \u2014 the anchor is `since <date>`: `since 2026-07-03`, then `every 2 weeks`.";
+  return "`on` is gone \u2014 the date lives in `since`: `since 2026-08-21`, then `every year`.";
+}
+function parseCadence(toks) {
+  const low = toks.map((t) => t.toLowerCase());
+  const head = low[0] ?? "";
+  if (low.length === 1) {
+    if (head === "year") return { kind: "year" };
+    if (head === "week") return { kind: "week" };
+    if (head === "month") return { kind: "month" };
+    if (head === "day") return { kind: "interval", n: 1, unit: "day" };
+    return null;
+  }
+  if (head === "month" && low[1] === "by") {
+    if (low[2] === "weekday" && low.length === 3)
+      return { kind: "month-weekday", last: false };
+    if (low[2] === "last" && low[3] === "weekday" && low.length === 4)
+      return { kind: "month-weekday", last: true };
+    return null;
+  }
+  if (low.length === 2 && /^\d+$/.test(head)) {
+    const unit = low[1].replace(/s$/, "");
+    if (unit === "day" || unit === "week" || unit === "month") {
+      const n = Number(head);
+      if (n >= 1) return { kind: "interval", n, unit };
+    }
+  }
+  return null;
+}
 var AMPM_RE = /^(\d{1,2})(?::(\d{2}))?\s*([ap]m)$/i;
 function targetToMs2(target, tz = null) {
   const ms = targetToMs(target, tz);
@@ -33,33 +67,6 @@ function isValidZone(zone) {
     return false;
   }
 }
-function ordinalToken(tok) {
-  const t = tok.toLowerCase();
-  if (t === "last") return -1;
-  const m = t.match(/^(\d+)(?:st|nd|rd|th)?$/);
-  if (m) {
-    const n = Number(m[1]);
-    return n >= 1 && n <= 5 ? n : null;
-  }
-  return null;
-}
-function parse24h(tok) {
-  const m = tok.match(TIME_24H_RE);
-  if (!m) return null;
-  const hour = Number(m[1]);
-  const minute = Number(m[2]);
-  if (hour > 23 || minute > 59) return null;
-  return { hour, minute };
-}
-function parseAt(rest, lineNum, softError) {
-  const tok = rest.trim();
-  const t = parse24h(tok);
-  if (t) return t;
-  const fixed = ampmTo24h(tok);
-  if (fixed) return parse24h(fixed);
-  softError(lineNum, `"at" needs a time like 18:00 or 6:30pm (got "${rest}").`);
-  return null;
-}
 function ampmTo24h(tok) {
   const m = tok.match(AMPM_RE);
   if (!m) return null;
@@ -80,7 +87,7 @@ function parseCountdown(content, palette) {
     resolvedMs: null,
     hasTime: false,
     tz: null,
-    since: null,
+    sinceMs: null,
     sinceLabel: null,
     units: "human",
     round: "up",
@@ -104,16 +111,13 @@ function parseCountdown(content, palette) {
   const lines = content.split("\n");
   let headerParsed = false;
   let cadence = null;
-  let intervalN = 1;
-  let intervalUnit = "day";
-  let onSpec = null;
-  let atTime = null;
+  let sinceRaw = null;
+  let sinceLine = 0;
+  let sinceMs = null;
+  let sinceHasTime = false;
   let targetRaw = null;
   let targetIsNow = false;
   let targetLine = 1;
-  let fromRaw = null;
-  let fromLine = 1;
-  let anchorMs = null;
   let targetMs = null;
   let hasTargetLine = false;
   let hasEvery = false;
@@ -178,73 +182,23 @@ function parseCountdown(content, palette) {
       // (each slot may also appear on its own line — handled below.)
       case "every": {
         hasEvery = true;
-        const seg = {
-          cadence: [],
-          on: [],
-          at: [],
-          from: []
-        };
-        let cur = "cadence";
-        for (const tok of rest.split(/\s+/).filter(Boolean)) {
-          const low = tok.toLowerCase();
-          if (low === "on" || low === "at" || low === "from") cur = low;
-          else seg[cur].push(tok);
-        }
-        const head = (seg.cadence[0] ?? "").toLowerCase();
-        const bareInterval = (head === "day" || head === "week" || head === "month") && seg.from.length > 0 && seg.on.length === 0;
-        if (bareInterval) {
-          cadence = "interval";
-          intervalN = 1;
-          intervalUnit = head;
-        } else if (head === "year" || head === "month" || head === "week") {
-          cadence = head;
-        } else if (head === "day") {
-          softError(
-            lineNum,
-            "`every day` needs `from <date>` (an interval anchor)."
-          );
-          break;
-        } else if (/^\d+$/.test(head) && seg.cadence[1]) {
-          const unit = seg.cadence[1].toLowerCase().replace(/s$/, "");
-          if (unit === "day" || unit === "week" || unit === "month") {
-            cadence = "interval";
-            intervalN = Number(head);
-            intervalUnit = unit;
-          } else {
-            softError(
-              lineNum,
-              `every ${head} <days|weeks|months> \u2014 unknown unit "${seg.cadence[1]}".`
-            );
-          }
-        } else {
+        const toks = rest.split(/\s+/).filter(Boolean);
+        const stray = toks.find((t) => RETIRED_SLOTS.has(t.toLowerCase()));
+        if (stray)
+          return fail(lineNum, retiredSlotMessage(stray.toLowerCase()));
+        const parsed = parseCadence(toks);
+        if (!parsed) {
           emitFreeProseError(lineNum, rest, softError);
           break;
         }
-        if (seg.on.length)
-          onSpec = parseOn(seg.on.join(" "), lineNum, softError);
-        if (seg.at.length)
-          atTime = parseAt(seg.at.join(" "), lineNum, softError);
-        if (seg.from.length) {
-          fromRaw = seg.from.join(" ");
-          fromLine = lineNum;
-        }
-        break;
-      }
-      // Standalone slot lines (lenient multi-line form).
-      case "on": {
-        onSpec = parseOn(rest, lineNum, softError);
-        break;
-      }
-      case "at": {
-        const t = parseAt(rest, lineNum, softError);
-        if (t) atTime = t;
-        break;
-      }
-      case "from": {
-        fromRaw = rest;
-        fromLine = lineNum;
+        cadence = parsed;
         break;
       }
+      // The standalone slot lines are retired alongside their `every` slots.
+      case "on":
+      case "at":
+      case "from":
+        return fail(lineNum, retiredSlotMessage(key));
       // ── Universal date directives (§ BL-121) ──
       case "date-order": {
         const v = rest.toLowerCase();
@@ -261,9 +215,8 @@ function parseCountdown(content, palette) {
       }
       // ── Ordinal / since — numbers a yearly occurrence (resolvedYear − since) ──
       case "since": {
-        const y = Number(rest);
-        if (Number.isInteger(y) && y > 0) result.since = y;
-        else softError(lineNum, `"since" needs a year (got "${rest}").`);
+        sinceRaw = rest;
+        sinceLine = lineNum;
         break;
       }
       // The eyebrow template: `Nth` → ordinal word, `N` → the number.
@@ -368,177 +321,99 @@ function parseCountdown(content, palette) {
       }
     }
   }
-  if (fromRaw !== null) {
-    const iso = normalizeDate(fromRaw, { order: dateOrder, year: baseYear });
-    const ms = targetToMs2(iso ?? fromRaw, result.tz);
+  if (sinceRaw !== null) {
+    if (/^\d{4}$/.test(sinceRaw.trim())) {
+      return fail(
+        sinceLine,
+        `"since" needs a full date now (got the bare year "${sinceRaw.trim()}") \u2014 write \`since ${sinceRaw.trim()}-06-14\`. The month and day that used to sit on \`every \u2026 on\` come from here.`
+      );
+    }
+    const iso = normalizeDate(sinceRaw, { order: dateOrder, year: baseYear });
+    const effective = iso ?? sinceRaw;
+    const ms = targetToMs2(effective, result.tz);
     if (ms === null) {
-      softError(fromLine, `"from" needs an anchor date (got "${fromRaw}").`);
-    } else {
-      anchorMs = ms;
+      return fail(
+        sinceLine,
+        `"since" needs a date or datetime (got "${sinceRaw}").`
+      );
     }
+    sinceMs = ms;
+    sinceHasTime = effective.includes(":");
   }
-  if (hasEvery && hasTargetLine) {
-    softError(
-      result.titleLineNumber ?? 1,
-      "A countdown has either `target` (one-shot) or `every` (recurring), not both."
+  const titleLine = result.titleLineNumber ?? 1;
+  if ((hasEvery || sinceRaw !== null) && hasTargetLine) {
+    return fail(
+      titleLine,
+      "A countdown has either `target` (one-shot) or `since`/`every` (recurring), not both."
     );
   }
-  if (result.expired !== null && hasEvery) {
+  if (hasEvery && sinceMs === null) {
+    return fail(
+      titleLine,
+      "`every` needs a `since <date>` to recur from \u2014 it carries the cadence, the anchor carries the date."
+    );
+  }
+  if (result.expired !== null && (hasEvery || sinceMs !== null)) {
     warn(
-      result.titleLineNumber ?? 1,
+      titleLine,
       "`expired` applies only to one-shot `target` blocks; recurring blocks roll forward."
     );
   }
-  if (hasEvery && cadence) {
-    const rule = assembleRule(
-      cadence,
-      { intervalN, intervalUnit, anchorMs },
-      onSpec,
-      atTime,
-      result.titleLineNumber ?? 1,
-      softError
+  if (sinceMs !== null) {
+    const rule = ruleFromAnchor(
+      cadence ?? { kind: "year" },
+      sinceMs,
+      !sinceHasTime,
+      result.tz
     );
-    if (rule) {
-      const tzRule = result.tz ? { ...rule, tz: result.tz } : rule;
-      result.rule = tzRule;
-      result.resolvedMs = resolveNext(tzRule, Date.now());
-      if (atTime) result.hasTime = true;
-    }
+    result.rule = rule;
+    result.resolvedMs = resolveNext(rule, Date.now());
+    result.sinceMs = sinceMs;
+    if (sinceHasTime) result.hasTime = true;
   } else if (targetMs !== null) {
     result.targetMs = targetMs;
     result.resolvedMs = targetMs;
   }
   if (result.resolvedMs === null && result.error === null) {
-    if (!hasEvery && !hasTargetLine) {
+    if (!hasTargetLine && sinceRaw === null) {
       softError(
-        result.titleLineNumber ?? 1,
-        "Missing `target` or `every` \u2014 a countdown needs one."
+        titleLine,
+        "Missing `target` (one-shot) or `since <date>` (recurring) \u2014 a countdown needs one."
       );
     }
   }
   return result;
 }
-function parseOn(rest, lineNum, softError) {
-  const toks = rest.split(/\s+/).filter(Boolean);
-  if (toks.length === 0) {
-    softError(
-      lineNum,
-      '"on" needs a target (e.g. "Aug 21", "3rd Tuesday", "Friday").'
-    );
-    return null;
-  }
-  const ord = ordinalToken(toks[0]);
-  if (ord !== null && toks[1]) {
-    const wd2 = weekdayIndex(toks[1]);
-    if (wd2 === null) {
-      softError(lineNum, `"${toks[1]}" is not a weekday.`);
-      return null;
-    }
-    return { nth: ord, weekday: wd2 };
-  }
-  const mo = monthIndex(toks[0]);
-  if (mo !== null && toks[1]) {
-    const day = Number(toks[1].replace(/(st|nd|rd|th)$/i, ""));
-    if (!Number.isInteger(day) || day < 1 || day > 31) {
-      softError(lineNum, `"${toks[1]}" is not a valid day of month.`);
-      return null;
-    }
-    return { month: mo, day };
-  }
-  const wd = weekdayIndex(toks[0]);
-  if (wd !== null) return { weekday: wd };
-  softError(
-    lineNum,
-    `"on ${rest}" \u2014 use "Aug 21", "3rd Tuesday", "last Friday", or a weekday.`
-  );
-  return null;
-}
-function assembleRule(cadence, interval, onSpec, atTime, lineNum, softError) {
-  const hour = atTime?.hour ?? 0;
-  const minute = atTime?.minute ?? 0;
-  const allDay = atTime === null;
-  if (cadence === "interval") {
-    return {
-      kind: "interval",
-      intervalN: interval.intervalN,
-      intervalUnit: interval.intervalUnit,
-      anchorMs: interval.anchorMs ?? void 0,
-      hour,
-      minute,
-      allDay
-    };
-  }
-  if (cadence === "year") {
-    if (onSpec?.month === void 0 || onSpec.day === void 0) {
-      softError(
-        lineNum,
-        "`every year` needs `on <Month> <Day>` (e.g. on Aug 21)."
-      );
-      return null;
-    }
-    return {
-      kind: "month-day",
-      month: onSpec.month,
-      day: onSpec.day,
-      hour,
-      minute,
-      allDay
-    };
-  }
-  if (cadence === "month") {
-    if (onSpec?.nth === void 0 || onSpec.weekday === void 0) {
-      softError(
-        lineNum,
-        "`every month` needs `on <nth> <weekday>`, `on last <weekday>`, or `from <date>`."
-      );
-      return null;
-    }
-    return onSpec.nth < 0 ? { kind: "last-weekday", weekday: onSpec.weekday, hour, minute, allDay } : {
-      kind: "nth-weekday",
-      nth: onSpec.nth,
-      weekday: onSpec.weekday,
-      hour,
-      minute,
-      allDay
-    };
-  }
-  if (onSpec?.weekday === void 0 || onSpec.nth !== void 0) {
-    softError(lineNum, "`every week` needs `on <weekday>` (e.g. on Friday).");
-    return null;
-  }
-  return { kind: "weekly", weekday: onSpec.weekday, hour, minute, allDay };
-}
 function emitFreeProseError(lineNum, rest, softError) {
   const toks = rest.split(/\s+/).filter(Boolean);
   const problems = [];
-  let onPart = "";
-  let atPart = "";
+  let suggestion = "every year";
   for (let i = 0; i < toks.length; i++) {
     const tok = toks[i];
     const fixed = ampmTo24h(tok);
     if (fixed) {
-      problems.push(`"${tok}": use 24h time (${fixed})`);
-      atPart = ` at ${fixed}`;
+      problems.push(
+        `"${tok}": a time belongs on the anchor (since \u2026T${fixed})`
+      );
+      continue;
+    }
+    if (weekdayIndex(tok) !== null) {
+      problems.push(`"${tok}": a weekday belongs on the anchor`);
+      suggestion = "every week";
       continue;
     }
-    const wd = weekdayIndex(tok);
-    if (wd !== null) onPart = `week on ${tok}`;
-    const mo = monthIndex(tok);
-    if (mo !== null && toks[i + 1] && /^\d/.test(toks[i + 1])) {
-      onPart = `year on ${tok} ${toks[i + 1]}`;
+    if (monthIndex(tok) !== null && toks[i + 1] && /^\d/.test(toks[i + 1])) {
+      problems.push(`"${tok} ${toks[i + 1]}": a date belongs on the anchor`);
+      suggestion = "every year";
     }
   }
-  if (!onPart && !atPart) {
+  if (problems.length === 0)
     problems.push(
-      "bare cadence \u2014 use year | month | week | N days|weeks|months"
+      "unknown cadence \u2014 use year | month | month by [last] weekday | week | day | N days|weeks|months"
     );
-  } else if (onPart.startsWith("week")) {
-    problems.push("bare weekday needs a cadence");
-  }
-  const suggestion = onPart ? `every ${onPart}${atPart}` : `every week \u2026${atPart}`;
   softError(
     lineNum,
-    `Free-form recurrence rejected. ${problems.join("; ")}. Try: ${suggestion}`
+    `\`every\` takes a cadence only. ${problems.join("; ")}. Try: \`since <date>\` + \`${suggestion}\`.`
   );
 }
 
@@ -546,4 +421,4 @@ export {
   targetToMs2 as targetToMs,
   parseCountdown
 };
-//# sourceMappingURL=chunk-5DYDPP7K.js.map
+//# sourceMappingURL=chunk-ZQ5SROS2.js.map

package/dist/completion-registry.js

@@ -1,17 +1,17 @@
 import {
   ALL_MARKERS
-} from "./chunk-I55PVEIX.js";
+} from "./chunk-MSVQ2YCY.js";
 import {
   GROUP_ONLY_METADATA,
   STATE_KEYWORDS
-} from "./chunk-YYBQ55V2.js";
-import "./chunk-DPGI742S.js";
+} from "./chunk-VWIXRNY2.js";
+import "./chunk-4FKEI4MF.js";
 import {
   ALL_CHART_TYPES,
   chartTypes
-} from "./chunk-ZJJWON5O.js";
-import "./chunk-EXNKNJ65.js";
-import "./chunk-OLMWTJVU.js";
+} from "./chunk-MK55PZVB.js";
+import "./chunk-XOGQY4EC.js";
+import "./chunk-5SI6T5A5.js";
 import "./chunk-5WRI5ZAA.js";
 
 // src/utils/offered-types.ts
@@ -632,25 +632,26 @@ var COMPLETION_REGISTRY = /* @__PURE__ */ new Map([
   ],
   [
     "countdown",
-    // Live "N until X". One-shot `target` OR a recurring `every … on … at …`
-    // rule (never both). `units`/`round`/`fields` shape the display; `since*`
-    // number the ordinal. All space-separated key value (no colon).
+    // Live "N until X". One-shot `target` OR a recurring `since <date>` (+ an
+    // optional `every <cadence>`), never both. Every calendar field comes from
+    // the anchor, so `on`/`at`/`from` are gone (decision #56).
+    // `units`/`round`/`fields` shape the display; `since-label` opts into the
+    // ordinal eyebrow. All space-separated key value (no colon).
     withGlobals({
       ...DATE_DIRECTIVES,
       target: {
         description: "One-shot instant: a date/datetime (ISO, 7/4, or Jul 4) or `now` (key value)"
       },
       every: {
-        description: "Recurring: every <year|month|week|N days|weeks|months> [on <instant>] [at <time>] [from <date>]"
-      },
-      on: {
-        description: "Instant within the cadence: Aug 21 | 3rd Tuesday | last Friday | Friday"
-      },
-      at: {
-        description: "Time of day: 18:00 | 6pm | 6:30pm; default midnight"
-      },
-      from: {
-        description: "Interval anchor date: every [N] day|week|month from <date> (e.g. every month from 2026-01-31)"
+        description: "Cadence only \u2014 year | month | month by weekday | month by last weekday | week | day | N days|weeks|months. Omit it and yearly is assumed",
+        values: [
+          "year",
+          "month",
+          "month by weekday",
+          "month by last weekday",
+          "week",
+          "day"
+        ]
       },
       units: {
         description: "human (default) | days | full | clock | weeks | words"
@@ -665,9 +666,11 @@ var COMPLETION_REGISTRY = /* @__PURE__ */ new Map([
       },
       lang: { description: "Locale for words/month names (en)" },
       "on-day": { description: "Text shown on the occurrence day (recurring)" },
-      since: { description: 'Anchor year \u2192 enables the ordinal ("7th")' },
+      since: {
+        description: "Recurring anchor \u2014 the whole origin instant (2015-06-14, or 2026-01-05T18:00 for a timed one). Every calendar field derives from it"
+      },
       "since-label": {
-        description: 'Eyebrow template: Nth \u2192 ordinal word, N \u2192 number (e.g. "Nth Anniversary")'
+        description: 'Opt into the ordinal eyebrow: Nth \u2192 ordinal word, N \u2192 number (e.g. "Nth Anniversary")'
       },
       expired: { description: "Text shown once a one-shot target passes" }
     })

package/dist/countdown.js

@@ -215,8 +215,29 @@ function resolveNext(rule, now) {
     }
   }
 }
-function ordinalFor(resolvedMs, since) {
-  return new Date(resolvedMs).getFullYear() - since;
+function ordinalFor(resolvedMs, rule) {
+  const anchor = rule.anchorMs;
+  if (anchor === void 0) return 0;
+  const tz = rule.tz ?? null;
+  const a = zoneFields(anchor, tz);
+  const r = zoneFields(resolvedMs, tz);
+  const months = (r.year - a.year) * 12 + (r.month - a.month);
+  const spanDays = (dayStart(resolvedMs, tz) - dayStart(anchor, tz)) / DAY_MS;
+  switch (rule.kind) {
+    case "month-day":
+      return r.year - a.year;
+    case "nth-weekday":
+    case "last-weekday":
+      return months;
+    case "weekly":
+      return Math.round(spanDays / 7);
+    case "interval": {
+      const n = rule.intervalN ?? 1;
+      if (rule.intervalUnit === "month") return Math.floor(months / n);
+      const perStep = rule.intervalUnit === "week" ? 7 : 1;
+      return Math.round(spanDays / perStep / n);
+    }
+  }
 }
 function roundBy(value, mode) {
   return mode === "down" ? Math.floor(value) : mode === "nearest" ? Math.round(value) : Math.ceil(value);
@@ -489,7 +510,6 @@ function updateNode(node, now) {
   }
   if (resolvedMs === null) return;
   const remaining = resolvedMs - now;
-  const sinceAttr = node.getAttribute("data-dgmo-countdown-since");
   const custom = node.getAttribute("data-dgmo-countdown-expired");
   const hasTime = node.getAttribute("data-dgmo-countdown-hastime") === "1";
   const frozen = expiredNow && custom !== null;
@@ -533,12 +553,12 @@ function updateNode(node, now) {
     const hasTime2 = node.getAttribute("data-dgmo-countdown-hastime") === "1";
     footer.textContent = formatFooter(resolvedMs, hasTime2, tz);
   }
+  const tpl = node.getAttribute("data-dgmo-countdown-since-label");
   const eyebrowEl = svg.querySelector("[data-dgmo-countdown-eyebrow]");
-  if (eyebrowEl && sinceAttr) {
-    const tpl = node.getAttribute("data-dgmo-countdown-since-label") || "Nth";
+  if (eyebrowEl && tpl && rule) {
     eyebrowEl.textContent = applyOrdinalTemplate(
       tpl,
-      ordinalFor(resolvedMs, Number(sinceAttr))
+      ordinalFor(resolvedMs, rule)
     );
   }
   const detail = svg.querySelector("[data-dgmo-countdown-detail]");

package/dist/{d3-Bfhj-XBX.d.ts → d3--y67plmW.d.ts}

@@ -1,4 +1,4 @@
-import { T as TagGroup, D as DgmoError, a as PaletteColors, C as CompactViewState } from './tag-groups-NUA2F1I5.js';
+import { T as TagGroup, D as DgmoError, a as PaletteColors, C as CompactViewState } from './tag-groups-DrHT2tEc.js';
 
 /** A POI / route-stop position: gazetteer name (+ optional ISO scope) or coords. */
 type PoiPos = {