jackherd 1.12.2 → 1.12.3

package/src/watch/source-entries.ts

@@ -16,6 +16,12 @@ export const ENTRY_LIMIT = 20
 
 const shownAt = ({ changedAt, seenAt }: SourceEntry): number => changedAt ?? seenAt
 
+/** The source's own time of an entry in epoch milliseconds; null for an unmapped `updatedAt` (`''`) or no date. */
+const sourceTimeOf = (updatedAt: string): number | null => {
+  const time = updatedAt === '' ? Number.NaN : Date.parse(updatedAt)
+  return Number.isNaN(time) ? null : time
+}
+
 const entryOf = (
   item: SourceItem,
   known: SourceEntry | undefined,
@@ -29,6 +35,7 @@ const entryOf = (
   count: item.count,
   seenAt: known?.seenAt ?? now,
   changedAt: seen && reportsItem(seen, item, settings) ? now : (known?.changedAt ?? null),
+  updatedAt: sourceTimeOf(item.updatedAt),
 })
 
 /**

package/src/watch/source-statuses.ts

@@ -6,7 +6,7 @@ import type { WatchState } from './watch-events'
 /** The newest entry a source reported, as the herd draws it; `isNew` while it is younger than `NEW_FOR_MS`. */
 export type LatestStatus = { title: string; url: string | null; isNew: boolean }
 
-/** An entry as the herd lists it under its source: `at` is when it last changed, else when the watcher first saw it; `isNew` only for a reported change younger than `NEW_FOR_MS`. */
+/** An entry as the herd lists it under its source: `at` is the source's own time of it, else when it last changed, else when the watcher first saw it; `isNew` only for a reported change younger than `NEW_FOR_MS`. */
 export type EntryStatus = {
   id: string
   title: string
@@ -30,7 +30,7 @@ const entryStatusOf = (entry: SourceEntry, now: number): EntryStatus => ({
   title: lineText(entry.title),
   url: entry.url === null ? null : previewUrlOf(entry.url, undefined),
   count: entry.count,
-  at: entry.changedAt ?? entry.seenAt,
+  at: entry.updatedAt ?? entry.changedAt ?? entry.seenAt,
   isNew: entry.changedAt !== null && now - entry.changedAt < NEW_FOR_MS,
 })
 

package/src/watch/sources.ts

@@ -93,7 +93,8 @@ export type LatestReport = { title: string; url: string | null; at: number }
 
 /**
  * An entry of a source as the herd lists it: its title as one line, its checked URL, its count, when the watcher first
- * saw it (`seenAt`) and when it last reported a change of it (`changedAt`, null while only the baseline knows it).
+ * saw it (`seenAt`), when it last reported a change of it (`changedAt`, null while only the baseline knows it), and the
+ * source's own time of it (`map.updatedAt` read as a date; null when unmapped or no date, absent in older states).
  */
 export type SourceEntry = {
   id: string
@@ -102,6 +103,7 @@ export type SourceEntry = {
   count: string | null
   seenAt: number
   changedAt: number | null
+  updatedAt?: number | null
 }
 
 /**
@@ -419,7 +421,8 @@ const isSourceEntry = (value: unknown): boolean =>
   isTextOrNull(value.url) &&
   isTextOrNull(value.count) &&
   typeof value.seenAt === 'number' &&
-  (value.changedAt === null || typeof value.changedAt === 'number')
+  (value.changedAt === null || typeof value.changedAt === 'number') &&
+  (value.updatedAt === undefined || value.updatedAt === null || typeof value.updatedAt === 'number')
 
 const isSourceRecord = (value: unknown): boolean =>
   isRecord(value) &&

package/src/plans/next-rows.ts

@@ -1,12 +0,0 @@
-import { sectionLines } from '../plan-format/markdown'
-import { NEXT_VOCABULARY, type PlanLanguage } from '../vocabulary'
-
-const MAX_NEXT_LINES = 3
-
-const LIST_LINE = /^(?:\d+[.)]|[-*])\s+(.+)$/
-
-/** The board's next section, up to three list lines in the order written; the parser cuts after three, as the board says. */
-export const nextLines = (board: string, language: PlanLanguage): string[] =>
-  sectionLines(board, NEXT_VOCABULARY[language].heading)
-    .flatMap((line) => LIST_LINE.exec(line.trim())?.[1] ?? [])
-    .slice(0, MAX_NEXT_LINES)