@diagrammo/dgmo 0.50.1 → 0.51.0

package/dist/chunk-RBDIYLA5.js

@@ -0,0 +1,267 @@
+// src/utils/date.ts
+var MONTHS_FULL = [
+  "january",
+  "february",
+  "march",
+  "april",
+  "may",
+  "june",
+  "july",
+  "august",
+  "september",
+  "october",
+  "november",
+  "december"
+];
+var MONTHS_ABBR = [
+  "jan",
+  "feb",
+  "mar",
+  "apr",
+  "may",
+  "jun",
+  "jul",
+  "aug",
+  "sep",
+  "oct",
+  "nov",
+  "dec"
+];
+function monthNameToNum(raw) {
+  const t = raw.toLowerCase().replace(/\.$/, "");
+  let i = MONTHS_FULL.indexOf(t);
+  if (i >= 0) return i + 1;
+  i = MONTHS_ABBR.indexOf(t.slice(0, 3));
+  return i >= 0 ? i + 1 : 0;
+}
+var ERA_RE = /^(\d{1,4})(?:-(\d{2})(?:-(\d{2}))?)?\s+(BCE|BC|CE|AD)\b/i;
+var ISO_RE = /^(\d{4})(?:-(\d{2})(?:-(\d{2}))?)?/;
+var MONTH_D_RE = /^([A-Za-z]{3,9})\.?\s+(\d{1,2})(?:,?\s+(\d{4}))?/;
+var D_MONTH_RE = /^(\d{1,2})\s+([A-Za-z]{3,9})\.?(?:\s+(\d{4}))?/;
+var SLASH_RE = /^(\d{1,2})[/-](\d{1,2})(?:[/-](\d{2,4}))?/;
+var TIME_RE = /^[T ](\d{1,2}):(\d{2})(?::(\d{2}))?/;
+function matchTime(rest) {
+  const m = rest.match(TIME_RE);
+  if (!m) return { hour: 0, minute: 0, second: 0, hasTime: false, consumed: 0 };
+  const hour = parseInt(m[1], 10);
+  const minute = parseInt(m[2], 10);
+  const second = m[3] !== void 0 ? parseInt(m[3], 10) : 0;
+  const ok = hour <= 23 && minute <= 59 && second <= 59;
+  return {
+    hour,
+    minute,
+    second,
+    hasTime: true,
+    consumed: m[0].length,
+    invalid: ok ? void 0 : m[0].trim()
+  };
+}
+function dayToken(year, month, day, sign = 1) {
+  return {
+    sign,
+    year,
+    month,
+    day,
+    hour: 0,
+    minute: 0,
+    second: 0,
+    grain: 3,
+    hasTime: false,
+    invalidTime: void 0
+  };
+}
+function parseDateToken(input, opts = {}) {
+  const order = opts.dateOrder ?? "mdy";
+  const era = input.match(ERA_RE);
+  if (era) {
+    const marker = era[4].toUpperCase();
+    const sign = marker === "BCE" || marker === "BC" ? -1 : 1;
+    const grain = era[3] ? 3 : era[2] ? 2 : 1;
+    return {
+      token: {
+        sign,
+        year: parseInt(era[1], 10),
+        month: era[2] ? parseInt(era[2], 10) : 1,
+        day: era[3] ? parseInt(era[3], 10) : 1,
+        hour: 0,
+        minute: 0,
+        second: 0,
+        grain,
+        hasTime: false
+      },
+      consumed: era[0].length
+    };
+  }
+  const iso = input.match(ISO_RE);
+  if (iso) {
+    const grain = iso[3] ? 3 : iso[2] ? 2 : 1;
+    let consumed = iso[0].length;
+    let time = {
+      hour: 0,
+      minute: 0,
+      second: 0,
+      hasTime: false,
+      consumed: 0
+    };
+    if (grain === 3) {
+      time = matchTime(input.slice(consumed));
+      consumed += time.consumed;
+    }
+    return {
+      token: {
+        sign: 1,
+        year: parseInt(iso[1], 10),
+        month: iso[2] ? parseInt(iso[2], 10) : 1,
+        day: iso[3] ? parseInt(iso[3], 10) : 1,
+        hour: time.hour,
+        minute: time.minute,
+        second: time.second,
+        grain,
+        hasTime: time.hasTime,
+        invalidTime: time.invalid
+      },
+      consumed
+    };
+  }
+  const md = input.match(MONTH_D_RE);
+  if (md && monthNameToNum(md[1]) > 0) {
+    const mo = monthNameToNum(md[1]);
+    const day = parseInt(md[2], 10);
+    const year = md[3] ? parseInt(md[3], 10) : null;
+    const tok = dayToken(year, mo, day);
+    const time = matchTime(input.slice(md[0].length));
+    tok.hour = time.hour;
+    tok.minute = time.minute;
+    tok.second = time.second;
+    tok.hasTime = time.hasTime;
+    tok.invalidTime = time.invalid;
+    return { token: tok, consumed: md[0].length + time.consumed };
+  }
+  const dm = input.match(D_MONTH_RE);
+  if (dm && monthNameToNum(dm[2]) > 0) {
+    const mo = monthNameToNum(dm[2]);
+    const day = parseInt(dm[1], 10);
+    const year = dm[3] ? parseInt(dm[3], 10) : null;
+    const tok = dayToken(year, mo, day);
+    const time = matchTime(input.slice(dm[0].length));
+    tok.hour = time.hour;
+    tok.minute = time.minute;
+    tok.second = time.second;
+    tok.hasTime = time.hasTime;
+    tok.invalidTime = time.invalid;
+    return { token: tok, consumed: dm[0].length + time.consumed };
+  }
+  const sl = input.match(SLASH_RE);
+  if (sl) {
+    const a = parseInt(sl[1], 10);
+    const b = parseInt(sl[2], 10);
+    let year = null;
+    if (sl[3]) {
+      year = parseInt(sl[3], 10);
+      if (sl[3].length === 2) year += 2e3;
+    }
+    let month;
+    let day;
+    if (a > 12 && b <= 12) {
+      day = a;
+      month = b;
+    } else if (b > 12 && a <= 12) {
+      month = a;
+      day = b;
+    } else if (order === "dmy") {
+      day = a;
+      month = b;
+    } else {
+      month = a;
+      day = b;
+    }
+    if (month < 1 || month > 12 || day < 1 || day > 31) return null;
+    const tok = dayToken(year, month, day);
+    const time = matchTime(input.slice(sl[0].length));
+    tok.hour = time.hour;
+    tok.minute = time.minute;
+    tok.second = time.second;
+    tok.hasTime = time.hasTime;
+    tok.invalidTime = time.invalid;
+    return { token: tok, consumed: sl[0].length + time.consumed };
+  }
+  return null;
+}
+function toInternal(token, resolvedYear) {
+  const y = token.year ?? resolvedYear;
+  const neg = token.sign < 0 ? "-" : "";
+  const yStr = String(y);
+  if (token.grain === 1) return `${neg}${yStr}`;
+  const mm = String(token.month).padStart(2, "0");
+  if (token.grain === 2) return `${neg}${yStr}-${mm}`;
+  const dd = String(token.day).padStart(2, "0");
+  let out = `${neg}${yStr}-${mm}-${dd}`;
+  if (token.hasTime) {
+    const hh = String(token.hour).padStart(2, "0");
+    const mi = String(token.minute).padStart(2, "0");
+    out += ` ${hh}:${mi}`;
+    if (token.second) out += `:${String(token.second).padStart(2, "0")}`;
+  }
+  return out;
+}
+function cmp(y, m, d, p) {
+  if (y !== p.y) return y - p.y;
+  if (m !== p.m) return m - p.m;
+  return d - p.d;
+}
+function resolveTokenYear(token, ctx) {
+  if (token.year != null) {
+    const signed = token.sign * token.year;
+    ctx.contextYear = signed;
+    ctx.prev = { y: signed, m: token.month, d: token.day };
+    return { internal: toInternal(token, token.year) };
+  }
+  let hint;
+  let error;
+  let y;
+  if (ctx.contextYear != null) {
+    y = ctx.contextYear;
+  } else if (ctx.noCurrentYear) {
+    error = "Date has no year and none can be derived. Add a full date, a `year 20XX` directive, or remove `no-current-year`.";
+    y = ctx.currentYear;
+  } else {
+    y = ctx.currentYear;
+    hint = "Date has no year; assuming the current year. Add `year 20XX` to make this diagram reproducible.";
+  }
+  if (ctx.prev && cmp(y, token.month, token.day, ctx.prev) < 0) {
+    y += 1;
+  }
+  ctx.contextYear = y;
+  ctx.prev = { y, m: token.month, d: token.day };
+  return { internal: toInternal(token, y), hint, error };
+}
+function makeYearContext(opts) {
+  const directiveYear = opts.directiveYear ?? null;
+  const seed = directiveYear ?? opts.prescanYear ?? null;
+  return {
+    order: opts.order ?? "mdy",
+    directiveYear,
+    currentYear: opts.currentYear ?? (/* @__PURE__ */ new Date()).getFullYear(),
+    noCurrentYear: opts.noCurrentYear ?? false,
+    contextYear: seed,
+    prev: null
+  };
+}
+function normalizeDate(raw, opts = {}) {
+  const s = raw.trim();
+  const res = parseDateToken(s, { dateOrder: opts.order });
+  if (!res) return null;
+  if (res.consumed !== s.length) return null;
+  if (res.token.invalidTime) return null;
+  const year = res.token.year ?? opts.year ?? opts.currentYear ?? (/* @__PURE__ */ new Date()).getFullYear();
+  return toInternal(res.token, year);
+}
+
+export {
+  parseDateToken,
+  toInternal,
+  resolveTokenYear,
+  makeYearContext,
+  normalizeDate
+};
+//# sourceMappingURL=chunk-RBDIYLA5.js.map

package/dist/{chunk-OTQKUHRS.js → chunk-RBHWPDBB.js}

@@ -7,7 +7,7 @@ import {
   tagAttrKey,
   validateTagGroupNames,
   validateTagValues
-} from "./chunk-FJUNPCYI.js";
+} from "./chunk-467TVMQL.js";
 import {
   normalizeName
 } from "./chunk-NOTA6TEI.js";
@@ -20,7 +20,7 @@ import {
   splitNameAndMeta,
   warnUnknownMetaKeys,
   withTagAliases
-} from "./chunk-OTAL43EH.js";
+} from "./chunk-LV4BETUU.js";
 import {
   formatDgmoError,
   makeDgmoError,
@@ -351,4 +351,4 @@ export {
   looksLikeOrg,
   parseOrg
 };
-//# sourceMappingURL=chunk-OTQKUHRS.js.map
+//# sourceMappingURL=chunk-RBHWPDBB.js.map

package/dist/{chunk-BH3UYK36.js → chunk-RLFVAKEO.js}

@@ -8,7 +8,7 @@ import {
   stripDefaultModifier,
   validateTagGroupNames,
   validateTagValues
-} from "./chunk-FJUNPCYI.js";
+} from "./chunk-467TVMQL.js";
 import {
   parseArrow,
   parseInArrowLabel
@@ -26,7 +26,7 @@ import {
   splitNameAndMeta,
   warnUnknownMetaKeys,
   withTagAliases
-} from "./chunk-OTAL43EH.js";
+} from "./chunk-LV4BETUU.js";
 import {
   NAME_DIAGNOSTIC_CODES,
   formatDgmoError,
@@ -1022,4 +1022,4 @@ export {
   parseSequenceDgmo,
   looksLikeSequence
 };
-//# sourceMappingURL=chunk-BH3UYK36.js.map
+//# sourceMappingURL=chunk-RLFVAKEO.js.map

package/dist/{chunk-3LH5CLP4.js → chunk-RXKTSFDL.js}

@@ -1,12 +1,25 @@
+import {
+  buildSwatches
+} from "./chunk-4XFBQT5O.js";
 import {
   layoutMap,
   mapLegendConfig,
   mapLegendGroups,
   parsePathRings
-} from "./chunk-LE4MYMLI.js";
+} from "./chunk-32XPAAET.js";
 import {
   renderIntegratedLegend
-} from "./chunk-HEVYAHLW.js";
+} from "./chunk-OU7HLO7I.js";
+import {
+  parseClock
+} from "./chunk-6NFYEQDX.js";
+import {
+  fixedParts,
+  formatTime,
+  sunLine,
+  workStatus,
+  zoneParts
+} from "./chunk-APKUAJ2L.js";
 import {
   TITLE_FONT_SIZE,
   TITLE_FONT_WEIGHT,
@@ -17,13 +30,132 @@ import {
 } from "./chunk-6KFWC4CO.js";
 import {
   measureText
-} from "./chunk-5LWQH6QV.js";
+} from "./chunk-WCT3NYCV.js";
 import {
-  mix
+  mix,
+  themeBaseBg
 } from "./chunk-P6T66CCZ.js";
 
 // src/map/renderer.ts
 import * as d3Selection from "d3-selection";
+
+// src/map/clock-card.ts
+var WEEKDAY_ABBR = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"];
+var clamp = (v, lo, hi) => Math.max(lo, Math.min(hi, v));
+function workFromDirectives(d) {
+  if (d.clockHours === void 0) return null;
+  const src = `clock
+hours ${d.clockHours}` + (d.clockDays !== void 0 ? `
+days ${d.clockDays}` : "");
+  const w = parseClock(src).work;
+  if (!w) return null;
+  return { startMin: w.startMin, endMin: w.endMin, days: w.days };
+}
+function partsFor(poi, now) {
+  return poi.tzFixedOffsetMin !== void 0 ? fixedParts(poi.tzFixedOffsetMin, now) : zoneParts(poi.tz, now);
+}
+function renderClockCards(gCards, layout, resolved, palette, isDark, now, frameW, frameH) {
+  const withTz = resolved.pois.filter((p) => p.tz !== void 0);
+  if (withTz.length === 0) return;
+  const byId = new Map(withTz.map((p) => [p.id, p]));
+  const baseBg = themeBaseBg(palette, isDark);
+  const muted = mix(palette.text, baseBg, 55);
+  const sw = buildSwatches(palette, muted);
+  const cardFill = mix(palette.text, palette.bg, 6);
+  const border = mix(palette.text, palette.bg, 32);
+  const work = workFromDirectives(resolved.directives);
+  const hours12 = true;
+  for (const lp of layout) {
+    const poi = byId.get(lp.id);
+    if (!poi) continue;
+    const parts = partsFor(poi, now);
+    const hasCoords = Number.isFinite(poi.lat) && Number.isFinite(poi.lon);
+    const isFixed = poi.tzFixedOffsetMin !== void 0;
+    const sun = !isFixed && hasCoords ? sunLine(now, poi.lat, poi.lon) : null;
+    const up = sun ? sun.up : parts.h >= 6 && parts.h < 18;
+    const ts = formatTime(parts.h, parts.m, parts.s, hours12);
+    const status = workStatus(parts, work);
+    const viewerWeekday = WEEKDAY_ABBR[new Date(now).getDay()];
+    const showWeekday = parts.weekday !== viewerWeekday;
+    const line2 = [showWeekday ? parts.weekday : null, status?.text].filter(Boolean).join(" \xB7 ");
+    const mainFont = 18;
+    const sf = 8;
+    const mainW = measureText(ts.main, mainFont);
+    const stackW = Math.max(
+      measureText(`:${ts.sec}`, sf),
+      ts.ap ? measureText(ts.ap, sf) : 0
+    );
+    const stackGap = 3;
+    const dotGap = 15;
+    const padX = 9;
+    const line1W = dotGap + mainW + stackGap + stackW;
+    const line2W = measureText(line2, 10.5);
+    const cardW = Math.max(line1W, line2W) + padX * 2;
+    const cardH = 44;
+    const leaderGap = 7;
+    const M = 6;
+    const cx = lp.cx;
+    const below = lp.cy - lp.r - leaderGap - cardH < M;
+    const cardTop = clamp(
+      below ? lp.cy + lp.r + leaderGap : lp.cy - lp.r - leaderGap - cardH,
+      M,
+      frameH - cardH - M
+    );
+    const cardLeft = clamp(cx - cardW / 2, M, frameW - cardW - M);
+    const g = gCards.append("g").attr("data-dgmo-clock", "").attr("data-dgmo-clock-zone", poi.tz).attr("data-dgmo-clock-hours12", hours12 ? "1" : "0").attr("data-dgmo-clock-sun", sun ? "1" : "0").attr("data-line-number", poi.lineNumber).attr("data-poi-clock", poi.id).attr("data-dgmo-clock-c-day", sw.day).attr("data-dgmo-clock-c-night", sw.night).attr("data-dgmo-clock-c-day-soft", sw.dayTint).attr("data-dgmo-clock-c-night-soft", sw.nightTint).attr("data-dgmo-clock-c-ok", sw.ok).attr("data-dgmo-clock-c-soon", sw.soon).attr("data-dgmo-clock-c-off", sw.off).attr("data-dgmo-clock-c-ok-soft", sw.okSoft).attr("data-dgmo-clock-c-soon-soft", sw.soonSoft).attr("data-dgmo-clock-c-off-soft", sw.offSoft);
+    if (hasCoords) {
+      g.attr("data-dgmo-clock-lat", poi.lat).attr(
+        "data-dgmo-clock-lon",
+        poi.lon
+      );
+    }
+    if (isFixed) g.attr("data-dgmo-clock-fixed-offset", poi.tzFixedOffsetMin);
+    if (work) {
+      g.attr("data-dgmo-clock-work-start", work.startMin).attr("data-dgmo-clock-work-end", work.endMin).attr(
+        "data-dgmo-clock-work-days",
+        WEEKDAY_ABBR.filter((d) => work.days[d]).join(",")
+      );
+    }
+    const leaderX = clamp(cx, cardLeft + 10, cardLeft + cardW - 10);
+    g.append("line").attr("x1", cx).attr("y1", below ? lp.cy + lp.r : lp.cy - lp.r).attr("x2", leaderX).attr("y2", below ? cardTop : cardTop + cardH).attr("stroke", border).attr("stroke-width", 1);
+    g.append("rect").attr("x", cardLeft).attr("y", cardTop).attr("width", cardW).attr("height", cardH).attr("rx", 6).attr("fill", cardFill).attr("stroke", border).attr("stroke-width", 1);
+    const dotCX = cardLeft + padX + 3.5;
+    const line1Y = cardTop + 20;
+    const dot = g.append("circle").attr("data-dgmo-clock-status-dot", "").attr("cx", dotCX).attr("cy", line1Y - mainFont * 0.35).attr("r", 3.5);
+    if (status) {
+      const dc = status.cls === "ok" ? sw.ok : status.cls === "soon" ? sw.soon : sw.off;
+      if (status.cls === "off") {
+        dot.attr("fill", "none").attr("stroke", dc).attr("stroke-width", 1.4);
+      } else {
+        dot.attr("fill", dc);
+      }
+    } else {
+      dot.attr("fill", up ? sw.day : sw.night);
+    }
+    const timeX = cardLeft + padX + dotGap;
+    g.append("text").attr("data-dgmo-clock-digital-part", "main").attr("x", timeX).attr("y", line1Y).attr("font-family", FONT_FAMILY).attr("fill", palette.text).attr("font-size", mainFont).attr("font-weight", 600).style("font-variant-numeric", "tabular-nums").text(ts.main);
+    const stackX = timeX + mainW + stackGap;
+    const capTop = line1Y - mainFont * 0.7;
+    g.append("text").attr("data-dgmo-clock-digital-part", "sec").attr("x", stackX).attr("y", capTop + sf * 0.72).attr("font-family", FONT_FAMILY).attr("fill", muted).attr("font-size", sf).style("font-variant-numeric", "tabular-nums").text(`:${ts.sec}`);
+    g.append("text").attr("data-dgmo-clock-digital-part", "ap").attr("x", stackX).attr("y", line1Y).attr("font-family", FONT_FAMILY).attr("fill", muted).attr("font-size", sf).text(ts.ap);
+    const line2Y = cardTop + 36;
+    const l2 = g.append("text").attr("x", cardLeft + padX).attr("y", line2Y).attr("font-family", FONT_FAMILY).attr("font-size", 10.5).attr("fill", muted);
+    let needSep = false;
+    if (showWeekday) {
+      l2.append("tspan").text(parts.weekday);
+      needSep = true;
+    }
+    if (status) {
+      if (needSep) l2.append("tspan").text(" \xB7 ");
+      l2.append("tspan").attr("data-dgmo-clock-status", "").attr(
+        "fill",
+        status.cls === "ok" ? sw.ok : status.cls === "soon" ? sw.soon : sw.off
+      ).text(status.text);
+    }
+  }
+}
+
+// src/map/renderer.ts
 var LABEL_FONT = 11;
 function pointInRing(px, py, ring) {
   let inside = false;
@@ -586,6 +718,19 @@ function renderMap(container, resolved, data, palette, isDark, onClickItem, expo
       );
     }
   }
+  if (resolved.pois.some((p) => p.tz !== void 0)) {
+    const gCards = svg.append("g").attr("class", "dgmo-map-clock-cards");
+    renderClockCards(
+      gCards,
+      layout.pois,
+      resolved,
+      palette,
+      isDark,
+      Date.now(),
+      width,
+      height
+    );
+  }
   if (layout.legend) {
     const legendY = (layout.title ? TITLE_Y + TITLE_FONT_SIZE : 0) + (layout.subtitle ? TITLE_FONT_SIZE : 0) + 8;
     const legendG = svg.append("g").attr("class", "dgmo-map-legend").attr("transform", `translate(0, ${legendY})`);
@@ -644,4 +789,4 @@ export {
   renderMap,
   renderMapForExport
 };
-//# sourceMappingURL=chunk-3LH5CLP4.js.map
+//# sourceMappingURL=chunk-RXKTSFDL.js.map

package/dist/{chunk-RZ6YKEUJ.js → chunk-TK2VQQX2.js}

@@ -1,9 +1,9 @@
 import {
   renderIntegratedLegend
-} from "./chunk-HEVYAHLW.js";
+} from "./chunk-OU7HLO7I.js";
 import {
   getMaxLegendReservedHeight
-} from "./chunk-7UEMZREK.js";
+} from "./chunk-YAA6IID3.js";
 import {
   TITLE_FONT_SIZE,
   TITLE_FONT_WEIGHT,
@@ -14,10 +14,10 @@ import {
 } from "./chunk-6KFWC4CO.js";
 import {
   LEGEND_GROUP_GAP
-} from "./chunk-HQCHYB5F.js";
+} from "./chunk-QOOUC2J5.js";
 import {
   measureText
-} from "./chunk-5LWQH6QV.js";
+} from "./chunk-WCT3NYCV.js";
 import {
   isBlockNode
 } from "./chunk-NNAAJVBU.js";
@@ -27,7 +27,7 @@ import {
 import {
   resolveTagColor,
   tagAttrKey
-} from "./chunk-FJUNPCYI.js";
+} from "./chunk-467TVMQL.js";
 
 // src/block/renderer.ts
 import * as d3Selection from "d3-selection";
@@ -359,4 +359,4 @@ export {
   renderBlock,
   authoredCollapsedIds
 };
-//# sourceMappingURL=chunk-RZ6YKEUJ.js.map
+//# sourceMappingURL=chunk-TK2VQQX2.js.map

package/dist/{chunk-I7F2A35O.js → chunk-TMACGPW5.js}

@@ -1,66 +1,44 @@
+import {
+  parseDateToken,
+  toInternal
+} from "./chunk-RBDIYLA5.js";
 import {
   TIMELINE_REGISTRY,
   splitNameAndMeta,
   warnUnknownMetaKeys,
   withTagAliases
-} from "./chunk-OTAL43EH.js";
+} from "./chunk-LV4BETUU.js";
 import {
   makeDgmoError
 } from "./chunk-CXK4DZH3.js";
 
 // src/timeline/parser.ts
 var TIMELINE_DURATION_RE = /^(\d+(?:\.\d{1,2})?)(min|[dwmyhs])(\?)?$/;
-var DATE_RE = /^(\d{4}(?:-\d{2}(?:-\d{2})?)?)/;
-var TIME_RE = /^\s+(\d{1,2}:\d{2}(?::\d{2})?)/;
 var ARROW_RE = /^\s*(?:->|–>)\s*/;
-var ERA_DATE_RE = /^(\d{1,4}(?:-\d{2}(?:-\d{2})?)?)\s+(BCE|BC|CE|AD)\b/i;
-function parseTime(timeStr) {
-  const [hStr, mStr, sStr] = timeStr.split(":");
-  const h = parseInt(hStr, 10);
-  const m = parseInt(mStr, 10);
-  const s = sStr !== void 0 ? parseInt(sStr, 10) : 0;
-  const valid = h >= 0 && h <= 23 && m >= 0 && m <= 59 && s >= 0 && s <= 59;
-  return { valid, h, m, s };
-}
-function parseDateWithOptionalTime(input) {
-  const eraMatch = input.match(ERA_DATE_RE);
-  if (eraMatch) {
-    const marker = eraMatch[2].toUpperCase();
-    const bce = marker === "BCE" || marker === "BC";
-    const date2 = (bce ? "-" : "") + eraMatch[1];
-    return {
-      date: date2,
-      rest: input.slice(eraMatch[0].length),
-      timeValid: true,
-      invalidTime: void 0
-    };
-  }
-  const dateMatch = input.match(DATE_RE);
-  if (!dateMatch) return null;
-  let date = dateMatch[1];
-  let rest = input.slice(date.length);
-  let timeValid = true;
-  let invalidTime;
-  const timeMatch = rest.match(TIME_RE);
-  if (timeMatch) {
-    const timeStr = timeMatch[1];
-    const { valid } = parseTime(timeStr);
-    timeValid = valid;
-    if (!valid) invalidTime = timeStr;
-    date = `${date} ${timeStr}`;
-    rest = rest.slice(timeMatch[0].length);
-  }
-  return { date, rest, timeValid, invalidTime };
+function parseDateWithOptionalTime(input, ctx) {
+  const res = parseDateToken(input, { dateOrder: ctx?.order });
+  if (!res) return null;
+  const { token, consumed } = res;
+  const internal = ctx?.resolve ? ctx.resolve(token).internal : toInternal(
+    token,
+    token.year ?? ctx?.currentYear ?? (/* @__PURE__ */ new Date()).getFullYear()
+  );
+  return {
+    date: internal,
+    rest: input.slice(consumed),
+    timeValid: !token.invalidTime,
+    invalidTime: token.invalidTime
+  };
 }
-function extractDatePrefix(line) {
-  const startResult = parseDateWithOptionalTime(line);
+function extractDatePrefix(line, ctx) {
+  const startResult = parseDateWithOptionalTime(line, ctx);
   if (!startResult) return null;
   const { date: startDate } = startResult;
   let { rest } = startResult;
   const arrowMatch = rest.match(ARROW_RE);
   if (arrowMatch) {
     rest = rest.slice(arrowMatch[0].length);
-    const endResult = parseDateWithOptionalTime(rest);
+    const endResult = parseDateWithOptionalTime(rest, ctx);
     if (endResult) {
       let uncertain = false;
       let afterEnd = endResult.rest;
@@ -209,9 +187,9 @@ function parseTimelineDate(s) {
   const yearBase = p.sign * p.year;
   return yearBase + (p.month - 1) / 12 + (p.day - 1) / 365 + p.hour / 8760 + p.minute / 525600 + p.second / 31536e3;
 }
-function parseTimelineEventLine(line, lineNumber, currentGroup, groupMetadata, aliasMap, registry) {
+function parseTimelineEventLine(line, lineNumber, currentGroup, groupMetadata, aliasMap, registry, dateCtx) {
   const diagnostics = [];
-  const prefix = extractDatePrefix(line);
+  const prefix = extractDatePrefix(line, dateCtx);
   if (!prefix) {
     if (/^\d/.test(line)) {
       const firstToken = line.split(/\s/)[0];
@@ -336,4 +314,4 @@ export {
   parseTimelineDate,
   parseTimelineEventLine
 };
-//# sourceMappingURL=chunk-I7F2A35O.js.map
+//# sourceMappingURL=chunk-TMACGPW5.js.map